mediacodec: Remove an unused variable

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 0567a57d0166702bb96d41e215cb26b45b0c02fd..37cdda87f60d03b4a2dc94ef52d6e3bb8b4e1898 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -29,6 +29,7 @@ usage()
        echo "  --disable-disc   configure to not build optical discs packages"
        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"
 }
 
 BUILD=
@@ -38,6 +39,7 @@ PKGS_ENABLE=
 PKGS_DISABLE=
 BUILD_ENCODERS="1"
 BUILD_DISCS="1"
+GPL="1"
 
 if test ! -f "../../contrib/src/main.mak"
 then
@@ -70,6 +72,9 @@ do
                --enable-small)
                        ENABLE_SMALL=1
                        ;;
+               --disable-gpl)
+                       GPL=
+                       ;;
                --disable-*)
                        PKGS_DISABLE="${PKGS_DISABLE} ${1#--disable-}"
                        ;;
@@ -191,7 +196,7 @@ check_android_sdk()
        add_make "ANDROID_NDK := ${ANDROID_NDK}"
        [ -z "${ANDROID_ABI}" ] && echo "You must set ANDROID_ABI environment variable" && exit 1
        add_make "ANDROID_ABI := ${ANDROID_ABI}"
-       test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON"
+       [ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_NEON"
        [ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_ARMV7A"
 }
 
@@ -199,6 +204,7 @@ test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
 test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
 test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
 test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
+test -z "$GPL" || add_make_enabled "GPL"
 
 #
 # Checks