summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-03-12 15:10:23 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-03-12 15:10:23 +0000
commitebe8cb3ac60b6cf0cb238405398ce0da0fc641d6 (patch)
treea739fe4738e168d501d8d8b3cd23549c1a2cc936 /media-sound
parentapplied a cleanup patch which was suggested by Diego Pettenò <dgp85@users.so... (diff)
downloadhistorical-ebe8cb3ac60b6cf0cb238405398ce0da0fc641d6.tar.gz
historical-ebe8cb3ac60b6cf0cb238405398ce0da0fc641d6.tar.bz2
historical-ebe8cb3ac60b6cf0cb238405398ce0da0fc641d6.zip
sorry, commited wrong ebuild
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/alsaplayer/Manifest8
-rw-r--r--media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild17
2 files changed, 15 insertions, 10 deletions
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index fb988a12b619..5da4f5e570c2 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 c8a8374f76b1e15270d8e67ca4bbbd5d alsaplayer-0.99.76-r1.ebuild 1993
+MD5 86c341e83cb83feea8e9e5442804a700 alsaplayer-0.99.76-r1.ebuild 2129
MD5 d41e2deaa8aef46712f1ede969a217d4 alsaplayer-0.99.75-r1.ebuild 2285
MD5 fecbec475efa4c387b612ac2a311e2b1 ChangeLog 5422
MD5 3be4f6e757e3057184136a002b0165f9 metadata.xml 221
@@ -14,7 +14,7 @@ MD5 5c35a3140250067b9e24fea110bde6c4 files/gcc.patch 805
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
-iD8DBQFCMwQI06ebR+OMO78RAqUQAKCMlXIdKLlKFWSP8v1fxFCrOTMofACfVqrh
-6gYtwCl9YbMddE29QPXru7o=
-=fIIn
+iD8DBQFCMwZl06ebR+OMO78RAvzHAJsGpQfB7I4D3lOhIbSC9FJXzgeF3ACdE4qs
+zTGJoFpfCfU9SgVl5G6Knuc=
+=MCym
-----END PGP SIGNATURE-----
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild
index d1d1a05b8b8a..c9f55a8c11e1 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild,v 1.1 2005/03/12 15:00:11 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild,v 1.2 2005/03/12 15:10:23 luckyduck Exp $
inherit eutils
-IUSE="nas nls esd opengl doc oss gtk oggvorbis alsa jack mikmod flac"
+IUSE="nas nls esd opengl doc oss gtk ogg oggvorbis alsa jack mikmod flac xosd"
DESCRIPTION="Media player primarily utilising ALSA"
HOMEPAGE="http://www.alsaplayer.org/"
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-1.2.10
flac? ( media-libs/flac )
mikmod? ( >=media-libs/libmikmod-3.1.10 )
opengl? ( virtual/opengl )
- vorbis? ( media-libs/libvorbis )
+ oggvorbis? ( media-libs/libvorbis )
ogg? ( media-libs/libogg )
xosd? ( x11-libs/xosd )"
@@ -41,14 +41,19 @@ src_unpack() {
}
src_compile() {
+ export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include"
+
use xosd ||
export ac_cv_lib_xosd_xosd_create="no"
use doc ||
export ac_cv_prog_HAVE_DOXYGEN="false"
- if ! use ogg && use vorbis; then
- die "To enable vorbis you must enable also ogg."
+ if ! use ogg && use oggvorbis; then
+ ewarn
+ ewarn "To enable oggvorbis you must enable also ogg."
+ ewarn
+ die "To enable oggvorbis you must enable also ogg."
fi
if use ogg && use flac; then
@@ -61,7 +66,7 @@ src_compile() {
$(use_enable opengl) \
$(use_enable nls) \
$(use_enable sparc) \
- $(use_enable vorbis oggvorbis) \
+ $(use_enable oggvorbis) \
$(use_enable esd) \
$(use_enable gtk) \
$(use_enable jack) \