Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3024
Modified Files: xmms.info xmms.patch Log Message: gcc 4 version. Disabled asm code on Intel since gcc fails to understand it?! Index: xmms.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/xmms.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- xmms.info 20 Jan 2006 20:30:47 -0000 1.1 +++ xmms.info 27 Feb 2006 15:02:02 -0000 1.2 @@ -1,9 +1,8 @@ Package: xmms Version: 1.2.8 -Revision: 4 -Architecture: powerpc +Revision: 1004 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, gcc3.3 +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 Replaces: %N (<< 1.2.7) Source: http://www.xmms.org/files/1.2.x/%n-%v.tar.bz2 Source-MD5: d523735b59232f0eedd45dc2b7a4f5ad @@ -13,10 +12,10 @@ SetLIBS: -L%p/lib ConfigureParams: --mandir=%p/share/man --without-gnome CompileScript: << - export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c + ./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 CC=gcc-3.3 CXX=g++-3.3 + make IR_SYSCONF_DIR=%p/etc << InstallScript: << make install DESTDIR=%d Index: xmms.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/xmms.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- xmms.patch 20 Jan 2006 20:30:47 -0000 1.1 +++ xmms.patch 27 Feb 2006 15:02:02 -0000 1.2 @@ -1,6 +1,22 @@ -diff -Naur xmms-1.2.8.old/configure xmms-1.2.8.new/configure ---- xmms-1.2.8.old/configure Fri Sep 5 06:00:38 2003 -+++ xmms-1.2.8.new/configure Mon Dec 8 03:04:01 2003 +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 @@ -10,9 +26,18 @@ # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes -diff -Naur xmms-1.2.8.old/gnomexmms/gnomexmms.desktop xmms-1.2.8.new/gnomexmms/gnomexmms.desktop ---- xmms-1.2.8.old/gnomexmms/gnomexmms.desktop Tue Nov 28 07:20:58 2000 -+++ xmms-1.2.8.new/gnomexmms/gnomexmms.desktop Mon Dec 8 03:04:01 2003 +@@ -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 @@ -21,9 +46,9 @@ +Icon=gnomexmms.xpm Terminal=0 Type=Application -diff -Naur xmms-1.2.8.old/libxmms/util.c xmms-1.2.8.new/libxmms/util.c ---- xmms-1.2.8.old/libxmms/util.c Wed Jan 15 00:09:18 2003 -+++ xmms-1.2.8.new/libxmms/util.c Mon Dec 8 03:04:01 2003 +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 @@ -15,6 +15,13 @@ #include <sys/sysctl.h> #endif @@ -67,9 +92,9 @@ #ifdef HAVE_SCHED_SETSCHEDULER #ifdef __FreeBSD__ /* -diff -Naur xmms-1.2.8.old/ltmain.sh xmms-1.2.8.new/ltmain.sh ---- xmms-1.2.8.old/ltmain.sh Wed Aug 13 21:59:04 2003 -+++ xmms-1.2.8.new/ltmain.sh Mon Dec 8 04:11:26 2003 +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 @@ -4053,10 +4053,10 @@ # Directory that this library needs to be installed in: @@ -85,9 +110,9 @@ done fi -diff -Naur xmms-1.2.8.old/xmms/Makefile.in xmms-1.2.8.new/xmms/Makefile.in ---- xmms-1.2.8.old/xmms/Makefile.in Fri Sep 5 06:01:20 2003 -+++ xmms-1.2.8.new/xmms/Makefile.in Mon Dec 8 03:11:12 2003 +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 ------------------------------------------------------- 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 Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits