From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-583848-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 569951381F3
for <garchives@archives.gentoo.org>; Thu, 25 Apr 2013 05:03:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A241EE0924;
Thu, 25 Apr 2013 05:03:31 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0DC59E0924
for <gentoo-commits@lists.gentoo.org>; Thu, 25 Apr 2013 05:03:30 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BD18C33BEEC
for <gentoo-commits@lists.gentoo.org>; Thu, 25 Apr 2013 05:03:29 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 2166)
id 463C52171D; Thu, 25 Apr 2013 05:03:28 +0000 (UTC)
From: "Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, ssuominen@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-video/noad: noad-0.7.3-r1.ebuild ChangeLog
X-VCS-Repository: gentoo-x86
X-VCS-Files: noad-0.7.3-r1.ebuild ChangeLog
X-VCS-Directories: media-video/noad
X-VCS-Committer: ssuominen
X-VCS-Committer-Name: Samuli Suominen
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Message-Id: <20130425050328.463C52171D@flycatcher.gentoo.org>
Date: Thu, 25 Apr 2013 05:03:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2fff02cb-2dff-4f66-bee0-e24ba3ad94fa
X-Archives-Hash: 912a4a33f720062ff0e0ce55c88656d0
ssuominen 13/04/25 05:03:28
Modified: noad-0.7.3-r1.ebuild ChangeLog
Log:
Fix building with media-gfx/imagemagick >= 6.8 wrt #467134. Fix building with recent media-video/ffmpeg (missing -lavutil linkage)
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.2 media-video/noad/noad-0.7.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/noad/noad-0.7.3-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/noad/noad-0.7.3-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/noad/noad-0.7.3-r1.ebuild?r1=1.1&r2=1.2
Index: noad-0.7.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- noad-0.7.3-r1.ebuild 29 Mar 2013 09:41:14 -0000 1.1
+++ noad-0.7.3-r1.ebuild 25 Apr 2013 05:03:28 -0000 1.2
@@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3-r1.ebuild,v 1.1 2013/03/29 09:41:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3-r1.ebuild,v 1.2 2013/04/25 05:03:28 ssuominen Exp $
EAPI=5
-inherit autotools eutils
+inherit autotools eutils toolchain-funcs
DESCRIPTION="Mark commercial Breaks in VDR records"
HOMEPAGE="http://noad.heliohost.org/"
@@ -12,13 +12,14 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg imagemagick"
+IUSE="ffmpeg"
-DEPEND="media-libs/libmpeg2:=
+RDEPEND="media-gfx/imagemagick:=
+ media-libs/libmpeg2:=
ffmpeg? ( virtual/ffmpeg )
- imagemagick? ( media-gfx/imagemagick:= )
!media-plugins/vdr-markad"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
src_prepare() {
EPATCH_FORCE=yes EPATCH_SUFFIX=diff EPATCH_SOURCE="${FILESDIR}"/patches-${PV%.*}.x epatch
@@ -29,26 +30,34 @@
sed -i -e '/CXXFLAGS.*O3/d' configure.ac || die #426746
+ sed -i \
+ -e "s:-lMagick++:$($(tc-getPKG_CONFIG) --libs-only-l Magick++):" \
+ Makefile.am || die #467134
+
# FIXME: --with-tools, markpics will compile but showindex won't!
sed -i \
-e '/^noinst_PROGRAMS/s:@TOOLSRC@::' \
-e '/^EXTRA_PROGRAMS/s:showindex::' \
Makefile.am || die
+ # ld: audiotools.o: undefined reference to symbol 'av_free@@LIBAVUTIL_51'
+ if use ffmpeg; then
+ sed -i -e 's:-lavcodec:& -lavutil:' configure.ac || die
+ fi
+
eautoreconf
}
src_configure() {
econf \
- $(use_with imagemagick magick) \
+ --with-magick \
--with-mpeginclude=/usr/include/mpeg2dec \
--with-tools \
$(usex ffmpeg '--with-ffmpeg --with-ffmpeginclude=/usr/include' '')
}
src_install() {
- dobin noad # showindex
- use imagemagick && dobin markpics
+ dobin noad markpics # showindex
dodoc README INSTALL
# example scripts are installed as dokumentation
1.57 media-video/noad/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/noad/ChangeLog?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/noad/ChangeLog?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/noad/ChangeLog?r1=1.56&r2=1.57
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ChangeLog 4 Apr 2013 10:49:11 -0000 1.56
+++ ChangeLog 25 Apr 2013 05:03:28 -0000 1.57
@@ -1,6 +1,10 @@
# ChangeLog for media-video/noad
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.56 2013/04/04 10:49:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.57 2013/04/25 05:03:28 ssuominen Exp $
+
+ 25 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> noad-0.7.3-r1.ebuild:
+ Fix building with media-gfx/imagemagick >= 6.8 wrt #467134. Fix building with
+ recent media-video/ffmpeg (missing -lavutil linkage)
04 Apr 2013; Alexis Ballier <aballier@gentoo.org>
+files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff: