[Sumover-dev] [svn commit] r4912 - vic/branches/mpeg4

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Sun Jan 22 03:37:54 2012
New Revision: 4912

Modified:
   vic/branches/mpeg4/configure.in

Log:
r29824 of libswscale is no longer in SVN, a copy of ffmpeg-0.5.8 using wget or curl is now downloaded insted.

bump snapshot of x264 from 20090708-2245 to 20100805-2245 to support the (codec/x264encoder.cpp) mods done by Andrew Ford

Minor configure script fix for building x264 on MacOS X 10.7 (Lion). Work still required to build /video/grabber-macosx.cpp on Lion due to missing QuickTime header file declarations.


Modified: vic/branches/mpeg4/configure.in
==============================================================================
--- vic/branches/mpeg4/configure.in	(original)
+++ vic/branches/mpeg4/configure.in	Sun Jan 22 03:37:54 2012
@@ -547,13 +547,14 @@
 dnl Check for 64-bit host gcc - in Snow Leopard+
         AC_MSG_CHECKING([for 64-bit gcc on OSX])
 	if gcc -v 2>&1 | grep host=x86_64 >& /dev/null ; then
-dnl Check for lack of 64-bit support in QT - an issue in Snow Leopard+
+dnl Check for lack of 64-bit support in QuickTime - an issue in Snow Leopard+
 	   if ! file -L  /System/Library/Frameworks/QuickTime.framework/QuickTime 2>&1 | grep x86_64 >&/dev/null; then
-              AC_MSG_RESULT([Yes but forcing 32-bit due to QT])
+              AC_MSG_RESULT([Yes but forcing 32-bit due to QuickTime])
               V_CCOPT="$V_CCOPT -arch i386"
               V_LDFLAGS="$V_LDFLAGS -arch i386  -mmacosx-version-min=10.4"
 dnl If gcc 32bit then we need to set these flags for compilation of ffmpeg and x264
               V_CCLDFLAGS32="LDFLAGS='-arch i386 -mmacosx-version-min=10.4' CFLAGS='-arch i386'"
+              x264_conf="$x264_conf --host=i686-apple-darwin"
 	   fi
 	else
               AC_MSG_RESULT([No - using 32-bit])
@@ -617,14 +618,13 @@
 AC_CHECK_PROG(DOWNLOAD, curl, [curl -s])
 
 havex264="no"
-AC_ARG_WITH(ffmpegver,       --with-ffmpegver=ffmpeg-version     specify the version of ffmpeg to download and build, ffmpegver=$withval, ffmpegver=ffmpeg)
+AC_ARG_WITH(ffmpegver,       --with-ffmpegver=ffmpeg-version     specify the version of ffmpeg to download and build, ffmpegver=$withval, ffmpegver=ffmpeg-0.5.8)
 AC_ARG_ENABLE(ffmpeg-co,	--disable-ffmpeg-co	Enable or disable ffmpeg download, ffmpegco="no", ffmpegco="yes")
 if test "$ffmpegco" = "yes" ; then
   if test "$gpl" = "yes" ; then
    if test ! -d ${ffmpegver} ; then
-      echo "Checking out r20462 (and 29824 of libswscale) of ffmpeg from svn://svn.ffmpeg.org/ffmpeg/trunk..."
-      svn checkout -q -r 20462 svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg
-      svn checkout -q -r 29824 svn://svn.ffmpeg.org/mplayer/trunk/libswscale  ffmpeg/libswscale
+      echo "Downloading ${ffmpegver} of ffmpeg from ffmpeg.org ..."
+      ${DOWNLOAD} http://ffmpeg.org/releases/${ffmpegver}.tar.bz2 | tar xjf - && ln -sf ${ffmpegver} ffmpeg
    fi
    patch --dry-run -sf -p0 < ffmpeg.iocom.patch >& /dev/null
    if test $? = 0; then
@@ -634,8 +634,8 @@
       echo "ffmpeg has already been patched for IOCOM decode compatibility"
    fi
    echo "Configuring ffmpeg..."
-   echo "${V_CCLDFLAGS32} ./configure --prefix=$V_PATH/ffmpeg $ffmpeg_conf --enable-gpl --enable-postproc"
-   cd ffmpeg && eval ${V_CCLDFLAGS32} ./configure --prefix=$V_PATH/ffmpeg $ffmpeg_conf --enable-gpl --enable-postproc; cd ..
+   echo "${V_CCLDFLAGS32} ./configure --prefix=$V_PATH/ffmpeg $ffmpeg_conf --enable-gpl --enable-swscale --enable-postproc"
+   cd ffmpeg && eval ${V_CCLDFLAGS32} ./configure --prefix=$V_PATH/ffmpeg $ffmpeg_conf --enable-gpl --enable-swscale --enable-postproc; cd ..
    V_INCLUDE="$V_INCLUDE -Iffmpeg/include -Iffmpeg"
    V_CODEC_LIB="$V_CODEC_LIB -Lffmpeg/lib -lavcodec -lavutil -lswscale -lpostproc "
   else
@@ -643,7 +643,7 @@
   fi
 fi
 
-AC_ARG_WITH(x264ver,       --with-x264ver=x264ver-version     specify the version of x264 to download and build, x264ver=$withval, x264ver=x264-snapshot-20090708-2245)
+AC_ARG_WITH(x264ver,       --with-x264ver=x264ver-version     specify the version of x264 to download and build, x264ver=$withval, x264ver=x264-snapshot-20100805-2245)
 AC_ARG_ENABLE(x264-co,        --disable-x264-co      Enable or disable x264 download, x264co="no", x264co="yes")
 if test "$x264co" = "yes" ; then
   if test "$gpl" = "yes" ; then
@@ -652,7 +652,7 @@
      ${DOWNLOAD} http://downloads.videolan.org/pub/videolan/x264/snapshots/${x264ver}.tar.bz2 | tar xjf - && ln -sf ${x264ver} x264
    fi
    echo;echo "Configuring x264..."
-   echo "${V_CCLDFLAGS32} ./configure --prefix=$V_PATH/x264"
+   echo "${V_CCLDFLAGS32} ./configure --prefix=$V_PATH/x264 $x264_conf"
    cd x264 && eval ${V_CCLDFLAGS32} ./configure --prefix=$V_PATH/x264 $x264_conf; cd ..
    V_INCLUDE="$V_INCLUDE -Ix264/include"
    V_CODEC_LIB="$V_CODEC_LIB -Lx264/lib -lx264"