summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-10-06 17:23:57 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-10-06 17:23:57 +0000
commitee6b178ab433ad93be4d44c9661cdb02c08459a2 (patch)
treeb5d7705482a2c3dc283049e3e4bfbc0b031d3ecf /user
parentf6b5278a9be8471733f1e18372b81a6eb7f0deb6 (diff)
downloadpackages-ee6b178ab433ad93be4d44c9661cdb02c08459a2.tar.gz
packages-ee6b178ab433ad93be4d44c9661cdb02c08459a2.tar.bz2
packages-ee6b178ab433ad93be4d44c9661cdb02c08459a2.tar.xz
packages-ee6b178ab433ad93be4d44c9661cdb02c08459a2.zip
user/libxvmc: fix conflict with xorgproto-dev
Diffstat (limited to 'user')
-rw-r--r--user/libxvmc/APKBUILD3
1 files changed, 3 insertions, 0 deletions
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"