diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2007-02-02 07:35:46 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2007-02-02 07:35:46 +0000 |
| commit | c6c816401982e7561a02535070b407f3547068d9 (patch) | |
| tree | 6ce184afa5af74f1ee2c32aa512e27303b0f8b00 /media-video/avidemux | |
| parent | snapshot bump (diff) | |
| download | gentoo-2-c6c816401982e7561a02535070b407f3547068d9.tar.gz gentoo-2-c6c816401982e7561a02535070b407f3547068d9.tar.bz2 gentoo-2-c6c816401982e7561a02535070b407f3547068d9.zip | |
parallel make fix, bug #163376, add some quotes, einfo -> elog conversion
(Portage version: 2.1.2-r6)
Diffstat (limited to 'media-video/avidemux')
| -rw-r--r-- | media-video/avidemux/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/avidemux/avidemux-2.3.0.ebuild | 17 | ||||
| -rw-r--r-- | media-video/avidemux/files/avidemux-2.3.0-po.makefile.patch | 12 |
3 files changed, 26 insertions, 9 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog index 818b1e08979a..8b55639f8ca9 100644 --- a/media-video/avidemux/ChangeLog +++ b/media-video/avidemux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/avidemux # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.106 2007/01/23 09:28:47 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.107 2007/02/02 07:35:46 aballier Exp $ + + 02 Feb 2007; Alexis Ballier <aballier@gentoo.org> + +files/avidemux-2.3.0-po.makefile.patch, avidemux-2.3.0.ebuild: + parallel make fix, bug #163376, add some quotes, einfo -> elog conversion 23 Jan 2007; Steve Dibb <beandog@gentoo.org> avidemux-2.3.0.ebuild: Autotools fix, bug 163376 diff --git a/media-video/avidemux/avidemux-2.3.0.ebuild b/media-video/avidemux/avidemux-2.3.0.ebuild index b76801347d49..8b46410cfad8 100644 --- a/media-video/avidemux/avidemux-2.3.0.ebuild +++ b/media-video/avidemux/avidemux-2.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.2 2007/01/23 09:28:47 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.3 2007/02/02 07:35:46 aballier Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -76,10 +76,11 @@ pkg_setup() { src_unpack() { unpack ${A} - cd ${S} + cd "${S}" - epatch ${FILESDIR}/${P}-dts.patch - epatch ${FILESDIR}/${P}-configure.patch + epatch "${FILESDIR}/${P}-dts.patch" + epatch "${FILESDIR}/${P}-configure.patch" + epatch "${FILESDIR}/${P}-po.makefile.patch" #sed -i -e 's/x264=no,-lm/x264=no,-lm -lX11/' configure.in.in || die "sed failed." gmake -f Makefile.dist || die "autotools failed." @@ -115,9 +116,9 @@ src_install() { pkg_postinst() { if use ppc && use oss; then - echo - einfo "OSS sound output may not work on ppc" - einfo "If your hear only static noise, try" - einfo "changing the sound device to ALSA or arts" + elog "" + elog "OSS sound output may not work on ppc" + elog "If your hear only static noise, try" + elog "changing the sound device to ALSA or arts" fi } diff --git a/media-video/avidemux/files/avidemux-2.3.0-po.makefile.patch b/media-video/avidemux/files/avidemux-2.3.0-po.makefile.patch new file mode 100644 index 000000000000..677b30118601 --- /dev/null +++ b/media-video/avidemux/files/avidemux-2.3.0-po.makefile.patch @@ -0,0 +1,12 @@ +diff -N -u -r avidemux_2.2_preview2-old/po/Makefile.in.in avidemux_2.2_preview2/po/Makefile.in.in +--- avidemux_2.2_preview2-old/po/Makefile.in.in 2006-08-26 19:06:27.631751295 +0200 ++++ avidemux_2.2_preview2/po/Makefile.in.in 2006-08-26 19:07:30.397921873 +0200 +@@ -68,7 +68,7 @@ + @lang=`echo $* | sed -e 's,.*/,,'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ +- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo ++ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po + + .sin.sed: + sed -e '/^#/d' $< > t-$@ |