Date: Sunday, October 20, 2019 @ 21:43:39 Author: heftig Revision: 365246
get the build going again after the header change Added: mutter/trunk/fix-build.diff Modified: mutter/trunk/PKGBUILD ----------------+ PKGBUILD | 9 +++++++-- fix-build.diff | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-20 20:30:43 UTC (rev 365245) +++ PKGBUILD 2019-10-20 21:43:39 UTC (rev 365246) @@ -17,8 +17,10 @@ groups=(gnome) install=mutter.install _commit=c0037305ebd9b742f8d133d810192022878efe8e # gnome-3-34 -source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit") -sha256sums=('SKIP') +source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit" + fix-build.diff) +sha256sums=('SKIP' + '28aa24daed161f2566ca2b159beb43285184c533956b851a7eb318de741da935') pkgver() { cd $pkgname @@ -27,6 +29,9 @@ prepare() { cd $pkgname + + # fix build with libglvnd's EGL headers + git apply -3 ../fix-build.diff } build() { Added: fix-build.diff =================================================================== --- fix-build.diff (rev 0) +++ fix-build.diff 2019-10-20 21:43:39 UTC (rev 365246) @@ -0,0 +1,55 @@ + cogl/cogl/meson.build | 2 +- + src/backends/meta-egl-ext.h | 1 + + src/backends/meta-egl.c | 1 + + src/backends/meta-egl.h | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +diff --git c/cogl/cogl/meson.build i/cogl/cogl/meson.build +index 1057ef955..9a642947d 100644 +--- c/cogl/cogl/meson.build ++++ i/cogl/cogl/meson.build +@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file( + built_headers += [cogl_gl_header_h] + + if have_egl +- cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>' ++ cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>' + else + cogl_egl_includes_string = '' + endif +diff --git c/src/backends/meta-egl-ext.h i/src/backends/meta-egl-ext.h +index 8705e7d5b..db0b74f76 100644 +--- c/src/backends/meta-egl-ext.h ++++ i/src/backends/meta-egl-ext.h +@@ -29,6 +29,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + + /* + * This is a little different to the tests shipped with EGL implementations, +diff --git c/src/backends/meta-egl.c i/src/backends/meta-egl.c +index 6554be935..fdeff4f77 100644 +--- c/src/backends/meta-egl.c ++++ i/src/backends/meta-egl.c +@@ -27,6 +27,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + #include <gio/gio.h> + #include <glib.h> + #include <glib-object.h> +diff --git c/src/backends/meta-egl.h i/src/backends/meta-egl.h +index f2a816445..4591e7d85 100644 +--- c/src/backends/meta-egl.h ++++ i/src/backends/meta-egl.h +@@ -28,6 +28,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + #include <glib-object.h> + + #define META_EGL_ERROR meta_egl_error_quark ()