[oe-commits] org.oe.dev xserver-xorg: build with Mesa so GLX works

[pb commit]

xserver-xorg: build with Mesa so GLX works

Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: cda98b5f7e614937fbdf5a3be7767b63019ac50d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cda98b5f7e614937fbdf5a3be7767b63019ac50d
Files:
1
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
Diffs:

#
# mt diff -r1522497d6e2cbc6aba048eddc78db0d6bdd4a035 -rcda98b5f7e614937fbdf5a3be7767b63019ac50d
#
# 
# 
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
#  from [3d9b8acffcb54eae1e3da2f67aa124b093de88ef]
#    to [a431ceb0601af0d4357b03521f3f1df1ca2ce5ad]
# 
# patch "packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb"
#  from [8e0b8a0f33c7194e7a144a170d8e674dd408ab29]
#    to [b8ecf2be91e73904343a74bec3621569db3ebb2e]
# 
# patch "packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb"
#  from [39683c5c773f7c46f6c528e06058045a98ed388c]
#    to [b33d96e401352b3c98ed5a2828bf614352c0e6c9]
# 
============================================================
--- packages/xorg-xserver/xorg-xserver-common.inc	3d9b8acffcb54eae1e3da2f67aa124b093de88ef
+++ packages/xorg-xserver/xorg-xserver-common.inc	a431ceb0601af0d4357b03521f3f1df1ca2ce5ad
@@ -5,6 +5,8 @@ PROVIDES = "virtual/xserver"
 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 @@ SRC_URI = "${XORG_MIRROR}/${@bb.data.get
 
 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"
 
============================================================
--- packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb	8e0b8a0f33c7194e7a144a170d8e674dd408ab29
+++ packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb	b8ecf2be91e73904343a74bec3621569db3ebb2e
@@ -1,6 +1,6 @@ require xorg-xserver-common.inc
 require xorg-xserver-common.inc
 
-PR = "r2"
+PR = "r3"
 
 #DESCRIPTION = ""
 
============================================================
--- packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb	39683c5c773f7c46f6c528e06058045a98ed388c
+++ packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb	b33d96e401352b3c98ed5a2828bf614352c0e6c9
@@ -1,8 +1,8 @@ SRC_URI += "file://drmfix.patch;patch=1"
 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 "