SOURCES: mas-0.6.0-x86_64.patch (NEW), mas-0.6.2-fftw.patch.bz2 (N...
paszczus
paszczus at pld-linux.org
Tue Aug 16 15:44:00 CEST 2005
Author: paszczus Date: Tue Aug 16 13:44:00 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- some files for mas, some of them propably to remove
---- Files affected:
SOURCES:
mas-0.6.0-x86_64.patch (NONE -> 1.1) (NEW), mas-0.6.2-fftw.patch.bz2 (NONE -> 1.1) (NEW), mas-0.6.3-logdir.patch.bz2 (NONE -> 1.1) (NEW), mas-add-components.dif (NONE -> 1.1) (NEW), mas-byteswap-fix.dif (NONE -> 1.1) (NEW), mas-launch-fix.dif (NONE -> 1.1) (NEW), mas-launch-lib64-fix.dif (NONE -> 1.1) (NEW), mas-lib64.dif (NONE -> 1.1) (NEW), mas-path.dif (NONE -> 1.1) (NEW), masconf.desktop (NONE -> 1.1) (NEW), masmix.desktop (NONE -> 1.1) (NEW), masplayer.desktop (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/mas-0.6.0-x86_64.patch
diff -u /dev/null SOURCES/mas-0.6.0-x86_64.patch:1.1
--- /dev/null Tue Aug 16 15:44:00 2005
+++ SOURCES/mas-0.6.0-x86_64.patch Tue Aug 16 15:43:55 2005
@@ -0,0 +1,74 @@
+--- config/Imake.cf
++++ config/Imake.cf
+@@ -418,6 +418,7 @@
+ # ifdef i386
+ # define i386Architecture
+ # undef i386
++# endif
+ # ifdef __i386__
+ # ifndef i386Architecture
+ # define i386Architecture
+@@ -428,7 +429,16 @@
+ # define AlphaArchitecture
+ # undef __alpha
+ # endif /* __alpha */
+-#endif
++# if defined(__x86_64__)
++# undef __x86_64__
++# define x86_64Architecture
++# endif
++# if defined(x86_64__)
++# undef x86_64__
++# ifndef x86_64Architecture
++# define x86_64Architecture
++# endif
++# endif
+ #endif /* linux */
+
+ #ifdef __uxp__
+--- config/linux.cf
++++ config/linux.cf
+@@ -195,6 +195,15 @@
+ #endif
+ #endif /* i386Architecture */
+
++#ifdef x86_64Architecture
++# ifndef OptimizedCDebugFlags
++# define OptimizedCDebugFlags DefaultGcc2x86_64Opt
++# endif
++# define LinuxMachineDefines -D__x86_64__
++# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#endif /* x86_64Architecture */
++
+ #ifdef AlphaArchitecture
+ #define OptimizedCDebugFlags -O2
+ #define LinuxMachineDefines -D__alpha__
+--- config/mas.tmpl
++++ config/mas.tmpl
+@@ -52,6 +52,10 @@
+ MAS_ENDIANNESS = MAS_LITTLE_ENDIAN
+ #define MAS_WE_ARE_LITTLE_ENDIAN
+
++#elif defined(x86_64Architecture)
++MAS_ENDIANNESS = MAS_LITTLE_ENDIAN
++#define MAS_WE_ARE_LITTLE_ENDIAN
++
+ #elif defined(ia64Architecture)
+ MAS_ENDIANNESS = MAS_LITTLE_ENDIAN
+ #define MAS_WE_ARE_LITTLE_ENDIAN
+--- config/xfree86.cf
++++ config/xfree86.cf
+@@ -584,6 +584,12 @@
+ #endif
+ #endif
+
++#if HasGcc2 && defined(x86_64Architecture)
++# ifndef DefaultGcc2x86_64Opt
++# define DefaultGcc2x86_64Opt -O2 -fno-strength-reduce
++# endif
++#endif
++
+ #ifndef BuildLBXCompatible
+ #define BuildLBXCompatible NO
+ #endif
================================================================
Index: SOURCES/mas-0.6.2-fftw.patch.bz2
<<Binary file>>
================================================================
Index: SOURCES/mas-0.6.3-logdir.patch.bz2
<<Binary file>>
================================================================
Index: SOURCES/mas-add-components.dif
diff -u /dev/null SOURCES/mas-add-components.dif:1.1
--- /dev/null Tue Aug 16 15:44:00 2005
+++ SOURCES/mas-add-components.dif Tue Aug 16 15:43:55 2005
@@ -0,0 +1,12 @@
+diff -urN mas-0.6.3/Imakefile mas-0.6.3-patched/Imakefile
+--- mas-0.6.3/Imakefile 2004-06-15 00:42:49.000000000 +0200
++++ mas-0.6.3-patched/Imakefile 2005-02-06 13:47:54.959885392 +0100
+@@ -2,7 +2,7 @@
+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
+
+ # The build order is important.
+-SUBDIRS = config share common jrtplib mas devices maslib miscgtk clients
++SUBDIRS = config share common jrtplib mas devices maslib miscgtk clients devtools control-apps
+
+ #ifndef OSName
+ #define OSName Unknown Operating System!
================================================================
Index: SOURCES/mas-byteswap-fix.dif
diff -u /dev/null SOURCES/mas-byteswap-fix.dif:1.1
--- /dev/null Tue Aug 16 15:44:00 2005
+++ SOURCES/mas-byteswap-fix.dif Tue Aug 16 15:43:55 2005
@@ -0,0 +1,19 @@
+diff -urN mas-0.6.3/common/mas_endian.h mas-0.6.3-patched/common/mas_endian.h
+--- mas-0.6.3/common/mas_endian.h 2003-01-22 14:26:17.000000000 +0100
++++ mas-0.6.3-patched/common/mas_endian.h 2005-02-06 14:11:03.236835216 +0100
+@@ -160,12 +160,12 @@
+
+ /** Use faster system byte swapping functions if available */
+ #ifdef linux
+-#include <asm/byteorder.h>
++#include <byteswap.h>
+ #ifdef __arch__swab16
+-#define mas_swap16 __arch__swab16
++#define mas_swap16 bswap_16
+ #endif
+ #ifdef __arch__swab32
+-#define mas_swap32 __arch__swab32
++#define mas_swap32 bswap_32
+ #endif
+ #endif
+
================================================================
Index: SOURCES/mas-launch-fix.dif
diff -u /dev/null SOURCES/mas-launch-fix.dif:1.1
--- /dev/null Tue Aug 16 15:44:00 2005
+++ SOURCES/mas-launch-fix.dif Tue Aug 16 15:43:55 2005
@@ -0,0 +1,18 @@
+--- clients/util/mas-launch.sh-dist 2003-09-11 15:32:43.000000000 +0200
++++ clients/util/mas-launch.sh 2003-09-11 15:34:54.000000000 +0200
+@@ -1,11 +1,12 @@
+ #!/bin/sh
+
+-PREFIX=/usr/local/mas
+-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PREFIX}/lib
++PREFIX=/usr
++# LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PREFIX}/lib
+ MAS_PATH=${PREFIX}/lib/mas
+ MAS=${PREFIX}/bin/mas
+ MAS_WD=${PREFIX}/bin/maswatchdog
+-LOG=${PREFIX}/mas-1.log
++LOG=/var/tmp/mas-1.log
++test -f $LOG && rm -f $LOG
+
+ # kill esound if it's running -- we can't coexist.
+ pkill esd
================================================================
Index: SOURCES/mas-launch-lib64-fix.dif
diff -u /dev/null SOURCES/mas-launch-lib64-fix.dif:1.1
--- /dev/null Tue Aug 16 15:44:00 2005
+++ SOURCES/mas-launch-lib64-fix.dif Tue Aug 16 15:43:55 2005
@@ -0,0 +1,11 @@
+--- clients/util/mas-launch.sh 2003-09-11 15:37:23.000000000 +0200
++++ clients/util/mas-launch.sh 2003-09-11 15:37:37.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ PREFIX=/usr
+ # LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PREFIX}/lib
+-MAS_PATH=${PREFIX}/lib/mas
++MAS_PATH=${PREFIX}/lib64/mas
+ MAS=${PREFIX}/bin/mas
+ MAS_WD=${PREFIX}/bin/maswatchdog
+ LOG=/var/tmp/mas-1.log
================================================================
Index: SOURCES/mas-lib64.dif
diff -u /dev/null SOURCES/mas-lib64.dif:1.1
--- /dev/null Tue Aug 16 15:44:00 2005
+++ SOURCES/mas-lib64.dif Tue Aug 16 15:43:55 2005
@@ -0,0 +1,54 @@
+--- config/mas.rules-dist 2003-07-28 16:22:24.502137080 +0200
++++ config/mas.rules 2003-07-28 16:23:51.563901680 +0200
+@@ -33,7 +33,7 @@
+ #endif
+
+ #ifdef MASProjectRoot
+-# define XUsrLibDirPath $(USRLIBDIR):$(MASPROJECTROOT)/lib
++# define XUsrLibDirPath $(USRLIBDIR):$(MASPROJECTROOT)/lib64
+ #else
+ # define XUsrLibDirPath $(USRLIBDIR)
+ #endif
+@@ -45,7 +45,7 @@
+ #if ImportMAS
+ # define XLdPreLibs -L$(LIBSRC)
+ #elif defined(UseInstalledMAS) && defined(MASProjectRoot)
+-# define XLdPreLibs -L$(MASPROJECTROOT)/lib
++# define XLdPreLibs -L$(MASPROJECTROOT)/lib64
+ #else
+ # define XLdPreLibs /**/
+ #endif
+@@ -55,7 +55,7 @@
+ #define LdPreLibs LdPreLib XLdPreLibs
+
+ #ifdef MASProjectRoot
+-# define XLdPostLibs -L$(MASPROJECTROOT)/lib
++# define XLdPostLibs -L$(MASPROJECTROOT)/lib64
+ #else
+ # define XLdPostLibs /**/
+ #endif
+@@ -77,11 +77,11 @@
+ #define TopIncludes TopInclude $(TOP_X_INCLUDES)
+
+ #if UseInstalledMAS && defined(MASProjectRoot)
+-# define X11BuildLibPath $(MASPROJECTROOT)/lib
++# define X11BuildLibPath $(MASPROJECTROOT)/lib64
+ #elif UseInstalledMAS
+ # define X11BuildLibPath $(USRLIBDIR)
+ #elif ImportMAS
+-# define X11BuildLibPath $(MASTOP)/lib
++# define X11BuildLibPath $(MASTOP)/lib64
+ #else
+ # define X11BuildLibPath $(TOP)/exports/lib
+ #endif
+--- devices/visual/Imakefile 2003/08/13 00:59:19 1.1
++++ devices/visual/Imakefile 2003/08/13 00:59:35
+@@ -16,7 +16,7 @@
+ #endif
+
+ #ifdef LinuxArchitecture
+-ARCHREQUIREDLIBS = -L/usr/X11R6/lib
++ARCHREQUIREDLIBS = -L/usr/X11R6/lib64
+ #endif
+
+ #ifdef SunArchitecture
================================================================
Index: SOURCES/mas-path.dif
diff -u /dev/null SOURCES/mas-path.dif:1.1
--- /dev/null Tue Aug 16 15:44:00 2005
+++ SOURCES/mas-path.dif Tue Aug 16 15:43:55 2005
@@ -0,0 +1,12 @@
+diff -urN mas-0.6.0/config/site.def mas-0.6.0-patched/config/site.def
+--- mas-0.6.0/config/site.def 2002-03-14 17:17:08.000000000 +0100
++++ mas-0.6.0-patched/config/site.def 2005-02-05 21:05:02.202803360 +0100
+@@ -67,7 +67,7 @@
+ #ifdef AfterVendorCF
+
+ #ifndef ProjectRoot
+-#define ProjectRoot /usr/local/mas
++#define ProjectRoot /usr
+ #endif
+
+ /* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */
================================================================
Index: SOURCES/masconf.desktop
diff -u /dev/null SOURCES/masconf.desktop:1.1
--- /dev/null Tue Aug 16 15:44:00 2005
+++ SOURCES/masconf.desktop Tue Aug 16 15:43:55 2005
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Exec=masconf_gui
+Name=MAS Sound System Configuration
+Icon=M_25px_icon.png
+
================================================================
Index: SOURCES/masmix.desktop
diff -u /dev/null SOURCES/masmix.desktop:1.1
--- /dev/null Tue Aug 16 15:44:00 2005
+++ SOURCES/masmix.desktop Tue Aug 16 15:43:55 2005
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Exec=masmix
+Name=MAS Sound System Mixer
+Icon=M_25px_icon.png
+
================================================================
Index: SOURCES/masplayer.desktop
diff -u /dev/null SOURCES/masplayer.desktop:1.1
--- /dev/null Tue Aug 16 15:44:00 2005
+++ SOURCES/masplayer.desktop Tue Aug 16 15:43:55 2005
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Exec=masplayer
+Name=MAS Player
+Icon=M_25px_icon.png
+
================================================================
More information about the pld-cvs-commit
mailing list