diff --git a/_service b/_service index 45b3ccb..9dcea5c 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ enable - 5.15.12+kde@TAG_OFFSET@ + 5.15.14+kde@TAG_OFFSET@ https://invent.kde.org/qt/qt/qtquick3d.git git qtquick3d-everywhere-src kde/5.15 - v5.15.12-lts-lgpl + v5.15.14-lts-lgpl enable diff --git a/_servicedata b/_servicedata index b4c1b0e..e2921a3 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://invent.kde.org/qt/qt/qtquick3d.git - d4f5966ba085a1146a04f2ea8449bbf14833a593 \ No newline at end of file + ad229f0c135f74801fba2bcd22c78abc0e3cf1d2 \ No newline at end of file diff --git a/libqt5-qtquick3d.changes b/libqt5-qtquick3d.changes index 816e4d7..d4b5d09 100644 --- a/libqt5-qtquick3d.changes +++ b/libqt5-qtquick3d.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Jul 22 12:07:32 UTC 2024 - Christophe Marin + +- Use system assimp unconditionally (boo#1228199) + +------------------------------------------------------------------- +Wed May 29 06:47:24 UTC 2024 - Fabian Vogt + +- Update to version 5.15.14+kde1, rebased upstream: + * Fix crash when a custom material / effect shader variable changes + * Skip processing unknown uniforms + * Fix progressive anti-aliasing for PrincipledMaterial + * Bump version to 5.15.14 + +------------------------------------------------------------------- +Tue Mar 19 09:58:31 UTC 2024 - Fabian Vogt + +- Update to version 5.15.13+kde1, rebased upstream: + * Bump version to 5.15.13 + ------------------------------------------------------------------- Fri Dec 29 13:30:17 UTC 2023 - Fabian Vogt diff --git a/libqt5-qtquick3d.spec b/libqt5-qtquick3d.spec index 1c056d8..a277215 100644 --- a/libqt5-qtquick3d.spec +++ b/libqt5-qtquick3d.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtquick3d # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,21 +16,13 @@ # -# Available on Tumbleweed for all archs -# TODO revisit the condition for Leap > 15.2 / jump -%if 0%{?suse_version} > 1500 -%bcond_without system_assimp -%else -%bcond_with system_assimp -%endif - %define qt5_snapshot 1 %define base_name libqt5 -%define real_version 5.15.12 -%define so_version 5.15.12 +%define real_version 5.15.14 +%define so_version 5.15.14 %define tar_version qtquick3d-everywhere-src-%{version} Name: libqt5-qtquick3d -Version: 5.15.12+kde1 +Version: 5.15.14+kde1 Release: 0 Summary: Qt 5 Quick 3D Module License: GPL-3.0-or-later @@ -40,11 +32,7 @@ Source: %{tar_version}.tar.xz # PATCH-FIX-UPSTREAM Patch0: qt5-quick3d-assimp-5.1.patch BuildRequires: fdupes -%if %{with system_assimp} BuildRequires: pkgconfig(assimp) >= 5.0.0 -%else -BuildRequires: zlib-devel -%endif BuildRequires: libQt5Core-private-headers-devel >= 5.12 BuildRequires: libQt5Gui-private-headers-devel BuildRequires: libQt5OpenGLExtensions-devel-static @@ -138,15 +126,15 @@ Examples for the Qt Quick 3D module. %prep %autosetup -p1 -n %{tar_version} +rm -r src/3rdparty/assimp/{src,unzip} + %build %if %{qt5_snapshot} #force the configure script to generate the forwarding headers (it checks whether .git directory exists) mkdir .git %endif %qmake5 -- \ - %if %{with system_assimp} -system-quick3d-assimp - %endif %make_jobs diff --git a/qtquick3d-everywhere-src-5.15.12+kde1.obscpio b/qtquick3d-everywhere-src-5.15.12+kde1.obscpio deleted file mode 100644 index 33f2eb6..0000000 --- a/qtquick3d-everywhere-src-5.15.12+kde1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab05f2a4deac8f80ea0ef1b42fb9997b9146516d4807bc71747d6173b7f7fe4b -size 158885902 diff --git a/qtquick3d-everywhere-src-5.15.14+kde1.obscpio b/qtquick3d-everywhere-src-5.15.14+kde1.obscpio new file mode 100644 index 0000000..9f2c1f7 --- /dev/null +++ b/qtquick3d-everywhere-src-5.15.14+kde1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73714ad18051d72ccf9f83f5c1911af8744a20aad4c307a3cfb45650cf97c983 +size 158886414 diff --git a/qtquick3d-everywhere-src.obsinfo b/qtquick3d-everywhere-src.obsinfo index 5995f78..5310a1f 100644 --- a/qtquick3d-everywhere-src.obsinfo +++ b/qtquick3d-everywhere-src.obsinfo @@ -1,4 +1,4 @@ name: qtquick3d-everywhere-src -version: 5.15.12+kde1 -mtime: 1703803148 -commit: d4f5966ba085a1146a04f2ea8449bbf14833a593 +version: 5.15.14+kde1 +mtime: 1716846035 +commit: ad229f0c135f74801fba2bcd22c78abc0e3cf1d2