Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> --- ...d-missing-dependency-on-generated-he.patch | 38 ------------------- patches/mesa-18.1.1/autogen.sh | 1 - patches/mesa-18.1.1/series | 4 -- rules/mesalib.make | 4 +- 4 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 patches/mesa-18.1.1/0001-egl-autotools-add-missing-dependency-on-generated-he.patch delete mode 120000 patches/mesa-18.1.1/autogen.sh delete mode 100644 patches/mesa-18.1.1/series
diff --git a/patches/mesa-18.1.1/0001-egl-autotools-add-missing-dependency-on-generated-he.patch b/patches/mesa-18.1.1/0001-egl-autotools-add-missing-dependency-on-generated-he.patch deleted file mode 100644 index 3bb76068130e..000000000000 --- a/patches/mesa-18.1.1/0001-egl-autotools-add-missing-dependency-on-generated-he.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Philipp Zabel <p.za...@pengutronix.de> -Date: Fri, 25 May 2018 09:13:44 +0200 -Subject: [PATCH] egl: autotools: add missing dependency on generated header - -platform_wayland.c includes linux-dmabuf-unstable-v1-client-protocol.h, -which is generated during build. Add the missing dependency to the -Makefile. - -I have seen the following build failure due to a race between generation -of linux-dmabuf-unstable-v1-client-protocol.h and compilation of -platform_wayland.cc: - - GEN drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h - GEN drivers/dri2/linux-dmabuf-unstable-v1-protocol.c -Using "code" is deprecated - use private-code or public-code. -See the help page for details. - CC drivers/dri2/platform_wayland.lo -../../../Mesa-18.1.0/src/egl/drivers/dri2/platform_wayland.c: In function 'create_wl_buffer': -../../../Mesa-18.1.0/src/egl/drivers/dri2/platform_wayland.c:810:16: error: implicit declaration of function 'zwp_linux_dmabuf_v1_create_params' [-Werror=implicit-function-declaration] - -Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> -Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> ---- - src/egl/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am -index 086a4a1e6302..116ed4ebf50a 100644 ---- a/src/egl/Makefile.am -+++ b/src/egl/Makefile.am -@@ -80,6 +80,7 @@ drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h: $(WL_DMABUF_XML) - if HAVE_PLATFORM_WAYLAND - drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h - drivers/dri2/egl_dri2.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h -+drivers/dri2/platform_wayland.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h - - AM_CFLAGS += $(WAYLAND_CLIENT_CFLAGS) - libEGL_common_la_LIBADD += $(WAYLAND_CLIENT_LIBS) diff --git a/patches/mesa-18.1.1/autogen.sh b/patches/mesa-18.1.1/autogen.sh deleted file mode 120000 index 9f8a4cb7ddcb..000000000000 --- a/patches/mesa-18.1.1/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file diff --git a/patches/mesa-18.1.1/series b/patches/mesa-18.1.1/series deleted file mode 100644 index 264310ea7a45..000000000000 --- a/patches/mesa-18.1.1/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-egl-autotools-add-missing-dependency-on-generated-he.patch -# 108fb83950e6b776255c812aca587e3b - git-ptx-patches magic diff --git a/rules/mesalib.make b/rules/mesalib.make index 48c619664536..ff2a92212ecf 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION := 18.1.1 -MESALIB_MD5 := 063468c930ff61d211ece0191874fa95 +MESALIB_VERSION := 18.1.5 +MESALIB_MD5 := 622bd23ca8daa83a62938bd33600a580 MESALIB := mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL := \ -- 2.18.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de
