From: Rafaël Carré <funman@videolan.org>
Date: Fri, 23 Sep 2011 05:44:58 +0000 (-0400)
Subject: portaudio: drop patch applied upstream
X-Git-Tag: 1.2.0-pre1~622
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=be1a4a7852c15e4032ebe14028f15ce81bbf95a4;p=vlc

portaudio: drop patch applied upstream
---

diff --git a/extras/contrib/src/Patches/portaudio-static.patch b/extras/contrib/src/Patches/portaudio-static.patch
deleted file mode 100644
index e262e8a547..0000000000
--- a/extras/contrib/src/Patches/portaudio-static.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 21829bbd5d..ffa72ca630 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1644,10 +1644,6 @@ portaudio: pa_stable_v$(PORTAUDIO_VERSION).tgz
 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
 
 .portaudio: portaudio
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make  install)