commit: 4053dbec8127eec2d8062731f08a020ffd0c5661
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 06:06:28 2016 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 06:06:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4053dbec
media-libs/assimp: patch that fixes Findassimp cmake module path
In default assimp installation there are hardcoded paths for /usr/local/lib
Reported in bug 595066
Reported-By: Patrick Nicolas <patricknicolas <AT> laposte.net>
Package-Manager: portage-2.3.1
media-libs/assimp/assimp-3.3.1.ebuild | 5 +++++
media-libs/assimp/files/findassimp-3.3.1.patch | 25 +++++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/media-libs/assimp/assimp-3.3.1.ebuild
b/media-libs/assimp/assimp-3.3.1.ebuild
index 02d5f95..823efd8 100644
--- a/media-libs/assimp/assimp-3.3.1.ebuild
+++ b/media-libs/assimp/assimp-3.3.1.ebuild
@@ -24,6 +24,11 @@ DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )
"
+src_prepare() {
+ eapply "${FILESDIR}/findassimp-${PV}.patch"
+ eapply_user
+}
+
src_configure() {
mycmakeargs=(
-DASSIMP_BUILD_SAMPLES=$(usex samples) \
diff --git a/media-libs/assimp/files/findassimp-3.3.1.patch
b/media-libs/assimp/files/findassimp-3.3.1.patch
new file mode 100644
index 00000000..0f36faf
--- /dev/null
+++ b/media-libs/assimp/files/findassimp-3.3.1.patch
@@ -0,0 +1,25 @@
+--- a/cmake-modules/Findassimp.cmake 2016-09-26 07:52:09.719727490 +0200
++++ b/cmake-modules/Findassimp.cmake 2016-09-26 07:52:28.509727838 +0200
+@@ -55,13 +55,13 @@
+ find_path(
+ 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/
+ )
+
+ if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+@@ -78,4 +78,4 @@
+ endif (assimp_FIND_REQUIRED)
+ endif (assimp_FOUND)
+
+-endif(WIN32)
+\ Brak znaku nowej linii na końcu pliku
++endif(WIN32)
