Win32 build: Update and fix FFmpeg

synfig · Mar 11, 2015 · d1ca068 · d1ca068
1 parent bc65a73
commit d1ca068
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/autobuild/fedora-crosscompile-win.sh b/autobuild/fedora-crosscompile-win.sh
@@ -389,7 +389,7 @@ fi
 
 mkffmpeg()
 {
-    export FFMPEG_VERSION=2.2.2
+    export FFMPEG_VERSION=2.5.2
     if ! pkg-config libswscale --exact-version=${FFMPEG_VERSION}  --print-errors; then
         cd $CACHEDIR
         [ -e ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev.7z ] || wget http://ffmpeg.zeranoe.com/builds/win${ARCH}/dev/ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev.7z
@@ -407,17 +407,19 @@ mkffmpeg()
         mkdir -p ${PREFIX}/share/ffmpeg/presets/ || true
         cp -rf ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared/presets/* /${PREFIX}/share/ffmpeg/presets/
 
-		for PKG in libswscale libavformat libavdevice; do
-			cat > ${PREFIX}/lib/pkgconfig/${PKG}.pc <<EOF
+		for PKG in avcodec avutil avformat swscale avdevice; do
+			cat > ${PREFIX}/lib/pkgconfig/lib${PKG}.pc <<EOF
 prefix=${PREFIX}
 exec_prefix=${PREFIX}
 libdir=${PREFIX}/lib
 includedir=${PREFIX}/include
 
-Name: ${PKG}
+Name: lib${PKG}
 Description: Dynamic module loader for GLib
 Version: ${FFMPEG_VERSION}
 
+Libs: -l${PKG}
+
 EOF
 		done
     fi

diff --git a/autobuild/synfigstudio-cygwin-mingw-build.sh b/autobuild/synfigstudio-cygwin-mingw-build.sh
@@ -739,7 +739,7 @@ fi
 #}
 mkffmpeg()
 {
-    export FFMPEG_VERSION=2.2.2
+    export FFMPEG_VERSION=2.5.2
     if ! pkg-config libswscale --exact-version=${FFMPEG_VERSION}  --print-errors; then
         pushd $WORKSPACE
         [ -e ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev.7z ] || wget http://ffmpeg.zeranoe.com/builds/win${ARCH}/dev/ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev.7z
@@ -757,17 +757,19 @@ mkffmpeg()
         cp -rf ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared/presets/* ${MINGWPREFIX}/share/ffmpeg/presets/
 
 		mkdir -p ${MINGWPREFIX}/lib/pkgconfig/ || true
-		for PKG in libswscale libavformat libavdevice; do
-			cat > ${MINGWPREFIX}/lib/pkgconfig/${PKG}.pc <<EOF
+		for PKG in avcodec avutil avformat swscale avdevice; do
+			cat > ${MINGWPREFIX}/lib/pkgconfig/lib${PKG}.pc <<EOF
 prefix=${MINGWPREFIX}
 exec_prefix=${MINGWPREFIX}
 libdir=${MINGWPREFIX}/lib
 includedir=${MINGWPREFIX}/include
 
-Name: ${PKG}
+Name: lib${PKG}
 Description: FFMpeg
 Version: ${FFMPEG_VERSION}
 
+Libs: -l${PKG}
+
 EOF
 		done
         popd