Patched for gcc-3.3. Closes #29553.

4 files changed, 111 insertions, 2 deletions

diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index 01c9877d6cd8..811c7118f753 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,10 +1,11 @@
-MD5 19cbb87a9ecb610ab3f3910341dcf563 ChangeLog 3247
+MD5 4f5c1e1f8f06134d3ae65725ccf431c1 ChangeLog 3406
 MD5 b5f1f8efbab5811fb35b109dec558407 alsaplayer-0.99.71.20020607.ebuild 1886
 MD5 80cfbf249cd8b38ba5afa5858e7b1a1e alsaplayer-0.99.72.ebuild 1970
 MD5 6e31333fd255bcd77a47b116741836b7 alsaplayer-0.99.73.ebuild 1927
 MD5 1947c78e7559cb789051591895b60fc3 alsaplayer-0.99.74.ebuild 2046
 MD5 e0889db43deb7ce522293c9457725172 alsaplayer-0.99.75.ebuild 2046
-MD5 e0889db43deb7ce522293c9457725172 alsaplayer-0.99.75-r1.ebuild 2046
+MD5 0addcbd9c9d1babdb3cd5a6287b4d756 alsaplayer-0.99.75-r1.ebuild 2075
+MD5 5c35a3140250067b9e24fea110bde6c4 files/gcc.patch 805
 MD5 c3bda0979e54037156c5184b6110db98 files/alsaplayer-0.99.70-gcc3.1-gentoo.patch 880
 MD5 e957f44dcc4c868c6ad49ebf0e44c5ba files/digest-alsaplayer-0.99.71.20020607 80
 MD5 8935db340128115835e9cef670f73a12 files/digest-alsaplayer-0.99.72 71
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild
new file mode 100644
index 000000000000..ce88a7024d54
--- /dev/null
+++ b/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild,v 1.1 2003/09/26 07:08:36 jje Exp $
+
+IUSE="nas nls esd opengl doc oss gtk oggvorbis alsa"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Media player primarily utilising ALSA"
+SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
+HOMEPAGE="http://www.alsaplayer.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc"
+
+DEPEND="alsa? ( media-libs/alsa-lib )
+	doc? ( app-doc/doxygen )
+	esd? ( media-sound/esound )
+	gtk? ( x11-libs/gtk+ )
+	nas? ( media-libs/nas )
+	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_compile() {
+	epatch ${FILESDIR}/gcc.patch
+
+	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 nls \
+		&& myconf="${myconf} --enable-nls" \
+		|| myconf="${myconf} --disable-nls"
+
+	use sparc \
+		&& myconf="${myconf} --enable-sparc" \
+		|| myconf="${myconf} --disable-sparc"
+
+	export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include"
+
+	econf \
+		--disable-sgi \
+		${myconf}
+
+#	./configure --enable-gtk --libdir=/usr/lib/alsaplayer
+
+	emake || die
+}
+
+src_install() {
+
+	make DESTDIR=${D} docdir=${D}/usr/share/doc/${PF} install
+
+#	einstall \
+#		docdir=${D}/usr/share/doc/${P}
+
+	dodoc AUTHORS COPYING ChangeLog README TODO DONATION*
+	dodoc docs/sockmon.txt docs/wishlist.txt
+}
diff --git a/media-sound/alsaplayer/files/digest-alsaplayer-0.99.75-r1 b/media-sound/alsaplayer/files/digest-alsaplayer-0.99.75-r1
new file mode 100644
index 000000000000..ffc5e6840824
--- /dev/null
+++ b/media-sound/alsaplayer/files/digest-alsaplayer-0.99.75-r1
@@ -0,0 +1 @@
+MD5 353b57058e05aa5f0c01f93fc049c650 alsaplayer-0.99.75.tar.bz2 635893
diff --git a/media-sound/alsaplayer/files/gcc.patch b/media-sound/alsaplayer/files/gcc.patch
new file mode 100644
index 000000000000..0d26bcc656b1
--- /dev/null
+++ b/media-sound/alsaplayer/files/gcc.patch
@@ -0,0 +1,22 @@
+diff -ruN interface/gtk/PlaylistWindow.cpp interface.new/gtk/PlaylistWindow.cpp
+--- interface/gtk/PlaylistWindow.cpp	2003-09-26 16:00:26.000000000 +0900
++++ interface.new/gtk/PlaylistWindow.cpp	2003-09-26 16:02:12.000000000 +0900
+@@ -22,6 +22,7 @@
+ #include <unistd.h>
+ #include <pthread.h>
+ #include <sys/stat.h>
++#include <assert.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtkdnd.h>
+diff -ruN interface/gtk/gtk_interface.cpp interface.new/gtk/gtk_interface.cpp
+--- interface/gtk/gtk_interface.cpp	2003-09-26 16:00:35.000000000 +0900
++++ interface.new/gtk/gtk_interface.cpp	2003-09-26 16:02:04.000000000 +0900
+@@ -22,6 +22,7 @@
+ #include "alsaplayer_error.h"
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <assert.h>
+ //#define NEW_SCALE
+ //#define SUBSECOND_DISPLAY 
+