rpm/libqt5-qt3d
SHA256
1
0
Fork 0
forked from pool/libqt5-qt3d
Code Pull Requests Activity

Accepting request 734738 from home:Vogtinator:qt5.14

Browse Source 
Qt 5.14 Alpha

OBS-URL: https://build.opensuse.org/request/show/734738
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qt3d?expand=0&rev=2
This commit is contained in:
Fabian Vogt 2019-10-05 16:00:52 +00:00 committed by Git OBS Bridge
parent 878f58124b
commit e6f9f9db59
5 changed files with 69 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fix-return-nonvoid-function.patch Normal file
View File

@ -0,0 +1,19 @@
From: Fabian Vogt <fabian@ritter-vogt.de>
Subject: Fix no return in nonvoid function error
Optflags include -Werror=return-type, which does not like qt3d without this.
Index: qt3d-everywhere-src-5.14.0-alpha/src/render/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp
===================================================================
--- qt3d-everywhere-src-5.14.0-alpha.orig/src/render/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp
+++ qt3d-everywhere-src-5.14.0-alpha/src/render/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp
@@ -73,6 +73,9 @@ GLenum glAccessEnumForShaderImageAccess(
return GL_WRITE_ONLY;
case QShaderImage::ReadWrite:
return GL_READ_WRITE;
+ default:
+ Q_UNREACHABLE();
+ return GL_NONE;
}
}

11
libqt5-qt3d.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Sep 30 13:29:53 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.14.0-alpha:
* New feature release
* No changelog available
* For more details about Qt 5.14 please see:
https://wiki.qt.io/New_Features_in_Qt_5.14
- Add patch to fix build:
* fix-return-nonvoid-function.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 25 08:42:32 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr> Wed Sep 25 08:42:32 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>

71
libqt5-qt3d.spec
View File

@ -21,18 +21,20 @@
%define libname libQt53DCore5 %define libname libQt53DCore5
Name: libqt5-qt3d Name: libqt5-qt3d
Version: 5.13.1 Version: 5.14.0~alpha
Release: 0 Release: 0
Summary: Qt 5 3D Addon Summary: Qt 5 3D Addon
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Url: https://www.qt.io Url: https://www.qt.io
%define base_name libqt5 %define base_name libqt5
%define real_version 5.13.1 %define real_version 5.14.0-alpha
%define so_version 5.13.1 %define so_version 5.14.0
%define tar_version qt3d-everywhere-src-5.13.1 %define tar_version qt3d-everywhere-src-5.14.0-alpha
Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf Source1: baselibs.conf
# PATCH-FIX-OPENSUSE
Patch1: fix-return-nonvoid-function.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: libQt5Bootstrap-devel-static >= %{version} BuildRequires: libQt5Bootstrap-devel-static >= %{version}
BuildRequires: libQt5Concurrent-devel >= %{version} BuildRequires: libQt5Concurrent-devel >= %{version}
@ -47,7 +49,6 @@ BuildRequires: pkgconfig(zlib)
BuildRequires: perl BuildRequires: perl
%endif %endif
BuildRequires: xz BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
Qt is a set of libraries for developing applications. Qt is a set of libraries for developing applications.
@ -440,27 +441,27 @@ popd
%files -n %libname %files -n %libname
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DCore.so.* %{_libqt5_libdir}/libQt53DCore.so.*
%files -n libQt53DInput5 %files -n libQt53DInput5
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DInput.so.* %{_libqt5_libdir}/libQt53DInput.so.*
%files -n libQt53DQuick5 %files -n libQt53DQuick5
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DQuick.so.* %{_libqt5_libdir}/libQt53DQuick.so.*
%files -n libQt53DQuickRender5 %files -n libQt53DQuickRender5
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DQuickRender.so.* %{_libqt5_libdir}/libQt53DQuickRender.so.*
%files -n libQt53DRender5 %files -n libQt53DRender5
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DRender.so.* %{_libqt5_libdir}/libQt53DRender.so.*
%dir %{_libqt5_libdir}/qt5/plugins/sceneparsers %dir %{_libqt5_libdir}/qt5/plugins/sceneparsers
%{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneimport.so %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneimport.so
@ -474,55 +475,55 @@ popd
%files -n libQt53DQuickInput5 %files -n libQt53DQuickInput5
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DQuickInput.so.* %{_libqt5_libdir}/libQt53DQuickInput.so.*
%files -n libQt53DLogic5 %files -n libQt53DLogic5
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_libqt5_libdir}/libQt53DLogic.so.* %{_libqt5_libdir}/libQt53DLogic.so.*
%doc LICENSE.* %license LICENSE.*
%files -n libQt53DExtras5 %files -n libQt53DExtras5
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DExtras.so.* %{_libqt5_libdir}/libQt53DExtras.so.*
%files -n libQt53DAnimation5 %files -n libQt53DAnimation5
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DAnimation.so.* %{_libqt5_libdir}/libQt53DAnimation.so.*
%files -n libQt53DQuickAnimation5 %files -n libQt53DQuickAnimation5
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DQuickAnimation.so.* %{_libqt5_libdir}/libQt53DQuickAnimation.so.*
%files -n libQt53DQuickScene2D5 %files -n libQt53DQuickScene2D5
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DQuickScene2D.so.* %{_libqt5_libdir}/libQt53DQuickScene2D.so.*
%dir %{_libqt5_libdir}/qt5/plugins/renderplugins %dir %{_libqt5_libdir}/qt5/plugins/renderplugins
%{_libqt5_libdir}/qt5/plugins/renderplugins/libscene2d.so %{_libqt5_libdir}/qt5/plugins/renderplugins/libscene2d.so
%files -n libQt53DQuickExtras5 %files -n libQt53DQuickExtras5
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DQuickExtras.so.* %{_libqt5_libdir}/libQt53DQuickExtras.so.*
%files imports %files imports
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_archdatadir}/qml/*/ %{_libqt5_archdatadir}/qml/*/
%files tools %files tools
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_bindir}/qgltf %{_bindir}/qgltf
%{_libqt5_bindir}/qgltf %{_libqt5_bindir}/qgltf
%files examples %files examples
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_examplesdir}/ %{_libqt5_examplesdir}/
%files -n libQt53DCore-devel %files -n libQt53DCore-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DCore.so %{_libqt5_libdir}/libQt53DCore.so
%{_libqt5_libdir}/libQt53DCore.prl %{_libqt5_libdir}/libQt53DCore.prl
%{_libqt5_libdir}/cmake/Qt53DCore/ %{_libqt5_libdir}/cmake/Qt53DCore/
@ -534,7 +535,7 @@ popd
%files -n libQt53DInput-devel %files -n libQt53DInput-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DInput.so %{_libqt5_libdir}/libQt53DInput.so
%{_libqt5_libdir}/libQt53DInput.prl %{_libqt5_libdir}/libQt53DInput.prl
%{_libqt5_libdir}/cmake/Qt53DInput/ %{_libqt5_libdir}/cmake/Qt53DInput/
@ -546,7 +547,7 @@ popd
%files -n libQt53DQuick-devel %files -n libQt53DQuick-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DQuick.so %{_libqt5_libdir}/libQt53DQuick.so
%{_libqt5_libdir}/libQt53DQuick.prl %{_libqt5_libdir}/libQt53DQuick.prl
%{_libqt5_libdir}/cmake/Qt53DQuick/ %{_libqt5_libdir}/cmake/Qt53DQuick/
@ -558,7 +559,7 @@ popd
%files -n libQt53DQuickRender-devel %files -n libQt53DQuickRender-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_includedir}/Qt3DQuickRender/ %{_libqt5_includedir}/Qt3DQuickRender/
%{_libqt5_libdir}/cmake/Qt53DQuickRender/ %{_libqt5_libdir}/cmake/Qt53DQuickRender/
%{_libqt5_libdir}/libQt53DQuickRender.so %{_libqt5_libdir}/libQt53DQuickRender.so
@ -570,7 +571,7 @@ popd
%files -n libQt53DQuickInput-devel %files -n libQt53DQuickInput-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_includedir}/Qt3DQuickInput/ %{_libqt5_includedir}/Qt3DQuickInput/
%{_libqt5_libdir}/libQt53DQuickInput.so %{_libqt5_libdir}/libQt53DQuickInput.so
%{_libqt5_libdir}/libQt53DQuickInput.prl %{_libqt5_libdir}/libQt53DQuickInput.prl
@ -582,7 +583,7 @@ popd
%files -n libQt53DRender-devel %files -n libQt53DRender-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_includedir}/Qt3DRender/ %{_libqt5_includedir}/Qt3DRender/
%{_libqt5_libdir}/cmake/Qt53DRender/ %{_libqt5_libdir}/cmake/Qt53DRender/
%{_libqt5_libdir}/libQt53DRender.so %{_libqt5_libdir}/libQt53DRender.so
@ -594,7 +595,7 @@ popd
%files -n libQt53DLogic-devel %files -n libQt53DLogic-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DLogic.so %{_libqt5_libdir}/libQt53DLogic.so
%{_libqt5_libdir}/libQt53DLogic.prl %{_libqt5_libdir}/libQt53DLogic.prl
%{_libqt5_libdir}/cmake/Qt53DLogic/ %{_libqt5_libdir}/cmake/Qt53DLogic/
@ -606,7 +607,7 @@ popd
%files -n libQt53DExtras-devel %files -n libQt53DExtras-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DExtras.so %{_libqt5_libdir}/libQt53DExtras.so
%{_libqt5_libdir}/libQt53DExtras.prl %{_libqt5_libdir}/libQt53DExtras.prl
%{_libqt5_libdir}/cmake/Qt53DExtras/ %{_libqt5_libdir}/cmake/Qt53DExtras/
@ -618,7 +619,7 @@ popd
%files -n libQt53DAnimation-devel %files -n libQt53DAnimation-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DAnimation.so %{_libqt5_libdir}/libQt53DAnimation.so
%{_libqt5_libdir}/libQt53DAnimation.prl %{_libqt5_libdir}/libQt53DAnimation.prl
%{_libqt5_libdir}/cmake/Qt53DAnimation/ %{_libqt5_libdir}/cmake/Qt53DAnimation/
@ -630,7 +631,7 @@ popd
%files -n libQt53DQuickAnimation-devel %files -n libQt53DQuickAnimation-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DQuickAnimation.so %{_libqt5_libdir}/libQt53DQuickAnimation.so
%{_libqt5_libdir}/libQt53DQuickAnimation.prl %{_libqt5_libdir}/libQt53DQuickAnimation.prl
%{_libqt5_libdir}/cmake/Qt53DQuickAnimation/ %{_libqt5_libdir}/cmake/Qt53DQuickAnimation/
@ -642,7 +643,7 @@ popd
%files -n libQt53DQuickScene2D-devel %files -n libQt53DQuickScene2D-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DQuickScene2D.so %{_libqt5_libdir}/libQt53DQuickScene2D.so
%{_libqt5_libdir}/libQt53DQuickScene2D.prl %{_libqt5_libdir}/libQt53DQuickScene2D.prl
%{_libqt5_libdir}/cmake/Qt53DQuickScene2D/ %{_libqt5_libdir}/cmake/Qt53DQuickScene2D/
@ -654,7 +655,7 @@ popd
%files -n libQt53DQuickExtras-devel %files -n libQt53DQuickExtras-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt53DQuickExtras.so %{_libqt5_libdir}/libQt53DQuickExtras.so
%{_libqt5_libdir}/libQt53DQuickExtras.prl %{_libqt5_libdir}/libQt53DQuickExtras.prl
%{_libqt5_libdir}/cmake/Qt53DQuickExtras/ %{_libqt5_libdir}/cmake/Qt53DQuickExtras/
@ -666,11 +667,11 @@ popd
%files private-headers-devel %files private-headers-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%{_libqt5_includedir}/Qt*/%{so_version}/ %{_libqt5_includedir}/Qt*/%{so_version}/
%files devel %files devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%doc LICENSE.* %license LICENSE.*
%changelog %changelog

3
qt3d-everywhere-src-5.13.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:092dc9a691eb784b30b1a48799c23578f0f17d892b1cbd25f18130c67f51a452
size 82107804

3
qt3d-everywhere-src-5.14.0-alpha.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea9fbfaf8f13ff4a1eb22233cdccdfd11317274788d54143354a7be929aa60b7
size 82188104