From eb9238b971121c92405cec7b545b7495bc599b8c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 2 Apr 2020 15:35:40 +0200 Subject: [PATCH] Update to 20200402 --- sources | 2 +- vlc.spec | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/sources b/sources index 8313376..4ce1d9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vlc-3.0.9-20200306-0223.tar.xz) = ca85dfab616d72572f83e67dc7b2b4e683237e0df2b2a4cec0c261c903932aa87dc7339dc6adfc45cf10eb1ca3f61e55058849e700f29144901cfafb1f6705dd +SHA512 (vlc-3.0.9-20200402-0222.tar.xz) = b83d99d780713b21fceab88ea794e5e620d756728e69f9578536bd12d66315aa9b3ab48ec65988e1bb83b0dd51f5b49aba4fddbd67f6faea6e13d9e6e5a5c272 diff --git a/vlc.spec b/vlc.spec index 0061557..8919217 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,6 +1,6 @@ -%global vlc_date 20200306 +%global vlc_date 20200402 #global vlc_rc -rc9 -%global vlc_tag -%{?vlc_date}-0223 +%global vlc_tag -%{?vlc_date}-0222 %if 0%{?vlc_tag:1} %global vlc_url https://nightlies.videolan.org/build/source/ %else @@ -54,12 +54,11 @@ Summary: The cross-platform open-source multimedia framework, player and server Epoch: 1 Name: vlc Version: 3.0.9 -Release: 33%{?dist} +Release: 34%{?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/buster-rpt/debian/patches/mmal_16.patch -Patch1: libplacebo_patch_1.patch +Patch0: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_16.patch Patch2: Fix_aom_abi_break.patch Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch # Revert commit for f30 @@ -304,12 +303,15 @@ VLC media player extras modules. %{?_with_rpi: %patch0 -p1 } -%patch1 -p1 %patch2 -p1 %patch3 -p1 %if 0%{?fedora} == 30 %patch4 -p1 %endif +%if 0%{?el7} +# Lower opus requirement - rfbz#5585 +sed -i -e 's/opus >= 1.0.3/opus >= 1.0.2/' configure.ac +%endif %if 0%{?rhel} == 7 . /opt/rh/devtoolset-7/enable @@ -421,6 +423,9 @@ rm -rf %{buildroot}%{_datadir}/kde4 %find_lang %{name} +%check +make check + %ldconfig_scriptlets core @@ -569,6 +574,10 @@ fi || : %changelog +* Thu Apr 02 2020 Nicolas Chauvet - 1:3.0.9-34 +- Update to 20200402 +- Enable make tests + * Fri Mar 06 2020 leigh123linux - 1:3.0.9-33 - Update to current snapshot