summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris White <chriswhite@gentoo.org>2005-02-07 21:10:03 +0000
committerChris White <chriswhite@gentoo.org>2005-02-07 21:10:03 +0000
commitf097622d40ca500d1754c8763a4f7c04381d0d4c (patch)
tree2a761721730f8824108eba94055364735c417489 /media-libs/xine-lib
parentStable on alpha. (diff)
downloadhistorical-f097622d40ca500d1754c8763a4f7c04381d0d4c.tar.gz
historical-f097622d40ca500d1754c8763a4f7c04381d0d4c.tar.bz2
historical-f097622d40ca500d1754c8763a4f7c04381d0d4c.zip
Fixed bug #76090 (aalib and libcaca hard links).
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'media-libs/xine-lib')
-rw-r--r--media-libs/xine-lib/ChangeLog5
-rw-r--r--media-libs/xine-lib/Manifest10
-rw-r--r--media-libs/xine-lib/xine-lib-1.0.ebuild13
3 files changed, 18 insertions, 10 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 06dfcb7195fe..5d7aae85033e 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/xine-lib
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.192 2005/02/07 18:21:57 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.193 2005/02/07 21:10:03 chriswhite Exp $
+
+ 08 Feb 2005; Chris White <chriswhite@gentoo.org> xine-lib-1.0.ebuild:
+ Fixed bug #76090 (aalib and libcaca hard links).
08 Feb 2005; Chris White <chriswhite@gentoo.org> xine-lib-1.0.ebuild,
xine-lib-1_rc6-r1.ebuild, xine-lib-1_rc8-r1.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 04aff77891d8..7b6f48c18c4b 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,9 +1,9 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 e5b0eef1ee0e2514c7f2976ee726498c ChangeLog 1658
+MD5 1c4b140f68eaf32aa13dddf5903b335e ChangeLog 1782
MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
-MD5 ed1625e21a9d8bf9c817d7ad4244defd xine-lib-1.0.ebuild 8054
+MD5 7c2ccf6d65c16e4e8fd2a4f49fde24ca xine-lib-1.0.ebuild 8234
MD5 fdda012c05b9d0425c290ba149c6e3e8 xine-lib-1_rc6-r1.ebuild 5699
MD5 a8a49d7711a38b747c792b3979815f4c xine-lib-1_rc8-r1.ebuild 5731
MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
@@ -43,7 +43,7 @@ MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
-iD8DBQFCB7HdFdQwWVoAgN4RAlxMAKDsCT4RJc8AQkvIRYEIXWtixMMsLQCeJn5h
-O/+/kwnxmFb1qfVTSTikHwU=
-=ghdB
+iD8DBQFCB9lCFdQwWVoAgN4RAubbAKC5WYapzqme9c7+PX10L2a8Z7sm3QCfeN4p
+vdI2irw2RMuHzDlFEZFrQ+g=
+=rc4A
-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.0.ebuild b/media-libs/xine-lib/xine-lib-1.0.ebuild
index 1121a2f670f4..4a9cc6640393 100644
--- a/media-libs/xine-lib/xine-lib-1.0.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.0.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-libs/xine-lib/xine-lib-1.0.ebuild,v 1.16 2005/02/07 18:21:57 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.ebuild,v 1.17 2005/02/07 21:10:03 chriswhite Exp $
inherit eutils flag-o-matic gcc libtool
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="1"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="arts esd avi nls dvd X directfb oggvorbis alsa gnome sdl speex
+IUSE="aalib libcaca arts esd avi nls dvd X directfb oggvorbis alsa gnome sdl speex
theora ipv6 altivec opengl aac fbcon xv xvmc nvidia i8x0 samba dxr3 vidix png mng"
RESTRICT="nostrip"
@@ -27,7 +27,7 @@ RDEPEND="oggvorbis? ( media-libs/libvorbis )
dvd? ( >=media-libs/libdvdcss-1.2.7 )
arts? ( kde-base/arts )
alsa? ( media-libs/alsa-lib )
- media-libs/aalib
+ aalib? ( media-libs/aalib )
directfb? ( >=dev-libs/DirectFB-0.9.9 dev-util/pkgconfig )
gnome? ( >=gnome-base/gnome-vfs-2.0
dev-util/pkgconfig )
@@ -36,7 +36,7 @@ RDEPEND="oggvorbis? ( media-libs/libvorbis )
>=media-libs/libfame-0.9.0
theora? ( media-libs/libtheora )
speex? ( media-libs/speex )
- media-libs/libcaca
+ libcaca? ( media-libs/libcaca )
samba? ( net-fs/samba )
png? ( media-libs/libpng )
mng? ( media-libs/libmng )"
@@ -155,6 +155,11 @@ src_compile() {
# These use-flags hasn't a configure option, so we must export these by hand
use !sdl && export ac_cv_path_SDL_CONFIG=no
+ use !libcaca && export ac_cv_path_CACA_CONFIG=no
+ if use !aalib ; then
+ export ac_cv_path_AALIB_CONFIG=no
+ export ac_cv_path_AAINFO=no
+ fi
use !samba && export ac_cv_lib_smbclient_smbc_init=no
use !png && export ac_cv_lib_png_png_create_read_struct=no
use !mng && export ac_cv_header_libmng_h=no