From 3898888a1cf7715da8fc86484ee4494d25c150b3 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 23 Dec 2019 22:23:58 -0600
Subject: user/xorgproto: Fix installation conflicts

Since we --enable-legacy, xorgproto "helpfully" installs headers which
are now provided by newer releases of upstream libraries.

We need to remove these so that libx11/libxvmc and xorgproto may be
installed at the same time.
---
 user/xorgproto/APKBUILD | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'user')

diff --git a/user/xorgproto/APKBUILD b/user/xorgproto/APKBUILD
index d855f3530..209642fed 100644
--- a/user/xorgproto/APKBUILD
+++ b/user/xorgproto/APKBUILD
@@ -71,6 +71,10 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+	# libX11
+	rm "$pkgdir"/usr/include/X11/extensions/XKBgeom.h
+	# libXvMC
+	rm "$pkgdir"/usr/include/X11/extensions/vldXvMC.h
 }
 
 sha512sums="cbfdf6bb3d58d4d4e7788c9ed779402352715e9899f65594fbc527b3178f1dc5e03cebc8ba5a863b3c196a1a0f2026c2d0438207ca19f81f3c8b7da0c0667904  xorgproto-2019.2.tar.bz2
-- 
cgit v1.2.3-60-g2f50