From b99d9265373d2032168cb5953c64e4f915578981 Mon Sep 17 00:00:00 2001
From: John Galt <johngaltfirstrun@gmail.com>
Date: Thu, 4 Sep 2014 11:28:09 -0700
Subject: [PATCH 1/2] MesaLib-git: fix ARM builds @xtraeme

---
 srcpkgs/MesaLib-git/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/MesaLib-git/template b/srcpkgs/MesaLib-git/template
index 6228f44f09d..000f3279da4 100644
--- a/srcpkgs/MesaLib-git/template
+++ b/srcpkgs/MesaLib-git/template
@@ -179,7 +179,13 @@ mesa-swraster-dri-git_package() {
 	depends="libGL-git libEGL-git libGLES-git"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/swrast*"
-		vmove "usr/lib/gallium-pipe/pipe_swrast.so"
+		# XXX
+		case "$XBPS_TARGET_MACHINE" in
+		i686*|x86_64*)
+			vmove "usr/lib/gallium-pipe/pipe_swrast.so"
+			;;
+		esac
+
 	}
 }
 

From dfb7a0419c72a2ee25707d18024d1f2e35a9dac6 Mon Sep 17 00:00:00 2001
From: John Galt <johngaltfirstrun@gmail.com>
Date: Thu, 4 Sep 2014 11:39:14 -0700
Subject: [PATCH 2/2] MesaLib-git: build with --disable-gallium-egl @xtraeme

As suggested by wayland. This option also disables libOpenVG, so remove
it completely.
---
 common/shlibs                |  1 -
 srcpkgs/MesaLib-git/template | 27 +++++++--------------------
 srcpkgs/libOpenVG-git        |  1 -
 3 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 120000 srcpkgs/libOpenVG-git

diff --git a/common/shlibs b/common/shlibs
index aa4e6d3ab09..ac98f6d39e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -129,7 +129,6 @@ libGL.so.1 nvidia304-304.00_1
 libGL.so.1 nvidia331-331.67_1
 libglapi.so.0 libglapi-7.11_1
 libglapi.so.0 libglapi-git-20140722_1
-libOpenVG.so.1 libOpenVG-git-20140722_1
 libgbm.so.1 libgbm-9.0_1
 libgbm.so.1 libgbm-git-20140722_1
 librsvg-2.so.2 librsvg-2.26.0_1
diff --git a/srcpkgs/MesaLib-git/template b/srcpkgs/MesaLib-git/template
index 000f3279da4..dddedcbb7ca 100644
--- a/srcpkgs/MesaLib-git/template
+++ b/srcpkgs/MesaLib-git/template
@@ -1,12 +1,12 @@
 # Template build file for 'MesaLib-git'.
 pkgname=MesaLib-git
 version=20140903
-revision=1
+revision=2
 wrksrc="Mesa-git-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
- --enable-gles1 --enable-gles2 --enable-openvg --enable-egl --enable-vdpau
- --enable-gallium-egl --enable-xvmc --enable-osmesa --enable-texture-float
+ --enable-gles1 --enable-gles2 --enable-egl --enable-vdpau
+ --disable-gallium-egl --enable-xvmc --enable-osmesa --enable-texture-float
  --with-egl-platforms=x11,drm,wayland"
 replaces="MesaLib>=0"
 provides="MesaLib-${version}_${revision}"
@@ -25,8 +25,7 @@ makedepends="
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
 subpackages="libglapi-git libgbm-git libEGL-git libGL-git libGLES-git
- libOpenVG-git libOSMesa-git libwayland-egl-git MesaLib-devel-git
- mesa-swraster-dri-git"
+ libOSMesa-git libwayland-egl-git MesaLib-devel-git mesa-swraster-dri-git"
 
 case "$XBPS_TARGET_MACHINE" in
 i686*|x86_64*)
@@ -108,7 +107,6 @@ libgbm-git_package() {
 	provides="libgbm-${version}_${revision}"
 	pkg_install() {
 		vmove "usr/lib/libgbm.so.*"
-		vmove usr/lib/gbm/gbm_gallium_drm.so
 	}
 }
 
@@ -123,15 +121,6 @@ libGL-git_package() {
 	}
 }
 
-libOpenVG-git_package() {
-	short_desc="Free implementation of the OpenVG API - runtime"
-	replaces="libOpenVG>=0"
-	provides="libOpenVG-${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/libOpenVG.so.*"
-	}
-}
-
 libOSMesa-git_package() {
 	short_desc="Mesa Off-Screen interface library"
 	replaces="libOSMesa>=0"
@@ -147,7 +136,6 @@ libwayland-egl-git_package() {
 	provides="libwayland-egl-${version}_${revision}"
 	pkg_install() {
 		vmove "usr/lib/libwayland-egl.so.*"
-		vmove usr/lib/egl
 	}
 }
 
@@ -155,10 +143,9 @@ MesaLib-devel-git_package() {
 	depends="glproto dri2proto>=2.1 dri3proto presentproto libxshmfence-devel
 		libXext-devel libXxf86vm-devel libXdamage-devel expat-devel
 		libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.39
-		libGL-git>=${version}_${revision} libOpenVG-git>=${version}_${revision}
-		libGLES-git>=${version}_${revision} libEGL-git>=${version}_${revision}
-		libOSMesa-git>=${version}_${revision} libgbm-git>=${version}_${revision}
-		libwayland-egl-git>=${version}_${revision}"
+		libGL-git>=${version}_${revision} libGLES-git>=${version}_${revision}
+		libEGL-git>=${version}_${revision} libOSMesa-git>=${version}_${revision}
+		libgbm-git>=${version}_${revision} libwayland-egl-git>=${version}_${revision}"
 	if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		depends+=" libxatracker-git>=${version}_${revision}"
 	fi
diff --git a/srcpkgs/libOpenVG-git b/srcpkgs/libOpenVG-git
deleted file mode 120000
index 2803ad10b07..00000000000
--- a/srcpkgs/libOpenVG-git
+++ /dev/null
@@ -1 +0,0 @@
-MesaLib-git
\ No newline at end of file