1 |
commit: 130b857abae7d59970828532ee59b55f65e4c34e |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 26 02:54:03 2017 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 26 03:09:26 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=130b857a |
7 |
|
8 |
dev-qt/qt3d: ensure that system media-libs/assimp is used |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-qt/qt3d/qt3d-5.8.0.ebuild | 7 +++++++ |
13 |
dev-qt/qt3d/qt3d-5.8.9999.ebuild | 9 ++++++++- |
14 |
dev-qt/qt3d/qt3d-5.9999.ebuild | 9 ++++++++- |
15 |
3 files changed, 23 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild |
18 |
index 4f238ff7..e869a76b 100644 |
19 |
--- a/dev-qt/qt3d/qt3d-5.8.0.ebuild |
20 |
+++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild |
21 |
@@ -18,5 +18,12 @@ DEPEND=" |
22 |
~dev-qt/qtcore-${PV} |
23 |
~dev-qt/qtgui-${PV} |
24 |
~dev-qt/qtnetwork-${PV} |
25 |
+ >=media-libs/assimp-3.1.1 |
26 |
" |
27 |
RDEPEND="${DEPEND}" |
28 |
+ |
29 |
+src_prepare() { |
30 |
+ rm -r src/3rdparty/assimp/{code,contrib,include} || die |
31 |
+ |
32 |
+ qt5-build_src_prepare |
33 |
+} |
34 |
|
35 |
diff --git a/dev-qt/qt3d/qt3d-5.8.9999.ebuild b/dev-qt/qt3d/qt3d-5.8.9999.ebuild |
36 |
index aad66b97..e869a76b 100644 |
37 |
--- a/dev-qt/qt3d/qt3d-5.8.9999.ebuild |
38 |
+++ b/dev-qt/qt3d/qt3d-5.8.9999.ebuild |
39 |
@@ -1,4 +1,4 @@ |
40 |
-# Copyright 1999-2016 Gentoo Foundation |
41 |
+# Copyright 1999-2017 Gentoo Foundation |
42 |
# Distributed under the terms of the GNU General Public License v2 |
43 |
# $Id$ |
44 |
|
45 |
@@ -18,5 +18,12 @@ DEPEND=" |
46 |
~dev-qt/qtcore-${PV} |
47 |
~dev-qt/qtgui-${PV} |
48 |
~dev-qt/qtnetwork-${PV} |
49 |
+ >=media-libs/assimp-3.1.1 |
50 |
" |
51 |
RDEPEND="${DEPEND}" |
52 |
+ |
53 |
+src_prepare() { |
54 |
+ rm -r src/3rdparty/assimp/{code,contrib,include} || die |
55 |
+ |
56 |
+ qt5-build_src_prepare |
57 |
+} |
58 |
|
59 |
diff --git a/dev-qt/qt3d/qt3d-5.9999.ebuild b/dev-qt/qt3d/qt3d-5.9999.ebuild |
60 |
index aad66b97..e869a76b 100644 |
61 |
--- a/dev-qt/qt3d/qt3d-5.9999.ebuild |
62 |
+++ b/dev-qt/qt3d/qt3d-5.9999.ebuild |
63 |
@@ -1,4 +1,4 @@ |
64 |
-# Copyright 1999-2016 Gentoo Foundation |
65 |
+# Copyright 1999-2017 Gentoo Foundation |
66 |
# Distributed under the terms of the GNU General Public License v2 |
67 |
# $Id$ |
68 |
|
69 |
@@ -18,5 +18,12 @@ DEPEND=" |
70 |
~dev-qt/qtcore-${PV} |
71 |
~dev-qt/qtgui-${PV} |
72 |
~dev-qt/qtnetwork-${PV} |
73 |
+ >=media-libs/assimp-3.1.1 |
74 |
" |
75 |
RDEPEND="${DEPEND}" |
76 |
+ |
77 |
+src_prepare() { |
78 |
+ rm -r src/3rdparty/assimp/{code,contrib,include} || die |
79 |
+ |
80 |
+ qt5-build_src_prepare |
81 |
+} |