summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-10-20 16:23:35 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-10-20 16:23:35 +0000
commit1a76da42534a0f955d0640c6b55e9d3d44d9b510 (patch)
tree423c09b6b43abe02cfe14f77e302a1b38a13c05b
parentPackage moved home (bug #289145) (diff)
downloadgentoo-2-1a76da42534a0f955d0640c6b55e9d3d44d9b510.tar.gz
gentoo-2-1a76da42534a0f955d0640c6b55e9d3d44d9b510.tar.bz2
gentoo-2-1a76da42534a0f955d0640c6b55e9d3d44d9b510.zip
Remove amrnb support wrt #252140.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
-rw-r--r--media-video/avidemux/ChangeLog6
-rw-r--r--media-video/avidemux/avidemux-2.4.4-r2.ebuild7
-rw-r--r--media-video/avidemux/metadata.xml2
3 files changed, 8 insertions, 7 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index c14e681a1206..3537f5fb36f7 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/avidemux
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.155 2009/09/30 18:44:08 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.156 2009/10/20 16:23:35 ssuominen Exp $
+
+ 20 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+ avidemux-2.4.4-r2.ebuild:
+ Remove amrnb support wrt #252140.
*avidemux-2.5.1_p5359 (30 Sep 2009)
diff --git a/media-video/avidemux/avidemux-2.4.4-r2.ebuild b/media-video/avidemux/avidemux-2.4.4-r2.ebuild
index a65277e29fb7..26aa3823b6cc 100644
--- a/media-video/avidemux/avidemux-2.4.4-r2.ebuild
+++ b/media-video/avidemux/avidemux-2.4.4-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.4-r2.ebuild,v 1.6 2009/09/30 14:40:11 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.4-r2.ebuild,v 1.7 2009/10/20 16:23:35 ssuominen Exp $
EAPI="2"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
KEYWORDS="amd64 ppc x86"
-IUSE="+aac +aften +alsa amrnb +dts esd jack libsamplerate +mp3 +truetype
+IUSE="+aac +aften +alsa +dts esd jack libsamplerate +mp3 +truetype
+vorbis +x264 +xv +xvid gtk +qt4"
RESTRICT="test"
@@ -27,7 +27,6 @@ RDEPEND="dev-libs/libxml2
media-libs/faad2 )
aften? ( media-libs/aften )
alsa? ( media-libs/alsa-lib )
- amrnb? ( media-libs/amrnb )
dts? ( media-libs/libdca )
mp3? ( media-sound/lame )
esd? ( media-sound/esound )
@@ -81,7 +80,7 @@ src_configure() {
use aac || mycmakeargs="${mycmakeargs} -DNO_FAAC=1"
use mp3 || mycmakeargs="${mycmakeargs} -DNO_Lame=1"
use xvid || mycmakeargs="${mycmakeargs} -DNO_Xvid=1"
- use amrnb || mycmakeargs="${mycmakeargs} -DNO_AMRNB=1"
+ mycmakeargs="${mycmakeargs} -DNO_AMRNB=1"
use dts || mycmakeargs="${mycmakeargs} -DNO_libdca=1"
use x264 || mycmakeargs="${mycmakeargs} -DNO_x264=1"
use aac || mycmakeargs="${mycmakeargs} -DNO_FAAD=1 -DNO_NeAAC=1"
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 544e57189f34..085e23139f86 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -10,7 +10,5 @@
<flag name='aften'>Enable A/52 (AC-3) audio encoder support</flag>
<flag name='amr'>Enable Adaptive Multi-Rate format support through
<pkg>media-libs/opencore-amr</pkg></flag>
- <flag name='amrnb'>Enables Adaptive Multi-Rate Audio support (Narrow Band)
- through <pkg>media-libs/amrnb</pkg></flag>
</use>
</pkgmetadata>