upgrade to ffmpeg 2.4

CMakeLists.txt

@@ -9,8 +9,7 @@ SET(ENV{PKG_CONFIG_PATH} ${CMAKE_BINARY_DIR}/lib/pkgconfig)
 
 EXTERNALPROJECT_ADD(
   yasm
-  URL http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz
-  PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/vendor/yasm-performance.patch
+  URL http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz
   CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}
   BUILD_IN_SOURCE 1
 )
@@ -22,7 +21,7 @@ EXTERNALPROJECT_ADD(
 )
 EXTERNALPROJECT_ADD(
   openssl
-  URL http://www.openssl.org/source/openssl-1.0.1h.tar.gz
+  URL http://www.openssl.org/source/openssl-1.0.1i.tar.gz
   CONFIGURE_COMMAND ./config no-shared no-idea no-mdc2 no-rc5 --prefix=${CMAKE_BINARY_DIR}
   BUILD_COMMAND make depend && make
   INSTALL_COMMAND make install_sw
@@ -178,7 +177,7 @@ EXTERNALPROJECT_ADD(
 EXTERNALPROJECT_ADD(
   ffmpeg
   DEPENDS yasm opencore faac aacplus fdkaac mp3lame ogg speex vorbis theora opus xvidcore x264 x265 vpx rtmp freetype ass
-  URL http://www.ffmpeg.org/releases/ffmpeg-2.3.3.tar.bz2
+  URL http://www.ffmpeg.org/releases/ffmpeg-2.4.tar.bz2
   PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/vendor/ffmpeg-ism-offset.patch
   CONFIGURE_COMMAND PATH=$ENV{PATH} PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} ./configure --prefix=${CMAKE_BINARY_DIR} --datadir=${CMAKE_BINARY_DIR}/etc --disable-shared --enable-static --enable-gpl --enable-version3 --enable-nonfree --disable-doc --disable-debug --disable-ffplay --disable-ffserver --disable-outdevs --enable-runtime-cpudetect --enable-memalign-hack --extra-cflags=-I${CMAKE_BINARY_DIR}/include\ --static --extra-ldflags=-L${CMAKE_BINARY_DIR}/lib\ -static --extra-libs=-lstdc++\ -lexpat\ -ldl --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libfaac --enable-libfdk-aac --enable-libaacplus --enable-libmp3lame --enable-libspeex --enable-libtheora --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libopus --enable-librtmp --enable-libfreetype --enable-libass
   BUILD_COMMAND PATH=$ENV{PATH} make

README.md

@@ -28,16 +28,16 @@ Then go grab a coffee (or maybe two). The helper will download and compile all F
 Once done, you should get a static system-independent FFmpeg binary in the `build/bin` directory.
 
     $ ./build/bin/ffmpeg
-    ffmpeg version 2.3 Copyright (c) 2000-2014 the FFmpeg developers
-      built on Jul 18 2014 12:08:26 with gcc 4.8 (Ubuntu 4.8.2-19ubuntu1)
-      libavutil      52. 92.100 / 52. 92.100
-      libavcodec     55. 69.100 / 55. 69.100
-      libavformat    55. 48.100 / 55. 48.100
-      libavdevice    55. 13.102 / 55. 13.102
-      libavfilter     4. 11.100 /  4. 11.100
-      libswscale      2.  6.100 /  2.  6.100
-      libswresample   0. 19.100 /  0. 19.100
-      libpostproc    52.  3.100 / 52.  3.100
+    ffmpeg version 2.4 Copyright (c) 2000-2014 the FFmpeg developers
+      built on Sep 16 2014 10:15:41 with gcc 4.8 (Ubuntu 4.8.2-19ubuntu1)
+      libavutil      54.  7.100 / 54.  7.100
+      libavcodec     56.  1.100 / 56.  1.100
+      libavformat    56.  4.101 / 56.  4.101
+      libavdevice    56.  0.100 / 56.  0.100
+      libavfilter     5.  1.100 /  5.  1.100
+      libswscale      3.  0.100 /  3.  0.100
+      libswresample   1.  1.100 /  1.  1.100
+      libpostproc    53.  0.100 / 53.  0.100
     Hyper fast Audio and Video encoder
     usage: ffmpeg [options] [[infile options] -i infile]... {[outfile options] outfile}...
 
@@ -57,7 +57,7 @@ You may optionally build a Debian package by typing the following command at the
 
 The `ffmpeg` and i`ffprobe` static binaries will be installed by the package in the `/usr/bin` directory.
 
-    $ sudo dpkg -i sffmpeg_2.3_amd64.deb
+    $ sudo dpkg -i sffmpeg_2.4_amd64.deb
     Selecting previously unselected package sffmpeg.
-    Unpacking sffmpeg (from sffmpeg_2.3_amd64.deb) ...
-    Setting up sffmpeg (2.3) ...
+    Unpacking sffmpeg (from sffmpeg_2.4_amd64.deb) ...
+    Setting up sffmpeg (2.4) ...

debian/changelog

@@ -1,3 +1,9 @@
+sffmpeg (2.4) stable; urgency=medium
+
+  * upgrade to ffmpeg 2.4
+
+ -- Pierre-Yves Kerembellec <[email protected]>  Tue, 15 Sep 2014 09:11:15 +0200
+
 sffmpeg (2.3) stable; urgency=medium
 
   * upgrade to ffmpeg 2.3.3