diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-02-25 18:44:10 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-25 18:44:10 +0000 |
| commit | f356c54e670682a030fc2e086943447649fe5131 (patch) | |
| tree | 9a5b9694efeb92a2888c9d46885e529a0dedbec3 /media-video/noad | |
| parent | Drop old so evolution-data-server-2.24 can be removed from the tree (diff) | |
| download | gentoo-2-f356c54e670682a030fc2e086943447649fe5131.tar.gz gentoo-2-f356c54e670682a030fc2e086943447649fe5131.tar.bz2 gentoo-2-f356c54e670682a030fc2e086943447649fe5131.zip | |
Fix -Wl,--as-needed failure with "make check" wrt #305571, thanks to Christian Ruppert for patch.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'media-video/noad')
| -rw-r--r-- | media-video/noad/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/noad/files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch | 14 | ||||
| -rw-r--r-- | media-video/noad/noad-0.7.0.20100119.ebuild | 12 |
3 files changed, 26 insertions, 8 deletions
diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog index d2b8e133169f..99fb28be1c86 100644 --- a/media-video/noad/ChangeLog +++ b/media-video/noad/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/noad # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.36 2010/01/31 14:57:15 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.37 2010/02/25 18:44:08 ssuominen Exp $ + + 25 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> + +files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch, + noad-0.7.0.20100119.ebuild: + Fix -Wl,--as-needed failure with "make check" wrt #305571, thanks to + Christian Ruppert for patch. *noad-0.7.0.20100119 (31 Jan 2010) diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch b/media-video/noad/files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch new file mode 100644 index 000000000000..1d01dad4bedc --- /dev/null +++ b/media-video/noad/files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/show_bug.cgi?id=305571 + +--- Makefile.am ++++ Makefile.am +@@ -14,8 +14,7 @@ noinst_PROGRAMS=@PICSRC@ @TOOLSRC@ + EXTRA_PROGRAMS=markpics showindex + + markpics_SOURCES=markpics.cpp +-markpics_LDADD=libnoad.a +-markpics_LDFLAGS=-lMagick++ ++markpics_LDADD=libnoad.a -lMagick++ + markpics_CXXFLAGS=@markpiccxxflags@ + showindex_SOURCES=showindex.cpp + showindex_LDADD=libnoad.a diff --git a/media-video/noad/noad-0.7.0.20100119.ebuild b/media-video/noad/noad-0.7.0.20100119.ebuild index b7263415b4a1..8a593802e8d9 100644 --- a/media-video/noad/noad-0.7.0.20100119.ebuild +++ b/media-video/noad/noad-0.7.0.20100119.ebuild @@ -1,12 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.0.20100119.ebuild,v 1.1 2010/01/31 14:57:15 hd_brummy Exp $ -EAPI="2" +# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.0.20100119.ebuild,v 1.2 2010/02/25 18:44:08 ssuominen Exp $ -WANT_AUTOMAKE="latest" -WANT_AUTOCONF="latest" - -inherit eutils autotools +EAPI=2 +inherit autotools eutils DESCRIPTION="Mark commercial Breaks in VDR records" HOMEPAGE="http://noad.heliohost.org/" @@ -24,7 +21,8 @@ RDEPEND="${DEPEND}" src_prepare() { - epatch "${FILESDIR}"/patches-0.6.0/hangcheck.diff + epatch "${FILESDIR}"/patches-0.6.0/hangcheck.diff \ + "${FILESDIR}"/patches-0.7.x/${P}-asneeded.patch if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then sed -e "s:include/ffmpeg:include/libavcodec:g" -i configure.ac |