1 |
commit: ffb6a46687b3a16ca1f9ebdb0fcd9e04bf910c4e |
2 |
Author: Slawomir Lis <slis <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 22 03:36:22 2019 +0000 |
4 |
Commit: Slawek Lis <slis <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 22 03:36:42 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb6a466 |
7 |
|
8 |
media-libs/assimp: version bump to 4.1.0 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/653992 |
11 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
12 |
Signed-off-by: Slawek Lis <slis <AT> gentoo.org> |
13 |
|
14 |
media-libs/assimp/Manifest | 1 + |
15 |
media-libs/assimp/assimp-4.1.0.ebuild | 65 ++++++++++++++++++++++ |
16 |
.../assimp/files/assimp-4.1.0-disabletest.patch | 10 ++++ |
17 |
.../assimp/files/assimp-4.1.0-unzip-of.patch | 11 ++++ |
18 |
4 files changed, 87 insertions(+) |
19 |
|
20 |
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest |
21 |
index 6e8afcaf3dc..76d568f91e9 100644 |
22 |
--- a/media-libs/assimp/Manifest |
23 |
+++ b/media-libs/assimp/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb |
26 |
+DIST assimp-4.1.0.tar.gz 45417293 BLAKE2B 74170ab48b64ab357ddd9da58f1218d0c3c0a4039345dcd7ae396aca3bb47c2f5ea2ee8b61b7d81c68c2e1237cd3ba516b816038400e9960b6c0cfe031a41e54 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a |
27 |
|
28 |
diff --git a/media-libs/assimp/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..05020030504 |
31 |
--- /dev/null |
32 |
+++ b/media-libs/assimp/assimp-4.1.0.ebuild |
33 |
@@ -0,0 +1,65 @@ |
34 |
+# Copyright 1999-2019 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=6 |
38 |
+ |
39 |
+inherit cmake-utils |
40 |
+ |
41 |
+DESCRIPTION="Importer library to import assets from 3D files" |
42 |
+HOMEPAGE="https://github.com/assimp/assimp" |
43 |
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
44 |
+ |
45 |
+LICENSE="BSD" |
46 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
47 |
+IUSE="samples static test tools" |
48 |
+SLOT="0" |
49 |
+ |
50 |
+RDEPEND=" |
51 |
+ dev-libs/boost:= |
52 |
+ sys-libs/zlib:=[minizip] |
53 |
+ samples? ( |
54 |
+ media-libs/freeglut |
55 |
+ virtual/opengl |
56 |
+ x11-libs/libX11 |
57 |
+ ) |
58 |
+ tools? ( |
59 |
+ dev-qt/qtcore:5 |
60 |
+ dev-qt/qtgui:5 |
61 |
+ dev-qt/qtopengl:5 |
62 |
+ dev-qt/qtwidgets:5 |
63 |
+ media-libs/devil |
64 |
+ virtual/opengl |
65 |
+ ) |
66 |
+" |
67 |
+DEPEND="${RDEPEND} |
68 |
+ test? ( dev-cpp/gtest ) |
69 |
+" |
70 |
+ |
71 |
+PATCHES=( |
72 |
+ "${FILESDIR}/${P}-disabletest.patch" # bug 659122 |
73 |
+ "${FILESDIR}/${P}-unzip-of.patch" |
74 |
+) |
75 |
+ |
76 |
+src_configure() { |
77 |
+ local mycmakeargs=( |
78 |
+ -DASSIMP_BUILD_SAMPLES=$(usex samples) |
79 |
+ -DASSIMP_BUILD_STATIC_LIB=$(usex static) |
80 |
+ -DASSIMP_BUILD_TESTS=$(usex test) |
81 |
+ -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools) |
82 |
+ -DCMAKE_DEBUG_POSTFIX="" |
83 |
+ -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/" |
84 |
+ ) |
85 |
+ |
86 |
+ cmake-utils_src_configure |
87 |
+} |
88 |
+ |
89 |
+src_install() { |
90 |
+ cmake-utils_src_install |
91 |
+ |
92 |
+ insinto /usr/share/cmake/Modules |
93 |
+ doins cmake-modules/Findassimp.cmake |
94 |
+} |
95 |
+ |
96 |
+src_test() { |
97 |
+ "${BUILD_DIR}/test/unit" || die |
98 |
+} |
99 |
|
100 |
diff --git a/media-libs/assimp/files/assimp-4.1.0-disabletest.patch b/media-libs/assimp/files/assimp-4.1.0-disabletest.patch |
101 |
new file mode 100644 |
102 |
index 00000000000..4afe5bbd26b |
103 |
--- /dev/null |
104 |
+++ b/media-libs/assimp/files/assimp-4.1.0-disabletest.patch |
105 |
@@ -0,0 +1,10 @@ |
106 |
+--- a/test/unit/utVersion.cpp 2017-07-28 22:33:41.000000000 +0200 |
107 |
++++ b/test/unit/utVersion.cpp 2018-08-26 01:48:54.935116440 +0200 |
108 |
+@@ -65,7 +65,3 @@ |
109 |
+ EXPECT_NE( aiGetCompileFlags(), 0U ); |
110 |
+ } |
111 |
+ |
112 |
+-TEST_F( utVersion, aiGetVersionRevisionTest ) { |
113 |
+- EXPECT_NE( aiGetVersionRevision(), 0U ); |
114 |
+-} |
115 |
+- |
116 |
|
117 |
diff --git a/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch |
118 |
new file mode 100644 |
119 |
index 00000000000..e75b47a1af4 |
120 |
--- /dev/null |
121 |
+++ b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch |
122 |
@@ -0,0 +1,11 @@ |
123 |
+--- a/contrib/unzip/unzip.h 2019-08-21 21:38:10.991542891 +0200 |
124 |
++++ b/contrib/unzip/unzip.h 2019-08-21 21:38:24.507543226 +0200 |
125 |
+@@ -45,6 +45,8 @@ |
126 |
+ #ifndef _unz_H |
127 |
+ #define _unz_H |
128 |
+ |
129 |
++#define OF _Z_OF |
130 |
++ |
131 |
+ #ifdef __cplusplus |
132 |
+ extern "C" { |
133 |
+ #endif |