diff options
| -rw-r--r-- | media-video/avidemux/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/avidemux/Manifest | 12 | ||||
| -rw-r--r-- | media-video/avidemux/avidemux-2.0.42-r1.ebuild | 30 | ||||
| -rw-r--r-- | media-video/avidemux/avidemux-2.1_pre1.ebuild | 16 |
4 files changed, 44 insertions, 20 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog index af030db56310..84846fea32fd 100644 --- a/media-video/avidemux/ChangeLog +++ b/media-video/avidemux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/avidemux # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.93 2005/11/04 10:39:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.94 2005/12/19 14:45:42 flameeyes Exp $ + + 19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> + avidemux-2.0.42-r1.ebuild, avidemux-2.1_pre1.ebuild: + Fix dependencies for modular x. 04 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.1_pre1.ebuild: diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest index 44f205afba14..2d6f2890c2ff 100644 --- a/media-video/avidemux/Manifest +++ b/media-video/avidemux/Manifest @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 a334cfca0dcd72127516891408c711a5 ChangeLog 17574 +MD5 37822585bbe67a43f2c8fd12e15eb6b6 ChangeLog 17717 MD5 ee5806b95c2dcfc5b397bcf7b64fc053 avidemux-2.0.24.ebuild 2486 -MD5 d573443c44494270349c77440f8b3435 avidemux-2.0.42-r1.ebuild 2851 -MD5 0c90a24580fdf60989581fbb1f95bfc3 avidemux-2.1_pre1.ebuild 2966 +MD5 1b639c8a504a44cf03a129f79e89afe5 avidemux-2.0.42-r1.ebuild 3041 +MD5 1d26b87f2ac7e2f96aa7805b7ee904e4 avidemux-2.1_pre1.ebuild 3150 MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68 MD5 0d0a90c34a5456ea2cad99a4bab62b50 files/digest-avidemux-2.0.42-r1 139 MD5 829b17a9790d79f257614bfcd384f049 files/digest-avidemux-2.1_pre1 142 @@ -12,7 +12,7 @@ MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDazqIj5H05b2HAEkRAgW4AKCLpXmp94UXQ3p6dI9k8JtED9ooYgCfXpCr -2apkGeu+IF+Wt0k9rpcnS+s= -=Uffb +iD8DBQFDpserAiZjviIA2XgRAh3TAKDGsc6V5ai44b5BIs5BtexoS2sHNwCdFrpZ +NiJW3FzYRpprt11vGqYcCnE= +=G4qP -----END PGP SIGNATURE----- diff --git a/media-video/avidemux/avidemux-2.0.42-r1.ebuild b/media-video/avidemux/avidemux-2.0.42-r1.ebuild index b7c74056b050..c0d24e5043bf 100644 --- a/media-video/avidemux/avidemux-2.0.42-r1.ebuild +++ b/media-video/avidemux/avidemux-2.0.42-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.42-r1.ebuild,v 1.1 2005/09/03 10:21:21 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.42-r1.ebuild,v 1.2 2005/12/19 14:45:42 flameeyes Exp $ inherit eutils flag-o-matic fixheadtails @@ -17,8 +17,7 @@ SLOT="2" KEYWORDS="~amd64 ~ppc ~x86" IUSE="a52 aac alsa altivec arts encode mad nls vorbis sdl truetype xvid xv oss" -RDEPEND="xv? ( virtual/x11 ) - a52? ( >=media-libs/a52dec-0.7.4 ) +RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 ) encode? ( >=media-sound/lame-3.93 ) >=dev-libs/libxml2-2.6.7 >=x11-libs/gtk+-2.4.1 @@ -31,25 +30,36 @@ RDEPEND="xv? ( virtual/x11 ) arts? ( >=kde-base/arts-1.2.3 ) truetype? ( >=media-libs/freetype-2.1.5 ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 ) - sdl? ( media-libs/libsdl )" + sdl? ( media-libs/libsdl ) + || ( ( + xv? ( x11-libs/libXv ) + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + ) virtual/x11 )" # media-sound/toolame is supported as well -DEPEND="$RDEPEND +DEPEND="${RDEPEND} + || ( ( + x11-base/xorg-server + x11-libs/libXt + x11-proto/xextproto + ) virtual/x11 ) dev-util/pkgconfig >=sys-devel/autoconf-2.58 >=sys-devel/automake-1.8.3" -filter-flags "-fno-default-inline" -filter-flags "-funroll-loops" -filter-flags "-funroll-all-loops" -filter-flags "-fforce-addr" - S=${WORKDIR}/${MY_P} pkg_setup() { if ! ( use oss || use arts || use alsa ); then die "You must select at least one between oss, arts and alsa audio output." fi + + filter-flags "-fno-default-inline" + filter-flags "-funroll-loops" + filter-flags "-funroll-all-loops" + filter-flags "-fforce-addr" } src_unpack() { diff --git a/media-video/avidemux/avidemux-2.1_pre1.ebuild b/media-video/avidemux/avidemux-2.1_pre1.ebuild index 2aaf4fc66e3a..1a36d6f19ab4 100644 --- a/media-video/avidemux/avidemux-2.1_pre1.ebuild +++ b/media-video/avidemux/avidemux-2.1_pre1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.1_pre1.ebuild,v 1.2 2005/11/04 10:39:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.1_pre1.ebuild,v 1.3 2005/12/19 14:45:42 flameeyes Exp $ inherit eutils flag-o-matic fixheadtails @@ -21,7 +21,6 @@ RDEPEND=" >=x11-libs/gtk+-2.6 >=dev-libs/libxml2-2.6.7 >=dev-lang/spidermonkey-1.5_rc6-r1 - xv? ( virtual/x11 ) a52? ( >=media-libs/a52dec-0.7.4 ) encode? ( >=media-sound/lame-3.93 ) aac? ( >=media-libs/faac-1.23.5 @@ -33,10 +32,21 @@ RDEPEND=" arts? ( >=kde-base/arts-1.2.3 ) truetype? ( >=media-libs/freetype-2.1.5 ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 ) - sdl? ( media-libs/libsdl )" + sdl? ( media-libs/libsdl ) + || ( ( + xv? ( x11-libs/libXv ) + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + ) virtual/x11 )" # media-sound/toolame is supported as well DEPEND="$RDEPEND + || ( ( + x11-base/xorg-server + x11-libs/libXt + x11-proto/xextproto + ) virtual/x11 ) dev-util/pkgconfig >=sys-devel/autoconf-2.58 >=sys-devel/automake-1.8.3" |