Make compilation of client and server plugins controllable via useflags, suggested by Thomas Hempe <thomas@thomashempe.de>.

Package-Manager: portage-2.1.6.10/cvs/Linux i686

4 files changed, 105 insertions, 7 deletions

diff --git a/media-plugins/vdr-streamdev/ChangeLog b/media-plugins/vdr-streamdev/ChangeLog
index 2928994099dc..d06929f9e0f3 100644
--- a/media-plugins/vdr-streamdev/ChangeLog
+++ b/media-plugins/vdr-streamdev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-streamdev
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.6 2009/02/25 15:21:31 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.7 2009/03/24 20:52:30 zzam Exp $
+
+*vdr-streamdev-0.3.4-r1 (24 Mar 2009)
+
+  24 Mar 2009; Matthias Schwarzott <zzam@gentoo.org> metadata.xml,
+  +vdr-streamdev-0.3.4-r1.ebuild:
+  Make compilation of client and server plugins controllable via useflags,
+  suggested by Thomas Hempe <thomas@thomashempe.de>.
 
   25 Feb 2009; Matthias Schwarzott <zzam@gentoo.org>
   vdr-streamdev-0.3.4.ebuild:
diff --git a/media-plugins/vdr-streamdev/Manifest b/media-plugins/vdr-streamdev/Manifest
index e0b56061ec56..8ea61de210c5 100644
--- a/media-plugins/vdr-streamdev/Manifest
+++ b/media-plugins/vdr-streamdev/Manifest
@@ -3,13 +3,14 @@ Hash: SHA1
 
 AUX vdr-streamdev-0.3.4-gentoo.diff 692 RMD160 1160469e62bd07cb770eb72c7a01669940959a8f SHA1 da0cb1bbe5b2d42d66c57062569c34de3cd0d91b SHA256 f6f7ba042e34849ac9113cb042dc292fdf88bc6fe6de2a362f0420683a05b017
 DIST vdr-streamdev-0.3.4.tgz 158398 RMD160 99511089ffd2aefe6215a266f50175728fd0634f SHA1 7da7efbff63f66ded24370c86ecbf8dc564a4231 SHA256 a7c00c9d588b1cec96a67e1598dec1f11aa7f85a12c2e122a9dcc13a88e56576
+EBUILD vdr-streamdev-0.3.4-r1.ebuild 2059 RMD160 f23fda47886b6df424e6c6cb3fb8ba57f510c5a2 SHA1 aa46e6444634f98d6411858d8572d55bae8e4733 SHA256 cd8d4ef41821d76c60090c42413dc75aab43b18853e65c89533e304cf6b8400b
 EBUILD vdr-streamdev-0.3.4.ebuild 1697 RMD160 542492644ce96f3fa558a700a18cc30b95c48513 SHA1 417f9c47a084c21af18082ee89c89210aeb0d024 SHA256 3dfac6dfa3aceaedc76a425b76a6132137d028534d6de6ed0599744b7793fd61
-MISC ChangeLog 1089 RMD160 ee9f2015be2feae71a71b8f8444160e4089ac50d SHA1 fd8e779506d6cd3138339bec12f62c427e0aed09 SHA256 5b16503828f9027008fb8e14c66fd8bea31c4298570f0a353d1c493834a14f5c
-MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
+MISC ChangeLog 1358 RMD160 e7a773070631fe9ccff49458e00b5c41d5387041 SHA1 266cdad24b223fe0a53734683dcd5482ef725b3b SHA256 22dc2390a2ddcd07657feb3a2bde5dfaf8ce5a7ae65feab44299f957ba84a71b
+MISC metadata.xml 551 RMD160 d9433445c98fa41f86ad8fa28d4fd101978cc9e4 SHA1 00d4d8b8b08e4a1c16668c476781560e501fe1cf SHA256 31897a7e99af2ccf43ea4f5a6eb73aee28c146a63c9f78c1aec926536cbe5ec8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmlZIIACgkQt2vP6XvVdOfx9ACgxXf/79rIG+nBhQ0oGkKafMRb
-CyEAoIlru9F87YngYRdM3MF6PEhiXBMY
-=pvWA
+iEYEARECAAYFAknJSBgACgkQt2vP6XvVdOfTLwCgtKZA0BwxDRLd22O8zma64w6t
+xUcAoK1LF9JCYEMxcMlAqaxmvJEgNs/N
+=0Qtu
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-streamdev/metadata.xml b/media-plugins/vdr-streamdev/metadata.xml
index 7b718b6f9765..afdf685c26ad 100644
--- a/media-plugins/vdr-streamdev/metadata.xml
+++ b/media-plugins/vdr-streamdev/metadata.xml
@@ -6,4 +6,15 @@
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
+	<use>
+	    <flag name="client">
+			Compile the VDR plugin vdr-streamdev-client
+			that acts like a dvb-budget card
+		</flag>
+		<flag name="server">
+			Compile the VDR plugin vdr-streamdev-server
+			that allows remote systems to access the
+			DVB cards used for the local VDR
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.3.4-r1.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..64293b58ed41
--- /dev/null
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.3.4-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/vdr-streamdev-0.3.4-r1.ebuild,v 1.1 2009/03/24 20:52:30 zzam Exp $
+
+EAPI="1"
+
+inherit vdr-plugin eutils
+
+DESCRIPTION="Video Disk Recorder Client/Server streaming plugin"
+HOMEPAGE="http://www.magoa.net/linux/"
+SRC_URI="http://streamdev.vdr-developer.org/releases/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client +server"
+
+DEPEND=">=media-video/vdr-1.3.24
+	!media-plugins/vdr-streamdev-client
+	!media-plugins/vdr-streamdev-server"
+RDEPEND="${DEPEND}"
+
+EXTERNREMUX_PATH=/usr/share/vdr/streamdev/externremux.sh
+
+PATCHES=("${FILESDIR}/${P}-gentoo.diff")
+
+pkg_setup() {
+	vdr-plugin_pkg_setup
+
+	if ! use client && ! use server; then
+		die "no plugins selected, change useflags and enable at least client or server!"
+	fi
+}
+
+src_unpack() {
+	vdr-plugin_src_unpack
+	cd "${S}"
+
+	# Moving externremux.sh out of /root
+	sed -i remux/extern.c \
+		-e "s#/root/externremux.sh#${EXTERNREMUX_PATH}#"
+
+	# make subdir libdvbmpeg respect CXXFLAGS
+	sed -i Makefile \
+		-e '/CXXFLAGS.*+=/s:^:#:'
+	sed -i libdvbmpeg/Makefile \
+		-e 's:CFLAGS =  -g -Wall -O2:CFLAGS = $(CXXFLAGS) :'
+
+	for flag in client server; do
+		if ! use ${flag}; then
+			sed -i Makefile \
+				-e '/^all:/s/libvdr-$(PLUGIN)-'${flag}'.so//'
+		fi
+	done
+
+	fix_vdr_libsi_include server/livestreamer.c
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	cd "${S}"
+	if use server; then
+		insinto /etc/vdr/plugins/streamdev
+		newins streamdevhosts.conf.example streamdevhosts.conf
+		chown vdr:vdr "${D}"/etc/vdr -R
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin_pkg_postinst
+	elog "If you want to use the externremux-feature, then put"
+	elog "your custom script as ${EXTERNREMUX_PATH}."
+
+	if [[ -e "${ROOT}"/etc/vdr/plugins/streamdevhosts.conf ]]; then
+		einfo "move config file to new config DIR ${ROOT}/etc/vdr/plugins/streamdev/"
+		mv "${ROOT}"/etc/vdr/plugins/streamdevhosts.conf "${ROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf
+	fi
+}