summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2002-07-22 09:47:38 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2002-07-22 09:47:38 +0000
commitdf0544279788b40f453046298530eb61b33e92ad (patch)
treee53f248cd2e421862c40d6a50cd4be9a1d5bfec8 /media-libs
parentrepoman'd (diff)
downloadgentoo-2-df0544279788b40f453046298530eb61b33e92ad.tar.gz
gentoo-2-df0544279788b40f453046298530eb61b33e92ad.tar.bz2
gentoo-2-df0544279788b40f453046298530eb61b33e92ad.zip
Made ogg optional again, read comment in ebuild.
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/xine-lib/ChangeLog6
-rw-r--r--media-libs/xine-lib/xine-lib-0.9.12-r1.ebuild9
2 files changed, 10 insertions, 5 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 34b4c6647a3c..195aacd2c661 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,9 +1,13 @@
# ChangeLog for media-libs/xine-lib
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.13 2002/07/19 20:23:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.14 2002/07/22 09:47:38 aliz Exp $
*xine-lib-0.9.12-r1 (19 Jul 2002)
+ 22 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> xine-lib-0.9.12-r1 :
+
+ Made ogg support optional again, leaving it to autodetect works.
+
19 Jul 2002; Seemant Kulleen <seemant@gentoo.org>
xine-lib-0.9.12-r1.ebuild files/digest-xine-lib-0.9.12-r1 :
diff --git a/media-libs/xine-lib/xine-lib-0.9.12-r1.ebuild b/media-libs/xine-lib/xine-lib-0.9.12-r1.ebuild
index 048d54180bfd..59a5a52cb3d3 100644
--- a/media-libs/xine-lib/xine-lib-0.9.12-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.12-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 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-0.9.12-r1.ebuild,v 1.2 2002/07/20 04:12:05 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.12-r1.ebuild,v 1.3 2002/07/22 09:47:38 aliz Exp $
inherit libtool
@@ -13,7 +13,7 @@ SLOT="0"
LICENSE="GPL-2"
KEYWORDS="x86"
-DEPEND="media-libs/libvorbis
+DEPEND="oggvorbis? ( media-libs/libvorbis )
X? ( virtual/x11 )
avi? ( >=media-libs/win32codecs-0.50
media-libs/divx4linux )
@@ -69,8 +69,9 @@ src_compile() {
# the next release until then let it autodetect. See bug #2377.
# use aalib || myconf="${myconf} --disable-aalib --disable-aalibtest"
- # In this release, oggvorbis is required, not optional. upstream needs
- # to start getting consistent.
+ # Configure script is broken, even if you pass the flags below it still assumes
+ # ogg is installed and tries to compile it, giving you bug #5244. But leaving
+ # ogg for autodetection works.
#use oggvorbis \
# || myconf="${myconf} \
# --disable-ogg \