1 |
commit: d4a1bfdfbe03733d8bd0922605773028d5307c77 |
2 |
Author: Lucian Poston <lucian.poston <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Dec 25 10:13:22 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 6 02:13:47 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4a1bfdf |
7 |
|
8 |
media-video/obs-studio: Prefer imagemagick-7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/641608 |
11 |
|
12 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
13 |
Closes: https://github.com/gentoo/gentoo/pull/6628 |
14 |
|
15 |
media-video/obs-studio/obs-studio-9999.ebuild | 14 +++----------- |
16 |
1 file changed, 3 insertions(+), 11 deletions(-) |
17 |
|
18 |
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild |
19 |
index 06c66b0e0b2..e790219d687 100644 |
20 |
--- a/media-video/obs-studio/obs-studio-9999.ebuild |
21 |
+++ b/media-video/obs-studio/obs-studio-9999.ebuild |
22 |
@@ -3,6 +3,8 @@ |
23 |
|
24 |
EAPI=6 |
25 |
|
26 |
+CMAKE_MIN_VERSION=3.9.6 |
27 |
+ |
28 |
inherit cmake-utils gnome2-utils |
29 |
|
30 |
if [[ ${PV} == *9999 ]]; then |
31 |
@@ -49,17 +51,7 @@ COMMON_DEPEND=" |
32 |
) |
33 |
v4l? ( media-libs/libv4l ) |
34 |
" |
35 |
-DEPEND="${COMMON_DEPEND} |
36 |
- imagemagick? ( |
37 |
- || ( |
38 |
- <media-gfx/imagemagick-7 |
39 |
- ( |
40 |
- >=media-gfx/imagemagick-7 |
41 |
- >=dev-util/cmake-3.9 |
42 |
- ) |
43 |
- ) |
44 |
- ) |
45 |
-" |
46 |
+DEPEND="${COMMON_DEPEND}" |
47 |
RDEPEND="${COMMON_DEPEND}" |
48 |
|
49 |
CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) |