Fix xmms to build on i386 Mac OS X 10.4.7.

Remove the _ SYMBOL_PREFIX, as OpenDarwin ports does.

Disable i386 assembly optimizations.

Add OSX code to raise priority.

_INSTALL_UNSTRIPPED=yes on OSX.  Otherwise plugins, such as
lib/xmms/Input/libmpg123.so fail to load because the OSX linker can't
find symbols such as _xmms_get_gentitle_format from xmms/main.c.

4 files changed, 94 insertions, 2 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 62111dd5ae7..4807e69a7f4 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/07/08 01:22:41 minskim Exp $
+# $NetBSD: Makefile,v 1.62 2006/08/28 05:09:05 ben Exp $
 #
 
 PKGREVISION=		6
@@ -9,6 +9,7 @@ CONFIGURE_ARGS+=	--disable-esd
 
 .if ${OPSYS} == "Darwin"
 PLIST_SUBST+=	CDAUDIO="@comment "
+_INSTALL_UNSTRIPPED=	yes
 .else
 PLIST_SUBST+=	CDAUDIO=""
 .endif
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index 631163b95d3..a7153436bd9 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2006/03/03 03:45:23 minskim Exp $
+$NetBSD: distinfo,v 1.28 2006/08/28 05:09:05 ben Exp $
 
 SHA1 (xmms-1.2.10.tar.bz2) = a3c3d3756d5263183c27b3c50a7f5404cba8bfaf
 RMD160 (xmms-1.2.10.tar.bz2) = 0360cbb8c326b3325bd8ebb3343c69a9788d7084
@@ -15,3 +15,5 @@ SHA1 (patch-ai) = c0bb82e63e6fb96327b1ee1e9ec5617fe9b55b44
 SHA1 (patch-aj) = 67a69e2a05f343a5d7c22b3f1f1cf0c25d9aeb6d
 SHA1 (patch-ak) = b49316325c6f778b0d3e85007b141699cf338238
 SHA1 (patch-al) = 1457ca7b5e4e1084623207d042a8ff349eb31aaa
+SHA1 (patch-am) = 38e339a7f21921eedbed36ffe4c3ec0b1148c1e2
+SHA1 (patch-an) = 3abc68bd37018800dc70b151a5b419211a727a02
diff --git a/audio/xmms/patches/patch-am b/audio/xmms/patches/patch-am
new file mode 100644
index 00000000000..d8bd2e430a6
--- /dev/null
+++ b/audio/xmms/patches/patch-am
@@ -0,0 +1,42 @@
+$NetBSD: patch-am,v 1.6 2006/08/28 05:09:05 ben Exp $
+
+--- configure.orig	2004-02-23 13:44:32.000000000 -0800
++++ configure
+@@ -19078,13 +19078,6 @@ _ACEOF
+ 
+ 		fi
+ 	;;
+-	*-*-darwin*)
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define SYMBOL_PREFIX "_"
+-_ACEOF
+-
+-	;;
+ 	*-hpux-*)
+ 		ARCH_DEFINES="-DHPUX"
+ 	;;
+@@ -19099,7 +19092,7 @@ case "$host" in
+ 	i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
+ 		arch_type=ix86
+ 		case "$host" in
+-		        *-*-netbsd* | *-*openbsd*)
++		        *-*-netbsd* | *-*openbsd* | *-*darwin*)
+ 			;;
+ 			*)
+ 				ARCH_DEFINES="-DI386_ASSEM"
+@@ -19778,6 +19771,14 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
++	: Avoid regenerating within pkgsrc
++	exit 0
++	: Avoid regenerating within pkgsrc
++	exit 0
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
diff --git a/audio/xmms/patches/patch-an b/audio/xmms/patches/patch-an
new file mode 100644
index 00000000000..63bcf2c7c9f
--- /dev/null
+++ b/audio/xmms/patches/patch-an
@@ -0,0 +1,47 @@
+$NetBSD: patch-an,v 1.7 2006/08/28 05:09:05 ben Exp $
+
+--- libxmms/util.c.orig	2003-05-19 14:22:07.000000000 -0700
++++ libxmms/util.c
+@@ -15,6 +15,13 @@
+ #include <sys/sysctl.h>
+ #endif
+ 
++#if defined(__APPLE__) && defined(__MACH__)
++#include <mach/mach.h>
++#include <mach/thread_policy.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#endif
++
+ #if TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+ # include <time.h>
+@@ -73,6 +80,28 @@ GtkWidget *xmms_show_message(gchar * tit
+ 
+ gboolean xmms_check_realtime_priority(void)
+ {
++#if defined(__APPLE__) && defined(__MACH__)
++	struct thread_time_constraint_policy ttcpolicy;
++	int bus_speed, mib [2] = { CTL_HW, HW_BUS_FREQ };
++	size_t len;
++
++	len = sizeof (bus_speed);
++	sysctl (mib, 2, &bus_speed, &len, NULL, 0);
++
++	/* Is it enough? */
++	ttcpolicy.period = bus_speed / 120;
++	ttcpolicy.computation = bus_speed / 1000;
++	ttcpolicy.constraint = bus_speed / 500;
++	ttcpolicy.preemptible = 1;
++
++	thread_policy_set (mach_thread_self (),
++			   THREAD_TIME_CONSTRAINT_POLICY,
++			   (int*)&ttcpolicy,
++			   THREAD_TIME_CONSTRAINT_POLICY_COUNT);
++
++	return TRUE;
++#endif
++
+ #ifdef HAVE_SCHED_SETSCHEDULER
+ #ifdef __FreeBSD__
+ 	/*