[oe-commits] Martin.Jansa : shr/merge: mesa-utils is package for glx*, do_install_append is in mesa-common.inc

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: eaa4bd0928d5ca41359efba51e27f819dc04bc75
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=eaa4bd0928d5ca41359efba51e27f819dc04bc75

Author: Martin.Jansa <Martin.Jansa at gmail.com>
Date:   Fri Oct 16 12:18:05 2009 +0000

shr/merge: mesa-utils is package for glx*, do_install_append is in mesa-common.inc

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 recipes/mesa/freeglut_2.4.0.bb |    2 +-
 recipes/mesa/mesa-dri_git.bb   |   14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/recipes/mesa/freeglut_2.4.0.bb b/recipes/mesa/freeglut_2.4.0.bb
index a244fb2..cfc9ec1 100644
--- a/recipes/mesa/freeglut_2.4.0.bb
+++ b/recipes/mesa/freeglut_2.4.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library. "
 LICENSE = "MIT/X11"
 
-DEPENDS = "mesa"
+DEPENDS = "virtual/libgl"
 
 SRC_URI = "http://dfn.dl.sourceforge.net/sourceforge/freeglut/freeglut-${PV}.tar.gz"
 
diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb
index ab24a05..1676b7c 100644
--- a/recipes/mesa/mesa-dri_git.bb
+++ b/recipes/mesa/mesa-dri_git.bb
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PV = "7.5.1+gitr${SRCREV}"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 PE = "1"
 
 DEFAULT_PREFERENCE = "-1"
@@ -16,19 +16,11 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
 SRC_URI_om-gta02 = "git://git.bitwiz.org.uk/mesa.git;protocol=git;branch=glamo"
 S = "${WORKDIR}/git"
 
-PACKAGES =+ " ${PN}-xprogs "
-
-do_install_append () {
-    install -d ${D}/usr/bin
-    install -m 0755 ${S}/progs/xdemos/glxdemo ${D}/usr/bin/
-    install -m 0755 ${S}/progs/xdemos/glxgears ${D}/usr/bin/
-    install -m 0755 ${S}/progs/xdemos/glxheads ${D}/usr/bin/
-    install -m 0755 ${S}/progs/xdemos/glxinfo ${D}/usr/bin/
-}
+PACKAGES =+ " mesa-utils "
 
 FILES_${PN} += "${libdir}/dri/*.so"
 FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+FILES_mesa-utils = "${bindir}/*"
 
 EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
 EXTRA_OECONF_append_om-gta02 = " --disable-glx-tls --disable-gallium-intel "