From d0a258ac6335227d39f53eba249d725fae908945 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 5 Sep 2014 01:23:54 +0200
Subject: [PATCH] MesaLib: build with --disable-gallium-egl as suggested by
 wayland.

This option also disables libOpenVG, so remove it completely.
---
 common/shlibs            |  1 -
 srcpkgs/MesaLib/template | 21 +++++----------------
 srcpkgs/libOpenVG        |  1 -
 3 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 120000 srcpkgs/libOpenVG

diff --git a/common/shlibs b/common/shlibs
index c3115171ea..aa4e6d3ab0 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-7.11_1
 libOpenVG.so.1 libOpenVG-git-20140722_1
 libgbm.so.1 libgbm-9.0_1
 libgbm.so.1 libgbm-git-20140722_1
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index a9aac07775..ee28e1db15 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,12 +1,12 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=10.2.6
-revision=3
+revision=4
 wrksrc="Mesa-${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"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -24,8 +24,7 @@ makedepends="
  elfutils-devel ncurses-devel zlib-devel libffi-devel"
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="libglapi libgbm libEGL libGL libGLES libOpenVG libOSMesa
- libwayland-egl mesa-swraster-dri"
+subpackages="libglapi libgbm libEGL libGL libGLES libOSMesa libwayland-egl mesa-swraster-dri"
 
 case "$XBPS_TARGET_MACHINE" in
 i686*|x86_64*)
@@ -81,7 +80,6 @@ libgbm_package() {
 	replaces="libgbm-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libgbm.so.*"
-		vmove usr/lib/gbm/gbm_gallium_drm.so
 	}
 }
 
@@ -112,14 +110,6 @@ libGL_package() {
 	}
 }
 
-libOpenVG_package() {
-	short_desc="Free implementation of the OpenVG API - runtime"
-	replaces="libOpenVG-git>=0"
-	pkg_install() {
-		vmove "usr/lib/libOpenVG.so.*"
-	}
-}
-
 libOSMesa_package() {
 	short_desc="Mesa Off-Screen interface library"
 	replaces="libOSMesa-git>=0"
@@ -133,7 +123,6 @@ libwayland-egl_package() {
 	replaces="libwayland-egl-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libwayland-egl.so.*"
-		vmove usr/lib/egl
 	}
 }
 
@@ -141,7 +130,7 @@ MesaLib-devel_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>=${version}_${revision} libOpenVG>=${version}_${revision}
+		libGL>=${version}_${revision}
 		libGLES>=${version}_${revision} libEGL>=${version}_${revision}
 		libOSMesa>=${version}_${revision} libgbm>=${version}_${revision}
 		libwayland-egl>=${version}_${revision}"
diff --git a/srcpkgs/libOpenVG b/srcpkgs/libOpenVG
deleted file mode 120000
index 8bf5fbea21..0000000000
--- a/srcpkgs/libOpenVG
+++ /dev/null
@@ -1 +0,0 @@
-MesaLib
\ No newline at end of file