hd_brummy 15/02/19 19:38:49 Modified: metadata.xml vdr-2.0.6-r1.ebuild ChangeLog vdr-2.0.7.ebuild vdr-2.0.5.ebuild vdr-2.0.4.ebuild vdr-2.0.6-r2.ebuild Added: vdr-2.2.0.ebuild Log: BUMP, 15 YEARS ANNIVERSARY EDITON; minor fixes on virtual/jpeg (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 34C2808A)
Revision Changes Path 1.17 media-video/vdr/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/metadata.xml?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/metadata.xml?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/metadata.xml?r1=1.16&r2=1.17 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/metadata.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- metadata.xml 25 Nov 2014 21:44:42 -0000 1.16 +++ metadata.xml 19 Feb 2015 19:38:49 -0000 1.17 @@ -15,12 +15,15 @@ <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 menuorg-plugin</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 vdr-permashift</flag> <flag name="permashift_v1">permanent timeshift by recording live TV on RAM, need plugin >=vdr-permashift-1</flag> <flag name="pinplugin">Support for pin plugin</flag> + <flag name="resumereset">rreset resume of EOF</flag> <flag name="rotor">Enable support for plugin vdr-rotor for dish-positioner.</flag> <flag name="setup">Enable support for the plugin vdr-setup</flag> <flag name="ttxtsubs">support for ttxtsubs plugin</flag> 1.4 media-video/vdr/vdr-2.0.6-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.6-r1.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.6-r1.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.6-r1.ebuild?r1=1.3&r2=1.4 Index: vdr-2.0.6-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.6-r1.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vdr-2.0.6-r1.ebuild 3 Feb 2015 20:28:10 -0000 1.3 +++ vdr-2.0.6-r1.ebuild 19 Feb 2015 19:38:49 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.6-r1.ebuild,v 1.3 2015/02/03 20:28:10 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.6-r1.ebuild,v 1.4 2015/02/19 19:38:49 hd_brummy Exp $ EAPI=5 @@ -38,7 +38,7 @@ permashift? ( !permashift_v1 ) permashift_v1? ( !permashift )" -COMMON_DEPEND="virtual/jpeg +COMMON_DEPEND="virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2" 1.189 media-video/vdr/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.189&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.189&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?r1=1.188&r2=1.189 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- ChangeLog 3 Feb 2015 20:28:10 -0000 1.188 +++ ChangeLog 19 Feb 2015 19:38:49 -0000 1.189 @@ -1,6 +1,13 @@ # ChangeLog for media-video/vdr # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.188 2015/02/03 20:28:10 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.189 2015/02/19 19:38:49 hd_brummy Exp $ + +*vdr-2.2.0 (19 Feb 2015) + + 19 Feb 2015; Joerg Bornkessel <hd_bru...@gentoo.org> vdr-2.0.4.ebuild, + vdr-2.0.5.ebuild, vdr-2.0.6-r1.ebuild, vdr-2.0.6-r2.ebuild, vdr-2.0.7.ebuild, + +vdr-2.2.0.ebuild, +files/vdr-2.2.0_gentoo.patch, metadata.xml: + BUMP, 15 YEARS ANNIVERSARY EDITON; minor fixes on virtual/jpeg 03 Feb 2015; Joerg Bornkessel <hd_bru...@gentoo.org> vdr-2.0.6-r1.ebuild: stable amd64 x86 1.2 media-video/vdr/vdr-2.0.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.7.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.7.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.7.ebuild?r1=1.1&r2=1.2 Index: vdr-2.0.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vdr-2.0.7.ebuild 23 Jan 2015 08:28:14 -0000 1.1 +++ vdr-2.0.7.ebuild 19 Feb 2015 19:38:49 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.7.ebuild,v 1.1 2015/01/23 08:28:14 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.7.ebuild,v 1.2 2015/02/19 19:38:49 hd_brummy Exp $ EAPI=5 @@ -38,7 +38,7 @@ permashift? ( !permashift_v1 ) permashift_v1? ( !permashift )" -COMMON_DEPEND="virtual/jpeg +COMMON_DEPEND="virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2" 1.3 media-video/vdr/vdr-2.0.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.5.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.5.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.5.ebuild?r1=1.2&r2=1.3 Index: vdr-2.0.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.5.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vdr-2.0.5.ebuild 4 Jan 2015 01:19:02 -0000 1.2 +++ vdr-2.0.5.ebuild 19 Feb 2015 19:38:49 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.5.ebuild,v 1.2 2015/01/04 01:19:02 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.5.ebuild,v 1.3 2015/02/19 19:38:49 hd_brummy Exp $ EAPI=5 @@ -37,7 +37,7 @@ REQUIRED_USE="setup? ( !menuorg ) menuorg? ( !setup )" -COMMON_DEPEND="virtual/jpeg +COMMON_DEPEND="virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2" 1.4 media-video/vdr/vdr-2.0.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.4.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.4.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.4.ebuild?r1=1.3&r2=1.4 Index: vdr-2.0.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.4.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vdr-2.0.4.ebuild 4 Jan 2015 01:19:02 -0000 1.3 +++ vdr-2.0.4.ebuild 19 Feb 2015 19:38:49 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.4.ebuild,v 1.3 2015/01/04 01:19:02 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.4.ebuild,v 1.4 2015/02/19 19:38:49 hd_brummy Exp $ EAPI=5 @@ -37,7 +37,7 @@ REQUIRED_USE="setup? ( !menuorg ) menuorg? ( !setup )" -COMMON_DEPEND="virtual/jpeg +COMMON_DEPEND="virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 1.2 media-video/vdr/vdr-2.0.6-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.6-r2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.6-r2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.0.6-r2.ebuild?r1=1.1&r2=1.2 Index: vdr-2.0.6-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.6-r2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vdr-2.0.6-r2.ebuild 20 Jan 2015 03:19:46 -0000 1.1 +++ vdr-2.0.6-r2.ebuild 19 Feb 2015 19:38:49 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.6-r2.ebuild,v 1.1 2015/01/20 03:19:46 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.6-r2.ebuild,v 1.2 2015/02/19 19:38:49 hd_brummy Exp $ EAPI=5 @@ -38,7 +38,7 @@ permashift? ( !permashift_v1 ) permashift_v1? ( !permashift )" -COMMON_DEPEND="virtual/jpeg +COMMON_DEPEND="virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2" 1.1 media-video/vdr/vdr-2.2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.2.0.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-2.2.0.ebuild?rev=1.1&content-type=text/plain Index: vdr-2.2.0.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.2.0.ebuild,v 1.1 2015/02/19 19:38:49 hd_brummy Exp $ EAPI=5 inherit eutils flag-o-matic multilib toolchain-funcs # Switches supported by extensions-patch EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 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" IUSE="bidi debug +kbd html systemd 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-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 http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2" KEYWORDS="~arm ~amd64 ~ppc ~x86" SLOT="0" LICENSE="GPL-2" 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.7 media-fonts/corefonts bidi? ( dev-libs/fribidi ) systemd? ( sys-apps/systemd )" 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_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 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 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 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 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 "${FILESDIR}/${P}_gentoo.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 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 einstall \ VIDEODIR="/" \ DESTDIR="${D}" install || die "emake install failed" keepdir "${PLUGIN_LIBDIR}" # backup for plugins they don't be able to create this dir keepdir "${CONF_DIR}"/plugins if use html; then dohtml *.html fi nonfatal 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_preinstall() { has_version "<${CATEGORY}/${PN}-2.2" previous_less_than_2_2=$ } pkg_postinst() { if [[ $previous_less_than_2_2 = 0 ]] ; then elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n" elog "\tA lot of thanks to Klaus Schmiedinger" elog "\tfor this nice piece of Software...\n" fi 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" }