[oe-commits] Martin Jansa : mesa: add version 7.6 for newer xorg

[git version control]

Module: openembedded.git
Branch: martin_jansa/xorg-7.5
Commit: bbfe390f23cace218a6fa9f90f664748e88a4b39
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=bbfe390f23cace218a6fa9f90f664748e88a4b39

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Nov  2 15:45:51 2009 +0100

mesa: add version 7.6 for newer xorg

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/checksums.ini                                 |    8 ++++++
 .../include/preferred-xorg-versions-X11R7.5.inc    |    4 ---
 recipes/mesa/mesa-dri_7.6.bb                       |   26 ++++++++++++++++++++
 recipes/mesa/mesa-xlib_7.6.bb                      |   15 +++++++++++
 recipes/mesa/mesa_7.6.bb                           |    2 +
 5 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index f97eeec..171fe89 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -602,6 +602,10 @@ sha256=3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4
 md5=02816f10f30b1dc5e069e0f68c177c98
 sha256=c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897
 
+[ftp://ftp.freedesktop.org/pub/mesa/7.6/MesaDemos-7.6.tar.bz2]
+md5=0ede7adf217951acd90dbe4551210c07
+sha256=2fdf09fd7967fb1946e7f6af07d39c9fb695c373e1bad3855d3c3fbece5badd0
+
 [http://downloads.sourceforge.net/mesa3d/MesaGLUT-7.0.2.tar.bz2]
 md5=3a33f8efc8c58a592a854cfc7a643286
 sha256=fa31ca39f00ff92c7da59d9993d0eefb8d901eb8a519743942e523fde120eb6c
@@ -666,6 +670,10 @@ sha256=a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
 md5=7ecddb341a2691e0dfdb02f697109834
 sha256=6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4
 
+[ftp://ftp.freedesktop.org/pub/mesa/7.6/MesaLib-7.6.tar.bz2]
+md5=8c75f90cd0303cfac9e4b6d54f6759ca
+sha256=782a7b2810b1c466b3a994eba96485b59b47cc1120c0caa24de1aecf1e013830
+
 [http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2805.tar.gz]
 md5=598bb59b86c2c4842eeffb03392fab5b
 sha256=8fd609d1e6b460b5c95ad5612cb823aa863d51360ed55caea987909a9bab50f5
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
index 193ff12..766afe4 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
@@ -233,10 +233,6 @@ PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
 PREFERRED_VERSION_xtrans ?= "1.2.5"
 PREFERRED_VERSION_xtrans-native ?= "1.2.5"
 
-# This should be here but is needed until bitbake can do
-# versioned depends
-PREFERRED_VERSION_mesa ?= "7.4"
-
 # proto
 PREFERRED_VERSION_applewmproto ?= "1.4.1"
 PREFERRED_VERSION_bigreqsproto ?= "1.1.0"
diff --git a/recipes/mesa/mesa-dri_7.6.bb b/recipes/mesa/mesa-dri_7.6.bb
new file mode 100644
index 0000000..168523b
--- /dev/null
+++ b/recipes/mesa/mesa-dri_7.6.bb
@@ -0,0 +1,26 @@
+include mesa-common.inc
+
+PROTO_DEPS = "xf86driproto glproto dri2proto expat"
+LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 \
+          "
+PE = "1"
+PR = "${INC_PR}.0"
+
+# most of our targets do not have DRI so will use mesa-xlib
+DEFAULT_PREFERENCE = "-1"
+
+# ASUS EeePC 901 has DRI support so use mesa-dri by default
+DEFAULT_PREFERENCE_eee901 = "1"
+
+PACKAGES =+ "${PN}-xprogs"
+
+FILES_${PN} += "${libdir}/dri/*.so"
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+
+EXTRA_OECONF += "--disable-gallium --with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
diff --git a/recipes/mesa/mesa-xlib_7.6.bb b/recipes/mesa/mesa-xlib_7.6.bb
new file mode 100644
index 0000000..3085e8d
--- /dev/null
+++ b/recipes/mesa/mesa-xlib_7.6.bb
@@ -0,0 +1,15 @@
+include mesa-common.inc
+
+PROTO_DEPS = "xf86driproto glproto"
+LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 \
+          "
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+EXTRA_OECONF += "--disable-gallium --with-driver=xlib"
diff --git a/recipes/mesa/mesa_7.6.bb b/recipes/mesa/mesa_7.6.bb
new file mode 100644
index 0000000..43cde67
--- /dev/null
+++ b/recipes/mesa/mesa_7.6.bb
@@ -0,0 +1,2 @@
+# This is a dummy package so OE can use the poky mesa files
+require mesa-dri_${PV}.bb