From: ddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Sun, 15 Jul 2007 07:43:48 +0000 (+0000)
Subject: avformat/configure: add --avformat-svn-extra
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=2c3bf9c72ca4986dee0d6abcefb9227d7172c7cf;p=melted

avformat/configure: add --avformat-svn-extra
avformat/Makefile: rebuild module when local ffmpeg changes

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

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index c3031ef..8d45fc6 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -24,14 +24,22 @@ ifdef SWSCALE
 	LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)
 endif
 
+ifdef LOCAL_FFMPEG
+	LOCAL_FFMPEG_OBJS = ffmpeg/libavformat/libavformat$(AVFORMAT_SUFFIX) \
+	                    ffmpeg/libavcodec/libavcodec$(AVFORMAT_SUFFIX) \
+	                    ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX)
+endif
+
 SRCS := $(OBJS:.o=.c)
 
 all: 	$(TARGET)
 
-$(TARGET): $(OBJS)
+$(LOCAL_FFMPEG_OBJS):
 		if [ $(LOCAL_FFMPEG) ] ; then \
 			$(MAKE) -C ffmpeg lib ; \
 		fi
+
+$(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)
 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 depend:	$(SRCS)
diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 96dda2b..9171372 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -7,6 +7,7 @@ then
 FFMPEG/avformat options:
 
   --avformat-svn          - Obtain ffmpeg from Subversion
+  --avformat-svn-extra    - Add extra configure options for --avformat-svn
   --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
@@ -44,6 +45,7 @@ else
 	export shared_ffmpeg=`which ffmpeg`
 	export extra_libs=
 	export svn_ffmpeg=
+	export svn_ffmpeg_extra=
 	export avformat_suffix=
 	export swscale=
 
@@ -62,9 +64,11 @@ else
 			--avformat-shared=* )	shared_ffmpeg="${i#--avformat-shared=}" ;;
 			--avformat-ldextra=* )	extra_libs="${i#--avformat-ldextra=}" ;;
 			--avformat-svn )		svn_ffmpeg=true ;;
+			--avformat-svn-extra=* ) svn_ffmpeg_extra="${i#--avformat-svn-extra=}" ;;
 			--avformat-cvs )		svn_ffmpeg=true ;;
 			--avformat-suffix=* )	avformat_suffix="${i#--avformat-suffix=}" ;;
 			--avformat-swscale )	swscale=true ;;
+			--avformat-swscaler )	swscale=true ;;
 		esac
 	done
 
@@ -93,7 +97,7 @@ else
 			echo
 			svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
 		fi
-		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure $enable_gpl $enable_swscale )
+		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure $enable_gpl $enable_swscale $svn_ffmpeg_extra )
 		#[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
 		echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec -I`pwd`/ffmpeg/libavutil -I`pwd`/ffmpeg/libswscale" >> config.mak
 		echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec -L`pwd`/ffmpeg/libavutil -L`pwd`/ffmpeg/libswscale" >> config.mak