Sync from SUSE:SLFO:Main libqt5-qtquick3d revision c84673a82c5b6e07c3ae9915da71ef92
This commit is contained in:
commit
e081626f11
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
18
_service
Normal file
18
_service
Normal file
@ -0,0 +1,18 @@
|
||||
<services>
|
||||
<service name="obs_scm" mode="disabled">
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="versionformat">5.15.11+kde@TAG_OFFSET@</param>
|
||||
<param name="url">https://invent.kde.org/qt/qt/qtquick3d.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">qtquick3d-everywhere-src</param>
|
||||
<param name="revision">kde/5.15</param>
|
||||
<param name="parent-tag">v5.15.11-lts-lgpl</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled"/>
|
||||
<service name="tar" mode="buildtime"/>
|
||||
<service name="recompress" mode="buildtime">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
</services>
|
||||
4
_servicedata
Normal file
4
_servicedata
Normal file
@ -0,0 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://invent.kde.org/qt/qt/qtquick3d.git</param>
|
||||
<param name="changesrevision">f3c3c2041f4800a7fc1904771f5c6af036167dc9</param></service></servicedata>
|
||||
176
libqt5-qtquick3d.changes
Normal file
176
libqt5-qtquick3d.changes
Normal file
@ -0,0 +1,176 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 6 06:41:49 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to version 5.15.11+kde1, rebased upstream:
|
||||
* Apply texture parameters for fbo textures
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 13 12:59:10 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to version 5.15.10+kde1, rebased upstream:
|
||||
* Drive-by doc fix
|
||||
* Clear layer resources when scene gets destroyed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 21 10:00:23 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to version 5.15.8+kde4, rebased upstream:
|
||||
* QQuick3DNode: Fix application order of local/parent rotation matrices
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 9 09:22:37 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to version 5.15.8+kde1, rebased upstream:
|
||||
* Clean dirty nodes when deleting resources
|
||||
* Assimp: Don't use multi-arg QString::arg(..)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 3 08:55:55 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to version 5.15.7+kde1, rebased upstream:
|
||||
* Doc: Add qmltype so Quaternion functions are collected by qdoc
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 26 11:44:29 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to version 5.15.6+kde1, rebased upstream:
|
||||
* PropertyEditor: Update designer specifics
|
||||
* Doc: Fix application order of Node.eulerRotation
|
||||
* QtQuic3D AssimpImporter: use quaternion by default
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 27 13:12:43 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to version 5.15.5+kde1, rebased upstream:
|
||||
* Handle 1bpp images in texture loading
|
||||
* Handle opacityMap with NoLighting
|
||||
* Add more error checking for shader cache import
|
||||
* Make IdComboBox compatible with both Qt6 and Qt5 creator
|
||||
* Fix writing compressed shader cache data
|
||||
* Introduce some civilization to QQuick3DShaderUtilsRenderPass::m_shaders
|
||||
* Fix bounds for imported objects
|
||||
* Check if sceneBounds is finite
|
||||
* Revert "Update commercial license headers"
|
||||
* Update designer light icons
|
||||
* Update commercial license headers
|
||||
* Remove shader cache export restriction
|
||||
* Allow import/export of shader cache data
|
||||
* Disable to use the system assimp when static-build
|
||||
- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 15 08:18:30 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Add patch from Archlinux to build with assimp 5.1:
|
||||
* qt5-quick3d-assimp-5.1.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 23 06:32:01 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Switch to KDE's maintenance branch
|
||||
- Update to version 5.15.2+kde19:
|
||||
* Fix build with system assimp
|
||||
* Only try and use valid asset import plugins
|
||||
* Designer support: Only show supported extension in Shader source field
|
||||
* Fix render mode switch crash
|
||||
* AssimpImporter : Fix the global scale value
|
||||
* Add version 7 to supported UIP version in UipParser
|
||||
* Fix crash on setting null camera to View3D
|
||||
* Avoid using the inverse() method in GLSL for SkyBox shader
|
||||
* Fix build with -no-gui configure flag
|
||||
* Fix dynamically changing a sourceItem's size
|
||||
* Fix transparency handling with QSGTexture
|
||||
* Backport a number of Texture.sourceItem related changes from Qt 6
|
||||
* Import enhanced sourceItem manual test from Qt 6
|
||||
* Remove unused and obsolete designer files
|
||||
* Change a default value of the assimpImporter
|
||||
* Allow non-integer scale properties for Texture
|
||||
* Designer: Add default shader files for CustomMaterial and Effect
|
||||
* Add changes file for Qt 5.15.2
|
||||
* Bump version
|
||||
- Add patch to reset version to 5.15.2:
|
||||
* 0001-Revert-Bump-version.patch
|
||||
- Drop patches, now upstream:
|
||||
* 0001-Fix-build-with-the-system-assimp.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 20 12:09:29 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.15.2:
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
http://code.qt.io/cgit/qt/qtquick3d.git/plain/dist/changes-5.15.2/?h=5.15.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 29 21:36:09 UTC 2020 - Christophe Giboudeaux <christophe@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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 10 07:57:18 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.15.1:
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
http://code.qt.io/cgit/qt/qtquick3d.git/plain/dist/changes-5.15.1/?h=5.15.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 26 10:14:30 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
|
||||
|
||||
- Update to version 5.15.0:
|
||||
* No changelog available
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 20 16:27:39 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
|
||||
|
||||
- Update to version 5.15.0-rc2:
|
||||
* No changelog available
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 6 11:37:45 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.15.0-rc:
|
||||
* New bugfix release
|
||||
* For the changes between 5.14.2 and 5.15.0 please see:
|
||||
http://code.qt.io/cgit/qt/qtquick3d.git/plain/dist/changes-5.15.0/?h=5.15.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 24 07:11:23 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.15.0-beta4:
|
||||
* New bugfix release
|
||||
* No changelog available
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 14 06:47:40 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.15.0-beta3:
|
||||
* New bugfix release
|
||||
* No changelog available
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 24 12:13:48 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.15.0-beta2:
|
||||
* New bugfix release
|
||||
* No changelog available
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 28 09:59:03 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.15.0-beta1:
|
||||
* New bugfix release
|
||||
* No changelog available
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 26 15:52:34 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Only needs Qt 5.12 to build
|
||||
- Fix private-headers-devel requires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 20 12:36:42 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Initial commit
|
||||
209
libqt5-qtquick3d.spec
Normal file
209
libqt5-qtquick3d.spec
Normal file
@ -0,0 +1,209 @@
|
||||
#
|
||||
# spec file for package libqt5-qtquick3d
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
# 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.11
|
||||
%define so_version 5.15.11
|
||||
%define tar_version qtquick3d-everywhere-src-%{version}
|
||||
Name: libqt5-qtquick3d
|
||||
Version: 5.15.11+kde1
|
||||
Release: 0
|
||||
Summary: Qt 5 Quick 3D Module
|
||||
License: GPL-3.0-or-later
|
||||
Group: Development/Libraries/X11
|
||||
URL: https://www.qt.io
|
||||
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
|
||||
BuildRequires: libqt5-qtdeclarative-private-headers-devel
|
||||
%if %{qt5_snapshot}
|
||||
#to create the forwarding headers
|
||||
BuildRequires: perl
|
||||
%endif
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: xz
|
||||
BuildRequires: pkgconfig(Qt5Qml) >= 5.12
|
||||
BuildRequires: pkgconfig(Qt5Quick)
|
||||
%requires_ge libQt5Widgets5
|
||||
%requires_ge libQtQuick5
|
||||
|
||||
%description
|
||||
Qt Quick 3D is a high level 3D API for Qt Quick.
|
||||
Qt Quick 3D enables anyone to introduce 3D content into their Qt Quick
|
||||
applications. Rather than requiring the end user to know advanced details of
|
||||
the graphicsrendering pipeline (building framegraphs and materials),
|
||||
it is now possible to simply build up a 3D scene using high level primitives.
|
||||
|
||||
%package -n libQt5Quick3D5
|
||||
Summary: Qt5 Quick3D Library
|
||||
License: GPL-3.0-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libQt5Quick3D5
|
||||
Qt Quick 3D is a high level 3D API for Qt Quick.
|
||||
Qt Quick 3D enables anyone to introduce 3D content into their Qt Quick
|
||||
applications. Rather than requiring the end user to know advanced details of
|
||||
the graphicsrendering pipeline (building framegraphs and materials),
|
||||
it is now possible to simply build up a 3D scene using high level primitives.
|
||||
|
||||
%package -n libQt5Quick3DAssetImport5
|
||||
Summary: Qt5 Quick3D Asset Importing Library
|
||||
License: GPL-3.0-or-later
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libQt5Quick3DAssetImport5
|
||||
Qt Quick 3D Library for importing of 3D assets.
|
||||
|
||||
%package tools
|
||||
Summary: Qt Development Kit
|
||||
License: GPL-3.0-or-later
|
||||
Group: Development/Libraries/X11
|
||||
|
||||
%description tools
|
||||
Tools for working with the Qt Quick 3D module.
|
||||
|
||||
%package imports
|
||||
Summary: Qt Development Kit
|
||||
License: GPL-3.0-or-later
|
||||
Group: Development/Libraries/X11
|
||||
Requires: %{name}-tools
|
||||
Requires: libQt5Quick3D5 = %{version}
|
||||
Requires: libQt5Quick3DAssetImport5 = %{version}
|
||||
|
||||
%description imports
|
||||
QML API for Qt Quick 3D.
|
||||
|
||||
%package devel
|
||||
Summary: Qt Development Kit
|
||||
License: GPL-3.0-or-later
|
||||
Group: Development/Libraries/X11
|
||||
Requires: %{name}-tools
|
||||
Requires: libQt5Quick3D5 = %{version}
|
||||
Requires: libQt5Quick3DAssetImport5 = %{version}
|
||||
|
||||
%description devel
|
||||
You need this package if you want to compile programs with Qt Quick 3D.
|
||||
|
||||
%package private-headers-devel
|
||||
Summary: Headers for the unstable API of the Qt5 Quick 3D module
|
||||
License: GPL-3.0-or-later
|
||||
Group: Development/Libraries/X11
|
||||
Requires: %{name}-devel = %{version}
|
||||
|
||||
%description private-headers-devel
|
||||
You need this package if you want to compile programs against the unstable API
|
||||
of the Qt5 Quick 3D module.
|
||||
|
||||
%package examples
|
||||
Summary: Qt5 Quick 3D examples
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/X11
|
||||
|
||||
%description examples
|
||||
Examples for the Qt Quick 3D module.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{tar_version}
|
||||
|
||||
%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
|
||||
|
||||
%install
|
||||
%qmake5_install
|
||||
|
||||
# kill .la files
|
||||
rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
|
||||
|
||||
%fdupes %{buildroot}
|
||||
|
||||
%post -n libQt5Quick3D5 -p /sbin/ldconfig
|
||||
%postun -n libQt5Quick3D5 -p /sbin/ldconfig
|
||||
%post -n libQt5Quick3DAssetImport5 -p /sbin/ldconfig
|
||||
%postun -n libQt5Quick3DAssetImport5 -p /sbin/ldconfig
|
||||
|
||||
%files -n libQt5Quick3D5
|
||||
%license LICENSE.*
|
||||
# Those go mostly together
|
||||
%{_libqt5_libdir}/libQt5Quick3D.so.*
|
||||
%{_libqt5_libdir}/libQt5Quick3DUtils.so.*
|
||||
%{_libqt5_libdir}/libQt5Quick3DRender.so.*
|
||||
%{_libqt5_libdir}/libQt5Quick3DRuntimeRender.so.*
|
||||
|
||||
%files -n libQt5Quick3DAssetImport5
|
||||
%license LICENSE.*
|
||||
# This needs plugins to be useful
|
||||
%{_libqt5_libdir}/libQt5Quick3DAssetImport.so.*
|
||||
%dir %{_libqt5_plugindir}/assetimporters/
|
||||
%{_libqt5_plugindir}/assetimporters/libassimp.so
|
||||
%{_libqt5_plugindir}/assetimporters/libuip.so
|
||||
|
||||
%files imports
|
||||
%license LICENSE.*
|
||||
%{_libqt5_archdatadir}/qml/QtQuick3D/
|
||||
|
||||
%files tools
|
||||
%license LICENSE.*
|
||||
%{_libqt5_bindir}/balsam
|
||||
%{_libqt5_bindir}/meshdebug
|
||||
|
||||
%files devel
|
||||
%license LICENSE.*
|
||||
%exclude %{_libqt5_includedir}/QtQuick3D*/%{so_version}
|
||||
%{_libqt5_includedir}/QtQuick3D*/
|
||||
%{_libqt5_libdir}/cmake/Qt5Quick3D*/
|
||||
%{_libqt5_libdir}/libQt5Quick3D*.prl
|
||||
%{_libqt5_libdir}/libQt5Quick3D*.so
|
||||
%{_libqt5_libdir}/pkgconfig/Qt5Quick3D*.pc
|
||||
%{_libqt5_archdatadir}/mkspecs/modules/qt_lib_quick3d*.pri
|
||||
|
||||
%files private-headers-devel
|
||||
%license LICENSE.*
|
||||
%{_libqt5_includedir}/QtQuick3D*/%{so_version}
|
||||
|
||||
%files examples
|
||||
%license LICENSE.*
|
||||
%{_libqt5_examplesdir}/
|
||||
|
||||
%changelog
|
||||
19
qt5-quick3d-assimp-5.1.patch
Normal file
19
qt5-quick3d-assimp-5.1.patch
Normal file
@ -0,0 +1,19 @@
|
||||
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
|
||||
// {
|
||||
BIN
qtquick3d-everywhere-src-5.15.11+kde1.obscpio
(Stored with Git LFS)
Normal file
BIN
qtquick3d-everywhere-src-5.15.11+kde1.obscpio
(Stored with Git LFS)
Normal file
Binary file not shown.
4
qtquick3d-everywhere-src.obsinfo
Normal file
4
qtquick3d-everywhere-src.obsinfo
Normal file
@ -0,0 +1,4 @@
|
||||
name: qtquick3d-everywhere-src
|
||||
version: 5.15.11+kde1
|
||||
mtime: 1696453130
|
||||
commit: f3c3c2041f4800a7fc1904771f5c6af036167dc9
|
||||
Loading…
Reference in New Issue
Block a user