alsaplayer version bump and support for gcc3.1 (please test with other compilers)

4 files changed, 117 insertions, 1 deletions

diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index 18f56711cc91..9aae20dca1b2 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/alsaplayer
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.3 2002/05/04 13:35:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.4 2002/05/22 22:14:36 mkennedy Exp $
+
+*alsaplayer-0.99.70 (22 May 2002)
+
+  22 May 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  alsaplayer-0.99.70.ebuild, files/digest-alsaplayer-0.99.70,
+  files/alsaplayer-0.99.70-gcc3.1-gentoo.patch :
+
+  Version bump and patch to get it to compile against gcc3.1.
 
 *alsaplayer-0.99.60-r1 (4 May 2002)
 
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.70.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.70.ebuild
new file mode 100644
index 000000000000..d544e68ba18f
--- /dev/null
+++ b/media-sound/alsaplayer/alsaplayer-0.99.70.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Seemant Kulleen <seemant@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.70.ebuild,v 1.1 2002/05/22 22:14:36 mkennedy Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Media player primarily utilising ALSA"
+SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
+HOMEPAGE="http://www.alsa-project.org/"
+QTROOT="/usr/qt/3"
+
+DEPEND="alsa? ( >=media-libs/alsa-lib-0.5.10 )
+	qt? ( >=x11-libs/qt-3.0.1 )
+	esd? ( media-sound/esound )
+	gtk? ( x11-libs/gtk+ )
+	opengl? ( virtual/opengl )
+	oggvorbis? ( media-libs/libvorbis )
+	>=media-libs/libmikmod-3.1.10
+	>=dev-libs/glib-1.2.10"
+	
+RDEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# minor correction to some C++ code required for
+	# building. will be submitted upstream.
+	patch -p1 <${FILESDIR}/alsaplayer-0.99.70-gcc3.1-gentoo.patch
+}
+
+src_compile() {
+
+	local myconf
+
+	use oggvorbis \
+		&& myconf="--enable-oggvorbis" \
+		|| myconf="--disable-oggvorbis --disable-oggtest --disable-vorbistest"
+
+	use oss \
+		&& myconf="${myconf} --enable-oss" \
+		|| myconf="${myconf} --disable-oss"
+
+	use esd \
+		&& myconf="${myconf} --enable-esd" \
+		|| myconf="${myconf} --disable-esd --disable-esdtest"
+
+	use nas \
+		&& myconf="${myconf} --enable-nas" \
+		|| myconf="${myconf} --disable-nas"
+
+	use opengl \
+		&& myconf="${myconf} --enable-opengl" \
+		|| myconf="${myconf} --disable-opengl"
+
+	use gtk \
+		&& myconf="${myconf} --enable-gtk" \
+		|| myconf="${myconf} --disable-gtk --disable-gtktest --disable-glibtest"
+
+	use qt \
+		&& myconf="${myconf} --enable-qt \
+				--with-qt-libdir=${QTROOT}/lib \
+				--with-qt-indir=${QTROOT}/include \
+				--with-qt-bindir=${QTROOT}/bin"
+
+	use nls \
+		&& myconf="${myconf} --enable-nls" \
+		|| myconf="${myconf} --disable-nls"
+
+	econf \
+		--disable-sgi \
+		--disable-sparc \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+
+	make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		install || die
+
+	dodoc AUTHORS COPYING ChangeLog README TODO
+	dodoc docs/sockmon.txt docs/wishlist.txt
+}
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.70-gcc3.1-gentoo.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.70-gcc3.1-gentoo.patch
new file mode 100644
index 000000000000..5d541b8cb862
--- /dev/null
+++ b/media-sound/alsaplayer/files/alsaplayer-0.99.70-gcc3.1-gentoo.patch
@@ -0,0 +1,20 @@
+--- alsaplayer-0.99.70.original/interface/gtk/PlaylistWindow.cpp	Mon May 13 08:31:56 2002
++++ alsaplayer-0.99.70/interface/gtk/PlaylistWindow.cpp	Wed May 22 16:37:52 2002
+@@ -149,7 +149,7 @@
+ 	gtk_clist_freeze(GTK_CLIST(gtkpl->playlist_list));
+ 	if (item.title.size()) {
+ 		sprintf(tmp, "%s %s", item.title.c_str(),
+-			item.artist.size() ? (string("- ") + item.artist).c_str() : "");
++			item.artist.size() ? (std::string("- ") + item.artist).c_str() : "");
+ 		gtk_clist_set_text(GTK_CLIST(gtkpl->playlist_list), position,
+ 				1, g_strdup(tmp));
+ 	}
+@@ -438,7 +438,7 @@
+ 			filename = (gchar *)g_strdup(new_path);
+ 	if (item->title.size()) {
+ 		sprintf(pt, "%s %s", item->title.c_str(), 
+-			item->artist.size() ? (string("- ") + item->artist).c_str() :
++			item->artist.size() ? (std::string("- ") + item->artist).c_str() :
+ 				"");
+ 	} else {
+ 		sprintf(pt, "%s", filename);
diff --git a/media-sound/alsaplayer/files/digest-alsaplayer-0.99.70 b/media-sound/alsaplayer/files/digest-alsaplayer-0.99.70
new file mode 100644
index 000000000000..471119478288
--- /dev/null
+++ b/media-sound/alsaplayer/files/digest-alsaplayer-0.99.70
@@ -0,0 +1 @@
+MD5 c799f85e9009b17535c16deb3247a506 alsaplayer-0.99.70.tar.bz2 506686