From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1477E138239 for ; Sun, 15 Dec 2019 12:59:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62D03E0831; Sun, 15 Dec 2019 12:59:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FBE8E0831 for ; Sun, 15 Dec 2019 12:59:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 889B934D201 for ; Sun, 15 Dec 2019 12:59:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 381C4A8 for ; Sun, 15 Dec 2019 12:59:47 +0000 (UTC) From: "Joerg Bornkessel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joerg Bornkessel" Message-ID: <1576414773.942e52300c8e525ae888c320524771517c3f585e.hd_brummy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vdr/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vdr/metadata.xml media-video/vdr/vdr-2.2.0-r5.ebuild X-VCS-Directories: media-video/vdr/ X-VCS-Committer: hd_brummy X-VCS-Committer-Name: Joerg Bornkessel X-VCS-Revision: 942e52300c8e525ae888c320524771517c3f585e X-VCS-Branch: master Date: Sun, 15 Dec 2019 12:59:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3447add0-5925-442d-ac2c-42c0039dcafb X-Archives-Hash: 96ed0ff7694a1d5ed8504b21f062596c commit: 942e52300c8e525ae888c320524771517c3f585e Author: Joerg Bornkessel gentoo org> AuthorDate: Sun Dec 15 12:58:41 2019 +0000 Commit: Joerg Bornkessel gentoo org> CommitDate: Sun Dec 15 12:59:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=942e5230 media-video/vdr: moved use flag moved use flag kbd to keyboard requested by wrt bug 685828 Bug: https://bugs.gentoo.org/685828 Package-Manager: Portage-2.3.81, Repoman-2.3.18 Signed-off-by: Joerg Bornkessel gentoo.org> media-video/vdr/metadata.xml | 1 + media-video/vdr/vdr-2.2.0-r5.ebuild | 301 ++++++++++++++++++++++++++++++++++++ 2 files changed, 302 insertions(+) diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml index 84dcc17c309..d0e7ffcbce8 100644 --- a/media-video/vdr/metadata.xml +++ b/media-video/vdr/metadata.xml @@ -19,6 +19,7 @@ support for vdr-graphtft plugin up from version 0.1.7 Install HTML documentation enable keyboard support as remote device + enable keyboard support as remote device Allows to replace main menu entries by some special plugins (like epgsearch, extrecmenu, ...) Enables support for the media-plugins/vdr-menuorg adds support for menu hotkeys of double digits diff --git a/media-video/vdr/vdr-2.2.0-r5.ebuild b/media-video/vdr/vdr-2.2.0-r5.ebuild new file mode 100644 index 00000000000..740d4182bd8 --- /dev/null +++ b/media-video/vdr/vdr-2.2.0-r5.ebuild @@ -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 keyboard 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 keyboard 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" +}