Hello community,
here is the log from the commit of package libqt5-qtquick3d for
openSUSE:Factory checked in at 2020-09-30 19:55:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtquick3d (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtquick3d.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtquick3d"
Wed Sep 30 19:55:00 2020 rev:4 rq:838732 version:5.15.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtquick3d/libqt5-qtquick3d.changes
2020-09-15 16:24:06.798356854 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtquick3d.new.4249/libqt5-qtquick3d.changes
2020-09-30 19:55:07.408823977 +0200
@@ -1,0 +2,7 @@
+Tue Sep 29 21:36:09 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Use the system assimp package for openSUSE Tumbleweed.
+- Add patch suggested by upstream to fix build:
+ * 0001-Fix-build-with-the-system-assimp.patch
+
+-------------------------------------------------------------------
New:
----
0001-Fix-build-with-the-system-assimp.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtquick3d.spec ++++++
--- /var/tmp/diff_new_pack.KSAQmu/_old 2020-09-30 19:55:08.580825025 +0200
+++ /var/tmp/diff_new_pack.KSAQmu/_new 2020-09-30 19:55:08.584825029 +0200
@@ -16,7 +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 base_name libqt5
%define real_version 5.15.1
@@ -30,6 +36,8 @@
Group: Development/Libraries/X11
URL: https://www.qt.io
Source:
https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz
+# PATCH-FIX-UPSTREAM https://bugreports.qt.io/browse/QTBUG-84037
+Patch0: 0001-Fix-build-with-the-system-assimp.patch
BuildRequires: fdupes
%if %{with system_assimp}
BuildRequires: pkgconfig(assimp) >= 5.0.0
@@ -123,12 +131,12 @@
Examples for the Qt Quick 3D module.
%prep
-%autosetup -n %{tar_version}
+%autosetup -p1 -n %{tar_version}
%build
%qmake5 -- \
%if %{with system_assimp}
- -system-assimp \
+ -system-quick3d-assimp
%endif
%make_jobs
++++++ 0001-Fix-build-with-the-system-assimp.patch ++++++
Subject: [PATCH] Fix build with the system assimp.
Upstream report: https://bugreports.qt.io/browse/QTBUG-84037
---
src/plugins/assetimporters/assimp/assimp.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/assetimporters/assimp/assimp.pro
b/src/plugins/assetimporters/assimp/assimp.pro
index ca5c499..174a075 100644
--- a/src/plugins/assetimporters/assimp/assimp.pro
+++ b/src/plugins/assetimporters/assimp/assimp.pro
@@ -10,7 +10,7 @@ QT_FOR_CONFIG += assetimporters-private
include($$OUT_PWD/../qtassetimporters-config.pri)
qtConfig(system-assimp):!if(cross_compile:host_build) {
- QMAKE_USE_PRIVATE += assimp
+ QMAKE_USE_PRIVATE += quick3d-assimp
} else {
include(../../../3rdparty/assimp/assimp.pri)
}
--
2.28.0
