vpx: fix leak

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index d9067da7cd73a0cba1144f7d6467cdcb9ac95afa..4d2b826a86fe2c823fccb6febcaf3a5e75a3db7e 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -215,6 +215,8 @@ check_android_sdk()
        add_make "ANDROID_API := ${ANDROID_API}"
        [ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_NEON"
        [ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_ARMV7A"
+       [ ${ANDROID_ABI} = "arm64-v8a" ] && add_make_enabled "HAVE_NEON"
+       [ ${ANDROID_ABI} = "arm64-v8a" ] && add_make_enabled "HAVE_ARMV8A"
        [ ${ANDROID_ABI} = "armeabi" -a -z "${NO_ARMV6}" ] && add_make_enabled "HAVE_ARMV6"
 }
 
@@ -237,7 +239,13 @@ case "${OS}" in
                        add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
                else
                        check_ios_sdk
-                       add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
+                       add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_FPU"
+
+                       case "${HOST}" in
+                               *arm*)
+                               add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
+                               ;;
+                       esac;
                fi
                ;;
        *bsd*)
@@ -250,9 +258,15 @@ case "${OS}" in
                        *arm*)
                        add_make "PLATFORM_SHORT_ARCH := arm"
                        ;;
+                       *arm64*|*aarch64*)
+                       add_make "PLATFORM_SHORT_ARCH := arm64"
+                       ;;
                        *i686*)
                        add_make "PLATFORM_SHORT_ARCH := x86"
                        ;;
+                       *x86_64*)
+                       add_make "PLATFORM_SHORT_ARCH := x86_64"
+                       ;;
                        *mipsel*)
                        add_make "PLATFORM_SHORT_ARCH := mips"
                        ;;