h264 packetizer: Check for negative sps.

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 35c47a3910d3cab0136d524f614db601523fd285..df3dd85c9c061d60e3ede42fedbf4200e9b83c84 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -155,11 +155,30 @@ check_macosx_sdk()
    add_make "OSX_VERSION ?= ${OSX_VERSION}"
 }
 
+check_ios_sdk()
+{
+       if test -z "$SDKROOT"
+       then
+               SDKROOT=`xcode-select -print-path`/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}${SDK_VERSION}.sdk
+               echo "SDKROOT not specified, assuming $SDKROOT"
+       else
+               SDKROOT="$SDKROOT"
+       fi
+
+       if [ ! -d "${SDKROOT}" ]
+       then
+               echo "*** ${SDKROOT} does not exist, please install required SDK, or set SDKROOT manually. ***"
+               exit 1
+       fi
+       add_make "SDKROOT=${SDKROOT}"
+}
+
 check_android_sdk()
 {
        [ -z "${ANDROID_NDK}" ] && echo "You must set ANDROID_NDK environment variable" && exit 1
        add_make "ANDROID_NDK := ${ANDROID_NDK}"
        test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON"
+       test -n "${TEGRA2}" && add_make_enabled "HAVE_TEGRA2"
 }
 
 test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
@@ -170,22 +189,22 @@ test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
 #
 # Checks
 #
-case "${HOST}" in
-       arm-apple-darwin*)
-               add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
-               ;;
-       *86*-apple-darwin*)
-               check_macosx_sdk
-               add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
-               ;;
-       powerpc-apple-darwin*)
-               check_macosx_sdk
-               add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
+OS="${HOST#*-}" # strip architecture
+case "${OS}" in
+       apple-darwin*)
+               if test -z "$BUILDFORIOS"
+               then
+                       check_macosx_sdk
+                       add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
+               else
+                       check_ios_sdk
+                       add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
+               fi
                ;;
        *bsd*)
                add_make_enabled "HAVE_BSD"
                ;;
-       *linux-androideabi)
+       linux-androideabi)
                check_android_sdk
                add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
                add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"