summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2018-05-22 17:02:55 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-05-25 20:59:29 +0200
commit3423528b051354ae9df22474803fa71efb8e6e5a (patch)
treebe87efe8ebc10cf0f6380a766cd704e46be84637
parentb183980c39c6a64512673ab7e4c24d33bcb86684 (diff)
downloadptxdist-3423528b051354ae9df22474803fa71efb8e6e5a.tar.gz
ptxdist-3423528b051354ae9df22474803fa71efb8e6e5a.tar.xz
mesalib: version bump 18.0.0 -> 18.1.0
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/mesa-18.1.0/0001-egl-autotools-add-missing-dependency-on-generated-he.patch38
l---------patches/mesa-18.1.0/autogen.sh1
-rw-r--r--patches/mesa-18.1.0/series4
-rw-r--r--rules/mesalib.make6
4 files changed, 47 insertions, 2 deletions
diff --git a/patches/mesa-18.1.0/0001-egl-autotools-add-missing-dependency-on-generated-he.patch b/patches/mesa-18.1.0/0001-egl-autotools-add-missing-dependency-on-generated-he.patch
new file mode 100644
index 000000000..3bb760681
--- /dev/null
+++ b/patches/mesa-18.1.0/0001-egl-autotools-add-missing-dependency-on-generated-he.patch
@@ -0,0 +1,38 @@
+From: Philipp Zabel <p.zabel@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.zabel@pengutronix.de>
+Signed-off-by: Michael Olbrich <m.olbrich@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.0/autogen.sh b/patches/mesa-18.1.0/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/mesa-18.1.0/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh \ No newline at end of file
diff --git a/patches/mesa-18.1.0/series b/patches/mesa-18.1.0/series
new file mode 100644
index 000000000..264310ea7
--- /dev/null
+++ b/patches/mesa-18.1.0/series
@@ -0,0 +1,4 @@
+# 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 7f2238883..7a1ff446b 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
#
# Paths and names
#
-MESALIB_VERSION := 18.0.0
-MESALIB_MD5 := c2a59fc5b56de3e197fa3a6023409e23
+MESALIB_VERSION := 18.1.0
+MESALIB_MD5 := 5f4b0d414f2fcef927e465315eb6aa45
MESALIB := mesa-$(MESALIB_VERSION)
MESALIB_SUFFIX := tar.xz
MESALIB_URL := \
@@ -116,6 +116,7 @@ MESALIB_CONF_OPT := \
--disable-nine \
--disable-xvmc \
--disable-vdpau \
+ --disable-omx-tizonia \
--disable-omx-bellagio \
--disable-va \
--disable-opencl \
@@ -143,6 +144,7 @@ MESALIB_CONF_OPT := \
--with-xvmc-libdir=/usr/lib \
--with-vdpau-libdir=/usr/lib/vdpau \
--with-omx-bellagio-libdir=/usr/lib/dri \
+ --with-omx-tizonia-libdir=/usr/lib/dri \
--with-va-libdir=/usr/lib/dri \
--with-d3d-libdir=/usr/lib/d3d \
--with-swr-archs=