From 3b95040b4d15af2d48467263ef0d6195b0008af6 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 6 Apr 2019 21:23:43 +0200 Subject: [PATCH] Update snapshot --- libvpx-1.8-fix.patch | 36 ------------------------------------ sources | 2 +- vlc.spec | 15 +++++++-------- 3 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 libvpx-1.8-fix.patch diff --git a/libvpx-1.8-fix.patch b/libvpx-1.8-fix.patch deleted file mode 100644 index 7d08b42..0000000 --- a/libvpx-1.8-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2688feb2742a6021ca211ae5c106b12c3d822946 Mon Sep 17 00:00:00 2001 -From: Danny Milosavljevic -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 -(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/sources b/sources index d784f58..22911d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ff71d262e070fd19f86a1c3542c7b4e vlc-3.0.6.tar.xz +02fe01ec602445745b46b0612456e023 vlc-3.0.7-20190406-0223.tar.xz diff --git a/vlc.spec b/vlc.spec index faf5c46..b09e919 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,6 +1,6 @@ -#global vlc_date 20181213 +%global vlc_date 20190406 #global vlc_rc -rc9 -#global vlc_tag -#{?vlc_date}-0221 +%global vlc_tag -%{?vlc_date}-0223 %if 0%{?vlc_tag:1} %global vlc_url https://nightlies.videolan.org/build/source/ %else @@ -42,14 +42,12 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc -Version: 3.0.6 -Release: 25%{?dist} +Version: 3.0.7 +Release: 0.1%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz Patch0: https://github.com/RPi-Distro/vlc/raw/stretch-rpt/debian/patches/mmal_8.patch -# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commitdiff;h=2688feb2742a6021ca211ae5c106b12c3d822946 -Patch1: libvpx-1.8-fix.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -286,7 +284,6 @@ VLC media player extras modules. %{?_with_rpi: %patch0 -p1 } -%patch1 -p1 %if 0%{?rhel} == 7 . /opt/rh/devtoolset-7/enable @@ -544,7 +541,9 @@ fi || : %changelog -* Sat Apr 06 2019 Nicolas Chauvet - 1:3.0.6-25 +* Sat Apr 06 2019 Nicolas Chauvet - 1:3.0.7-0.1 +- Update to 20190406 +- Rebuilt for live555 - Rebuilt for libplacebo - Update mmal patch