CVS commit: pkgsrc/graphics/qt6-qt3d

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Fri Sep 22 08:49:44 UTC 2023

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

Log Message:
graphics/qt6-qt3d: fix broken build.

Make AVX2 support on x86_64 optional (disabled by default), to prevent
PLIST fialures on older models.
Turn on SIMD (SSE2) support on i386 too, still to avoid PLIST issues.
This will likely break PLIST on CPUs before Pentium 4, but the use case
of qt6-qt3d on 486 -> Pentium III seems limited.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/qt6-qt3d/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/qt6-qt3d/PLIST
cvs rdiff -u -r0 -r1.1 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.7 pkgsrc/graphics/qt6-qt3d/Makefile:1.8
--- pkgsrc/graphics/qt6-qt3d/Makefile:1.7       Mon Aug  7 05:19:27 2023
+++ pkgsrc/graphics/qt6-qt3d/Makefile   Fri Sep 22 08:49:44 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/08/07 05:19:27 adam Exp $
+# $NetBSD: Makefile,v 1.8 2023/09/22 08:49:44 vins Exp $
 
 DISTNAME=      qt3d-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qt3d-${QTVERSION}
@@ -9,6 +9,7 @@ LICENSE=        gnu-lgpl-v3 OR gnu-gpl-v2 OR gn
 CONFIGURE_ARGS+=       -system-qt3d-assimp
 CONFIGURE_ARGS+=       -no-fbxsdk
 
+.include "options.mk"
 .include "../../x11/qt6-qtbase/Makefile.common"
 
 PKGCONFIG_OVERRIDE+=   lib/pkgconfig/Qt63DAnimation.pc
@@ -24,14 +25,17 @@ PKGCONFIG_OVERRIDE+=        lib/pkgconfig/Qt63D
 PKGCONFIG_OVERRIDE+=   lib/pkgconfig/Qt63DQuickScene2D.pc
 PKGCONFIG_OVERRIDE+=   lib/pkgconfig/Qt63DRender.pc
 
-PLIST_VARS+=   x86_64
+PLIST_VARS+=   simd
 
-.if ${MACHINE_ARCH} == "x86_64"
-PLIST.x86_64=  yes
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
+PLIST.simd=            yes
+.else
+CONFIGURE_ARGS+=       -qt3d-simd no
 .endif
 
 .include "../../graphics/qt6-qtshadertools/buildlink3.mk"
 .include "../../lang/qt6-qtdeclarative/buildlink3.mk"
 .include "../../multimedia/assimp/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/qt6-qt3d/PLIST
diff -u pkgsrc/graphics/qt6-qt3d/PLIST:1.4 pkgsrc/graphics/qt6-qt3d/PLIST:1.5
--- pkgsrc/graphics/qt6-qt3d/PLIST:1.4  Mon Aug  7 05:19:27 2023
+++ pkgsrc/graphics/qt6-qt3d/PLIST      Fri Sep 22 08:49:44 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2023/08/07 05:19:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2023/09/22 08:49:44 vins Exp $
 lib/pkgconfig/Qt63DAnimation.pc
 lib/pkgconfig/Qt63DCore.pc
 lib/pkgconfig/Qt63DExtras.pc
@@ -138,9 +138,9 @@ 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.x86_64}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_avx2_p.h
+${PLIST.avx}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_avx2_p.h
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_p.h
-${PLIST.x86_64}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_sse_p.h
+${PLIST.simd}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/matrix4x4_sse_p.h
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/nullservices_p.h
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/propertychangehandler_p.h
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/qabstractaspect_p.h
@@ -200,9 +200,9 @@ qt6/include/Qt3DCore/${PKGVERSION}/Qt3DC
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/sqt_p.h
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/task_p.h
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/vector3d_p.h
-${PLIST.x86_64}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/vector3d_sse_p.h
+${PLIST.simd}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/vector3d_sse_p.h
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/vector4d_p.h
-${PLIST.x86_64}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/vector4d_sse_p.h
+${PLIST.simd}qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/vector4d_sse_p.h
 qt6/include/Qt3DCore/${PKGVERSION}/Qt3DCore/private/vector_helper_p.h
 qt6/include/Qt3DCore/QAbstractAspect
 qt6/include/Qt3DCore/QAbstractFunctor

Added files:

Index: pkgsrc/graphics/qt6-qt3d/options.mk
diff -u /dev/null pkgsrc/graphics/qt6-qt3d/options.mk:1.1
--- /dev/null   Fri Sep 22 08:49:44 2023
+++ pkgsrc/graphics/qt6-qt3d/options.mk Fri Sep 22 08:49:44 2023
@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1 2023/09/22 08:49:44 vins Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.qt6-qt3d
+
+PLIST_VARS+=   avx
+
+.if ${MACHINE_ARCH} == "x86_64"
+PKG_SUPPORTED_OPTIONS+=        avx
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+##
+## Enable use of Advanced Vector Extensions (AVX) 2
+## [Requires a Haswell processor (or higher)]
+##
+.if !empty(PKG_OPTIONS:Mavx)
+CONFIGURE_ARGS+=       -qt3d-simd avx2
+PLIST.avx=             yes
+.else
+CONFIGURE_ARGS+=       -qt3d-simd sse2
+.endif