[Buildroot] [git commit] ffmpeg: bump version to 2.4.4

Peter Korsgaard peter at korsgaard.com
Tue Dec 2 09:27:45 UTC 2014


commit: http://git.buildroot.net/buildroot/commit/?id=c7739084b9a171152c830a1bd168dbb2a2ab043d
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

- Bump version to 2.4.4.
- Remove upstreamed patch
- Add a hash file

Signed-off-by: Vicente Olivert Riera <Vincent.Riera at imgtec.com>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/ffmpeg/0001-fminf.patch |   94 ---------------------------------------
 package/ffmpeg/ffmpeg.hash      |    2 +
 package/ffmpeg/ffmpeg.mk        |    2 +-
 3 files changed, 3 insertions(+), 95 deletions(-)

diff --git a/package/ffmpeg/0001-fminf.patch b/package/ffmpeg/0001-fminf.patch
deleted file mode 100644
index 8ecd5c1..0000000
--- a/package/ffmpeg/0001-fminf.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Fix build error
-
-CC      libavdevice/alldevices.o
-In file included from ./libavutil/internal.h:167:0,
-                 from ./libavutil/common.h:415,
-                 from ./libavutil/avutil.h:289,
-                 from ./libavutil/log.h:25,
-                 from libavdevice/avdevice.h:46,
-                 from libavdevice/alldevices.c:22:
-./libavutil/libm.h:87:40: error: static declaration of 'fminf' follows non-static declaration
- static av_always_inline av_const float fminf(float x, float y)
-                                        ^
-make: *** [libavdevice/alldevices.o] Error 1
-
-using buildroot-compiled uClibc toolchain, used defconfig:
-
-BR2_x86_64=y
-BR2_x86_corei7=y
-BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
-BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_FFMPEG=y
-BR2_PACKAGE_FFMPEG_GPL=y
-BR2_PACKAGE_FFMPEG_NONFREE=y
-BR2_PACKAGE_FFMPEG_FFPLAY=y
-BR2_PACKAGE_FFMPEG_FFSERVER=y
-BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
-BR2_PACKAGE_FFMPEG_POSTPROC=y
-
-Patch ported from upstream commit:
-http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=4436a8f44dedc83767b3d9da9beb85d1fae2ca30
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
-
-
-From 4436a8f44dedc83767b3d9da9beb85d1fae2ca30 Mon Sep 17 00:00:00 2001
-From: Carl Eugen Hoyos <cehoyos at ag.or.at>
-Date: Sat, 8 Nov 2014 10:48:37 +0100
-Subject: [PATCH] Remove fminf() emulation.
-
-The emulation is unused and causes compilation trouble on systems
-where fminf() is defined in <math.h> but missing from libm.
-This should fix compilation on Debian powerpcspe.
----
- configure        |    2 --
- libavutil/libm.h |   10 ----------
- 2 files changed, 12 deletions(-)
-
-diff --git a/configure b/configure
-index 314e7ff..978ef12 100755
---- a/configure
-+++ b/configure
-@@ -1678,7 +1678,6 @@ MATH_FUNCS="
-     exp2
-     exp2f
-     expf
--    fminf
-     isinf
-     isnan
-     ldexpf
-@@ -4813,7 +4812,6 @@ disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersi
- atan2f_args=2
- ldexpf_args=2
- powf_args=2
--fminf_args=2
- 
- for func in $MATH_FUNCS; do
-     eval check_mathfunc $func \${${func}_args:-1}
-diff --git a/libavutil/libm.h b/libavutil/libm.h
-index 28d5df8..6c17b28 100644
---- a/libavutil/libm.h
-+++ b/libavutil/libm.h
-@@ -82,16 +82,6 @@ static av_always_inline float cbrtf(float x)
- #define exp2f(x) ((float)exp2(x))
- #endif /* HAVE_EXP2F */
- 
--#if !HAVE_FMINF
--#undef fminf
--static av_always_inline av_const float fminf(float x, float y)
--{
--    //Note, the NaN special case is needed for C spec compliance, it should be
--    //optimized away if the users compiler is configured to assume no NaN
--    return x > y ? y : (x == x ? x : y);
--}
--#endif
--
- #if !HAVE_ISINF
- static av_always_inline av_const int isinf(float x)
- {
--- 
-1.7.10.4
-
diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash
new file mode 100644
index 0000000..4363ce1
--- /dev/null
+++ b/package/ffmpeg/ffmpeg.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 9ad041c0201fb8b2605c5c5c0259c373c793c32cfc96f7315fca67e900494afc ffmpeg-2.4.4.tar.bz2
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 1a68fa0..22577e6 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FFMPEG_VERSION = 2.4.3
+FFMPEG_VERSION = 2.4.4
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES


More information about the buildroot mailing list