Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtquick3d for
openSUSE:Factory checked in at 2022-01-03 10:49:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtquick3d (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtquick3d.new.1896 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtquick3d"
Mon Jan 3 10:49:18 2022 rev:7 rq:943310 version:5.15.2+kde19
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtquick3d/libqt5-qtquick3d.changes
2021-06-26 21:25:28.779344618 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtquick3d.new.1896/libqt5-qtquick3d.changes
2022-01-03 10:49:43.547587486 +0100
@@ -1,0 +2,6 @@
+Wed Dec 15 08:18:30 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Add patch from Archlinux to build with assimp 5.1:
+ * qt5-quick3d-assimp-5.1.patch
+
+-------------------------------------------------------------------
New:
----
qt5-quick3d-assimp-5.1.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtquick3d.spec ++++++
--- /var/tmp/diff_new_pack.r8J7kK/_old 2022-01-03 10:49:44.787587961 +0100
+++ /var/tmp/diff_new_pack.r8J7kK/_new 2022-01-03 10:49:44.791587962 +0100
@@ -37,6 +37,8 @@
Group: Development/Libraries/X11
URL: https://www.qt.io
Source: %{tar_version}.tar.xz
+# PATCH-FIX-UPSTREAM
+Patch0: qt5-quick3d-assimp-5.1.patch
# PATCH-FIX-OPENSUSE
Patch1: 0001-Revert-Bump-version.patch
BuildRequires: fdupes
++++++ qt5-quick3d-assimp-5.1.patch ++++++
Fix build with assimp 5.1
Origin: Arch linux
(https://github.com/archlinux/svntogit-packages/tree/packages/qt5-quick3d/trunk)
diff --git a/src/plugins/assetimporters/assimp/assimpimporter.cpp
b/src/plugins/assetimporters/assimp/assimpimporter.cpp
index f3660fdd..0f5fc901 100644
--- a/src/plugins/assetimporters/assimp/assimpimporter.cpp
+++ b/src/plugins/assetimporters/assimp/assimpimporter.cpp
@@ -1082,9 +1082,7 @@ void AssimpImporter::generateMaterial(aiMaterial
*material, QTextStream &output,
}
// SpecularGlossiness Properties
- bool hasSpecularGlossiness;
- result = material->Get(AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS,
hasSpecularGlossiness);
- if (result == aiReturn_SUCCESS && hasSpecularGlossiness) {
+ {
// diffuseFactor (color) // not used (yet), but ends up being
diffuseColor
// {
