Updated extensions-patch to version 62. Fixed installing docs. Add DVBDIR to include path.

Package-Manager: portage-2.1.5

3 files changed, 417 insertions, 5 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 6ada0bdcc304..8b2d9c1e867c 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.114 2008/05/21 05:50:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.115 2008/05/21 13:46:20 zzam Exp $
+
+*vdr-1.6.0_p1-r1 (21 May 2008)
+
+  21 May 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-1.6.0_p1-r1.ebuild:
+  Updated extensions-patch to version 62. Fixed installing docs. Add DVBDIR
+  to include path.
 
   21 May 2008; Matthias Schwarzott <zzam@gentoo.org> vdr-1.6.0_p1.ebuild:
   Add libdvdnav dependency for dvdarchive&&dvdchapjump use-flags, Bug
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index aab39e64035a..a88bbddbda4a 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -12,6 +12,7 @@ DIST VDR-Extensions-Patch-55.tar.bz2 129067 RMD160 a5c6fc1c74c89b1093c0b9270cca3
 DIST VDR-Extensions-Patch-56.tar.bz2 137606 RMD160 39fff764016c96703131898124503ef424853bfa SHA1 93206a4e26d373525e2a2e8406a248e43eb63a84 SHA256 81e129b5e361802655a450955479d4d842a16fea2860bee99c082f775c1959bf
 DIST VDR-Extensions-Patch-57.tar.bz2 140007 RMD160 14cc6458365c2882edcb61338e19b80356fb2b8a SHA1 d3b306dd769c9fea5ca1ea63856906302c05f933 SHA256 180d99a7a81abb79c8dbc732707fd92d92506db2c3d9f0dec80614d63ddd643b
 DIST VDR-Extensions-Patch-59.tar.bz2 241559 RMD160 dfb26099f9876e82f96bd54dedf018ef81cdcb41 SHA1 91b8074b6c18fad6ac77b04534c4be083fea19b1 SHA256 aa0ac0e8caff6f353e5d9f95d5a12c6d442fb1badc2fcae4f44b5121db3b1f1f
+DIST VDR-Extensions-Patch-62.tar.bz2 289080 RMD160 61ead607193f02ecb6a01d9db9f95d7454e5673b SHA1 65b606abc2fd1d8e25a569bea700ff5f528be4f6 SHA256 a4156a2f1baf1b03495f7e4c6fa83b55f6e7d0d3978be54ce13028b070ced003
 DIST gentoo-vdr-patchset-1.4.6-1.tar.bz2 183896 RMD160 c122a082605841410fb5497cd5671f965bdfe3fe SHA1 c13bc1769f36ece50fe4c1a183f3d2bd9e871ca3 SHA256 68be18b4409211e3303eff3f67e75a4ac844f48a89d8fee453e19c143ae79f9a
 DIST vdr-1.4.6.tar.bz2 561236 RMD160 e8d5498b6935e67941bc10be46a0f3fa9ea7aa9d SHA1 084c6c937aa64fd3339f87d3f56b53fa701b0d28 SHA256 06dea8e028480fa59f04976db83beacd75592835d89058dd5206f4191d315c9c
 DIST vdr-1.4.7.tar.bz2 560888 RMD160 0e7a0d1cf133ee5e168afb6e2374e2ee6c229fcf SHA1 11e8976b3480a0c9cf2b2aec88c329e9bb0f701b SHA256 9e9f3687efc135d890cf8d70068221e661fea21d1efd7d8dc74bc4e810d4a464
@@ -23,13 +24,14 @@ EBUILD vdr-1.4.7-r10.ebuild 9281 RMD160 e9ecf199b46c4d07c84419618be6fae12e7230d3
 EBUILD vdr-1.6.0-r1.ebuild 9528 RMD160 fe112640959a65ac03d4c6dfb8c997d8c801d4b6 SHA1 03eef553ceaf22cae3d1a2ce2fcb9adf12c6c326 SHA256 5f0bf32b2e7639efd8fe916728da6c7dab190314f96284d1d0360fa073abe5fd
 EBUILD vdr-1.6.0-r2.ebuild 9690 RMD160 f50872ec88c43d03add7028f067c2a23eba66e27 SHA1 77f6927fc5e4f791d6d545c8ad843978aa2322e7 SHA256 4e2f721da1a196350d410395eacb77c3baefea0a715dda4d6631fccdce2197f6
 EBUILD vdr-1.6.0.ebuild 9624 RMD160 46fc0f889f4369cac352bb3bc30bf3618799e6fd SHA1 7275ec338849605943aa393360e4fd0ce4d18a16 SHA256 71a4e1552c900780cea557a22c2c9c810dc0ee958d5cecb6c7271e678e1f9a49
+EBUILD vdr-1.6.0_p1-r1.ebuild 10060 RMD160 683d2fa9d7fb85855cadff799ab135f1cb83aa00 SHA1 7d36c8a2ac95b75ed1d0cd29b8bac4258ba63357 SHA256 e962511e02114914a2f7f707d26ef1cf8d6565f1f38d17b65232119294fb7bba
 EBUILD vdr-1.6.0_p1.ebuild 9960 RMD160 f1eacaf1ab9b4d12d32dfb75d0c6927e01bffbd7 SHA1 1a80b4d17c44ac06024a8b355a036c78370b9e91 SHA256 e8c0d03b7ab03c7bf97a35b246d8dea508c0918354f8ac0cf28c7ae330a5b0f7
-MISC ChangeLog 19908 RMD160 673f830d33300cd893c22d65851744ecbe4da4f4 SHA1 fff9bbf7d18c5ded3ab7411a6ba8fb9553cc70e7 SHA256 157432ee7294b99c2dd16be3bb729e211464179904a5226b01aced579f10d1ab
+MISC ChangeLog 20116 RMD160 a4a00f3e8913b96e89b910e05b1b490146f0f1bd SHA1 5cf3a3cef1ab0833e6d15edc5739d32faf5caee6 SHA256 2959c14768fcf1ea2664491bcc77d05c23027125c89a453cf5acc9b7d16872be
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgzuEMACgkQt2vP6XvVdOcZ/gCgnrdWSncrJuKHugOLXU5WY5i7
-tvoAoJv+srsOHABRoTr2ngtDWT0+QkXz
-=XrUI
+iEYEARECAAYFAkg0J7EACgkQt2vP6XvVdOf1GwCgsUkyz74dLoYWPBBqwCSenAZe
+xE8An0FF3DYD1TT6iU6Rze6X/ND3ZIix
+=V63P
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.6.0_p1-r1.ebuild b/media-video/vdr/vdr-1.6.0_p1-r1.ebuild
new file mode 100644
index 000000000000..361d96a6e7c9
--- /dev/null
+++ b/media-video/vdr/vdr-1.6.0_p1-r1.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/05/21 13:46:20 zzam Exp $
+
+inherit eutils flag-o-matic multilib
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
+	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter iptv
+	jumpplay liemikuutio lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
+	rotor settime setup sortrecords sourcecaps livebuffer
+	ttxtsubs timercmd timerinfo validinput yaepg
+	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer
+	volctrl wareagleicon lircsettings deltimeshiftrec em84xx"
+
+IUSE="debug vanilla dxr3 ${EXT_PATCH_FLAGS}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_V="62"
+EXT_P=VDR-Extensions-Patch-${EXT_V}
+EXT_DIR=${WORKDIR}/${EXT_P}/
+EXT_VDR_PV="${PV/_p/-}"
+
+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/${MY_P}.tar.bz2
+	ftp://ftp.cadsoft.de/vdr/Developer/${MY_P}-1.diff
+	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+COMMON_DEPEND="media-libs/jpeg
+	sys-libs/libcap
+	>=media-libs/fontconfig-2.4.2
+	>=media-libs/freetype-2
+	sys-devel/gettext
+	dvdarchive? ( dvdchapjump? ( media-libs/libdvdnav ) )"
+
+DEPEND="${COMMON_DEPEND}
+	media-tv/linuxtv-dvb-headers
+	dev-util/unifdef"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	>=media-tv/gentoo-vdr-scripts-0.4.2
+	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-r1 )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+	check_menu_flags
+
+	use debug && append-flags -g
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+}
+
+check_menu_flags() {
+	if use menuorg && use setup; then
+		echo
+		eerror "Please use only one of this USE-Flags"
+		eerror "\tmenuorg setup"
+		die "multiple menu manipulation"
+	fi
+}
+
+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:]'
+}
+
+extensions_all_defines_unset() {
+	# extract all possible settings for extensions-patch
+	# and convert them to -U... for unifdef
+	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \
+		Make.config.template \
+		| tr '\n' ' '
+}
+
+do_unifdef() {
+	ebegin "Unifdef sources"
+	local mf="Makefile.get"
+	cat <<'EOT' > $mf
+include Makefile
+show_def:
+	@echo $(DEFINES)
+show_src_files:
+	@echo $(OBJS:%.o=%.c)
+EOT
+
+	local DEFINES=$(extensions_all_defines_unset)
+
+	local RAW_DEFINES=$(make -f "$mf" show_def)
+	local VDR_SRC_FILES=$(make -f "$mf" show_src_files)
+	local KEEP_FILES=""
+	rm "$mf"
+
+	local def
+	for def in $RAW_DEFINES; do
+		case "${def}" in
+			-DUSE*)
+				DEFINES="${DEFINES} ${def}"
+				;;
+		esac
+	done
+
+	local f
+	for f in *.c; do
+
+		# Removing the src files the Makefile does not use for compiling vdr
+		if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then
+			rm -f ${f} ${f%.c}.h
+			continue
+		fi
+
+		unifdef ${DEFINES} "$f" > "tmp.$f"
+		mv "tmp.$f" "$f"
+	done
+	for f in *.h; do
+		unifdef ${DEFINES} "$f" > "tmp.$f"
+		mv "tmp.$f" "$f"
+		[[ -s $f ]] || rm "$f"
+	done
+	eend 0
+}
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd "${S}"
+	#applying maintainace-patches
+	epatch "${DISTDIR}/${MY_P}-1.diff"
+
+	ebegin "Changing pathes for gentoo"
+
+	sed \
+	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
+	  -i vdr.c
+
+	local DVBDIR=/usr/include
+
+	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/vdr/locale
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+		INCLUDES		+= -I\$(DVBDIR)
+
+	EOT
+	eend 0
+
+	epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff
+	if use dxr3; then
+		einfo "Applying dxr3 subtitle hack"
+		epatch "${FILESDIR}"/vdr-1.6.0-dxr3-subtitlehack.diff
+	fi
+
+	sed -i i18n-to-gettext.pl \
+		-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
+
+		cd "${S}"
+		# Now apply extensions patch
+		local fname="${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
+		epatch "${EXT_DIR}/${fname}"
+
+		# other gentoo patches
+		# epatch "${FILESDIR}/..."
+
+		# This allows us to start even if some plugin does not exist
+		# or is not loadable.
+		enable_patch PLUGINMISSING
+
+		# Patch necessary for media-plugins/vdr-reelchannelscan
+		# it does not change anything when plugin is not used
+		enable_patch CHANNELSCAN
+
+		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="channelscan pluginapi pluginmissing"
+
+			extensions_all_defines > "${T}"/new.IUSE
+			echo $EXT_PATCH_FLAGS $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
+		eend 0
+
+		extensions_add_make_conf
+
+		ebegin "Make depend"
+		emake .dependencies >/dev/null
+		eend $? "make depend failed"
+
+		do_unifdef
+
+		use iptv && sed -i sources.conf -e 's/^#P/P/'
+	fi
+
+	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
+	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
+		local dir_tmp_var
+		local LOCALPATCHES_SUBDIR=${PV}
+		for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do
+			if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then
+				LOCALPATCHES_SUBDIR="${dir_tmp_var}"
+			fi
+		done
+
+		echo
+		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
+			einfo "Applying local patches"
+		else
+			einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})"
+		fi
+
+		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{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_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.pl
+
+	dohtml *.html
+	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
+
+	cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir."
+
+	local f
+	rm *vdr-1.4* 2>/dev/null
+	for f in *; do
+		[[ -f ${f} ]] || break
+		newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensions-patch doc ${f}"
+	done
+
+	cd "${S}"
+
+	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 setup; then
+		insinto /usr/share/vdr/setup
+		doins "${S}"/menu.c
+	fi
+	chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+pkg_postinst() {
+	elog "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
+
+	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
+
+	if use atsc; then
+		ewarn "ATSC is only supported by a rudimentary patch"
+		einfo "and need at least this patch and a plugin installed"
+		einfo "emerge media-plugins/vdr-atscepg"
+	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"
+}