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

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

4 files changed, 104 insertions, 5 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/Manifest b/media-plugins/vdr-streamdev/Manifest
index c8b492f8b4ce..a468ed865af1 100644
--- a/media-plugins/vdr-streamdev/Manifest
+++ b/media-plugins/vdr-streamdev/Manifest
@@ -4,15 +4,17 @@ Hash: SHA1
 AUX confd-0.5.0 237 RMD160 efbe3ef831f4592724a3ac6e5f240d9479bbf677 SHA1 1a04952e4bf757766c3fc26d45d1feb26bbb44e1 SHA256 1b74bc3726a93a252208e632b9402b338f3d6f4b07ef82a1c67390bb6c2dafa8
 AUX rc-addon-0.5.0.sh 365 RMD160 d5acddcbdc7edd1cab6ee8b27b32db20215af53f SHA1 1db13014a9ff5ca1c9b651870a87327fe6f3a125 SHA256 0b870e68d44ff5278de0c780c448ec11c1d791324ff2f8898a1c6b27759b8778
 AUX vdr-streamdev-0.3.4-gentoo.diff 692 RMD160 1160469e62bd07cb770eb72c7a01669940959a8f SHA1 da0cb1bbe5b2d42d66c57062569c34de3cd0d91b SHA256 f6f7ba042e34849ac9113cb042dc292fdf88bc6fe6de2a362f0420683a05b017
+AUX vdr-streamdev-0.5.1_vdr-1.7.25.diff 607 RMD160 49d4f5ee51c3d5ad60c1756cf67efe2929eafd95 SHA1 5b4aadbd5daa460a907d30fa81033c793e203e71 SHA256 c217d0959c292bc03368904db4264ef1d70664ccbb115295406d2ccd565af186
 DIST vdr-streamdev-0.5.1.tgz 178999 RMD160 a4225127f41f552e49c46fb67eff66a61d89399e SHA1 48f998a076b4ffed371b71edc51cc16b6d197ece SHA256 254d1648251cd7265a905e6b7580c8a9f992a3225b4e4b4087582cb9c56e6763
+EBUILD vdr-streamdev-0.5.1-r1.ebuild 2025 RMD160 2981395d877ca3c9eb6d5d68ab51c9fcfc3f3344 SHA1 2682053ad90cb81b1e6c494745aed59f88b631be SHA256 64c53753d3401e8fdc5305902599008c343488d7a47f1b160ca84d969f64e22d
 EBUILD vdr-streamdev-0.5.1.ebuild 2060 RMD160 d3b25f381881984163b033f1430807fe174c6f00 SHA1 26aeb25488ba6942a546cdf994481b9fc8681d01 SHA256 03d3864cb99a45003d78bbe077d30637c0a7b7785215f5037359502284675ef5
-MISC ChangeLog 2995 RMD160 76f085979aac41807ff5029ffc73cf96fabb1ea4 SHA1 21d048430403541124232244e0e21b868667679c SHA256 182a61aa6de809a003fa907138718eb9f420f6dfce0f2b369f6d3d8fba847bcf
+MISC ChangeLog 3208 RMD160 657faccc4b49d2d1c15f8d73a071ac077974cfae SHA1 a84c94758aa123516b60c55f91c29bf8ff1dbe18 SHA256 eb24683003bd28db5f7597db8c7c107e201b3bb3ed5fdf0bd2b4f3a8abdd1a3d
 MISC metadata.xml 551 RMD160 d9433445c98fa41f86ad8fa28d4fd101978cc9e4 SHA1 00d4d8b8b08e4a1c16668c476781560e501fe1cf SHA256 31897a7e99af2ccf43ea4f5a6eb73aee28c146a63c9f78c1aec926536cbe5ec8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFPAfBZdn07HTTCgIoRAjgNAJ9yXEUbt0cZT57fITVr26b4YnD90wCdFfFj
-hVkJJxOFayzdgASxJdfdPUc=
-=HVbB
+iD8DBQFPUoTDdn07HTTCgIoRAhodAKCQ6re0eFfJYoHF1+e7Bf3EwXZb5ACdGKFE
+fS4nmiUSUhRZajyTdNsenOc=
+=+jYZ
 -----END PGP SIGNATURE-----
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
+}