Remove egl.pc to avoid conflict, bump

1 files changed, 7 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e40e5b3519b2..e00863c5bfa3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=mesa-aco-git
 pkgdesc="Mesa with the ACO compiler patchset, git version"
-pkgver=19.2.0_devel.113862.3f3665b8d52
+pkgver=19.2.0_devel.114249.17d9490cef1
 pkgrel=1
 arch=('x86_64')
 makedepends=('git' 'python-mako' 'xorgproto'
@@ -153,7 +153,12 @@ package() {
   DESTDIR="$pkgdir" ninja $NINJAFLAGS -C _build install
 
   # indirect rendering
-  ln -s /usr/lib/libGLX_mesa.so.0 ${pkgdir}/usr/lib/libGLX_indirect.so.0
+  ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}"/usr/lib/libGLX_indirect.so.0
+
+  # drop egl.pc -- upstream mesa has dropped this to fix confusion over who should provide it (conclusion: libglvnd),
+  # but as of 7/23 the ACO upstream doesn't have that patch.  Drop it now so we don't conflict with the libglvnd
+  # provider, next ACO rebase should remove this file when they pick up c7831b604063
+  rm -f "$pkgdir"/usr/lib/pkgconfig/egl.pc
 
   install -Dt "$pkgdir"/usr/share/licenses/$pkgname "$srcdir"/LICENSE
 }