eapi=4 changes, diff for >=vdr-1.7.25

(Portage version: 2.1.10.11/cvs/Linux i686)

3 files changed, 98 insertions, 1 deletions

diff --git a/media-plugins/vdr-streamdev/ChangeLog b/media-plugins/vdr-streamdev/ChangeLog
index 1669744f7a6c..97e75ed813e8 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.14 2012/01/02 17:58:38 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.15 2012/03/03 20:52:08 hd_brummy Exp $
+
+*vdr-streamdev-0.5.1-r1 (03 Mar 2012)
+
+  03 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-streamdev-0.5.1-r1.ebuild, +files/vdr-streamdev-0.5.1_vdr-1.7.25.diff:
+  eapi=4 changes, diff for >=vdr-1.7.25
 
   02 Jan 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   -vdr-streamdev-0.3.4.ebuild, -vdr-streamdev-0.3.4-r1.ebuild,
diff --git a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.5.1_vdr-1.7.25.diff b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.5.1_vdr-1.7.25.diff
new file mode 100644
index 000000000000..32b9cc9664f2
--- /dev/null
+++ b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.5.1_vdr-1.7.25.diff
@@ -0,0 +1,13 @@
+--- streamdev/client/device.c.bak	2012-03-03 15:27:48.000000000 +0100
++++ streamdev/client/device.c	2012-03-03 15:28:07.000000000 +0100
+@@ -313,8 +313,8 @@
+ 		m_Device->Lock();
+ 		if (m_Device->m_UpdatePriority && ClientSocket.DataSocket(siLive)) {
+ 			int Priority = m_Device->Priority();
+-			if (m_Device == cDevice::ActualDevice() && Priority < Setup.PrimaryLimit)
+-				Priority = Setup.PrimaryLimit;
++			if (m_Device == cDevice::ActualDevice() && Priority < 0)
++				Priority = 0;
+ 			if (m_Device->m_Priority != Priority && ClientSocket.SetPriority(Priority))
+ 				m_Device->m_Priority = Priority;
+ 		}
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.1-r1.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..442f2c4bec17
--- /dev/null
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 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.5.1-r1.ebuild,v 1.1 2012/03/03 20:52:08 hd_brummy Exp $
+
+EAPI="4"
+
+inherit vdr-plugin
+
+VERSION="497" # every bump, new version !
+
+DESCRIPTION="VDR Plugin: Client/Server 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.5.9"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE=" || ( client server ) "
+
+src_prepare() {
+	vdr-plugin_src_prepare
+
+	if has_version ">=media-video/vdr-1.7.25"; then
+		epatch "${FILESDIR}/${P}_vdr-1.7.25.diff"
+	fi
+
+	# 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:"
+
+	fix_vdr_libsi_include server/livestreamer.c
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	cd "${S}"
+	if use server; then
+		insinto /etc/vdr/plugins/streamdev-server
+		newins streamdev-server/streamdevhosts.conf streamdevhosts.conf
+		chown vdr:vdr "${D}"/etc/vdr -R
+
+		insinto /usr/share/vdr/streamdev
+		doins streamdev-server/externremux.sh
+
+		insinto /usr/share/vdr/rcscript
+		newins "${FILESDIR}"/rc-addon-0.5.0.sh plugin-streamdev-server.sh
+
+		insinto /etc/conf.d
+		newins "${FILESDIR}"/confd-0.5.0 vdr.streamdev-server
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin_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
+}