Update to 6.1.1

4 files changed, 16 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e21c1f9ffdc..986a0ec1639b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt6-quick3d
 	pkgdesc = Qt module and API for defining 3D content in Qt Quick (mingw-w64)
-	pkgver = 6.1.0
+	pkgver = 6.1.1
 	pkgrel = 1
 	url = https://www.qt.io
 	arch = any
@@ -12,7 +12,6 @@ pkgbase = mingw-w64-qt6-quick3d
 	makedepends = mingw-w64-cmake
 	makedepends = mingw-w64-vulkan-headers
 	makedepends = mingw-w64-vulkan-icd-loader
-	makedepends = mingw-w64-assimp
 	makedepends = mingw-w64-qt6-shadertools
 	makedepends = qt6-quick3d
 	makedepends = qt6-shadertools
@@ -22,8 +21,7 @@ pkgbase = mingw-w64-qt6-quick3d
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = https://download.qt.io/official_releases/qt/6.1/6.1.0/submodules/qtquick3d-everywhere-src-6.1.0.tar.xz
-	sha256sums = ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
+	source = https://download.qt.io/official_releases/qt/6.1/6.1.1/submodules/qtquick3d-everywhere-src-6.1.1.tar.xz
+	sha256sums = 94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c
 
 pkgname = mingw-w64-qt6-quick3d
-
diff --git a/PKGBUILD b/PKGBUILD
index fa79bb293f71..1af273130411 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.
 
 pkgname=mingw-w64-qt6-quick3d
-_qtver=6.1.0
+_qtver=6.1.1
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@@ -12,13 +12,13 @@ url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Qt module and API for defining 3D content in Qt Quick (mingw-w64)'
 depends=('mingw-w64-qt6-declarative')
-makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'mingw-w64-assimp'
+makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader'
              'mingw-w64-qt6-shadertools' 'qt6-quick3d' 'qt6-shadertools' 'ninja')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(mingw-w64-qt6)
 _pkgfqn="qtquick3d-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268')
+sha256sums=('94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
@@ -26,7 +26,8 @@ build() {
   for _arch in ${_architectures}; do
     export PKG_CONFIG=/usr/bin/$_arch-pkg-config
     $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \
-      -DFEATURE_pkg_config=ON
+      -DFEATURE_pkg_config=ON \
+      -DFEATURE_quick3d_assimp=OFF
     cmake --build build-$_arch
   done
 }
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index d596f748b9f9..4ed8cef40f7d 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt6-module', has_binaries => 1;
 \
-_qtver=6.1.0
+_qtver=6.1.1
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@@ -8,5 +8,10 @@ url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Qt module and API for defining 3D content in Qt Quick (mingw-w64)'
 depends=(<%== qt6deps qw(declarative) %>)
-makedepends=('mingw-w64-cmake<%== $static_suffix %>' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'mingw-w64-assimp'
+makedepends=('mingw-w64-cmake<%== $static_suffix %>' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader'
              <%== qt6deps qw(shadertools) %> 'qt6-quick3d' 'qt6-shadertools' 'ninja')
+% \
+% content_for additional_cmake_args => begin
+ \\
+      -DFEATURE_quick3d_assimp=OFF\
+% end
diff --git a/qtquick3d-sha256.txt b/qtquick3d-sha256.txt
index 773cec48d465..b510f48fab6f 100644
--- a/qtquick3d-sha256.txt
+++ b/qtquick3d-sha256.txt
@@ -1 +1 @@
-ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
+94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c