From e903b505a20ef2e67b514cc52dc2c6683b5b90ea Mon Sep 17 00:00:00 2001 From: Jörg Bornkessel Date: Sun, 31 Aug 2014 11:37:13 +0000 Subject: cleanup old (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 34C2808A) --- media-plugins/vdr-streamdev/ChangeLog | 7 +- media-plugins/vdr-streamdev/files/confd-0.5.0 | 10 -- .../vdr-streamdev/files/rc-addon-0.5.0.sh | 12 --- .../files/vdr-streamdev-0.6.0_vdr-2.1.2.diff | 15 --- .../vdr-streamdev/vdr-streamdev-0.5.2.ebuild | 77 ---------------- .../vdr-streamdev/vdr-streamdev-0.6.0.ebuild | 101 --------------------- 6 files changed, 6 insertions(+), 216 deletions(-) delete mode 100644 media-plugins/vdr-streamdev/files/confd-0.5.0 delete mode 100644 media-plugins/vdr-streamdev/files/rc-addon-0.5.0.sh delete mode 100644 media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.0_vdr-2.1.2.diff delete mode 100644 media-plugins/vdr-streamdev/vdr-streamdev-0.5.2.ebuild delete mode 100644 media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild (limited to 'media-plugins/vdr-streamdev') diff --git a/media-plugins/vdr-streamdev/ChangeLog b/media-plugins/vdr-streamdev/ChangeLog index 9d46b5098439..f62676696c01 100644 --- a/media-plugins/vdr-streamdev/ChangeLog +++ b/media-plugins/vdr-streamdev/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-streamdev # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.26 2014/03/02 19:42:41 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.27 2014/08/31 11:37:13 hd_brummy Exp $ + + 31 Aug 2014; Joerg Bornkessel + -vdr-streamdev-0.5.2.ebuild, -vdr-streamdev-0.6.0.ebuild, -files/confd-0.5.0, + -files/rc-addon-0.5.0.sh, -files/vdr-streamdev-0.6.0_vdr-2.1.2.diff: + cleanup old 02 Mar 2014; Joerg Bornkessel vdr-streamdev-0.6.1.ebuild: diff --git a/media-plugins/vdr-streamdev/files/confd-0.5.0 b/media-plugins/vdr-streamdev/files/confd-0.5.0 deleted file mode 100644 index e57f06dc5ada..000000000000 --- a/media-plugins/vdr-streamdev/files/confd-0.5.0 +++ /dev/null @@ -1,10 +0,0 @@ -# /etc/conf.d/vdr.streamdev - -# Use your own remux script -# -# default streamdevserver remux script used -# take a look in the README for handling -# -# allowed values: way to your script - -#STREAMDEV_REMUX_SCRIPT="/way/to/your/remux-script" diff --git a/media-plugins/vdr-streamdev/files/rc-addon-0.5.0.sh b/media-plugins/vdr-streamdev/files/rc-addon-0.5.0.sh deleted file mode 100644 index 96da8712d579..000000000000 --- a/media-plugins/vdr-streamdev/files/rc-addon-0.5.0.sh +++ /dev/null @@ -1,12 +0,0 @@ -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/files/rc-addon-0.5.0.sh,v 1.1 2011/01/17 17:07:34 hd_brummy Exp $ -# -# rc-addon-script for plugin streamdev-server -# -# Joerg Bornkessel - -plugin_pre_vdr_start() { - - : ${STREAMDEV_REMUX_SCRIPT:=/usr/share/vdr/streamdev/externremux.sh} - - add_plugin_param "-r ${STREAMDEV_REMUX_SCRIPT}" -} diff --git a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.0_vdr-2.1.2.diff b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.0_vdr-2.1.2.diff deleted file mode 100644 index 32389a4f9bcd..000000000000 --- a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.0_vdr-2.1.2.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur streamdev-0.6.0.orig/server/connectionVTP.c streamdev-0.6.0/server/connectionVTP.c ---- streamdev-0.6.0.orig/server/connectionVTP.c 2013-11-02 18:22:55.000000000 +0100 -+++ streamdev-0.6.0/server/connectionVTP.c 2013-11-02 18:24:57.000000000 +0100 -@@ -1377,7 +1377,11 @@ - if (*Option) { - if (strcasecmp(Option, "DISK") == 0) { - int FreeMB, UsedMB; -+#if APIVERSNUM < 20102 - int Percent = VideoDiskSpace(&FreeMB, &UsedMB); -+#else -+ int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB); -+#endif - Reply(250, "%dMB %dMB %d%%", FreeMB + UsedMB, FreeMB, Percent); - } - else if (strcasecmp(Option, "NAME") == 0) { diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.2.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.2.ebuild deleted file mode 100644 index 61b7b52acfde..000000000000 --- a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# 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.2.ebuild,v 1.2 2012/07/01 14:50:16 hd_brummy Exp $ - -EAPI="4" - -inherit vdr-plugin-2 - -VERSION="953" # 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.6" -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:" - - fix_vdr_libsi_include server/livestreamer.c -} - -src_install() { - vdr-plugin-2_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-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 -} diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild deleted file mode 100644 index 6109afeddf0d..000000000000 --- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.0.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2014 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.3 2014/01/02 13:12:22 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" - -PATCHES=( "${FILESDIR}/${P}_vdr-2.1.2.diff" ) - -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 -} -- cgit v1.2.3-65-gdbad