updated patchset to 0.5, added fix for a crash in libsi

(Portage version: 2.1_pre4-r1)

4 files changed, 236 insertions, 11 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 0b562302499c..3356f95bcda9 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.48 2006/02/08 19:08:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.49 2006/02/18 20:10:11 zzam Exp $
+
+*vdr-1.3.41-r1 (18 Feb 2006)
+
+  18 Feb 2006; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.3.41-r1.ebuild:
+  updated patchset to 0.5, added fix for a crash in libsi
 
   08 Feb 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.41.ebuild:
   Modified patchset to work with useflag bigpatch (See bug #122100)
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index bb380e50ae9d..6f7af99c06bb 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a5ea95244fb38a5427bedc2df7400812 ChangeLog 7231
 RMD160 f479ee001b4410c7ca4264e5cf3aa5261a3e3a41 ChangeLog 7231
 SHA256 7f74e84245a019c9eb5354978b49271e0a0ff4c9f717efe394cfea76af1ddb24 ChangeLog 7231
@@ -49,6 +46,9 @@ SHA256 f780c1be1bc5c2e22372175e0097ae7b82bf73f828659d5910551eeb7555b7fd files/di
 MD5 f1609fd224b6e6ae1696db31f61a0cbc files/digest-vdr-1.3.41 530
 RMD160 105c9fda430bf5ba6d6615d944cf5b19046f61e8 files/digest-vdr-1.3.41 530
 SHA256 6fc9d2df0617f8bc9790d6b9968bda3b254287f980444ca45b1806e0a246724c files/digest-vdr-1.3.41 530
+MD5 995b2416cc7c5e79bb602619065eb092 files/digest-vdr-1.3.41-r1 530
+RMD160 51b294c6816baeb54536d568afe8cc6472cd66e5 files/digest-vdr-1.3.41-r1 530
+SHA256 a24c8032c4e5976ccc776e89f554d307bd606a7811c1a972fc34c68d2a881e57 files/digest-vdr-1.3.41-r1 530
 MD5 aa8d0f66c8831be73c049584d6143c8b files/vdr-1.2.6-gentoo.diff 1995
 RMD160 e166ae3db608588fbc3b753764d1e5819a5c4549 files/vdr-1.2.6-gentoo.diff 1995
 SHA256 5c7380e402a1a835e91c5b13aeea6f5dbe589d7ed35b7b28753120d69998515c files/vdr-1.2.6-gentoo.diff 1995
@@ -103,13 +103,9 @@ SHA256 4d92b009fa6e0af7bfb0c63935572526fead7f3763deb11a8481ec950be8c42f vdr-1.3.
 MD5 fc877f5af6daffeec70f1e60a4de19ae vdr-1.3.36.ebuild 4720
 RMD160 015d231b0c6667fcc983ecda3194f47c2fcdd5f0 vdr-1.3.36.ebuild 4720
 SHA256 47822fc12f71cea5411bf54a4939bda27f3f90a44d25da0b5f420bf450036f13 vdr-1.3.36.ebuild 4720
+MD5 dda0391282befe5c25cc1dd40ef6f1b7 vdr-1.3.41-r1.ebuild 4717
+RMD160 4c98c83c31d5d1921870a644d59e7ba965d4a960 vdr-1.3.41-r1.ebuild 4717
+SHA256 5de43bcd9d60e0370271b3ee79eea292fff4758f23aa92d596b22b9d8b7ef976 vdr-1.3.41-r1.ebuild 4717
 MD5 0a32e88862bf95092c8f22fcc129dc06 vdr-1.3.41.ebuild 4717
 RMD160 92cbae7d1ba635450e626a07d0c0cddefb675ed3 vdr-1.3.41.ebuild 4717
 SHA256 e89e49f001b83af595c52d7089eea064454c2f4fc0bedb757a2fc3ac74858e89 vdr-1.3.41.ebuild 4717
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6kHpZfSl1Kp5KmoRAgzRAJ4gzQdCppCO6IhqOo77Mfkq0BRjuQCgllAh
-TYlcsAz/pzWvFaOynCYCuFk=
-=ZiHT
------END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/digest-vdr-1.3.41-r1 b/media-video/vdr/files/digest-vdr-1.3.41-r1
new file mode 100644
index 000000000000..22d0fd0ccd3c
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.3.41-r1
@@ -0,0 +1,6 @@
+MD5 3bce55a654d35bfb49d8789d708450e4 vdr-1.3.41-gentoo-patchset-0.5.tar.bz2 189798
+RMD160 16e8a6dad82737e2115b6bb4509b54ca9b4b88e3 vdr-1.3.41-gentoo-patchset-0.5.tar.bz2 189798
+SHA256 093db1d1228bd3dd067e643535fe356b2856fe21a55456cb52b6f5c2feda736c vdr-1.3.41-gentoo-patchset-0.5.tar.bz2 189798
+MD5 e0b115d8aa7a9b55ee15a62aa3856282 vdr-1.3.41.tar.bz2 532769
+RMD160 0a91c57eaa141fa0da97a4fb8b4e56f97b61af9c vdr-1.3.41.tar.bz2 532769
+SHA256 b3a3e20107644ba8b7316cb421ddcd7a43d11d954cb74f4c935be45d1734c79a vdr-1.3.41.tar.bz2 532769
diff --git a/media-video/vdr/vdr-1.3.41-r1.ebuild b/media-video/vdr/vdr-1.3.41-r1.ebuild
new file mode 100644
index 000000000000..317130dfdccd
--- /dev/null
+++ b/media-video/vdr/vdr-1.3.41-r1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.41-r1.ebuild,v 1.1 2006/02/18 20:10:11 zzam Exp $
+
+inherit eutils
+
+IUSE="aio bigpatch jumpplay lnbsharing sourcecaps yaepg setup-plugin subtitles"
+
+PATCHSET_V=0.5
+PATCHSET_NAME=${P}-gentoo-patchset-${PATCHSET_V}
+
+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
+	mirror://gentoo/${PATCHSET_NAME}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+
+DEPEND="media-libs/jpeg
+	sys-apps/gawk
+	media-tv/linuxtv-dvb-headers
+	sys-libs/libcap"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	media-tv/vdrplugin-rebuild
+	>=media-tv/gentoo-vdr-scripts-0.2.3"
+
+# Relevant Pathes for vdr on gentoo
+DVB_DIR=/usr/include
+VDR_INCLUDE_DIR=/usr/include/vdr
+PLUGIN_LIB_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."
+
+add_cap() {
+	while [ "$1" ]; do
+		CAPS="${CAPS}\n$1=1"
+		shift
+	done
+}
+
+# works like use to check for active (and not active !abc) useflags
+# if more than one flag is given it returns that all flags are active
+#
+# "use_multi_and a b !c !d"
+# ==
+# "use a && use b && use !c && use !d"
+#
+use_multi_and() {
+	while [[ -n ${1} ]]; do
+		use ${1} || return 1
+
+		shift
+	done
+	return 0
+}
+
+# reads the line GENTOO_USE out of the beginning of the patch
+# example: GENTOO_USE: aio !bigpatch
+# and checks weather the useflags are set appropriate (via use_multi_and)
+# if check returns true the patch is applied
+#
+apply_vdr_patch() {
+	local APPLY=1
+	local p="${1}"
+	debug-print "PATCH:"
+	debug-print "  $(basename ${p})"
+	local V1
+	local V2
+	while read V1 V2; do
+		case ${V1} in
+		GENTOO_USE:)
+			APPLY=0
+			if use_multi_and ${V2}; then
+				APPLY=1
+				break
+			fi
+			;;
+		+++|---|diff|@@)
+			break;
+			;;
+		*)
+			;;
+		esac
+	done < "${p}"
+	[[ ${APPLY} == 0 ]] && return
+	debug-print "    --> applied"
+	epatch "${p}"
+}
+
+# call apply_vdr_patch for all patchfiles in given directory
+
+apply_vdr_patchset() {
+	local p
+	for p in ${1}/*.{diff,patch}; do
+		[[ -f "${p}" ]] || continue
+		apply_vdr_patch "${p}"
+	done
+}
+
+src_unpack() {
+	unpack ${A}
+	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
+		PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
+	else
+		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+	fi
+
+	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_LIB_DIR}
+		CONFIGDIR	 = ${CONF_DIR}
+
+		DEFINES		+= -DCONFIGDIR=\"\$(CONFIGDIR)\"
+	EOT
+	eend 0
+
+	apply_vdr_patchset ${PATCHSET_DIR}
+
+	# 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 \
+		CAP_CHUID
+
+	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}/plugins
+
+	insinto ${CONF_DIR}
+	doins *.conf channels.conf.*
+
+	keepdir "${PLUGIN_LIB_DIR}"
+
+	doman vdr.1 vdr.5
+
+	dohtml *.html
+	dodoc MANUAL INSTALL README* HISTORY*
+	dodoc TODO-enAIO-rm CONTRIBUTORS
+
+	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
+
+	if use setup-plugin; then
+		insinto /usr/share/vdr/setup
+		doins ${S}/menu.c
+
+		insinto /etc/vdr/plugins/setup
+		newins ${FILESDIR}/vdr-setup-menu-0.2.3.xml vdr-menu.xml
+	fi
+	chown -R vdr:vdr ${D}/${CONF_DIR}
+}
+
+pkg_postinst() {
+	einfo "It is a good idea to run vdrplugin-rebuild now"
+	if has_version "<media-video/vdr-1.3.36-r3"; then
+		ewarn "Upgrade Info:"
+		ewarn
+		ewarn "If you had used the use-flags lirc, rcu or vfat"
+		ewarn "then, you now have to enable the associated functionality"
+		ewarn "in /etc/conf.d/vdr"
+		ewarn
+		ewarn "vfat is now set with VFAT_FILENAMES."
+		ewarn "lirc/rcu are now set with IR_CTRL."
+		ebeep
+	fi
+}