Thread: [Mlt-devel] SF.net SVN: mlt: [979] trunk/mlt/src/modules/avformat/configure
Brought to you by:
ddennedy,
lilo_booter
From: <dde...@us...> - 2007-06-09 06:46:07
|
Revision: 979 http://mlt.svn.sourceforge.net/mlt/?rev=979&view=rev Author: ddennedy Date: 2007-06-08 23:46:05 -0700 (Fri, 08 Jun 2007) Log Message: ----------- --avformat-swscale with --avformat-svn is only permitted with --enable-gpl Modified Paths: -------------- trunk/mlt/src/modules/avformat/configure Modified: trunk/mlt/src/modules/avformat/configure =================================================================== --- trunk/mlt/src/modules/avformat/configure 2007-06-09 01:39:47 UTC (rev 978) +++ trunk/mlt/src/modules/avformat/configure 2007-06-09 06:46:05 UTC (rev 979) @@ -70,17 +70,28 @@ 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 - ) - enable_gpl=`[ "$gpl" = "true" ] && echo "--enable-gpl"` - if [ "$swscale" != "" ] - then - enable_swscale="--enable-swscaler" - echo "SWSCALE=1" >> config.mak fi [ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure $enable_gpl $enable_swscale ) #[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2007-10-19 06:01:51
|
Revision: 1030 http://mlt.svn.sourceforge.net/mlt/?rev=1030&view=rev Author: ddennedy Date: 2007-10-18 23:01:41 -0700 (Thu, 18 Oct 2007) Log Message: ----------- avformat/configure: fix detect shared install of libavformat due to link to versioned .so. Modified Paths: -------------- trunk/mlt/src/modules/avformat/configure Modified: trunk/mlt/src/modules/avformat/configure =================================================================== --- trunk/mlt/src/modules/avformat/configure 2007-10-13 06:53:31 UTC (rev 1029) +++ trunk/mlt/src/modules/avformat/configure 2007-10-19 06:01:41 UTC (rev 1030) @@ -125,7 +125,7 @@ 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2007-12-08 07:43:21
|
Revision: 1042 http://mlt.svn.sourceforge.net/mlt/?rev=1042&view=rev Author: ddennedy Date: 2007-12-07 23:43:18 -0800 (Fri, 07 Dec 2007) Log Message: ----------- avformat/configure: revert mistaken change in last commit Modified Paths: -------------- trunk/mlt/src/modules/avformat/configure Modified: trunk/mlt/src/modules/avformat/configure =================================================================== --- trunk/mlt/src/modules/avformat/configure 2007-12-08 07:40:49 UTC (rev 1041) +++ trunk/mlt/src/modules/avformat/configure 2007-12-08 07:43:18 UTC (rev 1042) @@ -32,10 +32,10 @@ bits=$(uname -m) case $bits in x86_64) - export LIBDIR=lib + export LIBDIR=lib64 ;; *) - export LIBDIR=lib32 + export LIBDIR=lib ;; esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-02-13 07:38:38
|
Revision: 1071 http://mlt.svn.sourceforge.net/mlt/?rev=1071&view=rev Author: ddennedy Date: 2008-02-12 23:38:36 -0800 (Tue, 12 Feb 2008) Log Message: ----------- avformat/configure: use pkg-config with --avformat-shared Modified Paths: -------------- trunk/mlt/src/modules/avformat/configure Modified: trunk/mlt/src/modules/avformat/configure =================================================================== --- trunk/mlt/src/modules/avformat/configure 2008-02-13 06:38:50 UTC (rev 1070) +++ trunk/mlt/src/modules/avformat/configure 2008-02-13 07:38:36 UTC (rev 1071) @@ -42,21 +42,13 @@ 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 @@ -124,18 +116,16 @@ 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-02-27 18:16:58
|
Revision: 1083 http://mlt.svn.sourceforge.net/mlt/?rev=1083&view=rev Author: ddennedy Date: 2008-02-27 10:16:56 -0800 (Wed, 27 Feb 2008) Log Message: ----------- avformat/Makefile: compilation fix for latest FFmpeg update Modified Paths: -------------- trunk/mlt/src/modules/avformat/configure Modified: trunk/mlt/src/modules/avformat/configure =================================================================== --- trunk/mlt/src/modules/avformat/configure 2008-02-26 23:46:19 UTC (rev 1082) +++ trunk/mlt/src/modules/avformat/configure 2008-02-27 18:16:56 UTC (rev 1083) @@ -91,7 +91,7 @@ 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/libavdevice -I`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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-03-18 04:43:00
|
Revision: 1106 http://mlt.svn.sourceforge.net/mlt/?rev=1106&view=rev Author: ddennedy Date: 2008-03-17 21:42:57 -0700 (Mon, 17 Mar 2008) Log Message: ----------- avformat/configure: improve chances of successful linking with -svn and -static options Modified Paths: -------------- trunk/mlt/src/modules/avformat/configure Modified: trunk/mlt/src/modules/avformat/configure =================================================================== --- trunk/mlt/src/modules/avformat/configure 2008-03-07 07:59:04 UTC (rev 1105) +++ trunk/mlt/src/modules/avformat/configure 2008-03-18 04:42:57 UTC (rev 1106) @@ -96,6 +96,7 @@ [ $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 @@ -111,6 +112,8 @@ 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2008-05-15 16:43:27
|
Revision: 1127 http://mlt.svn.sourceforge.net/mlt/?rev=1127&view=rev Author: ddennedy Date: 2008-05-15 09:43:23 -0700 (Thu, 15 May 2008) Log Message: ----------- avformat/configure: fix compilation against shared ffmpeg for a headers configuration that has appeared. Modified Paths: -------------- trunk/mlt/src/modules/avformat/configure Modified: trunk/mlt/src/modules/avformat/configure =================================================================== --- trunk/mlt/src/modules/avformat/configure 2008-05-15 02:47:37 UTC (rev 1126) +++ trunk/mlt/src/modules/avformat/configure 2008-05-15 16:43:23 UTC (rev 1127) @@ -124,11 +124,16 @@ 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/libswscale" >> config.mak + [ -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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Jean-Michel P. <jm...@po...> - 2008-05-16 15:09:21
|
Le jeudi 15 mai 2008 à 09:43 -0700, dde...@us... a écrit : > Revision: 1127 > http://mlt.svn.sourceforge.net/mlt/?rev=1127&view=rev > Author: ddennedy > Date: 2008-05-15 09:43:23 -0700 (Thu, 15 May 2008) > > Log Message: > ----------- > avformat/configure: fix compilation against shared ffmpeg for a headers configuration that has appeared. Thanks. Tested and works perfectly. Can you also check Kdenlive build script? Kind regards, Jean-Michel |