Gentoo Archives: gentoo-commits

From: Slawek Lis <slis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/, media-libs/assimp/
Date: Mon, 18 Nov 2019 10:50:29
Message-Id: 1574074175.5d3c7dcb2b6201ac96a7685d8978afe8f9e54eb8.slis@gentoo
1 commit: 5d3c7dcb2b6201ac96a7685d8978afe8f9e54eb8
2 Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 18 10:49:05 2019 +0000
4 Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 18 10:49:35 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d3c7dcb
7
8 media-libs/assimp: version bump to 5.0.0
9
10 Package-Manager: Portage-2.3.77, Repoman-2.3.17
11 Signed-off-by: Slawek Lis <slis <AT> gentoo.org>
12
13 media-libs/assimp/Manifest | 1 +
14 media-libs/assimp/assimp-5.0.0.ebuild | 66 ++++++++++++++++++++++
15 .../assimp/files/assimp-5.0.0-disabletest.patch | 13 +++++
16 .../assimp/files/assimp-5.0.0-findassimp.patch | 28 +++++++++
17 .../assimp/files/assimp-5.0.0-unzip-of.patch | 11 ++++
18 5 files changed, 119 insertions(+)
19
20 diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
21 index 76d568f91e9..31741ac4ef0 100644
22 --- a/media-libs/assimp/Manifest
23 +++ b/media-libs/assimp/Manifest
24 @@ -1,2 +1,3 @@
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 +DIST assimp-5.0.0.tar.gz 46604597 BLAKE2B 850c84cce6c24c01c2db00d76337797f3e4a4e819e133cf194cac0a7344fa58cb4805e0d5eb29b434f651c0b977e2c0fc5dbe083557f19bb9fe7ccb6977428d1 SHA512 0f73b6e961cd8455d6b6c8c10ed8b99485d846c96377b5d4fcc3b83f737647207c1306aa3dd51dad9654fbfa61bfe1119b34646f90288ae7ecab45efa6fa418a
28
29 diff --git a/media-libs/assimp/assimp-5.0.0.ebuild b/media-libs/assimp/assimp-5.0.0.ebuild
30 new file mode 100644
31 index 00000000000..00b042528bb
32 --- /dev/null
33 +++ b/media-libs/assimp/assimp-5.0.0.ebuild
34 @@ -0,0 +1,66 @@
35 +# Copyright 1999-2019 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=6
39 +
40 +inherit cmake-utils
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 ~arm64 ~x86"
48 +IUSE="samples static test tools"
49 +SLOT="0"
50 +
51 +RDEPEND="
52 + dev-libs/boost:=
53 + sys-libs/zlib:=[minizip]
54 + samples? (
55 + media-libs/freeglut
56 + virtual/opengl
57 + x11-libs/libX11
58 + )
59 + tools? (
60 + dev-qt/qtcore:5
61 + dev-qt/qtgui:5
62 + dev-qt/qtopengl:5
63 + dev-qt/qtwidgets:5
64 + media-libs/devil
65 + virtual/opengl
66 + )
67 +"
68 +DEPEND="${RDEPEND}
69 + test? ( dev-cpp/gtest )
70 +"
71 +
72 +PATCHES=(
73 + "${FILESDIR}/${P}-disabletest.patch" # bug 659122
74 + "${FILESDIR}/${P}-unzip-of.patch"
75 + "${FILESDIR}/${P}-findassimp.patch"
76 +)
77 +
78 +src_configure() {
79 + local mycmakeargs=(
80 + -DASSIMP_BUILD_SAMPLES=$(usex samples)
81 + -DASSIMP_BUILD_STATIC_LIB=$(usex static)
82 + -DASSIMP_BUILD_TESTS=$(usex test)
83 + -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
84 + -DCMAKE_DEBUG_POSTFIX=""
85 + -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
86 + )
87 +
88 + cmake-utils_src_configure
89 +}
90 +
91 +src_install() {
92 + cmake-utils_src_install
93 +
94 + insinto /usr/share/cmake/Modules
95 + doins cmake-modules/Findassimp.cmake
96 +}
97 +
98 +src_test() {
99 + "${BUILD_DIR}/test/unit" || die
100 +}
101
102 diff --git a/media-libs/assimp/files/assimp-5.0.0-disabletest.patch b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch
103 new file mode 100644
104 index 00000000000..d5343c11366
105 --- /dev/null
106 +++ b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch
107 @@ -0,0 +1,13 @@
108 +--- a/test/unit/utVersion.cpp 2019-11-18 11:39:09.655298634 +0100
109 ++++ b/test/unit/utVersion.cpp 2019-11-18 11:39:25.823299035 +0100
110 +@@ -66,10 +66,6 @@
111 + EXPECT_NE( aiGetCompileFlags(), 0U );
112 + }
113 +
114 +-TEST_F( utVersion, aiGetVersionRevisionTest ) {
115 +- EXPECT_NE( aiGetVersionRevision(), 0U );
116 +-}
117 +-
118 + TEST_F( utVersion, aiGetBranchNameTest ) {
119 + EXPECT_NE( nullptr, aiGetBranchName() );
120 + }
121
122 diff --git a/media-libs/assimp/files/assimp-5.0.0-findassimp.patch b/media-libs/assimp/files/assimp-5.0.0-findassimp.patch
123 new file mode 100644
124 index 00000000000..6056f4973c5
125 --- /dev/null
126 +++ b/media-libs/assimp/files/assimp-5.0.0-findassimp.patch
127 @@ -0,0 +1,28 @@
128 +--- a/cmake-modules/Findassimp.cmake 2019-10-08 08:08:29.025321121 +0200
129 ++++ b/cmake-modules/Findassimp.cmake 2019-10-08 08:09:47.976323079 +0200
130 +@@ -54,14 +54,17 @@
131 +
132 + find_path(
133 + assimp_INCLUDE_DIRS
134 +- NAMES postprocess.h scene.h version.h config.h cimport.h
135 ++ NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
136 + PATHS /usr/local/include/
137 ++ PATHS /usr/include/
138 + )
139 +
140 + find_library(
141 + assimp_LIBRARIES
142 + NAMES assimp
143 + PATHS /usr/local/lib/
144 ++ PATHS /usr/lib/
145 ++ PATHS /usr/lib64/
146 + )
147 +
148 + if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
149 +@@ -78,4 +81,4 @@
150 + endif (assimp_FIND_REQUIRED)
151 + endif (assimp_FOUND)
152 +
153 +-endif(WIN32)
154 +\ Brak znaku nowej linii na końcu pliku
155 ++endif(WIN32)
156
157 diff --git a/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch b/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch
158 new file mode 100644
159 index 00000000000..e75b47a1af4
160 --- /dev/null
161 +++ b/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch
162 @@ -0,0 +1,11 @@
163 +--- a/contrib/unzip/unzip.h 2019-08-21 21:38:10.991542891 +0200
164 ++++ b/contrib/unzip/unzip.h 2019-08-21 21:38:24.507543226 +0200
165 +@@ -45,6 +45,8 @@
166 + #ifndef _unz_H
167 + #define _unz_H
168 +
169 ++#define OF _Z_OF
170 ++
171 + #ifdef __cplusplus
172 + extern "C" {
173 + #endif