media-video/vdr: fix multiple QA issues
authorMartin Dummer <martin.dummer@gmx.net>
Sun, 17 Nov 2019 01:33:46 +0000 (17:33 -0800)
committerDavid Seifert <soap@gentoo.org>
Sun, 17 Nov 2019 01:33:46 +0000 (17:33 -0800)
* QA issue: USE flag 'permashift_v1' uses reserved underscore
  character, rename USE flag 'permashift_v1' to 'permashift'
* QA issue: UnnecessarySlashStrip in DESTDIR="${D%/}"
* QA issue: makefile installs pre-compressed manpages

Bug: https://bugs.gentoo.org/695066
Closes: https://github.com/gentoo/gentoo/pull/13588
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
Signed-off-by: David Seifert <soap@gentoo.org>
media-video/vdr/files/vdr-2.2.0_gentoo.patch
media-video/vdr/metadata.xml
media-video/vdr/vdr-2.2.0-r3.ebuild
media-video/vdr/vdr-2.2.0-r4.ebuild [new file with mode: 0644]

index 37ffd3c7b2ca274b8a5198420f0f907a383561a5..70066f5b0c86ccf3f2ea970a6a3d427c65275090 100644 (file)
@@ -1,7 +1,6 @@
-diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
---- vdr-2.1.7.orig/Makefile    2015-01-18 12:37:45.506034673 +0100
-+++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
-@@ -116,7 +116,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -124,7 +124,7 @@
  VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
  APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
  
@@ -10,7 +9,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
  
  # Implicit rules:
  
-@@ -170,7 +170,7 @@
+@@ -179,7 +179,7 @@
  
  PODIR     = po
  LOCALEDIR = locale
@@ -19,7 +18,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
  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
-@@ -193,7 +193,7 @@
+@@ -202,7 +202,7 @@
  
  install-i18n: i18n
        @mkdir -p $(DESTDIR)$(LOCDIR)
@@ -28,7 +27,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
  
  # The 'include' directory (for plugins):
  
-@@ -255,7 +255,7 @@
+@@ -264,7 +264,7 @@
  
  # Install the files (note that 'install-pc' must be first!):
  
@@ -37,16 +36,13 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
  
  # VDR binary:
  
-@@ -267,12 +267,13 @@
+@@ -276,12 +276,10 @@
  
  install-dirs:
        @mkdir -p $(DESTDIR)$(VIDEODIR)
 -      @mkdir -p $(DESTDIR)$(CONFDIR)
 -      @mkdir -p $(DESTDIR)$(ARGSDIR)
 -      @mkdir -p $(DESTDIR)$(CACHEDIR)
-+#     @mkdir -p $(DESTDIR)$(CONFDIR)
-+#     @mkdir -p $(DESTDIR)$(ARGSDIR)
-+#     @mkdir -p $(DESTDIR)$(CACHEDIR)
        @mkdir -p $(DESTDIR)$(RESDIR)
  
  install-conf:
@@ -54,14 +50,25 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
        @cp -pn *.conf $(DESTDIR)$(CONFDIR)
  
  # Documentation:
-@@ -299,8 +300,11 @@
+@@ -289,9 +287,9 @@
+ install-doc:
+       @mkdir -p $(DESTDIR)$(MANDIR)/man1
+       @mkdir -p $(DESTDIR)$(MANDIR)/man5
+-      @gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
+-      @gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
+-      @gzip -c svdrpsend.1 > $(DESTDIR)$(MANDIR)/man1/svdrpsend.1.gz
++      @cp vdr.1 $(DESTDIR)$(MANDIR)/man1/
++      @cp vdr.5 $(DESTDIR)$(MANDIR)/man5/
++      @cp svdrpsend.1 $(DESTDIR)$(MANDIR)/man1/
+ # Plugins:
+@@ -308,8 +306,9 @@
  # 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
index 8ebb4b08a5128556f1b2d5a969c2ecc821ef20e8..246bd87c200545f51f0e0fe21e210c9a73e3b8a5 100644 (file)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+       <maintainer type="person">
+               <email>martin.dummer@gmx.net</email>
+               <name>Martin Dummer</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>proxy-maint@gentoo.org</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="project">
                <email>vdr@gentoo.org</email>
                <name>Gentoo VDR Project</name>
@@ -19,8 +27,8 @@
                <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="permashift">permanent timeshift by recording live TV into RAM, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag>
+               <flag name="permashift_v1">permanent timeshift by recording live TV into RAM, need plugin <pkg>media-plugins/vdr-permashift</pkg></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>
index 8dad304a1d82dcec7a582a57fe008c3553e2d6f1..dfbfd553e107c11a0e0506a8dfba693bb7995bce 100644 (file)
@@ -260,7 +260,7 @@ src_install() {
        # directory
        emake install \
        VIDEODIR="/" \
-       DESTDIR="${D%/}" install || die "emake install failed"
+       DESTDIR="${D}" install
 
        keepdir "${PLUGIN_LIBDIR}"
 
@@ -283,7 +283,7 @@ src_install() {
                doins "${FILESDIR}"/channel_alternative.conf
        fi
 
-       chown -R vdr:vdr "${D%/}/${CONF_DIR}"
+       chown -R vdr:vdr "${D}/${CONF_DIR}"
 }
 
 pkg_postinst() {
diff --git a/media-video/vdr/vdr-2.2.0-r4.ebuild b/media-video/vdr/vdr-2.2.0-r4.ebuild
new file mode 100644 (file)
index 0000000..27229ba
--- /dev/null
@@ -0,0 +1,301 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
+                               mainmenuhooks menuorg menuselection resumereset ttxtsubs"
+
+# 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="bidi no_kbd sdnotify"
+
+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/${MY_P}.tar.bz2
+       mirror://gentoo/${EXT_P}.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+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"
+RDEPEND="${COMMON_DEPEND}
+       dev-lang/perl
+       >=media-tv/gentoo-vdr-scripts-2.7
+       media-fonts/corefonts
+       bidi? ( dev-libs/fribidi )
+       systemd? ( sys-apps/systemd )"
+BDEPEND="sys-devel/gettext"
+
+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 || die "cannot write to Make.config"
+
+               # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
+               echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot write to defines.tmp"
+               cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE || die "cannot write to defines.tmp"
+               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 || die "cannot write to 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:]' || die "error in function extensions_all_defines"
+}
+
+lang_po() {
+       LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_configure() {
+       # support languages, written from right to left
+       export "BIDI=$(usex bidi 1 0)"
+       # systemd notification support
+       export "SDNOTIFY=$(usex systemd 1 0)"
+       # with/without keyboard
+       export "USE_KBD=$(usex kbd 1 0)"
+}
+
+src_prepare() {
+       # apply maintenance-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 || die "cannot write to Make.config"
+               #
+               # 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
+
+       # wrt bug 586070
+       if has_version ">=sys-apps/systemd-230"; then
+               sed -e "s:libsystemd-daemon:libsystemd:g" -i Makefile || die "sed libsystemd failed"
+       fi
+
+       if ! use vanilla; then
+
+               # Now apply extensions patch
+               eapply "${WORKDIR}/${EXT_P}.patch"
+               sed -e 's/PERMASHIFT_V1/PERMASHIFT/g' -i "${S}"/*.[ch] "${S}"/Make.config* || die "sed failed"
+
+               # This allows us to start even if some plugin does not exist
+               # or is not loadable.
+               enable_patch PLUGINMISSING
+
+               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"
+
+                       extensions_all_defines > "${T}"/new.IUSE || die "cannot write to new.IUSE"
+                       echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+                                       $IGNORE_PATCHES | \
+                               tr ' ' '\n' |sort > "${T}"/old.IUSE || die "cannot write to old.IUSE"
+                       local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+                       if [[ -z ${DIFFS} ]]; then
+                               einfo "EXT_PATCH_FLAGS are 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 || die "sed fails on Makefile"
+
+               ebegin "Make depend"
+               emake .dependencies >/dev/null
+               eend $? "make depend failed"
+
+               eapply "${FILESDIR}/${P}_gcc7extpng.patch"
+       fi
+
+       eapply "${FILESDIR}/${P}_gentoo.patch"
+       eapply "${FILESDIR}/${P}_unsignedtosigned.patch"
+       eapply "${FILESDIR}/${P}_glibc-2.24.patch"
+       eapply "${FILESDIR}/${P}-jpeg-9c.patch"
+
+       # fix some makefile issues
+       sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \
+               -e "s:ifdef BIDI:ifeq (\$(BIDI),1):" \
+               -e "s:ifdef SDNOTIFY:ifeq (\$(SDNOTIFY),1):" \
+               -i "${S}"/Makefile || die "sed fails on Makefile"
+
+       eapply_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 install \
+       VIDEODIR="/" \
+       DESTDIR="${ED}" install
+
+       keepdir "${PLUGIN_LIBDIR}"
+
+       # backup for plugins they don't be able to create this dir
+       keepdir "${CONF_DIR}"/plugins
+
+       if use html; then
+               local HTML_DOCS=( *.html )
+       fi
+
+       local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS )
+
+       einstalldocs
+
+       insinto /usr/share/vdr
+       doins "${CAP_FILE}"
+
+       if use alternatechannel; then
+               insinto /etc/vdr
+               doins "${FILESDIR}"/channel_alternative.conf
+       fi
+
+       chown -R vdr:vdr "${ED}/${CONF_DIR}" || die "chown failed"
+}
+
+pkg_postinst() {
+
+       elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n"
+       elog "\tA lot of thanks to Klaus Schmidinger"
+       elog "\tfor this nice piece of Software...\n"
+
+       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"
+}