[vlc-commits] commit: contribs: fix portaudio build for win64 ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sun Oct 10 14:04:21 2010 +0200| [677247dc1e48dfa2c6c508eeac700948db11682f] | committer: Rafaël Carré 

contribs: fix portaudio build for win64

patch sent upstream

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=677247dc1e48dfa2c6c508eeac700948db11682f
---

 extras/contrib/src/Makefile                       |    1 +
 extras/contrib/src/Patches/portaudio-static.patch |   11 +++++++++++
 extras/package/win32/configure-mingw64.sh         |    2 +-
 3 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 414e5b1..d13b7eb 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1642,6 +1642,7 @@ ifneq ($(HOST),$(BUILD))
 	(patch -p0 < Patches/portaudio-cross.patch;cd $@;  autoconf)
 endif
 ifdef HAVE_WIN64
+	patch -p0 < Patches/portaudio-static.patch
 	(cd $@ ; autoreconf -if)
 endif
 
diff --git a/extras/contrib/src/Patches/portaudio-static.patch b/extras/contrib/src/Patches/portaudio-static.patch
new file mode 100644
index 0000000..e262e8a
--- /dev/null
+++ b/extras/contrib/src/Patches/portaudio-static.patch
@@ -0,0 +1,11 @@
+--- portaudio/configure.in.orig	2010-10-10 14:02:33.000000000 +0200
++++ portaudio/configure.in	2010-10-10 14:03:04.000000000 +0200
+@@ -348,6 +348,8 @@
+ esac
+ CFLAGS="$CFLAGS $THREAD_CFLAGS"
+ 
++test "$enable_shared" != "yes" && SHARED_FLAGS=""
++
+ if test "$enable_cxx" = "yes"; then
+    AC_CONFIG_SUBDIRS([bindings/cpp])
+    ENABLE_CXX_TRUE=""
diff --git a/extras/package/win32/configure-mingw64.sh b/extras/package/win32/configure-mingw64.sh
index 585804e..dbff819 100755
--- a/extras/package/win32/configure-mingw64.sh
+++ b/extras/package/win32/configure-mingw64.sh
@@ -18,5 +18,5 @@ CC=amd64-mingw32msvc-gcc CXX=amd64-mingw32msvc-g++ \
 CONFIGURE="${root}configure" \
 CONFIGOPTS="--host=amd64-mingw32msvc --build=i386-linux
  --enable-dirac --enable-mkv --enable-taglib --enable-debug --enable-projectm
- --disable-portaudio --disable-qt4 --disable-skins2 --disable-activex --disable-mozilla" \
+ --disable-qt4 --disable-skins2 --disable-activex --disable-mozilla" \
 sh ${root}extras/package/win32/configure-common.sh