diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2002-03-28 23:06:39 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2002-03-28 23:06:39 +0000 |
| commit | a7fbea7b9d685fba4d3c87251b2ad552f35eb55b (patch) | |
| tree | 58da1aaf06ab183025341fb024efe672e29f2ff0 /media-sound/xmms | |
| parent | oggvorbis is the new USE flag (diff) | |
| download | gentoo-2-a7fbea7b9d685fba4d3c87251b2ad552f35eb55b.tar.gz gentoo-2-a7fbea7b9d685fba4d3c87251b2ad552f35eb55b.tar.bz2 gentoo-2-a7fbea7b9d685fba4d3c87251b2ad552f35eb55b.zip | |
ogg and vorbis USE flags are now one oggvorbis USE flag.
Diffstat (limited to 'media-sound/xmms')
| -rw-r--r-- | media-sound/xmms/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/xmms/xmms-1.2.7-r3.ebuild | 16 | ||||
| -rw-r--r-- | media-sound/xmms/xmms-1.2.7-r4.ebuild | 18 |
3 files changed, 17 insertions, 25 deletions
diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog index 85d8060a552c..15d30c1bad35 100644 --- a/media-sound/xmms/ChangeLog +++ b/media-sound/xmms/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/xmms # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.7 2002/03/28 12:00:45 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.8 2002/03/28 23:03:44 seemant Exp $ + +*xmms-1.2.7-r{3,4} (28 Mar 2002) + + 28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r{3,4}.ebuild : + ogg and vorbis USE flags have been combined to form the oggvorbis flag. + Kinda like Voltron. *xmms-1.2.7-r4 (28 Mar 2002) diff --git a/media-sound/xmms/xmms-1.2.7-r3.ebuild b/media-sound/xmms/xmms-1.2.7-r3.ebuild index 5bf23ff5a6c8..9a231cffe8ec 100644 --- a/media-sound/xmms/xmms-1.2.7-r3.ebuild +++ b/media-sound/xmms/xmms-1.2.7-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Maintainer: Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r3.ebuild,v 1.1 2002/03/27 22:05:48 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r3.ebuild,v 1.2 2002/03/28 23:03:44 seemant Exp $ S=${WORKDIR}/${P} DESCRIPTION="X MultiMedia System" @@ -12,7 +12,7 @@ RDEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 ) >=dev-libs/libxml-1.8.15 >=media-libs/libmikmod-3.1.9 esd? ( >=media-sound/esound-0.2.22 ) - vorbis? ( >=media-libs/libvorbis-1.0_beta4 ) + oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 ) opengl? ( virtual/opengl ) avi? ( >=media-video/avifile-0.6 ) >=x11-libs/gtk+-1.2.10-r4" @@ -63,16 +63,10 @@ src_compile() { myopts="${myopts} --disable-opengl" fi - if [ "`use ogg`" ] ; then - myopts="${myopts} --with-ogg" + if [ "`use oggvorbis`" ] ; then + myopts="${myopts} --with-ogg --with-vorbis" else - myopts="${myopts} --disable-ogg-test" - fi - - if [ "`use vorbis`" ] ; then - myopts="${myopts} --with-vorbis" - else - myopts="${myopts} --disable-vorbis-test" + myopts="${myopts} --disable-ogg-test --disable-vorbis-test" fi if [ ! "`use nls`" ] ; then diff --git a/media-sound/xmms/xmms-1.2.7-r4.ebuild b/media-sound/xmms/xmms-1.2.7-r4.ebuild index cf080c8b3942..d0db3b967ff4 100644 --- a/media-sound/xmms/xmms-1.2.7-r4.ebuild +++ b/media-sound/xmms/xmms-1.2.7-r4.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Maintainer: Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r4.ebuild,v 1.1 2002/03/28 12:00:45 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r4.ebuild,v 1.2 2002/03/28 23:03:44 seemant Exp $ S=${WORKDIR}/${P} DESCRIPTION="X MultiMedia System" @@ -12,7 +12,7 @@ RDEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 ) >=dev-libs/libxml-1.8.15 >=media-libs/libmikmod-3.1.9 esd? ( >=media-sound/esound-0.2.22 ) - vorbis? ( >=media-libs/libvorbis-1.0_beta4 ) + oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 ) opengl? ( virtual/opengl ) avi? ( >=media-video/avifile-0.6 ) >=x11-libs/gtk+-1.2.10-r4" @@ -24,8 +24,6 @@ src_unpack() { unpack ${P}.tar.gz cd ${S} -# cp configure configure.orig -# sed -e "s:-m486::" configure.orig > configure if [ "`use avi`" ] then @@ -63,16 +61,10 @@ src_compile() { myopts="${myopts} --disable-opengl" fi - if [ "`use ogg`" ] ; then - myopts="${myopts} --with-ogg" + if [ "`use oggvorbis`" ] ; then + myopts="${myopts} --with-ogg --with-vorbis" else - myopts="${myopts} --disable-ogg-test" - fi - - if [ "`use vorbis`" ] ; then - myopts="${myopts} --with-vorbis" - else - myopts="${myopts} --disable-vorbis-test" + myopts="${myopts} --disable-ogg-test --disable-vorbis-test" fi if [ ! "`use nls`" ] ; then |