Remove conflicting files.

1 files changed, 10 insertions, 3 deletions

diff --git a/PKGBUILD b/PKGBUILD
index bb73d4560e0c..56481041fabf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=lib32-libglvnd
 pkgname=$_pkgname-git
-pkgver=1.0.0.r0.g005fd3a
+pkgver=1.1.1.r10.g396433b
 pkgrel=1
 pkgdesc="The GL Vendor-Neutral Dispatch library"
 arch=('x86_64')
@@ -27,18 +27,25 @@ build() {
 
   cd libglvnd
   ./autogen.sh
-  ./configure --prefix=/usr --libdir=/usr/lib32/ --build=i686-unknown-linux-gnu
+  ./configure \
+    --prefix=/usr \
+    --disable-headers \
+    --libdir=/usr/lib32/ \
+    --build=i686-unknown-linux-gnu
   make
 }
 
 package() {
   # lib32-libglvnd needs lib32-mesa for indirect rendering
-  depends=('lib32-libxext' 'libglvnd-git' 'lib32-mesa' 'lib32-opengl-driver')
+  depends=('lib32-libxext' 'libglvnd' 'lib32-mesa' 'lib32-opengl-driver')
 
   cd libglvnd
   make DESTDIR="$pkgdir" install
 
   rm -r "$pkgdir"/usr/include
+  
+  # These files are in lib32-mesa package
+  rm "$pkgdir"/usr/lib32/pkgconfig/{egl,gl,glesv1_cm,glesv2}.pc
 
   mkdir -p "$pkgdir"/usr/share/licenses
   ln -s libglvnd-git "$pkgdir"/usr/share/licenses/$pkgname