commit 9a18f49211959bc25304b99bf2d89f0aa22dda2b Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Thu Oct 4 18:43:13 2018 +0100 Add upstream commit to fix aom build failure ...aomenc-remove-AVOption-related-to-frame-p.patch | 34 ++++++++++++++++++++++ ffmpeg.spec | 9 +++++- 2 files changed, 42 insertions(+), 1 deletion(-) --- diff --git a/avcodec-libaomenc-remove-AVOption-related-to-frame-p.patch b/avcodec-libaomenc-remove-AVOption-related-to-frame-p.patch new file mode 100644 index 0000000..ef74fb6 --- /dev/null +++ b/avcodec-libaomenc-remove-AVOption-related-to-frame-p.patch @@ -0,0 +1,34 @@ +From 4894e0f637e4a418d8a9b0455ea165e8ebeca517 Mon Sep 17 00:00:00 2001 +From: James Almer <jamrial(a)gmail.com&gt; +Date: Wed, 12 Sep 2018 11:44:56 -0300 +Subject: [PATCH] avcodec/libaomenc: remove AVOption related to frame + partitions + +Support for it was apparently never in the codebase, and the enum +value was recently removed from the public headers [1] + +[1] https://aomedia.googlesource.com/aom/+/df4ffb73140fe31bebdabd17c1a7b53721... + +Signed-off-by: James Almer <jamrial(a)gmail.com&gt; +--- + libavcodec/libaomenc.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c +index 41b05dc1c0..3e1bbb5afc 100644 +--- a/libavcodec/libaomenc.c ++++ b/libavcodec/libaomenc.c +@@ -697,10 +697,6 @@ static const AVOption options[] = { + "alternate reference frame selection", OFFSET(lag_in_frames), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VE}, + { "error-resilience", "Error resilience configuration", OFFSET(error_resilient), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, VE, "er"}, + { "default", "Improve resiliency against losses of whole frames", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_ERROR_RESILIENT_DEFAULT}, 0, 0, VE, "er"}, +- { "partitions", "The frame partitions are independently decodable " +- "by the bool decoder, meaning that partitions can be decoded even " +- "though earlier partitions have been lost. Note that intra predicition" +- " is still done over the partition boundary.", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_ERROR_RESILIENT_PARTITIONS}, 0, 0, VE, "er"}, + { "crf", "Select the quality for constant quality mode", offsetof(AOMContext, crf), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 63, VE }, + { "static-thresh", "A change threshold on blocks below which they will be skipped by the encoder", OFFSET(static_thresh), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, + { "drop-threshold", "Frame drop threshold", offsetof(AOMContext, drop_threshold), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, VE }, +-- +2.19.0 + diff --git a/ffmpeg.spec b/ffmpeg.spec index 4919f13..c8b222f 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -74,7 +74,7 @@ Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} Version: 4.0.2 -Release: 7%{?date}%{?date:git}%{?rel}%{?dist} +Release: 8%{?date}%{?date:git}%{?rel}%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ %if 0%{?date} @@ -82,6 +82,9 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2 %else Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz %endif +# Upstream commit to fix aom build issue +# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/b69ea742ab23ad74b2ae2... +Patch0: avcodec-libaomenc-remove-AVOption-related-to-frame-p.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}} %{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-nvcc-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}} @@ -300,6 +303,7 @@ echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION %else %setup -q -n ffmpeg-%{version} %endif +%patch0 -p1 -b .aom_build_fix # fix -O3 -g in host_cflags sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure mkdir -p _doc/examples @@ -409,6 +413,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %changelog +* Thu Oct 04 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 4.0.2-8 +- Add upstream commit to fix aom build failure + * Thu Oct 04 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 4.0.2-7 - Mass rebuild for x264 and/or x265