commit b27b4ee4afee3089caee542745671165daa333f7 Author: Leigh Scott <leigh123linux(a)googlemail.com&gt; Date: Wed Feb 27 09:07:16 2019 +0000 Patch for libvpx-1.8.0 libvpx-1.8-fix.patch | 36 ++++++++++++++++++++++++++++++++++++ vlc.spec | 10 ++++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) --- diff --git a/libvpx-1.8-fix.patch b/libvpx-1.8-fix.patch new file mode 100644 index 0000000..7d08b42 --- /dev/null +++ b/libvpx-1.8-fix.patch @@ -0,0 +1,36 @@ +From 2688feb2742a6021ca211ae5c106b12c3d822946 Mon Sep 17 00:00:00 2001 +From: Danny Milosavljevic <dannym(a)scratchpost.org&gt; +Date: Mon, 11 Feb 2019 16:07:12 +0100 +Subject: [PATCH] codec: vpx: Detect libvpx 1.8.0 and, if detected, use fewer + frame formats in the chroma_table + +Signed-off-by: Steve Lhomme <robux4(a)ycbcr.xyz&gt; +(cherry picked from commit 5575fe3eb3fd46bada8662268b74d03493476a84) +--- + modules/codec/vpx.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules/codec/vpx.c b/modules/codec/vpx.c +index 2b1e37818d..aba180361f 100644 +--- a/modules/codec/vpx.c ++++ b/modules/codec/vpx.c +@@ -116,6 +116,7 @@ static const struct + { VLC_CODEC_I440, VPX_IMG_FMT_I440, 8, 0 }, + + { VLC_CODEC_YV12, VPX_IMG_FMT_YV12, 8, 0 }, ++#if VPX_IMAGE_ABI_VERSION < 5 + { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 }, + { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 }, + { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 }, +@@ -128,7 +129,7 @@ static const struct + + { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 }, + { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 }, +- ++#endif + { VLC_CODEC_GBR_PLANAR, VPX_IMG_FMT_I444, 8, 1 }, + { VLC_CODEC_GBR_PLANAR_10L, VPX_IMG_FMT_I44416, 10, 1 }, + +-- +2.11.0 + diff --git a/vlc.spec b/vlc.spec index bb7f4f6..665c238 100644 --- a/vlc.spec +++ b/vlc.spec @@ -44,11 +44,13 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.6 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz -Patch0: https://raw.githubusercontent.com/fedberry/vlc/master/mmal_1.patch +Patch0: https://raw.githubusercontent.com/fedberry/vlc/master/mmal_1.patch +# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commitdiff;h=2688feb2742a60... +Patch1: libvpx-1.8-fix.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -285,6 +287,7 @@ VLC media player extras modules. %{?_with_rpi: %patch0 -p1 } +%patch1 -p1 %if 0%{?rhel} == 7 . /opt/rh/devtoolset-7/enable @@ -542,6 +545,9 @@ fi || : %changelog +* Wed Feb 27 2019 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:3.0.6-19 +- Patch for libvpx-1.8.0 + * Wed Feb 27 2019 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:3.0.6-18 - Rebuilt