X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=4954e157d0a3b9301f6c3a40e9d977955146268c;hb=78b58b5474240fc011c0bf05c517b76961613ad8;hp=0d9986cfe8d949ac38d960d2639cc890475eaa1e;hpb=cef70011d08af33924ab3b97d628deefce47b953;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 0d9986c..4954e15 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
@@ -31,10 +32,10 @@ else
 	bits=$(uname -m)
 	case $bits in
 	x86_64)
-		export LIBDIR=lib64
+		export LIBDIR=lib
 		;;
 	*)
-		export LIBDIR=lib
+		export LIBDIR=lib32
 		;;
 	esac
 
@@ -44,8 +45,9 @@ else
 	export shared_ffmpeg=`which ffmpeg`
 	export extra_libs=
 	export svn_ffmpeg=
+	export svn_ffmpeg_extra=
 	export avformat_suffix=
-	export swscale=false
+	export swscale=
 
 	if [ "$shared_ffmpeg" != "" -a -f "$shared_ffmpeg" ]
 	then
@@ -62,23 +64,45 @@ 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
 
 	if [ "$svn_ffmpeg" != "" ]
 	then
-		[ ! -d "ffmpeg" ] && ( 
+		if [ "$gpl" = "true" ]
+		then
+			enable_gpl="--enable-gpl"
+			if [ "$swscale" != "" ]
+			then
+					enable_swscale="--enable-swscaler"
+					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 - no password required"
 			echo
 			svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
-		)
-		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure --enable-shared --build-suffix="$avformat_suffix" )
+		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 -I`pwd`/ffmpeg/libavutil" >> config.mak
+		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
+		[ $targetos = "Darwin" ] &&
+			echo "LDFLAGS+=-single_module" >> config.mak
 		echo "LOCAL_FFMPEG=1" >> config.mak
 		extra_libs="$extra_libs -lz"
 	elif [ "$static_ffmpeg" != "" ]
@@ -89,14 +113,19 @@ else
 			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> config.mak
 			[ $targetos = "Darwin" ] &&
 			 	echo "LDFLAGS+=-single_module" >> config.mak
-			[ "$swscale" != "" ] && echo "SWSCALE=1" >> 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
 		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/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
+		if [ -d "$shared_ffmpeg/include/ffmpeg" -a -e "$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
 		then
 			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
 			echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak