summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-23 22:23:58 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-23 22:23:58 -0600
commit3898888a1cf7715da8fc86484ee4494d25c150b3 (patch)
treed4c6c78228fc5ed38568e3d23a830981ee520b22
parenta03cc5caa52177f93d36ddd3d0118325c99e156d (diff)
downloadpackages-3898888a1cf7715da8fc86484ee4494d25c150b3.tar.gz
packages-3898888a1cf7715da8fc86484ee4494d25c150b3.tar.bz2
packages-3898888a1cf7715da8fc86484ee4494d25c150b3.tar.xz
packages-3898888a1cf7715da8fc86484ee4494d25c150b3.zip
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.
-rw-r--r--user/xorgproto/APKBUILD4
1 files changed, 4 insertions, 0 deletions
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