diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-05-16 13:11:21 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-05-16 14:09:22 +0200 |
| commit | 02d2520b61e0c7d054020e6cbe63264bc8d2f5f9 (patch) | |
| tree | c3434ae7e975eea5c682d7cbd6e71a921e5b7eb3 /media-libs | |
| parent | net-fs/samba: Bump to version 4.8.2 (diff) | |
| download | gentoo-02d2520b61e0c7d054020e6cbe63264bc8d2f5f9.tar.gz gentoo-02d2520b61e0c7d054020e6cbe63264bc8d2f5f9.tar.bz2 gentoo-02d2520b61e0c7d054020e6cbe63264bc8d2f5f9.zip | |
media-libs/assimp: QA: Drop duplicate patch
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/assimp/assimp-4.0.0.ebuild | 2 | ||||
| -rw-r--r-- | media-libs/assimp/files/findassimp-4.0.0.patch | 25 |
2 files changed, 1 insertions, 26 deletions
diff --git a/media-libs/assimp/assimp-4.0.0.ebuild b/media-libs/assimp/assimp-4.0.0.ebuild index e051dd165eaf..2518909a9b24 100644 --- a/media-libs/assimp/assimp-4.0.0.ebuild +++ b/media-libs/assimp/assimp-4.0.0.ebuild @@ -23,7 +23,7 @@ DEPEND="${RDEPEND} test? ( dev-cpp/gtest ) " -PATCHES=( "${FILESDIR}/findassimp-${PV}.patch" ) +PATCHES=( "${FILESDIR}/findassimp-3.3.1.patch" ) src_configure() { local mycmakeargs=( diff --git a/media-libs/assimp/files/findassimp-4.0.0.patch b/media-libs/assimp/files/findassimp-4.0.0.patch deleted file mode 100644 index 2fbaa73a8500..000000000000 --- a/media-libs/assimp/files/findassimp-4.0.0.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/cmake-modules/Findassimp.cmake 2017-07-24 08:21:12.436647541 +0200 -+++ b/cmake-modules/Findassimp.cmake 2017-07-24 08:21:30.139980768 +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) |