rpm/assimp
SHA256
1
0
Fork 0
forked from pool/assimp
Code Pull Requests Activity

Accepting request 807744 from home:susnux:branches:games

Browse Source 
- 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
This commit is contained in:
Dmitriy Perlow 2020-05-31 16:27:49 +00:00 committed by Git OBS Bridge
parent 353b15e00a
commit b915aab554
8 changed files with 38 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
_service
View File

@ -1,15 +0,0 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">git://github.com/assimp/assimp</param>
<param name="revision">v4.1.0</param>
<param name="versionformat">4.1.0</param>
<!-- non-OSI media -->
<param name="exclude">test/models-nonbsd</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

3
assimp-4.1.0.tar.xz
View File

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

3
assimp-5.0.1.tar.gz Normal file
View File

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

18
assimp.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed May 20 13:15:44 UTC 2020 - Ferdinand Thiessen <rpm@fthiessen.de>
- 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 <jengelh@inai.de>

36
assimp.spec
View File

@ -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

13
disable-gitrevision-test.patch
View File

@ -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 );
}
+*/

14
do-not-install-irrXML.patch
View File

@ -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})

11
install-viewer.patch
View File

@ -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
+)