diff options
| author |   Slawomir Lis <slis@gentoo.org> | 2019-11-18 11:49:05 +0100 |
|---|---|---|
| committer | Slawomir Lis <slis@gentoo.org> | 2019-11-18 11:49:35 +0100 |
| commit | 5d3c7dcb2b6201ac96a7685d8978afe8f9e54eb8 (patch) | |
| tree | e390254be4f6365eca3001500f66f0019dec395f /media-libs/assimp/files | |
| parent | dev-python/snakeoil: drop pytest-mock test dep (diff) | |
| download | gentoo-5d3c7dcb2b6201ac96a7685d8978afe8f9e54eb8.tar.gz gentoo-5d3c7dcb2b6201ac96a7685d8978afe8f9e54eb8.tar.bz2 gentoo-5d3c7dcb2b6201ac96a7685d8978afe8f9e54eb8.zip | |
media-libs/assimp: version bump to 5.0.0
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Slawek Lis <slis@gentoo.org>
Diffstat (limited to 'media-libs/assimp/files')
| -rw-r--r-- | media-libs/assimp/files/assimp-5.0.0-disabletest.patch | 13 | ||||
| -rw-r--r-- | media-libs/assimp/files/assimp-5.0.0-findassimp.patch | 28 | ||||
| -rw-r--r-- | media-libs/assimp/files/assimp-5.0.0-unzip-of.patch | 11 |
3 files changed, 52 insertions, 0 deletions
diff --git a/media-libs/assimp/files/assimp-5.0.0-disabletest.patch b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch new file mode 100644 index 000000000000..d5343c113668 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch @@ -0,0 +1,13 @@ +--- a/test/unit/utVersion.cpp 2019-11-18 11:39:09.655298634 +0100 ++++ b/test/unit/utVersion.cpp 2019-11-18 11:39:25.823299035 +0100 +@@ -66,10 +66,6 @@ + EXPECT_NE( aiGetCompileFlags(), 0U ); + } + +-TEST_F( utVersion, aiGetVersionRevisionTest ) { +- EXPECT_NE( aiGetVersionRevision(), 0U ); +-} +- + TEST_F( utVersion, aiGetBranchNameTest ) { + EXPECT_NE( nullptr, aiGetBranchName() ); + } diff --git a/media-libs/assimp/files/assimp-5.0.0-findassimp.patch b/media-libs/assimp/files/assimp-5.0.0-findassimp.patch new file mode 100644 index 000000000000..6056f4973c55 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.0-findassimp.patch @@ -0,0 +1,28 @@ +--- a/cmake-modules/Findassimp.cmake 2019-10-08 08:08:29.025321121 +0200 ++++ b/cmake-modules/Findassimp.cmake 2019-10-08 08:09:47.976323079 +0200 +@@ -54,14 +54,17 @@ + + find_path( + assimp_INCLUDE_DIRS +- NAMES postprocess.h scene.h version.h config.h cimport.h ++ NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h + PATHS /usr/local/include/ ++ PATHS /usr/include/ + ) + + find_library( + assimp_LIBRARIES + NAMES assimp + PATHS /usr/local/lib/ ++ PATHS /usr/lib/ ++ PATHS /usr/lib64/ + ) + + if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) +@@ -78,4 +81,4 @@ + endif (assimp_FIND_REQUIRED) + endif (assimp_FOUND) + +-endif(WIN32) +\ Brak znaku nowej linii na końcu pliku ++endif(WIN32) diff --git a/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch b/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch new file mode 100644 index 000000000000..e75b47a1af4b --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch @@ -0,0 +1,11 @@ +--- a/contrib/unzip/unzip.h 2019-08-21 21:38:10.991542891 +0200 ++++ b/contrib/unzip/unzip.h 2019-08-21 21:38:24.507543226 +0200 +@@ -45,6 +45,8 @@ + #ifndef _unz_H + #define _unz_H + ++#define OF _Z_OF ++ + #ifdef __cplusplus + extern "C" { + #endif |