summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2009-03-21 13:10:41 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2009-03-21 13:10:41 +0000
commit93c3c1be4163a6bd5c2878225788e0ee08d7ec7b (patch)
treec934e6b7db756278691de758e8f7cc1317388e83 /media-video/vdr
parenttouchup tests a bit (diff)
downloadgentoo-2-93c3c1be4163a6bd5c2878225788e0ee08d7ec7b.tar.gz
gentoo-2-93c3c1be4163a6bd5c2878225788e0ee08d7ec7b.tar.bz2
gentoo-2-93c3c1be4163a6bd5c2878225788e0ee08d7ec7b.zip
Updated to extensions-patch v68. Added an update note for version 1.6
(Portage version: 2.1.6.9/cvs/Linux i686)
Diffstat (limited to 'media-video/vdr')
-rw-r--r--media-video/vdr/ChangeLog8
-rw-r--r--media-video/vdr/metadata.xml3
-rw-r--r--media-video/vdr/vdr-1.6.0_p2-r1.ebuild431
-rw-r--r--media-video/vdr/vdr-1.6.0_p2.ebuild16
4 files changed, 456 insertions, 2 deletions
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 470240a6f102..17a7d772b6a9 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-video/vdr
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.123 2009/01/12 13:23:01 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.124 2009/03/21 13:10:41 zzam Exp $
+
+*vdr-1.6.0_p2-r1 (21 Mar 2009)
+
+ 21 Mar 2009; Matthias Schwarzott <zzam@gentoo.org> metadata.xml,
+ vdr-1.6.0_p2.ebuild, +vdr-1.6.0_p2-r1.ebuild:
+ Updated to extensions-patch v68. Added an update note for version 1.6
12 Jan 2009; Matthias Schwarzott <zzam@gentoo.org>
+files/vdr-dvb-api-5-is-fine.diff, vdr-1.4.6.ebuild, vdr-1.4.7-r10.ebuild,
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 07ffa3e7ce0a..b98659a5a760 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -36,6 +36,7 @@
<flag name="hardlinkcutter">Speed up cutting by hardlinking unchanged files</flag>
<flag name="iptv">Enables support for vdr-iptv</flag>
<flag name="jumpplay">Enables automatic jumping over cut marks while watching a recording</flag>
+ <flag name="liemiext">Formerly known as AIO (all-in-one) patch, with additional changes from extensions patch</flag>
<flag name="liemikuutio">Formerly known as AIO (all-in-one) patch, adds some nice must haves</flag>
<flag name="lircsettings">Allows to change lirc settings delay, freq and timeout values in OSD</flag>
<flag name="livebuffer">does timeshifting/background recording all the time, allows to rewind live TV</flag>
@@ -46,11 +47,13 @@
<flag name="noepg">Adds code to selectively disable epg-reception for specific channels</flag>
<flag name="osdmaxitems">Support for text2skin</flag>
<flag name="pinplugin">Support for pin plugin</flag>
+ <flag name="pluginparam">Enables parameter support for vdr-iptv and maybe also other plugins</flag>
<flag name="rotor">Enable support for plugin vdr-rotor for dish-positioner.</flag>
<flag name="settime">set system time per script instead of via syscal</flag>
<flag name="setup">Enable support for the plugin vdr-setup</flag>
<flag name="setup-plugin">Enable support for the plugin vdr-setup</flag>
<flag name="shutdown_rewrite">use rewritten shutdown code from vdr-1.5</flag>
+ <flag name="softosd">Soft OSD fading with FF-Cards</flag>
<flag name="sortrecords">allows to change sort order of recordings</flag>
<flag name="sourcecaps">Adds the ability to define capabilities of dvb-cards (e.g. card1 can receive Sat @28.2E)</flag>
<flag name="submenu">Enable support for the plugin vdr-submenu.</flag>
diff --git a/media-video/vdr/vdr-1.6.0_p2-r1.ebuild b/media-video/vdr/vdr-1.6.0_p2-r1.ebuild
new file mode 100644
index 000000000000..93477f2aa08d
--- /dev/null
+++ b/media-video/vdr/vdr-1.6.0_p2-r1.ebuild
@@ -0,0 +1,431 @@
+# Copyright 1999-2009 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_p2-r1.ebuild,v 1.1 2009/03/21 13:10:41 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
+ pluginparam
+ jumpplay liemiext 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
+ cmdreccmdi18n softosd"
+
+IUSE="debug vanilla dxr3 ${EXT_PATCH_FLAGS}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_V="68"
+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
+ ftp://ftp.cadsoft.de/vdr/Developer/${MY_P}-2.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.5
+ 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"
+ epatch "${DISTDIR}/${MY_P}-2.diff"
+ epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.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}"
+
+ # Fix typo in Make.config.template
+ sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
+
+ # 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 pluginparam && 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} ]] || continue
+ 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_preinst() {
+ has_version "<${CATEGORY}/${PN}-1.3.36-r3"
+ previous_less_than_1_3_36_r3=$?
+
+ has_version "<${CATEGORY}/${PN}-1.6.0"
+ previous_less_than_1_3_36_r3=$?
+}
+
+pkg_postinst() {
+ elog "It is a good idea to run vdrplugin-rebuild now."
+ if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; 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
+
+ if [[ $previous_less_than_1_6_0 = 0 ]]; then
+ elog "By default vdr is now started with utf8 character encoding"
+ elog
+ elog "To rename the old recordings to utf8 conforming names, do this:"
+ elog "\temerge app-text/convmv"
+ elog "\tconvmv -f latin1 -t utf8 -r --notest -i /var/vdr/video/"
+ elog
+ elog "To fix the descriptions of your recordings do this:"
+ elog "\tfind /var/vdr/video/ -name "info.vdr" -print0|xargs -0 recode latin1..utf8"
+ 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"
+}
diff --git a/media-video/vdr/vdr-1.6.0_p2.ebuild b/media-video/vdr/vdr-1.6.0_p2.ebuild
index 5ed0335e8be8..050e0930828e 100644
--- a/media-video/vdr/vdr-1.6.0_p2.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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_p2.ebuild,v 1.3 2009/01/12 13:23:01 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2.ebuild,v 1.4 2009/03/21 13:10:41 zzam Exp $
inherit eutils flag-o-matic multilib
@@ -355,6 +355,9 @@ src_install() {
pkg_preinst() {
has_version "<${CATEGORY}/${PN}-1.3.36-r3"
previous_less_than_1_3_36_r3=$?
+
+ has_version "<${CATEGORY}/${PN}-1.6.0"
+ previous_less_than_1_3_36_r3=$?
}
pkg_postinst() {
@@ -407,6 +410,17 @@ pkg_postinst() {
einfo "emerge media-plugins/vdr-atscepg"
fi
+ if [[ $previous_less_than_1_6_0 = 0 ]]; then
+ elog "By default vdr is now started with utf8 character encoding"
+ elog
+ elog "To rename the old recordings to utf8 conforming names, do this:"
+ elog "\temerge app-text/convmv"
+ elog "\tconvmv -f latin1 -t utf8 -r --notest -i /var/vdr/video/"
+ elog
+ elog "To fix the descriptions of your recordings do this:"
+ elog "\tfind /var/vdr/video/ -name "info.vdr" -print0|xargs -0 recode latin1..utf8"
+ 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"