taken from vdr-devel overlay

(Portage version: 2.1.11.50/cvs/Linux i686, signed Manifest commit with key 34C2808A)

4 files changed, 167 insertions, 2 deletions

diff --git a/media-plugins/vdr-streamdev/ChangeLog b/media-plugins/vdr-streamdev/ChangeLog
index 3381758745fd..390bc637cdb4 100644
--- a/media-plugins/vdr-streamdev/ChangeLog
+++ b/media-plugins/vdr-streamdev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-streamdev
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.19 2012/07/01 14:50:16 hd_brummy Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.20 2013/03/31 16:22:06 hd_brummy Exp $
+
+*vdr-streamdev-0.6.0 (31 Mar 2013)
+
+  31 Mar 2013; Joerg Bornkessel <hd_brummy@gentoo.org> +files/confd-0.6.0,
+  +vdr-streamdev-0.6.0.ebuild, +files/rc-addon-0.6.0.sh:
+  taken from vdr-devel overlay
 
   01 Jul 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   -files/vdr-streamdev-0.3.4-gentoo.diff, -vdr-streamdev-0.5.1-r1.ebuild,
diff --git a/media-plugins/vdr-streamdev/files/confd-0.6.0 b/media-plugins/vdr-streamdev/files/confd-0.6.0
new file mode 100644
index 000000000000..1cb42eff3836
--- /dev/null
+++ b/media-plugins/vdr-streamdev/files/confd-0.6.0
@@ -0,0 +1,34 @@
+# /etc/conf.d/vdr.streamdev-server
+
+# Use your own remux script 
+#
+# default: streamdevserver remux script is used
+# take a look at the README for handling
+#
+# allowed values: full path to your replacement script
+#
+#STREAMDEV_REMUX_SCRIPT="/full/path/to/your/own/remux-script"
+
+# You can configure optional authentication credentials
+# for the http protocol here
+#
+# ATTENTION: the colon character ":" is not allowed in 
+#            both the login and password !
+#
+# enable http_auth
+#	allowed values: yes | no
+#	default: no
+#
+#STREAMDEV_HTTP_AUTH_ENABLE="yes"
+
+# Set the user for http_auth
+#	allowed values: your_user
+#	default:
+#
+STREAMDEV_HTTP_LOGIN=""
+
+# Set the password for http_auth
+#	allowed values: your_password
+#	default:
+#
+STREAMDEV_HTTP_PASSWORD=""
diff --git a/media-plugins/vdr-streamdev/files/rc-addon-0.6.0.sh b/media-plugins/vdr-streamdev/files/rc-addon-0.6.0.sh
new file mode 100644
index 000000000000..33d99ec6b60a
--- /dev/null
+++ b/media-plugins/vdr-streamdev/files/rc-addon-0.6.0.sh
@@ -0,0 +1,26 @@
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/files/rc-addon-0.6.0.sh,v 1.1 2013/03/31 16:22:06 hd_brummy Exp $
+#
+# rc-addon-script for plugin streamdev-server
+#
+# Joerg Bornkessel <hd_brummy@g.o>
+
+plugin_pre_vdr_start() {
+
+	: ${STREAMDEV_REMUX_SCRIPT:=/usr/share/vdr/streamdev/externremux.sh}
+	add_plugin_param "-r ${STREAMDEV_REMUX_SCRIPT}"
+
+	if yesno ${STREAMDEV_HTTP_AUTH_ENABLE:-no}; then
+
+		if [[ -z ${STREAMDEV_HTTP_LOGIN} ]]; then
+			eerror "No user in /etc/conf.d/vdr.streamdev-server"
+			logger -t vdr "ERROR: need password for plugin vdr-streamdev-server"
+		fi
+
+		if [[ -z ${STREAMDEV_HTTP_PASSWORD} ]]; then
+			eerror "No password in /etc/conf.d/vdr.streamdev-server"
+			logger -t vdr "ERROR: need password for plugin vdr-streamdev-server"
+		fi
+
+		add_plugin_param "-a ${STREAMDEV_HTTP_LOGIN}:${STREAMDEV_HTTP_PASSWORD}"
+	fi
+}
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild
new file mode 100644
index 000000000000..0999def10778
--- /dev/null
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 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.6.0.ebuild,v 1.1 2013/03/31 16:22:06 hd_brummy Exp $
+
+EAPI="5"
+
+inherit vdr-plugin-2
+
+VERSION="969" # every bump, new version !
+
+DESCRIPTION="VDR Plugin: Client/Server and http streaming plugin"
+HOMEPAGE="http://projects.vdr-developer.org/projects/plg-streamdev"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="client +server"
+
+DEPEND=">=media-video/vdr-1.7.25"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( client server )"
+
+# vdr-plugin-2.eclass changes
+PO_SUBDIR="client server"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# make subdir libdvbmpeg respect CXXFLAGS
+	sed -i Makefile \
+		-e '/CXXFLAGS.*+=/s:^:#:'
+
+	for flag in client server; do
+		if ! use ${flag}; then
+			sed -i Makefile \
+				-e '/^.PHONY:/s/'${flag}'//' \
+				-e '/^all:/s/'${flag}'//'
+		fi
+	done
+
+	sed -i server/Makefile \
+		-i client/Makefile \
+		-e "s:\$(CXXFLAGS) -shared:\$(CXXFLAGS) \$(LDFLAGS) -shared:"
+
+	sed -i "s:include \$(VDRDIR)/Make.global:-include \$(VDRDIR)/Make.global:" Makefile
+
+	fix_vdr_libsi_include server/livestreamer.c
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	if use server; then
+		insinto /usr/share/vdr/streamdev
+		doins streamdev-server/externremux.sh
+
+		insinto /usr/share/vdr/rcscript
+		newins "${FILESDIR}"/rc-addon-0.6.0.sh plugin-streamdev-server.sh
+
+		insinto /etc/conf.d
+		newins "${FILESDIR}"/confd-0.6.0 vdr.streamdev-server
+
+		insinto /etc/vdr/plugins/streamdev-server
+		newins streamdev-server/streamdevhosts.conf streamdevhosts.conf
+		fowners vdr:vdr /etc/vdr -R
+	fi
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.6.0"
+	previous_less_than_0_6_0=$?
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	if [[ -e "${ROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf ]]; then
+		einfo "move config file to new config DIR ${ROOT}/etc/vdr/plugins/streamdev-server/"
+		mv "${ROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf "${ROOT}"/etc/vdr/plugins/streamdev-server/streamdevhosts.conf
+	fi
+
+	if [[ $previous_less_than_0_6_0 = 0 ]]; then
+		einfo "The server-side setting \"Suspend behaviour\" has been dropped in 0.6.0 in favour"
+		einfo "of priority based precedence. A priority of 0 and above means that clients"
+		einfo "have precedence. A negative priority gives precedence to local live TV on the"
+		einfo "server. So if \"Suspend behaviour\" was previously set to \"Client may suspend\" or"
+		einfo "\"Never suspended\", you will have to configure a negative priority. If the"
+		einfo "\"Suspend behaviour\" was set to \"Always suspended\", the default values should do."
+		einfo ""
+		einfo "Configure the desired priorities for HTTP and IGMP Multicast streaming in the"
+		einfo "settings of streamdev-server. If you haven't updated all your streamdev-clients"
+		einfo "to at least 0.5.2, configure \"Legacy Client Priority\", too."
+		einfo ""
+		einfo "In streamdev-client, you should set \"Minimum Priority\" to -99. Adjust \"Live TV"
+		einfo "Priority\" if necessary."
+	fi
+}