rpms/audacious-plugins/devel audacious-plugins-2.2-scrobbler.patch, NONE, 1.1 audacious-plugins.spec, 1.98, 1.99

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18260/devel

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-scrobbler.patch 
Log Message:
* Mon Feb 15 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-23
- Patch out the tuple/mowgli refcounting in the scrobbler plugin
  worker thread and use tuple_copy() instead. Let's see whether that
  will crash, too (see comment in -22).


audacious-plugins-2.2-scrobbler.patch:
 plugin.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE audacious-plugins-2.2-scrobbler.patch ---
diff -Nur audacious-plugins-2.2-orig/src/scrobbler/plugin.c audacious-plugins-2.2-scrobbler/src/scrobbler/plugin.c
--- audacious-plugins-2.2-orig/src/scrobbler/plugin.c	2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2-scrobbler/src/scrobbler/plugin.c	2010-02-15 14:25:48.000000000 +0100
@@ -253,16 +253,15 @@
 
 			playlist = aud_playlist_get_active();
 			pos = aud_playlist_get_position(playlist);
-			tuple = (Tuple*) aud_playlist_entry_get_tuple(playlist, pos);
+			tuple = tuple_copy( (Tuple*) aud_playlist_entry_get_tuple(playlist, pos) );
 
 			if (tuple == NULL)
 				continue;
 
-			mowgli_object_ref(tuple);
 
 			if (ishttp(aud_tuple_get_string(tuple, FIELD_FILE_NAME, NULL)))
 			{
-				mowgli_object_unref(tuple);
+				tuple_free(tuple);
 				continue;
 			}
 
@@ -285,7 +284,7 @@
 				pdebug("tuple does not contain an artist or a title, not submitting.", DEBUG);
 
 			submit = FALSE;
-			mowgli_object_unref(tuple);
+			tuple_free(tuple);
 		}
 
 		g_get_current_time(&sleeptime);


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- audacious-plugins.spec	8 Feb 2010 21:01:07 -0000	1.98
+++ audacious-plugins.spec	15 Feb 2010 13:40:04 -0000	1.99
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 22%{?dist}
+Release: 23%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -57,6 +57,8 @@ Patch13: audacious-plugins-2.2-neon-erro
 Patch14: audacious-plugins-2.2-tmp-vuln.patch
 #
 Patch15: audacious-plugins-2.2-streambrowser-url-add.patch
+#
+Patch16: audacious-plugins-2.2-scrobbler.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -202,6 +204,7 @@ in Vortex (.vtx) format.
 %patch13 -p1 -b .neon-error-handling
 %patch14 -p1 -b .tmp-vuln
 %patch15 -p1 -b .streambrowser-url-add
+%patch16 -p1 -b .scrobbler
 
 for i in src/ladspa/ladspa.c
 do
@@ -226,7 +229,6 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
     --disable-mms  \
     --disable-libmadtest  \
     \
-    --disable-scrobbler  \
     --disable-oss  \
     --disable-projectm  \
     --disable-sse2  \
@@ -303,6 +305,11 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Feb 15 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-23
+- Patch out the tuple/mowgli refcounting in the scrobbler plugin
+  worker thread and use tuple_copy() instead. Let's see whether that
+  will crash, too (see comment in -22).
+
 * Mon Feb  8 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-22
 - Remove scrobbler plugin, since upstream has disabled it by default
   in the post-2.2 tree, because it is believed to cause memory corruption