# HG changeset patch # User Volker Grabsch # Date 1264546712 -3600 # Node ID 73d6b9460f7400ce9408e09f85d83a31a9c81ec3 # Parent 7d39dfb2b0db7a6767d5558bae96eefddd7bdf41 improved coding style in package portaudio diff -r 7d39dfb2b0db -r 73d6b9460f74 src/portaudio-win32.patch --- a/src/portaudio-win32.patch Tue Jan 26 23:15:56 2010 +0100 +++ b/src/portaudio-win32.patch Tue Jan 26 23:58:32 2010 +0100 @@ -8,7 +8,7 @@ dnl Mac OS X configuration AC_DEFINE(PA_USE_COREAUDIO) -+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" if [[ -d /Developer/SDKs/MacOSX10.5.sdk ]] ; then SHARED_FLAGS="-Werror -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3"; CFLAGS="-Werror $CFLAGS -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3"; @@ -44,7 +44,7 @@ cygwin* ) dnl Cygwin configuration - -+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/win" ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/win" OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"; CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_WDMKS -DPA_NO_ASIO -DPA_NO_WASAPI" + @@ -55,7 +55,7 @@ dnl SGI IRIX audio library (AL) configuration (Pieter, oct 2-13, 2003). dnl The 'dmedia' library is needed to read the Unadjusted System Time (UST). dnl -+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([IRIX posix thread library not found!])) AC_CHECK_LIB(audio, alOpenPort, , AC_MSG_ERROR([IRIX audio library not found!])) AC_CHECK_LIB(dmedia, dmGetUST, , AC_MSG_ERROR([IRIX digital media library not found!])) @@ -63,7 +63,7 @@ , AC_MSG_ERROR([libpthread not found!])) -+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" if [[ $have_alsa = "yes" ] && [ $with_alsa != "no" ]] ; then DLL_LIBS="$DLL_LIBS -lasound" OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o" diff -r 7d39dfb2b0db -r 73d6b9460f74 src/portaudio.mk --- a/src/portaudio.mk Tue Jan 26 23:15:56 2010 +0100 +++ b/src/portaudio.mk Tue Jan 26 23:58:32 2010 +0100 @@ -19,13 +19,14 @@ endef define $(PKG)_BUILD - cd '$(1)' && autoconf && ./configure \ + cd '$(1)' && autoconf + cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' \ --with-host_os=mingw \ --with-winapi=directx \ - --with-dxdir=$(PREFIX)/$(TARGET) \ - --prefix='$(PREFIX)/$(TARGET)' + --with-dxdir=$(PREFIX)/$(TARGET) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef