1 |
commit: be42b487bdbb8acdb5c3765710a3a785f2e38c9e |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 19 22:40:15 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 19 22:45:42 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be42b487 |
7 |
|
8 |
media-libs/xine-lib: disable dav1d for 1.2.11 |
9 |
|
10 |
1.2.12 has dav1d support enabled properly (and a patch for >= 1.0.0) |
11 |
but in 1.2.11, it was automagic. Let's just disable it entirely |
12 |
in 1.2.11 given that it fails to build and we've had to mask (for now) |
13 |
1.2.12 because of crashes. |
14 |
|
15 |
Closes: https://bugs.gentoo.org/846398 |
16 |
Bug: https://bugs.gentoo.org/835791 |
17 |
Bug: https://bugs.gentoo.org/845396 |
18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
19 |
|
20 |
.../xine-lib/{xine-lib-1.2.11.ebuild => xine-lib-1.2.11-r1.ebuild} | 5 +++-- |
21 |
media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 2 +- |
22 |
2 files changed, 4 insertions(+), 3 deletions(-) |
23 |
|
24 |
diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild b/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild |
25 |
similarity index 98% |
26 |
rename from media-libs/xine-lib/xine-lib-1.2.11.ebuild |
27 |
rename to media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild |
28 |
index 24c2b15d14e6..de062653a998 100644 |
29 |
--- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild |
30 |
+++ b/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild |
31 |
@@ -1,4 +1,4 @@ |
32 |
-# Copyright 1999-2021 Gentoo Authors |
33 |
+# Copyright 1999-2022 Gentoo Authors |
34 |
# Distributed under the terms of the GNU General Public License v2 |
35 |
|
36 |
EAPI=7 |
37 |
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND} |
38 |
gtk? ( x11-libs/gdk-pixbuf:2 ) |
39 |
imagemagick? ( virtual/imagemagick-tools ) |
40 |
jack? ( virtual/jack ) |
41 |
- jpeg? ( virtual/jpeg:0 ) |
42 |
+ jpeg? ( media-libs/libjpeg-turbo:= ) |
43 |
libcaca? ( media-libs/libcaca ) |
44 |
mad? ( media-libs/libmad ) |
45 |
mng? ( media-libs/libmng:= ) |
46 |
@@ -156,6 +156,7 @@ src_configure() { |
47 |
--with-real-codecs-path=/usr/$(get_libdir)/codecs |
48 |
--with-w32-path=${win32dir} |
49 |
--with-xv-path=/usr/$(get_libdir) |
50 |
+ --without-dav1d |
51 |
--without-esound |
52 |
--without-fusionsound |
53 |
$(use_enable a52 a52dec) |
54 |
|
55 |
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild |
56 |
index 4552c8b34a71..e9acbf2c1072 100644 |
57 |
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild |
58 |
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild |
59 |
@@ -50,7 +50,7 @@ RDEPEND=" |
60 |
gtk? ( x11-libs/gdk-pixbuf:2 ) |
61 |
imagemagick? ( virtual/imagemagick-tools ) |
62 |
jack? ( virtual/jack ) |
63 |
- jpeg? ( virtual/jpeg:0 ) |
64 |
+ jpeg? ( media-libs/libjpeg-turbo:= ) |
65 |
libcaca? ( media-libs/libcaca ) |
66 |
mad? ( media-libs/libmad ) |
67 |
mng? ( media-libs/libmng:= ) |