[xiph-commits] r18101 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2011-10-07 06:07:53 -0700 (Fri, 07 Oct 2011)
New Revision: 18101

Added:
   trunk/ffmpeg2theora/build_ffmpeg.sh
Modified:
   trunk/ffmpeg2theora/SConstruct
   trunk/ffmpeg2theora/get_ffmpeg.sh
Log:
split build and checkout of ffmpeg

Modified: trunk/ffmpeg2theora/SConstruct
===================================================================
--- trunk/ffmpeg2theora/SConstruct	2011-09-24 01:03:30 UTC (rev 18100)
+++ trunk/ffmpeg2theora/SConstruct	2011-10-07 13:07:53 UTC (rev 18101)
@@ -28,6 +28,7 @@
 opts.AddVariables(
   BoolVariable('static', 'Set to 1 for static linking', 0),
   BoolVariable('debug', 'Set to 1 to enable debugging', 0),
+  BoolVariable('build_ffmpeg', 'Set to 1 to build local copy of ffmpeg', 0),
   ('prefix', 'install files in', '/usr/local'),
   ('bindir', 'user executables', 'PREFIX/bin'),
   ('mandir', 'man documentation', 'PREFIX/man'),
@@ -109,6 +110,12 @@
   'CheckPKG' : CheckPKG,
 })
 
+if env["build_ffmpeg"]:
+  if env.GetOption('clean'):
+    TryAction("cd ffmpeg;make distclean")
+  else:
+    TryAction("./build_ffmpeg.sh")
+
 if not env.GetOption('clean'):
   pkgconfig_version='0.15.0'
   if not conf.CheckPKGConfig(pkgconfig_version): 

Added: trunk/ffmpeg2theora/build_ffmpeg.sh
===================================================================
--- trunk/ffmpeg2theora/build_ffmpeg.sh	                        (rev 0)
+++ trunk/ffmpeg2theora/build_ffmpeg.sh	2011-10-07 13:07:53 UTC (rev 18101)
@@ -0,0 +1,25 @@
+#!/bin/sh
+. ./ffmpegrev
+
+
+common="--enable-version2 --enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
+common="$common --disable-avconv --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --disable-doc"
+
+#optional, if you have those libs installed(requires GPL3):
+#extra="$extra --enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb"
+
+#apt-get install liba52-dev libgsm1-dev
+#extra="$extra  --enable-libgsm"
+
+#optional, if you have libvpx installed:
+#extra="$extra --enable-libvpx"
+
+#linux
+options="$common --enable-pthreads $extra"
+
+#mingw32
+uname | grep MINGW && options="$common --enable-memalign-hack --enable-mingw32 --extra-cflags=-I/usr/local/include --extra-ldflags=-L/usr/local/lib $extra"
+
+#configure and build ffmpeg
+cd $FFMPEG_CO_DIR && ./configure $options && make
+


Property changes on: trunk/ffmpeg2theora/build_ffmpeg.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/ffmpeg2theora/get_ffmpeg.sh
===================================================================
--- trunk/ffmpeg2theora/get_ffmpeg.sh	2011-09-24 01:03:30 UTC (rev 18100)
+++ trunk/ffmpeg2theora/get_ffmpeg.sh	2011-10-07 13:07:53 UTC (rev 18101)
@@ -1,23 +1,6 @@
 #!/bin/sh
+cd `dirname $0`
 
-common="--enable-version2 --enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
-common="$common --disable-avconv --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --disable-doc"
-
-#optional, if you have those libs installed(requires GPL3):
-#extra="$extra --enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb"
-
-#apt-get install liba52-dev libgsm1-dev
-#extra="$extra  --enable-libgsm"
-
-#optional, if you have libvpx installed:
-#extra="$extra --enable-libvpx"
-
-#linux
-options="$common --enable-pthreads $extra"
-
-#mingw32
-uname | grep MINGW && options="$common --enable-memalign-hack --enable-mingw32 --extra-cflags=-I/usr/local/include --extra-ldflags=-L/usr/local/lib $extra"
-
 # load FFMPEG specific properties
 . ./ffmpegrev
 
@@ -38,7 +21,5 @@
   cd ..
 }
 
-#test -e $FFMPEG_CO_DIR/.ffmpeg2theora_patched || apply_patches
-#configure and build ffmpeg
-cd $FFMPEG_CO_DIR && ./configure $options && make
+./build_ffmpeg.sh