gentoo auto-resync : 26:01:2023 - 07:55:33

3 files changed, 256 insertions, 17 deletions

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index f509c530bad2..453f6d3e853f 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,6 +1,8 @@
 AUX xine-lib-1.2.12-dav1d-1.0.0.patch 805 BLAKE2B 83b97835c46ff547636c9a39836ee4ace2213f3d75dc258071bf2be040f37dd6c53c4201f13201d511c1df9651d9c381bfe7c10d51a437ad424e184f9acedfd6 SHA512 3182d082b028b664abd1899c19a689213a02214cce13f7f3c9a7dc95deb2ec7c8f13438ec812b2151476d638b170be8e1d832b303b73eb962c2389d2ecb161b4
 AUX xine-lib-1.2.12-fix-mmap-crash.patch 535 BLAKE2B 6b6782a7923754c29daf8263bc267f57124de6b80705214537c9d788bafb3f80bcec35915ca50fb50935ffcbc612187dc1f0e0d71e80279d4d9e3fcbe54a4ebd SHA512 f642612419abd03b765f8dbf787aa675a1e5a031878db9b51c7f2a829caa19c153f9cabe733dbd21cbbbe55ce1ce5d5793b75e9b32c229e3fb57b548d39a6aa5
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
+DIST xine-lib-1.2.13.tar.xz 5007364 BLAKE2B 8c39328b4135035e7b4070c670591e61a92443bb389af3b7da053fd68101fcb2f18cd258840e96a5f3e02d4cf979b028947a10fddd1bfc3b92ed7f18d3f58942 SHA512 269275f0e324acc559695d268fb93e0e0ca4b17d22c4a57d482365ac058ae2aed125b9e1b522c1fc501cf4b2c186ac05d921d7c82a98e094cb0c70489e61c924
 EBUILD xine-lib-1.2.12-r4.ebuild 5489 BLAKE2B 21151c6f8f4d714a770b1add99a02e30ad258abbce0b34148dd81e1a193bdfb4f59addbbd01423dfe0c53935fd085a0246b79ffdf558cba128b1c3a5fcaeafa1 SHA512 bd34e9a9a9b894d3ff7529a53c4ed2e2adbc3190e9572ec02e7ef5048cbd5edf83bd4ed536cf88a33ccc993d6094e0965e38283dbe48e8724f99dc48eb9eba94
-EBUILD xine-lib-1.2.9999.ebuild 5376 BLAKE2B cc4f65f60c48750baef54eaf25fdd79794195b0986697b0c1006f4a72931620d98a35e4ed634c03e0794a79a9b7dbfcfedbad9e81bd568c2567a62be82ab74ff SHA512 ea2ed69072de70d02c8f80942a7b7894dd1e320f9e0a617361303d1a68abccf40dc28441abba6c205d5e56231ed28f274eccee418a11dd3b132ba9513cc93fa6
+EBUILD xine-lib-1.2.13.ebuild 5475 BLAKE2B 408ff7caff8917e90d242bbceac715ea15c843531096763e2328f3c169e66c025900701786ba1a75ac8b7dd50f68563e914e26b555b61276673611cc4255d839 SHA512 2b93784e11b4b89e25b98e5011df8cedacacb8fd784e1e58029b183292b8d2c242e3f3a570aab6b9fad75924aec08e62ebecc6c08f2f1c938b1de9216e6c3661
+EBUILD xine-lib-1.2.9999.ebuild 5475 BLAKE2B 408ff7caff8917e90d242bbceac715ea15c843531096763e2328f3c169e66c025900701786ba1a75ac8b7dd50f68563e914e26b555b61276673611cc4255d839 SHA512 2b93784e11b4b89e25b98e5011df8cedacacb8fd784e1e58029b183292b8d2c242e3f3a570aab6b9fad75924aec08e62ebecc6c08f2f1c938b1de9216e6c3661
 MISC metadata.xml 2784 BLAKE2B 636cdb7ad93aa8941a36a23b9bc70cde66878f7628cab7e697582733b8ce85d58c09a5c63fcfbc009f098001399407055c449412dabd52178548c0c41d572c5a SHA512 5b644f501953bbc34020f0955991363d558a23a9610eb37f46499bd2d5415849a10a3306625e50d5cfdf094e67a38da5175bb981387841bae63c33ae74e17757
diff --git a/media-libs/xine-lib/xine-lib-1.2.13.ebuild b/media-libs/xine-lib/xine-lib-1.2.13.ebuild
new file mode 100644
index 000000000000..a7cce97ce1ac
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.13.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
+	inherit autotools mercurial
+	unset NLS_IUSE
+	NLS_DEPEND="sys-devel/gettext"
+	NLS_RDEPEND="virtual/libintl"
+else
+	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
+
+	NLS_IUSE="nls"
+	NLS_DEPEND="nls? ( sys-devel/gettext )"
+	NLS_RDEPEND="nls? ( virtual/libintl )"
+fi
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="https://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick 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}"
+REQUIRED_USE="
+	vidix? ( || ( X fbcon ) )
+	wayland? ( opengl )
+	xv? ( X )
+	xinerama? ( X )
+"
+
+RDEPEND="
+	dev-libs/libxdg-basedir
+	media-libs/libdvdnav
+	media-video/ffmpeg:=
+	sys-libs/zlib:=
+	virtual/libiconv
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	aalib? ( media-libs/aalib )
+	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:= )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	imagemagick? ( virtual/imagemagick-tools )
+	jack? ( virtual/jack )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	libcaca? ( media-libs/libcaca )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng:= )
+	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	nfs? ( net-fs/libnfs:= )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pulseaudio? ( media-libs/libpulse )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+	)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+	)
+	v4l? ( media-libs/libv4l )
+	vaapi? ( media-libs/libva:=[opengl,X] )
+	vcd? (
+		>=media-video/vcdimager-0.7.23
+		dev-libs/libcdio:=[-minimal]
+	)
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	vpx? ( media-libs/libvpx:= )
+	wavpack? ( media-sound/wavpack )
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libxcb:=
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+"
+DEPEND="
+	${RDEPEND}
+	oss? ( virtual/os-headers )
+	v4l? ( virtual/os-headers )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXt
+	)
+	xv? ( x11-base/xorg-proto )
+	xvmc? ( x11-base/xorg-proto )
+	xinerama? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/libtool-2.2.6b
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
+
+	if [[ "${PV}" = *9999* ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	local x
+	for x in 0 1 2 3; do
+		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
+	done
+}
+
+src_configure() {
+	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
+
+	local win32dir #197236
+	if has_multilib_profile; then
+		win32dir=/usr/$(ABI="x86" get_libdir)/win32
+	else
+		win32dir=/usr/$(get_libdir)/win32
+	fi
+
+	local myconf=(
+		--disable-directfb
+		--disable-gnomevfs
+		--disable-optimizations
+		--disable-real-codecs
+		--disable-v4l
+		--disable-w32dll
+		--enable-avformat
+		--enable-ipv6
+		--with-external-dvdnav
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs
+		--with-w32-path=${win32dir}
+		--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)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable bluray)
+		$(use_enable dts)
+		$(use_enable dvb)
+		$(use_enable dxr3)
+		$(use_enable fbcon fb)
+		$(use_enable gtk gdkpixbuf)
+		$(use_enable jpeg libjpeg)
+		$(use_enable mad)
+		$(use_enable mmap)
+		$(use_enable mng)
+		$(use_enable modplug)
+		$(use_enable musepack)
+		$(use_enable nfs)
+		$(use_enable opengl)
+		$(use_enable opengl glu)
+		$(use_enable oss)
+		$(use_enable samba)
+		$(use_enable sftp)
+		$(use_enable v4l libv4l)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi)
+		$(use_enable vdpau)
+		$(use_enable vis)
+		$(use_enable vidix)
+		$(use_enable xinerama)
+		$(use_enable xvmc)
+		$(use_enable vcd)
+		$(use_enable vdr)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with alsa)
+		$(use_with dav1d)
+		$(use_with flac libflac)
+		$(use_with imagemagick)
+		$(use_with jack)
+		$(use_with libcaca caca)
+		$(use_with pulseaudio)
+		$(use_with sdl)
+		$(use_with speex)
+		$(use_with theora)
+		$(use_with truetype fontconfig)
+		$(use_with truetype freetype)
+		$(use_with vorbis)
+		$(use_with wavpack)
+		$(use_with X x)
+		$(use_with X xcb)
+	)
+	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
+}
+
+src_compile() {
+	# enable verbose building, bug #448140
+	emake V=1
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+}
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 b8b6b6b69e5d..a7cce97ce1ac 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,25 +12,28 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
+
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
 	NLS_RDEPEND="nls? ( virtual/libintl )"
 fi
 
 DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
+HOMEPAGE="https://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
 IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick 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
+REQUIRED_USE="
+	vidix? ( || ( X fbcon ) )
+	wayland? ( opengl )
+	xv? ( X )
+	xinerama? ( X )
 "
+
 RDEPEND="
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
@@ -61,7 +64,7 @@ RDEPEND="
 		virtual/glu
 		virtual/opengl
 	)
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	samba? ( net-fs/samba )
 	sftp? ( net-libs/libssh2 )
 	sdl? ( media-libs/libsdl )
@@ -78,7 +81,7 @@ RDEPEND="
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( media-libs/libva:=[X] )
+	vaapi? ( media-libs/libva:=[opengl,X] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:=[-minimal]
@@ -100,7 +103,8 @@ RDEPEND="
 	xv? ( x11-libs/libXv )
 	xvmc? ( x11-libs/libXvMC )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
@@ -111,10 +115,10 @@ DEPEND="${RDEPEND}
 	xvmc? ( x11-base/xorg-proto )
 	xinerama? ( x11-base/xorg-proto )
 "
-REQUIRED_USE="
-	vidix? ( || ( X fbcon ) )
-	xv? ( X )
-	xinerama? ( X )
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/libtool-2.2.6b
+	virtual/pkgconfig
 "
 
 src_prepare() {
@@ -214,7 +218,7 @@ src_configure() {
 	)
 	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
 
-	econf "${myconf[@]}"
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
 }
 
 src_compile() {