Added new patch which enables scripts to trigger auto-shutdown.

(Portage version: 2.1_pre2)

5 files changed, 282 insertions, 1 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 2b486acf22b9..5aa76a38cfd0 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.35 2005/12/27 19:16:32 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.36 2005/12/30 01:13:21 zzam Exp $
+
+*vdr-1.3.36-r2 (30 Dec 2005)
+
+  30 Dec 2005; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-add-svdrp-down-0.1.diff, +vdr-1.3.36-r2.ebuild:
+  Added new patch which enables scripts to trigger auto-shutdown.
 
   27 Dec 2005; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.36-r1.ebuild:
   Marked ebuild with crash-bugfix stable on x86
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 5d298c326765..c328f46fedb6 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -11,12 +11,14 @@ MD5 3d3b8b271925155442f660f5a9da86da files/digest-vdr-1.3.34-r1 366
 MD5 3d3b8b271925155442f660f5a9da86da files/digest-vdr-1.3.34-r2 366
 MD5 1a4dd7d813eaaa0a1b118bc6a9ec806b files/digest-vdr-1.3.36 366
 MD5 1a4dd7d813eaaa0a1b118bc6a9ec806b files/digest-vdr-1.3.36-r1 366
+MD5 1a4dd7d813eaaa0a1b118bc6a9ec806b files/digest-vdr-1.3.36-r2 366
 MD5 aa8d0f66c8831be73c049584d6143c8b files/vdr-1.2.6-gentoo.diff 1995
 MD5 aa18122fb081cdc19d419d53ad1f63de files/vdr-1.2.6_CAN-2005-0071.patch 893
 MD5 472e23b8b78fd88b22e140386af74b3d files/vdr-1.3.32-daemon.patch 794
 MD5 4e70ea0094c7bccffbdd3ac93f3010af files/vdr-1.3.36-SourceCaps-for-lnb-sharing.patch 7957
 MD5 d43cfe3b33e25f0d6b9fe2e7a05ae082 files/vdr-1.3.36-SourceCaps.patch 7729
 MD5 be9e179051be6507f89c4bc37612c0f6 files/vdr-1.3.36-low-space-crash.diff 477
+MD5 3c4137f515ae8b47f18eabbbc2be0529 files/vdr-add-svdrp-down-0.1.diff 2588
 MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
 MD5 454443921854ebacbe677c5c81e31022 vdr-1.2.6-r1.ebuild 1226
 MD5 ea832424e28ea15473a15de4aaf4f7f8 vdr-1.3.27.ebuild 4161
@@ -24,4 +26,5 @@ MD5 16d2aa27664f631787066edf0ed9a276 vdr-1.3.34-r1.ebuild 4415
 MD5 84538ae48b983c06e43d26f19f29b1ca vdr-1.3.34-r2.ebuild 4461
 MD5 c32310e782ca4a6b34f0ff48c3abb6d0 vdr-1.3.34.ebuild 4149
 MD5 514b263098bc3d78d509c7438f9e6c7d vdr-1.3.36-r1.ebuild 4761
+MD5 99c92defab46fa9a1ad67ffbe08dacda vdr-1.3.36-r2.ebuild 4747
 MD5 fc877f5af6daffeec70f1e60a4de19ae vdr-1.3.36.ebuild 4720
diff --git a/media-video/vdr/files/digest-vdr-1.3.36-r2 b/media-video/vdr/files/digest-vdr-1.3.36-r2
new file mode 100644
index 000000000000..ef46a95242b5
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.3.36-r2
@@ -0,0 +1,5 @@
+MD5 c64d982f9fe110e6cdc0ce023301a36c configurableLNBshare-VDR_1.3.36.patch 20066
+MD5 006d29b6d95c36b57a9d0be0e365e1d7 vdr-1.3.36-bigpatch-test1.tar.bz2 140154
+MD5 f83f881f2f7f906dd1980c1fa8280ec2 vdr-1.3.36-enAIO-2.7.diff.gz 11475
+MD5 43fd33cdc3980773543f83017f747148 vdr-1.3.36.tar.bz2 513639
+MD5 3b276851190bac5dc03ab81ba55ac193 vdr-jumpplay-0.6-1.3.29.diff 18904
diff --git a/media-video/vdr/files/vdr-add-svdrp-down-0.1.diff b/media-video/vdr/files/vdr-add-svdrp-down-0.1.diff
new file mode 100644
index 000000000000..0a992e16bcb4
--- /dev/null
+++ b/media-video/vdr/files/vdr-add-svdrp-down-0.1.diff
@@ -0,0 +1,71 @@
+diff -ru --exclude='*.o' vdr-1.3.36-orig/svdrp.c vdr-1.3.36/svdrp.c
+--- vdr-1.3.36-orig/svdrp.c	2005-12-29 00:02:26.000000000 +0100
++++ vdr-1.3.36/svdrp.c	2005-12-29 00:18:45.000000000 +0100
+@@ -293,6 +293,9 @@
+   "    Updates a timer. Settings must be in the same format as returned\n"
+   "    by the LSTT command. If a timer with the same channel, day, start\n"
+   "    and stop time does not yet exists, it will be created.",
++  "DOWN [ <minutes> ]\n"
++  "    Starts an automatic shutdown (with 5 minutes waiting time) in given\n"
++  "    minutes or now if no number was given.",
+   "VOLU [ <number> | + | - | mute ]\n"
+   "    Set the audio volume to the given number (which is limited to the range\n"
+   "    0...255). If the special options '+' or '-' are given, the volume will\n"
+@@ -1342,6 +1345,16 @@
+      Reply(501, "Missing timer settings");
+ }
+ 
++extern time_t LastActivity; 
++void cSVDRP::CmdDOWN(const char *Option)
++{
++  if (isnumber(Option))
++     LastActivity = time(NULL) - Setup.MinUserInactivity*60 + strtol(Option, NULL, 10)*60;
++  else
++     LastActivity = time(NULL) - Setup.MinUserInactivity*60;
++  Reply(250, "Automatic shutdown triggered");
++}
++	
+ void cSVDRP::CmdVOLU(const char *Option)
+ {
+   if (*Option) {
+@@ -1413,6 +1426,7 @@
+   else if (CMD("STAT"))  CmdSTAT(s);
+   else if (CMD("UPDT"))  CmdUPDT(s);
+   else if (CMD("VOLU"))  CmdVOLU(s);
++  else if (CMD("DOWN"))  CmdDOWN(s);
+   else if (CMD("QUIT"))  Close();
+   else                   Reply(500, "Command unrecognized: \"%s\"", Cmd);
+ }
+diff -ru --exclude='*.o' vdr-1.3.36-orig/svdrp.h vdr-1.3.36/svdrp.h
+--- vdr-1.3.36-orig/svdrp.h	2005-12-29 00:02:26.000000000 +0100
++++ vdr-1.3.36/svdrp.h	2005-12-29 00:20:27.000000000 +0100
+@@ -81,6 +81,7 @@
+   void CmdSCAN(const char *Option);
+   void CmdSTAT(const char *Option);
+   void CmdUPDT(const char *Option);
++  void CmdDOWN(const char *Option);
+   void CmdVOLU(const char *Option);
+   void Execute(char *Cmd);
+ public:
+Nur in vdr-1.3.36: vdr.
+diff -ru --exclude='*.o' vdr-1.3.36-orig/vdr.c vdr-1.3.36/vdr.c
+--- vdr-1.3.36-orig/vdr.c	2005-12-29 00:02:26.000000000 +0100
++++ vdr-1.3.36/vdr.c	2005-12-29 00:09:49.000000000 +0100
+@@ -89,6 +89,8 @@
+   exit(1);
+ }
+ 
++time_t LastActivity;
++
+ int main(int argc, char *argv[])
+ {
+   // Save terminal settings:
+@@ -395,7 +397,7 @@
+   int PreviousChannel[2] = { 1, 1 };
+   int PreviousChannelIndex = 0;
+   time_t LastChannelChanged = time(NULL);
+-  time_t LastActivity = 0;
++  LastActivity = 0; // now being a global variable
+   time_t LastCamMenu = 0;
+   int MaxLatencyTime = 0;
+   bool ForceShutdown = false;
diff --git a/media-video/vdr/vdr-1.3.36-r2.ebuild b/media-video/vdr/vdr-1.3.36-r2.ebuild
new file mode 100644
index 000000000000..8ae23c12dc78
--- /dev/null
+++ b/media-video/vdr/vdr-1.3.36-r2.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.36-r2.ebuild,v 1.1 2005/12/30 01:13:22 zzam Exp $
+
+inherit eutils
+
+IUSE="lirc vfat rcu
+	lnbsharing sourcecaps aio bigpatch jumpplay"
+
+# Names of patches
+FNAME_AIO="${P}-enAIO-2.7.diff"
+FNAME_BIGPATCH="${P}-bigpatch-test1"
+FNAME_JUMPPLAY="vdr-jumpplay-0.6-1.3.29.diff"
+FNAME_LNBSHARING="configurableLNBshare-VDR_1.3.36.patch"
+FNAME_SOURCECAPS_NORMAL="vdr-1.3.36-SourceCaps.patch"
+FNAME_SOURCECAPS_LNBSHARING="vdr-1.3.36-SourceCaps-for-lnb-sharing.patch"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.cadsoft.de/vdr/"
+SRC_URI="ftp://ftp.cadsoft.de/vdr/Developer/${P}.tar.bz2
+	lnbsharing? ( http://xn--ltzke-jua.de/dvb/VDR_LNB_sharing_patch/${FNAME_LNBSHARING} )
+	aio? ( http://www.saunalahti.fi/~rahrenbe/vdr/patches/${FNAME_AIO}.gz )
+	bigpatch? ( http://bigpatch.vdr-developer.org/${PV}/${FNAME_BIGPATCH}.tar.bz2 )
+	jumpplay? ( http://www.toms-cafe.de/vdr/download/${FNAME_JUMPPLAY} )"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+
+_DEPEND="media-libs/jpeg
+	lirc? ( app-misc/lirc )
+	sys-apps/gawk"
+
+RDEPEND="${_DEPEND}
+	dev-lang/perl
+	media-tv/vdrplugin-rebuild
+	media-tv/gentoo-vdr-scripts"
+
+DEPEND="${_DEPEND}
+	media-tv/linuxtv-dvb-headers"
+
+# Relevant Pathes for vdr on gentoo
+DVB_DIR=/usr/include
+VDR_INCLUDE_DIR=/usr/include/vdr
+PLUGIN_DIR=/usr/lib/vdr/plugins
+CONF_DIR=/etc/vdr
+RC_DIR=/usr/lib/vdr/rcscript
+CAP_FILE=${S}/vdr-capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+VDR_HOME=/var/vdr
+
+add_cap() {
+	while [ "$1" ]; do
+		CAPS="${CAPS}\n$1=1"
+		shift
+	done
+}
+
+pkg_setup() {
+	enewgroup vdr
+	enewuser vdr -1 /bin/bash ${VDR_HOME} vdr,video
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-low-space-crash.diff
+
+	ebegin "Changing pathes for gentoo"
+	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
+
+	sed \
+	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFIGDIR;-' \
+	  -i vdr.c
+
+	cat > Make.config <<-EOT
+		#
+		# Generated by ebuild ${PF}
+		#
+		DVBDIR		 = ${DVB_DIR}
+		PLUGINLIBDIR = ${PLUGIN_DIR}
+		CONFIGDIR	 = ${CONF_DIR}
+
+		DEFINES		+= -DCONFIGDIR=\"\$(CONFIGDIR)\"
+	EOT
+	eend 0
+
+	if use rcu; then
+		echo "REMOTE=RCU" >> Make.config
+		use lirc && ewarn "Only one remotes can be used: dropping lirc and keeping rcu"
+	else
+		use lirc && echo "REMOTE=LIRC" >> Make.config
+	fi
+	use vfat && echo "VFAT=1" >> Make.config
+
+	# apply standard patches
+	local MY_SOURCECAPS="${FILESDIR}/${FNAME_SOURCECAPS_NORMAL}"
+
+	epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
+
+	if use bigpatch; then
+		epatch "${WORKDIR}/BigPatch/bigpatch-current.diff"
+		add_cap PATCHED_BIGPATCH PATCHED_SOURCECAPS PATCHED_LNBSHARING PATCHED_AIO
+	else
+		# All these patches are included in bigpatch
+		if use aio; then
+			if use lnbsharing; then
+				ewarn "At the moment lnbsharing can not be combined with aio, dropping aio patch!"
+			else
+				epatch "../${FNAME_AIO}"
+				add_cap PATCHED_AIO
+			fi
+		fi
+
+		if use lnbsharing; then
+			epatch "${DISTDIR}/${FNAME_LNBSHARING}"
+			MY_SOURCECAPS="${FILESDIR}/${FNAME_SOURCECAPS_LNBSHARING}"
+			add_cap PATCHED_LNBSHARING
+		fi
+
+		use sourcecaps && epatch "${MY_SOURCECAPS}"
+		add_cap PATCHED_SOURCECAPS
+
+		if use jumpplay; then
+			if use sourcecaps; then
+				ewarn "At the moment sourcecaps can not be combined with jumpplay, dropping jumpplay patch."
+			else
+				epatch "${DISTDIR}/${FNAME_JUMPPLAY}"
+			fi
+		fi
+	fi
+
+
+
+	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
+	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
+		echo
+		einfo "Applying local patches"
+		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${PV}/*.{diff,patch}; do
+			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
+		done
+	fi
+
+	if [[ -n "${VDRSOURCE_DIR}" ]]; then
+		cp -r ${S} ${T}/source-tree
+	fi
+
+
+	add_cap CAP_IRCTRL_RUNTIME_PARAM \
+		CAP_VFAT_RUNTIME_PARAM \
+		CAP_SHUTDOWN_SVDRP
+
+	echo -e ${CAPS} > ${CAP_FILE}
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe vdr
+	doexe svdrpsend.pl
+
+	insinto ${VDR_INCLUDE_DIR}
+	doins *.h
+	doins Make.config
+
+	insinto ${VDR_INCLUDE_DIR}/libsi
+	doins libsi/*.h
+
+	keepdir ${CONF_DIR}
+	keepdir ${CONF_DIR}/plugins
+	keepdir ${VDR_HOME}
+	keepdir ${VDR_HOME}/video
+
+	insinto ${CONF_DIR}
+	doins *.conf channels.conf.*
+
+	chown -R vdr:vdr ${D}/${CONF_DIR} ${D}/${VDR_HOME}
+	keepdir "${PLUGIN_DIR}"
+
+	doman vdr.1 vdr.5
+
+	insinto ${RC_DIR}
+	doins ${CAP_FILE}
+
+	if [[ -n "${VDRSOURCE_DIR}" ]]; then
+		einfo "Installing sources"
+		insinto ${VDRSOURCE_DIR}/${P}
+		doins -r ${T}/source-tree/*
+		keepdir ${VDRSOURCE_DIR}/${P}/PLUGINS/lib
+	fi
+}
+
+pkg_postinst() {
+	einfo "It is a good idea to run vdrplugin-rebuild now"
+}