[JHBuild] Update Mesa to version 17
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Feb 2018 09:12:11 +0000 (09:12 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Feb 2018 09:12:11 +0000 (09:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=182599

Reviewed by Carlos Alberto Lopez Perez.

* gtk/jhbuild.modules: Update Mesa (and its dependencies, hopefully) to version 17.3.3.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@228314 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/gtk/jhbuild.modules
Tools/gtk/patches/weston-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch [deleted file]

index 0efd460..f0aea05 100644 (file)
@@ -1,3 +1,12 @@
+2018-02-09  Philippe Normand  <pnormand@igalia.com>
+
+        [JHBuild] Update Mesa to version 17
+        https://bugs.webkit.org/show_bug.cgi?id=182599
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        * gtk/jhbuild.modules: Update Mesa (and its dependencies, hopefully) to version 17.3.3.
+
 2018-02-08  Chris Dumez  <cdumez@apple.com>
 
         There should be a way to disable [OverrideBuiltins] behavior in a given DOMWrapperWorld
index e7acc28..4c3f79f 100644 (file)
     <dependencies>
       <dep package="pixman"/>
     </dependencies>
-    <branch module="/releases/individual/xserver/xorg-server-1.19.6.tar.bz2" version="1.16.4"
+    <branch module="/releases/individual/xserver/xorg-server-${version}.tar.bz2" version="1.19.6"
             repo="xorg"
             hash="sha256:a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197"
             md5sum="3e47777ff034a331aed2322b078694a8">
              autogen-sh="configure"
              autogenargs="--disable-documentation">
     <pkg-config>wayland-server.pc</pkg-config>
-    <branch module="releases/wayland-1.12.0.tar.xz"
-            version="1.12.0"
+    <branch module="releases/wayland-${version}.tar.xz"
+            version="1.14.0"
             repo="wayland.freedesktop.org"
-            hash="sha256:d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1"/>
+            hash="sha256:ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8"/>
   </autotools>
 
   <autotools id="wayland-protocols"
              autogen-sh="configure">
-    <branch module="releases/wayland-protocols-1.7.tar.xz"
-            version="1.7"
+    <branch module="releases/wayland-protocols-${version}.tar.xz"
+            version="1.12"
            repo="wayland.freedesktop.org"
-           hash="sha256:635f2a937d318f1fecb97b54074ca211486e38af943868dd0fa82ea38d091c1f"/>
+           hash="sha256:3b19e8a9e1e19474756a7069db23b90ca9b8ebb438448c6063b4a7fc89b7c8b2"/>
   </autotools>
 
   <autotools id="weston"
       <dep package="libinput"/>
       <dep package="wayland-protocols"/>
     </dependencies>
-    <branch module="releases/weston-1.12.0.tar.xz"
-            version="1.12.0"
+    <branch module="releases/weston-${version}.tar.xz"
+            version="3.0.0"
             repo="wayland.freedesktop.org"
-            hash="sha256:ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033">
-      <patch file="weston-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch" strip="1"/>
-    </branch>
+            hash="sha256:cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5"/>
   </autotools>
 
   <autotools id="gtk-doc" autogen-sh="configure">
 
   <autotools id="libdrm" autogen-sh="configure">
     <pkg-config>libdrm.pc</pkg-config>
-    <branch module="/libdrm/libdrm-2.4.65.tar.bz2" version="2.4.65"
+    <branch module="/libdrm/libdrm-${version}.tar.bz2" version="2.4.89"
             repo="dri.freedesktop.org"
-            hash="sha256:71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4"/>
+            hash="sha256:629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e"/>
   </autotools>
 
   <autotools id="mesa"
     <!--- WARNING: At jhbuildrc, when we define the path to the Gallium llvmpipe software rasterizer (needed by XvfbDriver),
           we assume that the directory is named "Mesa". So, don't change the checkoutdir name even if you update the version.  -->
     <branch checkoutdir="Mesa"
-            version="11.0.6"
-            module="/archive/older-versions/11.x/${version}/mesa-${version}.tar.xz"
+            version="17.3.3"
+            module="/archive/mesa-${version}.tar.xz"
             repo="mesa.freedesktop.org"
-            hash="sha256:8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760">
+            hash="sha256:41bac5de0ef6adc1f41a1ec0f80c19e361298ce02fa81b5f9ba4fdca33a9379b">
     </branch>
     <dependencies>
       <dep package="llvm"/>
diff --git a/Tools/gtk/patches/weston-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch b/Tools/gtk/patches/weston-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch
deleted file mode 100644 (file)
index b8d815e..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From c950667e87dc175bd2741a51460ebd3e29a57c92 Mon Sep 17 00:00:00 2001
-From: Vincent Abriou <vincent.abriou@st.com>
-Date: Wed, 5 Oct 2016 16:14:07 +0200
-Subject: [PATCH] libweston: include weston-egl-ext.h in drm, x11 and wayland
- compositor
-
-As to what is done for gl-renderer.c, weston-egl-ext.h should be
-include in compositor-drm.c, compositor-x11.c and compositor-wayland.c.
-This fix building issue with GPU that does not have EGL_PLATFORM_xxx_KHR
-in their extension header file eglext.h.
-
-Signed-off-by: Vincent Abriou <vincent.abriou@st.com>
-Reviewed-by: Daniel Stone <daniels@collabora.com>
----
- libweston/compositor-drm.c     | 1 +
- libweston/compositor-wayland.c | 1 +
- libweston/compositor-x11.c     | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
-index 567240f9..f61e3d9c 100644
---- a/libweston/compositor-drm.c
-+++ b/libweston/compositor-drm.c
-@@ -52,6 +52,7 @@
- #include "shared/helpers.h"
- #include "shared/timespec-util.h"
- #include "gl-renderer.h"
-+#include "weston-egl-ext.h"
- #include "pixman-renderer.h"
- #include "libbacklight.h"
- #include "libinput-seat.h"
-diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
-index 580c7b5a..46fdde15 100644
---- a/libweston/compositor-wayland.c
-+++ b/libweston/compositor-wayland.c
-@@ -44,6 +44,7 @@
- #include "compositor.h"
- #include "compositor-wayland.h"
- #include "gl-renderer.h"
-+#include "weston-egl-ext.h"
- #include "pixman-renderer.h"
- #include "shared/helpers.h"
- #include "shared/image-loader.h"
-diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
-index dadcd10f..1c6de084 100644
---- a/libweston/compositor-x11.c
-+++ b/libweston/compositor-x11.c
-@@ -56,6 +56,7 @@
- #include "shared/helpers.h"
- #include "shared/image-loader.h"
- #include "gl-renderer.h"
-+#include "weston-egl-ext.h"
- #include "pixman-renderer.h"
- #include "presentation-time-server-protocol.h"
- #include "linux-dmabuf.h"
--- 
-2.11.0
-