summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-04-18 21:34:47 +0000
committerTravis Tilley <lv@gentoo.org>2004-04-18 21:34:47 +0000
commit7b5674012e8e9592b9f7280b4e75bc925a0c7011 (patch)
tree45c688e71073f783c0198284714558f2e0024461 /media-libs
parentuse generic crontab access control (cron group) #37904 (diff)
downloadhistorical-7b5674012e8e9592b9f7280b4e75bc925a0c7011.tar.gz
historical-7b5674012e8e9592b9f7280b4e75bc925a0c7011.tar.bz2
historical-7b5674012e8e9592b9f7280b4e75bc925a0c7011.zip
added amd64-specific dependency needed to get xine-lib to compile
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/xine-lib/ChangeLog7
-rw-r--r--media-libs/xine-lib/Manifest4
-rw-r--r--media-libs/xine-lib/xine-lib-1_rc3-r3.ebuild5
3 files changed, 11 insertions, 5 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 3ea945419353..026c0733afd4 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/xine-lib
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.105 2004/04/18 04:03:19 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.106 2004/04/18 21:34:47 lv Exp $
+
+ 18 Apr 2004; Travis Tilley <lv@gentoo.org> xine-lib-1_rc3-r3.ebuild:
+ added an amd64-specific dependency on xfree 4.3.0-r6 or xorg-x11, as xine-lib
+ wont always compile properly using anything else. see bug 48261 for more
+ information
17 Apr 2004; Jason Wever <weeve@gentoo.org> xine-lib-1_rc3-r3.ebuild:
Stable on sparc wrt bug #48107.
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 031f4702642b..88d31a10c01d 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,10 +1,10 @@
-MD5 4383c2e4273a87a39cd8c8b8338d4699 ChangeLog 18662
+MD5 715c007e0651acfffb2e4a7edc0bee89 ChangeLog 18900
MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
MD5 74eefa329c52e465c889ab8d509843bc xine-lib-0.9.13-r3.ebuild 3461
MD5 2d8af992b607144689ef99e1482005cd xine-lib-1_rc2.ebuild 4038
MD5 13eec76b0a026a7a210c914bebb5bbd1 xine-lib-1_rc3-r1.ebuild 4126
MD5 911e8ac9be7bb59a1d410a07758bf3fd xine-lib-1_rc3-r2.ebuild 3952
-MD5 9b8b23c5a1f3fcba7d927fb433ce5079 xine-lib-1_rc3-r3.ebuild 3908
+MD5 7d589a33c21dcc03a842669778cd38bd xine-lib-1_rc3-r3.ebuild 3987
MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
MD5 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68
diff --git a/media-libs/xine-lib/xine-lib-1_rc3-r3.ebuild b/media-libs/xine-lib/xine-lib-1_rc3-r3.ebuild
index 672a34c1c856..80adb748d86a 100644
--- a/media-libs/xine-lib/xine-lib-1_rc3-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc3-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc3-r3.ebuild,v 1.5 2004/04/18 04:03:20 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc3-r3.ebuild,v 1.6 2004/04/18 21:34:47 lv Exp $
inherit eutils flag-o-matic gcc libtool
@@ -18,7 +18,8 @@ KEYWORDS="~x86 ~ppc -hppa sparc amd64 -ia64 alpha"
IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6"
RDEPEND="oggvorbis? ( media-libs/libvorbis )
- X? ( virtual/x11 )
+ !amd64? ( X? ( virtual/x11 ) )
+ amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) )
avi? ( x86? ( >=media-libs/win32codecs-0.50
media-libs/divx4linux ) )
esd? ( media-sound/esound )