Revert "contrib: vpx: update to 1.2.0"

This reverts commit 7e2edc0d.

http://webm.googlecode.com/files/libvpx-v1.1.0.tar.bz2
 is a release tarball
http://webm.googlecode.com/files/libvpx-v1.2.0.tar.bz2
 is a daily updated git snapshot

libvpx has no release tarballs (or releases) anymore apparently.

contrib/src/vpx/SHA512SUMS

-bf3fc0b4c3cd91ff5bdb8dec6753af484c2c3d4410835f7ef223e15f7ba65cb15415ad69315889ced52627c0ae5662397d1db52dbf11e39fffe7f133ccfff5b9  libvpx-v1.2.0.tar.bz2
+5c165a1a171143f7c406ef899914a353d35f6dec0e3c49eec9a4f3311fd4072dea2e0da8ceb80651ad23e24cdbf2d6da328805bda8be042bbea2c65c9e53eaaa  libvpx-v1.1.0.tar.bz2

contrib/src/vpx/libvpx-no-abi.patch

---- libvpx-v1.2.0/build/make/configure.sh.orig	2013-10-14 14:22:30.218929454 +0200
-+++ libvpx-v1.2.0/build/make/configure.sh	2013-10-14 14:23:38.986930059 +0200
-@@ -782,8 +782,8 @@
-             check_add_asflags --defsym ARCHITECTURE=${arch_int}
-             tune_cflags="-mtune="
-             if [ ${tgt_isa} == "armv7" ]; then
--                check_add_cflags  -march=armv7-a -mfloat-abi=softfp
--                check_add_asflags -march=armv7-a -mfloat-abi=softfp
-+                check_add_cflags  -march=armv7-a
-+                check_add_asflags -march=armv7-a
- 
-                 if enabled neon
-                 then
+--- libvpx-v1.1.0/build/make/configure.sh.orig	2012-05-09 01:14:00.000000000 +0200
++++ libvpx.new/build/make/configure.sh	2013-03-10 16:48:48.562884896 +0100
+@@ -738,8 +737,8 @@
+                     check_add_cflags -mfpu=neon #-ftree-vectorize
+                     check_add_asflags -mfpu=neon
+                 fi
+-                check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfloat-abi=softfp
+-                check_add_asflags -mcpu=cortex-a8 -mfloat-abi=softfp  #-march=armv7-a
++                check_add_cflags -march=armv7-a -mcpu=cortex-a8
++                check_add_asflags -mcpu=cortex-a8  #-march=armv7-a
+             else
+                 check_add_cflags -march=${tgt_isa}
+                 check_add_asflags -march=${tgt_isa}

contrib/src/vpx/libvpx-win32.patch

+--- 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))
+ {

contrib/src/vpx/rules.mak

 # libvpx
 
-VPX_VERSION := v1.2.0
+VPX_VERSION := v1.1.0
 VPX_URL := http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2
 
 $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
@@ -12,13 +12,14 @@ 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/libvpx-mac.patch
-ifdef HAVE_WIN32
-	$(APPLY) $(SRC)/vpx/win32.patch
-endif
+	$(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 \
 		s,^\#!/bin/bash,\#!`which bash`,g \

contrib/src/vpx/win32.patch

---- libvpx/libs.mk.orig	2013-10-14 14:32:39.610934820 +0200
-+++ libvpx/libs.mk	2013-10-14 14:32:52.146934930 +0200
-@@ -230,7 +230,7 @@
- 	$(qexec)echo 'Requires:' >> $@
- 	$(qexec)echo 'Conflicts:' >> $@
- 	$(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
--	$(qexec)echo 'Libs.private: -lm -lpthread' >> $@
-+	$(qexec)echo 'Libs.private: -lm' >> $@
- 	$(qexec)echo 'Cflags: -I$${includedir}' >> $@
- INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
- INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
-@@ -427,7 +427,7 @@
-         lib$(CODEC_LIB)$(CODEC_LIB_SUF) libgtest.a ))\
-     $(if $(BUILD_LIBVPX),$(eval $(call linkerxx_template,$(bin),\
-         $(LIBVPX_TEST_OBJS) \
--        -L. -lvpx -lgtest -lpthread -lm)\
-+        -L. -lvpx -lgtest -lm)\
-         )))\
-     $(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\
- 

contrib/src/vpx/windows.patch

+--- libvpx/vp8/common/generic/systemdependent.c.orig	2013-03-13 01:01:48.404990528 +0100
++++ libvpx/vp8/common/generic/systemdependent.c	2013-03-13 01:02:35.928991544 +0100
+@@ -18,6 +18,10 @@
+ #endif
+ #include "vp8/common/onyxc_int.h"
+ 
++#if defined(_WIN32)
++# include <windows.h>
++#endif
++
+ #if CONFIG_MULTITHREAD
+ #if HAVE_UNISTD_H && !defined(__OS2__)
+ #include <unistd.h>