From 36145d9e799b4cc4f3b1ef8133d6eb9c5b1b53fc Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 24 Dec 2019 17:49:09 -0600 Subject: user/libXvMC: install header again xorgproto has been bumped to 2019.2, so there is no more conflict. --- user/libxvmc/APKBUILD | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/user/libxvmc/APKBUILD b/user/libxvmc/APKBUILD index 2baf9b21d..99026afc0 100644 --- a/user/libxvmc/APKBUILD +++ b/user/libxvmc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox pkgname=libxvmc pkgver=1.0.12 -pkgrel=0 +pkgrel=1 pkgdesc="X11 Video Motion Compensation extension library" url="https://www.X.Org/" arch="all" @@ -30,9 +30,6 @@ 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