From e16c10df1add84e08220d8b4d0c7e9da7d925b79 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 26 Dec 2017 02:29:29 +0100 Subject: [PATCH] Update clean_ffmpeg.sh whitelist (sync from Fedora Chromium packaging) Add missing libavutil/imgutils.c, libavutil/imgutils.h, libavutil/imgutils_internal.h and libavcodec/hwaccel.h. Also update sources with the regenerated and reuploaded tarball. --- clean_ffmpeg.sh | 8 ++++++-- qt5-qtwebengine.spec | 1 + sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index 0b1fa64..c049e03 100755 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -61,9 +61,11 @@ header_files=" libavutil/x86/asm.h \ libavutil/cpu.h \ libavutil/dynarray.h \ libavutil/ffmath.h \ - libavutil/float_dsp.h \ libavutil/fixed_dsp.h \ + libavutil/float_dsp.h \ libavutil/hwcontext_internal.h \ + libavutil/imgutils.h \ + libavutil/imgutils_internal.h \ libavutil/internal.h \ libavutil/intfloat.h \ libavutil/intreadwrite.h \ @@ -116,6 +118,7 @@ header_files=" libavutil/x86/asm.h \ libavcodec/h264chroma.h \ libavcodec/h264pred.h \ libavcodec/hpeldsp.h \ + libavcodec/hwaccel.h \ libavcodec/idctdsp.h \ libavcodec/internal.h \ libavcodec/mathops.h \ @@ -229,8 +232,9 @@ manual_files=" libavutil/x86/x86inc.asm \ libavcodec/vp8_parser.c \ libavcodec/vp8dsp.c \ libavutil/cpu.c \ - libavutil/float_dsp.c \ libavutil/fixed_dsp.c \ + libavutil/float_dsp.c \ + libavutil/imgutils.c \ libavutil/aarch64/float_dsp_neon.S \ libavutil/arm/cpu.c \ libavutil/arm/float_dsp_neon.S \ diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 5142c43..b41afa6 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -581,6 +581,7 @@ done - Drop support for Fedora < 26 (in particular, WEBENGINE_CONFIG F25 workarounds) - Drop qt57 patch, support for Qt 5.7 was completely dropped upstream - Update get_free_ffmpeg_source_files.py from Fedora Chromium packaging +- Update clean_ffmpeg.sh whitelist (sync from Fedora Chromium packaging) - clean_qtwebengine.sh: Update for the changed tarball naming scheme - Use QMAKE_EXTRA_ARGS instead of the removed WEBENGINE_CONFIG - Rebase linux-pri, system-nspr-prtime, system-icu-utf, no-sse2, skia-neon and diff --git a/sources b/sources index d0b675c..f60115f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtwebengine-everywhere-src-5.10.0-clean.tar.xz) = 0c89061507a7f1541eb9433545f3610f96ac6b6b29dc2527a9bc15c945a0ce33d0d2bd693c9d865639b10a97077192fc387b0a5920e64b7860c576b987899fb2 +SHA512 (qtwebengine-everywhere-src-5.10.0-clean.tar.xz) = 7802bfe56ea24a3038b703af693d0227a5e283804a20d6796687c658b28f9eb21f99a163c3ddf4d9a13d915bf254d32e05b1bd54b413f2afa160b7b3d21815ba