media-libs/assimp: Patched findassimp cmake script

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Slawek Lis <slis@gentoo.org>

diff --git a/media-libs/assimp/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild
index 050200305045ee06c1ffa97bafbc26a4c58fff44..00b042528bb692031357685fb5b7e0c2987cfaa2 100644 (file)
--- a/media-libs/assimp/assimp-4.1.0.ebuild
+++ b/media-libs/assimp/assimp-4.1.0.ebuild
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
        "${FILESDIR}/${P}-disabletest.patch" # bug 659122
        "${FILESDIR}/${P}-unzip-of.patch"
+       "${FILESDIR}/${P}-findassimp.patch"
 )
 
 src_configure() {

diff --git a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
new file mode 100644 (file)
index 0000000..c2a3230
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
@@ -0,0 +1,25 @@
+--- 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
+@@ -56,12 +56,15 @@
+         assimp_INCLUDE_DIRS
+         NAMES postprocess.h scene.h version.h config.h 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)