package/ffmpeg: Fix Kodi 14.2 compile
PATCH 1/2 package/ffmpeg: Fix Kodi 14.2 compile
Removing 0013-add-public-version-of-ff_read_frame_flush.patch in
http://git.buildroot.net/buildroot/commit/package/ffmpeg?id=4d094d9eb4edba5b6c3c229a2c02da1427e43fe5
was a bit too early since Kodi 14.2 still uses it, so re-add 0013-add-public-version-of-ff_read_frame_flush.patch and rename 0013-fix-ff-thread-get-format.patch.
When Kodi 15.0 is released the file 0013-add-public-version-of-ff_read_frame_flush.patch can be removed again.
Fixes
http://autobuild.buildroot.net/results/1c1/1c12779e67ddc6d3dffbc1d2e5ebf9887ae721ca/
http://autobuild.buildroot.net/results/c63/c6301fc6f11204ee157a4f6a848dda9666cfb450/
http://autobuild.buildroot.net/results/e61/e6138bac331370b02af746e319ce8fd6fe51b793/
http://autobuild.buildroot.net/results/c3d/c3dbb01608debd1bf0af6acd6eb9de6d01424982/
http://autobuild.buildroot.net/results/e1b/e1b0fbc6631a0073d743705400460b8679b28a0f/
http://autobuild.buildroot.net/results/180/1803aa8bd62e4fc126d0a791456804bb9b036e6d/
http://autobuild.buildroot.net/results/d2e/d2e9571f5747e609eb4f9b64ac6ab99bccb92767/
---
...add-public-version-of-ff_read_frame_flush.patch | 54 ++++++++++++++++++++
...t.patch => 0014-fix-ff-thread-get-format.patch} | 0
2 files changed, 54 insertions(+)
create mode 100644 package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch
rename package/ffmpeg/{0013-fix-ff-thread-get-format.patch => 0014-fix-ff-thread-get-format.patch} (100%)package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch new file +54 -0
@@ -0,0 +1,54 @@ +From 7d7ce18ff0d24b586634fa6e631fa0eec7865aae Mon Sep 17 00:00:00 2001 +From: elupus <[email protected]> +Date: Tue, 1 Nov 2011 20:18:35 +0100 +Subject: [PATCH 13/13] add public version of ff_read_frame_flush + +We need this since we sometimes seek on the +input stream behind ffmpeg's back. After this +all data need to be flushed completely. + +Patch part of the XBMC patch set for ffmpeg, downloaded from +https://github.com/xbmc/FFmpeg/. + +Signed-off-by: Bernd Kuhls <[email protected]> +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + libavformat/avformat.h | 5 +++++ + libavformat/utils.c | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/libavformat/avformat.h b/libavformat/avformat.h +index 2e54ed1..3a9f292 100644 +--- a/libavformat/avformat.h ++++ b/libavformat/avformat.h +@@ -2121,6 +2121,11 @@ int av_find_best_stream(AVFormatContext *ic, + int av_read_frame(AVFormatContext *s, AVPacket *pkt); + + /** ++ * Clear out any buffered data in context ++ */ ++void av_read_frame_flush(AVFormatContext *s); ++ ++/** + * Seek to the keyframe at timestamp. + * 'timestamp' in 'stream_index'. + * +diff --git a/libavformat/utils.c b/libavformat/utils.c +index f4fb172..10dda18 100644 +--- a/libavformat/utils.c ++++ b/libavformat/utils.c +@@ -1624,6 +1624,11 @@ void ff_read_frame_flush(AVFormatContext *s) + } + } + ++void av_read_frame_flush(AVFormatContext *s) ++{ ++ ff_read_frame_flush(s); ++} ++ + void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp) + { + int i; +-- +2.1.0 +
package/ffmpeg/0014-fix-ff-thread-get-format.patch renamed from package/ffmpeg/0013-fix-ff-thread-get-format.patch +0 -0
Signature · 1 line
1.7.10.4
PATCH 2/2 package/kodi: Remove unused dependency to libungif
--- package/kodi/Config.in | 1 - package/kodi/kodi.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
package/kodi/Config.in +0 -1
@@ -58,7 +58,6 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_LIBPLIST select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBSAMPLERATE - select BR2_PACKAGE_LIBUNGIF select BR2_PACKAGE_LIBVORBIS select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT
package/kodi/kodi.mk +1 -1
@@ -18,7 +18,7 @@ KODI_DEPENDENCIES = host-gawk host-gettext host-gperf host-infozip host-lzo \ host-nasm host-sdl_image host-swig KODI_DEPENDENCIES += boost bzip2 expat ffmpeg fontconfig freetype jasper jpeg \ libass libcdio libcurl libfribidi libgcrypt libmad libmodplug libmpeg2 \ - libogg libplist libpng libsamplerate libungif libvorbis libxml2 libxslt lzo ncurses \ + libogg libplist libpng libsamplerate libvorbis libxml2 libxslt lzo ncurses \ openssl pcre python readline sqlite taglib tiff tinyxml yajl zlib KODI_CONF_ENV = \
Signature · 1 line
1.7.10.4
Thomas Petazzoni
AppliedPATCH 2/2 package/kodi: Remove unused dependency to libungif
Dear Bernd Kuhls,
Quoted 6 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>--- package/kodi/Config.in | 1 - package/kodi/kodi.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
Applied, thanks!
With this, the latest user of libungif is gone, so can you send a patch to deprecate the libungif package? I believe it was the overall goal of moving to giflib, right?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 2/2 package/kodi: Remove unused dependency to libungif
Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8 @public.gmane.org> wrote in news:20150408223335.7622520e at free-electrons.com:
Quoted 3 lines
With this, the latest user of libungif is gone, so can you send a patch to deprecate the libungif package? I believe it was the overall goal of moving to giflib, right?
Hi,
done: http://patchwork.ozlabs.org/patch/459488/
Yes, Kodi 15.0 will drop the dependency to SDL and will use libjpg/png/gif (not libungif) instead in the texturepacker host binary.
Regards, Bernd
PATCH 1/2 package/ffmpeg: Fix Kodi 14.2 compile
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 10 lines · Bernd Kuhls
package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch new file +4
-0@@ -0,0 +1,54 @@ +From 7d7ce18ff0d24b586634fa6e631fa0eec7865aae Mon Sep 17 00:00:00 2001 +From: elupus <[email protected]> +Date: Tue, 1 Nov 2011 20:18:35 +0100 +Subject: [PATCH 13/13] add public version of ff_read_frame_flush
package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch line 14
Quoted 10 lines
package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch new file +10
-0+ +We need this since we sometimes seek on the +input stream behind ffmpeg's back. After this +all data need to be flushed completely. + +Patch part of the XBMC patch set for ffmpeg, downloaded from +https://github.com/xbmc/FFmpeg/. + +Signed-off-by: Bernd Kuhls <[email protected]> +Signed-off-by: Thomas Petazzoni <[email protected]>
I am not sure why I am in the SoB here, so I removed myself from here before applying.
package/ffmpeg/0014-fix-ff-thread-get-format.patch
Quoted 4 lines
package/ffmpeg/0014-fix-ff-thread-get-format.patch renamed from package/ffmpeg/0013-fix-ff-thread-get-format.patch +0
-0
Despite this rename, there are still two patches named 014-<something> :-)
Anyway, applied!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/2 package/ffmpeg: Fix Kodi 14.2 compile
Hi,
Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8 @public.gmane.org> wrote in news:20150408223244.1d4c9cc4 at free-electrons.com:
Quoted 1 line
Quoted 1 line
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni-wi1+
55ScJUtKEb57/[email protected]>
Quoted 3 lines
I am not sure why I am in the SoB here, so I removed myself from here before applying.
sorry, this was not intentionally, I just reverted the commit bumping ffmpeg to 2.6.1
http://git.buildroot.net/buildroot/commit/package/ffmpeg?id=4d094d9eb4edba5b6c3c229a2c02da1427e43fe5
to regain 0013-add-public-version-of-ff_read_frame_flush.patch, this file containes your SoB ;)
Regards, Bernd