[xiph-commits] r14262 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2007-12-02 06:32:03 -0800 (Sun, 02 Dec 2007)
New Revision: 14262

Modified:
   trunk/ffmpeg2theora/Makefile.am
   trunk/ffmpeg2theora/build.mac.sh
   trunk/ffmpeg2theora/configure.ac
   trunk/ffmpeg2theora/get_ffmpeg_svn.sh
Log:
* depend on specific version of ffmpeg svn ins get_ffmpeg_svn and build.mac.sh
* depend on newer version of automake
* requite theora >= 1.0beta1
* up version to 0.20
 


Modified: trunk/ffmpeg2theora/Makefile.am
===================================================================
--- trunk/ffmpeg2theora/Makefile.am	2007-12-01 21:48:56 UTC (rev 14261)
+++ trunk/ffmpeg2theora/Makefile.am	2007-12-02 14:32:03 UTC (rev 14262)
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = 1.6 dist-bzip2 no-dist-gzip
+AUTOMAKE_OPTIONS = 1.8 dist-bzip2 no-dist-gzip
 
 SUBDIRS = kino_export
 

Modified: trunk/ffmpeg2theora/build.mac.sh
===================================================================
--- trunk/ffmpeg2theora/build.mac.sh	2007-12-01 21:48:56 UTC (rev 14261)
+++ trunk/ffmpeg2theora/build.mac.sh	2007-12-02 14:32:03 UTC (rev 14262)
@@ -14,7 +14,7 @@
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=0
   export PKG_CONFIG_LIBDIR=$dist_dir/lib/pkgconfig
 
-  ffmpeg_extra="--enable-pp --enable-gpl --enable-swscaler --disable-encoders  --enable-libogg --enable-libvorbis"
+  ffmpeg_extra="--enable-pp --enable-gpl --enable-swscaler --disable-encoders --enable-libvorbis"
   ffmpeg_extra="$ffmpeg_extra --enable-liba52"
   test -e $dist_dir/lib/libfaad.a && ffmpeg_extra="$ffmpeg_extra --enable-faad" && echo "building with faad"
   echo ""
@@ -80,7 +80,7 @@
     echo "using existing $arch/$package"
   else
     echo "building $arch/$package"
-    test -e ffmpeg || svn co svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+    test -e ffmpeg || svn co -r11076 svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
     cd ffmpeg
     unset CFLAGS
     unset LDFLAGS

Modified: trunk/ffmpeg2theora/configure.ac
===================================================================
--- trunk/ffmpeg2theora/configure.ac	2007-12-01 21:48:56 UTC (rev 14261)
+++ trunk/ffmpeg2theora/configure.ac	2007-12-02 14:32:03 UTC (rev 14262)
@@ -1,10 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT(ffmpeg2theora,0.19)
+AC_INIT(ffmpeg2theora,0.20)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AM_PROG_LIBTOOL
 
 AC_SYS_LARGEFILE
@@ -24,7 +25,7 @@
 AC_MSG_RESULT(no)
 )
 
-PKG_CHECK_MODULES(XIPH,ogg >= 1.1 vorbis vorbisenc theora )
+PKG_CHECK_MODULES(XIPH,ogg >= 1.1 vorbis vorbisenc theora >= 1.0beta1)
 
 AC_SUBST(XIPH_CFLAGS)
 AC_SUBST(XIPH_LIBS)

Modified: trunk/ffmpeg2theora/get_ffmpeg_svn.sh
===================================================================
--- trunk/ffmpeg2theora/get_ffmpeg_svn.sh	2007-12-01 21:48:56 UTC (rev 14261)
+++ trunk/ffmpeg2theora/get_ffmpeg_svn.sh	2007-12-02 14:32:03 UTC (rev 14262)
@@ -3,7 +3,7 @@
 #optional, if you have those libs installed:
 #extra="--enable-libfaad --enable-libgsm --enable-amr_nb --enable-amr_nb-fixed --enable-amr_wb --enable-amr_if2"
 
-common="--enable-gpl --enable-swscaler --enable-pp --enable-liba52 --disable-encoders"
+common="--enable-gpl --enable-swscaler --enable-pp --enable-liba52 --disable-encoders --enable-libvorbis"
 
 #linux
 options="$common --enable-pthreads $extra"
@@ -11,5 +11,5 @@
 #mingw32
 uname | grep MINGW && options="$common --enable-memalign-hack --enable-mingw32 --extra-cflags=-I/usr/local/include --extra-ldflags=-L/usr/local/lib $extra"
 
-svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+svn co -r11076 svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
 cd ffmpeg && ./configure $options && make