commit 59bfd6c3be07c4b91dc28c47022eb6f57543e366 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Thu Dec 31 14:57:20 2020 +0000 Update to 20201231git477dd2d .gitignore | 1 + ffmpeg-snapshot.sh | 1 + ffmpeg.spec | 17 ++++--- fix-vmaf-model-path.patch | 11 ++--- glslang_linker_flags.patch | 33 ------------- libavfilter_glslang.cpp.patch | 14 ------ libavutil_x86_x86inc.asm.patch | 101 ---------------------------------------- sources | 2 +- tests_checkasm_vf_blend.c.patch | 15 ------ 9 files changed, 16 insertions(+), 179 deletions(-) --- diff --git a/.gitignore b/.gitignore index 09ec616..194fd7b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ ffmpeg-*.rpm /ffmpeg-20200524.tar.bz2 /ffmpeg-20200531.tar.bz2 /ffmpeg-20200606.tar.bz2 +/ffmpeg-20201231.tar.bz2 diff --git a/ffmpeg-snapshot.sh b/ffmpeg-snapshot.sh index d4a9ab5..b6d07be 100755 --- a/ffmpeg-snapshot.sh +++ b/ffmpeg-snapshot.sh @@ -17,5 +17,6 @@ date=$(date +%Y%m%d) pushd "$tmp" git clone git://git.ffmpeg.org/ffmpeg.git cd ffmpeg +git rev-parse HEAD git archive --prefix="ffmpeg-${date}/" --format=tar master | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2 popd diff --git a/ffmpeg.spec b/ffmpeg.spec index f0b521b..601e787 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -1,8 +1,9 @@ # TODO: add make test to %%check section #global branch oldabi- -#global date 20200606 -#global rel rc1 +%global date 20201231 +%global commit 477dd2df60e6419ad8776a9865c421e8d42f68fe +%global rel %(c=%{commit}; echo ${c:0:7}) %ifarch %{ix86} # Fails due to asm issue @@ -102,8 +103,8 @@ ExclusiveArch: armv7hnl Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} -Version: 4.3.1 -Release: 15%{?date}%{?date:git}%{?rel}%{?dist} +Version: 4.4 +Release: 0.1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ %if 0%{?date} @@ -112,12 +113,7 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2 Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz %endif Patch0: fix-vmaf-model-path.patch -Patch1: glslang_linker_flags.patch -# upstream glslang commit -Patch2: libavfilter_glslang.cpp.patch # upstream asm commits -Patch3: libavutil_x86_x86inc.asm.patch -Patch4: tests_checkasm_vf_blend.c.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel} %{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})} @@ -471,6 +467,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %changelog +* Thu Dec 31 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 4.4-0.1.20201231git477dd2d +- Update to 20201231git477dd2d + * Thu Dec 24 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 4.3.1-15 - Enable dash demuxer (rfbz#5876) - Enable lv2 support (rfbz#5863) diff --git a/fix-vmaf-model-path.patch b/fix-vmaf-model-path.patch index 88a949b..737bf35 100644 --- a/fix-vmaf-model-path.patch +++ b/fix-vmaf-model-path.patch @@ -1,6 +1,6 @@ -From 37b8f54578ac1bcb7a63dc9038a5238fd6a58793 Mon Sep 17 00:00:00 2001 +From d87f2ce576ddb0ce8f6ade22b3c66a8b63c90713 Mon Sep 17 00:00:00 2001 From: Leigh Scott <leigh123linux(a)gmail.com&gt; -Date: Sat, 23 May 2020 12:32:44 +0100 +Date: Thu, 31 Dec 2020 13:08:06 +0000 Subject: [PATCH] fix vmaf model path --- @@ -8,7 +8,7 @@ Subject: [PATCH] fix vmaf model path 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c -index 14c3216b3a..e7273b6d1d 100644 +index 4d49127efc..bd6f4519e8 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -72,7 +72,7 @@ typedef struct LIBVMAFContext { @@ -18,8 +18,7 @@ index 14c3216b3a..e7273b6d1d 100644 - {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS}, + {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS}, {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, - {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, + {"log_fmt", "Set the format of the log (csv, json or xml).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, -- -2.26.2 - +2.29.2 diff --git a/sources b/sources index 4d5a142..a41703e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ffmpeg-4.3.1.tar.xz) = 64e1052c45145e27726e43d4fe49c9a92058e55562d34fd3b3adf54d3506e6bd680f016b748828215e1bfc8ce19aa85b6f7e4eb05fafe21479118a4ad528a81f +SHA512 (ffmpeg-20201231.tar.bz2) = f64087aa8222d3d7817a969abe80aa3bd769685432b5e28220a5e8d7482278b7b65745df6ad56ebe37e7eb2c2438c50b6856bad3ed9f8e2b9f1e41eafffe60a3