gcc-3.4 fixes submitted by Matthew Kennedy <mkennedy@gentoo.org> in bug #55352. Removed old version. -amd64.

6 files changed, 30 insertions, 90 deletions

diff --git a/media-sound/beep-media-player/ChangeLog b/media-sound/beep-media-player/ChangeLog
index c5f82789d5cf..7b431908efd6 100644
--- a/media-sound/beep-media-player/ChangeLog
+++ b/media-sound/beep-media-player/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/beep-media-player
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.8 2004/06/24 23:52:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.9 2004/07/07 21:51:11 eradicator Exp $
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/beep-media-player-0.9.6.1-gcc34.patch:
+  gcc-3.4 fixes submitted by Matthew Kennedy <mkennedy@gentoo.org> in bug
+  #55352. Removed old version.  -amd64
 
   29 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
   beep-media-player-0.9.6.1-r1.ebuild:
diff --git a/media-sound/beep-media-player/Manifest b/media-sound/beep-media-player/Manifest
index 6e5bc51b06f9..d18857e3029f 100644
--- a/media-sound/beep-media-player/Manifest
+++ b/media-sound/beep-media-player/Manifest
@@ -1,7 +1,6 @@
-MD5 9a457a47078f3dfbd6c4d2968d9636ca beep-media-player-1.0.0_pre5-r1.ebuild 2080
-MD5 67ba90508905da7a909295585640508f beep-media-player-0.9.6.1-r1.ebuild 2230
-MD5 81fd0c8ed5decc99e2275b509f0244a4 ChangeLog 1840
+MD5 d811a5463ce0f1b7aeb83b590d82413e ChangeLog 2061
+MD5 8a374f72791674dc80b4dee42e2295b4 beep-media-player-0.9.6.1-r1.ebuild 2350
 MD5 2b0e9087ef8939ab0578160c97b115e0 metadata.xml 215
 MD5 49ac6fbcf87a9de0e4fb7f349c53805c files/beep-media-player.desktop 281
-MD5 3c076f9d2b4d924ac325af974986ed77 files/digest-beep-media-player-1.0.0_pre5-r1 81
 MD5 063233d8fba29761b83b023b6a367489 files/digest-beep-media-player-0.9.6.1-r1 64
+MD5 e80bc03ebda5e6071f584a50638e9630 files/beep-media-player-0.9.6.1-gcc34.patch 552
diff --git a/media-sound/beep-media-player/beep-media-player-0.9.6.1-r1.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.6.1-r1.ebuild
index 89b9c7063581..87fa85e29fd7 100644
--- a/media-sound/beep-media-player/beep-media-player-0.9.6.1-r1.ebuild
+++ b/media-sound/beep-media-player/beep-media-player-0.9.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/beep-media-player-0.9.6.1-r1.ebuild,v 1.4 2004/06/24 23:52:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/beep-media-player-0.9.6.1-r1.ebuild,v 1.5 2004/07/07 21:51:11 eradicator Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,7 +13,8 @@ SRC_URI="mirror://sourceforge/beepmp/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~amd64"
+#-amd64: 0.9.6.1-r1: Segfault on startup
+KEYWORDS="x86 ~sparc -amd64"
 IUSE="nls esd gnome opengl oggvorbis mikmod alsa"
 
 RDEPEND="app-arch/unzip
@@ -30,6 +31,12 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
 src_compile() {
 	local myconf=""
 
diff --git a/media-sound/beep-media-player/beep-media-player-1.0.0_pre5-r1.ebuild b/media-sound/beep-media-player/beep-media-player-1.0.0_pre5-r1.ebuild
deleted file mode 100644
index 8a089b49b560..000000000000
--- a/media-sound/beep-media-player/beep-media-player-1.0.0_pre5-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/beep-media-player-1.0.0_pre5-r1.ebuild,v 1.5 2004/06/24 23:52:36 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Beep Media Player"
-HOMEPAGE="http://beepmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/beepmp/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-x86 -sparc"
-IUSE="nls esd gnome opengl oggvorbis mikmod"
-
-RDEPEND="app-arch/unzip
-	>=x11-libs/gtk+-2.2
-	>=x11-libs/pango-1.2
-	>=dev-libs/libxml-1.8.15
-	mikmod? ( >=media-libs/libmikmod-3.1.10 )
-	esd? ( >=media-sound/esound-0.2.29 )
-	opengl? ( virtual/opengl )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )"
-
-S=${WORKDIR}/${P/_/-}
-
-src_compile() {
-	local myconf=""
-
-	econf \
-		--with-dev-dsp=/dev/sound/dsp \
-		--with-dev-mixer=/dev/sound/mixer \
-		`use_enable oggvorbis vorbis` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable esd` \
-		`use_enable esd esdtest` \
-		`use_enable mikmod` \
-		`use_enable mikmod mikmodtest` \
-		`use_with mikmod libmikmod` \
-		`use_enable opengl` \
-		`use_enable nls` \
-		${myconf} \
-		|| die
-
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-
-	insinto /usr/share/pixmaps
-	doins beep.svg
-	doins beep/beep_mini.xpm
-
-	# Get the app registered in gnome
-
-	if use gnome; then
-		dodir /usr/share/gnome/apps
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/beep-media-player.desktop
-	fi
-
-	# We'll use xmms skins / plugins for the time being
-
-	dodir /usr/share/beep
-	dosym /usr/share/xmms/Skins /usr/share/beep/Skins
-	dosym /usr/share/xmms/Plugins /usr/share/beep/Plugins
-
-	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO
-}
-
-pkg_postinst() {
-	echo
-	einfo "This program is unstable on sparc when poking heavily with the GUI."
-	einfo "It's reportedly unstable on some x86 boxes also, YMMV."
-	echo
-	einfo "We're using xmms skins/plugins for the time being, they have been symlinked."
-	echo
-}
diff --git a/media-sound/beep-media-player/files/beep-media-player-0.9.6.1-gcc34.patch b/media-sound/beep-media-player/files/beep-media-player-0.9.6.1-gcc34.patch
new file mode 100644
index 000000000000..3940451dfe2c
--- /dev/null
+++ b/media-sound/beep-media-player/files/beep-media-player-0.9.6.1-gcc34.patch
@@ -0,0 +1,12 @@
+diff -ur bmp-0.9.6.1.orig/Input/vorbis/fileinfo.c bmp-0.9.6.1/Input/vorbis/fileinfo.c
+--- bmp-0.9.6.1.orig/Input/vorbis/fileinfo.c	2003-12-24 07:57:29.000000000 -0600
++++ bmp-0.9.6.1/Input/vorbis/fileinfo.c	2004-07-02 13:00:42.349657696 -0500
+@@ -54,6 +54,8 @@
+ static gint init_files(vcedit_state * state);
+ static gint close_files(vcedit_state * state);
+ 
++GtkWidget *xmms_show_message_test(gchar *, gchar *, gchar *, gboolean, GtkSignalFunc, gpointer);
++
+ extern GMutex *vf_mutex;
+ static GtkWidget *window = NULL;
+ static GList *genre_list = NULL;
diff --git a/media-sound/beep-media-player/files/digest-beep-media-player-1.0.0_pre5-r1 b/media-sound/beep-media-player/files/digest-beep-media-player-1.0.0_pre5-r1
deleted file mode 100644
index 91740109d32f..000000000000
--- a/media-sound/beep-media-player/files/digest-beep-media-player-1.0.0_pre5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 64aa256b8e34c44e84df44ff749cd412 beep-media-player-1.0.0-pre5.tar.gz 1372059