[vlc-commits] Contribs: update libvpx to 1.1.0

[Jean-Baptiste Kempf]

vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Mar 10 16:53:57 2013 +0100| [6270eff24d3b2df116404db458b0f913af05488c] | committer: Jean-Baptiste Kempf

Contribs: update libvpx to 1.1.0
(cherry picked from commit 2aa9d5fb98ca3270e88cdbb7a43e6c6edd3487ec)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=6270eff24d3b2df116404db458b0f913af05488c
---

 contrib/src/vpx/SHA512SUMS          |    2 +-
 contrib/src/vpx/libvpx-no-abi.patch |   21 ++++++++++-----------
 contrib/src/vpx/rules.mak           |    2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS
index e2093df..1a97c3a 100644
--- a/contrib/src/vpx/SHA512SUMS
+++ b/contrib/src/vpx/SHA512SUMS
@@ -1 +1 @@
-a54f594fd37f96a693b5377236cad0834581f189fbb8d55c7e3418cd72e217e0eda34b07c14744c7c0d34c0d5c8a19c7ca402146855d7163e3578b5fd2b075cc  libvpx-v1.0.0.tar.bz2
+5c165a1a171143f7c406ef899914a353d35f6dec0e3c49eec9a4f3311fd4072dea2e0da8ceb80651ad23e24cdbf2d6da328805bda8be042bbea2c65c9e53eaaa  libvpx-v1.1.0.tar.bz2
diff --git a/contrib/src/vpx/libvpx-no-abi.patch b/contrib/src/vpx/libvpx-no-abi.patch
index f4337cf..648e3b7 100644
--- a/contrib/src/vpx/libvpx-no-abi.patch
+++ b/contrib/src/vpx/libvpx-no-abi.patch
@@ -1,14 +1,13 @@
-diff -Nru libvpx.orig/build/make/configure.sh libvpx/build/make/configure.sh
---- libvpx.orig/build/make/configure.sh	2011-07-04 19:21:14.000000000 +0300
-+++ libvpx/build/make/configure.sh	2011-07-04 19:22:10.000000000 +0300
-@@ -659,8 +659,8 @@
-                 check_add_asflags -mcpu=${tgt_isa}
-             elif enabled armv7
-             then
--                check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp  #-ftree-vectorize
--                check_add_asflags -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp  #-march=armv7-a
-+                check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon  #-ftree-vectorize
-+                check_add_asflags -mcpu=cortex-a8 -mfpu=neon  #-march=armv7-a
+--- 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}
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index a0955ea..88e1775 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -1,6 +1,6 @@
 # libvpx
 
-VPX_VERSION := v1.0.0
+VPX_VERSION := v1.1.0
 VPX_URL := http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2
 
 $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2: