CVS commit: pkgsrc/graphics/qt6-qt3d

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Fri Nov  3 19:24:15 UTC 2023

Modified Files:
        pkgsrc/graphics/qt6-qt3d: Makefile PLIST options.mk

Log Message:
qt6-qt3d: Fix PLIST, matrix4x4_avx2.h is now always installed on x86 machines


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/qt6-qt3d/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/qt6-qt3d/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/qt6-qt3d/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/qt6-qt3d/Makefile
diff -u pkgsrc/graphics/qt6-qt3d/Makefile:1.12 pkgsrc/graphics/qt6-qt3d/Makefile:1.13
--- pkgsrc/graphics/qt6-qt3d/Makefile:1.12      Tue Oct 31 19:56:48 2023
+++ pkgsrc/graphics/qt6-qt3d/Makefile   Fri Nov  3 19:24:14 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/10/31 19:56:48 adam Exp $
+# $NetBSD: Makefile,v 1.13 2023/11/03 19:24:14 nros Exp $
 
 DISTNAME=      qt3d-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qt3d-${QTVERSION}
@@ -26,7 +26,7 @@ PKGCONFIG_OVERRIDE+=  lib/pkgconfig/Qt63D
 PKGCONFIG_OVERRIDE+=   lib/pkgconfig/Qt63DQuickScene2D.pc
 PKGCONFIG_OVERRIDE+=   lib/pkgconfig/Qt63DRender.pc
 
-PLIST_VARS+=   avx simd
+PLIST_VARS+=   simd
 
 .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
 PLIST.simd=            yes

Index: pkgsrc/graphics/qt6-qt3d/PLIST
diff -u pkgsrc/graphics/qt6-qt3d/PLIST:1.5 pkgsrc/graphics/qt6-qt3d/PLIST:1.6
--- pkgsrc/graphics/qt6-qt3d/PLIST:1.5  Fri Sep 22 08:49:44 2023
+++ pkgsrc/graphics/qt6-qt3d/PLIST      Fri Nov  3 19:24:14 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2023/09/22 08:49:44 vins Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/11/03 19:24:14 nros Exp $
 lib/pkgconfig/Qt63DAnimation.pc
 lib/pkgconfig/Qt63DCore.pc
 lib/pkgconfig/Qt63DExtras.pc
@@ -138,7 +138,7 @@ qt6/include/Qt3DCore/${PKGVERSION}/Qt3DC
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/corelogging_p.h
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/coresettings_p.h
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/job_common_p.h
-${PLIST.avx}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_avx2_p.h
+${PLIST.simd}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_avx2_p.h
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_p.h
 ${PLIST.simd}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_sse_p.h
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/nullservices_p.h

Index: pkgsrc/graphics/qt6-qt3d/options.mk
diff -u pkgsrc/graphics/qt6-qt3d/options.mk:1.2 pkgsrc/graphics/qt6-qt3d/options.mk:1.3
--- pkgsrc/graphics/qt6-qt3d/options.mk:1.2     Fri Sep 29 21:12:14 2023
+++ pkgsrc/graphics/qt6-qt3d/options.mk Fri Nov  3 19:24:14 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2023/09/29 21:12:14 adam Exp $
+# $NetBSD: options.mk,v 1.3 2023/11/03 19:24:14 nros Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qt6-qt3d
 PKG_SUPPORTED_OPTIONS+=        avx
@@ -11,7 +11,6 @@ PKG_SUPPORTED_OPTIONS+=       avx
 ##
 .if !empty(PKG_OPTIONS:Mavx)
 CONFIGURE_ARGS+=       -qt3d-simd avx2
-PLIST.avx=             yes
 .else
 CONFIGURE_ARGS+=       -qt3d-simd sse2
 .endif