Fri Nov 3 19:24:15 2023 UTC ()
qt6-qt3d: Fix PLIST, matrix4x4_avx2.h is now always installed on x86 machines


(nros)
diff -r1.12 -r1.13 pkgsrc/graphics/qt6-qt3d/Makefile
diff -r1.5 -r1.6 pkgsrc/graphics/qt6-qt3d/PLIST
diff -r1.2 -r1.3 pkgsrc/graphics/qt6-qt3d/options.mk
cvs diff -r1.12 -r1.13 pkgsrc/graphics/qt6-qt3d/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/qt6-qt3d/Makefile 2023/10/31 19:56:48 1.12
+++ pkgsrc/graphics/qt6-qt3d/Makefile 2023/11/03 19:24:14 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.12 2023/10/31 19:56:48 adam Exp $ 1# $NetBSD: Makefile,v 1.13 2023/11/03 19:24:14 nros Exp $
2 2
3DISTNAME= qt3d-everywhere-src-${QTVERSION} 3DISTNAME= qt3d-everywhere-src-${QTVERSION}
4PKGNAME= qt6-qt3d-${QTVERSION} 4PKGNAME= qt6-qt3d-${QTVERSION}
5COMMENT= Qt6 3d 5COMMENT= Qt6 3d
6CATEGORIES= graphics 6CATEGORIES= graphics
7LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3 7LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
8 8
9CONFIGURE_ARGS+= -system-qt3d-assimp 9CONFIGURE_ARGS+= -system-qt3d-assimp
10CONFIGURE_ARGS+= -no-fbxsdk 10CONFIGURE_ARGS+= -no-fbxsdk
11 11
12.if ${MACHINE_ARCH} == "x86_64" 12.if ${MACHINE_ARCH} == "x86_64"
13.include "options.mk" 13.include "options.mk"
14.endif 14.endif
@@ -16,27 +16,27 @@ CONFIGURE_ARGS+= -no-fbxsdk @@ -16,27 +16,27 @@ CONFIGURE_ARGS+= -no-fbxsdk
16PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DAnimation.pc 16PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DAnimation.pc
17PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DCore.pc 17PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DCore.pc
18PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DExtras.pc 18PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DExtras.pc
19PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DInput.pc 19PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DInput.pc
20PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DLogic.pc 20PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DLogic.pc
21PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuick.pc 21PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuick.pc
22PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickAnimation.pc 22PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickAnimation.pc
23PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickExtras.pc 23PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickExtras.pc
24PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickInput.pc 24PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickInput.pc
25PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickRender.pc 25PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickRender.pc
26PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickScene2D.pc 26PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickScene2D.pc
27PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DRender.pc 27PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DRender.pc
28 28
29PLIST_VARS+= avx simd 29PLIST_VARS+= simd
30 30
31.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" 31.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
32PLIST.simd= yes 32PLIST.simd= yes
33.else 33.else
34CONFIGURE_ARGS+= -qt3d-simd no 34CONFIGURE_ARGS+= -qt3d-simd no
35.endif 35.endif
36 36
37.include "../../x11/qt6-qtbase/Makefile.common" 37.include "../../x11/qt6-qtbase/Makefile.common"
38 38
39.include "../../graphics/qt6-qtshadertools/buildlink3.mk" 39.include "../../graphics/qt6-qtshadertools/buildlink3.mk"
40.include "../../lang/qt6-qtdeclarative/buildlink3.mk" 40.include "../../lang/qt6-qtdeclarative/buildlink3.mk"
41.include "../../multimedia/assimp/buildlink3.mk" 41.include "../../multimedia/assimp/buildlink3.mk"
42.if ${OPSYS} != "Darwin" 42.if ${OPSYS} != "Darwin"
cvs diff -r1.5 -r1.6 pkgsrc/graphics/qt6-qt3d/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/qt6-qt3d/PLIST 2023/09/22 08:49:44 1.5
+++ pkgsrc/graphics/qt6-qt3d/PLIST 2023/11/03 19:24:14 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2023/09/22 08:49:44 vins Exp $ 1@comment $NetBSD: PLIST,v 1.6 2023/11/03 19:24:14 nros Exp $
2lib/pkgconfig/Qt63DAnimation.pc 2lib/pkgconfig/Qt63DAnimation.pc
3lib/pkgconfig/Qt63DCore.pc 3lib/pkgconfig/Qt63DCore.pc
4lib/pkgconfig/Qt63DExtras.pc 4lib/pkgconfig/Qt63DExtras.pc
5lib/pkgconfig/Qt63DInput.pc 5lib/pkgconfig/Qt63DInput.pc
6lib/pkgconfig/Qt63DLogic.pc 6lib/pkgconfig/Qt63DLogic.pc
7lib/pkgconfig/Qt63DQuick.pc 7lib/pkgconfig/Qt63DQuick.pc
8lib/pkgconfig/Qt63DQuickAnimation.pc 8lib/pkgconfig/Qt63DQuickAnimation.pc
9lib/pkgconfig/Qt63DQuickExtras.pc 9lib/pkgconfig/Qt63DQuickExtras.pc
10lib/pkgconfig/Qt63DQuickInput.pc 10lib/pkgconfig/Qt63DQuickInput.pc
11lib/pkgconfig/Qt63DQuickRender.pc 11lib/pkgconfig/Qt63DQuickRender.pc
12lib/pkgconfig/Qt63DQuickScene2D.pc 12lib/pkgconfig/Qt63DQuickScene2D.pc
13lib/pkgconfig/Qt63DRender.pc 13lib/pkgconfig/Qt63DRender.pc
14qt6/include/Qt3DAnimation/${PKGVERSION}/Qt3DAnimation/private/abstractevaluateclipanimatorjob_p.h 14qt6/include/Qt3DAnimation/${PKGVERSION}/Qt3DAnimation/private/abstractevaluateclipanimatorjob_p.h
@@ -128,27 +128,27 @@ qt6/include/Qt3DAnimation/qmorphinganima @@ -128,27 +128,27 @@ qt6/include/Qt3DAnimation/qmorphinganima
128qt6/include/Qt3DAnimation/qmorphtarget.h 128qt6/include/Qt3DAnimation/qmorphtarget.h
129qt6/include/Qt3DAnimation/qskeletonmapping.h 129qt6/include/Qt3DAnimation/qskeletonmapping.h
130qt6/include/Qt3DAnimation/qt3danimation_global.h 130qt6/include/Qt3DAnimation/qt3danimation_global.h
131qt6/include/Qt3DAnimation/qt3danimationversion.h 131qt6/include/Qt3DAnimation/qt3danimationversion.h
132qt6/include/Qt3DAnimation/qvertexblendanimation.h 132qt6/include/Qt3DAnimation/qvertexblendanimation.h
133qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/aligned_malloc_p.h 133qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/aligned_malloc_p.h
134qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/aspectcommanddebugger_p.h 134qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/aspectcommanddebugger_p.h
135qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/bufferutils_p.h 135qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/bufferutils_p.h
136qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/buffervisitor_p.h 136qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/buffervisitor_p.h
137qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/calcboundingvolumejob_p.h 137qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/calcboundingvolumejob_p.h
138qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/corelogging_p.h 138qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/corelogging_p.h
139qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/coresettings_p.h 139qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/coresettings_p.h
140qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/job_common_p.h 140qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/job_common_p.h
141${PLIST.avx}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_avx2_p.h 141${PLIST.simd}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_avx2_p.h
142qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_p.h 142qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_p.h
143${PLIST.simd}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_sse_p.h 143${PLIST.simd}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_sse_p.h
144qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/nullservices_p.h 144qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/nullservices_p.h
145qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/propertychangehandler_p.h 145qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/propertychangehandler_p.h
146qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractaspect_p.h 146qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractaspect_p.h
147qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractaspectjobmanager_p.h 147qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractaspectjobmanager_p.h
148qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractframeadvanceservice_p.h 148qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractframeadvanceservice_p.h
149qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractframeadvanceservice_p_p.h 149qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractframeadvanceservice_p_p.h
150qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractfrontendnodemanager_p.h 150qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractfrontendnodemanager_p.h
151qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractnodefactory_p.h 151qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractnodefactory_p.h
152qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractserviceprovider_p.h 152qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractserviceprovider_p.h
153qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractskeleton_p.h 153qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractskeleton_p.h
154qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qarmature_p.h 154qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qarmature_p.h
cvs diff -r1.2 -r1.3 pkgsrc/graphics/qt6-qt3d/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/qt6-qt3d/options.mk 2023/09/29 21:12:14 1.2
+++ pkgsrc/graphics/qt6-qt3d/options.mk 2023/11/03 19:24:14 1.3
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: options.mk,v 1.2 2023/09/29 21:12:14 adam Exp $ 1# $NetBSD: options.mk,v 1.3 2023/11/03 19:24:14 nros Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qt6-qt3d 3PKG_OPTIONS_VAR= PKG_OPTIONS.qt6-qt3d
4PKG_SUPPORTED_OPTIONS+= avx 4PKG_SUPPORTED_OPTIONS+= avx
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8## 8##
9## Enable use of Advanced Vector Extensions (AVX) 2 9## Enable use of Advanced Vector Extensions (AVX) 2
10## [Requires a Haswell processor (or higher)] 10## [Requires a Haswell processor (or higher)]
11## 11##
12.if !empty(PKG_OPTIONS:Mavx) 12.if !empty(PKG_OPTIONS:Mavx)
13CONFIGURE_ARGS+= -qt3d-simd avx2 13CONFIGURE_ARGS+= -qt3d-simd avx2
14PLIST.avx= yes 
15.else 14.else
16CONFIGURE_ARGS+= -qt3d-simd sse2 15CONFIGURE_ARGS+= -qt3d-simd sse2
17.endif 16.endif