X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=d74c8116b4e6b30c0e5812a298e3dc3da862899c;hb=ae867071f780e9c61a5013f6f7452850b4151e07;hp=b6a94e37233c1b292f053b88f9f500a0d9cec3fe;hpb=21dc56743b907328aee0625b023539dc7bb912d8;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index b6a94e3..d74c811 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -10,11 +10,12 @@ FFMPEG/avformat options:
   --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
 
 EOF
 
 else
-        targetos=$(uname -s)
+	targetos=$(uname -s)
 	case $targetos in
 	Darwin)
 		export LIBSUF=.dylib
@@ -26,14 +27,25 @@ else
 		;;
 	esac
 		
+	bits=$(uname -m)
+	case $bits in
+	x86_64)
+		export LIBDIR=lib64
+		;;
+	*)
+		export LIBDIR=lib
+		;;
+	esac
+
 	echo > config.mak
 
 	export static_ffmpeg=
-	export shared_ffmpeg=`whereis ffmpeg | cut -f 2 -d' '`
+	export shared_ffmpeg=`which ffmpeg`
 	export extra_libs=
 	export cvs_ffmpeg=
+	export avformat_suffix=
 
-	if [ "$shared_ffmpeg" != "" ]
+	if [ "$shared_ffmpeg" != "" -a -f "$shared_ffmpeg" ]
 	then
 		# Chop ffmpeg 
 		shared_ffmpeg=`dirname $shared_ffmpeg`
@@ -48,23 +60,30 @@ else
 			--avformat-shared=* )	shared_ffmpeg="${i#--avformat-shared=}" ;;
 			--avformat-ldextra=* )	extra_libs="${i#--avformat-ldextra=}" ;;
 			--avformat-cvs )		cvs_ffmpeg=true ;;
+			--avformat-suffix=* )	avformat_suffix="${i#--avformat-suffix=}" ;;
 		esac
 	done
 
 	if [ "$cvs_ffmpeg" != "" ]
 	then
-		[ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
-		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure --enable-shared )
+		[ ! -d "ffmpeg" ] && ( 
+			echo
+			echo "Checking out ffmpeg/avformat - no password required"
+			echo
+			cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg login
+			cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
+		)
+		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure --enable-shared --build-suffix="$avformat_suffix" )
 		#[ ! -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/libavformat -I`pwd`/ffmpeg/libavcodec -I`pwd`/ffmpeg/libavutil" >> config.mak
 		echo "LOCAL_FFMPEG=1" >> config.mak
 		extra_libs="$extra_libs -lz"
 	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" >> config.mak
+			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> config.mak
 			[ $targetos = "Darwin" ] &&
 			 	echo "LDFLAGS+=-single_module" >> config.mak
 		else
@@ -73,10 +92,10 @@ else
 			echo 0
 		fi
 	else 
-		if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/lib/libavformat.so" ]
+		if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
 		then
 			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
-			echo "LDFLAGS+=-L$shared_ffmpeg/lib" >> config.mak
+			echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak
 		else
 			echo "avformat: No build environment found. "
 			echo "          Try configuring mlt with --avformat-cvs."
@@ -86,6 +105,7 @@ else
 	fi
 
 	echo "EXTRA_LIBS=$extra_libs" >> config.mak
+	echo "AVFORMAT_SUFFIX=$avformat_suffix" >> config.mak
 
 cat << EOF >> ../producers.dat
 avformat		libmltavformat$LIBSUF