Compare commits

..

No commits in common. "ebd55726402a4b134d4f2bd5804195f51b9afed1" and "7abc84c9c03d56515f05f392285e4bb21cea6f57" have entirely different histories.

4 changed files with 27 additions and 86 deletions

View File

@ -1,22 +0,0 @@
/* 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

View File

@ -1,65 +1,40 @@
%global qt_module qt3d
%global multilib_archs x86_64 %{ix86} loongarch64 sw_64
Summary: Qt5 - Qt3D QML bindings and C++ APIs
Name: qt5-%{qt_module}
Version: 5.15.10
Release: 1
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Name: qt5-qt3d
Version: 5.11.1
Release: 3
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/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
Source1: qt3dcore-config-multilib_p.h
Source0: https://download.qt.io/official_releases/qt/5.11/%{version}/submodules/qt3d-everywhere-src-%{version}.tar.xz
BuildRequires: make
BuildRequires: qt5-rpm-macros >= %{version}
BuildRequires: qt5-qtbase-static >= %{version}
BuildRequires: qt5-qtbase-private-devel
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
BuildRequires: qt5-qtdeclarative-devel
BuildRequires: qt5-qtimageformats
BuildRequires: qt5-qtxmlpatterns-devel
BuildRequires: pkgconfig(assimp) >= 3.3.1
Requires: qt5-qtimageformats%{?_isa} >= %{version}
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}}
%description
Qt 3D provides functionality for near-realtime simulation systems with
support for 2D and 3D rendering in both Qt C++ and Qt Quick applications).
Qt 3D support for 2D and 3D rendering in both Qt C++ and Qt Quick applications for
near-realtime simulation systems.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa}
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
%{summary}.
%package examples
Summary: Programming examples for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description examples
%{summary}.
Provides development files and programming examples for qt5-qt3d.
%prep
%setup -q -n %{qt_module}-everywhere-src-%{version}
%autosetup -n qt3d-everywhere-src-%{version}
%build
%define _lto_cflags %{nil}
%{qmake_qt5}
%make_build
%install
make install INSTALL_ROOT=%{buildroot}
%ifarch %{multilib_archs}
# multilib: qt3dcore-config_p.h
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}
@ -70,15 +45,16 @@ for prl_file in libQt5*.prl ; do
done
popd
%ldconfig_scriptlets
%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
@ -92,20 +68,11 @@ popd
%{_qt5_includedir}/{Qt3DRender/,Qt3DQuickRender/,Qt3DCore/,Qt3DInput/}
%{_qt5_libdir}/pkgconfig/*.pc
%{_qt5_archdatadir}/mkspecs/modules/*.pri
%files examples
%if 0%{?_qt5_examplesdir:1}
%{_qt5_examplesdir}/
%endif
%changelog
* Mon Aug 21 2023 huayadong <huayadong@kylinos.cn> - 5.15.10-1
- update to version 5.15.10-1
* 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

View File

@ -1,4 +0,0 @@
version_control: git
src_repo: https://code.qt.io/cgit/qt/qt3d.git/
tag_prefix: "^v"
separator: "."