commit: be42b487bdbb8acdb5c3765710a3a785f2e38c9e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu May 19 22:40:15 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu May 19 22:45:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be42b487
media-libs/xine-lib: disable dav1d for 1.2.11 1.2.12 has dav1d support enabled properly (and a patch for >= 1.0.0) but in 1.2.11, it was automagic. Let's just disable it entirely in 1.2.11 given that it fails to build and we've had to mask (for now) 1.2.12 because of crashes. Closes: https://bugs.gentoo.org/846398 Bug: https://bugs.gentoo.org/835791 Bug: https://bugs.gentoo.org/845396 Signed-off-by: Sam James <sam <AT> gentoo.org> .../xine-lib/{xine-lib-1.2.11.ebuild => xine-lib-1.2.11-r1.ebuild} | 5 +++-- media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) 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 similarity index 98% rename from media-libs/xine-lib/xine-lib-1.2.11.ebuild rename to media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild index 24c2b15d14e6..de062653a998 100644 --- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND} gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) @@ -156,6 +156,7 @@ src_configure() { --with-real-codecs-path=/usr/$(get_libdir)/codecs --with-w32-path=${win32dir} --with-xv-path=/usr/$(get_libdir) + --without-dav1d --without-esound --without-fusionsound $(use_enable a52 a52dec) diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild index 4552c8b34a71..e9acbf2c1072 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild @@ -50,7 +50,7 @@ RDEPEND=" gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= )
