From 943f6fdd0bc20060b5e120ad22f80cb8534153fd Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Thu, 28 May 2015 14:14:10 +0300 Subject: mesa: Upgrade 10.5.4 -> 10.5.6 Among other things fixes a bug that prevents Weston from starting on i965. Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_10.5.4.bb | 13 ------------- meta/recipes-graphics/mesa/mesa-gl_10.5.6.bb | 13 +++++++++++++ meta/recipes-graphics/mesa/mesa_10.5.4.bb | 14 -------------- meta/recipes-graphics/mesa/mesa_10.5.6.bb | 14 ++++++++++++++ 4 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_10.5.4.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_10.5.6.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_10.5.4.bb create mode 100644 meta/recipes-graphics/mesa/mesa_10.5.6.bb diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.5.4.bb b/meta/recipes-graphics/mesa/mesa-gl_10.5.4.bb deleted file mode 100644 index fc2bca9982..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_10.5.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -require mesa_${PV}.bb - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.5.6.bb b/meta/recipes-graphics/mesa/mesa-gl_10.5.6.bb new file mode 100644 index 0000000000..fc2bca9982 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_10.5.6.bb @@ -0,0 +1,13 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa_10.5.4.bb b/meta/recipes-graphics/mesa/mesa_10.5.4.bb deleted file mode 100644 index 03c9ecff68..0000000000 --- a/meta/recipes-graphics/mesa/mesa_10.5.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz" - -SRC_URI[md5sum] = "26644437b6447fb3dbae50714a019797" -SRC_URI[sha256sum] = "b51e723f3a20d842c88a92d809435b229fc4744ca0dbec0317d9d4a3ac4c6803" - -#because we cannot rely on the fact that all apps will use pkgconfig, -#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/meta/recipes-graphics/mesa/mesa_10.5.6.bb b/meta/recipes-graphics/mesa/mesa_10.5.6.bb new file mode 100644 index 0000000000..70cc8aa22a --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_10.5.6.bb @@ -0,0 +1,14 @@ +require ${BPN}.inc + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz" + +SRC_URI[md5sum] = "7a845c50fc8aaae4c9373e795c1f491d" +SRC_URI[sha256sum] = "66017853bde5f7a6647db3eede30512a091a3491daa1708e0ad8027c328ba595" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_install_append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then + sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} -- cgit v1.2.3