commit:     85b3527f9c3bddee3f2f3c0589ca1f994b28f2b9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 14:33:24 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 14:36:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b3527f

media-video/vdr: Restore 2.0.6-r1...

media-plugins/vdr-pvr350 requires >=media-video/vdr-2[yaepg]...

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/vdr/Manifest                     |   2 +
 media-video/vdr/files/vdr-2.0.6_gentoo.patch |  68 +++++++
 media-video/vdr/metadata.xml                 |   9 +
 media-video/vdr/vdr-2.0.6-r1.ebuild          | 277 +++++++++++++++++++++++++++
 4 files changed, 356 insertions(+)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index dac0f69a4e8..e9b20f623a1 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,2 +1,4 @@
+DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 BLAKE2B 
60669e9c20b2bd573eb05733bbf9548d2e643b36693be8b15a377b38470708a71b29e2a16baf7ed378132265f814ec9d35dae749ccf6ae204cd9beb787dc8f57
 SHA512 
f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 
81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1
 SHA512 
16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
+DIST vdr-2.0.6.tar.bz2 839575 BLAKE2B 
40de46d8465b7008bc29c7e2c1c241d4114aa3d62aa6a0acd81636133c295cd87c2fc618e725885c98f47445220e897c23188373457a96b51cf832ca417c9842
 SHA512 
070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
 SHA512 
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d

diff --git a/media-video/vdr/files/vdr-2.0.6_gentoo.patch 
b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
new file mode 100644
index 00000000000..1641fc8e2ee
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
@@ -0,0 +1,68 @@
+diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile
+--- vdr-2.0.6.orig/Makefile    2014-09-22 22:17:23.000000000 +0200
++++ vdr-2.0.6/Makefile 2014-09-24 15:22:43.000000000 +0200
+@@ -109,7 +109,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
+ 
+-all: vdr i18n plugins
++all: vdr i18n
+ 
+ # Implicit rules:
+ 
+@@ -162,7 +162,7 @@
+ 
+ PODIR     = po
+ LOCALEDIR = locale
+-I18Npo    = $(wildcard $(PODIR)/*.po)
++I18Npo    = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot   = $(PODIR)/vdr.pot
+@@ -185,7 +185,7 @@
+ 
+ install-i18n: i18n
+       @mkdir -p $(DESTDIR)$(LOCDIR)
+-      cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++      @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] 
&& continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+ 
+ # The 'include' directory (for plugins):
+ 
+@@ -247,7 +247,7 @@
+ 
+ # Install the files (note that 'install-pc' must be first!):
+ 
+-install: install-pc install-bin install-dirs install-conf install-doc 
install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc 
install-i18n install-includes
+ 
+ # VDR binary:
+ 
+@@ -259,11 +259,12 @@
+ 
+ install-dirs:
+       @mkdir -p $(DESTDIR)$(VIDEODIR)
+-      @mkdir -p $(DESTDIR)$(CONFDIR)
+-      @mkdir -p $(DESTDIR)$(CACHEDIR)
++#     @mkdir -p $(DESTDIR)$(CONFDIR)
++#     @mkdir -p $(DESTDIR)$(CACHEDIR)
+       @mkdir -p $(DESTDIR)$(RESDIR)
+ 
+ install-conf:
++      @mkdir -p $(DESTDIR)$(CONFDIR)
+       @cp -pn *.conf $(DESTDIR)$(CONFDIR)
+ 
+ # Documentation:
+@@ -290,8 +291,11 @@
+ # Includes:
+ 
+ install-includes: include-dir
+-      @mkdir -p $(DESTDIR)$(INCDIR)
+-      @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++#     @mkdir -p $(DESTDIR)$(INCDIR)
++#     @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++      @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++      @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++      @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+ 
+ # pkg-config file:
+ 

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index f9813be524f..8ebb4b08a51 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -8,16 +8,25 @@
        <use>
                <flag name="alternatechannel">Use alternate channel on 
record</flag>
                <flag name="bidi">fribidi support, for languages, written from 
right to left</flag>
+               <flag name="ddepgentry">remove duplicate EPG entries</flag>
+               <flag name="dvlvidprefer">controls video-dir choice on 
recording</flag>
                <flag name="graphtft">support for vdr-graphtft plugin up from 
version 0.1.7</flag>
                <flag name="html">Install HTML documentation</flag>
+               <flag name="jumpplay">Enables automatic jumping over cut marks 
while watching a recording</flag>
+               <flag name="jumpingseconds">skip seconds in played 
records</flag>
                <flag name="kbd">enable keyboard support as remote device</flag>
                <flag name="mainmenuhooks">Allows to replace main menu entries 
by some special plugins (like epgsearch, extrecmenu, ...)</flag>
                <flag name="menuorg">Enables support for the 
<pkg>media-plugins/vdr-menuorg</pkg></flag>
                <flag name="menuselection">adds support for menu hotkeys of 
double digits</flag>
                <flag name="naludump">Removes NALU fill data from h.264-Streams 
of TS files</flag>
+               <flag name="permashift">permanent timeshift by recording live 
TV on hard disk, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag>
                <flag name="permashift_v1">permanent timeshift by recording 
live TV on RAM, need plugin &gt;=mediaplugins/vdr-permashift-1</flag>
                <flag name="pinplugin">Support for 
<pkg>media-plugins/vdr-pin</pkg></flag>
                <flag name="resumereset">rreset resume of EOF</flag>
+               <flag name="rotor">Enable support for plugin vdr-rotor for 
dish-positioner.</flag>
                <flag name="ttxtsubs">support for 
<pkg>media-plugins/vdr-ttxtsubs</pkg></flag>
+               <flag name="vasarajanauloja">replacement for the liemikuutio 
patch, adds some nice must haves features</flag>
+               <flag name="wareagleicon">Replace original icon set in 
menu</flag>
+               <flag name="yaepg">Enables support for the vdr-yaepg 
plugin</flag>
        </use>
 </pkgmetadata>

diff --git a/media-video/vdr/vdr-2.0.6-r1.ebuild 
b/media-video/vdr/vdr-2.0.6-r1.ebuild
new file mode 100644
index 00000000000..63de150c12f
--- /dev/null
+++ b/media-video/vdr/vdr-2.0.6-r1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
+       jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift 
permashift_v1
+       pinplugin rotor ttxtsubs vasarajanauloja 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=""
+
+IUSE="bidi debug html vanilla ${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-v6"
+
+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/${MY_P}.tar.bz2
+       https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2";
+
+KEYWORDS="amd64 ~arm ~ppc x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+REQUIRED_USE="
+       permashift? ( !permashift_v1 )
+       permashift_v1? ( !permashift )"
+
+COMMON_DEPEND="virtual/jpeg:*
+       sys-libs/libcap
+       >=media-libs/fontconfig-2.4.2
+       >=media-libs/freetype-2"
+
+DEPEND="${COMMON_DEPEND}
+       >=virtual/linuxtv-dvb-headers-5.3
+       sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+       dev-lang/perl
+       >=media-tv/gentoo-vdr-scripts-2.5_rc1
+       media-fonts/corefonts
+       bidi? ( dev-libs/fribidi )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+       use debug && append-flags -g
+
+       PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+       tc-export CC CXX AR
+}
+
+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
+
+               # codesnippet to bring the extpng defines into the vdr.pc 
CXXFLAGS CFLAGS
+               echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+               cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
+               export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+       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() {
+       # apply maintainace-patches
+       ebegin "Changing paths for gentoo"
+
+       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 too 
old for ${P}"
+               eerror "You cannot compile VDR against old dvb-header"
+               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
+               INCDIR                  = \$(PREFIX)/include
+
+               DEFINES                 += -DCONFDIR=\"\$(CONFDIR)\"
+               INCLUDES                += -I\$(DVBDIR)
+
+               # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+               # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile 
new)
+               LIBDIR                  = ${PLUGIN_LIBDIR}
+               PCDIR                   = /usr/$(get_libdir)/pkgconfig
+       EOT
+       eend 0
+
+       # support languages, written from right to left
+       BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
+
+       epatch "${FILESDIR}/${PN}-2.0.6_gentoo.patch"
+
+       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
+
+               if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+                       einfo "Doing maintainer checks:"
+
+                       # we do not support these patches
+                       # (or have them already hard enabled)
+                       local IGNORE_PATCHES="pluginmissing  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
+
+               eend 0
+
+               extensions_add_make_conf
+
+               # add defined use-flags compile options to vdr.pc
+               sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) 
\$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
+                       -i Makefile
+
+               ebegin "Make depend"
+               emake .dependencies >/dev/null
+               eend $? "make depend failed"
+       fi
+
+       epatch_user
+
+       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
+       emake \
+       VIDEODIR="/" \
+       DESTDIR="${D}" install || die "emake install failed"
+
+       keepdir "${PLUGIN_LIBDIR}"
+
+       keepdir "${CONF_DIR}"/plugins
+       keepdir "${CONF_DIR}"/themes
+
+       if use html; then
+               dohtml *.html
+       fi
+
+       dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+       insinto /usr/share/vdr
+       doins "${CAP_FILE}"
+
+       if use alternatechannel; then
+               insinto /etc/vdr
+               doins "${FILESDIR}"/channel_alternative.conf
+       fi
+
+       chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+pkg_postinst() {
+       elog "It is a good idea to run vdrplugin-rebuild now."
+
+       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 "\thttps://wiki.gentoo.org/wiki/VDR";
+}

Reply via email to