Version Bump. Thanks to Ben Jackson <benj@puremourning.co.uk> and Felix Braun <Felix.Braun@mail.mcgill.ca> for Debian patches. Closes bug #99606.

(Portage version: 2.0.53_rc6)

6 files changed, 82 insertions, 14 deletions

diff --git a/media-plugins/xmms-scrobbler/ChangeLog b/media-plugins/xmms-scrobbler/ChangeLog
index 00baa7db00e0..cbed8d6aa802 100644
--- a/media-plugins/xmms-scrobbler/ChangeLog
+++ b/media-plugins/xmms-scrobbler/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/xmms-scrobbler
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-scrobbler/ChangeLog,v 1.20 2005/09/09 12:19:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-scrobbler/ChangeLog,v 1.21 2005/10/23 21:41:09 metalgod Exp $
+
+*xmms-scrobbler-0.3.8.1 (23 Oct 2005)
+
+  23 Oct 2005; Luis Medinas <metalgod@gentoo.org> +files/scrobbler.c.patch,
+  +files/xmms_scrobbler.c.patch, +xmms-scrobbler-0.3.8.1.ebuild:
+  Version Bump. Thanks to Ben Jackson <benj@puremourning.co.uk> and Felix
+  Braun <Felix.Braun@mail.mcgill.ca> for Debian patches. Closes bug #99606.
 
   09 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
   xmms-scrobbler-0.3.6.ebuild, xmms-scrobbler-0.3.7.ebuild:
diff --git a/media-plugins/xmms-scrobbler/Manifest b/media-plugins/xmms-scrobbler/Manifest
index c16a29f19c2b..5c422319dd98 100644
--- a/media-plugins/xmms-scrobbler/Manifest
+++ b/media-plugins/xmms-scrobbler/Manifest
@@ -1,16 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cc67a5ece36049d5f53ffa29f05b1845 xmms-scrobbler-0.3.6.ebuild 648
 MD5 e90dc68718088d5959ee90759d49a780 ChangeLog 3205
-MD5 2bea1aff1c8983876c6c507a4f02a29c xmms-scrobbler-0.3.7.ebuild 645
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 f3f9865258d1a7ab26719dc5e241b524 files/digest-xmms-scrobbler-0.3.6 73
 MD5 c790015adb5c08af62d5e99d64a34da4 files/digest-xmms-scrobbler-0.3.7 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDIX3sj5H05b2HAEkRAobSAJ9EArGKaAtrvq3zYd5Cy1iGl4iB8gCghzJu
-w/Nhh2N5hDkCviec+hpyrcg=
-=DDbt
------END PGP SIGNATURE-----
+MD5 f1fada66ccc897082f19b62f1c8af09b files/digest-xmms-scrobbler-0.3.8.1 75
+MD5 a06ccc8cb0399bb9cbaf1e5d276a1d47 files/scrobbler.c.patch 421
+MD5 97ef549ab2ba1767497788587237f301 files/xmms_scrobbler.c.patch 241
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 cc67a5ece36049d5f53ffa29f05b1845 xmms-scrobbler-0.3.6.ebuild 648
+MD5 2bea1aff1c8983876c6c507a4f02a29c xmms-scrobbler-0.3.7.ebuild 645
+MD5 673c7d39853019f0d2aead62c9ff4ca1 xmms-scrobbler-0.3.8.1.ebuild 669
diff --git a/media-plugins/xmms-scrobbler/files/digest-xmms-scrobbler-0.3.8.1 b/media-plugins/xmms-scrobbler/files/digest-xmms-scrobbler-0.3.8.1
new file mode 100644
index 000000000000..8df7953719ba
--- /dev/null
+++ b/media-plugins/xmms-scrobbler/files/digest-xmms-scrobbler-0.3.8.1
@@ -0,0 +1 @@
+MD5 e933c7660fe9103916ca022ec60ad654 xmms-scrobbler-0.3.8.1.tar.bz2 257740
diff --git a/media-plugins/xmms-scrobbler/files/scrobbler.c.patch b/media-plugins/xmms-scrobbler/files/scrobbler.c.patch
new file mode 100644
index 000000000000..e61fb900c42d
--- /dev/null
+++ b/media-plugins/xmms-scrobbler/files/scrobbler.c.patch
@@ -0,0 +1,24 @@
+--- orig/scrobbler.c
++++ mod/scrobbler.c
+@@ -488,6 +488,7 @@
+ {
+ 	GString *submitentry;
+ 	int nsubmit;
++	int i;
+ 	int wait;
+ 
+ 	if(sc_submit_timeout < time(NULL) && sc_bad_users < 3)
+@@ -512,7 +513,12 @@
+ 				pthread_mutex_lock(&mutex);
+ 
+ #ifdef ALLOW_MULTIPLE
+-				q_free();
++				if (nsubmit < q_len()) {
++					for (i=0; i<nsubmit; i++)
++						q_get();
++				} else {
++					q_free();
++				}
+ #else
+ 				q_get();
+ #endif
diff --git a/media-plugins/xmms-scrobbler/files/xmms_scrobbler.c.patch b/media-plugins/xmms-scrobbler/files/xmms_scrobbler.c.patch
new file mode 100644
index 000000000000..a14396ae73d1
--- /dev/null
+++ b/media-plugins/xmms-scrobbler/files/xmms_scrobbler.c.patch
@@ -0,0 +1,11 @@
+--- orig/xmms_scrobbler.c
++++ mod/xmms_scrobbler.c
+@@ -344,6 +344,8 @@
+ 
+ 	/* keep current value for next iteration */
+ 	ps_p = ps_c;
++	if ( file_p != NULL ) 
++		g_free(file_p);
+ 	file_p = file_c;
+ 	playtime_p = playtime_c;
+ 	pos_p = pos_c;
diff --git a/media-plugins/xmms-scrobbler/xmms-scrobbler-0.3.8.1.ebuild b/media-plugins/xmms-scrobbler/xmms-scrobbler-0.3.8.1.ebuild
new file mode 100644
index 000000000000..f9d4e66d05c7
--- /dev/null
+++ b/media-plugins/xmms-scrobbler/xmms-scrobbler-0.3.8.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-scrobbler/xmms-scrobbler-0.3.8.1.ebuild,v 1.1 2005/10/23 21:41:09 metalgod Exp $
+
+IUSE="debug"
+
+DESCRIPTION="Audioscrobbler music-profiling plugin for XMMS"
+HOMEPAGE="http://www.audioscrobbler.com/"
+SRC_URI="http://www.pipian.com/stuffforchat/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-sound/xmms
+	net-misc/curl
+	>=media-libs/musicbrainz-2.0.2-r2"
+
+src_compile() {
+	if use debug;
+		then DBG='--enable-debug';
+		else DBG='';
+	fi
+	econf '--disable-bmp-plugin' ${DBG} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog INSTALL NEWS README
+}