From c8e99546c525fef73629498cdc258b2d47f17ef1 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sat, 11 Jan 2014 00:52:40 +0100
Subject: [PATCH] Contribs: Update to vpx 1.3.0

---
 contrib/src/vpx/SHA512SUMS                    |  2 +-
 .../src/vpx/libvpx-mac-mountain-lion.patch    | 11 ----------
 contrib/src/vpx/libvpx-win32.patch            | 11 ----------
 contrib/src/vpx/rules.mak                     | 21 +++----------------
 4 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 contrib/src/vpx/libvpx-mac-mountain-lion.patch
 delete mode 100644 contrib/src/vpx/libvpx-win32.patch

diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS
index 1a97c3ab6c..84d2a309bc 100644
--- a/contrib/src/vpx/SHA512SUMS
+++ b/contrib/src/vpx/SHA512SUMS
@@ -1 +1 @@
-5c165a1a171143f7c406ef899914a353d35f6dec0e3c49eec9a4f3311fd4072dea2e0da8ceb80651ad23e24cdbf2d6da328805bda8be042bbea2c65c9e53eaaa  libvpx-v1.1.0.tar.bz2
+af26766a3336155c5bc7b8cce7c23228de054287b990f9cacdc35273384a7af4999c01bb623d12143f40107036308a8b3207081efe67936748503c30c985fd6b  libvpx-v1.3.0.tar.bz2
diff --git a/contrib/src/vpx/libvpx-mac-mountain-lion.patch b/contrib/src/vpx/libvpx-mac-mountain-lion.patch
deleted file mode 100644
index 6f11f4b37e..0000000000
--- a/contrib/src/vpx/libvpx-mac-mountain-lion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libvpx/build/make/gen_asm_deps.sh.orig	2013-03-13 01:39:54.000000000 +0100
-+++ libvpx/build/make/gen_asm_deps.sh	2013-03-13 01:41:41.000000000 +0100
-@@ -42,7 +42,7 @@
- 
- [ -n "$srcfile" ] || show_help
- sfx=${sfx:-asm}
--includes=$(LC_ALL=C egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |
-+includes=$(LC_ALL=C egrep -i "include +\"?[a-z0-9_/]+\.${sfx}" $srcfile |
-            perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
- #" restore editor state
- for inc in ${includes}; do
diff --git a/contrib/src/vpx/libvpx-win32.patch b/contrib/src/vpx/libvpx-win32.patch
deleted file mode 100644
index fcf9862a6c..0000000000
--- a/contrib/src/vpx/libvpx-win32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libvpx/vp8/common/generic/systemdependent.c	2013-03-14 15:39:20.284261976 +0100
-+++ libvpx.new/vp8/common/generic/systemdependent.c	2013-03-14 15:39:01.423974364 +0100
-@@ -87,7 +87,7 @@
- #endif
- 
- 
--#if HAVE_PTHREAD_H
-+#if HAVE_PTHREAD_H && !defined(_WIN32)
- #include <pthread.h>
- static void once(void (*func)(void))
- {
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index df8c3140bd..a22abd1a6b 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -1,6 +1,6 @@
 # libvpx
 
-VPX_VERSION := v1.1.0
+VPX_VERSION := v1.3.0
 VPX_URL := http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2
 
 $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
@@ -11,14 +11,9 @@ $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
 libvpx: libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx
 	$(UNPACK)
 	$(APPLY) $(SRC)/vpx/libvpx-no-cross.patch
-	$(APPLY) $(SRC)/vpx/libvpx-no-abi.patch
 	$(APPLY) $(SRC)/vpx/windows.patch
 ifdef HAVE_MACOSX
 	$(APPLY) $(SRC)/vpx/libvpx-mac.patch
-	$(APPLY) $(SRC)/vpx/libvpx-mac-mountain-lion.patch
-endif
-ifdef HAVE_WIN32
-	$(APPLY) $(SRC)/vpx/libvpx-win32.patch
 endif
 ifneq ($(which bash),/bin/bash)
 	sed -i.orig \
@@ -83,10 +78,9 @@ endif
 VPX_CONF := \
 	--enable-runtime-cpu-detect \
 	--disable-install-bins \
-	--disable-install-srcs \
-	--disable-install-libs \
 	--disable-install-docs \
 	--disable-examples \
+	--disable-unit-tests \
 	--disable-vp8-decoder
 ifndef HAVE_WIN32
 VPX_CONF += --enable-pic
@@ -100,15 +94,6 @@ endif
 
 .vpx: libvpx
 	cd $< && CROSS=$(VPX_CROSS) ./configure --target=$(VPX_TARGET) \
-		$(VPX_CONF)
+		$(VPX_CONF) --prefix=$(PREFIX)
 	cd $< && $(MAKE) install
-	rm -Rf -- "$(PREFIX)/include/vpx/"
-	mkdir -p -- "$(PREFIX)/include/vpx/"
-	# Of course! Why the hell would it be listed or in make install?
-	cp $</vpx/*.h $</vpx_ports/*.h "$(PREFIX)/include/vpx/"
-	rm -f -- "$(PREFIX)/include/vpx/config.h"
-	$(RANLIB) $</libvpx.a
-	# Of course! Why the hell would it be listed or in make install?
-	mkdir -p -- "$(PREFIX)/lib"
-	install -- $</libvpx.a "$(PREFIX)/lib/libvpx.a"
 	touch $@
-- 
2.39.5