Big endian patch by Yuta Satoh <gentoo@0x100.com> from bug #68223, stable on x86, old ebuild cleaned.

8 files changed, 48 insertions, 60 deletions

diff --git a/media-sound/beep-media-player/ChangeLog b/media-sound/beep-media-player/ChangeLog
index c5d11f01f803..4908bc74f7df 100644
--- a/media-sound/beep-media-player/ChangeLog
+++ b/media-sound/beep-media-player/ChangeLog
@@ -1,6 +1,17 @@
 # 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.34 2004/12/20 22:07:48 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.35 2004/12/23 21:18:58 chainsaw Exp $
+
+*beep-media-player-0.9.7-r2 (23 Dec 2004)
+
+  23 Dec 2004; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.9.7-bigendian.patch,
+  -files/beep-media-player-0.9.7_rc2-includefix.patch,
+  -files/beep-media-player-0.9.7_rc2-mime.patch,
+  +beep-media-player-0.9.7-r2.ebuild,
+  -beep-media-player-0.9.7_rc2-r3.ebuild:
+  Added bigendian patch by Yuta Satoh <gentoo@0x100.com> from bug #68223;
+  stable on x86. Old ebuild and patches cleaned.
 
   20 Dec 2004; Tony Vroon <chainsaw@gentoo.org>
   beep-media-player-0.9.7-r1.ebuild:
diff --git a/media-sound/beep-media-player/Manifest b/media-sound/beep-media-player/Manifest
index cdd64a9e686e..e1f9a6837821 100644
--- a/media-sound/beep-media-player/Manifest
+++ b/media-sound/beep-media-player/Manifest
@@ -1,12 +1,11 @@
 MD5 5d39c2c9906ce93bc5f36bb64a218979 beep-media-player-0.9.7-r1.ebuild 2263
-MD5 15863538ed0624548b6982c3cbb726b4 beep-media-player-0.9.7_rc2-r3.ebuild 2527
 MD5 cc5cad310c578392015fc5d9b51cdb3a beep-media-player-0.9.7.ebuild 2058
-MD5 94241e4dbe2ec098aae739e419250b5c ChangeLog 6430
+MD5 40c20da25e4a92bf506fc63b0b5e0559 beep-media-player-0.9.7-r2.ebuild 2182
+MD5 d119a73a16106cfca174a7f043fe32d4 ChangeLog 6861
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
-MD5 3e05152668a0fcdce073aa47702bd463 files/beep-media-player-0.9.7_rc2-includefix.patch 329
+MD5 bea6e241ce4dae7a01125836fda25fcc files/0.9.7-bigendian.patch 315
 MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r1 62
-MD5 27cf6516ed075a139579b1c439e9bd90 files/beep-media-player-0.9.7_rc2-mime.patch 587
-MD5 b7d99875975dc75e79760f82bbeaf790 files/digest-beep-media-player-0.9.7_rc2-r3 65
+MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r2 62
 MD5 e0224d7dcc5a2cb1af6ea6b18a6daea8 files/beep-config 3347
 MD5 533bcd69c3357e3b6dd5b3a49afbb6bf files/0.9.7-noclick-resize.patch 974
 MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7 62
diff --git a/media-sound/beep-media-player/beep-media-player-0.9.7_rc2-r3.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.7-r2.ebuild
index 3a4cb1a29358..8f4025727995 100644
--- a/media-sound/beep-media-player/beep-media-player-0.9.7_rc2-r3.ebuild
+++ b/media-sound/beep-media-player/beep-media-player-0.9.7-r2.ebuild
@@ -1,8 +1,8 @@
 # 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.7_rc2-r3.ebuild,v 1.5 2004/12/03 17:48:49 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/beep-media-player-0.9.7-r2.ebuild,v 1.1 2004/12/23 21:18:58 chainsaw Exp $
 
-IUSE="nls gnome opengl oggvorbis mikmod alsa oss esd mmx"
+IUSE="nls gnome mp3 oggvorbis alsa oss esd mmx old-eq"
 
 inherit flag-o-matic eutils
 
@@ -17,18 +17,14 @@ SRC_URI="mirror://sourceforge/beepmp/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~ppc ~sparc x86 ~hppa ~mips"
+KEYWORDS="~amd64 ~ppc ~sparc x86 ~hppa ~mips"
 
 RDEPEND="app-arch/unzip
 	>=x11-libs/gtk+-2.4
 	>=x11-libs/pango-1.2
-	>=dev-libs/libxml-1.8.15
 	>=gnome-base/libglade-2.3.1
-	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 	esd? ( >=media-sound/esound-0.2.30 )
-	opengl? ( virtual/opengl )
-	oggvorbis? ( >=media-libs/libvorbis-1.0
-		     >=media-libs/libogg-1.0 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )
 	alsa? ( >=media-libs/alsa-lib-1.0 )
 	gnome? ( >=gnome-base/gnome-vfs-2.6.0
 	         >=gnome-base/gconf-2.6.0 )"
@@ -37,40 +33,33 @@ DEPEND="${RDEPEND}
 	nls? ( dev-util/intltool )"
 
 src_unpack() {
-	unpack ${A}
+	if ! useq mp3; then
+		ewarn "MP3 support is now optional and you have not enabled it."
+	fi
 
+	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-mime.patch
-	epatch ${FILESDIR}/${P}-includefix.patch
+	epatch ${FILESDIR}/${PV}-noclick-resize.patch
+	epatch ${FILESDIR}/${PV}-bigendian.patch
 }
 
 src_compile() {
-	local myconf=""
-
 	# Bug #42893
 	replace-flags "-Os" "-O2"
 
-	if use gnome; then
-		myconf="${myconf} --enable-gconf --enable-gnome-vfs"
-	fi
-
-	if use mmx; then
-		myconf="${myconf} --enable-simd"
-	fi
-
 	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 mikmod` \
-		`use_with mikmod libmikmod` \
-		`use_enable opengl` \
+		`use_enable mp3` \
 		`use_enable nls` \
 		`use_enable oss` \
 		`use_enable alsa` \
-		${myconf} \
 		|| die
 
 	emake || die "make failed"
@@ -85,8 +74,10 @@ src_install() {
 
 	dosym /usr/include/beep-media-player/bmp /usr/include/beep-media-player/xmms
 
-	# We'll use xmms skins
-	dosym /usr/share/xmms/Skins /usr/share/beep/Skins
+	# 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
@@ -98,9 +89,7 @@ src_install() {
 
 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 for the time being, they have been symlinked."
+	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-bigendian.patch b/media-sound/beep-media-player/files/0.9.7-bigendian.patch
new file mode 100644
index 000000000000..4032a81fd2f3
--- /dev/null
+++ b/media-sound/beep-media-player/files/0.9.7-bigendian.patch
@@ -0,0 +1,11 @@
+diff -Nur bmp-0.9.7rc2.orig/configure.ac bmp-0.9.7rc2/configure.ac
+--- bmp-0.9.7rc2.orig/configure.ac	2004-11-24 22:28:04.180907736 +0900
++++ bmp-0.9.7rc2/configure.ac	2004-11-24 22:28:25.374880832 +0900
+@@ -52,6 +52,7 @@
+ AC_DISABLE_STATIC
+ AC_ENABLE_SHARED
+ AC_PROG_LIBTOOL
++AC_C_BIGENDIAN
+ 
+ 
+ dnl Path settings
diff --git a/media-sound/beep-media-player/files/beep-media-player-0.9.7_rc2-includefix.patch b/media-sound/beep-media-player/files/beep-media-player-0.9.7_rc2-includefix.patch
deleted file mode 100644
index b32a096b74de..000000000000
--- a/media-sound/beep-media-player/files/beep-media-player-0.9.7_rc2-includefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur bmp-0.9.7rc2.orig/beep/plugin.h bmp-0.9.7rc2/beep/plugin.h
---- bmp-0.9.7rc2.orig/beep/plugin.h	2004-07-04 04:54:25.000000000 -0700
-+++ bmp-0.9.7rc2/beep/plugin.h	2004-10-20 03:02:16.080499393 -0700
-@@ -26,6 +26,7 @@
- 
- 
- #include <glib.h>
-+#include <glib/gmacros.h>
- 
- 
- #define INPUT_PLUGIN(x)   ((InputPlugin *)(x))
diff --git a/media-sound/beep-media-player/files/beep-media-player-0.9.7_rc2-mime.patch b/media-sound/beep-media-player/files/beep-media-player-0.9.7_rc2-mime.patch
deleted file mode 100644
index fddc076a1d45..000000000000
--- a/media-sound/beep-media-player/files/beep-media-player-0.9.7_rc2-mime.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- beep/bmp.desktop.in.old	2004-09-30 15:00:52.054890304 +0200
-+++ beep/bmp.desktop.in	2004-09-30 15:02:01.054400784 +0200
-@@ -3,7 +3,7 @@
- Comment=Play music
- Exec=beep-media-player
- Icon=bmp.svg
--MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg
-+MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg;application/ogg;audio/x-flac;application/x-flac
- Categories=Application;GTK;AudioVideo;Player;
- Terminal=false
- Type=Application
diff --git a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r2 b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r2
new file mode 100644
index 000000000000..c8dccff861f8
--- /dev/null
+++ b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r2
@@ -0,0 +1 @@
+MD5 5d74113f5de3d11a400d1d6c118d41c0 bmp-0.9.7.tar.gz 1974397
diff --git a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7_rc2-r3 b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7_rc2-r3
deleted file mode 100644
index ee9bb0f2a088..000000000000
--- a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7_rc2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1fcf7b7d8964f26cb5c0ebddc95d1a7d bmp-0.9.7rc2.tar.gz 1705197