Title: [255920] releases/WebKitGTK/webkit-2.28/Tools
- Revision
- 255920
- Author
- [email protected]
- Date
- 2020-02-06 07:09:38 -0800 (Thu, 06 Feb 2020)
Log Message
Merge r255831 - [GTK] Fix dependencies build
https://bugs.webkit.org/show_bug.cgi?id=207273
Reviewed by Carlos Garcia Campos.
* gtk/jhbuild.modules: Bumped wpebackend-fdo version to 1.4.1 and
added mesa as one of its deps. Added the xserver patch as well.
* gtk/patches/xserver-gl-version.patch: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Tools/ChangeLog (255919 => 255920)
--- releases/WebKitGTK/webkit-2.28/Tools/ChangeLog 2020-02-06 15:09:34 UTC (rev 255919)
+++ releases/WebKitGTK/webkit-2.28/Tools/ChangeLog 2020-02-06 15:09:38 UTC (rev 255920)
@@ -1,3 +1,14 @@
+2020-02-05 Xabier Rodriguez Calvar <[email protected]>
+
+ [GTK] Fix dependencies build
+ https://bugs.webkit.org/show_bug.cgi?id=207273
+
+ Reviewed by Carlos Garcia Campos.
+
+ * gtk/jhbuild.modules: Bumped wpebackend-fdo version to 1.4.1 and
+ added mesa as one of its deps. Added the xserver patch as well.
+ * gtk/patches/xserver-gl-version.patch: Added.
+
2020-02-01 Darin Adler <[email protected]>
Replace RGBA32 typedef with a class to improve type safety
Modified: releases/WebKitGTK/webkit-2.28/Tools/gtk/jhbuild.modules (255919 => 255920)
--- releases/WebKitGTK/webkit-2.28/Tools/gtk/jhbuild.modules 2020-02-06 15:09:34 UTC (rev 255919)
+++ releases/WebKitGTK/webkit-2.28/Tools/gtk/jhbuild.modules 2020-02-06 15:09:38 UTC (rev 255920)
@@ -315,6 +315,7 @@
md5sum="3e47777ff034a331aed2322b078694a8">
<patch file="xserver-remove-bogus-dependencies.patch" strip="1"/>
<patch file="xserver-search-for-DRI-drivers-at-LIBGL_DRIVERS_PATH-environ.patch" strip="1"/>
+ <patch file="xserver-gl-version.patch" strip="1"/> <!-- This patch does not include the meson build fix -->
</branch>
</autotools>
@@ -459,9 +460,10 @@
<dependencies>
<dep package="libwpe"/>
<dep package="glib"/>
+ <dep package="mesa"/>
</dependencies>
- <branch repo="wpewebkit" module="wpebackend-fdo-1.4.0.tar.xz" version="1.4.0"
- hash="sha256:a919ca4a5bc445f9419a5b7f3781cfc98e5abcf5d7259eb1869f5ab20fd18baf"/>
+ <branch repo="wpewebkit" module="wpebackend-fdo-1.4.1.tar.xz" version="1.4.1"
+ hash="sha256:6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d"/>
</cmake>
<!-- Dependencies listed below this point are not thought to affect test results, and are only
Added: releases/WebKitGTK/webkit-2.28/Tools/gtk/patches/xserver-gl-version.patch (0 => 255920)
--- releases/WebKitGTK/webkit-2.28/Tools/gtk/patches/xserver-gl-version.patch (rev 0)
+++ releases/WebKitGTK/webkit-2.28/Tools/gtk/patches/xserver-gl-version.patch 2020-02-06 15:09:38 UTC (rev 255920)
@@ -0,0 +1,48 @@
+From e6ef2b12404dfec7f23592a3524d2a63d9d25802 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <[email protected]>
+Date: Tue, 24 Sep 2019 09:58:43 +0200
+Subject: [PATCH] build: glx: Lower gl version to work with libglvnd
+
+When using mesa with libglvnd support, mesa will no longer install the
+gl, glx, egl pkg-config files but instead let libglvnd provide them.
+libglvnd maintainers decided to change the versioning as it was
+mesa-specific previously. Now the libraries have versions of the API
+they expose[1].
+This causes problems when building the X server:
+
+ checking for glproto >= 1.4.17 gl >= 9.2.0... no
+ configure: error: Package requirements (glproto >= 1.4.17 gl >= 9.2.0) were not met:
+
+ Requested 'gl >= 9.2.0' but version of gl is 1.2
+
+Lower the version requirement to 1.2 to allow building against libglvnd
+provided libraries
+
+[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba
+---
+ configure.ac | 4 ++--
+ glx/meson.build | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 03c2e367c..969090b94 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -760,7 +760,7 @@ LIBDRI="dri >= 7.8.0"
+ LIBDRM="libdrm >= 2.4.89"
+ LIBEGL="egl"
+ LIBGBM="gbm >= 10.2.0"
+-LIBGL="gl >= 7.1.0"
++LIBGL="gl >= 1.2"
+ LIBXEXT="xext >= 1.0.99.4"
+ LIBXFONT="xfont2 >= 2.0.0"
+ LIBXI="xi >= 1.2.99.1"
+@@ -1115,7 +1115,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in
+ yes,yes | auto,yes)
+ AC_DEFINE(DRI2, 1, [Build DRI2 extension])
+ DRI2=yes
+- LIBGL="gl >= 9.2.0"
++ LIBGL="gl >= 1.2"
+ SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"
+ ;;
+ esac
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
