avformat : add an option to force a specific format

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index fe9978668531f4647db86af4971b7dfe9c1d5057..a4b541084eff5449bcb8b51eb5c11d4d94eafa38 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -38,7 +38,7 @@ PKGS_DISABLE=
 BUILD_ENCODERS="1"
 BUILD_DISCS="1"
 
-if test ! -f "../src/main.mak"
+if test ! -f "../../contrib/src/main.mak"
 then
        echo "$0 must be run from a subdirectory"
        exit 1
@@ -103,17 +103,11 @@ if test "$PREFIX"
 then
        # strip trailing slash
        PREFIX="${PREFIX%/}"
-else
-       PREFIX="../hosts/$HOST"
 fi
 
 #
 # Prepare files
 #
-echo "Creating prefix... $PREFIX"
-mkdir -p -- "$PREFIX" || exit $?
-mkdir -p -- "$PREFIX/share/aclocal" || exit $?
-
 echo "Creating configuration file... config.mak"
 exec 3>config.mak
 cat >&3 << EOF
@@ -121,7 +115,6 @@ cat >&3 << EOF
 # Any change will be overwritten if ../bootstrap is run again.
 BUILD := $BUILD
 HOST := $HOST
-PREFIX := $PREFIX
 PKGS_DISABLE := $PKGS_DISABLE
 PKGS_ENABLE := $PKGS_ENABLE
 EOF
@@ -144,6 +137,28 @@ add_make_enabled()
        done
 }
 
+check_macosx_sdk()
+{
+   [ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.5" && OSX_VERSION=10.5
+   SDK="/Developer/SDKs/MacOSX${OSX_VERSION}.sdk"
+   if [ ! -d "${SDK}" ]
+   then
+          echo "
+*** ${SDK} does not exist, please install required SDK, or use export OSX_VERSION=10.6 ***
+"
+          exit 1
+   fi
+   add_make "OSX_VERSION ?= ${OSX_VERSION}"
+}
+
+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 -z "$PREFIX" || add_make "PREFIX := $PREFIX"
 test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
 test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
 
@@ -153,6 +168,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
 OS="${HOST#*-}" # strip architecture
 case "${OS}" in
        apple-darwin*)
+               check_macosx_sdk
                add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
                ;;
        *darwin*)
@@ -161,6 +177,11 @@ case "${OS}" in
        *bsd*)
                add_make_enabled "HAVE_BSD"
                ;;
+       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}"
+               ;;
        *linux*)
                add_make_enabled "HAVE_LINUX"
                ;;
@@ -176,20 +197,22 @@ esac
 # Results output
 #
 test -e Makefile && unlink Makefile
-ln -sf ../src/main.mak Makefile
+ln -sf ../../contrib/src/main.mak Makefile
 cat << EOF
 Bootstrap completed.
 
-The following packages were selected:
-$PKGS
-
 Run "make" to start compilation.
 
 Other targets:
  * make install      same as "make"
+ * make prebuilt     fetch and install prebuilt binaries
+ * make list         list packages
  * make fetch        fetch required source tarballs
  * make fetch-all    fetch all source tarballs
  * make distclean    clean everything and undo bootstrap
- * make clean        clean everything
  * make mostlyclean  clean everything except source tarballs
+ * make clean        clean everything
+ * make package      prepare prebuilt packages
 EOF
+
+mkdir -p ../../contrib/tarballs