!9 [sync] PR-8: update to upstream version 5.15.2

Merge pull request !9 from openeuler-sync-bot/sync-pr8-master-to-openEuler-22.03-LTS-Next
update to upstream version 5.15.2
2022-01-19 03:47:05 +00:00 · 2022-01-17 15:03:18 +08:00 · 2020-09-14 11:48:47 +08:00 · 2020-09-14 10:08:24 +08:00 · 2020-05-21 20:06:30 +08:00 · 2020-05-21 15:36:50 +08:00
4 changed files with 122 additions and 0 deletions
--- a/qt3d-everywhere-src-5.15.2.tar.xz
+++ b/qt3d-everywhere-src-5.15.2.tar.xz
--- a/qt3dcore-config-multilib_p.h
+++ b/qt3dcore-config-multilib_p.h
@ -0,0 +1,22 @@
+/* qt3dcore-config_p.h */
+/* This file is here to prevent a file conflict on multiarch systems.  A
+ * conflict will occur because qt3dcore-config_p.h has arch-specific definitions.
+ *
+ * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
+
+#ifndef Q3DCONFIG_MULTILIB_H
+#define Q3DCONFIG_MULTILIB_H
+
+#ifndef __WORDSIZE
+#include <bits/wordsize.h>
+#endif
+
+#if __WORDSIZE == 32
+#include "Qt3DCore/private/qt3dcore-config-32_p.h"
+#elif __WORDSIZE == 64
+#include "Qt3DCore/private/qt3dcore-config-64_p.h"
+#else
+#error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
--- a/qt5-qt3d.spec
+++ b/qt5-qt3d.spec
@ -0,0 +1,96 @@
+Name:          qt5-qt3d
+Version:       5.15.2
+Release:       1 
+Summary:       Qt5 - Qt3D C++ APIs and QML bindings
+License:       LGPLv2 with exceptions or GPLv3 with exceptions
+Url:           http://www.qt.io
+%global majmin %(echo %{version} | cut -d. -f1-2)
+Source0:       https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qt3d-everywhere-src-%{version}.tar.xz
+Source1:       qt3dcore-config-multilib_p.h
+
+BuildRequires: make
+BuildRequires: qt5-rpm-macros >= %{version} qt5-qtbase-private-devel qt5-qtdeclarative-devel
+BuildRequires: qt5-qtimageformats qt5-qtxmlpatterns-devel pkgconfig(assimp) >= 3.3.1
+Requires:      qt5-qtimageformats >= %{version}
+%{?_qt5:Requires: %{_qt5} = %{_qt5_version}}
+BuildRequires: qt5-qtbase-static >= %{version}
+
+%description
+Qt 3D support for 2D and 3D rendering in both Qt C++ and Qt Quick applications for
+near-realtime simulation systems.
+
+%package       devel
+Summary:       Provides development files for qt5-qt3d
+Requires:      qt5-qt3d = %{version}-%{release} qt5-qtbase-devel
+
+Provides:      %{name}-examples = %{version}-%{release}
+Obsoletes:     %{name}-examples < %{version}-%{release}
+
+%description   devel
+Provides development files and programming examples for qt5-qt3d.
+
+%prep
+%autosetup  -n qt3d-everywhere-src-%{version}
+
+%build
+%define _lto_cflags %{nil}
+
+%{qmake_qt5}
+%make_build
+
+%install
+make install INSTALL_ROOT=%{buildroot}
+
+%ifarch x86_64
+  mv %{buildroot}%{_qt5_headerdir}/Qt3DCore/%{version}/Qt3DCore/private/qt3dcore-config_p.h %{buildroot}%{_qt5_headerdir}/Qt3DCore/%{version}/Qt3DCore/private/qt3dcore-config-%{__isa_bits}_p.h
+  install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt5_headerdir}/Qt3DCore/%{version}/Qt3DCore/private/qt3dcore-config_p.h
+%endif
+
+pushd %{buildroot}%{_qt5_libdir}
+for prl_file in libQt5*.prl ; do
+  sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file}
+  if [ -f "$(basename ${prl_file} .prl).so" ]; then
+    rm -fv "$(basename ${prl_file} .prl).la"
+    sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file}
+  fi
+done
+popd
+
+%post
+/sbin/ldconfig
+%postun
+/sbin/ldconfig
+
+%files
+%license LICENSE.GPL* LICENSE.LGPL*
+%{_qt5_libdir}/{libQt53D*.so.5*}
+%{_qt5_qmldir}/{Qt3D/,QtQuick/Scene3D/,QtQuick/Scene2D/}
+%{_qt5_plugindir}/{sceneparsers/,renderplugins/,geometryloaders/}
+%{_qt5_plugindir}/renderers/
+
+%files devel
+%{_qt5_bindir}/qgltf
+%{_qt5_libdir}/{libQt53D*.so}
+%{_qt5_libdir}/{libQt53D*.prl}
+%{_qt5_libdir}/cmake/{Qt53DQuickScene2D,Qt53DQuickAnimation,Qt53DAnimation,Qt53DQuickExtras}
+%{_qt5_libdir}/cmake/{Qt53DExtras,Qt53DQuickInput,Qt53DLogic,Qt53DRender/}
+%{_qt5_libdir}/cmake/{Qt53DQuickRender/,Qt53DInput,Qt53DQuick,Qt53DCore/}
+%{_qt5_includedir}/{Qt3DQuick,Qt3DQuickScene2D,Qt3DQuickAnimation,Qt3DAnimation}
+%{_qt5_includedir}/{Qt3DQuickExtras,Qt3DExtras,Qt3DQuickInput/,Qt3DLogic/}
+%{_qt5_includedir}/{Qt3DRender/,Qt3DQuickRender/,Qt3DCore/,Qt3DInput/}
+%{_qt5_libdir}/pkgconfig/*.pc
+%{_qt5_archdatadir}/mkspecs/modules/*.pri
+%if 0%{?_qt5_examplesdir:1}
+%{_qt5_examplesdir}/
+%endif
+
+%changelog
+* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 5.15.2-1
+- update to upstream version 5.15.2
+
+* Mon Sep 14 2020 liuweibo <liuweibo10@huawei.com> - 5.11.1-4
+- Fix Source0
+
+* Tue Dec 3 2019 Tianfei <tianfei16@huawei.com> - 5.11.1-3
+- Package init
+
--- a/qt5-qt3d.yaml
+++ b/qt5-qt3d.yaml
@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://code.qt.io/cgit/qt/qt3d.git/
+tag_prefix: "^v"
+separator: "."
Author	SHA1	Message	Date
openeuler-ci-bot	787128424b	!9 [sync] PR-8: update to upstream version 5.15.2 Merge pull request !9 from openeuler-sync-bot/sync-pr8-master-to-openEuler-22.03-LTS-Next	2022-01-19 03:47:05 +00:00
pei-jiankang	7a7bc0bf6e	update to upstream version 5.15.2 (cherry picked from commit 2186976a6ea27ebb0c04c0dc1cbbc3b06f56ef18)	2022-01-17 15:03:18 +08:00
openeuler-ci-bot	a73365ef7e	!5 Fix source0 From: @kkkl12 Reviewed-by: @small_leek Signed-off-by: @small_leek	2020-09-14 11:48:47 +08:00
kkkl12	e34d6fbc6f	Fix Source0	2020-09-14 10:08:24 +08:00
openeuler-ci-bot	94d4d946c4	!4 qt5-qt3d.yaml Merge pull request !4 from 成子晗/master	2020-05-21 20:06:30 +08:00
chengzihan2	7b2b37f8cc	add qt5-qt3d.yaml	2020-05-21 15:36:50 +08:00
openeuler-ci-bot	9b5b690f5b	!2 modify spec Merge pull request !2 from wisdoman/master	2019-12-09 13:50:37 +08:00
wisdoman	2dd65b679a	Merge branch 'master' of https://gitee.com/wisdoman/qt5-qt3d Conflicts: qt5-qt3d.spec	2019-12-09 11:49:52 +08:00
wisdoman	7abc84c9c0	add code	2019-12-09 11:23:54 +08:00
openeuler-ci-bot	f2a343a090	!1 qt5-qt3d init Merge pull request !1 from wisdoman/master	2019-12-08 13:48:38 +08:00
wisdoman	106901f8a3	add code	2019-12-06 21:30:05 +08:00