From fa08267f1399904fed079277bc86ac1aa26c06dc Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Thu, 1 Jun 2017 12:29:45 +0200 Subject: mesa: upgrade to 17.1.1 * Costmetic changes in license.html file required new MD5 hash * Add PACKAGECONFIG option for libunwind support (new feature, disable by default) * Rebased 0001-Use-wayland-scanner-in-the-path.patch * Added zlib in DEPENDS, otherwise mesa no longer builds. * Added 0001-util-rand_xor-add-missing-include-statements.patch, sent upstream Signed-off-by: Nicolas Dechesne Signed-off-by: Ross Burton --- .../0001-Use-wayland-scanner-in-the-path.patch | 12 ++++---- ...l-rand_xor-add-missing-include-statements.patch | 35 ++++++++++++++++++++++ meta/recipes-graphics/mesa/mesa-gl_17.0.6.bb | 13 -------- meta/recipes-graphics/mesa/mesa-gl_17.1.1.bb | 13 ++++++++ meta/recipes-graphics/mesa/mesa.inc | 6 ++-- meta/recipes-graphics/mesa/mesa_17.0.6.bb | 18 ----------- meta/recipes-graphics/mesa/mesa_17.1.1.bb | 19 ++++++++++++ 7 files changed, 77 insertions(+), 39 deletions(-) create mode 100644 meta/recipes-graphics/mesa/files/0001-util-rand_xor-add-missing-include-statements.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.0.6.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.1.1.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_17.0.6.bb create mode 100644 meta/recipes-graphics/mesa/mesa_17.1.1.bb diff --git a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch index e49695bf85..eb6ff4ff04 100644 --- a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch +++ b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch @@ -1,4 +1,4 @@ -From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001 +From c908f0c13ac81a3a52140f129a13b2bc997ff4ee Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 15 Nov 2016 15:20:49 +0200 Subject: [PATCH] Simplify wayland-scanner lookup @@ -15,23 +15,23 @@ Signed-off-by: Jussi Kukkonen 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index e56e35a..a92005a 100644 +index 2c7e636fac..d2b2350739 100644 --- a/configure.ac +++ b/configure.ac -@@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then - AC_MSG_ERROR([cannot build egl state tracker without EGL library]) +@@ -2174,12 +2174,7 @@ if test "x$with_platforms" != xauto; then + with_egl_platforms=$with_platforms fi -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, - WAYLAND_SCANNER='') -if test "x$WAYLAND_SCANNER" = x; then -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) +- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -fi +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) # Do per-EGL platform setups and checks egl_platforms=`IFS=', '; echo $with_egl_platforms` -- -2.1.4 +2.13.0 diff --git a/meta/recipes-graphics/mesa/files/0001-util-rand_xor-add-missing-include-statements.patch b/meta/recipes-graphics/mesa/files/0001-util-rand_xor-add-missing-include-statements.patch new file mode 100644 index 0000000000..ffe8b96163 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-util-rand_xor-add-missing-include-statements.patch @@ -0,0 +1,35 @@ +From a8a1081ec05634e667d6670ab7c128d536cc60a9 Mon Sep 17 00:00:00 2001 +From: Nicolas Dechesne +Date: Thu, 1 Jun 2017 11:59:42 +0200 +Subject: [PATCH] util/rand_xor: add missing include statements + +Fixes for: + +src/util/rand_xor.c:60:13: error: implicit declaration of function 'open' [-Werror=implicit-function-declaration] + int fd = open("/dev/urandom", O_RDONLY); + ^~~~ +src/util/rand_xor.c:60:34: error: 'O_RDONLY' undeclared (first use in this function) + int fd = open("/dev/urandom", O_RDONLY); + ^~~~~~~~ + +Upstream-Status: Submitted [ https://lists.freedesktop.org/archives/mesa-dev/2017-June/157542.html ] +Signed-off-by: Nicolas Dechesne +--- + src/util/rand_xor.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c +index de05fa64b3..de04bbc284 100644 +--- a/src/util/rand_xor.c ++++ b/src/util/rand_xor.c +@@ -25,6 +25,7 @@ + #if defined(__linux__) + #include + #include ++#include + #else + #include + #endif +-- +2.13.0 + diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.0.6.bb b/meta/recipes-graphics/mesa/mesa-gl_17.0.6.bb deleted file mode 100644 index e3604f30bb..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_17.0.6.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.1.1.bb b/meta/recipes-graphics/mesa/mesa-gl_17.1.1.bb new file mode 100644 index 0000000000..e3604f30bb --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_17.1.1.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.inc b/meta/recipes-graphics/mesa/mesa.inc index 447fd6d0df..67039a9962 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -10,11 +10,11 @@ HOMEPAGE = "http://mesa3d.org" BUGTRACKER = "https://bugs.freedesktop.org" SECTION = "x11" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d5" +LIC_FILES_CHKSUM = "file://docs/license.html;md5=725f991a1cc322aa7a0cd3a2016621c4" PE = "2" -DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native" +DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib" PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa" @@ -74,6 +74,8 @@ PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium-osmesa', 'osmesa', d)}" PACKAGECONFIG[osmesa] = "--enable-${OSMESA},--disable-${OSMESA}" +PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" + # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" diff --git a/meta/recipes-graphics/mesa/mesa_17.0.6.bb b/meta/recipes-graphics/mesa/mesa_17.0.6.bb deleted file mode 100644 index 3f98271f21..0000000000 --- a/meta/recipes-graphics/mesa/mesa_17.0.6.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] = "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 -} diff --git a/meta/recipes-graphics/mesa/mesa_17.1.1.bb b/meta/recipes-graphics/mesa/mesa_17.1.1.bb new file mode 100644 index 0000000000..060a279015 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_17.1.1.bb @@ -0,0 +1,19 @@ +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 \ + file://0001-util-rand_xor-add-missing-include-statements.patch \ +" + +SRC_URI[md5sum] = "a4844bc6052578574f9629458bcbb749" +SRC_URI[sha256sum] = "aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef" + +#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