From c2ceef39735bd8d20cb97df0d6da60d46696057f Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Thu, 12 May 2016 10:20:32 +0300 Subject: mesa: Upgrade 11.1.1 -> 11.2.2 (From OE-Core rev: 112483b52151f0194f247f51d2397f4a1e1a94b7) Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb | 13 ------------- meta/recipes-graphics/mesa/mesa-gl_11.2.2.bb | 13 +++++++++++++ meta/recipes-graphics/mesa/mesa_11.1.1.bb | 16 ---------------- meta/recipes-graphics/mesa/mesa_11.2.2.bb | 16 ++++++++++++++++ 4 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_11.2.2.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_11.1.1.bb create mode 100644 meta/recipes-graphics/mesa/mesa_11.2.2.bb diff --git a/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb b/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb deleted file mode 100644 index f06a3e9b58..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_11.1.1.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 ${MESA_CRYPTO} ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa-gl_11.2.2.bb b/meta/recipes-graphics/mesa/mesa-gl_11.2.2.bb new file mode 100644 index 0000000000..f06a3e9b58 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_11.2.2.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 ${MESA_CRYPTO} ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa_11.1.1.bb b/meta/recipes-graphics/mesa/mesa_11.1.1.bb deleted file mode 100644 index 502afcfd8a..0000000000 --- a/meta/recipes-graphics/mesa/mesa_11.1.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ - file://replace_glibc_check_with_linux.patch \ -" - -SRC_URI[md5sum] = "1043dfb907beecb2a761272455960427" -SRC_URI[sha256sum] = "64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20" - -#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 defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/meta/recipes-graphics/mesa/mesa_11.2.2.bb b/meta/recipes-graphics/mesa/mesa_11.2.2.bb new file mode 100644 index 0000000000..a864b54af8 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_11.2.2.bb @@ -0,0 +1,16 @@ +require ${BPN}.inc + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ + file://replace_glibc_check_with_linux.patch \ +" + +SRC_URI[md5sum] = "e0ec73f7273662a74366f0d76dd19ac3" +SRC_URI[sha256sum] = "40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4" + +#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 defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} -- cgit v1.2.3-54-g00ecf