Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound
In directory sc8-pr-cvs17:/tmp/cvs-serv21994
Modified Files:
xmms.info xmms.patch
Log Message:
latest version to stable (with maintainers permission)
Index: xmms.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/xmms.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xmms.info 13 Jan 2007 19:34:29 -0000 1.4
+++ xmms.info 13 Jul 2007 15:06:54 -0000 1.5
@@ -1,12 +1,29 @@
Package: xmms
-Version: 1.2.8
-Revision: 1003
+Version: 1.2.10
+Revision: 3
Depends: %N-bin (>= %v-%r)
-BuildDepends: esound, libogg, libvorbis0, libmikmod, glib, gtk+, libxml, fink
(>= 0.9.9), gettext-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev,
esound-bin, audiofile
+BuildDepends: <<
+ esound,
+ libogg,
+ libvorbis0,
+ libmikmod,
+ glib,
+ gtk+,
+ libxml,
+ fink (>= 0.9.9),
+ gettext-dev,
+ gettext-bin,
+ gettext-tools,
+ libiconv-dev,
+ x11-dev,
+ esound-bin,
+ audiofile
+<<
Replaces: %N (<< 1.2.7)
Source: http://www.xmms.org/files/1.2.x/%n-%v.tar.bz2
-Source-MD5: d523735b59232f0eedd45dc2b7a4f5ad
+Source-MD5: 03a85cfc5e1877a2e1f7be4fa1d3f63c
Patch: %n.patch
+PatchScript: perl -pi -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' xmms.m4
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
NoSetMAKEFLAGS: true
@@ -41,7 +58,7 @@
DocFiles: AUTHORS COPYING ChangeLog FAQ NEWS README TODO
<<
DocFiles: AUTHORS COPYING ChangeLog FAQ NEWS README TODO
-Description: Multimedia player development headers and libraries
+Description: Multimedia player headers and libraries
DescDetail: <<
X MultiMedia System is a sound player written from scratch. Since it
uses the WinAmp GUI, it can use WinAmp skins. It can play mp3s, mods, s3ms,
@@ -49,7 +66,7 @@
visualization plugins.
<<
License: GPL
-Maintainer: None <[EMAIL PROTECTED]>
+Maintainer: Henning Kiel <[EMAIL PROTECTED]>
DescPackaging: <<
Originally packaged by Masanori Sekino.
<<
Index: xmms.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/xmms.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmms.patch 14 Mar 2006 19:11:02 -0000 1.2
+++ xmms.patch 13 Jul 2007 15:06:54 -0000 1.3
@@ -1,6 +1,6 @@
-diff -ru xmms-1.2.8.orig/General/ir/ir.c xmms-1.2.8/General/ir/ir.c
---- xmms-1.2.8.orig/General/ir/ir.c 2001-03-05 09:15:13.000000000 -0500
-+++ xmms-1.2.8/General/ir/ir.c 2006-02-26 22:07:59.000000000 -0500
+diff -ru xmms-1.2.10/General/ir/ir.c xmms-1.2.10-patched/General/ir/ir.c
+--- xmms-1.2.10/General/ir/ir.c 2001-03-05 14:17:44.000000000 +0100
++++ xmms-1.2.10-patched/General/ir/ir.c 2006-03-26 12:15:53.000000000
+0200
@@ -16,10 +16,10 @@
#include "ir.h"
@@ -14,19 +14,10 @@
/* Declarations for calls that we need to mention in the plugin struct */
static void init(void);
-diff -ru xmms-1.2.8.orig/configure xmms-1.2.8/configure
---- xmms-1.2.8.orig/configure 2003-09-04 17:00:38.000000000 -0400
-+++ xmms-1.2.8/configure 2006-02-26 22:07:35.000000000 -0500
-@@ -3918,7 +3918,7 @@
- # FIXME: Relying on posixy $() will cause problems for
- # cross-compilation, but unfortunately the echo tests do not
- # yet detect zsh echo's removal of \ escapes.
-- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
-install_name $rpath/$soname $verstring'
-+ archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
$(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
- # We need to add '_' to the symbols in $export_symbols first
- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
- hardcode_direct=yes
-@@ -13060,7 +13060,7 @@
+diff -ru xmms-1.2.10/configure xmms-1.2.10-patched/configure
+--- xmms-1.2.10/configure 2004-02-23 22:44:32.000000000 +0100
++++ xmms-1.2.10-patched/configure 2006-03-26 12:15:42.000000000 +0200
+@@ -19099,7 +19099,7 @@
i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
arch_type=ix86
case "$host" in
@@ -35,20 +26,9 @@
;;
*)
ARCH_DEFINES="-DI386_ASSEM"
-diff -ru xmms-1.2.8.orig/gnomexmms/gnomexmms.desktop
xmms-1.2.8/gnomexmms/gnomexmms.desktop
---- xmms-1.2.8.orig/gnomexmms/gnomexmms.desktop 2000-11-27
17:20:58.000000000 -0500
-+++ xmms-1.2.8/gnomexmms/gnomexmms.desktop 2006-02-26 22:07:35.000000000
-0500
-@@ -9,6 +9,6 @@
- Name[sv]=XMMS-panelprogram
- Name[pt_BR]=Applet do XMMS
- Exec=gnomexmms --activate-goad-server=gnomexmms
--Icon=
-+Icon=gnomexmms.xpm
- Terminal=0
- Type=Application
-diff -ru xmms-1.2.8.orig/libxmms/util.c xmms-1.2.8/libxmms/util.c
---- xmms-1.2.8.orig/libxmms/util.c 2003-01-14 10:09:18.000000000 -0500
-+++ xmms-1.2.8/libxmms/util.c 2006-02-26 22:07:35.000000000 -0500
+diff -ru xmms-1.2.10/libxmms/util.c xmms-1.2.10-patched/libxmms/util.c
+--- xmms-1.2.10/libxmms/util.c 2003-05-19 23:22:07.000000000 +0200
++++ xmms-1.2.10-patched/libxmms/util.c 2006-03-26 12:14:47.000000000 +0200
@@ -15,6 +15,13 @@
#include <sys/sysctl.h>
#endif
@@ -63,38 +43,45 @@
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
-@@ -73,6 +80,28 @@
+@@ -73,6 +80,35 @@
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;
++ mach_port_t machThread = mach_thread_self();
++ kern_return_t result = 0;
++ thread_extended_policy_data_t timeShareData;
++ thread_precedence_policy_data_t precidenceData;
+
-+ len = sizeof (bus_speed);
-+ sysctl (mib, 2, &bus_speed, &len, NULL, 0);
++ //Copied from
http://lists.apple.com/archives/scitech/2003/Jan/msg00119.html. We put priority
to 20 and, this is the important part,
++ //set this thread not to timeshare, but to a round robin priority.
++ precidenceData.importance = 20;
++ timeShareData.timeshare = FALSE;
+
-+ /* Is it enough? */
-+ ttcpolicy.period = bus_speed / 120;
-+ ttcpolicy.computation = bus_speed / 1000;
-+ ttcpolicy.constraint = bus_speed / 500;
-+ ttcpolicy.preemptible = 1;
++ //Set the scheduling flavor. We want to do this first, since doing so
++ //can alter the priority
++ result = thread_policy_set( machThread,
++ THREAD_EXTENDED_POLICY,
++ &timeShareData,
++ THREAD_EXTENDED_POLICY_COUNT );
+
-+ thread_policy_set (mach_thread_self (),
-+ THREAD_TIME_CONSTRAINT_POLICY,
-+ (int*)&ttcpolicy,
-+ THREAD_TIME_CONSTRAINT_POLICY_COUNT);
++ if( 0 != result )
++ return result;
++
++ //Now set the priority
++ return thread_policy_set( machThread,
++ THREAD_PRECEDENCE_POLICY,
++ &precidenceData,
++ THREAD_PRECEDENCE_POLICY_COUNT );
+
+ return TRUE;
+#endif
-+
#ifdef HAVE_SCHED_SETSCHEDULER
#ifdef __FreeBSD__
/*
-diff -ru xmms-1.2.8.orig/ltmain.sh xmms-1.2.8/ltmain.sh
---- xmms-1.2.8.orig/ltmain.sh 2003-08-13 08:59:04.000000000 -0400
-+++ xmms-1.2.8/ltmain.sh 2006-02-26 22:07:35.000000000 -0500
+diff -ru xmms-1.2.10/ltmain.sh xmms-1.2.10-patched/ltmain.sh
+--- xmms-1.2.10/ltmain.sh 2003-09-04 22:59:05.000000000 +0200
++++ xmms-1.2.10-patched/ltmain.sh 2006-03-26 12:14:47.000000000 +0200
@@ -4053,10 +4053,10 @@
# Directory that this library needs to be installed in:
@@ -110,17 +97,3 @@
done
fi
-diff -ru xmms-1.2.8.orig/xmms/Makefile.in xmms-1.2.8/xmms/Makefile.in
---- xmms-1.2.8.orig/xmms/Makefile.in 2003-09-04 17:01:20.000000000 -0400
-+++ xmms-1.2.8/xmms/Makefile.in 2006-02-26 22:07:35.000000000 -0500
-@@ -176,8 +176,8 @@
- bin_PROGRAMS = xmms
-
- xmms_LDFLAGS = -export-dynamic
--xmms_LDADD = @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \
[EMAIL PROTECTED]@ $(top_builddir)/libxmms/libxmms.la @LTLIBINTL@
-+xmms_LDADD = $(top_builddir)/libxmms/libxmms.la @GTK_LIBS@ \
[EMAIL PROTECTED]@ @SM_LIBS@ @VM_LIBS@ @POSIX_LIBS@ @LTLIBINTL@
-
-
- INCLUDES = @GTK_CFLAGS@ @XMMS_DEFINES@ @ARCH_DEFINES@ \
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
