X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=b6c6945709b6751d2131661d8d3e804d051ee134;hb=bb2674a23b551cbc146d40ff7a122c87856b49ff;hp=53276dbc4bb292f103e6890a60a3ebc814ebb312;hpb=db7368b4d5da5086d80c5004ee38d5e4ecc84c8b;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 53276db..b6c6945 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -1,20 +1,34 @@
 #!/bin/sh
 
+# Determine whether to recommend/use the HEAD revision of FFmpeg (unreleased)
+# or a specific revision based upon whether the last digit of our version
+# is even or odd. An odd MLT version number always represents unreleased.
+svn_rev="17923"
+micro_version=$(echo $version | cut -d . -f 3)
+odd_version=$(($micro_version % 2))
+[ "$odd_version" -eq "1" ] && svn_rev="HEAD"
 
 if [ "$help" = "1" ]
 then
 	cat << EOF
 FFMPEG/avformat options:
 
-  --avformat-cvs          - Obtain ffmpeg from CVS
+  --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
+  --avformat-suffix=suff  - Specify a custom suffix for an ffmpeg shared build
+  --avformat-swscale      - Use ffmpeg libswcale instead of img_convert
+  --avformat-no-codecs    - Disable the producer and consumer to avoid the FFmpeg codecs
+  --avformat-no-filters   - Disable the filters to make a codecs+muxers-only plugin
+
+  NOTE: The recommended version of FFmpeg is SVN-r$svn_rev.
 
 EOF
 
 else
-        targetos=$(uname -s)
+	targetos=$(uname -s)
 	case $targetos in
 	Darwin)
 		export LIBSUF=.dylib
@@ -26,20 +40,27 @@ else
 		;;
 	esac
 		
+	bits=$(uname -m)
+	case $bits in
+	x86_64)
+		[ -d /usr/lib/lib64 ] && export LIBDIR=lib64 || export LIBDIR=lib
+		;;
+	*)
+		export LIBDIR=lib
+		;;
+	esac
+
 	echo > config.mak
 
 	export static_ffmpeg=
-	export shared_ffmpeg=`whereis ffmpeg | cut -f 2 -d' '`
+	export shared_ffmpeg=$(pkg-config --variable=prefix libavformat)
 	export extra_libs=
-	export cvs_ffmpeg=
-
-	if [ "$shared_ffmpeg" != "" ]
-	then
-		# Chop ffmpeg 
-		shared_ffmpeg=`dirname $shared_ffmpeg`
-		# Chop bin 
-		shared_ffmpeg=`dirname $shared_ffmpeg`
-	fi
+	export svn_ffmpeg=
+	export svn_ffmpeg_extra=
+	export avformat_suffix=
+	export swscale=
+	export codecs=true
+	export filters=true
 
 	for i in "$@"
 	do
@@ -47,59 +68,100 @@ 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 ;;
+			--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 ;;
+			--avformat-no-codecs )	codecs=false ;;
+			--avformat-no-filters )	filters=false ;;
 		esac
 	done
 
-	if [ "$cvs_ffmpeg" != "" ]
+	if [ "$svn_ffmpeg" != "" ]
 	then
-		[ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
-		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure --enable-shared )
+		if [ "$gpl" = "true" ]
+		then
+			enable_gpl="--enable-gpl"
+			if [ "$swscale" != "" ]
+			then
+					enable_swscale="--enable-swscale"
+					echo "SWSCALE=1" >> config.mak
+			fi
+		elif [ "$swscale" != "" ]
+		then
+			echo
+			echo "ERROR        ERROR        ERROR        ERROR        ERROR        ERROR"
+			echo "--enable-gpl is required to use --avformat-swscale with --avformat-svn!"
+			echo
+			exit
+		fi
+		if [ ! -d "ffmpeg" ]
+		then
+			echo
+			echo "Checking out ffmpeg/avformat revision $svn_rev - no password required"
+			echo
+			svn checkout -r $svn_rev svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+		fi
+		[ -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" >> config.mak
+		echo "CFLAGS+=-I`pwd`/ffmpeg -I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec -I`pwd`/ffmpeg/libavutil -I`pwd`/ffmpeg/libavdevice -I`pwd`/ffmpeg/libswscale" >> config.mak
+		echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec -L`pwd`/ffmpeg/libavutil -L`pwd`/ffmpeg/libavdevice -L`pwd`/ffmpeg/libswscale" >> config.mak
+		[ $targetos = "Darwin" ] &&
+			echo "LDFLAGS+=-single_module" >> config.mak
 		echo "LOCAL_FFMPEG=1" >> config.mak
-		extra_libs="$extra_libs -lz"
+		echo "LDFLAGS+=-Wl,-Bsymbolic" >> config.mak
+		extra_libs="$extra_libs -lz -lbz2"
 	elif [ "$static_ffmpeg" != "" ]
 	then 
 		if [ -d "$static_ffmpeg" ]
 		then
-			echo "CFLAGS+=-I$static_ffmpeg/libavformat -I$static_ffmpeg/libavcodec" >> config.mak
-			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec" >> config.mak
+			echo "CFLAGS+=-I$static_ffmpeg/libavformat -I$static_ffmpeg/libavcodec -I$static_ffmpeg/libavutil -I$static_ffmpeg/libavdevice" >> config.mak
+			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil -L$static_ffmpeg/libavdevice" >> config.mak
 			[ $targetos = "Darwin" ] &&
 			 	echo "LDFLAGS+=-single_module" >> config.mak
+			if [ "$swscale" != "" ]
+			then
+				echo "CFLAGS+=-I$static_ffmpeg/libswscale" >> config.mak
+				echo "LDFLAGS+=-L$static_ffmpeg/libswscale" >> config.mak
+				echo "SWSCALE=1" >> config.mak
+			fi
+			echo "LDFLAGS+=-Wl,-Bsymbolic" >> config.mak
+			extra_libs="$extra_libs -lz"
 		else
 			echo "avformat: Invalid path specified: $static_ffmpeg"
 			touch ../disable-avformat
 			echo 0
 		fi
-	else 
-		if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/lib/libavformat.so" ]
+	elif [ "$shared_ffmpeg" != "" ]
+	then
+		echo "PREFIX=$shared_ffmpeg" >> config.mak
+		echo "CFLAGS+=$(pkg-config --cflags libavformat) $TMP_CFLAGS" >> config.mak
+		echo "LDFLAGS+=$(pkg-config --libs libavformat)" >> config.mak
+		[ -d "$shared_ffmpeg/include/ffmpeg/libavformat" ] &&
+			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg/libavformat -I$shared_ffmpeg/include/ffmpeg/libavcodec" >> config.mak
+		[ -d "$shared_ffmpeg/include/libavformat" ] &&
+			echo "CFLAGS+=-I$shared_ffmpeg/include/libavformat -I$shared_ffmpeg/include/libavcodec" >> config.mak
+		if [ "$swscale" != "" ]
 		then
-			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
-			echo "LDFLAGS+=-L$shared_ffmpeg/lib" >> config.mak
-		else
-			echo "avformat: No build environment found. "
-			echo "          Try configuring mlt with --avformat-cvs."
-			touch ../disable-avformat
-			exit 0
+			[ -d "$shared_ffmpeg/include/ffmpeg/libswscale" ] &&
+				echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg/libswscale" >> config.mak
+			[ -d "$shared_ffmpeg/include/libswscale" ] &&
+				echo "CFLAGS+=-I$shared_ffmpeg/include/libswscale" >> config.mak
+			echo "SWSCALE=1" >> config.mak
 		fi
+	else
+		echo "avformat: No build environment found. "
+		echo "          Try configuring mlt with --avformat-svn."
+		touch ../disable-avformat
+		exit 0
 	fi
 
 	echo "EXTRA_LIBS=$extra_libs" >> config.mak
-
-cat << EOF >> ../producers.dat
-avformat		libmltffmpeg$LIBSUF
-EOF
-
-cat << EOF >> ../filters.dat
-avdeinterlace	libmltffmpeg$LIBSUF
-avresample		libmltffmpeg$LIBSUF
-avcolour_space	libmltffmpeg$LIBSUF
-EOF
-
-cat << EOF >> ../consumers.dat
-avformat		libmltffmpeg$LIBSUF
-EOF
+	echo "AVFORMAT_SUFFIX=$avformat_suffix" >> config.mak
+	[ "$codecs" = "true" ] && echo "CODECS=1" >> config.mak
+	[ "$filters" = "true" ] && echo "FILTERS=1" >> config.mak
+	exit 0
 
 fi
-