Contribs: build portaudio on Windows. Close #419

diff --git a/extras/contrib/src/Distributions/win32.mak b/extras/contrib/src/Distributions/win32.mak
index 0efa421d48501b82e943aae4acbeb1bcdf060db7..1b0ce210482f4ab4c9680a01757c6369093f108c 100644 (file)
--- a/extras/contrib/src/Distributions/win32.mak
+++ b/extras/contrib/src/Distributions/win32.mak
@@ -6,6 +6,6 @@ all: .iconv .intl .freetype .fribidi .zlib \
         .png .gpg-error .gcrypt .gnutls .mpcdec \
         .dvdnav .dvbpsi .wxwidgets .qt4 .dirac .SDL_image \
         .dx_headers .dshow_headers .gecko-win32 .unicows .dca \
-        .lua .tag .fontconfig \
+        .lua .tag .fontconfig .portaudio \
         .aclocal
-#       .daap .cddb .cdio .vcdimager .portaudio
+#       .daap .cddb .cdio .vcdimager

diff --git a/extras/contrib/src/Patches/portaudio-cross.patch b/extras/contrib/src/Patches/portaudio-cross.patch
index bbe823047ed5d06ea3ee222909e3914276b81a55..0a4b146335e5b924759188d8c24a7b24bcdf56ed 100644 (file)
--- a/extras/contrib/src/Patches/portaudio-cross.patch
+++ b/extras/contrib/src/Patches/portaudio-cross.patch
@@ -1,6 +1,19 @@
---- portaudio/configure.in     2005-12-01 15:07:26.000000000 +0000
-+++ portaudio-new/configure.in 2005-12-09 18:48:43.000000000 +0000
-@@ -75,9 +75,10 @@
+diff -ruN portaudio/Makefile.in portaudio.n/Makefile.in
+--- portaudio/Makefile.in      2007-10-24 17:29:04.000000000 +0200
++++ portaudio.n/Makefile.in    2007-12-18 05:43:27.000000000 +0100
+@@ -120,7 +120,7 @@
+ SUBDIRS =
+ @ENABLE_CXX_TRUE@SUBDIRS += bindings/cpp
+ 
+-all: lib/$(PALIB) all-recursive tests
++all: lib/$(PALIB) all-recursive
+ 
+ tests: bin-stamp $(TESTS)
+ 
+diff -ruN portaudio/configure.in portaudio.n/configure.in
+--- portaudio/configure.in     2007-11-13 22:22:56.000000000 +0100
++++ portaudio.n/configure.in   2007-12-18 05:43:14.000000000 +0100
+@@ -95,9 +95,10 @@
  
  dnl sizeof checks: we will need a 16-bit and a 32-bit type
  
@@ -12,5 +25,5 @@
 +dnl AC_CHECK_SIZEOF(int)
 +dnl AC_CHECK_SIZEOF(long)
  
- dnl extra variables
- AC_SUBST(OTHER_OBJS)
+ save_LIBS="${LIBS}"
+ AC_CHECK_LIB(rt, clock_gettime, [rt_libs=" -lrt"])