rpms/xmms/devel xmms-1.2.10-crossfade-0.3.9.patch, NONE, 1.1 xmms.spec, 1.14, 1.15

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	xmms.spec 
Added Files:
	xmms-1.2.10-crossfade-0.3.9.patch 
Log Message:
Add crossfade patch.


xmms-1.2.10-crossfade-0.3.9.patch:

--- NEW FILE xmms-1.2.10-crossfade-0.3.9.patch ---
diff -ur xmms-1.2.10/xmms/input.c xmms-1.2.10.patched/xmms/input.c
--- xmms-1.2.10/xmms/input.c	2003-08-08 19:10:44.000000000 +0200
+++ xmms-1.2.10.patched/xmms/input.c	2005-11-25 00:12:36.000000000 +0100
@@ -285,6 +285,14 @@
 	}
 }
 
+gboolean input_stopped_for_restart = FALSE;  /* crossfade */
+void input_stop_for_restart()  /* crossfade */
+{
+	input_stopped_for_restart = TRUE;
+	input_stop();
+	input_stopped_for_restart = FALSE;
+}
+
 void input_stop(void)
 {
 	if (ip_data->playing && get_current_input_plugin())
diff -ur xmms-1.2.10/xmms/input.h xmms-1.2.10.patched/xmms/input.h
--- xmms-1.2.10/xmms/input.h	2000-02-16 22:05:57.000000000 +0100
+++ xmms-1.2.10.patched/xmms/input.h	2005-11-25 00:12:36.000000000 +0100
@@ -34,6 +34,7 @@
 gboolean input_check_file(gchar * filename);
 void input_play(char *filename);
 void input_stop(void);
+void input_stop_for_restart(void);
 void input_pause(void);
 int input_get_time(void);
 void input_set_eq(int on, float preamp, float *bands);
diff -ur xmms-1.2.10/xmms/main.c xmms-1.2.10.patched/xmms/main.c
--- xmms-1.2.10/xmms/main.c	2004-02-23 21:31:43.000000000 +0100
+++ xmms-1.2.10.patched/xmms/main.c	2005-11-25 00:12:36.000000000 +0100
@@ -881,8 +881,10 @@
 	mainwin_set_shade(!cfg.player_shaded);
 }
 
+gboolean is_quitting = FALSE;  /* crossfade */
 void mainwin_quit_cb(void)
 {
+	is_quitting = TRUE;  /* crossfade */
 	input_stop();
 	gtk_widget_hide(equalizerwin);
 	gtk_widget_hide(playlistwin);
@@ -1523,7 +1525,8 @@
 		int *pos;
 
 		if (get_input_playing())
-			input_stop();
+			input_stop_for_restart();
+		
 		pos = gtk_clist_get_row_data(clist, GPOINTER_TO_INT(clist->selection->data));
 		playlist_set_position(*pos);
 		playlist_play();
diff -ur xmms-1.2.10/xmms/playlist.c xmms-1.2.10.patched/xmms/playlist.c
--- xmms-1.2.10/xmms/playlist.c	2004-02-23 21:31:43.000000000 +0100
+++ xmms-1.2.10.patched/xmms/playlist.c	2005-11-25 00:12:36.000000000 +0100
@@ -124,7 +124,7 @@
 		if (get_input_playing())
 		{
 			PL_UNLOCK();
-			input_stop();
+			input_stop_for_restart();
 			PL_LOCK();
 			*restart_playing = TRUE;
 		}
@@ -570,7 +570,7 @@
 	}
 
 	if (get_input_playing())
-		input_stop();
+		input_stop_for_restart();
 
 	vis_clear_data(mainwin_vis);
 	vis_clear_data(playlistwin_vis);
@@ -668,7 +668,7 @@
 	{
 		/* We need to stop before changing playlist_position */
 		PL_UNLOCK();
-		input_stop();
+		input_stop_for_restart();
 		PL_LOCK();
 		restart_playing = TRUE;
 	}
@@ -723,7 +723,7 @@
 	{
 		/* We need to stop before changing playlist_position */
 		PL_UNLOCK();
-		input_stop();
+		input_stop_for_restart();
 		PL_LOCK();
 		restart_playing = TRUE;
 	}
@@ -852,7 +852,7 @@
 	{
 		/* We need to stop before changing playlist_position */
 		PL_UNLOCK();
-		input_stop();
+		input_stop_for_restart();
 		PL_LOCK();
 		restart_playing = TRUE;
 	}


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xmms.spec	13 Feb 2006 12:26:45 -0000	1.14
+++ xmms.spec	13 Feb 2006 13:31:23 -0000	1.15
@@ -20,6 +20,7 @@
 Patch9: xmms-underquoted.patch
 Patch10: xmms-alsa-backport.patch
 Patch11: xmms-1.2.10-gcc4.patch
+Patch12: xmms-1.2.10-crossfade-0.3.9.patch
 
 Requires: unzip
 # the desktop file and redhat-menus are redundant requires really
@@ -27,9 +28,9 @@
 Requires: redhat-menus >= 0.11
 
 BuildRequires: gtk+-devel, esound-devel, arts-devel, alsa-lib-devel
-BuildRequires: libvorbis-devel, mikmod-devel
-BuildRequires: libSM-devel, libXxf86vm-devel, mesa-libGL-devel
-BuildRequires: zlib-devel
+BuildRequires: libogg-devel, libvorbis-devel, mikmod-devel
+BuildRequires: libXt-devel, libSM-devel, libXxf86vm-devel, mesa-libGL-devel
+BuildRequires: gettext-devel, zlib-devel
 Requires(post): desktop-file-utils >= 0.9
 Requires(postun): desktop-file-utils >= 0.9
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -76,6 +77,8 @@
 %patch10 -p0 -b .alsa-backport
 # Fix compilation with gcc4
 %patch11 -p1 -b .gcc4
+# Fix for crossfade >= 0.3.9 to work properly
+%patch12 -p1 -b .crossfade
 
 
 %build
@@ -167,12 +170,15 @@
 * Mon Feb 13 2006 Matthias Saou <http://freshrpms.net/> 1:1.2.10-20
 - Spec file cleanup.
 - Disable previous -lpthread hack, since it seems to work again now...
+- Include crossfade 0.3.9 patch.
 - Remove very old x11amp obsoletes.
 - Exclude static libraries, update devel summary and description for it.
 - List all plugins directories in order to be aware of breakage if the
   libtool problem ever happens again.
 - Fix post/postun scriplets.
 - Remove xmms_logo.xpm and xmms_mini.xpm, they should be unused.
+- Add libXt-devel to fullfill the "checking for X..." configure check.
+- Add gettext-devel to make more configure checks happy.
 
 * Wed Dec 28 2005 Hans de Goede <j.w.r.degoede at hhs.nl>  1:1.2.10-19
 - Remove -lpthread from all LDFLAGS as this confuses the old libtool