Commit 92122338 authored by Vicente Olivert Riera's avatar Vicente Olivert Riera Committed by Peter Korsgaard
Browse files

ffmpeg: bump to version 2.8 

0016-ranlib.patch is not needed anymore since the problem that it fixes
is already handled upstream:

  https://github.com/FFmpeg/FFmpeg/commit/2c77ca459e9c9aceee5ed93f8dd8de09e9fbf8df



Signed-off-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 838fdfda

package/ffmpeg/0016-ranlib.patch

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
Fix ranlib check when cross-compiling



Without this patch /usr/bin/ranlib is tested for "-D", not ranlib from the

cross-compiler suite being in use.



Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>



diff -uNr ffmpeg-2.6.2.org/configure ffmpeg-2.6.2/configure

--- ffmpeg-2.6.2.org/configure	2015-04-12 00:47:55.000000000 +0200

+++ ffmpeg-2.6.2/configure	2015-04-16 21:53:24.313202517 +0200

@@ -2719,11 +2719,6 @@

 nm_default="nm -g"

 objformat="elf"

 pkg_config_default=pkg-config

-if ranlib 2>&1 | grep -q "\-D "; then

-    ranlib_default="ranlib -D"

-else

-    ranlib_default="ranlib"

-fi

 strip_default="strip"

 yasmexe_default="yasm"

 windres_default="windres"

@@ -3001,6 +2996,12 @@

         die "Must specify target arch and OS when cross-compiling"

 fi

 

+if "${cross_prefix}ranlib" 2>&1 | grep -q "\-D "; then

+    ranlib_default="ranlib -D"

+else

+    ranlib_default="ranlib"

+fi

+

 test -n "$valgrind" && toolchain="valgrind-memcheck"

 

 case "$toolchain" in

package/ffmpeg/ffmpeg.hash

+1 −1
Original line number Diff line number Diff line 
# Locally calculated

sha256	7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2	ffmpeg-2.7.2.tar.bz2
 
sha256 9565236404d3515aab754283c687c0a001019003148bf7f708e643608c0690b8  ffmpeg-2.8.tar.bz2

package/ffmpeg/ffmpeg.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



FFMPEG_VERSION = 2.7.2

FFMPEG_VERSION = 2.8

FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2

FFMPEG_SITE = http://ffmpeg.org/releases

FFMPEG_INSTALL_STAGING = YES