summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-12-13 16:40:19 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-12-13 16:40:19 +0000
commitcdb37193f6367fb02127230baf39abb94968988e (patch)
tree3c6600ad561ad3b095d62170a335a67138cca9ae /media-video/avifile
parentStable on ppc64; bug #114710 (diff)
downloadgentoo-2-cdb37193f6367fb02127230baf39abb94968988e.tar.gz
gentoo-2-cdb37193f6367fb02127230baf39abb94968988e.tar.bz2
gentoo-2-cdb37193f6367fb02127230baf39abb94968988e.zip
Add modular X dependencies. Also add use_enable for xinerama, since it's in IUSE and there was no mention of its removal in the ChangeLog.
(Portage version: 2.0.53)
Diffstat (limited to 'media-video/avifile')
-rw-r--r--media-video/avifile/ChangeLog7
-rw-r--r--media-video/avifile/avifile-0.7.43.20050224-r2.ebuild26
2 files changed, 29 insertions, 4 deletions
diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 5d9c28433375..5462fd494696 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/avifile
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.115 2005/10/24 09:22:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.116 2005/12/13 16:40:19 spyderous Exp $
+
+ 13 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ avifile-0.7.43.20050224-r2.ebuild:
+ Add modular X dependencies. Also add use_enable for xinerama, since it's in
+ IUSE and there was no mention of its removal in the ChangeLog.
24 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
avifile-0.7.38.20030710-r1.ebuild, avifile-0.7.41.20041001-r1.ebuild,
diff --git a/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
index 0bce3a913b07..cdbca45b15ce 100644
--- a/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
+++ b/media-video/avifile/avifile-0.7.43.20050224-r2.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/avifile/avifile-0.7.43.20050224-r2.ebuild,v 1.6 2005/10/24 09:22:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild,v 1.7 2005/12/13 16:40:19 spyderous Exp $
inherit eutils flag-o-matic qt3
@@ -32,14 +32,33 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
qt? ( $(qt_min_version 3.1) )
sdl? ( >=media-libs/libsdl-1.2.2 )
truetype? ( >=media-libs/freetype-2.1 )
- xv? ( virtual/x11 )
+ xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
+ xv? ( || ( x11-libs/libXv virtual/x11 ) )
xvid? ( =media-libs/xvid-1* )
- X? ( virtual/x11 virtual/xft )
+ X? ( || ( ( x11-libs/libXi
+ x11-libs/libXxf86dga
+ x11-libs/libXxf86vm
+ x11-libs/libXrender
+ )
+ virtual/x11
+ )
+ virtual/xft
+ )
zlib? ( >=sys-libs/zlib-1.1.3 )
>=media-video/ffmpeg-0.4.9_p20050226-r2
>=media-libs/jpeg-6b"
DEPEND="${RDEPEND}
+ xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+ xv? ( || ( x11-proto/videoproto virtual/x11 ) )
+ X? ( || ( ( x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86dgaproto
+ x11-proto/xf86vidmodeproto
+ )
+ virtual/x11
+ )
+ )
>=sys-devel/autoconf-2.59
>=sys-devel/automake-1.4_p6
sys-devel/libtool"
@@ -137,6 +156,7 @@ src_compile() {
$(use_enable vidix) \
$(use_with X x) $(use_enable X xft) \
$(use_enable xv) \
+ $(use_enable xinerama) \
$(use_enable xvid xvid4) --disable-xvid \
$(use_enable zlib libz) \
${myconf} \