qt4: fix COM leak and handle errors

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index caa7691faefff982eaabd8f5fe013ff59cf2fb51..ced4fe081abf184588999266723edbeaa591c5db 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -31,6 +31,7 @@ usage()
        echo "  --disable-sout   configure to not build stream output packages"
        echo "  --enable-small   optimize libraries for size with slight speed decrease [DANGEROUS]"
        echo "  --disable-gpl    configure to not build viral GPL code"
+       echo "  --disable-optim  disable optimization in libraries"
 }
 
 BUILD=
@@ -42,6 +43,7 @@ BUILD_ENCODERS="1"
 BUILD_NETWORK="1"
 BUILD_DISCS="1"
 GPL="1"
+WITH_OPTIMIZATION="1"
 
 if test ! -f "../../contrib/src/main.mak"
 then
@@ -74,6 +76,9 @@ do
                --disable-sout)
                        BUILD_ENCODERS=
                        ;;
+               --disable-optim)
+                       WITH_OPTIMIZATION=
+                       ;;
                --enable-small)
                        ENABLE_SMALL=1
                        ;;
@@ -215,6 +220,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"
 }
 
@@ -224,6 +231,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
 test -z "$BUILD_NETWORK" || add_make_enabled "BUILD_NETWORK"
 test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
 test -z "$GPL" || add_make_enabled "GPL"
+test -z "$WITH_OPTIMIZATION" || add_make_enabled "WITH_OPTIMIZATION"
 
 #
 # Checks
@@ -237,7 +245,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,6 +264,9 @@ 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"
                        ;;