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

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 4954e15..b00de77 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -32,31 +32,23 @@ else
 	bits=$(uname -m)
 	case $bits in
 	x86_64)
-		export LIBDIR=lib
+		[ -d /usr/lib/lib64 ] && export LIBDIR=lib64 || export LIBDIR=lib
 		;;
 	*)
-		export LIBDIR=lib32
+		export LIBDIR=lib
 		;;
 	esac
 
 	echo > config.mak
 
 	export static_ffmpeg=
-	export shared_ffmpeg=`which ffmpeg`
+	export shared_ffmpeg=$(pkg-config --variable=prefix libavformat)
 	export extra_libs=
 	export svn_ffmpeg=
 	export svn_ffmpeg_extra=
 	export avformat_suffix=
 	export swscale=
 
-	if [ "$shared_ffmpeg" != "" -a -f "$shared_ffmpeg" ]
-	then
-		# Chop ffmpeg 
-		shared_ffmpeg=`dirname $shared_ffmpeg`
-		# Chop bin 
-		shared_ffmpeg=`dirname $shared_ffmpeg`
-	fi
-
 	for i in "$@"
 	do
 		case $i in
@@ -99,18 +91,19 @@ else
 		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 -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
+		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
+		echo "LDFLAGS+=-Wl,-Bsymbolic" >> 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 -I$static_ffmpeg/libavutil" >> config.mak
-			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> 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" != "" ]
@@ -119,41 +112,27 @@ else
 				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 -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
-			[ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak
-		else
-			echo "avformat: No build environment found. "
-			echo "          Try configuring mlt with --avformat-svn."
-			touch ../disable-avformat
-			exit 0
-		fi
+	elif [ "$shared_ffmpeg" != "" ]
+	then
+		echo "CFLAGS+=$(pkg-config --cflags libavformat)" >> config.mak
+		echo "LDFLAGS+=$(pkg-config --libs libavformat)" >> config.mak
+		[ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak
+	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
 	echo "AVFORMAT_SUFFIX=$avformat_suffix" >> config.mak
 
-cat << EOF >> ../producers.dat
-avformat		libmltavformat$LIBSUF
-EOF
-
-cat << EOF >> ../filters.dat
-avdeinterlace	libmltavformat$LIBSUF
-avresample		libmltavformat$LIBSUF
-avcolour_space	libmltavformat$LIBSUF
-EOF
-
-cat << EOF >> ../consumers.dat
-avformat		libmltavformat$LIBSUF
-EOF
-
 fi