From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 634CA138330 for ; Mon, 26 Sep 2016 06:14:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D91C0E0C25; Mon, 26 Sep 2016 06:14:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 323DFE0C25 for ; Mon, 26 Sep 2016 06:14:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1E1C340906 for ; Mon, 26 Sep 2016 06:14:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A2C10245E for ; Mon, 26 Sep 2016 06:14:08 +0000 (UTC) From: "Slawek Lis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slawek Lis" Message-ID: <1474869988.4053dbec8127eec2d8062731f08a020ffd0c5661.slis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/assimp/assimp-3.3.1.ebuild media-libs/assimp/files/findassimp-3.3.1.patch X-VCS-Directories: media-libs/assimp/ media-libs/assimp/files/ X-VCS-Committer: slis X-VCS-Committer-Name: Slawek Lis X-VCS-Revision: 4053dbec8127eec2d8062731f08a020ffd0c5661 X-VCS-Branch: master Date: Mon, 26 Sep 2016 06:14:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2675dcdf-0ed6-4a43-9453-f6f42aeaad20 X-Archives-Hash: b4d5823341b4cbf178af51fb78ac8bf3 commit: 4053dbec8127eec2d8062731f08a020ffd0c5661 Author: Slawomir Lis gentoo org> AuthorDate: Mon Sep 26 06:06:28 2016 +0000 Commit: Slawek Lis gentoo 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 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)