rpms/xmms/devel xmms-1.2.10-joycrash.patch, NONE, 1.1 xmms.spec, 1.20, 1.21

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/xmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30156

Modified Files:
	xmms.spec 
Added Files:
	xmms-1.2.10-joycrash.patch 
Log Message:
* Tue May 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-24
- Apply upstream fix for joystick plugin crashes.


xmms-1.2.10-joycrash.patch:

--- NEW FILE xmms-1.2.10-joycrash.patch ---
===================================================================
RCS file: /cvs/xmms/General/joystick/joy.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xmms/General/joystick/joy.c	2001/02/04 18:00:11	1.8
+++ xmms/General/joystick/joy.c	2004/07/17 21:54:55	1.9
@@ -177,8 +177,11 @@ static void init(void)
 /* ---------------------------------------------------------------------- */
 static void cleanup(void)
 {
-	keep_going = FALSE;
-	pthread_join(joyapp_thread, NULL);
+	if (keep_going)
+	{
+		keep_going = FALSE;
+		pthread_join(joyapp_thread, NULL);
+	}
 	if (joy_fd1 > 0)
 		close(joy_fd1);
 	if (joy_fd2 > 0)


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xmms.spec	6 Apr 2006 20:43:57 -0000	1.20
+++ xmms.spec	23 May 2006 19:25:25 -0000	1.21
@@ -4,7 +4,7 @@
 
 Name:           xmms
 Version:        1.2.10
-Release:        23%{?dist}
+Release:        24%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
@@ -19,6 +19,8 @@
 Source1:        xmms.req
 Source2:        xmms.xpm
 Source3:        rh_mp3.c
+# http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9
+Patch0:         %{name}-1.2.10-joycrash.patch
 Patch1:         %{name}-1.2.6-audio.patch
 Patch2:         %{name}-1.2.6-lazy.patch
 Patch3:         %{name}-1.2.8-default-skin.patch
@@ -76,6 +78,8 @@
 
 %prep
 %setup -q
+# Fix joystick plugin crashes
+%patch0 -p1 -b .joycrash
 # Set default output plugin to ALSA
 %patch1 -p1 -b .audio
 # Use RTLD_LAZY, not RTLD_NOW
@@ -183,6 +187,9 @@
 
 
 %changelog
+* Tue May 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-24
+- Apply upstream fix for joystick plugin crashes.
+
 * Thu Apr  6 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-23
 - Split library and plugins to xmms-libs (#184606).
 - ALSA is ubiquitous, don't filter dependencies to it.