From: Rafaël Carré <funman@videolan.org>
Date: Mon, 21 Nov 2011 02:30:58 +0000 (-0500)
Subject: contrib: vpx: fix OSX build
X-Git-Tag: 1.3.0-git~204
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=119e9b31c351c233e43e4f4c75451ca0ac4312ed;p=vlc

contrib: vpx: fix OSX build
---

diff --git a/contrib/src/vpx/libvpx-darwin10.patch b/contrib/src/vpx/libvpx-darwin10.patch
new file mode 100644
index 0000000000..1776187c1c
--- /dev/null
+++ b/contrib/src/vpx/libvpx-darwin10.patch
@@ -0,0 +1,10 @@
+--- libvpx/configure.orig	2011-08-15 17:02:45.000000000 -0400
++++ libvpx/configure	2011-11-20 21:29:52.241612178 -0500
+@@ -107,6 +107,7 @@
+ all_platforms="${all_platforms} x86-darwin8-icc"
+ all_platforms="${all_platforms} x86-darwin9-gcc"
+ all_platforms="${all_platforms} x86-darwin9-icc"
++all_platforms="${all_platforms} x86-darwin10-gcc"
+ all_platforms="${all_platforms} x86-linux-gcc"
+ all_platforms="${all_platforms} x86-linux-icc"
+ all_platforms="${all_platforms} x86-solaris-gcc"
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index c7d0add8cd..54df8b4527 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -13,6 +13,7 @@ libvpx: libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx
 	$(APPLY) $(SRC)/vpx/libvpx-no-cross.patch
 	$(APPLY) $(SRC)/vpx/libvpx-no-abi.patch
 	$(APPLY) $(SRC)/vpx/libvpx-win64.patch
+	$(APPLY) $(SRC)/vpx/libvpx-darwin10.patch
 	$(MOVE)
 
 DEPS_vpx =
@@ -45,7 +46,7 @@ else ifdef HAVE_MACOSX
 ifeq ($(ARCH),arm)
 VPX_OS := darwin
 else
-VPX_OS := darwin9
+VPX_OS := darwin10
 endif
 else ifdef HAVE_SOLARIS
 VPX_OS := solaris