[vlc-commits] Contribs: update libvpx to 1.6.1

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Apr  8 14:11:48 2017 +0200| [fea127141b0dab0577c31453b5796ece95da3be8] | committer: Jean-Baptiste Kempf

Contribs: update libvpx to 1.6.1

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

 contrib/src/vpx/SHA512SUMS           |  2 +-
 contrib/src/vpx/libvpx-android.patch | 50 ++++++++++++++++++------------------
 contrib/src/vpx/libvpx-arm.patch     | 10 --------
 contrib/src/vpx/rules.mak            |  3 +--
 4 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS
index 459f309..da99c86 100644
--- a/contrib/src/vpx/SHA512SUMS
+++ b/contrib/src/vpx/SHA512SUMS
@@ -1 +1 @@
-dd753372a156bbf7ceb4090276e5fb32b4c8581c93925dded93efee74153b5eb24ee8c3d8ee6339a6878482f0ecf178a2befeeb36e17eada6c440b48c60e9162  libvpx-1.6.0.tar.bz2
+1a4b009fe1737715c6563a79848126a5859394a5074b1e9cca9bc2e213df90890c15e708040d5f2c96c7c21e268f51e1352ac6911514bf891a4bf3eea154159d  libvpx-1.6.1.tar.bz2
diff --git a/contrib/src/vpx/libvpx-android.patch b/contrib/src/vpx/libvpx-android.patch
index 8f71683..a71781c 100644
--- a/contrib/src/vpx/libvpx-android.patch
+++ b/contrib/src/vpx/libvpx-android.patch
@@ -20,8 +20,8 @@ cpu-features.c. Additionally, we don't need to link with pthread.
  PORTS_SRCS-$(ARCH_ARM) += arm_cpudetect.c
 +PORTS_SRCS-$(ARCH_ARM) += cpu-features.c
  PORTS_SRCS-$(ARCH_ARM) += arm.h
---- libvpx/build/make/configure.sh.orig	2016-05-20 12:48:54.468179035 +0200
-+++ libvpx/build/make/configure.sh	2016-05-20 12:49:30.379601840 +0200
+--- libvpx/build/make/configure.sh.orig	2017-04-08 12:19:54.992242234 +0200
++++ libvpx/build/make/configure.sh	2017-04-08 12:22:19.280235805 +0200
 @@ -628,8 +628,8 @@
  }
  
@@ -33,30 +33,30 @@ cpu-features.c. Additionally, we don't need to link with pthread.
    AR=${AR:-${CROSS}ar}
    LD=${LD:-${CROSS}${link_with_cc:-ld}}
    AS=${AS:-${CROSS}as}
-@@ -951,8 +951,8 @@
-           COMPILER_LOCATION=`find "${SDK_PATH}" \
-                              -name "arm-linux-androideabi-gcc*" -print -quit`
-           TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/arm-linux-androideabi-
--          CC=${TOOLCHAIN_PATH}gcc
--          CXX=${TOOLCHAIN_PATH}g++
-+          CC=clang
-+          CXX=clang++
-           AR=${TOOLCHAIN_PATH}ar
-           LD=${TOOLCHAIN_PATH}gcc
-           AS=${TOOLCHAIN_PATH}as
-@@ -983,7 +983,8 @@
-             soft_enable runtime_cpu_detect
-           fi
-           if enabled runtime_cpu_detect; then
--            add_cflags "-I${SDK_PATH}/sources/android/cpufeatures"
-+            cp "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" vpx_ports
-+            add_cflags "-I${ANDROID_NDK}/sources/android/cpufeatures"
-           fi
-           ;;
- 
-@@ -1363,9 +1364,6 @@
-         ;;
+@@ -916,8 +916,8 @@
+             COMPILER_LOCATION=`find "${SDK_PATH}" \
+               -name "arm-linux-androideabi-gcc*" -print -quit`
+             TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/arm-linux-androideabi-
+-            CC=${TOOLCHAIN_PATH}gcc
+-            CXX=${TOOLCHAIN_PATH}g++
++            CC=clang
++            CXX=clang++
+             AR=${TOOLCHAIN_PATH}ar
+             LD=${TOOLCHAIN_PATH}gcc
+             AS=${TOOLCHAIN_PATH}as
+@@ -948,7 +948,8 @@
+               soft_enable runtime_cpu_detect
+             fi
+             if enabled runtime_cpu_detect; then
+-              add_cflags "-I${SDK_PATH}/sources/android/cpufeatures"
++              cp "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" vpx_ports
++              add_cflags "-I${ANDROID_NDK}/sources/android/cpufeatures"
+             fi
+           else
+             echo "Assuming standalone build with NDK toolchain."
+@@ -1331,9 +1332,6 @@
        *-android-gcc)
+         # bionic includes basic pthread functionality, obviating -lpthread.
          ;;
 -      *)
 -        check_header pthread.h && add_extralibs -lpthread
diff --git a/contrib/src/vpx/libvpx-arm.patch b/contrib/src/vpx/libvpx-arm.patch
deleted file mode 100644
index 6736f82..0000000
--- a/contrib/src/vpx/libvpx-arm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libvpx/vpx_ports/arm_cpudetect.c	2015-04-03 20:49:19.000000000 +0200
-+++ libvpx.ok/vpx_ports/arm_cpudetect.c	2016-05-20 09:57:06.066241700 +0200
-@@ -84,7 +84,6 @@ int arm_cpu_caps(void) {
-     } __except (GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) {
-     /*Ignore exception.*/
-   }
--}
- #endif /* HAVE_MEDIA */
- #if HAVE_NEON || HAVE_NEON_ASM
- if (mask &HAS_NEON) {
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 6185553..0f3bbe2 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -1,6 +1,6 @@
 # libvpx
 
-VPX_VERSION := 1.6.0
+VPX_VERSION := 1.6.1
 VPX_URL := http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-$(VPX_VERSION).tar.bz2
 
 PKGS += vpx
@@ -17,7 +17,6 @@ libvpx: libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx
 	$(UNPACK)
 	$(APPLY) $(SRC)/vpx/libvpx-mac.patch
 	$(APPLY) $(SRC)/vpx/libvpx-ios.patch
-	$(APPLY) $(SRC)/vpx/libvpx-arm.patch
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/vpx/libvpx-android.patch
 endif