From 79f3915908d50fc0f470da1494b5bdf28c217f6a Mon Sep 17 00:00:00 2001
From: Miller Puckette <msp@ucsd.edu>
Date: Fri, 3 Aug 2007 18:21:37 -0700
Subject: [PATCH] fixes fro new portaudio/portmidi on mac
---
linux/git-add-pd.sh | 1 -
linux/make-release | 17 ++++++++---------
src/configure.in | 7 +++++--
src/s_midi_pm.c | 1 -
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/linux/git-add-pd.sh b/linux/git-add-pd.sh
index 2eb6e8464..8cf1deb98 100755
--- a/linux/git-add-pd.sh
+++ b/linux/git-add-pd.sh
@@ -1,3 +1,2 @@
-cd ~/pd
git add INSTALL.txt LICENSE.txt README.txt doc extra man \
portaudio portmidi src msw linux
diff --git a/linux/make-release b/linux/make-release
index 0ffdb8a73..45166559c 100755
--- a/linux/make-release
+++ b/linux/make-release
@@ -1,16 +1,17 @@
#!/bin/sh
-#usage: ./make-release 0.34-0 or 0.35-0test11 or 0.37-1test6
+#usage: ./make-release <version>
if test x$1 == x
then
- echo usage: ./make-release 0.34-0 or 0.35-0test11 or 0.37-1test6
+ echo usage: ./make-release 0.34-0 or 0.35-0test11 or ...
exit 1
fi
-set -x
+# set -x
cd ..
ROOTDIR=`pwd`
-find . \( -name ".[a-zA-Z]*" -o -name "core*" -o -name "*.cache" \) \
+find . \( -name ".[azA-Z]*" \! -name ".git" \
+ -o -name "core" -o -name "core.*" -o -name "*.cache" \) \
-ok rm -r {} \;
cd src
@@ -22,17 +23,15 @@ cd ..
TMPPD=/tmp/pd-$1
rm -rf /tmp/pd $TMPPD
mkdir $TMPPD
-cp -a README.txt LICENSE.txt INSTALL.txt src doc extra man \
+cp -pR README.txt LICENSE.txt INSTALL.txt src doc extra man \
portaudio portmidi $TMPPD
mkdir $TMPPD/obj $TMPPD/bin
cd $TMPPD/src
autoconf
make distclean
rm -rf autom4te.cache
-rm *.pd
+rm -f *.pd
cd /tmp
tar cf - pd-$1 | gzip > $ROOTDIR/archive/dist/pd-$1.src.tar.gz
-mv pd-$1 pd
-tar cf - pd | gzip > /usr/src/redhat/SOURCES/pd.tar.gz
-# rm -rf /tmp/pd $TMPPD
+rm -rf $TMPPD
ls -l $ROOTDIR/archive/dist/pd-$1.src.tar.gz
diff --git a/src/configure.in b/src/configure.in
index 46837b439..e328f6aac 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -214,7 +214,8 @@ dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
../portaudio/src/common/pa_skeleton.c \
../portaudio/src/common/pa_stream.c \
../portaudio/src/common/pa_trace.c \
- ../portaudio/src/common/pa_debugprint.c \
+ ../portaudio/src/common/pa_debugprint.c \
+ ../portaudio/src/common/pa_ringbuffer.c \
../portaudio/src/os/unix/pa_unix_hostapis.c \
../portaudio/src/os/unix/pa_unix_util.c \
../portaudio/src/hostapi/oss/pa_unix_oss.c "$SYSSRC
@@ -266,7 +267,7 @@ then
-I../portaudio/src/os/mac_osx/ \
-I../portmidi/pm_common -I../portmidi/pm_mac \
-I../portmidi/porttime \
- -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO"
+ -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -DNEWBUFFER"
if test `uname -r` = 7.9.0;
then
MORECFLAGS="-DMACOSX3 -DPA_BIG_ENDIAN -Wno-error"
@@ -290,6 +291,7 @@ then
../portaudio/src/common/pa_stream.c \
../portaudio/src/common/pa_trace.c \
../portaudio/src/common/pa_debugprint.c \
+ ../portaudio/src/common/pa_ringbuffer.c \
../portaudio/src/os/unix/pa_unix_util.c \
../portaudio/src/os/mac_osx/pa_mac_hostapis.c \
../portaudio/src/hostapi/coreaudio/pa_mac_core.c \
@@ -361,6 +363,7 @@ then
../portaudio/src/common/pa_stream.c \
../portaudio/src/common/pa_trace.c \
../portaudio/src/common/pa_debugprint.c \
+ ../portaudio/src/common/pa_ringbuffer.c \
../portaudio/src/os/win/pa_win_util.c \
../portaudio/src/os/win/pa_win_hostapis.c \
../portaudio/src/os/win/pa_x86_plain_converters.c \
diff --git a/src/s_midi_pm.c b/src/s_midi_pm.c
index b09932687..831f3f060 100644
--- a/src/s_midi_pm.c
+++ b/src/s_midi_pm.c
@@ -21,7 +21,6 @@
#include "portaudio.h"
#include "portmidi.h"
#include "porttime.h"
-#include "pminternal.h"
static PmStream *mac_midiindevlist[MAXMIDIINDEV];
static PmStream *mac_midioutdevlist[MAXMIDIOUTDEV];
--
GitLab