Changed shutdown-behaviour, and corrected a bug in shutdown. Cosmetic changes to ebuild.

Package-Manager: portage-2.0.51.22-r3

5 files changed, 228 insertions, 2 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index c2ae9e4ad5c9..60241bcfadcb 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2005/10/11 19:01:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.23 2005/10/12 10:18:24 zzam Exp $
+
+*vdr-1.3.34-r1 (12 Oct 2005)
+
+  12 Oct 2005; Matthias Schwarzott <zzam@gentoo.org>
+  +files/1.3.34/vdr-1.3.34-shutdown-retry.diff, +vdr-1.3.34-r1.ebuild:
+  Changed shutdown-behaviour, and corrected a bug in shutdown. Cosmetic
+  changes to ebuild.
 
   11 Oct 2005; Matthias Schwarzott <zzam@gentoo.org> vdr-1.2.6-r1.ebuild,
   vdr-1.3.27.ebuild, vdr-1.3.34.ebuild:
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index d44bcfd935c7..1aefcc1923e4 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,6 +1,7 @@
 MD5 85028e3cc03f1ac1ba27a5ee0391e96d vdr-1.2.6-r1.ebuild 1433
+MD5 546e03d244cc9660ca10c95f0d7f7217 vdr-1.3.34-r1.ebuild 4413
 MD5 3ef27a3e0510fb21b54e124e01a979d0 vdr-1.3.27.ebuild 4184
-MD5 ddb78e8cb39db8181e990a986a77258a ChangeLog 3064
+MD5 bcd9a0b9aa3f69be6d56dbe420487b50 ChangeLog 3312
 MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
 MD5 2a59a19ef5cb87556f771b9e6ea443c7 vdr-1.3.34.ebuild 4173
 MD5 aa18122fb081cdc19d419d53ad1f63de files/vdr-1.2.6_CAN-2005-0071.patch 893
@@ -8,7 +9,9 @@ MD5 4e0e788481ae4a07c9260bcdbaab3465 files/digest-vdr-1.3.27 370
 MD5 3d3b8b271925155442f660f5a9da86da files/digest-vdr-1.3.34 366
 MD5 5df3de1f888e3fc8f8ba27623a19f40b files/digest-vdr-1.2.6-r1 62
 MD5 aa8d0f66c8831be73c049584d6143c8b files/vdr-1.2.6-gentoo.diff 1995
+MD5 3d3b8b271925155442f660f5a9da86da files/digest-vdr-1.3.34-r1 366
 MD5 0d386d3861b6fc42122c42da4bef26f8 files/1.3.27/vdr-1.3.27-SourceCaps-lnb-sharing.diff 7138
 MD5 f45571c5192376c05c3acc204fbdfef8 files/1.3.27/vdr-1.3.27-SourceCaps.diff 7152
 MD5 05d546888439560f03f1857d32af2062 files/1.3.34/SourceCaps-1.3.33-lnb-sharing.patch 7959
+MD5 76f2aa394b7d17866bc8ea63fe22864a files/1.3.34/vdr-1.3.34-shutdown-retry.diff 1346
 MD5 9b94d2f03c586e9c4dcf2b300af9fd45 files/1.3.34/SourceCaps-1.3.33.patch 7731
diff --git a/media-video/vdr/files/1.3.34/vdr-1.3.34-shutdown-retry.diff b/media-video/vdr/files/1.3.34/vdr-1.3.34-shutdown-retry.diff
new file mode 100644
index 000000000000..b2687b9b812d
--- /dev/null
+++ b/media-video/vdr/files/1.3.34/vdr-1.3.34-shutdown-retry.diff
@@ -0,0 +1,26 @@
+diff -Nru vdr-1.3.34-orig/vdr.c vdr-1.3.34/vdr.c
+--- vdr-1.3.34-orig/vdr.c	2005-10-12 10:50:13.000000000 +0200
++++ vdr-1.3.34/vdr.c	2005-10-12 10:54:43.000000000 +0200
+@@ -68,6 +68,7 @@
+                               // in order to react on a possible new CAM menu as soon as possible
+ #define DEVICEREADYTIMEOUT 30 // seconds to wait until all devices are ready
+ #define MENUTIMEOUT       120 // seconds of user inactivity after which an OSD display is closed
++#define SHUTDOWNRETRY     600 // seconds to wait before retrying a failed automatic shutdown
+ 
+ #define EXIT(v) { ExitCode = (v); goto Exit; }
+ 
+@@ -982,7 +983,13 @@
+                        if (signal(SIGALRM, Watchdog) == SIG_IGN)
+                           signal(SIGALRM, SIG_IGN);
+                        }
+-                    LastActivity = time(NULL); // don't try again too soon
++                    if (!UserShutdown) {
++                       // retry in SHUTDOWNRETRY seconds
++                       LastActivity = time(NULL) - Setup.MinUserInactivity*60 + SHUTDOWNRETRY;
++                       }
++                    else {
++                       LastActivity = time(NULL); // don't try again too soon
++                       }
+                     UserShutdown = false;
+                     continue; // skip the rest of the housekeeping for now
+                     }
diff --git a/media-video/vdr/files/digest-vdr-1.3.34-r1 b/media-video/vdr/files/digest-vdr-1.3.34-r1
new file mode 100644
index 000000000000..3a0d211fdaee
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.3.34-r1
@@ -0,0 +1,5 @@
+MD5 9ac7300d0cba39a84b66bedb509de263 vdr-1.3.34.tar.bz2 511498
+MD5 6d30f22d3a86f851bac2167296912ad0 configurableLNBshare-VDR_1.3.33.patch 20188
+MD5 41f0b90e6c42e9b217b82a3a5e6af5fa vdr-1.3.34-enAIO-2.6.diff.gz 11557
+MD5 e0625aedad55dbb4654c7a8a331aa24f vdr-1.3.34-bigpatch-test1.tar.bz2 139114
+MD5 3b276851190bac5dc03ab81ba55ac193 vdr-jumpplay-0.6-1.3.29.diff 18904
diff --git a/media-video/vdr/vdr-1.3.34-r1.ebuild b/media-video/vdr/vdr-1.3.34-r1.ebuild
new file mode 100644
index 000000000000..180de8ebd4f3
--- /dev/null
+++ b/media-video/vdr/vdr-1.3.34-r1.ebuild
@@ -0,0 +1,185 @@
+# 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.34-r1.ebuild,v 1.1 2005/10/12 10:18:24 zzam Exp $
+
+inherit eutils
+
+IUSE="lirc vfat rcu
+	lnbsharing sourcecaps aio bigpatch jumpplay"
+
+# Names of patches
+FNAME_AIO="${P}-enAIO-2.6.diff"
+FNAME_BIGPATCH="BigPatch/bigpatch-current.diff"
+FNAME_JUMPPLAY="vdr-jumpplay-0.6-1.3.29.diff"
+FNAME_LNBSHARING="configurableLNBshare-VDR_1.3.33.patch"
+FNAME_SOURCECAPS_NORMAL="SourceCaps-1.3.33.patch"
+FNAME_SOURCECAPS_LNBSHARING="SourceCaps-1.3.33-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/${P}-bigpatch-test1.tar.bz2 )
+	jumpplay? ( http://www.toms-cafe.de/vdr/download/${FNAME_JUMPPLAY} )"
+
+KEYWORDS="~amd64 ~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}
+	|| (
+		>=sys-kernel/linux-headers-2.6.11-r2
+		media-tv/linuxtv-dvb
+	)"
+
+# 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
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+	enewuser vdr -1 /bin/bash ${VDR_HOME} vdr,video
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	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 PATCHDIR=${FILESDIR}/${PV}
+	local MY_SOURCECAPS="${PATCHDIR}/${FNAME_SOURCECAPS_NORMAL}"
+
+	epatch "${PATCHDIR}/${P}-shutdown-retry.diff"
+
+	if use bigpatch; then
+		epatch "${WORKDIR}/${FNAME_BIGPATCH}"
+	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}"
+			fi
+		fi
+
+		if use lnbsharing; then
+			epatch "${DISTDIR}/${FNAME_LNBSHARING}"
+			MY_SOURCECAPS="${PATCHDIR}/${FNAME_SOURCECAPS_LNBSHARING}"
+		fi
+
+		use sourcecaps && epatch "${MY_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
+
+	cat > ${CAP_FILE} <<-EOT
+		CAP_IRCTRL_RUNTIME_PARAM=1
+		CAP_VFAT_RUNTIME_PARAM=1
+		CAP_SHUTDOWN_AUTO_RETRY=1
+	EOT
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe vdr
+	doexe svdrpsend.pl
+
+	insinto ${VDR_INCLUDE_DIR}
+	doins *.h
+	doins Make.config
+
+	diropts -m755 -ovdr -gvdr
+	keepdir ${CONF_DIR}
+	keepdir ${CONF_DIR}/plugins
+	keepdir ${VDR_HOME}
+	keepdir ${VDR_HOME}/video
+
+	insinto ${CONF_DIR}
+	insopts -m0644 -ovdr -gvdr
+	doins *.conf channels.conf.*
+	insopts -m0644
+	diropts -m755
+
+
+	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}
+		cp -rl ${T}/source-tree ${D}/${VDRSOURCE_DIR}/${P}
+	fi
+}
+
+pkg_postinst() {
+	einfo "It is a good idea to run vdrplugin-rebuild now"
+}