Revision bumping to add patch to correct NULL title strings. Patch submitted by Stefan Koegl <gensk@t-online.de> in bug #41238.

7 files changed, 161 insertions, 8 deletions

diff --git a/media-plugins/xmms-musepack/ChangeLog b/media-plugins/xmms-musepack/ChangeLog
index 8f77f89c76e6..053619dd0a08 100644
--- a/media-plugins/xmms-musepack/ChangeLog
+++ b/media-plugins/xmms-musepack/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/xmms-musepack
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/ChangeLog,v 1.8 2004/02/19 09:44:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/ChangeLog,v 1.9 2004/02/19 09:56:15 eradicator Exp $
+
+*xmms-musepack-0.94-r2 (19 Feb 2004)
+
+  19 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-musepack-0.94-r1.ebuild, xmms-musepack-0.94-r2.ebuild,
+  xmms-musepack-0.94.ebuild, files/xmms-musepack-0.94-titles.patch:
+  Revision bumping to add patch to correct NULL title strings. Patch submitted
+  by Stefan Koegl <gensk@t-online.de> in bug #41238.
 
   19 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xmms-musepack-0.98-r1.ebuild:
diff --git a/media-plugins/xmms-musepack/Manifest b/media-plugins/xmms-musepack/Manifest
index 34cf7c0bffde..ead5a017d965 100644
--- a/media-plugins/xmms-musepack/Manifest
+++ b/media-plugins/xmms-musepack/Manifest
@@ -1,10 +1,13 @@
-MD5 194601724e4ee7a6eda52180eb2be433 xmms-musepack-0.94.ebuild 713
-MD5 34025436c0bcf962ffa674181ce835f7 ChangeLog 1813
+MD5 7d19bc91ce0e10db9a79a68dbfbdbf9d xmms-musepack-0.94.ebuild 733
+MD5 6d5a5a0e275b88c6884f030a93c0e6cc xmms-musepack-0.94-r2.ebuild 1143
+MD5 bacf726d2e4bd2f19929a517ac616c67 ChangeLog 2166
 MD5 6d88011b963756aa43b6df79676821e0 xmms-musepack-0.98-r1.ebuild 1644
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 a3f13c29802ea46aff1d31c3309f04b9 xmms-musepack-0.94-r1.ebuild 1094
+MD5 3c392d26e935e29783c9f5d2ec428517 xmms-musepack-0.94-r1.ebuild 1114
 MD5 a9df10edf2898414b6f2958643b63477 files/digest-xmms-musepack-0.94 70
 MD5 e4ac40cdcd84c7fa35957450457407ce files/xmms-musepack-0.98-bad-makefile.patch 2005
 MD5 a9df10edf2898414b6f2958643b63477 files/digest-xmms-musepack-0.94-r1 70
+MD5 a9df10edf2898414b6f2958643b63477 files/digest-xmms-musepack-0.94-r2 70
 MD5 eb1357b5fbaa2b86c3267d732568201d files/digest-xmms-musepack-0.98-r1 58
 MD5 ed030d04fa02f984be113732ad39b061 files/xmms-musepack-0.94-bad-makefile.patch 956
+MD5 fb770d6a178a0327376d76d9b996b20a files/xmms-musepack-0.94-titles.patch 3111
diff --git a/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.94-r2 b/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.94-r2
new file mode 100644
index 000000000000..2521f84584f8
--- /dev/null
+++ b/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.94-r2
@@ -0,0 +1 @@
+MD5 32fe1e12fedb6590b3146222df836ffa xmms-musepack-0.94.tar.bz2 56999
diff --git a/media-plugins/xmms-musepack/files/xmms-musepack-0.94-titles.patch b/media-plugins/xmms-musepack/files/xmms-musepack-0.94-titles.patch
new file mode 100644
index 000000000000..4aeb23d74379
--- /dev/null
+++ b/media-plugins/xmms-musepack/files/xmms-musepack-0.94-titles.patch
@@ -0,0 +1,98 @@
+--- in_mpc.c	2004-02-18 20:35:15.651793976 +0100
++++ in_mpc.c	2004-02-18 20:38:14.830554664 +0100
+@@ -33,6 +33,8 @@
+ #include "mpc_dec.h"
+ #include "mpplus_blue.xpm"
+ 
++#include <xmms/titlestring.h>
++
+ #ifndef M_LN10
+ # define M_LN10   2.3025850929940456840179914546843642
+ #endif
+@@ -88,6 +90,7 @@
+ void play(char *);
+ void setvolume(const int, const int);
+ void infoDlg(char *);
++static gchar *get_title(gchar *filename);
+ void getfileinfo(char *, char **, int *);
+ void config(void);
+ void about(void);
+@@ -1278,6 +1281,9 @@
+         inputFile=NULL;
+         return;
+       } // cannot open sound device
++
++    char *title = get_title(fn);
++
+     // AB: set info for overall-VBR
+     if (!UpdateBitrate)
+     {
+@@ -1299,10 +1305,10 @@
+             if(DisplayID3Names==1)
+               mod.set_info(displayed_info,(int)(OverallFrames*1152/44.1f),VBR_Bitrate,SAMPLERATE/1000,NCH);
+             else
+-              mod.set_info(NULL,(int)(OverallFrames*1152/44.1f),VBR_Bitrate,SAMPLERATE/1000,NCH);
++              mod.set_info(title,(int)(OverallFrames*1152/44.1f),VBR_Bitrate,SAMPLERATE/1000,NCH);
+           }
+         else
+-          mod.set_info(NULL,(int)(OverallFrames*1152/44.1f),VBR_Bitrate,SAMPLERATE/1000,NCH);
++          mod.set_info(title,(int)(OverallFrames*1152/44.1f),VBR_Bitrate,SAMPLERATE/1000,NCH);
+     }
+     else
+       if(id3_found)
+@@ -1310,10 +1316,10 @@
+           if(DisplayID3Names==1)
+             mod.set_info(displayed_info,(int)(OverallFrames*1152/44.1f),0,SAMPLERATE/1000,NCH);
+           else
+-            mod.set_info(NULL,(int)(OverallFrames*1152/44.1f),0,SAMPLERATE/1000,NCH);
++            mod.set_info(title,(int)(OverallFrames*1152/44.1f),0,SAMPLERATE/1000,NCH);
+         }
+       else
+-        mod.set_info(NULL,(int)(OverallFrames*1152/44.1f),0,SAMPLERATE/1000,NCH);
++        mod.set_info(title,(int)(OverallFrames*1152/44.1f),0,SAMPLERATE/1000,NCH);
+ 
+     // create decoding thread
+     killDecodeThread=0;
+@@ -1488,9 +1494,41 @@
+   return;
+ }
+ 
++static gchar *get_title(gchar *filename)
++{
++        TitleInput *input;
++        gchar *temp, *ext, *title, *path, *temp2;
++
++        XMMS_NEW_TITLEINPUT(input);
++
++        path = g_strdup(filename);
++        temp = g_strdup(filename);
++        ext = strrchr(temp, '.');
++        if (ext)
++                *ext = '\0';
++        temp2 = strrchr(path, '/');
++        if (temp2)
++                *temp2 = '\0';
++
++        input->file_name = g_basename(filename);
++        input->file_ext = ext ? ext+1 : NULL;
++        input->file_path = g_strdup_printf("%s/", path);
++
++        title = xmms_get_titlestring(xmms_get_gentitle_format(), input);
++        if ( title == NULL )
++                title = g_strdup(input->file_name);
++
++        g_free(temp);
++        g_free(path);
++        g_free(input);
++
++        return title;
++}
++
+ void getfileinfo(char *filename, char **_title, int *length_in_ms)
+ {
+-  char *title = *_title;
++/*  char *title = *_title; */
++  *_title = get_title(filename);
+ 
+   if ( filename == NULL || filename[0] == '\0' ) {  // currently playing file
+       if (length_in_ms) *length_in_ms=getlength();
diff --git a/media-plugins/xmms-musepack/xmms-musepack-0.94-r1.ebuild b/media-plugins/xmms-musepack/xmms-musepack-0.94-r1.ebuild
index 42ce49c0f0c7..1f43ecf14b95 100644
--- a/media-plugins/xmms-musepack/xmms-musepack-0.94-r1.ebuild
+++ b/media-plugins/xmms-musepack/xmms-musepack-0.94-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-0.94-r1.ebuild,v 1.5 2003/09/11 01:19:38 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-0.94-r1.ebuild,v 1.6 2004/02/19 09:56:15 eradicator Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,6 +12,7 @@ filter-mfpmath "sse"
 DESCRIPTION="XMMS plugin to play audio files encoded with Andree Buschmann's encoder Musepack (mpc, mp+, mpp)"
 HOMEPAGE="http://sourceforge.net/projects/mpegplus/"
 SRC_URI="mirror://sourceforge/mpegplus/${P}.tar.bz2"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-plugins/xmms-musepack/xmms-musepack-0.94-r2.ebuild b/media-plugins/xmms-musepack/xmms-musepack-0.94-r2.ebuild
new file mode 100644
index 000000000000..0e258cf05939
--- /dev/null
+++ b/media-plugins/xmms-musepack/xmms-musepack-0.94-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-0.94-r2.ebuild,v 1.1 2004/02/19 09:56:15 eradicator Exp $
+
+inherit flag-o-matic eutils
+
+# Enabling -mfpath=sse can cause high-pitched whine, at least on Pentiums.
+# This drops the entire flag for safety. Reports of success with any variations
+# would be welcomed, but mind those eardrums!
+filter-mfpmath "sse"
+
+DESCRIPTION="XMMS plugin to play audio files encoded with Andree Buschmann's encoder Musepack (mpc, mp+, mpp)"
+HOMEPAGE="http://sourceforge.net/projects/mpegplus/"
+SRC_URI="mirror://sourceforge/mpegplus/${P}.tar.bz2"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="media-sound/xmms"
+
+src_unpack() {
+	unpack ${A}
+	# Fix up the atrocious Makefile.
+	cd ${S};
+
+	epatch ${FILESDIR}/${P}-bad-makefile.patch
+	epatch ${FILESDIR}/${P}-titles.patch
+}
+
+src_compile() {
+	# Makefile will use ARCH when calling gcc
+	emake ARCH="${CFLAGS}" || die
+}
+
+src_install() {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe ${P}.so
+}
diff --git a/media-plugins/xmms-musepack/xmms-musepack-0.94.ebuild b/media-plugins/xmms-musepack/xmms-musepack-0.94.ebuild
index d138c87aa7c4..ac3868395bed 100644
--- a/media-plugins/xmms-musepack/xmms-musepack-0.94.ebuild
+++ b/media-plugins/xmms-musepack/xmms-musepack-0.94.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-0.94.ebuild,v 1.3 2003/07/12 18:40:48 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-0.94.ebuild,v 1.4 2004/02/19 09:56:15 eradicator Exp $
 
 DESCRIPTION="XMMS plugin to play audio files encoded with Andree Buschmann's encoder Musepack (mpc, mp+, mpp)"
 HOMEPAGE="http://sourceforge.net/projects/mpegplus/"
 SRC_URI="mirror://sourceforge/mpegplus/${P}.tar.bz2"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"