Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17791/10.4/unstable/main/finkinfo/sound
Modified Files:
xmms.info xmms.patch
Log Message:
New upstream version (from tracker item #1200136)
Index: xmms.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/xmms.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xmms.info 21 Mar 2006 17:06:34 -0000 1.3
+++ xmms.info 25 Mar 2006 11:41:26 -0000 1.4
@@ -1,32 +1,30 @@
Package: xmms
-Version: 1.2.8
-Revision: 1004
+Version: 1.2.10
+Revision: 1
Depends: %N-bin (>= %v-%r)
-BuildDepends: esound, libogg, libvorbis0, libmikmod, glib, gtk+, libxml, fink
(>= 0.9.9), libgettext3-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
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp
SetLIBS: -L%p/lib
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
ConfigureParams: --mandir=%p/share/man --without-gnome
CompileScript: <<
- ./configure %c
+ export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c
perl -pi.bak -e 's/^#define.*SYMBOL_PREFIX.*$//g' config.h
perl -pi.bak -e 's/^#define.*SYMBOL_PREFIX.*$//g' libxmms/config.h
- make IR_SYSCONF_DIR=%p/etc
+ make IR_SYSCONF_DIR=%p/etc CC=gcc-3.3 CXX=g++-3.3
<<
InstallScript: <<
make install DESTDIR=%d
- rm -f %i/share/locale/locale.alias
+ rm -f %p/share/locale/locale.alias
<<
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
- Depends: esound-bin, libvorbis0-shlibs, libmikmod-shlibs, libxml-shlibs,
libgettext3-shlibs
+ Depends: esound-bin, libvorbis0-shlibs, libmikmod-shlibs, libxml-shlibs
Replaces: %N (<< 1.2.7)
Description: Multimedia player shared libraries
Files: lib/libxmms.*.dylib
@@ -42,7 +40,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,
@@ -50,7 +48,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/unstable/main/finkinfo/sound/xmms.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmms.patch 27 Feb 2006 15:02:02 -0000 1.2
+++ xmms.patch 25 Mar 2006 11:41:26 -0000 1.3
@@ -1,54 +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
-@@ -16,10 +16,10 @@
- #include "ir.h"
-
- /* Important stuff to know */
--static gboolean keepGoing = FALSE;
-+gboolean keepGoing = FALSE;
-
- /* The thread handle */
--static pthread_t irapp_thread;
-+pthread_t irapp_thread;
-
- /* 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 @@
- i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
- arch_type=ix86
- case "$host" in
-- *-*-netbsd* | *-*openbsd*)
-+ *-*-netbsd* | *-*openbsd* | *-*-darwin*)
- ;;
- *)
- 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 -urN 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 2005-05-11 19:22:53.000000000 +0200
@@ -15,6 +15,13 @@
#include <sys/sysctl.h>
#endif
@@ -63,38 +15,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 -urN 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 2005-05-11 17:50:01.000000000 +0200
@@ -4053,10 +4053,10 @@
# Directory that this library needs to be installed in:
@@ -110,17 +69,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 xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
