Compare commits

1 Commits
main ... 1.1

4 changed files with 53 additions and 158 deletions

View File

@@ -1,49 +1,3 @@
-------------------------------------------------------------------
Tue Jun 3 07:49:30 UTC 2025 - Christophe Marin <christophe@krop.fr>
- Update to 6.9.1:
* https://www.qt.io/blog/qt-6.9.1-released
-------------------------------------------------------------------
Wed Apr 2 11:03:40 UTC 2025 - Christophe Marin <christophe@krop.fr>
- Update to 6.9.0:
* https://www.qt.io/blog/qt-6.9-released
-------------------------------------------------------------------
Sun Mar 9 22:48:34 UTC 2025 - Christophe Marin <christophe@krop.fr>
- Ignore private QML imports
-------------------------------------------------------------------
Fri Jan 31 10:22:58 UTC 2025 - Christophe Marin <christophe@krop.fr>
- Update to 6.8.2
https://www.qt.io/blog/qt-6.8.2-released
-------------------------------------------------------------------
Wed Jan 22 17:28:45 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
- Fix license
-------------------------------------------------------------------
Mon Dec 2 13:02:09 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 6.8.1:
* https://www.qt.io/blog/qt-6.8.1-released
-------------------------------------------------------------------
Tue Oct 8 09:29:49 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 6.8.0:
* https://www.qt.io/blog/qt-6.8-released
-------------------------------------------------------------------
Sat Sep 28 08:23:04 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 6.7.3
* https://www.qt.io/blog/qt-6.7.3-released
-------------------------------------------------------------------
Wed Jun 19 07:25:54 UTC 2024 - Christophe Marin <christophe@krop.fr>

View File

@@ -1,7 +1,7 @@
#
# spec file for package qt6-quick3d
#
# Copyright (c) 2025 SUSE LLC
# 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
@@ -16,8 +16,8 @@
#
%define real_version 6.9.1
%define short_version 6.9
%define real_version 6.7.2
%define short_version 6.7
%define tar_name qtquick3d-everywhere-src
%define tar_suffix %{nil}
#
@@ -26,35 +26,32 @@
%define pkg_suffix -docs
%endif
#
# Private QML imports
%global __requires_exclude qt6qmlimport\\((Quick3DAssets|VirtualAssistant\\.Constants|robotassistant|.*Example|xr_shared).*
#
Name: qt6-quick3d%{?pkg_suffix}
Version: 6.9.1
Version: 6.7.2
Release: 0
Summary: API for creating 3D content and 3D user interfaces based on Qt Quick
License: GPL-3.0-only
License: GPL-3.0-or-later
URL: https://www.qt.io
Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
Source99: qt6-quick3d-rpmlintrc
BuildRequires: fdupes
BuildRequires: pkgconfig
BuildRequires: qt6-core-private-devel
BuildRequires: qt6-gui-private-devel
BuildRequires: qt6-qml-private-devel
BuildRequires: qt6-quick-private-devel
BuildRequires: qt6-quicktimeline-private-devel
BuildRequires: qt6-shadertools-private-devel
BuildRequires: cmake(Qt6Concurrent) = %{real_version}
BuildRequires: cmake(Qt6Core) = %{real_version}
BuildRequires: cmake(Qt6CorePrivate) = %{real_version}
BuildRequires: cmake(Qt6Gui) = %{real_version}
BuildRequires: cmake(Qt6GuiPrivate) = %{real_version}
BuildRequires: cmake(Qt6Network) = %{real_version}
BuildRequires: cmake(Qt6Qml) = %{real_version}
BuildRequires: cmake(Qt6QmlPrivate) = %{real_version}
BuildRequires: cmake(Qt6Quick) = %{real_version}
BuildRequires: cmake(Qt6QuickPrivate) = %{real_version}
# Only needed if QT_FEATURE_qml_debug is enabled
# BuildRequires: cmake(Qt6PacketProtocolPrivate)
BuildRequires: cmake(Qt6QuickTimeline) = %{real_version}
BuildRequires: cmake(Qt6ShaderTools) = %{real_version}
BuildRequires: cmake(Qt6ShaderToolsPrivate) = %{real_version}
BuildRequires: cmake(Qt6Widgets) = %{real_version}
BuildRequires: cmake(assimp) >= 5.1.0
BuildRequires: pkgconfig(zlib)
@@ -90,12 +87,12 @@ Development files for the Qt 6 Quick3D library.
%package private-devel
Summary: Non-ABI stable API for the Qt 6 Quick3D library
Requires: cmake(Qt6CorePrivate) = %{real_version}
Requires: cmake(Qt6GuiPrivate) = %{real_version}
Requires: cmake(Qt6QmlPrivate) = %{real_version}
Requires: qt6-quick3druntimerender-private-devel = %{version}
Requires: cmake(Qt6Quick3D) = %{real_version}
Requires: cmake(Qt6Quick3DRuntimeRenderPrivate) = %{real_version}
Requires: cmake(Qt6QuickPrivate) = %{real_version}
%requires_eq qt6-core-private-devel
%requires_eq qt6-gui-private-devel
%requires_eq qt6-qml-private-devel
%requires_eq qt6-quick-private-devel
%description private-devel
This package provides private headers of libQt6Quick3D that do not have any
@@ -125,9 +122,9 @@ Development files for the Qt 6 Quick3DAssetImport library.
%package -n qt6-quick3dassetimport-private-devel
Summary: Non-ABI stable API for the Qt 6 Quick3DAssetImport library
Requires: cmake(Qt6CorePrivate) = %{real_version}
Requires: qt6-quick3dutils-private-devel = %{version}
Requires: cmake(Qt6Quick3DAssetImport) = %{real_version}
Requires: cmake(Qt6Quick3DUtilsPrivate) = %{real_version}
%requires_eq qt6-core-private-devel
%description -n qt6-quick3dassetimport-private-devel
This package provides private headers of libQt6Quick3DAssetImport that do not
@@ -142,14 +139,14 @@ The Qt 6 Quick3DAssetUtils library.
%package -n qt6-quick3dassetutils-devel
Summary: Qt6 Quick3DAssetUtils library - Development files
Requires: libQt6Quick3DAssetUtils6 = %{version}
Requires: qt6-quick3d-private-devel = %{version}
Requires: qt6-quick3dassetimport-private-devel = %{version}
Requires: qt6-quick3druntimerender-private-devel = %{version}
Requires: cmake(Qt6Gui) = %{real_version}
Requires: cmake(Qt6Quick) = %{real_version}
Requires: cmake(Qt6Quick3D) = %{real_version}
Requires: cmake(Qt6Quick3DAssetImport) = %{real_version}
Requires: cmake(Qt6Quick3DAssetImportPrivate) = %{real_version}
Requires: cmake(Qt6Quick3DPrivate) = %{real_version}
Requires: cmake(Qt6Quick3DRuntimeRender) = %{real_version}
Requires: cmake(Qt6Quick3DRuntimeRenderPrivate) = %{real_version}
Requires: cmake(Qt6QuickTimeline) = %{real_version}
%description -n qt6-quick3dassetutils-devel
@@ -157,13 +154,13 @@ Development files for the Qt 6 Quick3DAssetUtils library.
%package -n qt6-quick3dassetutils-private-devel
Summary: Non-ABI stable API for the Qt 6 Quick3DAssetUtils library
Requires: cmake(Qt6CorePrivate) = %{real_version}
Requires: cmake(Qt6GuiPrivate) = %{real_version}
Requires: cmake(Qt6Quick3DAssetImportPrivate) = %{real_version}
Requires: qt6-quick3d-private-devel = %{version}
Requires: qt6-quick3dassetimport-private-devel = %{version}
Requires: qt6-quick3druntimerender-private-devel = %{version}
Requires: cmake(Qt6Quick3DAssetUtils) = %{real_version}
Requires: cmake(Qt6Quick3DPrivate) = %{real_version}
Requires: cmake(Qt6Quick3DRuntimeRenderPrivate) = %{real_version}
Requires: cmake(Qt6QuickTimelinePrivate) = %{real_version}
%requires_eq qt6-core-private-devel
%requires_eq qt6-gui-private-devel
%requires_eq qt6-quicktimeline-private-devel
%description -n qt6-quick3dassetutils-private-devel
This package provides private headers of libQt6Quick3DAssetUtils that do not
@@ -178,9 +175,9 @@ The Qt 6 Quick3DEffects library.
%package -n qt6-quick3deffects-devel
Summary: Qt6 Quick3DEffects library - Development files
Requires: libQt6Quick3DEffects6 = %{version}
Requires: qt6-quick3d-private-devel = %{version}
Requires: cmake(Qt6Qml) = %{real_version}
Requires: cmake(Qt6Quick) = %{real_version}
Requires: cmake(Qt6Quick3DPrivate) = %{real_version}
%description -n qt6-quick3deffects-devel
Development files for the Qt 6 Quick3DEffects library.
@@ -194,9 +191,9 @@ The Qt 6 Quick3DHelpers library.
%package -n qt6-quick3dhelpers-devel
Summary: Qt6 Quick3DHelpers library - Development files
Requires: libQt6Quick3DHelpers6 = %{version}
Requires: qt6-quick3d-private-devel = %{version}
Requires: cmake(Qt6Qml) = %{real_version}
Requires: cmake(Qt6Quick) = %{real_version}
Requires: cmake(Qt6Quick3DPrivate) = %{real_version}
%description -n qt6-quick3dhelpers-devel
Development files for the Qt 6 Quick3DHelpers library.
@@ -218,9 +215,9 @@ The Qt 6 Quick3DHelpersImpl library.
%package -n qt6-quick3dhelpersimpl-devel
Summary: Qt6 Quick3DHelpersImpl library - Development files
Requires: libQt6Quick3DHelpersImpl6 = %{version}
Requires: qt6-quick3d-private-devel = %{version}
Requires: cmake(Qt6Qml) = %{real_version}
Requires: cmake(Qt6Quick) = %{real_version}
Requires: cmake(Qt6Quick3DPrivate) = %{real_version}
%description -n qt6-quick3dhelpersimpl-devel
Development files for the Qt 6 Quick3DHelpersImpl library.
@@ -251,9 +248,9 @@ Development files for the Qt 6 Quick3DIblBaker library.
%package -n qt6-quick3diblbaker-private-devel
Summary: Non-ABI stable API for the Qt 6 Quick3DIblBaker library
Requires: cmake(Qt6GuiPrivate) = %{real_version}
Requires: qt6-quick3druntimerender-private-devel = %{version}
Requires: cmake(Qt6Quick3DIblBaker) = %{real_version}
Requires: cmake(Qt6Quick3DRuntimeRenderPrivate) = %{real_version}
%requires_eq qt6-gui-private-devel
%description -n qt6-quick3diblbaker-private-devel
This package provides private headers of libQt6Quick3DIblBaker that do not
@@ -276,14 +273,14 @@ Development files for the Qt 6 Quick3DParticles library.
%package -n qt6-quick3dparticles-private-devel
Summary: Non-ABI stable API for the Qt 6 Quick3DParticles library
Requires: cmake(Qt6CorePrivate) = %{real_version}
Requires: cmake(Qt6GuiPrivate) = %{real_version}
Requires: cmake(Qt6QmlPrivate) = %{real_version}
Requires: cmake(Qt6Quick3DAssetImportPrivate) = %{real_version}
Requires: qt6-quick3d-private-devel = %{version}
Requires: qt6-quick3dassetimport-private-devel = %{version}
Requires: qt6-quick3druntimerender-private-devel = %{version}
Requires: cmake(Qt6Quick3DParticles) = %{real_version}
Requires: cmake(Qt6Quick3DPrivate) = %{real_version}
Requires: cmake(Qt6Quick3DRuntimeRenderPrivate) = %{real_version}
Requires: cmake(Qt6QuickPrivate) = %{real_version}
%requires_eq qt6-core-private-devel
%requires_eq qt6-gui-private-devel
%requires_eq qt6-qml-private-devel
%requires_eq qt6-quick-private-devel
%description -n qt6-quick3dparticles-private-devel
This package provides private headers of libQt6Quick3DParticles that do not
@@ -328,10 +325,10 @@ Development files for the Qt 6 Quick3DRuntimeRender library.
%package -n qt6-quick3druntimerender-private-devel
Summary: Non-ABI stable API for the Qt 6 Quick3DRuntimeRender library
Requires: qt6-quick3dutils-private-devel = %{version}
Requires: cmake(Qt6Quick3DRuntimeRender) = %{real_version}
Requires: cmake(Qt6Quick3DUtilsPrivate) = %{real_version}
Requires: cmake(Qt6QuickPrivate) = %{real_version}
Requires: cmake(Qt6ShaderToolsPrivate) = %{real_version}
%requires_eq qt6-quick-private-devel
%requires_eq qt6-shadertools-private-devel
%description -n qt6-quick3druntimerender-private-devel
This package provides private headers of libQt6Quick3DRuntimeRender that do not
@@ -354,29 +351,15 @@ Development files for the Qt 6 Quick3DUtils library.
%package -n qt6-quick3dutils-private-devel
Summary: Non-ABI stable API for the Qt 6 Quick3DUtils library
Requires: cmake(Qt6CorePrivate) = %{real_version}
Requires: cmake(Qt6GuiPrivate) = %{real_version}
Requires: cmake(Qt6Quick3DUtils) = %{real_version}
Requires: cmake(Qt6QuickPrivate) = %{real_version}
%requires_eq qt6-core-private-devel
%requires_eq qt6-gui-private-devel
%requires_eq qt6-quick-private-devel
%description -n qt6-quick3dutils-private-devel
This package provides private headers of libQt6Quick3DUtils that do not have any
ABI or API guarantees.
%package -n libQt6Quick3DXr6
Summary: Qt 6 Quick3DXr library
%description -n libQt6Quick3DXr6
Adds OpenXR support for applications using QtQuick3D.
%package -n qt6-quick3dxr-private-devel
Summary: Qt 6 Quick3DXr library - Development files
Requires: libQt6Quick3DXr6 = %{version}
%description -n qt6-quick3dxr-private-devel
Development files for the Qt 6 Quick3DXr library.
This library does not have any ABI or API guarantees.
### Private only library ###
@@ -398,11 +381,11 @@ This library does not have any ABI or API guarantees.
### Static libraries ###
# Embree only supports x86_64 %%x86_64 and arm64
%ifarch x86_64 %{x86_64} aarch64
# Embree only supports x86_64 %x86_64 and arm64
%ifarch x86_64 %x86_64 aarch64
%package -n qt6-bundledembree-devel-static
Summary: Qt6 BundledEmbree static library
Requires: cmake(Qt6CorePrivate) = %{real_version}
%requires_eq qt6-core-private-devel
%description -n qt6-bundledembree-devel-static
The Qt6 BundledEmbree static library.
@@ -417,17 +400,10 @@ This library does not have any ABI or API guarantees.
%autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix}
%build
# Package provides static libraries, -ffat-lto-objects is not enough for libQt6BundledEmbree.a
%global _lto_cflags %{nil}
%if %{qt6_docs_flavor}
# Work around https://bugreports.qt.io/browse/QTBUG-129807
%define extra_args -DFEATURE_quick3dxr_openxr:BOOL=FALSE -DFEATURE_system_openxr:BOOL=FALSE
%endif
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
%cmake_qt6 \
-DQT_GENERATE_SBOM:BOOL=FALSE \
-DFEATURE_system_assimp:BOOL=TRUE %{?extra_args}
-DFEATURE_system_assimp=ON
%{qt6_build}
@@ -445,13 +421,6 @@ rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin*.cmake
# There's no private api
rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_quick3deffects_private.pri
rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_quick3dparticleeffects_private.pri
rm -r %{buildroot}%{_qt6_cmakedir}/Qt6Quick3DEffectsPrivate
rm -r %{buildroot}%{_qt6_cmakedir}/Qt6Quick3DParticleEffectsPrivate
# Probably unneeded
rm %{buildroot}%{_qt6_cmakedir}/Qt6/FindWrapBundledOpenXRConfigExtra.cmake
rm %{buildroot}%{_qt6_libdir}/libQt6BundledOpenXR.a
rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
%fdupes %{buildroot}%{_qt6_qmldir}/QtQuick3D
@@ -467,7 +436,6 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
%ldconfig_scriptlets -n libQt6Quick3DParticles6
%ldconfig_scriptlets -n libQt6Quick3DRuntimeRender6
%ldconfig_scriptlets -n libQt6Quick3DUtils6
%ldconfig_scriptlets -n libQt6Quick3DXr6
%files
# No better place to install these quick3d plugins
@@ -497,7 +465,6 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
%files devel
%{_qt6_cmakedir}/Qt6/FindWrapQuick3DAssimp.cmake
%{_qt6_cmakedir}/Qt6/FindWrapOpenXR.cmake
%{_qt6_cmakedir}/Qt6BuildInternals/StandaloneTests/QtQuick3DTestsConfig.cmake
%{_qt6_cmakedir}/Qt6Quick3D/
# Only required by Qt6Quick3DDependencies.cmake
@@ -512,7 +479,6 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
%exclude %{_qt6_includedir}/QtQuick3D/%{real_version}
%files private-devel
%{_qt6_cmakedir}/Qt6Quick3DPrivate/
%{_qt6_includedir}/QtQuick3D/%{real_version}/
%{_qt6_mkspecsdir}/modules/qt_lib_quick3d_private.pri
@@ -531,7 +497,6 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
%exclude %{_qt6_includedir}/QtQuick3DAssetImport/%{real_version}
%files -n qt6-quick3dassetimport-private-devel
%{_qt6_cmakedir}/Qt6Quick3DAssetImportPrivate/
%{_qt6_includedir}/QtQuick3DAssetImport/%{real_version}/
%{_qt6_mkspecsdir}/modules/qt_lib_quick3dassetimport_private.pri
@@ -550,7 +515,6 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
%exclude %{_qt6_includedir}/QtQuick3DAssetUtils/%{real_version}
%files -n qt6-quick3dassetutils-private-devel
%{_qt6_cmakedir}/Qt6Quick3DAssetUtilsPrivate/
%{_qt6_includedir}/QtQuick3DAssetUtils/%{real_version}/
%{_qt6_mkspecsdir}/modules/qt_lib_quick3dassetutils_private.pri
@@ -581,7 +545,6 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
%exclude %{_qt6_includedir}/QtQuick3DHelpers/%{real_version}
%files -n qt6-quick3dhelpers-private-devel
%{_qt6_cmakedir}/Qt6Quick3DHelpersPrivate/
%{_qt6_includedir}/QtQuick3DHelpers/%{real_version}/
%{_qt6_mkspecsdir}/modules/qt_lib_quick3dhelpers_private.pri
@@ -600,7 +563,6 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
%exclude %{_qt6_includedir}/QtQuick3DHelpersImpl/%{real_version}
%files -n qt6-quick3dhelpersimpl-private-devel
%{_qt6_cmakedir}/Qt6Quick3DHelpersImplPrivate/
%{_qt6_includedir}/QtQuick3DHelpersImpl/%{real_version}/
%{_qt6_mkspecsdir}/modules/qt_lib_quick3dhelpersimpl_private.pri
@@ -619,7 +581,6 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
%exclude %{_qt6_includedir}/QtQuick3DIblBaker/%{real_version}
%files -n qt6-quick3diblbaker-private-devel
%{_qt6_cmakedir}/Qt6Quick3DIblBakerPrivate/
%{_qt6_includedir}/QtQuick3DIblBaker/%{real_version}/
%{_qt6_mkspecsdir}/modules/qt_lib_quick3diblbaker_private.pri
@@ -638,7 +599,6 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
%exclude %{_qt6_includedir}/QtQuick3DParticles/%{real_version}
%files -n qt6-quick3dparticles-private-devel
%{_qt6_cmakedir}/Qt6Quick3DParticlesPrivate/
%{_qt6_includedir}/QtQuick3DParticles/%{real_version}/
%{_qt6_mkspecsdir}/modules/qt_lib_quick3dparticles_private.pri
@@ -669,7 +629,6 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
%exclude %{_qt6_includedir}/QtQuick3DRuntimeRender/%{real_version}
%files -n qt6-quick3druntimerender-private-devel
%{_qt6_cmakedir}/Qt6Quick3DRuntimeRenderPrivate/
%{_qt6_includedir}/QtQuick3DRuntimeRender/%{real_version}/
%{_qt6_mkspecsdir}/modules/qt_lib_quick3druntimerender_private.pri
@@ -688,27 +647,9 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
%exclude %{_qt6_includedir}/QtQuick3DUtils/%{real_version}
%files -n qt6-quick3dutils-private-devel
%{_qt6_cmakedir}/Qt6Quick3DUtilsPrivate/
%{_qt6_includedir}/QtQuick3DUtils/%{real_version}/
%{_qt6_mkspecsdir}/modules/qt_lib_quick3dutils_private.pri
%files -n libQt6Quick3DXr6
%{_qt6_libdir}/libQt6Quick3DXr.so.*
%files -n qt6-quick3dxr-private-devel
%{_qt6_cmakedir}/Qt6/FindWrapSystemOpenXR.cmake
%{_qt6_cmakedir}/Qt6Quick3DXr/
%{_qt6_cmakedir}/Qt6Quick3DXrPrivate/
%{_qt6_descriptionsdir}/Quick3DXr.json
%{_qt6_includedir}/QtQuick3DXr/
%{_qt6_libdir}/libQt6Quick3DXr.prl
%{_qt6_libdir}/libQt6Quick3DXr.so
%{_qt6_metatypesdir}/qt6quick3dxr_*_metatypes.json
%{_qt6_mkspecsdir}/modules/qt_ext_openxr_loader.pri
%{_qt6_mkspecsdir}/modules/qt_lib_quick3dxr.pri
%{_qt6_mkspecsdir}/modules/qt_lib_quick3dxr_private.pri
%{_qt6_pkgconfigdir}/Qt6Quick3DXr.pc
### Private only library ###
%files -n libQt6Quick3DGlslParser6
@@ -725,7 +666,7 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BundledOpenXR
### Static libraries ###
%ifarch x86_64 %{x86_64} aarch64
%ifarch x86_64 %x86_64 aarch64
%files -n qt6-bundledembree-devel-static
%{_qt6_cmakedir}/Qt6/FindWrapBundledEmbreeConfigExtra.cmake
%{_qt6_cmakedir}/Qt6BundledEmbree/

Binary file not shown.

Binary file not shown.