From 46c4cab05964a0f2bffb451c79142f7a501e885d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 26 Sep 2013 10:41:45 +0200
Subject: [PATCH] Mesa: switch to Mesa-9.3-devel

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/graphics/Mesa/package.mk | 14 +++-----------
 projects/ARCTIC_MC/options        |  5 -----
 projects/ATV/options              |  5 -----
 projects/Fusion/options           |  5 -----
 projects/Generic/options          |  5 -----
 projects/Generic_OSS/options      |  5 -----
 projects/ION/options              |  5 -----
 projects/Intel/options            |  5 -----
 projects/RPi/options              |  5 -----
 projects/Virtual/options          |  5 -----
 10 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/packages/graphics/Mesa/package.mk b/packages/graphics/Mesa/package.mk
index e18ce7ffa1..b68554c635 100644
--- a/packages/graphics/Mesa/package.mk
+++ b/packages/graphics/Mesa/package.mk
@@ -18,22 +18,14 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-case "$MESA" in
-  default)
-    PKG_VERSION="9.2.0"
-    PKG_URL="ftp://freedesktop.org/pub/mesa/9.2/MesaLib-$PKG_VERSION.tar.bz2"
-    ;;
-  master)
-    PKG_VERSION="ckoenig-8d56907"
-    PKG_URL="$DISTRO_SRC/Mesa-$PKG_VERSION.tar.xz"
-    ;;
-esac
-
 PKG_NAME="Mesa"
+PKG_VERSION="ckoenig-8d56907"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
+# PKG_URL="ftp://freedesktop.org/pub/mesa/9.2/MesaLib-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/Mesa-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libX11"
 PKG_BUILD_DEPENDS_TARGET="toolchain Python-host makedepend:host libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
 PKG_PRIORITY="optional"
diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options
index 3784bead3e..e6577a409b 100755
--- a/projects/ARCTIC_MC/options
+++ b/projects/ARCTIC_MC/options
@@ -237,11 +237,6 @@
 # OpenGL(X) implementation to use (no / Mesa)
   OPENGL="Mesa"
 
-# Mesa to use
-# default: default Mesa release
-# master: latest Mesa-master checkout
-  MESA="master"
-
 # OpenGL-ES implementation to use (no)
   OPENGLES="no"
 
diff --git a/projects/ATV/options b/projects/ATV/options
index 59f6d0614f..bdaed5216d 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -237,11 +237,6 @@
 # OpenGL(X) implementation to use (no / Mesa)
   OPENGL="Mesa"
 
-# Mesa to use
-# default: default Mesa release
-# master: latest Mesa-master checkout
-  MESA="default"
-
 # OpenGL-ES implementation to use (no)
   OPENGLES="no"
 
diff --git a/projects/Fusion/options b/projects/Fusion/options
index 0241f08222..d628ba3de3 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -237,11 +237,6 @@
 # OpenGL(X) implementation to use (no / Mesa)
   OPENGL="Mesa"
 
-# Mesa to use
-# default: default Mesa release
-# master: latest Mesa-master checkout
-  MESA="master"
-
 # OpenGL-ES implementation to use (no)
   OPENGLES="no"
 
diff --git a/projects/Generic/options b/projects/Generic/options
index 9d3b8a7f95..c3e86bcd79 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -237,11 +237,6 @@
 # OpenGL(X) implementation to use (no / Mesa)
   OPENGL="Mesa"
 
-# Mesa to use
-# default: default Mesa release
-# master: latest Mesa-master checkout
-  MESA="master"
-
 # OpenGL-ES implementation to use (no)
   OPENGLES="no"
 
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index deccd17858..0ae4aeb13a 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -237,11 +237,6 @@
 # OpenGL(X) implementation to use (no / Mesa)
   OPENGL="Mesa"
 
-# Mesa to use
-# default: default Mesa release
-# master: latest Mesa-master checkout
-  MESA="master"
-
 # OpenGL-ES implementation to use (no)
   OPENGLES="no"
 
diff --git a/projects/ION/options b/projects/ION/options
index f10cbd16a7..61b1f73110 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -237,11 +237,6 @@
 # OpenGL(X) implementation to use (no / Mesa)
   OPENGL="Mesa"
 
-# Mesa to use
-# default: default Mesa release
-# master: latest Mesa-master checkout
-  MESA="default"
-
 # OpenGL-ES implementation to use (no)
   OPENGLES="no"
 
diff --git a/projects/Intel/options b/projects/Intel/options
index 8d8a7f3758..b5e01ce09f 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -237,11 +237,6 @@
 # OpenGL(X) implementation to use (no / Mesa)
   OPENGL="Mesa"
 
-# Mesa to use
-# default: default Mesa release
-# master: latest Mesa-master checkout
-  MESA="default"
-
 # OpenGL-ES implementation to use (no)
   OPENGLES="no"
 
diff --git a/projects/RPi/options b/projects/RPi/options
index 1b8c90377d..24cdefe90a 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -237,11 +237,6 @@
 # OpenGL(X) implementation to use (no / Mesa)
   OPENGL="no"
 
-# Mesa to use
-# default: default Mesa release
-# master: latest Mesa-master checkout
-  MESA="default"
-
 # OpenGL-ES implementation to use (no / bcm2835-driver)
   OPENGLES="bcm2835-driver"
 
diff --git a/projects/Virtual/options b/projects/Virtual/options
index ecf7da504e..2292bc9897 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -232,11 +232,6 @@
 # OpenGL(X) implementation to use (no / Mesa)
   OPENGL="Mesa"
 
-# Mesa to use
-# default: default Mesa release
-# master: latest Mesa-master checkout
-  MESA="default"
-
 # OpenGL-ES implementation to use (no)
   OPENGLES="no"