mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/ffmpeg: bump version to 4.4

Browse Source 
Remove wavpack-related patch and configure options due to upstream
removal of wavpack support:
http://git.videolan.org/?p=ffmpeg.git;a=commit;h=45070eec4c089b06947f07e25cdb1bc8b2102553

Changelog:
http://git.videolan.org/?p=ffmpeg.git;a=blob;f=Changelog;;hb=refs/heads/release/4.4

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls
2021-04-09 22:20:22 +02:00
committed by Peter Korsgaard
parent 25135631d2
commit e243ec75f3
4 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
package/ffmpeg/0003-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch → package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch
View File

31
package/ffmpeg/0002-configure-use-require_pkg_config-to-check-for-wavpac.patch
View File

@@ -1,31 +0,0 @@
From a507a9cd6525d5b3a1eea32e25a139b4023800a2 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Sun, 20 Sep 2020 13:48:00 +0200
Subject: [PATCH] configure: use require_pkg_config to check for wavpack
Fixes static builds with toolchains needing "-lm" for math functions.
Patch sent upstream:
http://ffmpeg.org/pipermail/ffmpeg-devel/2020-September/270127.html
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 5d68695192..4e6c6edd30 100755
--- a/configure
+++ b/configure
@@ -6438,7 +6438,7 @@ enabled libvpx && {
fi
}
-enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack
+enabled libwavpack && require_pkg_config libwavpack wavpack "wavpack/wavpack.h" WavpackOpenFileOutput
enabled libwebp && {
enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; }
--
2.27.0

2
package/ffmpeg/ffmpeg.hash
View File

@@ -1,5 +1,5 @@
# Locally calculated # Locally calculated
sha256 46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb ffmpeg-4.3.2.tar.xz sha256 06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909 ffmpeg-4.4.tar.xz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2
sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1
sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md

9
package/ffmpeg/ffmpeg.mk
View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
FFMPEG_VERSION = 4.3.2 FFMPEG_VERSION = 4.4
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_SITE = http://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES FFMPEG_INSTALL_STAGING = YES
@@ -368,13 +368,6 @@ else
FFMPEG_CONF_OPTS += --disable-libtheora FFMPEG_CONF_OPTS += --disable-libtheora
endif endif
ifeq ($(BR2_PACKAGE_WAVPACK),y)
FFMPEG_CONF_OPTS += --enable-libwavpack
FFMPEG_DEPENDENCIES += wavpack
else
FFMPEG_CONF_OPTS += --disable-libwavpack
endif
ifeq ($(BR2_PACKAGE_LIBICONV),y) ifeq ($(BR2_PACKAGE_LIBICONV),y)
FFMPEG_CONF_OPTS += --enable-iconv FFMPEG_CONF_OPTS += --enable-iconv
FFMPEG_DEPENDENCIES += libiconv FFMPEG_DEPENDENCIES += libiconv