From 9830f977b7702241f7f50653c0d5fcafb4eb2b16aded4048462970f96d1bf57b Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Thu, 17 Jan 2019 12:22:32 +0000 Subject: [PATCH 1/7] Accepting request 665002 from home:susnux:branches:games - Update to 4.1.0 * Added support for Export 3MF (experimental) * Added supprt for Import / Export glTF 2 * Prevent failing stringstream to crash the export process * Fix invalid access to mesh array when the array is empty in Blender, also fixed short overflow. * Fixed memory leak in AMFImporter * Fixed IOStream leak in UnrealLoader: * Fixed out-of-bounds read in MaterialSystem unit test * Added support for SIB models from Silo 2.5 - Changes from 4.0.1 * StreamReader: fix out-of-range exception - Changes From 4.0.0 * New QT-Widget based assimp-viewer * Open3DGC codec supported by glFT-importer * glTF: Read and write transparency values * Support for X3D, AMF and Lugdunum3D * MDLLoader: fix resource leak. * Fix memory leak in Collada importer * Fixed many FBX bugs - Added %check section, run unit tests - Added disable-gitrevision-test.patch to fix testsuite as we do not build from git, git rev will test will fail. - Added do-not-install-irrXML.patch to prevent cmake from installing the irrXML (static) library. OBS-URL: https://build.opensuse.org/request/show/665002 OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=7 --- assimp-3.3.1-suse.tar.gz | 3 -- assimp-4.1.0-suse.tar.xz | 3 ++ assimp.changes | 29 ++++++++++++ assimp.spec | 86 ++++++++++++++++++++++++---------- disable-gitrevision-test.patch | 13 +++++ do-not-install-irrXML.patch | 13 +++++ install-viewer.patch | 11 +++++ sanitize_source.sh | 7 --- 8 files changed, 129 insertions(+), 36 deletions(-) delete mode 100644 assimp-3.3.1-suse.tar.gz create mode 100644 assimp-4.1.0-suse.tar.xz create mode 100644 disable-gitrevision-test.patch create mode 100644 do-not-install-irrXML.patch create mode 100644 install-viewer.patch delete mode 100644 sanitize_source.sh diff --git a/assimp-3.3.1-suse.tar.gz b/assimp-3.3.1-suse.tar.gz deleted file mode 100644 index aaa57a8..0000000 --- a/assimp-3.3.1-suse.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40b7d298ceb976409fc4e8456331f728a4f4406355b731120eac80abee42e877 -size 27302594 diff --git a/assimp-4.1.0-suse.tar.xz b/assimp-4.1.0-suse.tar.xz new file mode 100644 index 0000000..d8d1f28 --- /dev/null +++ b/assimp-4.1.0-suse.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c0e16540ae6fe09a9d16f7ff0cfa99667b3269b304cc32f909b7ac908686ee6 +size 21696292 diff --git a/assimp.changes b/assimp.changes index 2b2d5c5..0a543eb 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Sat Aug 11 16:16:03 UTC 2018 - rpm@fthiessen.de + +- Update to 4.1.0 + * Added support for Export 3MF (experimental) + * Added supprt for Import / Export glTF 2 + * Prevent failing stringstream to crash the export process + * Fix invalid access to mesh array when the array is + empty in Blender, also fixed short overflow. + * Fixed memory leak in AMFImporter + * Fixed IOStream leak in UnrealLoader: + * Fixed out-of-bounds read in MaterialSystem unit test + * Added support for SIB models from Silo 2.5 +- Changes from 4.0.1 + * StreamReader: fix out-of-range exception +- Changes From 4.0.0 + * New QT-Widget based assimp-viewer + * Open3DGC codec supported by glFT-importer + * glTF: Read and write transparency values + * Support for X3D, AMF and Lugdunum3D + * MDLLoader: fix resource leak. + * Fix memory leak in Collada importer + * Fixed many FBX bugs +- Added %check section, run unit tests +- Added disable-gitrevision-test.patch to fix testsuite as we do + not build from git, git rev will test will fail. +- Added do-not-install-irrXML.patch to prevent cmake from + installing the irrXML (static) library. + ------------------------------------------------------------------- Thu Apr 20 11:05:53 UTC 2017 - jengelh@inai.de diff --git a/assimp.spec b/assimp.spec index e154ac7..4ad6560 100644 --- a/assimp.spec +++ b/assimp.spec @@ -1,7 +1,7 @@ # # spec file for package assimp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,34 +16,52 @@ # -%define sover 3 +%define sover 4 Name: assimp -Version: 3.3.1 +Version: 4.1.0 Release: 0 Summary: Library to load and process 3D scenes from various data formats -License: BSD-3-Clause +License: BSD-3-Clause AND MIT Group: Development/Libraries/C and C++ Url: http://assimp.org/ -#Source: https://github.com/assimp/assimp/archive/v%{version}/%{name}-%{version}.tar.gz -Source: %{name}-%{version}-suse.tar.gz -Source9: sanitize_source.sh -BuildRequires: boost-devel +# Removed non free parts from the original source package (models-nonbsd) +# https://github.com/assimp/assimp/archive/v%%{version}/%%{name}-%%{version}.tar.gz +Source0: %{name}-%{version}-suse.tar.xz +# PATCH-FIX-OPENSUSE disable-gitrevision-test.patch -- Disable gitrev test as we build from release not from git +Patch0: disable-gitrevision-test.patch +Patch1: do-not-install-irrXML.patch +Patch2: install-viewer.patch BuildRequires: cmake BuildRequires: dos2unix BuildRequires: gcc-c++ +BuildRequires: irrlicht-devel +BuildRequires: libboost_headers-devel BuildRequires: pkgconfig BuildRequires: zlib-devel +BuildRequires: pkgconfig(IL) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(minizip) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Assimp is a library to load and process geometric scenes from various data formats. It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, materials, bone animations and potential texture data. The library is not designed for speed, it is primarily useful for importing assets from various sources once and storing it in a engine-specific format for easy and fast every-day-loading. +Assimp is a library to load and process geometric scenes from various data formats. +It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, +materials, bone animations and potential texture data. The library is not designed for speed, +it is primarily useful for importing assets from various sources once and storing it in a +engine-specific format for easy and fast every-day-loading. %package -n lib%{name}%{sover} Summary: Headers, docs and command-line utility for %{name} Group: System/Libraries %description -n lib%{name}%{sover} -Assimp is a library to load and process geometric scenes from various data formats. It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, materials, bone animations and potential texture data. The library is not designed for speed, it is primarily useful for importing assets from various sources once and storing it in a engine-specific format for easy and fast every-day-loading. +Assimp is a library to load and process geometric scenes from various data formats. +It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, +materials, bone animations and potential texture data. The library is not designed for speed, +it is primarily useful for importing assets from various sources once and storing it in a +engine-specific format for easy and fast every-day-loading. %package devel Summary: Headers, docs and command-line utility for %{name} @@ -53,44 +71,60 @@ Requires: lib%{name}%{sover} = %{version} Requires: libstdc++-devel %description devel -Assimp is a library to load and process geometric scenes from various data formats. It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, materials, bone animations and potential texture data. The library is not designed for speed, it is primarily useful for importing assets from various sources once and storing it in a engine-specific format for easy and fast every-day-loading. +Assimp is a library to load and process geometric scenes from various data formats. +It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, +materials, bone animations and potential texture data. The library is not designed for speed, +it is primarily useful for importing assets from various sources once and storing it in a +engine-specific format for easy and fast every-day-loading. + +%package viewer +Summary: Viewer for assimp supported assets +Group: Development/Libraries/C and C++ + +%description viewer +Assimp is a library to load and process geometric scenes from various data formats. +It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, +materials, bone animations and potential texture data. The library is not designed for speed, +it is primarily useful for importing assets from various sources once and storing it in a +engine-specific format for easy and fast every-day-loading. %prep %setup -q - -dos2unix LICENSE CREDITS CHANGES README -find . -type f -name "*.lib" -delete +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %cmake \ - -DCMAKE_BUILD_TYPE="Release" \ -DASSIMP_LIB_INSTALL_DIR="%{_libdir}" -CFLAGS="%{optflags}" make %{?_smp_mflags} +make %{?_smp_mflags} %install -rm -rf examples/.deps %cmake_install find %{buildroot} -type f -name "*.la" -delete -print +%check +pushd build/test +LD_LIBRARY_PATH=%{buildroot}%{_libdir} ctest --output-on-failure --force-new-ctest-process +popd + %post -n lib%{name}%{sover} -p /sbin/ldconfig %postun -n lib%{name}%{sover} -p /sbin/ldconfig %files -n lib%{name}%{sover} -%defattr(-,root,root) -%if 0%{?suse_version} > 1320 -%license CREDITS LICENSE -%else -%doc CREDITS LICENSE -%endif -%{_libdir}/libassimp.so.3* +%license LICENSE +%{_libdir}/libassimp.so.%{sover}* %files devel -%defattr(-,root,root) -%doc README CHANGES +%doc README CHANGES CREDITS %{_includedir}/assimp/ %{_bindir}/assimp %{_libdir}/libassimp.so %{_libdir}/cmake/* %{_libdir}/pkgconfig/assimp.pc +%files viewer +%license LICENSE +%{_bindir}/assimp_qt_viewer + %changelog diff --git a/disable-gitrevision-test.patch b/disable-gitrevision-test.patch new file mode 100644 index 0000000..07cc584 --- /dev/null +++ b/disable-gitrevision-test.patch @@ -0,0 +1,13 @@ +diff -Nur assimp-4.1.0/test/unit/utVersion.cpp new/test/unit/utVersion.cpp +--- assimp-4.1.0/test/unit/utVersion.cpp 2017-12-11 14:22:45.000000000 +0100 ++++ new/test/unit/utVersion.cpp 2018-08-11 18:14:15.231279250 +0200 +@@ -65,7 +65,9 @@ + EXPECT_NE( aiGetCompileFlags(), 0U ); + } + ++/* Does not work, as we do not build from GIT + TEST_F( utVersion, aiGetVersionRevisionTest ) { + EXPECT_NE( aiGetVersionRevision(), 0U ); + } ++*/ + diff --git a/do-not-install-irrXML.patch b/do-not-install-irrXML.patch new file mode 100644 index 0000000..72d2014 --- /dev/null +++ b/do-not-install-irrXML.patch @@ -0,0 +1,13 @@ +diff -Nur assimp-4.1.0/contrib/irrXML/CMakeLists.txt new/contrib/irrXML/CMakeLists.txt +--- assimp-4.1.0/contrib/irrXML/CMakeLists.txt 2017-12-11 14:22:45.000000000 +0100 ++++ new/contrib/irrXML/CMakeLists.txt 2018-08-11 20:36:21.068206869 +0200 +@@ -17,6 +17,6 @@ + set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" ) + set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" ) + +-install(TARGETS IrrXML +- ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +- COMPONENT ${LIBASSIMP_COMPONENT}) ++#install(TARGETS IrrXML ++# ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} ++# COMPONENT ${LIBASSIMP_COMPONENT}) diff --git a/install-viewer.patch b/install-viewer.patch new file mode 100644 index 0000000..71c6135 --- /dev/null +++ b/install-viewer.patch @@ -0,0 +1,11 @@ +diff -Nur assimp-4.1.0/tools/assimp_qt_viewer/CMakeLists.txt new/tools/assimp_qt_viewer/CMakeLists.txt +--- assimp-4.1.0/tools/assimp_qt_viewer/CMakeLists.txt 2017-12-11 14:22:45.000000000 +0100 ++++ new/tools/assimp_qt_viewer/CMakeLists.txt 2018-08-11 22:08:44.441867937 +0200 +@@ -43,3 +43,7 @@ + endif() + + set_property(TARGET ${PROJECT_NAME} PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) ++ ++install( TARGETS ${PROJECT_NAME} ++ DESTINATION "${ASSIMP_BIN_INSTALL_DIR}" COMPONENT assimp-dev ++) diff --git a/sanitize_source.sh b/sanitize_source.sh deleted file mode 100644 index 050efff..0000000 --- a/sanitize_source.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -p="assimp-3.3.1" -wget -c "https://github.com/assimp/assimp/archive/v3.3.1/$p.tar.gz" -rm -Rf "$p" -tar -xf "$p.tar.gz" -rm -Rf "$p/test/models-nonbsd" -tar --owner=root --group=root -czf "$p-suse.tar.gz" "$p" From 428aa93e15e16a97cf9d2e93d7a06fedac970f8c8b57da95ee7ca374b1d72e44 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Thu, 17 Jan 2019 13:16:25 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=8 --- assimp.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/assimp.changes b/assimp.changes index 0a543eb..385a940 100644 --- a/assimp.changes +++ b/assimp.changes @@ -26,6 +26,7 @@ Sat Aug 11 16:16:03 UTC 2018 - rpm@fthiessen.de not build from git, git rev will test will fail. - Added do-not-install-irrXML.patch to prevent cmake from installing the irrXML (static) library. +- install-viewer.patch: Install viewer component ------------------------------------------------------------------- Thu Apr 20 11:05:53 UTC 2017 - jengelh@inai.de From 1154fad11a8370eae94af44762312fc72f432ce65e26226099865ea64656db65 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 17 Jan 2019 18:35:04 +0000 Subject: [PATCH 3/7] Accepting request 666759 from home:jengelh:branches:games - Fix incorrect summary for libassimp*. OBS-URL: https://build.opensuse.org/request/show/666759 OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=9 --- assimp.changes | 5 +++++ assimp.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/assimp.changes b/assimp.changes index 385a940..2c4248d 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 17 15:03:13 UTC 2019 - Jan Engelhardt + +- Fix incorrect summary for libassimp*. + ------------------------------------------------------------------- Sat Aug 11 16:16:03 UTC 2018 - rpm@fthiessen.de diff --git a/assimp.spec b/assimp.spec index 4ad6560..c775611 100644 --- a/assimp.spec +++ b/assimp.spec @@ -1,7 +1,7 @@ # # spec file for package assimp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -53,7 +53,7 @@ it is primarily useful for importing assets from various sources once and storin engine-specific format for easy and fast every-day-loading. %package -n lib%{name}%{sover} -Summary: Headers, docs and command-line utility for %{name} +Summary: Library to load and process 3D scenes from various data formats Group: System/Libraries %description -n lib%{name}%{sover} From 353b15e00abda64fd61db93c33283c344431f30df78c9c8b91e8b6cd361da076 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 29 Jan 2019 01:42:00 +0000 Subject: [PATCH 4/7] Accepting request 668173 from home:jengelh:branches:games - sanitize_source.sh was removed in the 4.1.0 update; restore its logic with a new _service file and recreate the tarball. OBS-URL: https://build.opensuse.org/request/show/668173 OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=10 --- _service | 15 +++++++++++++++ assimp-4.1.0-suse.tar.xz | 3 --- assimp-4.1.0.tar.xz | 3 +++ assimp.changes | 6 ++++++ assimp.spec | 5 ++--- 5 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 _service delete mode 100644 assimp-4.1.0-suse.tar.xz create mode 100644 assimp-4.1.0.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..933eced --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + git + git://github.com/assimp/assimp + v4.1.0 + 4.1.0 + + test/models-nonbsd + + + *.tar + xz + + + diff --git a/assimp-4.1.0-suse.tar.xz b/assimp-4.1.0-suse.tar.xz deleted file mode 100644 index d8d1f28..0000000 --- a/assimp-4.1.0-suse.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c0e16540ae6fe09a9d16f7ff0cfa99667b3269b304cc32f909b7ac908686ee6 -size 21696292 diff --git a/assimp-4.1.0.tar.xz b/assimp-4.1.0.tar.xz new file mode 100644 index 0000000..c75b87f --- /dev/null +++ b/assimp-4.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9dce96c623cf65f9cc51882e68da7ac415bc6259856e41da7b689efbcffc1d45 +size 21277128 diff --git a/assimp.changes b/assimp.changes index 2c4248d..70af245 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 23 20:08:14 UTC 2019 - Jan Engelhardt + +- sanitize_source.sh was removed in the 4.1.0 update; restore its + logic with a new _service file and recreate the tarball. + ------------------------------------------------------------------- Thu Jan 17 15:03:13 UTC 2019 - Jan Engelhardt diff --git a/assimp.spec b/assimp.spec index c775611..4807eef 100644 --- a/assimp.spec +++ b/assimp.spec @@ -24,9 +24,8 @@ Summary: Library to load and process 3D scenes from various data formats License: BSD-3-Clause AND MIT Group: Development/Libraries/C and C++ Url: http://assimp.org/ -# Removed non free parts from the original source package (models-nonbsd) -# https://github.com/assimp/assimp/archive/v%%{version}/%%{name}-%%{version}.tar.gz -Source0: %{name}-%{version}-suse.tar.xz +Source0: %{name}-%{version}.tar.xz +Source9: _service # PATCH-FIX-OPENSUSE disable-gitrevision-test.patch -- Disable gitrev test as we build from release not from git Patch0: disable-gitrevision-test.patch Patch1: do-not-install-irrXML.patch From b915aab554dcbd374721d51242d3586f32b583b36354ffa78bf1682d32f04b33 Mon Sep 17 00:00:00 2001 From: Dmitriy Perlow Date: Sun, 31 May 2020 16:27:49 +0000 Subject: [PATCH 5/7] Accepting request 807744 from home:susnux:branches:games - Update to 5.0.1 * Added texture types: BASE_COLOR, NORMAL_CAMERA, EMISSION_COLOR, METALNESS, DIFFUSE_ROUGHNESS * Fixed various issues and memory leaks * 3DS: Explicitly pass "UNNAMED" as 3DS root node name and fix more thread-safety issue in 3DS loader. * 3MF: Introduce first prototype for basematerial support * AssJSon: Add json export. * Various other file support improvements - Dropped viewer subpackage, as it now requires DirectX - Removed not needed disable-gitrevision-test.patch - Rebased do-not-install-irrXML.patch - Removed not needed install-viewer.patch - Removed _service OBS-URL: https://build.opensuse.org/request/show/807744 OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=12 --- _service | 15 -------------- assimp-4.1.0.tar.xz | 3 --- assimp-5.0.1.tar.gz | 3 +++ assimp.changes | 18 +++++++++++++++++ assimp.spec | 36 +++++++--------------------------- disable-gitrevision-test.patch | 13 ------------ do-not-install-irrXML.patch | 14 +++++++++---- install-viewer.patch | 11 ----------- 8 files changed, 38 insertions(+), 75 deletions(-) delete mode 100644 _service delete mode 100644 assimp-4.1.0.tar.xz create mode 100644 assimp-5.0.1.tar.gz delete mode 100644 disable-gitrevision-test.patch delete mode 100644 install-viewer.patch diff --git a/_service b/_service deleted file mode 100644 index 933eced..0000000 --- a/_service +++ /dev/null @@ -1,15 +0,0 @@ - - - git - git://github.com/assimp/assimp - v4.1.0 - 4.1.0 - - test/models-nonbsd - - - *.tar - xz - - - diff --git a/assimp-4.1.0.tar.xz b/assimp-4.1.0.tar.xz deleted file mode 100644 index c75b87f..0000000 --- a/assimp-4.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9dce96c623cf65f9cc51882e68da7ac415bc6259856e41da7b689efbcffc1d45 -size 21277128 diff --git a/assimp-5.0.1.tar.gz b/assimp-5.0.1.tar.gz new file mode 100644 index 0000000..8f6f21e --- /dev/null +++ b/assimp-5.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc +size 46607553 diff --git a/assimp.changes b/assimp.changes index 70af245..9a322e7 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed May 20 13:15:44 UTC 2020 - Ferdinand Thiessen + +- Update to 5.0.1 + * Added texture types: BASE_COLOR, NORMAL_CAMERA, EMISSION_COLOR, + METALNESS, DIFFUSE_ROUGHNESS + * Fixed various issues and memory leaks + * 3DS: Explicitly pass "UNNAMED" as 3DS root node name and fix + more thread-safety issue in 3DS loader. + * 3MF: Introduce first prototype for basematerial support + * AssJSon: Add json export. + * Various other file support improvements +- Dropped viewer subpackage, as it now requires DirectX +- Removed not needed disable-gitrevision-test.patch +- Rebased do-not-install-irrXML.patch +- Removed not needed install-viewer.patch +- Removed _service + ------------------------------------------------------------------- Wed Jan 23 20:08:14 UTC 2019 - Jan Engelhardt diff --git a/assimp.spec b/assimp.spec index 4807eef..cfa2108 100644 --- a/assimp.spec +++ b/assimp.spec @@ -1,7 +1,7 @@ # # spec file for package assimp # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +16,16 @@ # -%define sover 4 +%define sover 5 Name: assimp -Version: 4.1.0 +Version: 5.0.1 Release: 0 Summary: Library to load and process 3D scenes from various data formats License: BSD-3-Clause AND MIT Group: Development/Libraries/C and C++ -Url: http://assimp.org/ -Source0: %{name}-%{version}.tar.xz -Source9: _service -# PATCH-FIX-OPENSUSE disable-gitrevision-test.patch -- Disable gitrev test as we build from release not from git -Patch0: disable-gitrevision-test.patch -Patch1: do-not-install-irrXML.patch -Patch2: install-viewer.patch +URL: https://assimp.org/ +Source0: https://github.com/assimp/assimp/archive/v%{version}/assimp-%{version}.tar.gz +Patch0: do-not-install-irrXML.patch BuildRequires: cmake BuildRequires: dos2unix BuildRequires: gcc-c++ @@ -42,7 +38,6 @@ BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(minizip) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Assimp is a library to load and process geometric scenes from various data formats. @@ -76,27 +71,14 @@ materials, bone animations and potential texture data. The library is not design it is primarily useful for importing assets from various sources once and storing it in a engine-specific format for easy and fast every-day-loading. -%package viewer -Summary: Viewer for assimp supported assets -Group: Development/Libraries/C and C++ - -%description viewer -Assimp is a library to load and process geometric scenes from various data formats. -It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, -materials, bone animations and potential texture data. The library is not designed for speed, -it is primarily useful for importing assets from various sources once and storing it in a -engine-specific format for easy and fast every-day-loading. - %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %cmake \ -DASSIMP_LIB_INSTALL_DIR="%{_libdir}" -make %{?_smp_mflags} +%make_build %install %cmake_install @@ -122,8 +104,4 @@ popd %{_libdir}/cmake/* %{_libdir}/pkgconfig/assimp.pc -%files viewer -%license LICENSE -%{_bindir}/assimp_qt_viewer - %changelog diff --git a/disable-gitrevision-test.patch b/disable-gitrevision-test.patch deleted file mode 100644 index 07cc584..0000000 --- a/disable-gitrevision-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur assimp-4.1.0/test/unit/utVersion.cpp new/test/unit/utVersion.cpp ---- assimp-4.1.0/test/unit/utVersion.cpp 2017-12-11 14:22:45.000000000 +0100 -+++ new/test/unit/utVersion.cpp 2018-08-11 18:14:15.231279250 +0200 -@@ -65,7 +65,9 @@ - EXPECT_NE( aiGetCompileFlags(), 0U ); - } - -+/* Does not work, as we do not build from GIT - TEST_F( utVersion, aiGetVersionRevisionTest ) { - EXPECT_NE( aiGetVersionRevision(), 0U ); - } -+*/ - diff --git a/do-not-install-irrXML.patch b/do-not-install-irrXML.patch index 72d2014..fc1b941 100644 --- a/do-not-install-irrXML.patch +++ b/do-not-install-irrXML.patch @@ -1,13 +1,19 @@ -diff -Nur assimp-4.1.0/contrib/irrXML/CMakeLists.txt new/contrib/irrXML/CMakeLists.txt ---- assimp-4.1.0/contrib/irrXML/CMakeLists.txt 2017-12-11 14:22:45.000000000 +0100 -+++ new/contrib/irrXML/CMakeLists.txt 2018-08-11 20:36:21.068206869 +0200 -@@ -17,6 +17,6 @@ +diff -Nur assimp-5.0.1/contrib/irrXML/CMakeLists.txt new/contrib/irrXML/CMakeLists.txt +--- assimp-5.0.1/contrib/irrXML/CMakeLists.txt 2020-01-12 12:56:40.000000000 +0100 ++++ new/contrib/irrXML/CMakeLists.txt 2020-05-20 01:51:22.652107741 +0200 +@@ -21,9 +21,9 @@ set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" ) set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" ) -install(TARGETS IrrXML +- LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +- RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} +- FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} - COMPONENT ${LIBASSIMP_COMPONENT}) +#install(TARGETS IrrXML ++# LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +# ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} ++# RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} ++# FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +# COMPONENT ${LIBASSIMP_COMPONENT}) diff --git a/install-viewer.patch b/install-viewer.patch deleted file mode 100644 index 71c6135..0000000 --- a/install-viewer.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur assimp-4.1.0/tools/assimp_qt_viewer/CMakeLists.txt new/tools/assimp_qt_viewer/CMakeLists.txt ---- assimp-4.1.0/tools/assimp_qt_viewer/CMakeLists.txt 2017-12-11 14:22:45.000000000 +0100 -+++ new/tools/assimp_qt_viewer/CMakeLists.txt 2018-08-11 22:08:44.441867937 +0200 -@@ -43,3 +43,7 @@ - endif() - - set_property(TARGET ${PROJECT_NAME} PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) -+ -+install( TARGETS ${PROJECT_NAME} -+ DESTINATION "${ASSIMP_BIN_INSTALL_DIR}" COMPONENT assimp-dev -+) From 9ef5166b09b4d8b492401b464b4c72ddfdfff48f645c8d65cd8b908984a36f9e Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Wed, 10 Jun 2020 22:17:54 +0000 Subject: [PATCH 6/7] Accepting request 813181 from home:cgiboudeaux:branches:games - Add upstream patch to fix the broken CMake config files: * 0001-use-GNUInstallDirs-where-possible.patch (adapted for the 5.0.1 release) OBS-URL: https://build.opensuse.org/request/show/813181 OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=13 --- 0001-use-GNUInstallDirs-where-possible.patch | 242 +++++++++++++++++++ assimp.changes | 7 + assimp.spec | 11 +- 3 files changed, 255 insertions(+), 5 deletions(-) create mode 100644 0001-use-GNUInstallDirs-where-possible.patch diff --git a/0001-use-GNUInstallDirs-where-possible.patch b/0001-use-GNUInstallDirs-where-possible.patch new file mode 100644 index 0000000..ed901c1 --- /dev/null +++ b/0001-use-GNUInstallDirs-where-possible.patch @@ -0,0 +1,242 @@ +From b483fbb30ce41786e9a308f1e2fbd41ecd410feb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Victor=20Matar=C3=A9?= +Date: Tue, 31 Mar 2020 21:30:07 +0200 +Subject: [PATCH] use GNUInstallDirs where possible + +Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and +disable redefining FHS-mandated install locations via user-editable +ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary, +Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables. +--- + CMakeLists.txt | 33 ++++++++++++++++++++------------- + assimp.pc.in | 6 ++---- + assimpTargets-debug.cmake.in | 20 ++++++++++---------- + assimpTargets-release.cmake.in | 20 ++++++++++---------- + assimpTargets.cmake.in | 15 +-------------- + 5 files changed, 43 insertions(+), 51 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dcafb64..c6109e6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -230,11 +230,6 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M + SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev) + SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names") + +-IF( UNIX ) +- # Use GNUInstallDirs for Unix predefined directories +- INCLUDE(GNUInstallDirs) +-ENDIF( UNIX ) +- + # Grouped compiler settings + IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) + IF(NOT HUNTER_ENABLED) +@@ -329,14 +324,6 @@ IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) + SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" ) + ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) + +-# Cache these to allow the user to override them manually. +-SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING +- "Path the built library files are installed to." ) +-SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING +- "Path the header files are installed to." ) +-SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING +- "Path the tool executables are installed to." ) +- + get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG) + + IF (INJECT_DEBUG_POSTFIX AND (is_multi_config OR CMAKE_BUILD_TYPE STREQUAL "Debug")) +@@ -390,6 +377,26 @@ IF(HUNTER_ENABLED) + DESTINATION "${CONFIG_INSTALL_DIR}" + ) + ELSE(HUNTER_ENABLED) ++ IF( UNIX ) ++ # Use GNUInstallDirs for Unix predefined directories ++ INCLUDE(GNUInstallDirs) ++ ++ SET( ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) ++ SET( ASSIMP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}) ++ SET( ASSIMP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) ++ ELSE() ++ # Cache these to allow the user to override them on non-Unix platforms ++ SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING ++ "Path the built library files are installed to." ) ++ SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING ++ "Path the header files are installed to." ) ++ SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING ++ "Path the tool executables are installed to." ) ++ ++ SET(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_INCLUDE_INSTALL_DIR}) ++ SET(CMAKE_INSTALL_FULL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR}) ++ SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_BIN_INSTALL_DIR}) ++ ENDIF() + # cmake configuration files + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE) + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE) +diff --git a/assimp.pc.in b/assimp.pc.in +index c659e19..555a3a1 100644 +--- a/assimp.pc.in ++++ b/assimp.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_PREFIX@/ +-libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@ +-includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @CMAKE_PROJECT_NAME@ + Description: Import various well-known 3D model formats in an uniform manner. +diff --git a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in +index 1ebe2a6..f5034c9 100644 +--- a/assimpTargets-debug.cmake.in ++++ b/assimpTargets-debug.cmake.in +@@ -42,22 +42,22 @@ if(MSVC) + # Import target "assimp::assimp" for configuration "Debug" + set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/${importLibraryName}" +- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ++ IMPORTED_IMPLIB_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}" ++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}") +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}") ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" ) + else() + set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@") + + # Import target "assimp::assimp" for configuration "Debug" + set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}") ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}") + endif() + + else() +@@ -66,17 +66,17 @@ else() + set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@") + set_target_properties(assimp::assimp PROPERTIES + IMPORTED_SONAME_DEBUG "${sharedLibraryName}" +- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" ) + else() + set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@") + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" ) + endif() + endif() + +diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in +index f3db8f1..89f1a14 100644 +--- a/assimpTargets-release.cmake.in ++++ b/assimpTargets-release.cmake.in +@@ -42,22 +42,22 @@ if(MSVC) + # Import target "assimp::assimp" for configuration "Release" + set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}" +- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ++ IMPORTED_IMPLIB_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}" ++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}") +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}") ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" ) + else() + set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@") + + # Import target "assimp::assimp" for configuration "Release" + set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}") ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}") + endif() + + else() +@@ -70,17 +70,17 @@ else() + endif() + set_target_properties(assimp::assimp PROPERTIES + IMPORTED_SONAME_RELEASE "${sharedLibraryName}" +- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" ) + else() + set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@") + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" ) + endif() + endif() + +diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in +index ab1a8d2..ef90c83 100644 +--- a/assimpTargets.cmake.in ++++ b/assimpTargets.cmake.in +@@ -40,16 +40,6 @@ unset(_targetsDefined) + unset(_targetsNotDefined) + unset(_expectedTargets) + +- +-# Compute the installation prefix relative to this file. +-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +-if(_IMPORT_PREFIX STREQUAL "/") +- set(_IMPORT_PREFIX "") +-endif() +- + # Create imported target assimp::assimp + if(@BUILD_SHARED_LIBS@) + add_library(assimp::assimp SHARED IMPORTED) +@@ -60,7 +50,7 @@ endif() + set_target_properties(assimp::assimp PROPERTIES + COMPATIBLE_INTERFACE_STRING "assimp_MAJOR_VERSION" + INTERFACE_assimp_MAJOR_VERSION "1" +- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include" ++ INTERFACE_INCLUDE_DIRECTORIES "@CMAKE_INSTALL_FULL_INCLUDEDIR@" + #INTERFACE_LINK_LIBRARIES "TxtUtils::TxtUtils;MealyMachine::MealyMachine" + ) + +@@ -75,9 +65,6 @@ foreach(f ${CONFIG_FILES}) + include(${f}) + endforeach() + +-# Cleanup temporary variables. +-set(_IMPORT_PREFIX) +- + # Loop over all imported files and verify that they actually exist + foreach(target ${_IMPORT_CHECK_TARGETS} ) + foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) +-- +2.26.2 + diff --git a/assimp.changes b/assimp.changes index 9a322e7..4e66d29 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 10 09:38:02 UTC 2020 - Christophe Giboudeaux + +- Add upstream patch to fix the broken CMake config files: + * 0001-use-GNUInstallDirs-where-possible.patch + (adapted for the 5.0.1 release) + ------------------------------------------------------------------- Wed May 20 13:15:44 UTC 2020 - Ferdinand Thiessen diff --git a/assimp.spec b/assimp.spec index cfa2108..983b156 100644 --- a/assimp.spec +++ b/assimp.spec @@ -26,6 +26,8 @@ Group: Development/Libraries/C and C++ URL: https://assimp.org/ Source0: https://github.com/assimp/assimp/archive/v%{version}/assimp-%{version}.tar.gz Patch0: do-not-install-irrXML.patch +# PATCH-FIX-UPSTREAM -- Don't hardcode the library and binary location +Patch1: 0001-use-GNUInstallDirs-where-possible.patch BuildRequires: cmake BuildRequires: dos2unix BuildRequires: gcc-c++ @@ -72,13 +74,12 @@ it is primarily useful for importing assets from various sources once and storin engine-specific format for easy and fast every-day-loading. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build -%cmake \ - -DASSIMP_LIB_INSTALL_DIR="%{_libdir}" -%make_build +%cmake + +%cmake_build %install %cmake_install From 14687895c2d4f9fe1811ba9bfae473cb01cd1230bfd33e747b2b9200531d03f5 Mon Sep 17 00:00:00 2001 From: Dmitriy Perlow Date: Tue, 14 Jul 2020 06:44:55 +0000 Subject: [PATCH 7/7] Accepting request 819823 from home:cgiboudeaux:Qt6 - Restore the _service file. Assimp still ships files which are not allowed in openSUSE. OBS-URL: https://build.opensuse.org/request/show/819823 OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=14 --- _service | 15 +++++++++++++++ assimp-5.0.1.tar.gz | 3 --- assimp-5.0.1.tar.xz | 3 +++ assimp.changes | 7 +++++++ assimp.spec | 2 +- 5 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 _service delete mode 100644 assimp-5.0.1.tar.gz create mode 100644 assimp-5.0.1.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..1891fd2 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + git + git://github.com/assimp/assimp + v5.0.1 + 5.0.1 + + test/models-nonbsd + + + *.tar + xz + + + diff --git a/assimp-5.0.1.tar.gz b/assimp-5.0.1.tar.gz deleted file mode 100644 index 8f6f21e..0000000 --- a/assimp-5.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc -size 46607553 diff --git a/assimp-5.0.1.tar.xz b/assimp-5.0.1.tar.xz new file mode 100644 index 0000000..e83b2b7 --- /dev/null +++ b/assimp-5.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55a496e015c79ef35f49d4a8b6fe4d8418781b83966b2943fa3923021205a7f2 +size 22351472 diff --git a/assimp.changes b/assimp.changes index 4e66d29..99cb9a8 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 9 20:42:17 UTC 2020 - Christophe Giboudeaux + +- Restore the _service file. + +Assimp still ships files which are not allowed in openSUSE. + ------------------------------------------------------------------- Wed Jun 10 09:38:02 UTC 2020 - Christophe Giboudeaux diff --git a/assimp.spec b/assimp.spec index 983b156..19111dc 100644 --- a/assimp.spec +++ b/assimp.spec @@ -24,7 +24,7 @@ Summary: Library to load and process 3D scenes from various data formats License: BSD-3-Clause AND MIT Group: Development/Libraries/C and C++ URL: https://assimp.org/ -Source0: https://github.com/assimp/assimp/archive/v%{version}/assimp-%{version}.tar.gz +Source0: %{name}-%{version}.tar.xz Patch0: do-not-install-irrXML.patch # PATCH-FIX-UPSTREAM -- Don't hardcode the library and binary location Patch1: 0001-use-GNUInstallDirs-where-possible.patch