From e0b0d91b9904d42bc7e5370fac8e4f08e3764fc4 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 21 Sep 2013 19:14:29 +0200
Subject: [PATCH] Mesa: add support to build latest Mesa-master

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

diff --git a/packages/graphics/Mesa/package.mk b/packages/graphics/Mesa/package.mk
index 2ef32442b8..04a8b50da1 100644
--- a/packages/graphics/Mesa/package.mk
+++ b/packages/graphics/Mesa/package.mk
@@ -18,13 +18,22 @@
 #  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="1569b3e"
+    PKG_URL="$DISTRO_SRC/Mesa-$PKG_VERSION.tar.xz"
+    ;;
+esac
+
 PKG_NAME="Mesa"
-PKG_VERSION="9.2.0"
 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_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 b59aaf14f3..cba7cc9f71 100755
--- a/projects/ARCTIC_MC/options
+++ b/projects/ARCTIC_MC/options
@@ -237,6 +237,11 @@
 # 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/ATV/options b/projects/ATV/options
index 3015985765..552adb5884 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -237,6 +237,11 @@
 # 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 4631a26ece..41cfbb4948 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -237,6 +237,11 @@
 # 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/Generic/options b/projects/Generic/options
index c954e113b9..4e9d85aedd 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -237,6 +237,11 @@
 # 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/Generic_OSS/options b/projects/Generic_OSS/options
index 493c1a918b..19257b7d22 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -237,6 +237,11 @@
 # 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"
 
@@ -255,7 +260,7 @@
   XBMCPLAYER_DRIVER="default"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
-  VDPAU="no"
+  VDPAU="yes"
 
 # Use VAAPI video acceleration (needs intel i965 driver and a supported card)
   VAAPI="yes"
diff --git a/projects/ION/options b/projects/ION/options
index aab854b513..acea28f56f 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -237,6 +237,11 @@
 # 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 1880d53c80..afb8056012 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -237,6 +237,11 @@
 # 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 8ae9365f19..c037e90a11 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -237,6 +237,11 @@
 # 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 9f1430ab70..13c0141e50 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -232,6 +232,11 @@
 # 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"