diff options
| author |   Ilya Tumaykin <itumaykin@gmail.com> | 2016-01-09 22:42:57 +0300 |
|---|---|---|
| committer |   Ian Delaney <idella4@gentoo.org> | 2016-01-10 09:58:55 +0800 |
| commit | 95b17a979efbb78a23484cbca6447e536552a1ac (patch) | |
| tree | 0216b058ad2c1ec0157a31f7a24a6f30e9112f9f /media-libs/ffmpegsource/files | |
| parent | media-libs/ffmpegsource: add compiler check for C++11 support (diff) | |
| download | gentoo-95b17a979efbb78a23484cbca6447e536552a1ac.tar.gz gentoo-95b17a979efbb78a23484cbca6447e536552a1ac.tar.bz2 gentoo-95b17a979efbb78a23484cbca6447e536552a1ac.zip | |
media-libs/ffmpegsource: verbump to 2.22 wrt bug 564524
Gentoo-Bug: 564524
Package-Manager: portage-2.2.26
Diffstat (limited to 'media-libs/ffmpegsource/files')
3 files changed, 80 insertions, 0 deletions
diff --git a/media-libs/ffmpegsource/files/ffmpegsource-2.22-add-missing-extern-C.patch b/media-libs/ffmpegsource/files/ffmpegsource-2.22-add-missing-extern-C.patch new file mode 100644 index 000000000000..9ef42d7113d6 --- /dev/null +++ b/media-libs/ffmpegsource/files/ffmpegsource-2.22-add-missing-extern-C.patch @@ -0,0 +1,27 @@ +commit 1dc922cdd0798d5522331f1c98657f494d18c6b9 +Author: Derek Buitenhuis <derek.buitenhuis@gmail.com> +Date: Sun Dec 27 18:37:59 2015 -0500 + + track: Wrap C headers in extern "C" properly + + This fixes av_rescale being undefiend during linking with some + GCC versions (e.g. 4.8.4 on Ubuntu 14.04). + + Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> + +diff --git a/src/core/track.cpp b/src/core/track.cpp +index 136bc21..23e57ad 100644 +--- a/src/core/track.cpp ++++ b/src/core/track.cpp +@@ -25,9 +25,11 @@ + + #include <algorithm> + ++extern "C" { + #include <libavutil/avutil.h> + #include <libavutil/common.h> + #include <libavutil/mathematics.h> ++} + + namespace { + FrameInfo ReadFrame(ZipFile &stream, FrameInfo const& prev, const FFMS_TrackType TT) { diff --git a/media-libs/ffmpegsource/files/ffmpegsource-2.22-fix-pixfmt-define.patch b/media-libs/ffmpegsource/files/ffmpegsource-2.22-fix-pixfmt-define.patch new file mode 100644 index 000000000000..9815edc8fb43 --- /dev/null +++ b/media-libs/ffmpegsource/files/ffmpegsource-2.22-fix-pixfmt-define.patch @@ -0,0 +1,31 @@ +commit d4cf0fcdb355319e2f868d4e474a6b78b36848fd +Author: Derek Buitenhuis <derek.buitenhuis@gmail.com> +Date: Sun Dec 27 18:36:27 2015 -0500 + + ffmscompat: Use a separate version check for pixfmt flags + + These changed during a separate version bump from the pixfmts themselves. + + What a mess. + + Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> + +diff --git a/include/ffmscompat.h b/include/ffmscompat.h +index be99db8..eea9029 100644 +--- a/include/ffmscompat.h ++++ b/include/ffmscompat.h +@@ -88,9 +88,13 @@ static void av_frame_free(AVFrame **frame) { av_freep(frame); } + # if VERSION_CHECK(LIBAVUTIL_VERSION_INT, <, 51, 42, 0, 51, 74, 100) + # define AVPixelFormat PixelFormat + # define FFMS_PIX_FMT(x) PIX_FMT_##x +-# define FFMS_PIX_FMT_FLAG(x) PIX_FMT_##x + # else + # define FFMS_PIX_FMT(x) AV_PIX_FMT_##x ++# endif ++ ++# if VERSION_CHECK(LIBAVUTIL_VERSION_INT, <, 52, 11, 0, 52, 32, 100) ++# define FFMS_PIX_FMT_FLAG(x) PIX_FMT_##x ++# else + # define FFMS_PIX_FMT_FLAG(x) AV_PIX_FMT_FLAG_##x + # endif + diff --git a/media-libs/ffmpegsource/files/ffmpegsource-2.22-include-missing-header.patch b/media-libs/ffmpegsource/files/ffmpegsource-2.22-include-missing-header.patch new file mode 100644 index 000000000000..bae86ec49af3 --- /dev/null +++ b/media-libs/ffmpegsource/files/ffmpegsource-2.22-include-missing-header.patch @@ -0,0 +1,22 @@ +commit 848f7656e1e912352345f84b9499ab4483902d3b +Author: Derek Buitenhuis <derek.buitenhuis@gmail.com> +Date: Sun Dec 27 18:37:28 2015 -0500 + + track: Include missing header + + This is requried for av_rescale. + + Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> + +diff --git a/src/core/track.cpp b/src/core/track.cpp +index 3300094..136bc21 100644 +--- a/src/core/track.cpp ++++ b/src/core/track.cpp +@@ -27,6 +27,7 @@ + + #include <libavutil/avutil.h> + #include <libavutil/common.h> ++#include <libavutil/mathematics.h> + + namespace { + FrameInfo ReadFrame(ZipFile &stream, FrameInfo const& prev, const FFMS_TrackType TT) { |