testing version, default enabled USEFHS from vdr source

(Portage version: 2.1.11.31/svn/Linux i686, signed Manifest commit with key 34C2808A)

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

3 files changed, 416 insertions, 4 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 7add7cb..9d7a9c2 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vdr-1.7.35-r1 (06 Jan 2013)
+
+  06 Jan 2013; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-1.7.35-r1.ebuild:
+  testing version, default enabled USEFHS from vdr source
+
   01 Jan 2013; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-1.7.34.ebuild,
   -files/vdr-1.7.34_gentoo.patch:
   cleanup version vdr-1.7.34
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 924293b..ab5c808 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -37,14 +37,15 @@ EBUILD vdr-1.7.31.ebuild 10774 SHA256 d1e039c3415ee668298bc78a14018f19dda6078b49
 EBUILD vdr-1.7.32-r1.ebuild 10697 SHA256 de0d2ad92e6f81d40d00ef508232fd125fb17312576d1dccede608cae8103a34 SHA512 3f66ef887573ba927c35f919656042844ce023ea6906447999648b679e894cfdccab0eb2dafeac6c215a8ee0cc8cc51ff6df9a2513b515eb6b524fbc801842b4 WHIRLPOOL 14edfa8d5b5bbffe0766ad5728c32463b644806770f23974b9a33da8c0b01883b5148a24446ebd4ae90eff794c4b3f1247065313c0e41b5242d3c2104c19f0a6
 EBUILD vdr-1.7.33-r1.ebuild 10561 SHA256 adf2b441445a4133d39267f854e9ab6c3892b1bd1ea6799445cd6c9285b64816 SHA512 b3c13b42c2d2effe03f88b1de52a928a7227cec9d146905e60c93feed8c2dd60e75fdb3215d6b718cf5e52407264243e848ac630efd1ad7fa11f025af31df5a4 WHIRLPOOL b7a6ce5a36b29058615a5417adb7bfe70146f1299e4a70fcdcc4ea1f901f8fd20bd81cb50236e188ffeb7649fdc490f4b57498477f3e3324e12f4794f71d4854
 EBUILD vdr-1.7.33.ebuild 10577 SHA256 298905730268f0bd0af138e6c9b3b437dd57647a644169315a3ba235f6c94ffb SHA512 5c6ce568c2b6789f10eaa2b39d65045e707762c39580955494a1f6de4c700829056e578bd2a1e46c3b0f9b2788d5c6e422a98ab4b6a7d20002070b0ef2bc5ba4 WHIRLPOOL e3bb776885fe29b0fae6b2240b8012e6a1366da4c016951827489d931f152e62170e1f5ea9aa3156cb81a34984d37181374ae8295c5e915a238cf3a392dc609a
+EBUILD vdr-1.7.35-r1.ebuild 11124 SHA256 c91672891d6e316f4f951932c2593742538953b99bab4cf825db8e864a75bfaa SHA512 6caabf27eb980044532c51583a2d96be3b3a9522a7360f04c5e69ddd2baedfc189f16a26c255005ae5cbbeaab1b736ba3decee9680652d7063adc731f6c270b8 WHIRLPOOL 141d737356a48db7cd4a812da2e79b0b878c66108ccd3d82021bf344d018f7f5c2d07537341cb34b2fe69ef3d2f5793d34e82da3d77af4eab8ce54bb13ba60b2
 EBUILD vdr-1.7.35.ebuild 11020 SHA256 07b117005a7dac836c5ed2be0a9fe6e90e81e925c603378fad0b8e8e07d6ed7b SHA512 d150ffa54326f2d9b21b740cf14eb4dab75494e022d30d5dc60df198da6314d0c607dbeb4f26c0190b00f7311d747bd466a02964d39d9423474a41f036bb7254 WHIRLPOOL e9c8aea2cebca58d97e29c610e808296f1259b1ae53dbc9f87535615ad4bf756f8cc29ec3a4aedc5b3534bbb51fea721361f12dbbf0ac6ab56166eb6af263f4a
-MISC ChangeLog 21671 SHA256 51ae95a77d2d1b67424e1c707c9d4bce053433080b3c862072b48064c3fdc060 SHA512 e790ba9a167e093f20e7eec696893ec6b44a4645cc3c5a96127f82a178797f6a71ccdc61d5785cffa57e03c66694ec4b35ffe8d30a0986450b20da47d3007538 WHIRLPOOL 9bce790d80ea9f77550681499fe5356ae29b5bf54d494903612353f3d53119c120dcfe465a07353cd4905119cf9eda3bef617ec53615a06ed537e69171ffaeb6
+MISC ChangeLog 21838 SHA256 311dd3740fb0684ecb0d81394615c32d3dcb3fa1bcbe9b266c297181a21668c1 SHA512 de343f522b2822c8e41856cfa894bfb0983228947ebc52633d1d23b3a447563089c422f1438ceffbffbe6f1805561e59a3e40d7546db130d36c191fd4f7989a6 WHIRLPOOL 17474240096d8dcfd238b3b139b3c3cf2f07308487dfe4c8b61edde9e6fb48cd17a32090a190db3dae1c72d57f53d10503d2371f354100690309550ad2338306
 MISC metadata.xml 2360 SHA256 a4cc5a9f06856992a36c94ad66d8b8524fd8c930047e161aa676719feb56c7a7 SHA512 b911a6049dc92c93ab809b67949c680c95bf6ebf193283873d205f373e749be0a82b8cbc5608a4a66efaa4e6ac77fcca87b86be604a753678aaeb495e7fa2baf WHIRLPOOL 2cc0c86cf20423d51073183d554fade8309a4d0a518ed6e7a3bef030b7fbd78874ef0d0e067b6e550c036814a7dc1a54ec037cf0e8f5fa5685ac0852cb75acdf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFQ4xhOdn07HTTCgIoRCHU0AJ91iur03WRJi30GMqe1gbnrfyFLhwCcCzIX
-4VdTyU27G8NTUtyOFBjPStw=
-=CcGa
+iD8DBQFQ6dgLdn07HTTCgIoRCMGeAKCM4dG1QUW6E9QHxbn47u+LrVCr4QCeKviC
+lutC8gxctryUgOZb5fgTrJs=
+=jBWb
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.7.35-r1.ebuild b/media-video/vdr/vdr-1.7.35-r1.ebuild
new file mode 100644
index 0000000..05609bd
--- /dev/null
+++ b/media-video/vdr/vdr-1.7.35-r1.ebuild
@@ -0,0 +1,406 @@
+# Copyright 1999-2013 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="5"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft jumpplay
+	lircsettings mainmenuhooks menuorg naludump pinplugin
+	rotor setup ttxtsubs vasarajanauloja 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-v1"
+
+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/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
+
+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 obsolet!"
+		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"
+
+	tc-export CC CXX
+}
+
+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 '/need to touch the following/,/^$/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:]'
+}
+
+lang_po() {
+	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+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}
+		LIBDIR			= ${PLUGIN_LIBDIR}
+		## PLUGINLIBDIR (old plugin Makefile) = LIBDIR ( new plugin Makefile )
+		CONFDIR			= ${CONF_DIR}
+		VIDEODIR		= /var/vdr/video
+		LOCDIR			= \$(PREFIX)/share/locale
+		INCDIR			= \$(PREFIX)/include
+		# we need this for backwards compatibility, on old plugin makefiles
+		PLGCFG			= \${PREFIX}/include/vdr/Make.config
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+		INCLUDES		+= -I\$(DVBDIR)
+
+		USEFHS = 1
+
+		ifdef USEFHS
+		DEFINES += -DUSEFHS
+		CACHEDIR     = /var/cache/vdr
+		RESDIR       = \$(PREFIX)/share/vdr
+		endif
+
+	EOT
+	eend 0
+
+	epatch "${FILESDIR}/${P}_gentoo.patch"
+
+	# Do not compile/install plugins from vdr source
+	sed -i Makefile \
+		-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
+
+		# needed for usefhs support
+		sed -e "s:resdir=\$(RESDIRDEF):resdir=/usr/share/vdr:" \
+			-i Makefile
+
+		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 usefhs"
+
+			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 vasarajanauloja && 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}"
+
+	# LINGUAS support
+	einfo "\n \t VDR supports the LINGUAS values"
+
+	lang_po
+
+	einfo "\t Please set one of this values in your sytem make.conf"
+	einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+	if [[ -z ${LINGUAS} ]]; then
+		einfo "\n \t No values in LINGUAS="
+		einfo "\t you will get only english text on OSD \n"
+	fi
+
+	strip-linguas ${LING_PO} en
+}
+
+src_install() {
+	# trick makefile not to create a videodir by supplying it with an existing
+	# directory
+	einstall \
+	VIDEODIR="/" \
+	DESTDIR="${D}" \
+	|| die "emake install failed"
+
+	keepdir "${CONF_DIR}"/plugins
+	keepdir "${CONF_DIR}"/themes
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	keepdir /var/cache/vdr
+
+	if use html; then
+		dohtml *.html
+	fi
+
+	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+	insinto /usr/share/vdr
+	doins "${CAP_FILE}"
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins vdr.pc
+
+	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=$?
+
+	has_version "<${CATEGORY}/${PN}-1.7.27"
+	previous_less_than_1_7_27=$?
+
+	has_version "<${CATEGORY}/${PN}-1.7.34-r1"
+	previous_less_than_1_7_34_r1=$?
+}
+
+pkg_postinst() {
+	elog "This is a *developer* version."
+	elog "We strongly recommend that you only use it under controlled"
+	elog "conditions and for testing and debugging."
+
+	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 plugins 'dvbsddevice' 'dvbhddevice'. 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 man 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
+
+	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
+		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
+		elog "This results now in a lot of not working plugins on compile process"
+		elog "Please visit for more infos:"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
+		elog "and depended bugs"
+	fi
+
+	if [[ previous_less_than_1_7_34_r1=$? = 0 ]] ; then
+		elog "USEFHS from vdr source is now enabled by default"
+		elog "Gentoo still use the standard from"
+		elog "Filesystem Hirarchy Standard"
+		elog "It is supported thins beginning of support"
+		elog "of VDR on Gentoo"
+		elog "Finaly, for the user are minimal changes now"
+	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"
+}