[packages/vlc] upstream patch to fix build against libvpx 1.8

atler atler at pld-linux.org
Sun Mar 3 14:59:19 CET 2019


commit abbb38995d87d0cb44dc4b753ba9e25efbe371ad
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Mar 3 14:58:51 2019 +0100

    upstream patch to fix build against libvpx 1.8

 vlc-libvpx-1.8.patch | 35 +++++++++++++++++++++++++++++++++++
 vlc.spec             |  2 ++
 2 files changed, 37 insertions(+)
---
diff --git a/vlc.spec b/vlc.spec
index 6b02a36..faed390 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -74,6 +74,7 @@ Patch1:		%{name}-tremor.patch
 Patch2:		%{name}-mpc.patch
 Patch3:		xmas-sucks.patch
 Patch4:		no-cache.patch
+Patch5:		%{name}-libvpx-1.8.patch
 URL:		http://www.videolan.org/vlc/
 # 1.0 for X11 or GLESv1, 1.1 for GLESv2
 BuildRequires:	EGL-devel >= %{?with_glesv2:1.1}%{!?with_glesv2:1.0}
@@ -352,6 +353,7 @@ Akcje klienta VLC dla Solid.
 %patch3 -p1
 %endif
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}
diff --git a/vlc-libvpx-1.8.patch b/vlc-libvpx-1.8.patch
new file mode 100644
index 0000000..3148595
--- /dev/null
+++ b/vlc-libvpx-1.8.patch
@@ -0,0 +1,35 @@
+From 5575fe3eb3fd46bada8662268b74d03493476a84 Mon Sep 17 00:00:00 2001
+From: Danny Milosavljevic <dannym at scratchpost.org>
+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 at ycbcr.xyz>
+---
+ 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 f03c7fae62..59b3acdef7 100644
+--- a/modules/codec/vpx.c
++++ b/modules/codec/vpx.c
+@@ -117,6 +117,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 },
+@@ -129,7 +130,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.18.1
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vlc.git/commitdiff/abbb38995d87d0cb44dc4b753ba9e25efbe371ad



More information about the pld-cvs-commit mailing list