1 |
commit: bf499ff6e315e46b3557d460a8f656525e8cfc85 |
2 |
Author: Slawomir Lis <slis <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 24 06:31:56 2017 +0000 |
4 |
Commit: Slawek Lis <slis <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 24 06:30:44 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf499ff6 |
7 |
|
8 |
media-libs/assimp: version bump to 4.0.0 |
9 |
|
10 |
Reported in #625948 |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
13 |
|
14 |
media-libs/assimp/Manifest | 1 + |
15 |
media-libs/assimp/assimp-4.0.0.ebuild | 53 ++++++++++++++++++++++++++ |
16 |
media-libs/assimp/files/findassimp-4.0.0.patch | 25 ++++++++++++ |
17 |
3 files changed, 79 insertions(+) |
18 |
|
19 |
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest |
20 |
index 32ab0053144..aa539541f86 100644 |
21 |
--- a/media-libs/assimp/Manifest |
22 |
+++ b/media-libs/assimp/Manifest |
23 |
@@ -2,3 +2,4 @@ DIST assimp--3.0.1270-source-only.zip 4042147 SHA256 ac29beb596db97df57451a5503a |
24 |
DIST assimp-3.1.1.zip 32869052 SHA256 3b8d16eaf6c4b26479295f4f7436388bee1e42e8c0b11f6f695b7194985eb00e SHA512 c466d312c0db53fa31b5d1e9b0f65e547a82fb28b1df0a6a96f0dcd876b636a6883d9d705d325193acc58910272b5f158ba37d824ecad29eccf7cf5731697527 WHIRLPOOL 238a79a7e2c7ce799dc89394043962456af06eb8b6ed105893512cb751919287c70c88030b03832ba2f3e6ea54d82db4e8d6009629bb7ed3f3e5e6df78bbd6c6 |
25 |
DIST assimp-3.2.tar.gz 33756081 SHA256 187f825c563e84b1b17527a4da0351aa3d575dfd696a9d204ae4bb19ee7df94a SHA512 d9c4b1efc319990726605664ef38fda49d23a8f169261dda007d912015f404737b2c2a8306bffb837827e4a62d5fb362dae384b85b865450a5622325fe13ad7a WHIRLPOOL 1a1cb97356a888863f1183a6cc838cccabda1ffa5d89265f94fb231df24be2cadffbdeb72763826000b80d513e2003d81aca6d20aae7bce09428194ef45f6888 |
26 |
DIST assimp-3.3.1.tar.gz 36428380 SHA256 d385c3f90876241343f09e45f4e5033a6a05861b971c63d1f6d512371ffdc7bf SHA512 660a720f1698e12e6505a554638b15108dfe94f081eb61c675bba9ae979fd80fe8552f6c4c366ff391be6cb34e799c5cf000f621f064105a161caedc82dd934a WHIRLPOOL 9aba3cc73641ae130c0d3522b32c1bd5afd16eb9b599c1dff8cc1bcb71952b109420eeb7bc3474fc21bbedf79ed58e14743983d6bee01c4e3e5305d447bb9316 |
27 |
+DIST assimp-4.0.0.tar.gz 44618473 SHA256 9025d7fdd2a1d1d23261cbbcb1155b267f2a277f7e86103e5e16f1cdea407fb9 SHA512 ab2b376c6323fc8579fe3a4b3dbe92c44d753747464a14d6e2be70d2a855c208df882ad84487a7b96f364afb175938b5f6a1111d767450b01e0b8b7f0f36ba62 WHIRLPOOL 4082275dce5244433f501be420ba59a62ba562269daafd985d0bf0e9be013da57ae9390ba2df210b8765612b873078703b6d6bd1884066c2375004fd13c7cbcf |
28 |
|
29 |
diff --git a/media-libs/assimp/assimp-4.0.0.ebuild b/media-libs/assimp/assimp-4.0.0.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..c96cc0c1651 |
32 |
--- /dev/null |
33 |
+++ b/media-libs/assimp/assimp-4.0.0.ebuild |
34 |
@@ -0,0 +1,53 @@ |
35 |
+# Copyright 1999-2017 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=6 |
39 |
+ |
40 |
+inherit cmake-utils versionator multilib |
41 |
+ |
42 |
+DESCRIPTION="Importer library to import assets from 3D files" |
43 |
+HOMEPAGE="https://github.com/assimp/assimp" |
44 |
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
45 |
+ |
46 |
+LICENSE="BSD" |
47 |
+KEYWORDS="~amd64 ~arm ~x86" |
48 |
+IUSE="samples static test tools" |
49 |
+SLOT="0" |
50 |
+ |
51 |
+RDEPEND=" |
52 |
+ dev-libs/boost |
53 |
+ samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) |
54 |
+ sys-libs/zlib |
55 |
+" |
56 |
+DEPEND="${RDEPEND} |
57 |
+ test? ( dev-cpp/gtest ) |
58 |
+" |
59 |
+ |
60 |
+src_prepare() { |
61 |
+ eapply "${FILESDIR}/findassimp-${PV}.patch" |
62 |
+ eapply_user |
63 |
+} |
64 |
+ |
65 |
+src_configure() { |
66 |
+ mycmakeargs=( |
67 |
+ -DASSIMP_BUILD_SAMPLES=$(usex samples) \ |
68 |
+ -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools) \ |
69 |
+ -DASSIMP_BUILD_STATIC_LIB=$(usex static) \ |
70 |
+ -DASSIMP_BUILD_TESTS=$(usex test) |
71 |
+ -DCMAKE_DEBUG_POSTFIX="" |
72 |
+ -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/" |
73 |
+ ) |
74 |
+ |
75 |
+ cmake-utils_src_configure |
76 |
+} |
77 |
+ |
78 |
+src_install() { |
79 |
+ cmake-utils_src_install |
80 |
+ |
81 |
+ insinto /usr/share/cmake/Modules |
82 |
+ doins cmake-modules/Findassimp.cmake |
83 |
+} |
84 |
+ |
85 |
+src_test() { |
86 |
+ "${BUILD_DIR}/test/unit" || die |
87 |
+} |
88 |
|
89 |
diff --git a/media-libs/assimp/files/findassimp-4.0.0.patch b/media-libs/assimp/files/findassimp-4.0.0.patch |
90 |
new file mode 100644 |
91 |
index 00000000000..2fbaa73a850 |
92 |
--- /dev/null |
93 |
+++ b/media-libs/assimp/files/findassimp-4.0.0.patch |
94 |
@@ -0,0 +1,25 @@ |
95 |
+--- a/cmake-modules/Findassimp.cmake 2017-07-24 08:21:12.436647541 +0200 |
96 |
++++ b/cmake-modules/Findassimp.cmake 2017-07-24 08:21:30.139980768 +0200 |
97 |
+@@ -55,13 +55,13 @@ |
98 |
+ find_path( |
99 |
+ assimp_INCLUDE_DIRS |
100 |
+ NAMES postprocess.h scene.h version.h config.h cimport.h |
101 |
+- PATHS /usr/local/include/ |
102 |
++ PATHS /usr/include/ |
103 |
+ ) |
104 |
+ |
105 |
+ find_library( |
106 |
+ assimp_LIBRARIES |
107 |
+ NAMES assimp |
108 |
+- PATHS /usr/local/lib/ |
109 |
++ PATHS /usr/lib/ |
110 |
+ ) |
111 |
+ |
112 |
+ if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) |
113 |
+@@ -78,4 +78,4 @@ |
114 |
+ endif (assimp_FIND_REQUIRED) |
115 |
+ endif (assimp_FOUND) |
116 |
+ |
117 |
+-endif(WIN32) |
118 |
+\ Brak znaku nowej linii na końcu pliku |
119 |
++endif(WIN32) |