diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-09-16 17:25:20 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-09-16 17:25:20 +0000 |
| commit | 7a43242d788bd43dfcaa21aa372c5b2a309d41e0 (patch) | |
| tree | 78097d2f31462a802a155ccaff118a7584b4fe77 | |
| parent | c906145bd22b2a44caf7bb8a0142970700691cdd (diff) | |
cleaned up macintel patch
svn path=/trunk/; revision=5951
| -rw-r--r-- | packages/patches/TODO | 9 | ||||
| -rw-r--r-- | packages/patches/macintel-0.39.2.patch | 35 |
2 files changed, 19 insertions, 25 deletions
diff --git a/packages/patches/TODO b/packages/patches/TODO index c073e514..91410ea0 100644 --- a/packages/patches/TODO +++ b/packages/patches/TODO @@ -2,10 +2,13 @@ - check out Mac/Intel patches ----------------------- -Patches accepted into 0.40 ----------------------- +----------------------------------- +Patches accepted into or obsoleted by 0.40 +----------------------------------- +- bang_method_for_clip-0.40.pre.patch +- complete_version_defines-0.39.2.patch +- fftw_support-0.39-1.patch - number_bug_list_bug-0.39.2.patch - help_browser-0.39.2.patch - mingw_fixes-0.39-2.patch diff --git a/packages/patches/macintel-0.39.2.patch b/packages/patches/macintel-0.39.2.patch index 1fd9317c..99308238 100644 --- a/packages/patches/macintel-0.39.2.patch +++ b/packages/patches/macintel-0.39.2.patch @@ -1,31 +1,22 @@ Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v -retrieving revision 1.16 -diff -u -w -r1.16 configure.in ---- configure.in 31 Dec 2005 20:55:25 -0000 1.16 -+++ configure.in 24 May 2006 16:57:41 -0000 -@@ -260,12 +260,22 @@ - -framework AudioUnit -framework AudioToolbox \ - -framework Carbon -framework CoreMIDI" - EXT=pd_darwin -- MORECFLAGS="-DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include \ -+if test `uname -p` = i386; -+then -+ MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include \ -+ -I../portaudio/pa_common -I../portaudio/pablio \ -+ -I../portmidi/pm_common -I../portmidi/pm_mac \ -+ -I../portmidi/porttime \ -+ -Wno-error \ -+ -DUSEAPI_PORTAUDIO -DPA_LITTLE_ENDIAN -DPA19 -DPA_USE_COREAUDIO" -+else -+ MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include \ - -I../portaudio/pa_common -I../portaudio/pablio \ +retrieving revision 1.15 +diff -u -w -r1.15 configure.in +--- configure.in 16 Aug 2005 04:06:28 -0000 1.15 ++++ configure.in 16 Sep 2006 17:19:16 -0000 +@@ -265,7 +265,13 @@ -I../portmidi/pm_common -I../portmidi/pm_mac \ -I../portmidi/porttime \ -Wno-error \ - -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO" -+fi +- -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO" ++ -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO" ++ if test `uname -p` == powerpc; ++ then ++ MORECFLAGS="$MORECFLAGS -DPA_BIG_ENDIAN" ++ else ++ MORECFLAGS="$MORECFLAGS -DPA_LITTLE_ENDIAN" ++ fi SYSSRC="s_midi_pm.c s_audio_pa.c \ s_audio_pablio.c \ s_audio_paring.c \ |