Re: [PATCH 4/4] mesa: Upgrade 12.0.3 -> 13.0.1

Andreas Müller
2016-11-16T13:39:36Z

On Wed, Nov 16, 2016 at 2:15 PM, Jussi Kukkonen
<jussi.kukkonen@intel.com> wrote:
> New major release with OpenGL 4.4 support. Dependency on libudev has
> been removed.
>
> Rebase replace_glibc_check_with_linux.patch.
> Add patch to find native wayland-scanner.
>
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> ---
> .../0001-Use-wayland-scanner-in-the-path.patch | 37 ++++++++++++++++++++++
> .../files/replace_glibc_check_with_linux.patch | 25 ++++++++++-----
> .../mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} | 0
> meta/recipes-graphics/mesa/mesa.inc | 2 +-
> .../mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} | 5 +--
> 5 files changed, 58 insertions(+), 11 deletions(-)
> create mode 100644 meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
> rename meta/recipes-graphics/mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} (100%)
> rename meta/recipes-graphics/mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} (75%)
>
> 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
> new file mode 100644
> index 0000000..e49695b
> --- /dev/null
> +++ b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
> @@ -0,0 +1,37 @@
> +From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001
> +From: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +Date: Tue, 15 Nov 2016 15:20:49 +0200
> +Subject: [PATCH] Simplify wayland-scanner lookup
> +
> +Don't use pkg-config to lookup the path of a binary that's in the path.
> +
> +Alternatively we'd have to prefix the path returned by pkg-config with
> +PKG_CONFIG_SYSROOT_DIR.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +---
> + configure.ac | 7 +------
> + 1 file changed, 1 insertion(+), 6 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index e56e35a..a92005a 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])
> + 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])
> +-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
> +
> diff --git a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch
> index e4461ef..0280ee8 100644
> --- a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch
> +++ b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch
> @@ -2,16 +2,25 @@ endianness check is OS wide and not specific to libc
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Upstream-Status: Pending
> -Index: mesa-11.1.1/src/gallium/include/pipe/p_config.h
> -===================================================================
> ---- mesa-11.1.1.orig/src/gallium/include/pipe/p_config.h
> -+++ mesa-11.1.1/src/gallium/include/pipe/p_config.h
> -@@ -130,7 +130,7 @@
> - * Endian detection.
> - */
> +
> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +---
> + src/util/u_endian.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/util/u_endian.h b/src/util/u_endian.h
> +index b9d563d..2d5eab9 100644
> +--- a/src/util/u_endian.h
> ++++ b/src/util/u_endian.h
> +@@ -27,7 +27,7 @@
> + #ifndef U_ENDIAN_H
> + #define U_ENDIAN_H
>
> --#ifdef __GLIBC__
> +-#if defined(__GLIBC__) || defined(ANDROID)
> +#if defined(__linux__)
> #include <endian.h>
>
> #if __BYTE_ORDER == __LITTLE_ENDIAN
> +--
> +2.1.4
> +
> diff --git a/meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb b/meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb
> similarity index 100%
> rename from meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb
> rename to meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb
> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
> index e4880ff..2f5511e 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d
>
> PE = "2"
>
> -DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev"
> +DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native"
>
> PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa"
>
> diff --git a/meta/recipes-graphics/mesa/mesa_12.0.3.bb b/meta/recipes-graphics/mesa/mesa_13.0.1.bb
> similarity index 75%
> rename from meta/recipes-graphics/mesa/mesa_12.0.3.bb
> rename to meta/recipes-graphics/mesa/mesa_13.0.1.bb
> index acc8353..37ac15f 100644
> --- a/meta/recipes-graphics/mesa/mesa_12.0.3.bb
> +++ b/meta/recipes-graphics/mesa/mesa_13.0.1.bb
> @@ -3,10 +3,11 @@ require ${BPN}.inc
> SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/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] = "1113699c714042d8c4df4766be8c57d8"
> -SRC_URI[sha256sum] = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1"
> +SRC_URI[md5sum] = "72b7f4d0c2407f367484abd201cb8276"
> +SRC_URI[sha256sum] = "71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731"
>
> #because we cannot rely on the fact that all apps will use pkgconfig,
> #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> --
> 2.1.4
>
I had already tested mesa 13.0.0 and ran into similar problems as
reported in [1]. So I waited for libdrm which was updated yesterday.
Can you prepare an update for libdrm 2.4.73 too - or shall I take
care?

[1] https://bugs.freedesktop.org/show_bug.cgi?id=98563

Andreas