mesa: upgrade to 9.2.5
PATCH 1/1 mesa: upgrade to 9.2.5
tested on qemux86, genericx86 for core-image-sato
and core-image-weston.
---
.../mesa/{mesa-gl_9.2.2.bb => mesa-gl_9.2.5.bb} | 0
meta/recipes-graphics/mesa/{mesa_9.2.2.bb => mesa_9.2.5.bb} | 10 ++++++++--
meta/recipes-graphics/mesa/mesa_git.bb | 10 ++++++++--
3 files changed, 16 insertions(+), 4 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-gl_9.2.2.bb => mesa-gl_9.2.5.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_9.2.2.bb => mesa_9.2.5.bb} (38%)meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb renamed from meta/recipes-graphics/mesa/mesa-gl_9.2.2.bb +0 -0
meta/recipes-graphics/mesa/mesa_9.2.5.bb renamed from meta/recipes-graphics/mesa/mesa_9.2.2.bb +8 -2
@@ -5,7 +5,13 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ file://0006-fix-out-of-tree-egl.patch \ " -SRC_URI[md5sum] = "20887f8020db7d1736a01ae9cd5d8c38" -SRC_URI[sha256sum] = "c78a5035233672844cf2492fe82dc10877e12026be227d04469d6ca6ac656a3d" +SRC_URI[md5sum] = "9fb4de29ca1d9cfd03cbdefa123ba336" +SRC_URI[sha256sum] = "b46ab9efed176df0591993397594d712ada9da6a47fd31bbe75050fe28eb6bf0" S = "${WORKDIR}/Mesa-${PV}" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_configure_append() { + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${S}/include/EGL/eglplatform.h +}
meta/recipes-graphics/mesa/mesa_git.bb +8 -2
@@ -5,8 +5,8 @@ DEFAULT_PREFERENCE = "-1" LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf" PR = "${INC_PR}.0" -SRCREV = "8f0742051e8501e737affb392996aef172034ca8" -PV = "9.2.2+git${SRCPV}" +SRCREV = "4636e87191fddd492ed8c61ba61faf4b2d89b2e4" +PV = "9.2.5+git${SRCPV}" SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa \ file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
@@ -14,3 +14,9 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa \ " S = "${WORKDIR}/git" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_configure_append() { + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${S}/include/EGL/eglplatform.h +}
Signature · 1 line
1.8.3.2
Quoted 2 lines · Valentin Popa
tested on qemux86, genericx86 for core-image-sato
and core-image-weston.
Does it resolve
http://lists.openembedded.org/pipermail/openembedded-core/2014-January/088727.html
?
Quoted 69 lines
Signed-off-by Valentin Popa <[email protected]>--- .../mesa/{mesa-gl_9.2.2.bb => mesa-gl_9.2.5.bb} | 0 meta/recipes-graphics/mesa/{mesa_9.2.2.bb => mesa_9.2.5.bb} | 10 ++++++++-- meta/recipes-graphics/mesa/mesa_git.bb | 10 ++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) rename meta/recipes-graphics/mesa/{mesa-gl_9.2.2.bb => mesa-gl_9.2.5.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_9.2.2.bb => mesa_9.2.5.bb} (38%)meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb renamed from meta/recipes-graphics/mesa/mesa-gl_9.2.2.bb +0
-0meta/recipes-graphics/mesa/mesa_9.2.5.bb renamed from meta/recipes-graphics/mesa/mesa_9.2.2.bb +8
-2@@ -5,7 +5,13 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ file://0006-fix-out-of-tree-egl.patch \ " -SRC_URI[md5sum] = "20887f8020db7d1736a01ae9cd5d8c38" -SRC_URI[sha256sum] = "c78a5035233672844cf2492fe82dc10877e12026be227d04469d6ca6ac656a3d" +SRC_URI[md5sum] = "9fb4de29ca1d9cfd03cbdefa123ba336" +SRC_URI[sha256sum] = "b46ab9efed176df0591993397594d712ada9da6a47fd31bbe75050fe28eb6bf0" S = "${WORKDIR}/Mesa-${PV}" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_configure_append() { + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${S}/include/EGL/eglplatform.h +}meta/recipes-graphics/mesa/mesa_git.bb +8
-2@@ -5,8 +5,8 @@ DEFAULT_PREFERENCE = "-1" LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf" PR = "${INC_PR}.0" -SRCREV = "8f0742051e8501e737affb392996aef172034ca8" -PV = "9.2.2+git${SRCPV}" +SRCREV = "4636e87191fddd492ed8c61ba61faf4b2d89b2e4" +PV = "9.2.5+git${SRCPV}" SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa \ file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \@@ -14,3 +14,9 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa \ " S = "${WORKDIR}/git" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_configure_append() { + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${S}/include/EGL/eglplatform.h +}Signature · 6 lines
1.8.3.2 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 7 lines · Martin Jansa
Quoted 2 lines · Valentin Popa
tested on qemux86, genericx86 for core-image-sato
and core-image-weston.Does it resolve
http://lists.openembedded.org/pipermail/openembedded-core/2014-January/088727.html
?
That was certainly the intention of the sed. Not convinced it should happen there though as that will mean if you change DISTRO_FEATURES the old value will remain in the file.
Valentin, can you change the sed to happen in do_install_append()? Ideally we should be considering ${S} to be read-only so that rebuilds work.
Ross