summaryrefslogtreecommitdiff
path: root/media-libs/xine-lib
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-03-24 23:59:54 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-03-24 23:59:54 +0000
commit401101f9c8077911929d3f2b60a37098460a5d89 (patch)
treec2bef4719f6787550f0916aeaa8f4f403a9296af /media-libs/xine-lib
parent4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff)
gentoo resync : 25.03.2022
Diffstat (limited to 'media-libs/xine-lib')
-rw-r--r--media-libs/xine-lib/Manifest7
-rw-r--r--media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch22
-rw-r--r--media-libs/xine-lib/metadata.xml3
-rw-r--r--media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild (renamed from media-libs/xine-lib/xine-lib-1.2.12.ebuild)13
-rw-r--r--media-libs/xine-lib/xine-lib-1.2.9999.ebuild9
5 files changed, 45 insertions, 9 deletions
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 99db4e7125a4..5b9002da1ba2 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,8 +1,9 @@
+AUX xine-lib-1.2.12-dav1d-1.0.0.patch 805 BLAKE2B 83b97835c46ff547636c9a39836ee4ace2213f3d75dc258071bf2be040f37dd6c53c4201f13201d511c1df9651d9c381bfe7c10d51a437ad424e184f9acedfd6 SHA512 3182d082b028b664abd1899c19a689213a02214cce13f7f3c9a7dc95deb2ec7c8f13438ec812b2151476d638b170be8e1d832b303b73eb962c2389d2ecb161b4
DIST xine-lib-1.2.10.tar.xz 5226116 BLAKE2B e1bc088814c951ff56e55b626fe1f6f34c3da744e716de369a68e6c82a5adc414b452675ad19a5f82500bade6795b54efd503de8ffe4f1e65b534317ca0a26af SHA512 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
EBUILD xine-lib-1.2.10.ebuild 5196 BLAKE2B 3ab9183a937bf5e72058dc6309a1258e8177b2e1d2044e6b164e525be497688cdfcd12c176f9aa1fe809588c5511de060935ed29189886c4a24ba5f81991170e SHA512 569b9418b0671eba865429434ebdccb52b9a1d387027f70fb7484f4d32b99b9bda5658c1c6a9f58d43bf026e625cd0666ea0d8cb657952cb88e7460543914910
EBUILD xine-lib-1.2.11.ebuild 5213 BLAKE2B fb1aa47ca34bdc267a2923d55ecfc1d642248e9bb072f782e9dbbcc66a926a1c4278037650d0ae3809ac2021a89e3504bf2586031883979ce5cc7faad1e62333 SHA512 bf042d0761c3320e5a94fd83d6aed7642bb1b3f982befaf05697c9139e1e062bf25624fd23090a656654b2c62d4ed2fa2b75c20ca04b6db11172a76d117bf5a3
-EBUILD xine-lib-1.2.12.ebuild 5218 BLAKE2B 3c6d52508e1562030c3f88b013473a23f908e540ffdcadd4debdcd3caff179a52665687cb08802f2351fb6a335a935148e76d8b9f1e69232e83a53a70ac52a4b SHA512 b0fbe4a5ecc646220c8bee90da8b4ecd61960e73cb33f6b1c88b60627e1fc4f0518ec105b5b0651ad94d1be1bdb510edf6f38c317c3aae3b47624c92870d5f78
-EBUILD xine-lib-1.2.9999.ebuild 5218 BLAKE2B 3c6d52508e1562030c3f88b013473a23f908e540ffdcadd4debdcd3caff179a52665687cb08802f2351fb6a335a935148e76d8b9f1e69232e83a53a70ac52a4b SHA512 b0fbe4a5ecc646220c8bee90da8b4ecd61960e73cb33f6b1c88b60627e1fc4f0518ec105b5b0651ad94d1be1bdb510edf6f38c317c3aae3b47624c92870d5f78
-MISC metadata.xml 2679 BLAKE2B e4a259e41b87a49e33a5313d436da9ec288b24a7a0a89f93e61e8ca86ce7da17b7614fa3445307d4cba1a7fedd8ee3578f98884c4523be1cdf2393b045f4a41c SHA512 8f6375ab89a851634acd40e8d749cc4d1347e26c0c2a524cd2452855edc3b6f2e7842b202e1d2b1584bd645c6087a487daec2aa54ccd72cb272dc88445e57d70
+EBUILD xine-lib-1.2.12-r1.ebuild 5393 BLAKE2B 0d6a58768d9f722a2577d81b850d76980ce88584c1da50da164b0673c0f2523dc32c92079571732d83ccf3e4052bd1f8e5c598884a12977e3c44e8212d488fd3 SHA512 b40304d09c5a5dd11a708b57168da37acf467d8952230b7c18f42c8ac0ca920692a1bf74c8784331e8c72d3cff08beedf08dc19d0bd228d803643e4c515282d3
+EBUILD xine-lib-1.2.9999.ebuild 5334 BLAKE2B 578ebe981aeb5ad23b40a0ae3a88947c194d5733a6296a9709b72bb1661554ff18206ee2f9796284aca3a76d63d3f34fb478f26fede38e07ea74f15f3f036bbd SHA512 2d0435f0de8ca9f5920bbbdf93d90de0e9f8ead98b96d3225fa7f45dfe5bfc26033760faf53a955c19167fc40b7942d0f531021cb4c7c022f9e939d0f861db51
+MISC metadata.xml 2773 BLAKE2B 5f143a245bde88888f0b8e73601f62cfa7e8c23b9ed9c44b6baa13d8f78e8a05aba513996c323ecdcea83c91c938e86ef454571065eb110b11e9ea6285d89231 SHA512 9ed8a950a2c87b1c63ccab900a5cd80b37a0330bd5c859100559c7e8ec68581f7fda45ad6dc01dca98665798265dd0611e2cde4f9e7d2b9bff84249dfe2fd0c2
diff --git a/media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch b/media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch
new file mode 100644
index 000000000000..cb3253cf99a5
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/835791
+https://sourceforge.net/p/xine/tickets/11/
+--- a/src/video_dec/dav1d.c
++++ b/src/video_dec/dav1d.c
+@@ -544,11 +544,17 @@
+
+ /* multithreading */
+ ncpu = xine_cpu_count();
++#if DAV1D_API_VERSION_MAJOR > 5
++ settings.n_threads = ncpu + 1;
++ xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
++ "Using %d threads\n", settings.n_threads);
++#else
+ settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2;
+ settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
+ xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
+ "Using %d frame threads, %d tile threads\n",
+ settings.n_frame_threads, settings.n_tile_threads);
++#endif
+
+ /* dri frame allocator */
+ settings.allocator.cookie = this;
diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index 387486f97a70..8eb50e96f2ff 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/metadata.xml
@@ -8,6 +8,9 @@
<flag name="bluray">
Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg>
</flag>
+ <flag name="dav1d">
+ Enable support for <pkg>media-libs/dav1d</pkg> AV1 decoder
+ </flag>
<flag name="dxr3">
Enable support for DXR3 mpeg acceleration cards.
</flag>
diff --git a/media-libs/xine-lib/xine-lib-1.2.12.ebuild b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
index b3f3393bc258..29f22fbfac90 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
@@ -24,14 +24,14 @@ HOMEPAGE="http://xine.sourceforge.net/"
LICENSE="GPL-2"
SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
BDEPEND="
app-arch/xz-utils
>=sys-devel/libtool-2.2.6b
virtual/pkgconfig
"
-RDEPEND="${NLS_RDEPEND}
+RDEPEND="
dev-libs/libxdg-basedir
media-libs/libdvdnav
media-video/ffmpeg:0=
@@ -43,6 +43,7 @@ RDEPEND="${NLS_RDEPEND}
alsa? ( media-libs/alsa-lib )
bluray? ( >=media-libs/libbluray-0.2.1:= )
css? ( >=media-libs/libdvdcss-1.2.10 )
+ dav1d? ( media-libs/dav1d:= )
dts? ( media-libs/libdca )
dxr3? ( media-libs/libfame )
flac? ( media-libs/flac )
@@ -100,7 +101,6 @@ RDEPEND="${NLS_RDEPEND}
xvmc? ( x11-libs/libXvMC )
"
DEPEND="${RDEPEND}
- ${NLS_DEPEND}
oss? ( virtual/os-headers )
v4l? ( virtual/os-headers )
X? (
@@ -117,6 +117,10 @@ REQUIRED_USE="
xinerama? ( X )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.12-dav1d-1.0.0.patch
+)
+
src_prepare() {
default
@@ -158,6 +162,8 @@ src_configure() {
--with-xv-path=/usr/$(get_libdir)
--without-esound
--without-fusionsound
+ # Added dav1d for now. Could support both? Does it need to be XOR?
+ --without-libaom
$(use_enable a52 a52dec)
$(use_enable aac faad)
$(use_enable aalib)
@@ -194,6 +200,7 @@ src_configure() {
$(use_enable vpx)
$(use_enable wayland)
$(use_with alsa)
+ $(use_with dav1d)
$(use_with flac libflac)
$(use_with imagemagick)
$(use_with jack)
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 b3f3393bc258..4552c8b34a71 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -24,14 +24,14 @@ HOMEPAGE="http://xine.sourceforge.net/"
LICENSE="GPL-2"
SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
BDEPEND="
app-arch/xz-utils
>=sys-devel/libtool-2.2.6b
virtual/pkgconfig
"
-RDEPEND="${NLS_RDEPEND}
+RDEPEND="
dev-libs/libxdg-basedir
media-libs/libdvdnav
media-video/ffmpeg:0=
@@ -43,6 +43,7 @@ RDEPEND="${NLS_RDEPEND}
alsa? ( media-libs/alsa-lib )
bluray? ( >=media-libs/libbluray-0.2.1:= )
css? ( >=media-libs/libdvdcss-1.2.10 )
+ dav1d? ( media-libs/dav1d:= )
dts? ( media-libs/libdca )
dxr3? ( media-libs/libfame )
flac? ( media-libs/flac )
@@ -100,7 +101,6 @@ RDEPEND="${NLS_RDEPEND}
xvmc? ( x11-libs/libXvMC )
"
DEPEND="${RDEPEND}
- ${NLS_DEPEND}
oss? ( virtual/os-headers )
v4l? ( virtual/os-headers )
X? (
@@ -158,6 +158,8 @@ src_configure() {
--with-xv-path=/usr/$(get_libdir)
--without-esound
--without-fusionsound
+ # Added dav1d for now. Could support both? Does it need to be XOR?
+ --without-libaom
$(use_enable a52 a52dec)
$(use_enable aac faad)
$(use_enable aalib)
@@ -194,6 +196,7 @@ src_configure() {
$(use_enable vpx)
$(use_enable wayland)
$(use_with alsa)
+ $(use_with dav1d)
$(use_with flac libflac)
$(use_with imagemagick)
$(use_with jack)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 17:59:39 +0000