[vlc-devel] [PATCH] contrib: libvpx: remove patch for Android

[Thomas Guillem]

LGTM

On Thu, May 9, 2019, at 13:50, Romain Vimont wrote:
> The patch does not apply anymore on libvpx v1.7.0, which already
> implements the workaround.
> ---
>  .../vpx/libvpx-android-fix_cortex_a8-flag.patch   | 15 ---------------
>  contrib/src/vpx/rules.mak                         |  1 -
>  2 files changed, 16 deletions(-)
>  delete mode 100644 contrib/src/vpx/libvpx-android-fix_cortex_a8-flag.patch
> 
> diff --git a/contrib/src/vpx/libvpx-android-fix_cortex_a8-flag.patch 
> b/contrib/src/vpx/libvpx-android-fix_cortex_a8-flag.patch
> deleted file mode 100644
> index 3ff5e83588..0000000000
> --- a/contrib/src/vpx/libvpx-android-fix_cortex_a8-flag.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -diff --git a/build/make/configure.sh b/build/make/configure.sh
> -index a658544..86db9b9 100644
> ---- a/build/make/configure.sh
> -+++ b/build/make/configure.sh
> -@@ -988,10 +988,6 @@ EOF
> -               add_ldflags "--sysroot=${alt_libc}"
> -             fi
> - 
> --            # linker flag that routes around a CPU bug in some
> --            # Cortex-A8 implementations (NDK Dev Guide)
> --            add_ldflags "-Wl,--fix-cortex-a8"
> --
> -             enable_feature pic
> -             soft_enable realtime_only
> -             if [ ${tgt_isa} = "armv7" ]; then
> diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
> index 7b405b956f..722552b5f4 100644
> --- a/contrib/src/vpx/rules.mak
> +++ b/contrib/src/vpx/rules.mak
> @@ -19,7 +19,6 @@ libvpx: libvpx-$(VPX_VERSION).tar.gz .sum-vpx
>  	$(APPLY) $(SRC)/vpx/libvpx-ios.patch
>  ifdef HAVE_ANDROID
>  	$(APPLY) $(SRC)/vpx/libvpx-android.patch
> -	$(APPLY) $(SRC)/vpx/libvpx-android-fix_cortex_a8-flag.patch
>  	$(APPLY) $(SRC)/vpx/libvpx-android-toolchain_path.patch
>  endif
>  	$(APPLY) $(SRC)/vpx/0001-ads2gas-Add-a-noelf-option.patch
> -- 
> 2.20.1
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel