merge

dev/qt/qt6-3d/ympbuild

@@ -9,7 +9,7 @@ maintainer='brkt8khn'
 license=('FDL' 'GPL3' 'LGPL3' 'custom')
 source=("https://download.qt.io/archive/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz")
 depends=(qt6-base qt6-declarative qt6-shadertools)
-makedepends=(cmake assimp ninja)
+makedepends=(cmake  ninja)
 sha256sums=('803b82a8be8632b79f4fc717b236edba716100ab274a54349add439056896424')
 group=(dev.qt)
 uses=()

dev/qt/qt6-base/ympbuild

@@ -34,6 +34,7 @@ setup () {
 		-DINSTALL_MKSPECSDIR=lib64/qt6/mkspecs \
 		-DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \
 		-DQT_FEATURE_journald=OFF \
+    -DQT_FEATURE_opengles3=ON \
 		-DFEATURE_libproxy=ON \
         -DFEATURE_openssl_linked=ON \
         -DFEATURE_system_sqlite=ON \
@@ -53,5 +54,10 @@ build () {
 
 package () {
     ninja -C build install $jobs
+    install -d -m755 "$DESTDIR"/usr/include/qt6xcb-private/{gl_integrations,nativepainting}
+    cp -r src/plugins/platforms/xcb/*.h "$DESTDIR"/usr/include/qt6xcb-private/
+    cp -r src/plugins/platforms/xcb/gl_integrations/*.h "$DESTDIR"/usr/include/qt6xcb-private/gl_integrations/
+    cp -r src/plugins/platforms/xcb/nativepainting/*.h "$DESTDIR"/usr/include/qt6xcb-private/nativepainting/
+
 }
 

dev/qt/qt6-multimedia/ympbuild

@@ -19,11 +19,13 @@ cd "qtmultimedia-everywhere-src-"${version}
 export PATH=/usr/bin/qt6:$PATH
 
 
+export CXXFLAGS="$CXXFLAGS -g1 -flto=auto -ffat-lto-objects"
+
 setup() {
 	cmake -B build -G Ninja \
-			-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
-    		-DCMAKE_CXX_FLAGS="$CXXFLAGS -ffat-lto-objects"
-
+      -DCMAKE_MESSAGE_LOG_LEVEL=STATUS
+			-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+			-DCMAKE_INSTALL_PREFIX=/usr
 
 }
 

dev/qt/qt6-quick3d/ympbuild

@@ -21,12 +21,13 @@ export PATH=/usr/bin/qt6:$PATH
 setup() {
 	cmake -B build -G Ninja \
 			-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-			-DCMAKE_INSTALL_PREFIX=/usr 
+			-DCMAKE_INSTALL_PREFIX=/usr
 
 }
 
 build () {
-	cmake --build build
+	ninja -C build clean
+	ninja -C build
 }
 
 package () {

dev/qt/qt6-quicktimeline/ympbuild

@@ -22,9 +22,8 @@ setup() {
 export CFLAGS="$CFLAGS -g1 -flto=auto"
 export CXXFLAGS="$CXXFLAGS -g1 -flto=auto"
 
-	cmake -B build -G Ninja \
-			-DCMAKE_BUILD_TYPE=Release \
-			-DCMAKE_INSTALL_PREFIX=/usr 
+	cmake -B build  -G Ninja \
+			-DCMAKE_INSTALL_PREFIX=/usr
 
 }