From f4574e585d87477ba0cb3c64844e7a7fd713933b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 21 Aug 2019 15:51:45 +0100 Subject: [PATCH] KMA --- 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch | 39 ------------------- Fix_aom_abi_break.patch | 11 ++++++ vlc.spec | 3 +- 3 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch create mode 100644 Fix_aom_abi_break.patch diff --git a/0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch b/0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch deleted file mode 100644 index 81983be..0000000 --- a/0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 680849e6b9ced55fe8ac61771fd57e694c9ff79c Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet -Date: Mon, 24 Sep 2018 18:28:26 +0200 -Subject: [PATCH] Use @SYSTEM wide ciphers for gnutls - -Gnutls upstream has support for system -This is decribed at -https://fedoraproject.org/wiki/Packaging:CryptoPolicies -Also found on the debian wiki -https://wiki.debian.org/CryptoPolicy - -Signed-off-by: Nicolas Chauvet ---- - modules/misc/gnutls.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c -index 1b214358d4..05b4209692 100644 ---- a/modules/misc/gnutls.c -+++ b/modules/misc/gnutls.c -@@ -768,6 +768,7 @@ static void CloseServer (vlc_tls_creds_t *crd) - "hash functions and compression methods can be selected. " \ - "Refer to GNU TLS documentation for detailed syntax.") - static const char *const priorities_values[] = { -+ "@SYSTEM", - "PERFORMANCE", - "NORMAL", - "SECURE128", -@@ -775,6 +776,7 @@ static const char *const priorities_values[] = { - "EXPORT", - }; - static const char *const priorities_text[] = { -+ N_("System (default to system crypto ciphers policy)"), - N_("Performance (prioritize faster ciphers)"), - N_("Normal"), - N_("Secure 128-bits (exclude 256-bits ciphers)"), --- -2.17.2 - diff --git a/Fix_aom_abi_break.patch b/Fix_aom_abi_break.patch new file mode 100644 index 0000000..16b15a1 --- /dev/null +++ b/Fix_aom_abi_break.patch @@ -0,0 +1,11 @@ +--- a/modules/codec/aom.c ++++ b/modules/codec/aom.c +@@ -98,7 +98,6 @@ + { VLC_CODEC_I444, AOM_IMG_FMT_I444, 8, 0 }, + + { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 }, +-{ VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 }, + + { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 }, + { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 }, + diff --git a/vlc.spec b/vlc.spec index e990d6a..121c7e7 100644 --- a/vlc.spec +++ b/vlc.spec @@ -57,7 +57,7 @@ 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 Patch1: libplacebo_patch_1.patch -Patch2: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch +Patch2: Fix_aom_abi_break.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: fontpackages-devel @@ -295,6 +295,7 @@ VLC media player extras modules. %patch0 -p1 } %patch1 -p1 +%patch2 -p1 %if 0%{?rhel} == 7 . /opt/rh/devtoolset-7/enable