commit: 2b8297d91439c9eebacef0ed85eaa45908b29464 Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> AuthorDate: Wed Dec 25 18:25:29 2019 +0000 Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> CommitDate: Wed Dec 25 18:25:29 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8297d9
media-video/vdr: version bump to vdr-2.4.1 this version is a major update to vdr-2.4.1 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> Package-Manager: Portage-2.3.82, Repoman-2.3.18 Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> media-video/vdr/Manifest | 6 + media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch | 2 + media-video/vdr/files/vdr-2.4.1_gentoo.patch | 66 +++++++ .../vdr/files/vdr-2.4.1_makefile-variables.patch | 40 ++++ media-video/vdr/files/vdr-2.4_remove_plugins.patch | 25 +++ media-video/vdr/metadata.xml | 2 + media-video/vdr/vdr-2.4.1.ebuild | 201 +++++++++++++++++++++ 7 files changed, 342 insertions(+) diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest index dac0f69a4e8..645fd58bd16 100644 --- a/media-video/vdr/Manifest +++ b/media-video/vdr/Manifest @@ -1,2 +1,8 @@ DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e +DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175 SHA512 d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d +DIST vdr-2.4.0-ttxtsubs.patch.bz2 16721 BLAKE2B d5c3da713cd82ed8c3baccd1336d283404ebf1099116e76776c26a41ac193aa88bcb5bc2aaa8409a6d40e61c122bbc8ac0d67cb6ff8f83b0dbaea392101643b9 SHA512 99f2cab268d3f6af11607333a35583e5802f90636712e0429eb89eb66ccea7b1fb16a0d3ed2ff266e6f87c338bf77f97028a372eef5e6116b27220a5670a6d31 +DIST vdr-2.4.1.tar.bz2 940623 BLAKE2B 6fa7858e1c0fc25d3332d20347b30515276fc2b54905f32109dfa7f59e4e0c8a83687be405fac063a673c89d77e191f62162b1bd0ed6ee179d32a27f73076fb3 SHA512 b851ebf626de1a6aea11ee9c0cd87d78ebebdc34128925d2027a7030db1262064edb8818566a87ce22d37a9bd2b4f0b4ff1aad8dd251061d9ff972ffe0cf022d +DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f SHA512 9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759 +DIST vdr-2.4.1_pinplugin.patch.bz2 8641 BLAKE2B 339bb23ed0f505087bdbbefb192824d5def37bb00c4d5dc300f545c7951f11504115d058c157d1964f5f32e483e668675e13254465b5acce76cfdcf07faae216 SHA512 f402fa51314ad6c34439f71b7cb81e1ca51e0fa3b120a1fdaee119c2dd1b13174db2e666bf5e6204aa28e4acef8f6bd6e3ab8324793c3484eafb16dc8cf808d5 +DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0 diff --git a/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch b/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch index b67c94d7c57..8ae498a28fd 100644 --- a/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch +++ b/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch @@ -1,5 +1,7 @@ https://bugs.gentoo.org/667934 +Signed-off-by: Martin Dummer <[email protected]> +Reviewed-by: Joerg Bornkessel <[email protected]> --- a/tools.c +++ b/tools.c @@ -1221,15 +1221,15 @@ diff --git a/media-video/vdr/files/vdr-2.4.1_gentoo.patch b/media-video/vdr/files/vdr-2.4.1_gentoo.patch new file mode 100644 index 00000000000..71aca7f5f96 --- /dev/null +++ b/media-video/vdr/files/vdr-2.4.1_gentoo.patch @@ -0,0 +1,66 @@ +this patch will disable some handling in the core Makefile +as we use for Linux FHS a different handling in gentoo +demoplugins from core vdr install disabled +support from Linguas variable + +Signed-off-by: Martin Dummer <[email protected]> +Reviewed-by: Joerg Bornkessel <[email protected]> +--- a/Makefile ++++ b/Makefile +@@ -182,7 +182,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 +@@ -209,7 +209,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): + +@@ -283,12 +283,11 @@ + + install-dirs: + @mkdir -p $(DESTDIR)$(VIDEODIR) +- @mkdir -p $(DESTDIR)$(CONFDIR) + @mkdir -p $(DESTDIR)$(ARGSDIR) +- @mkdir -p $(DESTDIR)$(CACHEDIR) + @mkdir -p $(DESTDIR)$(RESDIR) + + install-conf: install-dirs ++ @mkdir -p $(DESTDIR)$(CONFDIR) + @cp -pn *.conf $(DESTDIR)$(CONFDIR) + + # Documentation: +@@ -296,9 +295,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: + +@@ -315,8 +314,9 @@ + # Includes: + + install-includes: include-dir +- @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/files/vdr-2.4.1_makefile-variables.patch b/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch new file mode 100644 index 00000000000..30cd39528f9 --- /dev/null +++ b/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch @@ -0,0 +1,40 @@ +we change some variables in the Makefile +for a better handling in gentoo ebuild + +Signed-off-by: Joerg Bornkessel <[email protected]> ( 22 Dec 2019 ) +diff -Naur vdr-2.4.1.orig/Makefile vdr-2.4.1/Makefile +--- vdr-2.4.1.orig/Makefile 2019-12-22 00:51:31.000000000 +0100 ++++ vdr-2.4.1/Makefile 2019-12-22 00:53:34.000000000 +0100 +@@ -54,7 +54,7 @@ + + # Output control + +-ifdef VERBOSE ++ifeq ($(VERBOSE),1) + Q = + else + Q = @ +@@ -89,7 +89,7 @@ + ifdef HDRDIR + HDRDIR := -I$(HDRDIR) + endif +-ifndef NO_KBD ++ifeq ($(USE_KBD),1) + DEFINES += -DREMOTE_KBD + endif + ifdef REMOTE +@@ -98,12 +98,12 @@ + ifdef VDR_USER + DEFINES += -DVDR_USER=\"$(VDR_USER)\" + endif +-ifdef BIDI ++ifeq ($(BIDI),1) + INCLUDES += $(shell pkg-config --cflags fribidi) + DEFINES += -DBIDI + LIBS += $(shell pkg-config --libs fribidi) + endif +-ifdef SDNOTIFY ++ifeq ($(SDNOTIFY),1) + INCLUDES += $(shell pkg-config --silence-errors --cflags libsystemd-daemon || pkg-config --cflags libsystemd) + DEFINES += -DSDNOTIFY + LIBS += $(shell pkg-config --silence-errors --libs libsystemd-daemon || pkg-config --libs libsystemd) diff --git a/media-video/vdr/files/vdr-2.4_remove_plugins.patch b/media-video/vdr/files/vdr-2.4_remove_plugins.patch new file mode 100644 index 00000000000..56997968d60 --- /dev/null +++ b/media-video/vdr/files/vdr-2.4_remove_plugins.patch @@ -0,0 +1,25 @@ +we do not install any plugins from core vdr + +Signed-off-by: Martin Dummer <[email protected]> +Reviewed-by: Joerg Bornkessel <[email protected]> +diff -Naur vdr-2.4.0.orig/Makefile vdr-2.4.0/Makefile +--- vdr-2.4.0.orig/Makefile 2017-05-29 10:48:42.000000000 +0200 ++++ vdr-2.4.0/Makefile 2019-03-14 12:08:56.857495048 +0100 +@@ -125,7 +125,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: + +@@ -271,7 +271,7 @@ + + # Install the files (note that 'install-pc' must be first!): + +-install: install-pc install-bin install-conf install-doc install-plugins install-i18n install-includes ++install: install-pc install-bin install-conf install-doc install-i18n install-includes + + # VDR binary: + diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml index acf02374158..eea6df4fdb2 100644 --- a/media-video/vdr/metadata.xml +++ b/media-video/vdr/metadata.xml @@ -20,6 +20,7 @@ <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="demoplugins">Install demo and example plugins coming with vanilla vdr</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="keyboard">enable keyboard support as remote device</flag> @@ -31,5 +32,6 @@ <flag name="pinplugin">Support for <pkg>media-plugins/vdr-pin</pkg></flag> <flag name="resumereset">rreset resume of EOF</flag> <flag name="ttxtsubs">support for <pkg>media-plugins/vdr-ttxtsubs</pkg></flag> + <flag name="verbose">enable full output on compile</flag> </use> </pkgmetadata> diff --git a/media-video/vdr/vdr-2.4.1.ebuild b/media-video/vdr/vdr-2.4.1.ebuild new file mode 100644 index 00000000000..d2f923913af --- /dev/null +++ b/media-video/vdr/vdr-2.4.1.ebuild @@ -0,0 +1,201 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic multilib toolchain-funcs + +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/${P}.tar.bz2 + mainmenuhooks? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_mainmenuhook-1.0.1.patch.bz2 ) + menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff ) + naludump? ( http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff ) + pinplugin? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 ) + ttxtsubs? ( http://vdr.websitec.de/download/${PN}/${P}/${PN}-2.4.0-ttxtsubs.patch.bz2 )" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump pinplugin systemd ttxtsubs verbose" + +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 + media-fonts/corefonts + bidi? ( dev-libs/fribidi ) + systemd? ( sys-apps/systemd )" +BDEPEND="sys-devel/gettext" + +REQUIRED_USE="pinplugin? ( !mainmenuhooks )" + +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 +} + +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)" + # detailed compile output for debug + export "VERBOSE=$(usex verbose 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} + ARGSDIR = \$(CONFDIR)/conf.d + 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 + + eapply "${FILESDIR}/${P}_gentoo.patch" + eapply "${FILESDIR}/vdr-2.2.0-jpeg-9c.patch" + use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch" + eapply "${FILESDIR}/${P}_makefile-variables.patch" + + # works + use naludump && eapply "${DISTDIR}/${PN}-2.1.5-naludump-0.1.diff" +# # request to upstream for new patch +# use permashift && eapply "${DISTDIR}/vdr-2.3-patch-for-permashift.diff" + #pinplugin works + use pinplugin && eapply "${WORKDIR}/${P}_pinplugin.patch" + # ttxtsubs works + use ttxtsubs && eapply "${WORKDIR}/${PN}-2.4.0-ttxtsubs.patch" + # menuorg works + use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff" + # mainmenuhooks, works + use mainmenuhooks && eapply "${WORKDIR}/${P}_mainmenuhook-1.0.1.patch" + + add_cap CAP_UTF8 \ + CAP_IRCTRL_RUNTIME_PARAM \ + CAP_VFAT_RUNTIME_PARAM \ + CAP_CHUID \ + CAP_SHUTDOWN_AUTO_RETRY + + echo -e ${CAPS} > "${CAP_FILE}" || die "cannot write to 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 + + default +} + +src_install() { + # trick the makefile to not create a VIDEODIR by supplying it with an + # existing directory + emake 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 UPDATE-2* ) + einstalldocs + + insinto /usr/share/vdr + doins "${CAP_FILE}" + + fowners vdr:vdr "${CONF_DIR}" -R +} + +pkg_postinst() { + elog "Please read the /usr/share/doc/${PF}/UPDATE-2.4" + elog "for major changes in this version\n" + + elog "It is a good idea to run vdrplugin-rebuild now.\n" + + 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\n" + + elog "To get an idea how to proceed now, have a look at our vdr-guide:" + elog "\thttps://wiki.gentoo.org/wiki/VDR"; +}
