mesa: move mesa-progs from mesa-common.inc to mesa-version.inc

* for mesa-7.9 and newer there are mesa-demos in separate repository
* I'll add recipe for latest mesa-demos later

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

diff --git a/recipes/mesa/mesa-7.2.inc b/recipes/mesa/mesa-7.2.inc
index 88513ab..23cc5ef 100644 (file)
--- a/recipes/mesa/mesa-7.2.inc
+++ b/recipes/mesa/mesa-7.2.inc
@@ -5,3 +5,13 @@ SRC_URI[archive.md5sum] = "04d379292e023df0b0266825cb0dbde5"
 SRC_URI[archive.sha256sum] = "a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2"
 SRC_URI[demos.md5sum] = "22e03dc4038cd63f32c21eb60994892b"
 SRC_URI[demos.sha256sum] = "3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4"
+
+PACKAGES =+ "${PN}-xprogs"
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+
+do_install_append () {
+    install -d ${D}/${bindir}
+    for i in glxdemo glxgears glxheads glxinfo; do
+        install -m 0755 ${S}/progs/xdemos/${i} ${D}/${bindir}
+    done
+}

diff --git a/recipes/mesa/mesa-7.4.inc b/recipes/mesa/mesa-7.4.inc
index 0378eec..d194978 100644 (file)
--- a/recipes/mesa/mesa-7.4.inc
+++ b/recipes/mesa/mesa-7.4.inc
@@ -5,3 +5,13 @@ SRC_URI[archive.md5sum] = "7ecddb341a2691e0dfdb02f697109834"
 SRC_URI[archive.sha256sum] = "6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4"
 SRC_URI[demos.md5sum] = "02816f10f30b1dc5e069e0f68c177c98"
 SRC_URI[demos.sha256sum] = "c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897"
+
+PACKAGES =+ "${PN}-xprogs"
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+
+do_install_append () {
+    install -d ${D}/${bindir}
+    for i in glxdemo glxgears glxheads glxinfo; do
+        install -m 0755 ${S}/progs/xdemos/${i} ${D}/${bindir}
+    done
+}

diff --git a/recipes/mesa/mesa-7.6.inc b/recipes/mesa/mesa-7.6.inc
index 76b41c6..3edac59 100644 (file)
--- a/recipes/mesa/mesa-7.6.inc
+++ b/recipes/mesa/mesa-7.6.inc
@@ -1,6 +1,18 @@
+SRC_URI += "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos"
+
 SRC_URI[archive.md5sum] = "8c75f90cd0303cfac9e4b6d54f6759ca"
 SRC_URI[archive.sha256sum] = "782a7b2810b1c466b3a994eba96485b59b47cc1120c0caa24de1aecf1e013830"
 SRC_URI[demos.md5sum] = "0ede7adf217951acd90dbe4551210c07"
 SRC_URI[demos.sha256sum] = "2fdf09fd7967fb1946e7f6af07d39c9fb695c373e1bad3855d3c3fbece5badd0"
 
+PACKAGES =+ "${PN}-xprogs"
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+
 EXTRA_OECONF += " --disable-gallium"
+
+do_install_append () {
+    install -d ${D}/${bindir}
+    for i in glxdemo glxgears glxheads glxinfo; do
+        install -m 0755 ${S}/progs/xdemos/${i} ${D}/${bindir}
+    done
+}

diff --git a/recipes/mesa/mesa-7.8.2.inc b/recipes/mesa/mesa-7.8.2.inc
index a20e290..cf68779 100644 (file)
--- a/recipes/mesa/mesa-7.8.2.inc
+++ b/recipes/mesa/mesa-7.8.2.inc
@@ -1,4 +1,5 @@
 SRC_URI += " \ 
+            ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \
             file://fix-progs-makefile.patch \
             file://glamo.patch \
            "
@@ -8,6 +9,16 @@ SRC_URI[archive.sha256sum] = "505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d
 SRC_URI[demos.md5sum] = "757d9e2e06f48b1a52848be9b0307ced"
 SRC_URI[demos.sha256sum] = "ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794ab82542f9885ac3c"
 
+PACKAGES =+ "${PN}-xprogs"
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+
 DEFAULT_PREFERENCE_shr = "2"
 
 EXTRA_OECONF += " --disable-gallium"
+
+do_install_append () {
+    install -d ${D}/${bindir}
+    for i in glxdemo glxgears glxheads glxinfo; do
+        install -m 0755 ${S}/progs/xdemos/${i} ${D}/${bindir}
+    done
+}

diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc
index f87575c..3427c76 100644 (file)
--- a/recipes/mesa/mesa-common.inc
+++ b/recipes/mesa/mesa-common.inc
@@ -13,7 +13,6 @@ 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;name=archive \
-           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \
           "
 S = "${WORKDIR}/Mesa-${PV}"
 
@@ -31,9 +30,8 @@ inherit glx-use-tls
 # Package contents vary according to ${MACHINE_DRI_MODULES}.
 PACKAGE_ARCH = "${MACHINE}"
 
-PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev ${PN}-xprogs"
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
 FILES_${PN} += "${libdir}/dri/*.so"
-FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
 FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
 FILES_libgl = "${libdir}/libGL.so.*"
 FILES_libglu = "${libdir}/libGLU.so.*"
@@ -49,10 +47,6 @@ FILES_libegl-dbg += "${libdir}/egl/.debug/*"
 
 NATIVE_INSTALL_WORKS = "1"
 do_install_append () {
-    install -d ${D}/${bindir}
-    for i in glxdemo glxgears glxheads glxinfo; do 
-        install -m 0755 ${S}/progs/xdemos/${i} ${D}/${bindir}
-    done
     install -d ${D}/${includedir}/GL
     cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
 }