[47013] trunk/dports/audio/xmms
blb at macports.org
blb at macports.org
Thu Feb 19 14:06:41 PST 2009
Revision: 47013
http://trac.macports.org/changeset/47013
Author: blb at macports.org
Date: 2009-02-19 14:06:41 -0800 (Thu, 19 Feb 2009)
Log Message:
-----------
audio/xmms - version update to 1.2.11 (ticket #16595); split still-needed
patches from patch-xmms into file-based patches; make plugins work; switch
to port:-style dependencies for most things, and bison is build-time; put
manpages in right place
Modified Paths:
--------------
trunk/dports/audio/xmms/Portfile
Added Paths:
-----------
trunk/dports/audio/xmms/files/patch-configure.diff
trunk/dports/audio/xmms/files/patch-libxmms_util.c.diff
trunk/dports/audio/xmms/files/patch-xmms_Makefile.in.diff
Removed Paths:
-------------
trunk/dports/audio/xmms/files/patch-xmms
Modified: trunk/dports/audio/xmms/Portfile
===================================================================
--- trunk/dports/audio/xmms/Portfile 2009-02-19 21:54:18 UTC (rev 47012)
+++ trunk/dports/audio/xmms/Portfile 2009-02-19 22:06:41 UTC (rev 47013)
@@ -4,9 +4,8 @@
PortSystem 1.0
name xmms
-version 1.2.10
+version 1.2.11
set branch [join [lrange [split ${version} .] 0 1] .]
-revision 2
categories audio
maintainers nomaintainer
homepage http://www.xmms.org/
@@ -21,31 +20,38 @@
use_bzip2 yes
+depends_build \
+ bin:bison:bison
+
depends_lib \
- lib:libglib.1:glib1 \
- lib:libgtk.1:gtk1 \
- lib:libesd.0:esound \
- lib:libintl:gettext \
- bin:bison:bison \
- lib:libiconv:libiconv \
- lib:libvorbis:libvorbis \
- lib:libmikmod:libmikmod \
- lib:libogg:libogg
+ port:glib1 \
+ port:gtk1 \
+ port:esound \
+ port:gettext \
+ port:libiconv \
+ port:libvorbis \
+ port:libmikmod \
+ port:libogg
checksums \
- md5 03a85cfc5e1877a2e1f7be4fa1d3f63c
+ md5 f3e6dbaf0b3f571a532ab575656be506 \
+ sha1 9d1eae4baab25fd35c9ddfb49321ca60222f672d \
+ rmd160 466a624572574c56595ef34f42c43d0b74857b0a
patchfiles \
- patch-xmms \
+ patch-libxmms_util.c.diff \
+ patch-xmms_Makefile.in.diff \
patch-General-ir-ir.c \
- patch-Intel-noasm.diff
+ patch-Intel-noasm.diff \
+ patch-configure.diff
configure.cflags-append \
-I${prefix}/include
configure.args \
--disable-alsatest \
- --with-gtk=${prefix}
+ --with-gtk=${prefix} \
+ --mandir=${prefix}/share/man
# There is no oss interface on darwin/osx
platform darwin {
Added: trunk/dports/audio/xmms/files/patch-configure.diff
===================================================================
--- trunk/dports/audio/xmms/files/patch-configure.diff (rev 0)
+++ trunk/dports/audio/xmms/files/patch-configure.diff 2009-02-19 22:06:41 UTC (rev 47013)
@@ -0,0 +1,16 @@
+--- configure.orig 2007-11-16 14:54:45.000000000 -0700
++++ configure 2009-02-19 14:54:27.000000000 -0700
+@@ -33390,13 +33390,6 @@
+
+ fi
+ ;;
+- *-*-darwin*)
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define SYMBOL_PREFIX "_"
+-_ACEOF
+-
+- ;;
+ *-hpux-*)
+ ARCH_DEFINES="-DHPUX"
+ ;;
Added: trunk/dports/audio/xmms/files/patch-libxmms_util.c.diff
===================================================================
--- trunk/dports/audio/xmms/files/patch-libxmms_util.c.diff (rev 0)
+++ trunk/dports/audio/xmms/files/patch-libxmms_util.c.diff 2009-02-19 22:06:41 UTC (rev 47013)
@@ -0,0 +1,45 @@
+--- libxmms/util.c.orig 2005-05-14 18:01:20.000000000 -0600
++++ libxmms/util.c 2009-02-19 02:22:55.000000000 -0700
+@@ -15,6 +15,13 @@
+ #include <sys/sysctl.h>
+ #endif
+
++#if defined (__APPLE__)
++#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 @@
+
+ gboolean xmms_check_realtime_priority(void)
+ {
++#if defined (__APPLE__)
++ 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__
+ /*
Deleted: trunk/dports/audio/xmms/files/patch-xmms
===================================================================
--- trunk/dports/audio/xmms/files/patch-xmms 2009-02-19 21:54:18 UTC (rev 47012)
+++ trunk/dports/audio/xmms/files/patch-xmms 2009-02-19 22:06:41 UTC (rev 47013)
@@ -1,91 +0,0 @@
---- configure.orig Fri Sep 5 06:00:38 2003
-+++ configure Mon Dec 8 03:04:01 2003
-@@ -19078,13 +19078,6 @@
-
- fi
- ;;
-- *-*-darwin*)
--
--cat >>confdefs.h <<\_ACEOF
--#define SYMBOL_PREFIX "_"
--_ACEOF
--
-- ;;
- *-hpux-*)
- ARCH_DEFINES="-DHPUX"
- ;;
---- libxmms/util.c.orig Wed Jan 15 00:09:18 2003
-+++ libxmms/util.c Mon Dec 8 03:04:01 2003
-@@ -15,6 +15,13 @@
- #include <sys/sysctl.h>
- #endif
-
-+#if defined (__APPLE__)
-+#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 @@
-
- gboolean xmms_check_realtime_priority(void)
- {
-+#if defined (__APPLE__)
-+ 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__
- /*
---- ltmain.sh.orig Wed Aug 13 21:59:04 2003
-+++ ltmain.sh Mon Dec 8 04:11:26 2003
-@@ -4053,10 +4053,10 @@
-
- # Directory that this library needs to be installed in:
- libdir='$install_libdir'"
-- if test "$installed" = no && test $need_relink = yes; then
-- $echo >> $output "\
--relink_command=\"$relink_command\""
-- fi
-+# if test "$installed" = no && test $need_relink = yes; then
-+# $echo >> $output "\
-+#relink_command=\"$relink_command\""
-+# fi
- done
- fi
-
---- xmms/Makefile.in.orig Fri Sep 5 06:01:20 2003
-+++ xmms/Makefile.in Mon Dec 8 03:11:12 2003
-@@ -176,8 +176,8 @@
- bin_PROGRAMS = xmms
-
- xmms_LDFLAGS = -export-dynamic
--xmms_LDADD = @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \
-- at POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @LTLIBINTL@
-+xmms_LDADD = $(top_builddir)/libxmms/libxmms.la @GTK_LIBS@ \
-+ at PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ @POSIX_LIBS@ @LTLIBINTL@
-
-
- INCLUDES = @GTK_CFLAGS@ @XMMS_DEFINES@ @ARCH_DEFINES@ \
Added: trunk/dports/audio/xmms/files/patch-xmms_Makefile.in.diff
===================================================================
--- trunk/dports/audio/xmms/files/patch-xmms_Makefile.in.diff (rev 0)
+++ trunk/dports/audio/xmms/files/patch-xmms_Makefile.in.diff 2009-02-19 22:06:41 UTC (rev 47013)
@@ -0,0 +1,13 @@
+--- xmms/Makefile.in.orig 2007-11-16 14:54:44.000000000 -0700
++++ xmms/Makefile.in 2009-02-19 02:27:40.000000000 -0700
+@@ -306,8 +306,8 @@
+ SUBDIRS = defskin
+ xmmsincludedir = $(includedir)/xmms
+ xmms_LDFLAGS = -export-dynamic
+-xmms_LDADD = @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \
+- at POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @LTLIBINTL@
++xmms_LDADD = $(top_builddir)/libxmms/libxmms.la @GTK_LIBS@ \
++ at PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ @POSIX_LIBS@ @LTLIBINTL@
+
+ INCLUDES = @GTK_CFLAGS@ @XMMS_DEFINES@ @ARCH_DEFINES@ \
+ -I$(top_builddir)/intl -I$(top_srcdir)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090219/861de9f5/attachment-0001.html>
More information about the macports-changes
mailing list