Patch by Frank Groeneveld, closes bug #87049 (bogus song information exported through infopipe).

(Portage version: 2.0.51.22-r1)

5 files changed, 149 insertions, 10 deletions

diff --git a/media-sound/beep-media-player/ChangeLog b/media-sound/beep-media-player/ChangeLog
index 86d944a2ea7a..d1341abb8d0e 100644
--- a/media-sound/beep-media-player/ChangeLog
+++ b/media-sound/beep-media-player/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/beep-media-player
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.54 2005/05/09 13:18:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.55 2005/05/29 15:02:32 chainsaw Exp $
+
+*beep-media-player-0.9.7-r6 (29 May 2005)
+
+  29 May 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.9.7-bogus-songinfo.patch, +beep-media-player-0.9.7-r6.ebuild:
+  Add patch to resolve bogus song information exported through infopipe.
+  Closes bug #87049, patch by Frank Groeneveld <frankgroeneveld@gmail.com>.
 
   09 May 2005; Aron Griffis <agriffis@gentoo.org>
   beep-media-player-0.9.7-r4.ebuild:
diff --git a/media-sound/beep-media-player/Manifest b/media-sound/beep-media-player/Manifest
index 0e7be7b6e6fe..9808104c4fd8 100644
--- a/media-sound/beep-media-player/Manifest
+++ b/media-sound/beep-media-player/Manifest
@@ -1,14 +1,17 @@
-MD5 c62deaa89427a1af38bad2bb5b78374d beep-media-player-0.9.7-r5.ebuild 2723
-MD5 d97bb9a054319e3e6869617ad517f15b ChangeLog 9834
-MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 MD5 3bef7c491ede84c567d5e3aa4767e5f3 beep-media-player-0.9.7-r4.ebuild 2609
+MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
+MD5 6ae271680ef9bd3e29e59fddf941ce7e ChangeLog 10148
+MD5 c62deaa89427a1af38bad2bb5b78374d beep-media-player-0.9.7-r5.ebuild 2723
+MD5 50ea8edceb04072edcec4967c08735c4 beep-media-player-0.9.7-r6.ebuild 2728
+MD5 d14dde91067c784f210c19e1e4024650 files/0.9.7-desktop-icon.patch 535
 MD5 bea6e241ce4dae7a01125836fda25fcc files/0.9.7-bigendian.patch 315
-MD5 32c2097467512370b951158b88abbeda files/0.9.7-hidden-window.patch 658
-MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r4 62
 MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r5 62
-MD5 d14dde91067c784f210c19e1e4024650 files/0.9.7-desktop-icon.patch 535
-MD5 e0224d7dcc5a2cb1af6ea6b18a6daea8 files/beep-config 3347
-MD5 539d031b4930b4ce080fbe0804edfc28 files/0.9.7-window-focus.patch 850
+MD5 07dd84987f30f2cbb9ca16ec80cb6962 files/0.9.7-playlist-deadfile-delete.patch 540
+MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r4 62
 MD5 533bcd69c3357e3b6dd5b3a49afbb6bf files/0.9.7-noclick-resize.patch 974
 MD5 893b0d5bce79831b0f71aae51af7440d files/0.9.7-vorbis-date.patch 637
-MD5 07dd84987f30f2cbb9ca16ec80cb6962 files/0.9.7-playlist-deadfile-delete.patch 540
+MD5 32c2097467512370b951158b88abbeda files/0.9.7-hidden-window.patch 658
+MD5 e0224d7dcc5a2cb1af6ea6b18a6daea8 files/beep-config 3347
+MD5 539d031b4930b4ce080fbe0804edfc28 files/0.9.7-window-focus.patch 850
+MD5 4fe36295e02a77ccc81d9f710ebcc9fb files/0.9.7-bogus-songinfo.patch 517
+MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r6 62
diff --git a/media-sound/beep-media-player/beep-media-player-0.9.7-r6.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.7-r6.ebuild
new file mode 100644
index 000000000000..34e6ad4cf3e9
--- /dev/null
+++ b/media-sound/beep-media-player/beep-media-player-0.9.7-r6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2005 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.7-r6.ebuild,v 1.1 2005/05/29 15:02:32 chainsaw Exp $
+
+IUSE="nls gnome mp3 oggvorbis alsa oss esd mmx old-eq"
+
+inherit flag-o-matic eutils libtool
+
+MY_PN="bmp"
+MY_P=bmp-${PV/_/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Beep Media Player"
+HOMEPAGE="http://www.sosdg.org/~larne/w/BMP_Homepage"
+SRC_URI="mirror://sourceforge/beepmp/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~hppa ~mips ~ppc64 ~alpha ~ia64"
+
+# beep-config has a runtime depend on pkg-config
+RDEPEND="app-arch/unzip
+	>=x11-libs/gtk+-2.4
+	>=x11-libs/pango-1.2
+	>=gnome-base/libglade-2.3.1
+	>=dev-util/pkgconfig-0.9.0
+	esd? ( >=media-sound/esound-0.2.30 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
+	gnome? ( >=gnome-base/gconf-2.6.0 )
+	mp3? ( media-libs/id3lib )"
+
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )"
+
+src_unpack() {
+	if ! useq mp3; then
+		ewarn "MP3 support is now optional and you have not enabled it."
+	fi
+
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-noclick-resize.patch
+	epatch ${FILESDIR}/${PV}-desktop-icon.patch
+	epatch ${FILESDIR}/${PV}-vorbis-date.patch
+	epatch ${FILESDIR}/${PV}-hidden-window.patch
+	epatch ${FILESDIR}/${PV}-playlist-deadfile-delete.patch
+	epatch ${FILESDIR}/${PV}-window-focus.patch
+	epatch ${FILESDIR}/${PV}-bogus-songinfo.patch
+
+	elibtoolize
+}
+
+src_compile() {
+	# Bug #42893
+	replace-flags "-Os" "-O2"
+
+	econf \
+		--with-dev-dsp=/dev/sound/dsp \
+		--with-dev-mixer=/dev/sound/mixer \
+		--includedir=/usr/include/beep-media-player \
+		`use_with old-eq xmms-eq` \
+		`use_enable mmx simd` \
+		`use_enable gnome gconf` \
+		`use_enable oggvorbis vorbis` \
+		`use_enable esd` \
+		`use_enable mp3` \
+		`use_enable nls` \
+		`use_enable oss` \
+		`use_enable alsa` \
+		|| die
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins icons/bmp.svg
+
+	insinto /usr/share/pixmaps
+	doins beep/beep_logo.xpm
+
+	dosym /usr/include/beep-media-player/bmp /usr/include/beep-media-player/xmms
+
+	# XMMS skin symlinking; bug 70697
+	for SKIN in /usr/share/xmms/Skins/* ; do
+		dosym "$SKIN" /usr/share/bmp/Skins/
+	done
+
+	# Plugins want beep-config, this wasn't included
+	# Note that this one has a special gentoo modification
+	# to work with xmms-plugin.eclass
+	dobin ${FILESDIR}/beep-config
+
+	dodoc AUTHORS FAQ NEWS README TODO
+}
+
+pkg_postinst() {
+	echo
+	einfo "Your XMMS skins, if any, have been symlinked."
+	einfo "MP3 support is now optional, you may want to enable the mp3 USE-flag."
+	echo
+}
diff --git a/media-sound/beep-media-player/files/0.9.7-bogus-songinfo.patch b/media-sound/beep-media-player/files/0.9.7-bogus-songinfo.patch
new file mode 100644
index 000000000000..b5f0fbe5a1b3
--- /dev/null
+++ b/media-sound/beep-media-player/files/0.9.7-bogus-songinfo.patch
@@ -0,0 +1,21 @@
+--- beep/mainwin.c.orig	Fri May 13 17:18:27 2005
++++ beep/mainwin.c	Fri May 13 17:19:56 2005
+@@ -441,13 +441,13 @@
+                            gint * n_channels)
+ {
+     if (bitrate)
+-        playback_info.bitrate = *bitrate;
+-
++	*bitrate = playback_info.bitrate;
++	    
+     if (frequency)
+-        playback_info.frequency = *frequency;
+-
++	*frequency = playback_info.frequency;
++	    
+     if (n_channels)
+-        playback_info.n_channels = *n_channels;
++	*n_channels = playback_info.n_channels;
+ }
+ 
+ static void
diff --git a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r6 b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r6
new file mode 100644
index 000000000000..c8dccff861f8
--- /dev/null
+++ b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r6
@@ -0,0 +1 @@
+MD5 5d74113f5de3d11a400d1d6c118d41c0 bmp-0.9.7.tar.gz 1974397