[vlc-commits] contrib: vpx: fix x86 android build with encoders

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Dec 22 15:04:47 2017 +0100| [ba4e6fe35035d7d5ad5468fc7b6a31cfb089f0f4] | committer: Jean-Baptiste Kempf

contrib: vpx: fix x86 android build with encoders

__ANDROID__ doesn't seem to be defined when built from the android yasm

(cherry picked from commit c2ddfa5e419c61dbc491227e5a9df041cdacf7a1)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/vpx/libvpx-android.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/contrib/src/vpx/libvpx-android.patch b/contrib/src/vpx/libvpx-android.patch
index a71781ca77..ef7e6bde8f 100644
--- a/contrib/src/vpx/libvpx-android.patch
+++ b/contrib/src/vpx/libvpx-android.patch
@@ -64,3 +64,13 @@ cpu-features.c. Additionally, we don't need to link with pthread.
      esac
    fi
  
+--- libvpx/vpx_ports/x86_abi_support.asm.orig	2017-12-22 14:13:01.624421364 +0100
++++ libvpx/vpx_ports/x86_abi_support.asm	2017-12-22 14:12:32.152908813 +0100
+@@ -393,6 +393,7 @@
+ 
+ ; On Android platforms use lrand48 when building postproc routines. Prior to L
+ ; rand() was not available.
++%define __ANDROID__
+ %if CONFIG_POSTPROC=1 || CONFIG_VP9_POSTPROC=1
+ %ifdef __ANDROID__
+ extern sym(lrand48)