From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1IVNkI-0000tn-EV for garchives@archives.gentoo.org; Wed, 12 Sep 2007 08:38:51 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.0/8.14.0) with SMTP id l8C8Vd67010283; Wed, 12 Sep 2007 08:31:39 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.0/8.14.0) with ESMTP id l8C8VcU1010278 for ; Wed, 12 Sep 2007 08:31:38 GMT 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 64EDF65169 for ; Wed, 12 Sep 2007 08:31:37 +0000 (UTC) Received: from hd_brummy by stork.gentoo.org with local (Exim 4.60) (envelope-from ) id 1IVNdI-0006ZS-UQ for gentoo-commits@lists.gentoo.org; Wed, 12 Sep 2007 08:31:37 +0000 From: "Joerg Bornkessel (hd_brummy)" To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-video/vdr: ChangeLog vdr-1.4.7-r4.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog vdr-1.4.7-r4.ebuild X-VCS-Directories: media-video/vdr X-VCS-Committer: hd_brummy X-VCS-Committer-Name: Joerg Bornkessel Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: Joerg Bornkessel Date: Wed, 12 Sep 2007 08:31:36 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org Reply-To: gentoo-dev@lists.gentoo.org X-Archives-Salt: b6318c0a-201e-464b-9a8a-f89de63e2630 X-Archives-Hash: 6575020df845d165266a8982971bf54d hd_brummy 07/09/12 08:31:36 Modified: ChangeLog Added: vdr-1.4.7-r4.ebuild Log: versions bump; new patchset handling and a lot of new use-flags up from this version (Portage version: 2.1.2.12) Revision Changes Path 1.86 media-video/vdr/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/ChangeLog?rev=1.86&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/ChangeLog?rev=1.86&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/ChangeLog?r1=1.85&r2=1.86 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- ChangeLog 11 Sep 2007 19:06:48 -0000 1.85 +++ ChangeLog 12 Sep 2007 08:31:36 -0000 1.86 @@ -1,6 +1,17 @@ # ChangeLog for media-video/vdr # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.85 2007/09/11 19:06:48 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.86 2007/09/12 08:31:36 hd_brummy Exp $ + +*vdr-1.4.7-r4 (12 Sep 2007) + + 12 Sep 2007; Joerg Bornkessel + +files/vdr-add-svdrp-down-0.1.diff, + +files/vdr-1.4.7-makefile-destdir.diff, + +files/vdr-1.4.7-makefile-install-header.diff, + +files/extensions-patch-32-plugin-link-error.diff, + +files/vdr-set-dumpable.diff, +vdr-1.4.7-r4.ebuild: + versions bump; new patchset handling and a lot of new use-flags up from this + version 11 Sep 2007; Matthias Schwarzott vdr-1.4.6.ebuild: Marked stable on x86. 1.1 media-video/vdr/vdr-1.4.7-r4.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/vdr-1.4.7-r4.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/vdr-1.4.7-r4.ebuild?rev=1.1&content-type=text/plain Index: vdr-1.4.7-r4.ebuild =================================================================== # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r4.ebuild,v 1.1 2007/09/12 08:31:36 hd_brummy Exp $ inherit eutils flag-o-matic multilib IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft jumpplay liemikuutio livebuffer lnbshare mainmenuhooks noepg osdmaxitems pinplugin rotor settime setup sortrecords sourcecaps submenu subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter" IUSE="debug vanilla ${IUSE_EXTENSIONS}" EXT_V="32" EXT_P=VDR-Extensions-Patch-${EXT_V} EXT_DIR=${WORKDIR}/${EXT_P}/ # Set if != $PV #EXT_VDR_PV=1.5.3 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB" HOMEPAGE="http://www.cadsoft.de/vdr/" SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2 http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2" KEYWORDS="~amd64 ~ppc ~x86" SLOT="0" LICENSE="GPL-2" DEPEND="media-libs/jpeg sys-apps/gawk media-tv/linuxtv-dvb-headers sys-libs/libcap dev-util/unifdef" RDEPEND="${DEPEND} dev-lang/perl media-tv/vdrplugin-rebuild >=media-tv/gentoo-vdr-scripts-0.3.5" # pull in vdr-setup to get the xml files, else menu will not work PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )" # Relevant Pathes for vdr on gentoo DVB_DIR=/usr/include 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" } add_cap() { while [ "$1" ]; do CAPS="${CAPS}\n$1=1" shift done } enable_patch() { local patch while [ "$1" ]; do patch="$1" echo "$patch = 1" >> Make.config shift 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].*= 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].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \ Make.config.template \ | tr '\n' ' ' } do_unifdef() { ebegin "Unifdef sources" local mf="Makefile.get" cat <<'EOT' > $mf include Makefile show_def: @echo $(DEFINES) show_src_files: @echo $(OBJS:%.o=%.c) EOT local DEFINES=$(extensions_all_defines_unset) local RAW_DEFINES=$(make -f "$mf" show_def) local VDR_SRC_FILES="$(make -f "$mf" show_src_files)" local KEEP_FILES="genfontfile.c $(echo font*.c)" rm "$mf" local def for def in $RAW_DEFINES; do case "${def}" in -DUSE*) DEFINES="${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" done eend 0 } src_unpack() { unpack ${A} cd ${S} ebegin "Changing pathes for gentoo" sed \ -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \ -i vdr.c cat > Make.config <<-EOT # # Generated by ebuild ${PF} # BINDIR = /usr/bin MANDIR = /usr/share/man DVBDIR = ${DVB_DIR} PLUGINLIBDIR = ${PLUGIN_LIBDIR} CONFDIR = ${CONF_DIR} VIDEODIR = /var/vdr/video HEADERDIR = /usr/include DEFINES += -DCONFDIR=\"\$(CONFDIR)\" EOT eend 0 epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff sed -i Makefile \ -e 's/runvdr//' \ -e 's/ install-plugins//' if ! use vanilla; then # changes to extensions-patch to be applicable to vdr-$PV cd "${EXT_DIR}" local LOCAL_EXT_CHANGES="${FILESDIR}/extensions-patch-${EXT_V}-vdr-${PV}.diff" if [[ -f "${LOCAL_EXT_CHANGES}" ]]; then epatch "${LOCAL_EXT_CHANGES}" fi epatch "${FILESDIR}/extensions-patch-32-plugin-link-error.diff" cd "${S}" epatch "${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff" #epatch "${FILESDIR}/${P}-gentoo-hardlinkcutter.diff" epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff" add_cap CAP_SHUTDOWN_SVDRP epatch "${FILESDIR}/vdr-set-dumpable.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="channelscan pluginapi pluginmissing" extensions_all_defines > ${T}/new.IUSE echo $IUSE_EXTENSIONS $IGNORE_PATCHES|tr ' ' '\n' |sort > ${T}/old.IUSE local DIFFS=$(diff -u ${T}/old.IUSE ${T}/new.IUSE|grep '^[+-][^+-]') if [[ -z ${DIFFS} ]]; then einfo "IUSE_EXTENSIONS 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 $IUSE_EXTENSIONS; do FLAG_UP=$(echo $flag|tr '[:lower:]' '[:upper:]') use $flag && enable_patch ${FLAG_UP} done eend 0 extensions_add_make_conf ebegin "Make fonts" emake font >/dev/null eend $? "make fonts failed" ebegin "Make depend" emake .dependencies >/dev/null eend $? "make depend failed" do_unifdef 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=${PV} for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then LOCALPATCHES_SUBDIR="${dir_tmp_var}" fi done echo if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then einfo "Applying local patches" else einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})" fi for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{diff,patch}; do test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}" done fi if [[ -n "${VDRSOURCE_DIR}" ]]; then cp -r ${S} ${T}/source-tree fi if ! use vanilla; then add_cap CAP_IRCTRL_RUNTIME_PARAM \ CAP_VFAT_RUNTIME_PARAM \ CAP_CHUID echo -e ${CAPS} > ${CAP_FILE} fi } src_install() { emake install DESTDIR="${D}" keepdir ${CONF_DIR}/plugins keepdir ${CONF_DIR}/themes keepdir "${PLUGIN_LIBDIR}" dohtml *.html dodoc MANUAL INSTALL README* HISTORY* dodoc TODO-enAIO-rm CONTRIBUTORS newdoc ${EXT_DIR}/README README.extensions-patch insinto /usr/share/vdr doins ${CAP_FILE} if [[ -n "${VDRSOURCE_DIR}" ]]; then einfo "Installing sources" insinto ${VDRSOURCE_DIR}/${P} doins -r ${T}/source-tree/* keepdir ${VDRSOURCE_DIR}/${P}/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_postinst() { elog "It is a good idea to run vdrplugin-rebuild now" if has_version "