Version bump to 1.7.25. The noepg patch has been removed as vdr offers almost the same functionality as of 1.7.25

(Portage version: 2.1.10.44/svn/Linux i686, signed Manifest commit with key B427ABC8)

svn path=/vdr-devel/; revision=927

3 files changed, 376 insertions, 7 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index a896b55..9170ad2 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vdr-1.7.25 (04 Mar 2012)
+
+  04 Mar 2012; Christian Ruppert <idl0r@gentoo.org> +vdr-1.7.25.ebuild:
+  Version bump to 1.7.25. The noepg patch has been removed as vdr offers almost
+  the same functionality as of 1.7.25
+
   03 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.7.24-r1.ebuild:
   more cleanups for install info
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index cee39f4..e5631ab 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 1.7.24-time_shift.patch 405 RMD160 d59011eac105f4cb8e0d962109f634bb8c2a28f4 SHA1 ad55664870976f21c358bef4dd24370811f1a7ea SHA256 99256af917d877b8e4e5cf23246c4c7fca6ba78aa3b9b30111f36f3915813409
 AUX channel_alternative.conf 332 RMD160 2471e236ed71e93339545447b1651c5ad37491ea SHA1 936278f8d564b17d137f5910b1d43bc2a31ebd0f SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce
@@ -12,23 +12,29 @@ AUX vdr-1.7.22-shared-tinyxml.diff 1228 RMD160 36cc3f931edf86c114a0dccaae095acef
 DIST extpng-vdr-1.7.22v1-gentoo-edition.diff.tgz 117201 RMD160 630415557834d7b2c3252671cdb8ce2fdfda19e3 SHA1 587f48464980613448eabcbe2fbaab4dda47b75b SHA256 7aecc2fc9637ea7912d0e074e3d8b54dfb01ea347978fffd16d3bc1e9538bdb1
 DIST extpng-vdr-1.7.23v1-gentoo-edition.patch 572319 RMD160 14332bf39d9d0cf4fbbe546c5b324d97d3000c86 SHA1 f1844de19b17045a556aad677c51aad74ae60c50 SHA256 ea8347fe4bf07e2b4924febb28018df9b3ebfa0ff73564c7dae8d32d35162a7e
 DIST extpng-vdr-1.7.24v2-gentoo-edition.patch 445832 RMD160 757bc1b354b2d084312901e5b6981d787b201b15 SHA1 a03888f4b3a080e6a5fbf3661bd4634f14ede65b SHA256 a5646c64530ebc9068a95f51e61803f49b248b97605a09466e027c97d75730a5
+DIST extpng-vdr-1.7.25-gentoo-edition.patch.bz2 73764 RMD160 909d79614bca6a825d06e680a0a1377bef730ca3 SHA1 ea7721a42296dd4972e38e0308ccb3dbddba52c0 SHA256 022e5c793f806164f9f1ae4da253db6a1dbcd997241d7523ce489040bbab8fb7
 DIST extpngvdr1.7.21v1.diff.gz 91865 RMD160 cfb5915d71faae5be096f585aaaca32dd535ded8 SHA1 939a6ca46478702c400c433406e13029f3b381d1 SHA256 72b1e0f02d9eb4c2971a2a5fa93467150ffb66ce4ae435afeb7e5381ec88f10c
 DIST vdr-1.7.21.tar.bz2 730767 RMD160 8427ea612ac5570745efcabd991eb8b7e402adbd SHA1 f916e1aeae54ee615920442225fa312ddf445ada SHA256 f85e431b8d233e0541501884619a1a17a46104c76ef0fbe96d09e09e2b67437a
 DIST vdr-1.7.22.tar.bz2 757800 RMD160 3f29e31c56cad920ac4572701caa652a5821765e SHA1 dd677c3db91f8331d9a9e7a382cbb908b8443af0 SHA256 73c36058400bc86b8b5aaaf5de0989551e4e6fc052157bebd180bfac4af7f628
 DIST vdr-1.7.23.tar.bz2 761767 RMD160 59d6efc62aa16108d96262d53781c8eadeb98de9 SHA1 5b7485bf5ca15f6339d3385f84900fb4cbe67c26 SHA256 1d1c25e66f51c5489ed0238601002c7ffa9ad5c666f45b51c311fa13bd018c0e
 DIST vdr-1.7.24.tar.bz2 765472 RMD160 410402bb4a4f7e5350672e94f4fdb2e0326cf80b SHA1 4358b78e0aba63ed8fd8aaba1d7baea95d4175a0 SHA256 a1209612c69bab9bd37078b65c5da26b1173f075aba742acb6dc07303beb97a8
+DIST vdr-1.7.25.tar.bz2 768334 RMD160 324915c7081076031d028b30ed225a380e53f41d SHA1 5a37469b89034f56298faaa77bdca2e3d1eb901b SHA256 3e5438ee46e32cdfcd074bd55246965796d93c33984be3b2a21e51983ac48cf4
 EBUILD vdr-1.7.21-r1.ebuild 11790 RMD160 2121869265392bc188dcd9ca91a04811cec14766 SHA1 a9cb60b1805261a4bde5f84d3194503dd9a8e9b1 SHA256 175eff3df4de2bbf46116c2fec8320fa1282e8550cb5e713b87eca0a636879a8
 EBUILD vdr-1.7.21.ebuild 11854 RMD160 162c79c56fed518c791613ecc48bab0e35f6683c SHA1 2579bde5f2727af4096b62291b25f496dea75526 SHA256 59fff0902128fd1935eebfbb6d193adbe0ba30b40df22c4787d78ba06baa2a93
 EBUILD vdr-1.7.22.ebuild 11393 RMD160 225deaffa7a80504287678127869dde1df0eff8e SHA1 67210b93e18d41362f6c434ebcd2f638bc69f5e7 SHA256 ddcf43986ad1f6c1ce95303aafbd7e1127b4ce16f643c2068d86926e1f6217e2
 EBUILD vdr-1.7.23.ebuild 11026 RMD160 a378b51aa13161ece496624f16ae1bb6ca9de018 SHA1 5d05292469bb0fafcde7990ebcf9b483192983b7 SHA256 d06d75542914d4b5c5f35b763c4ec09bdc7c647bab4b9f1efcd144a6793d620b
 EBUILD vdr-1.7.24-r1.ebuild 9947 RMD160 bfba04dbbfcdceb921a5be76395ac3685e6f5149 SHA1 fe8e6612a74b4fb170de932318acf383c14b8bd9 SHA256 0f003a523326da70f4bd5e20849df388bf4d378343aaec52e62018a17717cbaa
-MISC ChangeLog 16020 RMD160 92989c4ef7b28fe222b429451f4c9bab18b8c826 SHA1 4db8fbf70fec3ec839467586a450a99664a37710 SHA256 5a5dfa7373ed39575e765ad0e10661c475580db187ea37fd5704136e0d16b5bd
+EBUILD vdr-1.7.25.ebuild 9902 RMD160 6bb89fdbc731068104bdc3ba1fb54c3329c613c5 SHA1 d9bbc76af17666276fee7e6cb44445767f50391a SHA256 02d5bc05ed761a35e7024cd311160162215714d7a2268a7411f1beebf253b16a
+MISC ChangeLog 16238 RMD160 6db80714060b190084d6df5b832153afc9d7f9ba SHA1 b3a2369e69c61338f8ce4f0e19e61ccb7b35ae95 SHA256 25812eac7e6a2238cd1f24f3caf0f317abdb9a8bcedd34acce35519eb008a44d
 MISC metadata.xml 2280 RMD160 4dcf23bafb66b7f25220f92b63cc00d126442fb1 SHA1 c265991ff31bbb8995cf0f227e722ff20807500b SHA256 d204634476258763293b4fe587465e556210a6f9646c81bf2abb86e54ad26023
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFPUl5udn07HTTCgIoRAk+rAJ9Na4y4oyaSYVIUyNilQeqNjpbHBACfWUCI
-5eoawCubZFSMt9wkWPQha0E=
-=Wan2
+iQEcBAEBCAAGBQJPU+ocAAoJEMOx0zmdw4Z13FEH/A6earRr8nmN2Z7qETcHWEnW
+sYQ4FaLQLAvynTsNb3+nqvGIg9flHO6QLXcm7tyxuN0/y6QqRqq08stwaSk0JpB5
+qqQtcmNQBt4RNzgZkjZW6oRZ17tdStwOSQfOzfAxQUKhPs/SoHBTulkxI1mCuTCV
+Uwely/gdRUFj7j8YVlOJzG07NqLfvJDm8hQW0TOWf98G6JlsdqYWFbGQPcawHz4n
+ZMCuozSCg1rgk6mDiLALOpNZ4C+aEYAUG4Iv4nzW/6bGcmLxQnV9Mc3CXbw4cEnd
+CD4TNt+2q8D9G5ngGd7grG/bKbsCcd8vHVBNhV19XucJzyB9jXPKW6bgP46o4ms=
+=FaW3
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.7.25.ebuild b/media-video/vdr/vdr-1.7.25.ebuild
new file mode 100644
index 0000000..8bf8ba1
--- /dev/null
+++ b/media-video/vdr/vdr-1.7.25.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic multilib
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel cutterlimit
+	ddepgentry dvlvidprefer graphtft hardlinkcutter jumpplay
+	liemikuutio lircsettings mainmenuhooks menuorg nalustripper pinplugin
+	rotor setup timerinfo ttxtsubs volctrl wareagleicon yaepg"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
+
+IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${P}-gentoo-edition"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~idl0r/vdr/${EXT_P}.patch.bz2"
+#		http://vdr.websitec.de/download/ext-patch/${EXT_P}.diff.tgz"
+
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+REQUIRED_USE="setup? ( !menuorg )
+	menuorg? ( !setup )"
+
+COMMON_DEPEND="virtual/jpeg
+	sys-libs/libcap
+	>=media-libs/fontconfig-2.4.2
+	>=media-libs/freetype-2
+	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
+
+DEPEND="${COMMON_DEPEND}
+	>=virtual/linuxtv-dvb-headers-5.3
+	sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	>=media-tv/gentoo-vdr-scripts-0.4.10
+	media-fonts/corefonts"
+
+# pull in vdr-setup to get the xml files, else menu will not work
+PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
+		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
+		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
+		eerror "Please move all your patches into"
+		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
+		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
+		die
+	fi
+
+	use debug && append-flags -g
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+}
+
+add_cap() {
+	local arg
+	for arg; do
+		CAPS="${CAPS}\n${arg}=1"
+	done
+}
+
+enable_patch() {
+	local arg ARG_UPPER
+	for arg; do
+		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+		echo "${ARG_UPPER} = 1" >> Make.config
+	done
+}
+
+extensions_add_make_conf()
+{
+	# copy all ifdef for extensions-patch to Make.config
+	sed -e '1,/need to touch the following:/d' \
+		-e '/ifdef DVBDIR/,/^$/d' \
+		Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+	# extract all possible settings for extensions-patch
+	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+		Make.config.template \
+		| sort \
+		| tr '[:upper:]' '[:lower:]'
+}
+
+src_prepare() {
+	#applying maintainace-patches
+
+	ebegin "Changing pathes for gentoo"
+
+	sed \
+	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
+	  -i vdr.c
+
+	local DVBDIR=/usr/include
+	local i
+	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+		[[ -d ${i} ]] || continue
+		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+			einfo "Found DVB header files in ${i}"
+			DVBDIR=${i}
+			break
+		fi
+	done
+
+	# checking for s2api headers
+	local api_version
+	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+	if [[ ${api_version:-0} -lt 5*3 ]]; then
+		eerror "DVB header files do not contain s2api support or to old for ${P}"
+		eerror "You cannot compile VDR against old dvb-headers"
+		die "DVB headers too old"
+	fi
+
+	cat > Make.config <<-EOT
+		#
+		# Generated by ebuild ${PF}
+		#
+		PREFIX			= /usr
+		DVBDIR			= ${DVBDIR}
+		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
+		CONFDIR			= ${CONF_DIR}
+		VIDEODIR		= /var/vdr/video
+		LOCDIR			= \$(PREFIX)/share/locale
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+		INCLUDES		+= -I\$(DVBDIR)
+
+	EOT
+	eend 0
+
+	epatch "${FILESDIR}/${PN}-1.7.22-makefile-install-header.diff"
+
+	sed -i i18n-to-gettext \
+		-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/'
+
+	# Do not install runvdr script and plugins
+	sed -i Makefile \
+		-e 's/runvdr//' \
+		-e 's/ install-plugins//'
+
+	if ! use vanilla; then
+		# Now apply extensions patch
+		epatch "${WORKDIR}/${EXT_P}.patch"
+
+		# This allows us to start even if some plugin does not exist
+		# or is not loadable.
+		enable_patch PLUGINMISSING
+		enable_patch CHANNELBIND
+
+		# was default enabled in old versions of extpatch
+		enable_patch MCLI
+
+		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+			einfo "Doing maintainer checks:"
+
+			# these patches we do not support
+			# (or have them already hard enabled)
+			local IGNORE_PATCHES="pluginmissing mcli channelbind"
+
+			extensions_all_defines > "${T}"/new.IUSE
+			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+					$IGNORE_PATCHES | \
+				tr ' ' '\n' |sort > "${T}"/old.IUSE
+			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+			if [[ -z ${DIFFS} ]]; then
+				einfo "EXT_PATCH_FLAGS is up to date."
+			else
+				ewarn "IUSE differences!"
+				local diff
+				for diff in $DIFFS; do
+					ewarn "$diff"
+				done
+			fi
+		fi
+
+		ebegin "Enabling selected patches"
+		local flag
+		for flag in $EXT_PATCH_FLAGS; do
+			use $flag && enable_patch ${flag}
+		done
+
+		# patches that got renamed
+		use liemikuutio && enable_patch jumpingseconds
+
+		eend 0
+
+		extensions_add_make_conf
+
+		ebegin "Make depend"
+		emake .dependencies >/dev/null
+		eend $? "make depend failed"
+	fi
+
+	epatch_user
+
+	if [[ -n "${VDRSOURCE_DIR}" ]]; then
+		cp -r "${S}" "${T}"/source-tree
+	fi
+
+	add_cap CAP_UTF8
+
+	add_cap CAP_IRCTRL_RUNTIME_PARAM \
+			CAP_VFAT_RUNTIME_PARAM \
+			CAP_CHUID \
+			CAP_SHUTDOWN_AUTO_RETRY
+
+	echo -e ${CAPS} > "${CAP_FILE}"
+}
+
+src_install() {
+	# trick makefile not to create a videodir by supplying it with an existing
+	# directory
+	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
+
+	keepdir "${CONF_DIR}"/plugins
+	keepdir "${CONF_DIR}"/themes
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	exeinto /usr/share/vdr/bin
+	doexe i18n-to-gettext
+
+	if use html; then
+		dohtml *.html
+	fi
+
+	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+	insinto /usr/share/vdr
+	doins "${CAP_FILE}"
+
+	if [[ -n "${VDRSOURCE_DIR}" ]]; then
+		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
+		einfo "Installing sources"
+		insinto "${SOURCES_DEST}"
+		doins -r "${T}"/source-tree/*
+		keepdir "${SOURCES_DEST}"/PLUGINS/lib
+	fi
+
+	if use alternatechannel; then
+		insinto /etc/vdr
+		doins "${FILESDIR}"/channel_alternative.conf
+	fi
+
+	if use setup; then
+		insinto /usr/share/vdr/setup
+		doins "${S}"/menu.c
+	fi
+	chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
+	previous_less_than_1_6_0_p2_r8=$?
+}
+
+pkg_postinst() {
+	elog "!!!! WARNING !!!!"
+	elog "  ${P} contains large changes with respect to"
+	elog "  how it handles video streams, so expect this"
+	elog "  version to not work as good as the versions before!"
+	elog
+	elog "  We strongly advise you NOT to use this version"
+	elog "  on a productive system!"
+
+	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
+		elog "  Upgrade Info:"
+
+		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
+		elog "  can still be replayed and edited, but new recordings are done in TS."
+
+		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
+		elog "  into the new plugin 'dvbsddevice'. On systems that use such a card as their"
+		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
+		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
+		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
+		elog "  capability."
+
+		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
+		elog "  recording is replayed that has no index. This can also be used to"
+		elog "  re-create a broken index file by manually deleting the index file and then"
+		elog "  replaying the recording."
+
+		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
+		elog "  commands. See vdr.5 for information about the new file format."
+
+		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
+		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
+
+		elog "  The default SVDRP port is now 6419"
+	fi
+
+	elog "It is a good idea to run vdrplugin-rebuild now."
+
+	if use setup; then
+		if ! has_version media-plugins/vdr-setup || \
+			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
+
+			echo
+			ewarn "You have compiled media-video/vdr with USE=\"setup\""
+			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
+			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
+		fi
+	fi
+
+	local keysfound=0
+	local key
+	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
+	local remote_file="${ROOT}"/etc/vdr/remote.conf
+
+	if [[ -e ${remote_file} ]]; then
+		for key in ${warn_keys}; do
+			if grep -q -i "\.${key} " "${remote_file}"; then
+				keysfound=1
+				break
+			fi
+		done
+		if [[ ${keysfound} == 1 ]]; then
+			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
+			ewarn "Please remove these keys or vdr will not start:"
+			ewarn "#  ${warn_keys}"
+		fi
+	fi
+
+	elog "To get nice symbols in OSD we recommend to install"
+	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+	elog "\t2. select font VDRSymbolsSans in Setup"
+	elog ""
+	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
+}