[vlc-devel] [RFC PATCH] contrib: vpx: update to 1.5.0

[Filip Roséen]

Due to the recent changes in terms of vpx-contrib (5a08752), I
discovered that a newer version of libvpx than the now quite old 1.4.0
is necessary in order to build vlc-android together with the contrib.

What is lacking in 1.4.0 is the possibility to set the relevant
"--toolchain", hence the upgrade to 1.5.0 where the list of applicable
toolchains has been updated in the library.

---

Since I have never messed around with contribs other than locally for
my own pleasure, I am marking this patch as RFC (I might also add that
it is currently around 7am and that I have as most often not slept in
far too long).

Please tell me;

    - if the mentioned rationale for upgrading is not appropriate, or;
    - if it is more appropriate to go all the way and update to 1.6.0, or;
    - if it would be better to conditionally disable vpx explicitly on
      android.


Best Regards,
Filip Roséen

                ,'"".
                )  ,|
               /  /,'-.
              /  //  /.`.
            ,'  //  /  `.`.
           (    )--.`.   //|
           |`--'|   `.`.// |
            `--'      `./  /
              |         | /
              |_________|/  -shimrod

        src: http://www.ascii-code.com/ascii-art/electronics/phones.php

---
 contrib/src/vpx/SHA512SUMS       |  2 +-
 contrib/src/vpx/libvpx-ios.patch | 21 ++++++++++++++-------
 contrib/src/vpx/rules.mak        |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS
index 7923cbc..7046d82 100644
--- a/contrib/src/vpx/SHA512SUMS
+++ b/contrib/src/vpx/SHA512SUMS
@@ -1 +1 @@
-70234220e0ed64db000689ec8bea02dadef938a4f4dea96e5781d361c15245456212c1b6aec2b698d32ed423e73917d2303009e49224a2237669cab416dd6984  libvpx-1.4.0.tar.bz2
+5a952aa53e539a130d316723d424fa02a8f42a450950d74a16d8abc5df569ba5559b3b09a32140b638d7a0cd54be1c7b0f8306ad286825bc1281f513bb665fc5  libvpx-1.5.0.tar.bz2
diff --git a/contrib/src/vpx/libvpx-ios.patch b/contrib/src/vpx/libvpx-ios.patch
index 5b293b1..b2cf964 100644
--- a/contrib/src/vpx/libvpx-ios.patch
+++ b/contrib/src/vpx/libvpx-ios.patch
@@ -1,7 +1,6 @@
-diff -ru libvpx/build/make/configure.sh libvpx-fixed/build/make/configure.sh
---- libvpx/build/make/configure.sh	2015-05-27 14:40:33.000000000 +0200
-+++ libvpx-fixed/build/make/configure.sh	2015-05-27 14:40:09.000000000 +0200
-@@ -742,61 +742,6 @@
+--- libvpx/build/make/configure.sh.orig	2016-08-07 05:36:24.713912318 +0200
++++ libvpx/build/make/configure.sh	2016-08-07 05:37:20.804374128 +0200
+@@ -743,69 +743,6 @@
    # PIC is probably what we want when building shared libs
    enabled shared && soft_enable pic
  
@@ -11,7 +10,15 @@ diff -ru libvpx/build/make/configure.sh libvpx-fixed/build/make/configure.sh
 -  # Handle darwin variants. Newer SDKs allow targeting older
 -  # platforms, so use the newest one available.
 -  case ${toolchain} in
--    *-darwin*)
+-    arm*-darwin*)
+-      add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
+-      iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
+-      if [ -d "${iphoneos_sdk_dir}" ]; then
+-        add_cflags  "-isysroot ${iphoneos_sdk_dir}"
+-        add_ldflags "-isysroot ${iphoneos_sdk_dir}"
+-      fi
+-      ;;
+-    x86*-darwin*)
 -      osx_sdk_dir="$(show_darwin_sdk_path macosx)"
 -      if [ -d "${osx_sdk_dir}" ]; then
 -        add_cflags  "-isysroot ${osx_sdk_dir}"
@@ -63,7 +70,7 @@ diff -ru libvpx/build/make/configure.sh libvpx-fixed/build/make/configure.sh
    # Handle Solaris variants. Solaris 10 needs -lposix4
    case ${toolchain} in
      sparc-solaris-*)
-@@ -1002,12 +947,6 @@
+@@ -1032,12 +969,6 @@
              add_cflags -isysroot ${alt_libc}
            fi
  
@@ -76,7 +83,7 @@ diff -ru libvpx/build/make/configure.sh libvpx-fixed/build/make/configure.sh
            for d in lib usr/lib usr/lib/system; do
              try_dir="${alt_libc}/${d}"
              [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"
-@@ -1149,6 +1088,13 @@
+@@ -1191,6 +1122,13 @@
        case ${tgt_cc} in
          gcc*)
            add_cflags -m${bits}
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index d501c52..18c1f75 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -1,6 +1,6 @@
 # libvpx
 
-VPX_VERSION := 1.4.0
+VPX_VERSION := 1.5.0
 VPX_URL := http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-$(VPX_VERSION).tar.bz2
 
 PKGS += vpx
-- 
2.9.2