gentoo resync : 29.12.2022

4 files changed, 179 insertions, 4 deletions

diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 561ae621c566..19a794238620 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,9 +1,11 @@
 AUX confd-2.0.0 1476 BLAKE2B a1f852cb07940ff54125d88bae9467e5068e66e903b4dcdbde295cb3aa89a49d92ff7e89632882ad8be59037ff44e1f6f1d6a4f53d7200024e0fe69b499da693 SHA512 8ab8b99e770dacbaadfc97ccc80f3d2c857bf95b662b9152959ccd88b940f4d2f7d2957ea4f6390f30470aca809cb3bb04b8b9e696122131fbb6d9f5d010f579
 AUX vdr-frontend 392 BLAKE2B 99afb106dce6908c8d3a02d22c6072bbe4f9917bb8090175997769c465eede475a84329bb7b7bbd5ab1cde9a77d459652fb8b1c8b7630ebcb99034398a78fb55 SHA512 1c25d59809c7fafb837755eb9719bc11526b333cea01c6467aa83bf8b3284f10a4a62fafba00321a15f6cef4b462456ece1313b1fca00ce36b828418af883351
+AUX vdr-frontend-r1 364 BLAKE2B bf0951f9f324297bf09edfaabf4eb536b9df13eede8fc2882713eee7774f139b36d10fcf28b7b9caaeab34fd6745fc11f9c207a573589b78b0a416270da5b450 SHA512 8beb203aa361f80c18cf2e4f1cab84d4d6357865c8cfeb116a0690eca8d7cf85f877d38047e9b8d8a68c1bc01ae150653f25ac88a0053d0d621a9d741a3a579c
 AUX vdr-xineliboutput-2.2.0_no-gcc.patch 981 BLAKE2B ea8daf82a19d7f8dd7cf5b56e90ed51ea5b9a986d589611c3922a750e61f1a1208d2291f761c2bce1992cd4de9c15d41de93fd1ceccb3d17cf59d5f0c6268eba SHA512 c8861a49f9c9849dafc6ac600df3696606d810f6b58ee24026355899aa1708ad309548c2c8f7b00850faa2ebd54674aec450af276c3eb556c4a5f9b7dc5d28c0
 DIST vdr-xineliboutput-2.2.0.tgz 426058 BLAKE2B 8a5e325e0dd45dffdbcf1b9e49d4ae2486d3b3c7585dbca81855264a0a9057c48da7626acd5e9d7b2113b200eead178b19a0d9834ace5d25cd97157912d50bfa SHA512 d3b753fe496c6f73d491195cc1dac3333a46f2ef6350683fc15e3e8a423a90946574c3fdf0ed43727d61f007a8abdf3041e274317216bf06a8146dc9206f88d9
 DIST vdr-xineliboutput-2.2.0_clang.patch.bz2 7405 BLAKE2B 80d4a0ca3673f61cd14538c2fbdc03017f8c993a55b4c3de0349c799b7239052bc452fbd78689e9ccace2e865b4d08ec69365ed9ad6900e08205676135dac3b9 SHA512 c02cc9a6ee8c9b3458dec6439ea4fa85421f3ac01828e65b123d13db689a75cbba5622a7e1fd76066a19a714c2debdb08f4c78139573a4563aefab19107a5512
 EBUILD vdr-xineliboutput-2.2.0-r2.ebuild 3306 BLAKE2B 87598ca98dcd9634e3a2eb0443c119ac20b5cc765e0a8fd9052117c072eb5076a85bb5130a4da58ca0fe4082ea6c4d42fb01a9c7ed6e54662abe46a7835b237d SHA512 eebc8ea17baa5e747110e2e6aa68d2f031be8d673459537356003fbacb5bfc2110ff5b2cb41597f3583b574831e64d5e93247592d6d319728d5384db9e41151f
 EBUILD vdr-xineliboutput-2.2.0-r4.ebuild 3483 BLAKE2B 5a9d246711ab0533dca5df19d3e7388dfcb8b426c5844b678dccb76bc5e09fa0430ff34baf97b8b384dc7109bb2ba8b4f8f67e3c44afe0679e0cb13837bde918 SHA512 4875895b3f17bce520689bfe8f9e735ce42072b63d011a7a3ccf7a8133a0ea22884b85d6ae657fda79fc776e37409aed4facf004dac36a2dd8a10ecccff4971e
-EBUILD vdr-xineliboutput-9999.ebuild 3374 BLAKE2B b289705090735957ceeca4a2eaf01a89ff12e28ebbe5c992bff6d834386e187f2275e7ff20841c0d2b3f22a802f8f819569c63b31664d17cc2d59b1b9d84e998 SHA512 803f1a12ebb9ab1fe2e3e1d6164d2333f802d7225b4a8fea330b1f4e56105e7e24cf762a79df810de92539b38beb0e5f17926022cb197afe3ae866909c31a7de
+EBUILD vdr-xineliboutput-2.2.0-r5.ebuild 3524 BLAKE2B 6378e06dee2756ec83ea5ab388c8758f1b3adaeb66ef24510c0fffe957ced6fcf5bae7dbbbd3abcf8b3e4ced248e83ff154a59fc1b0c3ce6596671a5ad750d26 SHA512 0019d261e8b110f6f3bd7560265c160ec07f5b905b75bd14ac4f90fb9e7223cd0815251562118a3cc5a4bb7ebbfb4ebcfba87f5e203bb3a97374b43f9e7a2e7d
+EBUILD vdr-xineliboutput-9999.ebuild 3415 BLAKE2B 52320b17d8cdece25eb624675d6ec10412352302cfe4c47abbfe16cbeece6c0a6823703e2418e97b130e9fa0919835e894ccf4434727b9bff2ca1d8a004cb254 SHA512 09e43744e686ff2a45b95a4f8e88d1db35fdfc2532a4e5f99e089c3df3458b4827485a71551f0c8e3fe0a85541998c076a1fa9b4d27c9d8cd09be095a5e6c42c
 MISC metadata.xml 831 BLAKE2B 2e3e8bb38385795fc4888defb8db10f3bf75f4719a56122a2f423f1c2f2ec63dccb66c3b2b1b27ed9ae4f9e9c143298d1a7af8b5451664d056c9d1f0c8d305bb SHA512 8e65771c2aba51185bc1c8b7d0ca2f1f17ef3cf85cc33ac46170ab1454399595f869004eb08e9968eef0172183a7d4a1d1f5a6b1c031916133aad85c3de41c59
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-frontend-r1 b/media-plugins/vdr-xineliboutput/files/vdr-frontend-r1
new file mode 100644
index 000000000000..9f1bd6a227e8
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/vdr-frontend-r1
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Start xineliboutput sxfe/sxfb remote frontend"
+
+. /etc/conf.d/vdr.xineliboutput
+
+command="/usr/bin/vdr-sxfe"
+command_args="${REMOTE_FRONTEND}"
+pidfile="/var/run/vdr-frontend.pid"
+command_background="yes"
+command_user="vdr:vdr"
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild
new file mode 100644
index 000000000000..22f0489518ed
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r5.ebuild
@@ -0,0 +1,160 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs vdr-plugin-2
+
+GENTOO_VDR_CONDITIONAL=yes
+
+DESCRIPTION="VDR Plugin: Xinelib PlugIn"
+HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
+SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz
+		http://vdr.websitec.de/download/${PN}/${P}_clang.patch.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
+
+COMMON_DEPEND="
+	vdr? (
+		media-video/vdr
+		libextractor? ( >=media-libs/libextractor-0.5.20 )
+		caps? ( sys-libs/libcap )
+	)
+
+	xine? (
+		( >=media-libs/xine-lib-1.2
+			media-video/ffmpeg )
+		fbcon? ( jpeg? ( media-libs/libjpeg-turbo:= ) )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrender
+			bluray? ( media-libs/libbluray )
+			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
+			jpeg? ( media-libs/libjpeg-turbo:= )
+			opengl? ( virtual/opengl )
+			vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
+			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers
+	nls? ( sys-devel/gettext )
+	xine? (
+		X? (
+			x11-base/xorg-proto
+			x11-libs/libXxf86vm
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE=" || ( vdr xine )"
+
+VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
+
+pkg_setup() {
+	vdr-plugin-2_pkg_setup
+
+	if use xine; then
+		XINE_PLUGIN_DIR=$($(tc-getPKG_CONFIG) --variable=plugindir libxine)
+		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
+	fi
+}
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# bug 711978
+	sed -e "s:X11  opengl:X11  OpenGl:" -i configure || die
+
+	# bug 771036,780462 do not call cc directly
+	eapply "${FILESDIR}/${P}_no-gcc.patch"
+	eapply "${WORKDIR}/${P}_clang.patch"
+}
+
+src_configure() {
+	local myconf
+
+	if has_version ">=media-libs/xine-lib-1.2"; then
+		myconf="${myconf} --enable-libavutil"
+	else
+		myconf="${myconf} --disable-libavutil"
+	fi
+
+	# No autotools based configure script
+	./configure \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		$(use_enable X x11) \
+		$(use_enable X xshm) \
+		$(use_enable X xdpms) \
+		$(use_enable X xshape) \
+		$(use_enable X xrandr) \
+		$(use_enable X xrender) \
+		$(use_enable fbcon fb) \
+		$(use_enable vdr) \
+		$(use_enable xine libxine) \
+		$(use_enable libextractor) \
+		$(use_enable caps libcap) \
+		$(use_enable cec libcec) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable xinerama) \
+		$(use_enable dbus dbus-glib-1) \
+		$(use_enable nls i18n) \
+		$(use_enable bluray libbluray) \
+		$(use_enable opengl) \
+		${myconf} \
+		|| die
+
+	# UINT64_C is needed by ffmpeg headers
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+}
+
+src_install() {
+	if use vdr; then
+		vdr-plugin-2_src_install
+
+		# bug 346989
+		insinto /etc/vdr/plugins/xineliboutput/
+		doins examples/allowed_hosts.conf
+		fowners -R vdr:vdr /etc/vdr/
+
+		if use nls; then
+			emake DESTDIR="${D}" i18n
+		fi
+
+		if use xine; then
+			newinitd "${FILESDIR}"/vdr-frontend-r1 vdr-frontend
+
+			insinto $XINE_PLUGIN_DIR
+			doins xineplug_inp_xvdr.so
+
+			insinto $XINE_PLUGIN_DIR/post
+			doins xineplug_post_*.so
+
+			if use fbcon; then
+				dobin vdr-fbfe
+
+				insinto $VDR_PLUGIN_DIR
+				doins libxineliboutput-fbfe.so.*
+			fi
+
+			if use X; then
+				dobin vdr-sxfe
+
+				insinto $VDR_PLUGIN_DIR
+				doins libxineliboutput-sxfe.so.*
+			fi
+		fi
+	else
+		emake DESTDIR="${D}" install
+
+		dodoc HISTORY README
+	fi
+}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index c95ba6bb45b1..2ffc32df32a0 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -27,7 +27,7 @@ COMMON_DEPEND="
 	xine? (
 		( >=media-libs/xine-lib-1.2
 			media-video/ffmpeg )
-		fbcon? ( jpeg? ( virtual/jpeg:* ) )
+		fbcon? ( jpeg? ( media-libs/libjpeg-turbo:= ) )
 		X? (
 			x11-libs/libX11
 			x11-libs/libXext
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 			xinerama? ( x11-libs/libXinerama )
 			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
 			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
-			jpeg? ( virtual/jpeg:* )
+			jpeg? ( media-libs/libjpeg-turbo:= )
 			bluray? ( media-libs/libbluray )
 			opengl? ( virtual/opengl )
 		)
@@ -131,7 +131,7 @@ src_install() {
 		fi
 
 		if use xine; then
-			doinitd "${FILESDIR}"/vdr-frontend
+			newinitd "${FILESDIR}"/vdr-frontend-r1 vdr-frontend
 
 			insinto $XINE_PLUGIN_DIR
 			doins xineplug_inp_xvdr.so