From 53b58373c7f64fe5b03f1c90b2a0ec75d6c231a5 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Wed, 24 May 2017 17:08:58 +0800 Subject: mesa: 17.0.4 -> 17.0.6 Upgrade mesa from 17.0.4 to 17.0.6. Signed-off-by: Huang Qiyu Signed-off-by: Ross Burton --- meta/recipes-graphics/mesa/mesa-gl_17.0.4.bb | 13 ------------- meta/recipes-graphics/mesa/mesa-gl_17.0.6.bb | 13 +++++++++++++ meta/recipes-graphics/mesa/mesa_17.0.4.bb | 18 ------------------ meta/recipes-graphics/mesa/mesa_17.0.6.bb | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.0.4.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.0.6.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_17.0.4.bb create mode 100644 meta/recipes-graphics/mesa/mesa_17.0.6.bb diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.0.4.bb b/meta/recipes-graphics/mesa/mesa-gl_17.0.4.bb deleted file mode 100644 index e3604f30bb..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_17.0.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.filter('DISTRO_FEATURES', 'x11', d)}" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.0.6.bb b/meta/recipes-graphics/mesa/mesa-gl_17.0.6.bb new file mode 100644 index 0000000000..e3604f30bb --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_17.0.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.filter('DISTRO_FEATURES', 'x11', d)}" + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa_17.0.4.bb b/meta/recipes-graphics/mesa/mesa_17.0.4.bb deleted file mode 100644 index 396076d2a1..0000000000 --- a/meta/recipes-graphics/mesa/mesa_17.0.4.bb +++ /dev/null @@ -1,18 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/mesa-${PV}.tar.xz \ - file://replace_glibc_check_with_linux.patch \ - file://disable-asm-on-non-gcc.patch \ - file://0001-Use-wayland-scanner-in-the-path.patch \ -" - -SRC_URI[md5sum] = "4a16cfc1c6d034cc17314b866eada628" -SRC_URI[sha256sum] = "1269dc8545a193932a0779b2db5bce9be4a5f6813b98c38b93b372be8362a346" - -#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_17.0.6.bb b/meta/recipes-graphics/mesa/mesa_17.0.6.bb new file mode 100644 index 0000000000..3f98271f21 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_17.0.6.bb @@ -0,0 +1,18 @@ +require ${BPN}.inc + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/mesa-${PV}.tar.xz \ + file://replace_glibc_check_with_linux.patch \ + file://disable-asm-on-non-gcc.patch \ + file://0001-Use-wayland-scanner-in-the-path.patch \ +" + +SRC_URI[md5sum] = "77ea38dc0ab899864b06ea2941ac31a4" +SRC_URI[sha256sum] = "89ecf3bcd0f18dcca5aaa42bf36bb52a2df33be89889f94aaaad91f7a504a69d" + +#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 1.2.3-korg