ports/65433: (patch) multimedia/xmms broken on amd64

[Tim Robbins]

>Number:         65433
>Category:       ports
>Synopsis:       (patch) multimedia/xmms broken on amd64
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 11 04:50:16 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Tim Robbins
>Release:        FreeBSD 5.2-tjr amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD 5.2-tjr amd64

>Description:
XMMS usually crashes as soon as you try to play a file on amd64.

>How-To-Repeat:
Start XMMS, open a file and play it. Repeat until it crashes (it should
not take more than 3 or 4 tries.)

>Fix:

Add the following as ports/multimedia/xmms/files/patch-amd64:

diff -ru Input/cdaudio/cdaudio.c.orig Input/cdaudio/cdaudio.c
--- Input/cdaudio/cdaudio.c.orig	Wed Jan 28 10:09:39 2004
+++ Input/cdaudio/cdaudio.c	Sun Apr 11 21:24:05 2004
@@ -333,7 +333,7 @@
 #elif defined(HAVE_GETMNTINFO)
  	entries = getmntinfo(&fsp, MNT_NOWAIT);
  	if (entries < 0)
- 		return NULL;
+ 		return FALSE;
 	
 	while (entries-- > 0)
 	{
diff -ru Output/esd/esdout.h.orig Output/esd/esdout.h
--- Output/esd/esdout.h.orig	Mon Dec  3 13:38:42 2001
+++ Output/esd/esdout.h	Sun Apr 11 21:23:23 2004
@@ -67,6 +67,7 @@
 void esdout_fetch_volume(int *l, int *r);
 void esdout_set_volume(int l, int r);
 void esdout_mixer_init(void);
+void esdout_reset_playerid(void);
 
 int esdout_playing(void);
 int esdout_free(void);
diff -ru libxmms/util.c.orig xmms-1.2.10/libxmms/util.c
--- libxmms/util.c.orig	Tue May 20 07:22:07 2003
+++ libxmms/util.c	Sun Apr 11 21:18:58 2004
@@ -80,7 +80,8 @@
 	 * before sched_getschedule() (so that we don't get
 	 * non-present syscall warnings in kernel log).
 	 */
-	int val = 0, len;
+	int val = 0;
+	size_t len;
 
 	len = sizeof(val);
 	sysctlbyname("p1003_1b.priority_scheduling", &val, &len, NULL, 0);
diff -ru libxmms/xmmsctrl.c.orig libxmms/xmmsctrl.c
--- libxmms/xmmsctrl.c.orig	Tue Feb 24 07:31:42 2004
+++ libxmms/xmmsctrl.c	Sun Apr 11 21:18:15 2004
@@ -30,6 +30,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "xmmsctrl.h"
 #include "../xmms/controlsocket.h"
 
diff -ru wmxmms/getopt.c.orig xmms-1.2.10/wmxmms/getopt.c
--- wmxmms/getopt.c.orig	Fri Jul 30 07:03:12 1999
+++ wmxmms/getopt.c	Sun Apr 11 21:24:25 2004
@@ -43,6 +43,7 @@
 #endif
 
 #include <stdio.h>
+#include <string.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C
@@ -73,9 +74,6 @@
 
 #ifdef VMS
 #include <unixlib.h>
-#if HAVE_STRING_H - 0
-#include <string.h>
-#endif
 #endif
 
 #if defined (WIN32) && !defined (__CYGWIN32__)
diff -ru xmms/getopt.c.orig xmms/getopt.c
--- xmms/getopt.c.orig	Fri Jul 30 07:03:12 1999
+++ xmms/getopt.c	Sun Apr 11 21:20:00 2004
@@ -43,6 +43,7 @@
 #endif
 
 #include <stdio.h>
+#include <string.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C
@@ -73,9 +74,6 @@
 
 #ifdef VMS
 #include <unixlib.h>
-#if HAVE_STRING_H - 0
-#include <string.h>
-#endif
 #endif
 
 #if defined (WIN32) && !defined (__CYGWIN32__)
>Release-Note:
>Audit-Trail:
>Unformatted: