iOS: more building fixes

[vlc] / extras / package / ios / build.sh

diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 1ef0f1d0356855399f7ed0812ab1cf0121a794e2..2f78ef7c44a23f58a4f7dfb57447db7309aec6a7 100755 (executable)
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -82,6 +82,7 @@ if [ "$PLATFORM" = "Simulator" ]; then
     OPTIM="-O3 -g"
 else
     TARGET="arm-apple-darwin11"
+    OPTIM="-O3 -g"
 fi
 
 info "Using ${ARCH} with SDK version ${SDK_VERSION}"
@@ -185,7 +186,7 @@ else
   export ASCPP="xcrun as"
 fi
 
-../bootstrap --host=${TARGET} --build="i686-apple-darwin10" --disable-gpl \
+../bootstrap --host=${TARGET} --build="i686-apple-darwin10" --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --disable-gpl \
     --disable-disc --disable-sout \
     --enable-small \
     --disable-sdl \
@@ -212,7 +213,9 @@ fi
     --disable-orc \
     --disable-schroedinger \
     --disable-libmpeg2 \
-    --enable-mad > ${out}
+    --disable-chromaprint \
+    --disable-mad \
+    --disable-taglib > ${out}
 
 echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
 echo "EXTRA_LDFLAGS += ${EXTRA_LDFLAGS}" >> config.mak
@@ -236,12 +239,6 @@ if [ ".$PLATFORM" != ".Simulator" ]; then
     export AVFORMAT_LIBS="-L${PREFIX}/lib -lavcodec -lz -lavutil -lavformat"
 fi
 
-export DVBPSI_CFLAGS="-I${VLCROOT}/contrib-ios-${TARGET}/include "
-export DVBPSI_LIBS="-L${VLCROOT}/contrib-ios-${TARGET}/lib "
-
-export SWSCALE_CFLAGS="-I${VLCROOT}/contrib-ios-${TARGET}/include "
-export SWSCALE_LIBS="-L${VLCROOT}/contrib-ios-${TARGET}/lib "
-
 mkdir -p ${BUILDDIR}
 spushd ${BUILDDIR}
 
@@ -250,10 +247,10 @@ info ">> --prefix=${PREFIX} --host=${TARGET}"
 # Run configure only upon changes.
 if [ "${VLCROOT}/configure" -nt config.log -o \
      "${THIS_SCRIPT_PATH}" -nt config.log ]; then
-CONTRIB_DIR=${VLCROOT}/contrib-ios-${TARGET} \
 ${VLCROOT}/configure \
     --prefix="${PREFIX}" \
     --host="${TARGET}" \
+    --with-contrib="${VLCROOT}/contrib/${TARGET}-${ARCH}" \
     --disable-debug \
     --enable-static \
     --disable-macosx \
@@ -262,8 +259,11 @@ ${VLCROOT}/configure \
     --disable-macosx-qtkit \
     --disable-macosx-eyetv \
     --disable-macosx-vlc-app \
+    --disable-macosx-avfoundation \
     --enable-audioqueue \
+    --enable-ios-audio \
     --enable-ios-vout \
+    --enable-ios-vout2 \
     --disable-shared \
     --disable-macosx-quartztext \
     --enable-avcodec \
@@ -272,7 +272,6 @@ ${VLCROOT}/configure \
     --disable-sout \
     --disable-faad \
     --disable-lua \
-    --enable-mad \
     --disable-a52 \
     --disable-fribidi \
     --disable-macosx-audio \
@@ -314,7 +313,8 @@ ${VLCROOT}/configure \
     --disable-screen \
     --disable-freetype \
     --disable-taglib \
-    --disable-mmx > ${out} # MMX and SSE support requires llvm which is broken on Simulator
+    --disable-mmx \
+    --disable-mad > ${out} # MMX and SSE support requires llvm which is broken on Simulator
 fi
 
 CORE_COUNT=`sysctl -n machdep.cpu.core_count`
@@ -327,7 +327,7 @@ info "Installing libvlc"
 make install > ${out}
 
 find ${PREFIX}/lib/vlc/plugins -name *.a -type f -exec cp '{}' ${PREFIX}/lib/vlc/plugins \;
-cp -R "${VLCROOT}/contrib/${TARGET}" "${PREFIX}/contribs"
+cp -R "${VLCROOT}/contrib/${TARGET}-${ARCH}" "${PREFIX}/contribs"
 
 info "Removing unneeded modules"
 blacklist="
@@ -383,7 +383,6 @@ logger
 visual
 fb
 aout_file
-yuv
 dummy
 invert
 sepia
@@ -396,7 +395,6 @@ extract
 colorthres
 antiflicker
 anaglyph
-adjust
 remap
 "