[xiph-commits] r7168 - trunk/ffmpeg2theora

[j at dactyl.lonelymoon.com]

Author: j
Date: Fri Jul 16 23:01:15 2004
New Revision: 7168

Modified:
trunk/ffmpeg2theora/ChangeLog
trunk/ffmpeg2theora/INSTALL
trunk/ffmpeg2theora/Makefile.am
trunk/ffmpeg2theora/configure.ac
trunk/ffmpeg2theora/ffmpeg2theora.c
Log:
change configure.ac and Makefile.am to better build with mingw32

Modified: trunk/ffmpeg2theora/ChangeLog
===================================================================
--- trunk/ffmpeg2theora/ChangeLog	2004-07-16 20:15:46 UTC (rev 7167)
+++ trunk/ffmpeg2theora/ChangeLog	2004-07-17 06:01:13 UTC (rev 7168)
@@ -1,6 +1,8 @@
-0.xx 	2004-0x-xx
+0.10.2 	2004-07-17
- add cropping support
- remove support for ffmpeg<0.4.9-pre1
+	- change configure.ac and Makefile.am to better build with
+	  mingw32

0.10.1 	2004-07-15 21:03:15
- fix problems with mpeg files using ffmpeg from cvs or versions

Modified: trunk/ffmpeg2theora/INSTALL
===================================================================
--- trunk/ffmpeg2theora/INSTALL	2004-07-16 20:15:46 UTC (rev 7167)
+++ trunk/ffmpeg2theora/INSTALL	2004-07-17 06:01:13 UTC (rev 7168)
@@ -16,11 +16,17 @@

you need to crosscompiled libvorbis,libogg,libtheora

- you need ffmpeg, to build it and install it to /usr/local/win32:
-./configure --prefix=/usr/local/win32/build  --enable-vorbis --enable-shared --enable-shared-pp --enable-mingw32  --cc=i586-mingw32msvc-gcc
+ you need ffmpeg, to build it with other crosscompiled libs in /usr/local/win32:
+ ./configure --prefix=/usr/local/win32/build  --enable-vorbis --disable-mp3lame --enable-pp --enable-a52  --disable-pthreads --disable-vhook --disable-v4l --disable-audio-oss --disable-dv1394  --disable-ffmpeg --disable-ffserver --disable-network --enable-gpl --enable-mingw32  --cc=i586-mingw32msvc-gcc
make
- make install

to build ffmpeg2theora
- make -f Makefile.mingw32
-[ you might be able to compile it with the Makefile generated by automake too ]
+ PREFIX=/usr/local/win32
+ TARGET=i586-mingw32msvc
+ PATH="$PREFIX/bin:$PREFIX/$TARGET/bin:$PATH"
+ export PATH
+ cache=cross-config.cache
+ ./configure --cache-file="$cache" \
+         --target=$TARGET --host=$TARGET --build=i386-linux --prefix=$PREFIX \
+         --with-ffmpegprefix=/path/to/ffmpeg_src
+

Modified: trunk/ffmpeg2theora/Makefile.am
===================================================================
--- trunk/ffmpeg2theora/Makefile.am	2004-07-16 20:15:46 UTC (rev 7167)
+++ trunk/ffmpeg2theora/Makefile.am	2004-07-17 06:01:13 UTC (rev 7168)
@@ -4,10 +4,10 @@

EXTRA_DIST = Makefile.mingw32 theorautils.h

-EXTRA="-D_FILE_OFFSET_BITS=64"
+EXTRA=-D_FILE_OFFSET_BITS=64 -I$(prefix)/include

bin_PROGRAMS = ffmpeg2theora

ffmpeg2theora_SOURCES = ffmpeg2theora.c  theorautils.c
-ffmpeg2theora_LDFLAGS = -static @FFMPEG_LIBS@ @XIPH_LIBS@
+ffmpeg2theora_LDFLAGS = -static -L$(prefix)/lib @FFMPEG_LIBS@ @XIPH_LIBS@
ffmpeg2theora_CFLAGS = $(EXTRA) @XIPH_CFLAGS@ @FFMPEG_CFLAGS@

Modified: trunk/ffmpeg2theora/configure.ac
===================================================================
--- trunk/ffmpeg2theora/configure.ac	2004-07-16 20:15:46 UTC (rev 7167)
+++ trunk/ffmpeg2theora/configure.ac	2004-07-17 06:01:13 UTC (rev 7168)
@@ -18,17 +18,23 @@

dnl only check for libavcodec.a and libformat.a if not crosscompiling
dnl
+LIBPREF=lib
+LIBSUF=.a
if test "$cross_compiling" = yes; then
HAVE_FFMPEG=yes
+  LIBPREF=
+  LIBSUF=.lib
else
-  AC_CHECK_FILES([$ffmpegprefix $ffmpegprefix/libavcodec/libavcodec.a $ffmpegprefix/libavformat/libavformat.a],[HAVE_FFMPEG=yes])
+  AC_CHECK_FILES([$ffmpegprefix/libavcodec/${LIBPREF}avcodec$LIBSUF $ffmpegprefix/libavformat/${LIBPREF}avformat$LIBSUF],[HAVE_FFMPEG=yes])
fi

dnl if not using ffmpegprefix try to look for shared files
if test "x$HAVE_FFMPEG" != xyes; then
-	AC_CHECK_HEADER(ffmpeg/avcodec.h,[HAVE_SHARED_AVCODEC=yes])
-	AC_CHECK_HEADER(ffmpeg/avformat.h, [HAVE_SHARED_AVFORMAT=yes])
-	AC_CHECK_FILE(/usr/local/include/ffmpeg, [HAVE_FFMPEG_LOCAL=yes])
+	if test "$ffmpegprefix" == ffmpeg; then
+		AC_CHECK_HEADER(ffmpeg/avcodec.h,[HAVE_SHARED_AVCODEC=yes])
+		AC_CHECK_HEADER(ffmpeg/avformat.h, [HAVE_SHARED_AVFORMAT=yes])
+		AC_CHECK_FILE(/usr/local/include/ffmpeg, [HAVE_FFMPEG_LOCAL=yes])
+	fi
if test "x$HAVE_SHARED_AVCODEC$HAVE_SHARED_AVCODEC" != xyesyes; then
AC_MSG_ERROR([
you need libavcodec and libavformat from ffmpeg cvs
@@ -50,7 +56,7 @@
else
FFMPEG_CFLAGS="-I$ffmpegprefix/libavformat -I$ffmpegprefix/libavcodec"
FFMPEG_EXTLIBS="-lm -lz"
-	FFMPEG_LIBS="$ffmpegprefix/libavformat/libavformat.a $ffmpegprefix/libavcodec/libavcodec.a $FFMPEG_EXTLIBS"
+	FFMPEG_LIBS="$ffmpegprefix/libavformat/${LIBPREF}avformat$LIBSUF $ffmpegprefix/libavcodec/${LIBPREF}avcodec$LIBSUF $FFMPEG_EXTLIBS"
fi



Modified: trunk/ffmpeg2theora/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/ffmpeg2theora.c	2004-07-16 20:15:46 UTC (rev 7167)
+++ trunk/ffmpeg2theora/ffmpeg2theora.c	2004-07-17 06:01:13 UTC (rev 7168)
@@ -534,7 +534,6 @@
return crop_value;
}

-
void print_presets_info() {
fprintf (stderr,
//  "v2v presets - more info at http://wiki.v2v.cc/presets"
@@ -633,7 +632,7 @@
// set some variables;
info.debug=0;

-	while((c=getopt_long_only(argc,argv,optstring,options,&long_option_index))!=EOF){
+	while((c=getopt_long(argc,argv,optstring,options,&long_option_index))!=EOF){
switch(c)
{
case 0: