[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/, media-libs/assimp/files/

["Slawek Lis" <slis@gentoo.org>]

commit:     bf499ff6e315e46b3557d460a8f656525e8cfc85
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 06:31:56 2017 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 06:30:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf499ff6

media-libs/assimp: version bump to 4.0.0

Reported in #625948

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 media-libs/assimp/Manifest                     |  1 +
 media-libs/assimp/assimp-4.0.0.ebuild          | 53 ++++++++++++++++++++++++++
 media-libs/assimp/files/findassimp-4.0.0.patch | 25 ++++++++++++
 3 files changed, 79 insertions(+)

diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 32ab0053144..aa539541f86 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -2,3 +2,4 @@ DIST assimp--3.0.1270-source-only.zip 4042147 SHA256 ac29beb596db97df57451a5503a
 DIST assimp-3.1.1.zip 32869052 SHA256 3b8d16eaf6c4b26479295f4f7436388bee1e42e8c0b11f6f695b7194985eb00e SHA512 c466d312c0db53fa31b5d1e9b0f65e547a82fb28b1df0a6a96f0dcd876b636a6883d9d705d325193acc58910272b5f158ba37d824ecad29eccf7cf5731697527 WHIRLPOOL 238a79a7e2c7ce799dc89394043962456af06eb8b6ed105893512cb751919287c70c88030b03832ba2f3e6ea54d82db4e8d6009629bb7ed3f3e5e6df78bbd6c6
 DIST assimp-3.2.tar.gz 33756081 SHA256 187f825c563e84b1b17527a4da0351aa3d575dfd696a9d204ae4bb19ee7df94a SHA512 d9c4b1efc319990726605664ef38fda49d23a8f169261dda007d912015f404737b2c2a8306bffb837827e4a62d5fb362dae384b85b865450a5622325fe13ad7a WHIRLPOOL 1a1cb97356a888863f1183a6cc838cccabda1ffa5d89265f94fb231df24be2cadffbdeb72763826000b80d513e2003d81aca6d20aae7bce09428194ef45f6888
 DIST assimp-3.3.1.tar.gz 36428380 SHA256 d385c3f90876241343f09e45f4e5033a6a05861b971c63d1f6d512371ffdc7bf SHA512 660a720f1698e12e6505a554638b15108dfe94f081eb61c675bba9ae979fd80fe8552f6c4c366ff391be6cb34e799c5cf000f621f064105a161caedc82dd934a WHIRLPOOL 9aba3cc73641ae130c0d3522b32c1bd5afd16eb9b599c1dff8cc1bcb71952b109420eeb7bc3474fc21bbedf79ed58e14743983d6bee01c4e3e5305d447bb9316
+DIST assimp-4.0.0.tar.gz 44618473 SHA256 9025d7fdd2a1d1d23261cbbcb1155b267f2a277f7e86103e5e16f1cdea407fb9 SHA512 ab2b376c6323fc8579fe3a4b3dbe92c44d753747464a14d6e2be70d2a855c208df882ad84487a7b96f364afb175938b5f6a1111d767450b01e0b8b7f0f36ba62 WHIRLPOOL 4082275dce5244433f501be420ba59a62ba562269daafd985d0bf0e9be013da57ae9390ba2df210b8765612b873078703b6d6bd1884066c2375004fd13c7cbcf

diff --git a/media-libs/assimp/assimp-4.0.0.ebuild b/media-libs/assimp/assimp-4.0.0.ebuild
new file mode 100644
index 00000000000..c96cc0c1651
--- /dev/null
+++ b/media-libs/assimp/assimp-4.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils versionator multilib
+
+DESCRIPTION="Importer library to import assets from 3D files"
+HOMEPAGE="https://github.com/assimp/assimp"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="samples static test tools"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/boost
+	samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+	eapply "${FILESDIR}/findassimp-${PV}.patch"
+	eapply_user
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DASSIMP_BUILD_SAMPLES=$(usex samples) \
+		-DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools) \
+		-DASSIMP_BUILD_STATIC_LIB=$(usex static) \
+		-DASSIMP_BUILD_TESTS=$(usex test)
+		-DCMAKE_DEBUG_POSTFIX=""
+		-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/cmake/Modules
+	doins cmake-modules/Findassimp.cmake
+}
+
+src_test() {
+	"${BUILD_DIR}/test/unit" || die
+}

diff --git a/media-libs/assimp/files/findassimp-4.0.0.patch b/media-libs/assimp/files/findassimp-4.0.0.patch
new file mode 100644
index 00000000000..2fbaa73a850
--- /dev/null
+++ b/media-libs/assimp/files/findassimp-4.0.0.patch
@@ -0,0 +1,25 @@
+--- 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)