From 7cc5981f6564d5a3299b02faa2443bd461ec6cea Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Fri, 26 Jan 2007 21:45:20 +0000
Subject: xserver-xorg: build with Mesa so GLX works

---
 packages/xorg-xserver/xorg-xserver-common.inc       | 5 ++++-
 packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb | 2 +-
 packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'packages/xorg-xserver')

diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index b1cbd5c472..3aa3aaf3c6 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -5,6 +5,8 @@ LICENSE = "MIT-X"
 RPROVIDES_${PN} = "virtual/xserver"
 PROVIDES = "virtual/xserver"
 
+MESA_VER ?= "6.5"
+
 DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \
 xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
 xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \
@@ -18,13 +20,14 @@ RDEPENDS_${PN} = "rgb"
 
 XORG_PN = "xorg-server"
 SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.bz2 \
+	${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${MESA_VER}.tar.bz2 \
 	file://xorg.conf"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--disable-builddocs"
+EXTRA_OECONF = "--disable-builddocs --with-mesa-source=${WORKDIR}/Mesa-${MESA_VER}"
 
 PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xnest ${PN}-dmx"
 
diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
index 57d57fda84..e91a50a603 100644
--- a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
+++ b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
 require xorg-xserver-common.inc
 
-PR = "r2"
+PR = "r3"
 
 #DESCRIPTION = ""
 
diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
index 6ee935a21e..3c29684394 100644
--- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
@@ -2,7 +2,7 @@ require xorg-xserver-common.inc
 
 SRC_URI += "file://drmfix.patch;patch=1"
 
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
 
-- 
cgit v1.2.3