avformat/Makefile, configure: fix --avformat-swscale and the removal of the

[melted] / src / modules / avformat / configure

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index e52d58e..284d10e 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -42,21 +42,13 @@ else
        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
@@ -79,7 +71,7 @@ else
                        enable_gpl="--enable-gpl"
                        if [ "$swscale" != "" ]
                        then
-                                       enable_swscale="--enable-swscaler"
+                                       enable_swscale="--enable-swscale"
                                        echo "SWSCALE=1" >> config.mak
                        fi
                elif [ "$swscale" != "" ]
@@ -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,23 +112,23 @@ 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