From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5B6C4138222 for ; Thu, 5 May 2016 19:24:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43D1A21C012; Thu, 5 May 2016 19:24:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD93A21C012 for ; Thu, 5 May 2016 19:24:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E7B2340834 for ; Thu, 5 May 2016 19:24:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32F1E335 for ; Thu, 5 May 2016 19:24:01 +0000 (UTC) From: "Joerg Bornkessel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joerg Bornkessel" Message-ID: <1462476206.91cf3ddad86852356bf48f7bd215d75807a1824d.hd_brummy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/noad/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/noad/noad-0.7.3.ebuild media-video/noad/noad-0.8.6-r2.ebuild media-video/noad/noad-0.8.6.ebuild X-VCS-Directories: media-video/noad/ X-VCS-Committer: hd_brummy X-VCS-Committer-Name: Joerg Bornkessel X-VCS-Revision: 91cf3ddad86852356bf48f7bd215d75807a1824d X-VCS-Branch: master Date: Thu, 5 May 2016 19:24:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 83795386-f974-4189-ae03-977a97b0a6e8 X-Archives-Hash: ec411c1e906cec2d0d0353ed170c5a85 commit: 91cf3ddad86852356bf48f7bd215d75807a1824d Author: Joerg Bornkessel gentoo org> AuthorDate: Thu May 5 19:23:26 2016 +0000 Commit: Joerg Bornkessel gentoo org> CommitDate: Thu May 5 19:23:26 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91cf3dda compilefix wrt bug 575494 Package-Manager: portage-2.2.28 media-video/noad/noad-0.7.3.ebuild | 88 ---------------------- .../{noad-0.8.6.ebuild => noad-0.8.6-r2.ebuild} | 15 +++- 2 files changed, 11 insertions(+), 92 deletions(-) diff --git a/media-video/noad/noad-0.7.3.ebuild b/media-video/noad/noad-0.7.3.ebuild deleted file mode 100644 index acce5bb..0000000 --- a/media-video/noad/noad-0.7.3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils flag-o-matic autotools - -DESCRIPTION="Mark commercial Breaks in VDR records" -HOMEPAGE="http://noad.heliohost.org/" -SRC_URI="http://noad.heliohost.org/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="ffmpeg imagemagick" - -DEPEND="media-libs/libmpeg2 - ffmpeg? ( >=virtual/ffmpeg-0.4.8 ) - imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 ) - !media-plugins/vdr-markad" -RDEPEND="${DEPEND}" - -src_prepare() { - - epatch "${FILESDIR}"/patches-0.7.x/"${P}"-hangcheck.diff - - # UINT64_C is needed by ffmpeg headers - append-flags -D__STDC_CONSTANT_MACROS - - if has_version ">=media-video/vdr-1.7.15"; then - sed -e "s:2001:6419:" -i svdrpc.cpp - fi - - epatch "${FILESDIR}/patches-0.7.x/${P}_gcc-4.7.diff" - - eautoreconf -} - -src_configure() { - - local=myconf - use ffmpeg && myconf="--with-ffmpeg --with-ffmpeginclude=/usr/include" - - econf \ - ${myconf} \ - $(use_with imagemagick magick) \ - --with-mpeginclude=/usr/include/mpeg2dec -# --with-tools # fails on showindex, marcpics compile -} - -src_install() { - - dobin noad -# fix me later! -# dobin noad showindex -# use imagemagick && dobin markpics - - dodoc README INSTALL - # example scripts are installed as dokumentation - dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html - - newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad - - insinto /usr/share/vdr/record - doins "${FILESDIR}"/record-50-noad.sh - - insinto /usr/share/vdr/shutdown - doins "${FILESDIR}"/pre-shutdown-15-noad.sh - - insinto /etc/vdr/reccmds - doins "${FILESDIR}"/reccmds.noad.conf - - exeinto /usr/share/vdr/bin - doexe "${FILESDIR}"/noad-reccmd -} - -pkg_postinst() { - - elog - elog "Congratulations, you have just installed noad!," - elog "To integrate noad in VDR you should do this:" - elog - elog "start and set Parameter in /etc/conf.d/vdraddon.noad" - elog - elog "Note: You can use here all pararmeters for noad," - elog "please look in the documentation of noad." -} diff --git a/media-video/noad/noad-0.8.6.ebuild b/media-video/noad/noad-0.8.6-r2.ebuild similarity index 82% rename from media-video/noad/noad-0.8.6.ebuild rename to media-video/noad/noad-0.8.6-r2.ebuild index 297a1a3..bb10d50 100644 --- a/media-video/noad/noad-0.8.6.ebuild +++ b/media-video/noad/noad-0.8.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -25,9 +25,16 @@ DEPEND="${RDEPEND} REQUIRED_USE="|| ( ffmpeg libmpeg2 )" src_prepare() { - if has_version '>=media-video/vdr-1.7.15'; then - sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp || die - fi + sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp + + # wrt bug 575494 + sed -e "s:CODEC_ID_MP3:AV_CODEC_ID_MP3:" -i audiotools.cpp + sed -e "sCODEC_ID_PROBE:AV_CODEC_ID_PROBE:" -i ffmpeg_decoder.cpp + + # tested libav-9, ffmepg-2.2.9 + epatch "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \ + "${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch" + eautoreconf }