From b79d3b51317c6c90b1a79de8da9bfce8b846a36f Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@adinet.com.uy>
Date: Fri, 7 Sep 2012 19:40:26 -0300
Subject: mesa-git: fix libegl conflict

---
 pcr/mesa-git/PKGBUILD | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pcr/mesa-git/PKGBUILD')

diff --git a/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD
index 4394a440a..d2d0d4bbe 100644
--- a/pcr/mesa-git/PKGBUILD
+++ b/pcr/mesa-git/PKGBUILD
@@ -32,7 +32,7 @@ true && pkgname=(
   mesa-git
 )
 true && pkgver=9.0.0.git20120907
-true && pkgrel=1
+true && pkgrel=2
 _mesaver=9.0
 arch=(
   i686
@@ -98,8 +98,8 @@ build() {
 
   autoreconf -vfi
   ./autogen.sh --prefix=/usr \
-    --enable-egl \
     --enable-dri \
+    --enable-egl \
     --enable-gallium-egl \
     --enable-gallium-g3dvl \
     --enable-gallium-gbm \
@@ -202,6 +202,7 @@ package_libegl-wayland-git() {
   make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install
 
   cd $srcdir/build
+  rm -fvr $pkgdir/usr/include/KHR
  #install -m755 -d $pkgdir/usr/include/EGL
  #install -m755 -d $pkgdir/usr/lib/egl
  #install -m755 -d $pkgdir/usr/lib/pkgconfig
-- 
cgit v1.2.3