Commit 4ecf0bf5 authored by Natanael Copa's avatar Natanael Copa
Browse files

community/vlc: fix build against libvpx-1.8

parent 66616129
......@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=vlc
pkgver=3.0.6
pkgrel=1
pkgrel=2
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
pkgusers="vlc"
......@@ -117,7 +117,9 @@ source="https://get.videolan.org/vlc/$pkgver/$pkgname-$pkgver.tar.xz
check-headless.patch
disable-sub-autodetect-fuzzy-1-test.patch
test-s390x.patch
fribidi_allow_deprecated.patch"
fribidi_allow_deprecated.patch
libvpx-1.8.patch
"
builddir="$srcdir/$pkgname-$pkgver"
......@@ -333,4 +335,5 @@ e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576d
22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch
e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch
c0107655249687655846a9547ca1a5670b9207443180600e7a149c69ffb96d7226787c19b018d4033db9b284c1a5faa8d7d42188ed40c3b8bb051256febf11c5 test-s390x.patch
8230a83306905cdda07fecdb6cb2b791196034775cc5c8986ab63e97cd3476317544011cbce92948059ac9f7b57ef450cd71820f0f134bc3ab3bed38463a67c3 fribidi_allow_deprecated.patch"
8230a83306905cdda07fecdb6cb2b791196034775cc5c8986ab63e97cd3476317544011cbce92948059ac9f7b57ef450cd71820f0f134bc3ab3bed38463a67c3 fribidi_allow_deprecated.patch
f2d703d54333b1b86e1ec4857cc5a069e30946ae72c2b39b7044225dededbeed4fd4d7454d8cec06461956a0c22207512f55a65ab7298fedfef683cf9ccc3e5b libvpx-1.8.patch"
From 5575fe3eb3fd46bada8662268b74d03493476a84 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@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@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 f03c7fae625..59b3acdef74 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 },
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment