diff options
| author |   Slawomir Lis <slis@gentoo.org> | 2016-09-26 08:06:28 +0200 |
|---|---|---|
| committer | Slawomir Lis <slis@gentoo.org> | 2016-09-26 08:06:28 +0200 |
| commit | 4053dbec8127eec2d8062731f08a020ffd0c5661 (patch) | |
| tree | d8fe552876dc5f4e8ccc157e6ea37483d6e7ecb0 | |
| parent | net-libs/nghttp2: Removed old. (diff) | |
| download | gentoo-4053dbec8127eec2d8062731f08a020ffd0c5661.tar.gz gentoo-4053dbec8127eec2d8062731f08a020ffd0c5661.tar.bz2 gentoo-4053dbec8127eec2d8062731f08a020ffd0c5661.zip | |
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@laposte.net>
Package-Manager: portage-2.3.1
| -rw-r--r-- | media-libs/assimp/assimp-3.3.1.ebuild | 5 | ||||
| -rw-r--r-- | media-libs/assimp/files/findassimp-3.3.1.patch | 25 |
2 files changed, 30 insertions, 0 deletions
diff --git a/media-libs/assimp/assimp-3.3.1.ebuild b/media-libs/assimp/assimp-3.3.1.ebuild index 02d5f9523e63..823efd807deb 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 000000000000..0f36fafb0152 --- /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) |