diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-03-11 12:41:18 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-03-11 12:41:18 +0000 |
| commit | 5bd5d0257346df7a471ce6aa708bdf7b9aff9775 (patch) | |
| tree | 1a2b48817067873970bbfd1facf7edd2d7b26e4e /media-video/avidemux | |
| parent | Stable for amd64 wrt bug #461080 (diff) | |
| download | gentoo-2-5bd5d0257346df7a471ce6aa708bdf7b9aff9775.tar.gz gentoo-2-5bd5d0257346df7a471ce6aa708bdf7b9aff9775.tar.bz2 gentoo-2-5bd5d0257346df7a471ce6aa708bdf7b9aff9775.zip | |
Fixed conversion from IUSE flags to cmake arguments to support USE flags that are disabled by default, as a result it no longer fails to emerge due to -system-ffmpeg.
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'media-video/avidemux')
| -rw-r--r-- | media-video/avidemux/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/avidemux/avidemux-2.6.1.ebuild | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog index 08bfa20880e1..3dfa6158c398 100644 --- a/media-video/avidemux/ChangeLog +++ b/media-video/avidemux/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/avidemux # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.207 2013/03/10 13:58:25 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.208 2013/03/11 12:41:18 tomwij Exp $ + + 11 Mar 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-2.6.1.ebuild: + Fixed conversion from IUSE flags to cmake arguments to support USE flags that + are disabled by default, as a result it no longer fails to emerge due to + -system-ffmpeg. 10 Mar 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-2.6.1.ebuild, metadata.xml: diff --git a/media-video/avidemux/avidemux-2.6.1.ebuild b/media-video/avidemux/avidemux-2.6.1.ebuild index 42a8fa1d76c3..40c59a0e3d98 100644 --- a/media-video/avidemux/avidemux-2.6.1.ebuild +++ b/media-video/avidemux/avidemux-2.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v 1.4 2013/03/10 13:58:25 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v 1.5 2013/03/11 12:41:18 tomwij Exp $ EAPI="5" @@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz" # Multiple licenses because of all the bundled stuff. LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" KEYWORDS="~amd64 ~x86" -IUSE="aften a52 alsa amr debug dts fontconfig gtk jack lame libsamplerate mmx nls qt4 sdl -system-ffmpeg vorbis truetype xvid xv oss x264" +IUSE="aften a52 alsa amr debug dts fontconfig gtk jack lame libsamplerate mmx oss nls qt4 sdl -system-ffmpeg vorbis truetype xvid x264 xv" RDEPEND=" >=dev-lang/spidermonkey-1.5-r2 @@ -125,13 +125,13 @@ src_configure() { local x mycmakeargs plugin_ui mycmakeargs=" - $(for x in ${IUSE}; do cmake-utils_use $x; done) + $(for x in ${IUSE}; do cmake-utils_use ${x/#-/}; done) + $(cmake-utils_use amr OPENCORE_AMRWB) + $(cmake-utils_use amr OPENCORE_AMRNB) $(cmake-utils_use dts LIBDCA) - $(cmake-utils_use truetype FREETYPE2) $(cmake-utils_use nls GETTEXT) + $(cmake-utils_use truetype FREETYPE2) $(cmake-utils_use xv XVIDEO) - $(cmake-utils_use amr OPENCORE_AMRWB) - $(cmake-utils_use amr OPENCORE_AMRNB) " use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug" |