rpms/xmms/devel xmms-1.2.10-pls-188603.patch, NONE, 1.1 xmms.sh, NONE, 1.1 xmms.spec, 1.25, 1.26

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	xmms.spec 
Added Files:
	xmms-1.2.10-pls-188603.patch xmms.sh 
Log Message:
* Mon Nov  6 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-29
- Work around incompatibilities with the Composite X extension (#213172).
- Apply upstream playlist randomization improvements (#188603).


xmms-1.2.10-pls-188603.patch:

--- NEW FILE xmms-1.2.10-pls-188603.patch ---
diff -u -p -r1.84 -r1.85
--- xmms/xmms/playlist.c	2004/03/21 16:41:56	1.84
+++ xmms/xmms/playlist.c	2004/04/12 19:06:58	1.85
@@ -1633,14 +1640,14 @@ static GList *playlist_shuffle_list(GLis
 	for (node = list, i = 0; i < len; node = g_list_next(node), i++)
 		ptrs[i] = node;
 
-	j = random() % len;
+	j = (int)(random() / (RAND_MAX + 1.0) * len); 
 	list = ptrs[j];
 	ptrs[j]->next = NULL;
 	ptrs[j] = ptrs[0];
 
 	for (i = 1; i < len; i++)
 	{
-		j = random() % (len - i);
+		j = (int)(random() / (RAND_MAX + 1.0) * (len - i));
 		list->prev = ptrs[i + j];
 		ptrs[i + j]->next = list;
 		list = ptrs[i + j];
diff -u -p -r1.88 -r1.89
--- xmms/xmms/playlist.c	2005/05/06 23:57:03	1.88
+++ xmms/xmms/playlist.c	2005/05/07 01:47:35	1.89
@@ -563,7 +563,7 @@ void playlist_play(void)
 		/* If there are entries */
 		if (g_list_length(skinlist)) {
 			/* Get a random value to select the skin to use */
-			int randval = random() % (g_list_length(skinlist) + 1);
+			int randval = (gint)(random() / (RAND_MAX + 1.0) * (g_list_length(skinlist) + 1));
 			/* If the random value is 0, use the default skin */
 			/* Otherwise subtract 1 from the random value and */
 			/* select the skin */


--- NEW FILE xmms.sh ---
#!/bin/sh

# https://bugzilla.redhat.com/213172
if [ -z "$XLIB_SKIP_ARGB_VISUALS" ] ; then
    exec env XLIB_SKIP_ARGB_VISUALS=1 /usr/libexec/xmms "$@"
else
    exec /usr/libexec/xmms "$@"
fi


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xmms.spec	28 Aug 2006 16:06:01 -0000	1.25
+++ xmms.spec	6 Nov 2006 21:00:57 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           xmms
 Version:        1.2.10
-Release:        28%{?dist}
+Release:        29%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
@@ -12,6 +12,7 @@
 # $ tar jx --exclude "mpg123*" -f xmms-1.2.10.tar.bz2
 # $ tar jcf xmms-1.2.10.patched.tar.bz2 xmms-1.2.10
 Source0:        %{name}-%{version}.patched.tar.bz2
+Source1:        xmms.sh
 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
@@ -29,6 +30,7 @@
 Patch10:        %{name}-alsa-backport.patch
 Patch11:        %{name}-1.2.10-gcc4.patch
 Patch12:        %{name}-1.2.10-crossfade-0.3.9.patch
+Patch13:        %{name}-1.2.10-pls-188603.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel
@@ -109,6 +111,8 @@
 %patch11 -p1 -b .gcc4
 # Fix for crossfade >= 0.3.9 to work properly
 %patch12 -p1 -b .crossfade
+# Randomize playlists better
+%patch13 -p1 -b .pls
 # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
 sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
 
@@ -141,6 +145,15 @@
 # On FC5 x86_64, some get created even though we pass --disable-static
 rm -f $RPM_BUILD_ROOT%{_libdir}/xmms/*/*.a
 
+# https://bugzilla.redhat.com/213172
+for bin in xmms wmxmms ; do
+    install -Dpm 755 $RPM_BUILD_ROOT%{_bindir}/$bin \
+        $RPM_BUILD_ROOT%{_libexecdir}/$bin
+    sed -e "s|/usr/libexec/xmms|%{_libexecdir}/$bin|" %{SOURCE1} > \
+        $RPM_BUILD_ROOT%{_bindir}/$bin
+    chmod 755 $RPM_BUILD_ROOT%{_bindir}/$bin
+done
+
 # Link to the desktop menu entry included in redhat-menus
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/applications
 ln -s ../desktop-menu-patches/redhat-audio-player.desktop \
@@ -175,6 +188,8 @@
 %doc AUTHORS ChangeLog COPYING FAQ NEWS TODO README
 %{_bindir}/xmms
 %{_bindir}/wmxmms
+%{_libexecdir}/xmms
+%{_libexecdir}/wmxmms
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*x*/apps/xmms.xpm
 %{_datadir}/xmms/
@@ -208,6 +223,10 @@
 
 
 %changelog
+* Mon Nov  6 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-29
+- Work around incompatibilities with the Composite X extension (#213172).
+- Apply upstream playlist randomization improvements (#188603).
+
 * Mon Aug 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2.10-28
 - Rebuild.