From: lilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Tue, 25 May 2004 10:52:55 +0000 (+0000)
Subject: Yet another way to configure ffmpeg
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=8c530b43ba3c97b1dfcd306ad9ee5cd808923528;p=melted

Yet another way to configure ffmpeg


git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@317 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index ade450a..d5096fa 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -18,19 +18,22 @@ SRCS := $(OBJS:.o=.c)
 all: 	$(TARGET)
 
 $(TARGET): $(OBJS)
+		if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg all ; fi
 		$(CC) -shared -o $@ $(OBJS) $(LDFLAGS)
 
 depend:	$(SRCS)
+		if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dep ; fi
 		$(CC) -MM $(CFLAGS) $^ 1>.depend
 
 dist-clean:	clean
+		if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dist-clean ; fi
 		rm -f .depend
 
 clean:	
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
+		install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 11ad231..e3b36c5 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -5,6 +5,7 @@ then
 	cat << EOF
 FFMPEG/avformat options:
 
+  --avformat-cvs          - Obtain ffmpeg from CVS
   --avformat-shared=path  - Link against a shared installation of ffmpeg (default)
   --avformat-static=path  - Link against a static ffmpeg dev tree
   --avformat-ldextra=libs - Provide additional libs to link with
@@ -17,6 +18,7 @@ else
 	export static_ffmpeg=
 	export shared_ffmpeg=`whereis ffmpeg | cut -f 2 -d' '`
 	export extra_libs=
+	export cvs_ffmpeg=
 
 	if [ "$shared_ffmpeg" != "" ]
 	then
@@ -32,10 +34,19 @@ else
 			--avformat-static=* )	static_ffmpeg="${i#--avformat-static=}" ;;
 			--avformat-shared=* )	shared_ffmpeg="${i#--avformat-shared=}" ;;
 			--avformat-ldextra=* )	extra_libs="${i#--avformat-ldextra=}" ;;
+			--avformat-cvs )		cvs_ffmpeg=true ;;
 		esac
 	done
 
-	if [ "$static_ffmpeg" != "" ]
+	if [ "$cvs_ffmpeg" != "" ]
+	then
+		[ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
+		[ -d "ffmpeg" ] && ( cd ffmpeg ; cvs -z9 update -PdA ; ./configure )
+		echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec" >> config.mak
+		echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec" >> config.mak
+		echo "LOCAL_FFMPEG=1" >> config.mak
+		extra_libs="$extra_libs -lz"
+	elif [ "$static_ffmpeg" != "" ]
 	then 
 		if [ -d "$static_ffmpeg" ]
 		then
@@ -52,7 +63,8 @@ else
 			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
 			echo "LDFLAGS+=-L$shared_ffmpeg" >> config.mak
 		else
-			echo "avformat: No build environment found."
+			echo "avformat: No build environment found. "
+			echo "          Try configuring mlt with --avformat-cvs."
 			touch ../disable-avformat
 			exit 0
 		fi