From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MCCC8-0006kz-Nf for garchives@archives.gentoo.org; Thu, 04 Jun 2009 12:37:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3E08E0455; Thu, 4 Jun 2009 12:37:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 66449E0455 for ; Thu, 4 Jun 2009 12:37:17 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 4FA39664E1 for ; Thu, 4 Jun 2009 12:37:15 +0000 (UTC) Received: from zzam by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MCCC2-0006pg-OJ for gentoo-commits@lists.gentoo.org; Thu, 04 Jun 2009 12:37:14 +0000 From: "Matthias Schwarzott (zzam)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, zzam@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-video/vdr: metadata.xml ChangeLog vdr-1.6.0_p2-r3.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: metadata.xml ChangeLog vdr-1.6.0_p2-r3.ebuild X-VCS-Directories: media-video/vdr X-VCS-Committer: zzam X-VCS-Committer-Name: Matthias Schwarzott Content-Type: text/plain; charset=utf8 Message-Id: Sender: Matthias Schwarzott Date: Thu, 04 Jun 2009 12:37:14 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e2be8ae2-c575-43e8-bac4-9c49a6e670da X-Archives-Hash: 4d068e13b04cb5e5278e4c1ef1401cb3 zzam 09/06/04 12:37:14 Modified: metadata.xml ChangeLog Added: vdr-1.6.0_p2-r3.ebuild Log: Update to extensions patch v72. Do not support streamdevext patch for n= ow. (Portage version: 2.1.6.13/cvs/Linux i686) Revision Changes Path 1.9 media-video/vdr/metadata.xml file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/me= tadata.xml?rev=3D1.9&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/me= tadata.xml?rev=3D1.9&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/me= tadata.xml?r1=3D1.8&r2=3D1.9 Index: metadata.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/metadata.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- metadata.xml 25 Mar 2009 20:42:56 -0000 1.8 +++ metadata.xml 4 Jun 2009 12:37:14 -0000 1.9 @@ -45,6 +45,7 @@ Enables support for the menuorg-plugin Adds code to selectively disable epg-reception fo= r specific channels Support for text2skin + Support Parental Rating Support for pin plugin Enable support for plugin vdr-rotor for dish-posi= tioner. set system time per script instead of via sysca= l 1.130 media-video/vdr/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/Ch= angeLog?rev=3D1.130&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/Ch= angeLog?rev=3D1.130&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/Ch= angeLog?r1=3D1.129&r2=3D1.130 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- ChangeLog 4 Jun 2009 08:46:37 -0000 1.129 +++ ChangeLog 4 Jun 2009 12:37:14 -0000 1.130 @@ -1,6 +1,13 @@ # ChangeLog for media-video/vdr # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.129 200= 9/06/04 08:46:37 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.130 200= 9/06/04 12:37:14 zzam Exp $ + +*vdr-1.6.0_p2-r3 (04 Jun 2009) + + 04 Jun 2009; Matthias Schwarzott + +vdr-1.6.0_p2-r3.ebuild, +files/vdr-1.6.0-extensions-72-gcc-4.4.diff, + metadata.xml: + Update to extensions patch v72. Do not support streamdevext patch for = now. =20 04 Jun 2009; Matthias Schwarzott vdr-1.6.0_p2-r2.ebu= ild, +files/vdr-1.6.0-extensions-gcc-4.4.diff, +files/vdr-1.6.0-gcc-4.4.dif= f: 1.1 media-video/vdr/vdr-1.6.0_p2-r3.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/vd= r-1.6.0_p2-r3.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/vd= r-1.6.0_p2-r3.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: vdr-1.6.0_p2-r3.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r3.ebuild= ,v 1.1 2009/06/04 12:37:14 zzam Exp $ inherit eutils flag-o-matic multilib # Switches supported by extensions-patch EXT_PATCH_FLAGS=3D"analogtv atsc cmdsubmenu cutterlimit cutterqueue cutti= me ddepgentry dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcu= tter jumpplay lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin rotor settime setup sortrecords sourcecaps livebuffer ttxtsubs timercmd timerinfo validinput yaepg syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer volctrl wareagleicon lircsettings deltimeshiftrec em84xx cmdreccmdi18n softosd parentalrating" # names of the use-flags EXT_PATCH_FLAGS_RENAMED=3D"iptv liemikuutio" # names ext-patch uses internally, here only used for maintainer checks EXT_PATCH_FLAGS_RENAMED_EXT_NAME=3D"pluginparam liemiext" IUSE=3D"debug vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}" MY_PV=3D"${PV%_p*}" MY_P=3D"${PN}-${MY_PV}" S=3D"${WORKDIR}/${MY_P}" EXT_V=3D"72" EXT_P=3DVDR-Extensions-Patch-${EXT_V} EXT_DIR=3D${WORKDIR}/${EXT_P}/ EXT_VDR_PV=3D"${PV/_p/-}" DESCRIPTION=3D"Video Disk Recorder - turns a pc into a powerful set top b= ox for DVB" HOMEPAGE=3D"http://www.cadsoft.de/vdr/" SRC_URI=3D"ftp://ftp.cadsoft.de/vdr/${MY_P}.tar.bz2 ftp://ftp.cadsoft.de/vdr/Developer/${MY_P}-1.diff ftp://ftp.cadsoft.de/vdr/Developer/${MY_P}-2.diff http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2" KEYWORDS=3D"~amd64 ~ppc ~x86" SLOT=3D"0" LICENSE=3D"GPL-2" COMMON_DEPEND=3D"media-libs/jpeg sys-libs/libcap >=3Dmedia-libs/fontconfig-2.4.2 >=3Dmedia-libs/freetype-2 sys-devel/gettext dvdarchive? ( dvdchapjump? ( media-libs/libdvdnav ) )" DEPEND=3D"${COMMON_DEPEND} media-tv/linuxtv-dvb-headers dev-util/unifdef" RDEPEND=3D"${COMMON_DEPEND} dev-lang/perl >=3Dmedia-tv/gentoo-vdr-scripts-0.4.5 media-fonts/corefonts" # pull in vdr-setup to get the xml files, else menu will not work PDEPEND=3D"setup? ( >=3Dmedia-plugins/vdr-setup-0.3.1-r1 )" CONF_DIR=3D/etc/vdr CAP_FILE=3D${S}/capabilities.sh CAPS=3D"# Capabilities of the vdr-executable for use by startscript etc." pkg_setup() { check_menu_flags use debug && append-flags -g PLUGIN_LIBDIR=3D"/usr/$(get_libdir)/vdr/plugins" } check_menu_flags() { if use menuorg && use setup; then echo eerror "Please use only one of this USE-Flags" eerror "\tmenuorg setup" die "multiple menu manipulation" fi } add_cap() { local arg for arg; do CAPS=3D"${CAPS}\n${arg}=3D1" done } enable_patch() { local arg ARG_UPPER for arg; do ARG_UPPER=3D$(echo $arg|tr '[:lower:]' '[:upper:]') echo "${ARG_UPPER} =3D 1" >> Make.config done } extensions_add_make_conf() { # copy all ifdef for extensions-patch to Make.config sed -e '1,/need to touch the following:/d' \ -e '/ifdef DVBDIR/,/^$/d' \ Make.config.template >> Make.config } extensions_all_defines() { # extract all possible settings for extensions-patch sed -e '/^#\?[A-Z].*=3D 1/!d' -e 's/^#\?//' -e 's/ .*//' \ Make.config.template \ | sort \ | tr '[:upper:]' '[:lower:]' } extensions_all_defines_unset() { # extract all possible settings for extensions-patch # and convert them to -U... for unifdef sed -e '/^#\?[A-Z].*=3D 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \ Make.config.template \ | tr '\n' ' ' } do_unifdef() { ebegin "Unifdef sources" local mf=3D"Makefile.get" cat <<'EOT' > $mf include Makefile show_def: @echo $(DEFINES) show_src_files: @echo $(OBJS:%.o=3D%.c) EOT local DEFINES=3D$(extensions_all_defines_unset) local RAW_DEFINES=3D$(make -f "$mf" show_def) local VDR_SRC_FILES=3D$(make -f "$mf" show_src_files) local KEEP_FILES=3D"" rm "$mf" local def for def in $RAW_DEFINES; do case "${def}" in -DUSE*) DEFINES=3D"${DEFINES} ${def}" ;; esac done local f for f in *.c; do # Removing the src files the Makefile does not use for compiling vdr if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then rm -f ${f} ${f%.c}.h continue fi unifdef ${DEFINES} "$f" > "tmp.$f" mv "tmp.$f" "$f" done for f in *.h; do unifdef ${DEFINES} "$f" > "tmp.$f" mv "tmp.$f" "$f" [[ -s $f ]] || rm "$f" done eend 0 } src_unpack() { unpack ${A} cd "${S}" # fix for wrong header include #263840 ; this need >libdvdread-0.9.7 sed -e "s:dvdread:dvdnav:g" -i "${EXT_DIR}/${PN}"-1.6.0-2_extensions.dif= f #applying maintainace-patches epatch "${DISTDIR}/${MY_P}-1.diff" epatch "${DISTDIR}/${MY_P}-2.diff" epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff ebegin "Changing pathes for gentoo" sed \ -e 's-ConfigDirectory =3D VideoDirectory;-ConfigDirectory =3D CONFDIR;= -' \ -i vdr.c local DVBDIR=3D/usr/include cat > Make.config <<-EOT # # Generated by ebuild ${PF} # PREFIX =3D /usr DVBDIR =3D ${DVBDIR} PLUGINLIBDIR =3D ${PLUGIN_LIBDIR} CONFDIR =3D ${CONF_DIR} VIDEODIR =3D /var/vdr/video LOCDIR =3D \$(PREFIX)/share/vdr/locale DEFINES +=3D -DCONFDIR=3D\"\$(CONFDIR)\" INCLUDES +=3D -I\$(DVBDIR) EOT eend 0 epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff if use dxr3; then einfo "Applying dxr3 subtitle hack" epatch "${FILESDIR}"/vdr-1.6.0-dxr3-subtitlehack.diff fi sed -i i18n-to-gettext.pl \ -e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.ec= lass "/' # Do not install runvdr script and plugins sed -i Makefile \ -e 's/runvdr//' \ -e 's/ install-plugins//' if use vanilla; then epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff else cd "${S}" # Now apply extensions patch local fname=3D"${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff" epatch "${EXT_DIR}/${fname}" # Fix typo in Make.config.template sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template # other gentoo patches # epatch "${FILESDIR}/..." epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.diff # This allows us to start even if some plugin does not exist # or is not loadable. enable_patch PLUGINMISSING # Patch necessary for media-plugins/vdr-reelchannelscan # it does not change anything when plugin is not used enable_patch CHANNELSCAN if [[ -n ${VDR_MAINTAINER_MODE} ]]; then einfo "Doing maintainer checks:" # these patches we do not support # (or have them already hard enabled) local IGNORE_PATCHES=3D"channelscan pluginapi pluginmissing streamdeve= xt" 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=3D$(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 # patches that got renamed use iptv && enable_patch pluginparam use liemikuutio && enable_patch liemiext eend 0 extensions_add_make_conf ebegin "Make depend" emake .dependencies >/dev/null eend $? "make depend failed" [[ -z "$NO_UNIFDEF" ]] && do_unifdef use iptv && sed -i sources.conf -e 's/^#P/P/' fi # apply local patches defined by variable VDR_LOCAL_PATCHES_DIR if test -n "${VDR_LOCAL_PATCHES_DIR}"; then local dir_tmp_var local LOCALPATCHES_SUBDIR=3D${PV} for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then LOCALPATCHES_SUBDIR=3D"${dir_tmp_var}" fi done echo if [[ ${LOCALPATCHES_SUBDIR} =3D=3D ${PV} ]]; then einfo "Applying local patches" else einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBD= IR})" fi for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{di= ff,patch}; do test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}" done fi if [[ -n "${VDRSOURCE_DIR}" ]]; then cp -r "${S}" "${T}"/source-tree fi 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}" } src_install() { # trick makefile not to create a videodir by supplying it with an existi= ng # directory emake install DESTDIR=3D"${D}" VIDEODIR=3D"/" || die "emake install fail= ed" keepdir "${CONF_DIR}"/plugins keepdir "${CONF_DIR}"/themes keepdir "${PLUGIN_LIBDIR}" exeinto /usr/share/vdr/bin doexe i18n-to-gettext.pl dohtml *.html dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir.= " local f rm *vdr-1.4* 2>/dev/null for f in *; do [[ -f ${f} ]] || continue newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensio= ns-patch doc ${f}" done cd "${S}" insinto /usr/share/vdr doins "${CAP_FILE}" if [[ -n "${VDRSOURCE_DIR}" ]]; then local SOURCES_DEST=3D"${VDRSOURCE_DIR}/${P/_p/-}" einfo "Installing sources" insinto "${SOURCES_DEST}" doins -r "${T}"/source-tree/* keepdir "${SOURCES_DEST}"/PLUGINS/lib fi if use setup; then insinto /usr/share/vdr/setup doins "${S}"/menu.c fi chown -R vdr:vdr "${D}/${CONF_DIR}" } pkg_preinst() { has_version "<${CATEGORY}/${PN}-1.3.36-r3" previous_less_than_1_3_36_r3=3D$? has_version "<${CATEGORY}/${PN}-1.6.0" previous_less_than_1_3_36_r3=3D$? } pkg_postinst() { elog "It is a good idea to run vdrplugin-rebuild now." if [[ $previous_less_than_1_3_36_r3 =3D 0 ]] ; then ewarn "Upgrade Info:" ewarn ewarn "If you had used the use-flags lirc, rcu or vfat" ewarn "then, you now have to enable the associated functionality" ewarn "in /etc/conf.d/vdr" ewarn ewarn "vfat is now set with VFAT_FILENAMES." ewarn "lirc/rcu are now set with IR_CTRL." ebeep fi if use setup; then if ! has_version media-plugins/vdr-setup || \ ! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then echo ewarn "You have compiled media-video/vdr with USE=3D\"setup\"" ewarn "It is very important to emerge media-plugins/vdr-setup now!" ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins" fi fi local keysfound=3D0 local key local warn_keys=3D"JumpFwd JumpRew JumpFwdSlow JumpRewSlow" local remote_file=3D"${ROOT}"/etc/vdr/remote.conf if [[ -e ${remote_file} ]]; then for key in ${warn_keys}; do if grep -q -i "\.${key} " "${remote_file}"; then keysfound=3D1 break fi done if [[ ${keysfound} =3D=3D 1 ]]; then ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usa= ble" ewarn "Please remove these keys or vdr will not start:" ewarn "# ${warn_keys}" fi fi if use atsc; then ewarn "ATSC is only supported by a rudimentary patch" einfo "and need at least this patch and a plugin installed" einfo "emerge media-plugins/vdr-atscepg" fi if [[ $previous_less_than_1_6_0 =3D 0 ]]; then elog "By default vdr is now started with utf8 character encoding" elog elog "To rename the old recordings to utf8 conforming names, do this:" elog "\temerge app-text/convmv" elog "\tconvmv -f latin1 -t utf8 -r --notest -i /var/vdr/video/" elog elog "To fix the descriptions of your recordings do this:" elog "\tfind /var/vdr/video/ -name "info.vdr" -print0|xargs -0 recode l= atin1..utf8" fi 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 "\thttp://www.gentoo.org/doc/en/vdr-guide.xml" }