From ee6b178ab433ad93be4d44c9661cdb02c08459a2 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 6 Oct 2019 17:23:57 +0000
Subject: user/libxvmc: fix conflict with xorgproto-dev

---
 user/libxvmc/APKBUILD | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'user')

diff --git a/user/libxvmc/APKBUILD b/user/libxvmc/APKBUILD
index daabfc36e..2baf9b21d 100644
--- a/user/libxvmc/APKBUILD
+++ b/user/libxvmc/APKBUILD
@@ -30,6 +30,9 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+
+	# Conflicts with xorgproto until 2019.2, which is unreleased.
+	rm "$pkgdir"/usr/include/X11/extensions/vldXvMC.h
 }
 
 sha512sums="62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955  libXvMC-1.0.12.tar.bz2"
-- 
cgit v1.2.3-70-g09d2