commit: 9c0907498c287998bfb87e750264b114ecd22585 Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> AuthorDate: Mon Feb 10 20:45:30 2020 +0000 Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> CommitDate: Mon Feb 10 20:45:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c090749
media-video/vdr: compile fix for glibc-2.31 Replace obsolete stime() function with clock_settime() Suggested-by: Manuel Reimer <manuel.reimer <AT> gmx.de> Bug: https://bugs.gentoo.org/708802 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch | 20 +++ media-video/vdr/vdr-2.4.1-r1.ebuild | 202 +++++++++++++++++++++++ 2 files changed, 222 insertions(+) diff --git a/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch b/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch new file mode 100644 index 00000000000..0db8c5064ac --- /dev/null +++ b/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch @@ -0,0 +1,20 @@ +Replace obsolete stime() function with clock_settime() +bug 708802 + + +Suggested-by: Manuel Reimer <[email protected]> +Signed-off-by: Joerg Bornkessel <[email protected]> ( 2020 Feb 10 ) +diff -Naur vdr-2.4.1.orig/eit.c vdr-2.4.1/eit.c +--- vdr-2.4.1.orig/eit.c 2020-02-10 21:25:03.594761113 +0100 ++++ vdr-2.4.1/eit.c 2020-02-10 21:26:32.443761113 +0100 +@@ -391,7 +391,9 @@ + if (abs(diff) > MAX_TIME_DIFF) { + mutex.Lock(); + if (abs(diff) > MAX_ADJ_DIFF) { +- if (stime(&dvbtim) == 0) ++ timespec ts = {}; ++ ts.tv_sec = dvbtim; ++ if (clock_settime(CLOCK_REALTIME, &ts) == 0) + isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim); + else + esyslog("ERROR while setting system time: %m"); diff --git a/media-video/vdr/vdr-2.4.1-r1.ebuild b/media-video/vdr/vdr-2.4.1-r1.ebuild new file mode 100644 index 00000000000..dffe1a8bd52 --- /dev/null +++ b/media-video/vdr/vdr-2.4.1-r1.ebuild @@ -0,0 +1,202 @@ +# Copyright 2020 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" + eapply "${FILESDIR}/${P}_glibc-2.31.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"; +}
