diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-11-07 16:35:46 +0000 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2019-11-09 10:34:50 +0000 |
| commit | 4b616ab19af9eb41f614efd3609bab76437e812f (patch) | |
| tree | c3f562207dc25fe2aa3d933f4f5a8f46898c2559 | |
| parent | a6929e9ff3f8e521bd0d2b892c57a50c7e660553 (diff) | |
mutter: Fix build with mesa 19.2.3
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/3.28.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch | 63 |
3 files changed, 70 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index cc00fc5ece448..85208163415b8 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { }) # See patch commit message ./0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch + # Fix build with libglvnd provided headers + ./libglvnd-328.patch ]; configureFlags = [ diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index c8b1ac7e4661e..b39376a30928a 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -60,6 +60,11 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit zenity; }) + # Fix build with libglvnd provided headers + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch"; + sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd"; + }) ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch b/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch new file mode 100644 index 0000000000000..96e2755982886 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch @@ -0,0 +1,63 @@ +diff --git a/cogl/configure.ac b/cogl/configure.ac +index 3be282f..d338cd1 100644 +--- a/cogl/configure.ac ++++ b/cogl/configure.ac +@@ -490,6 +490,11 @@ AS_IF([test "x$enable_gles1" = "xyes"], + #include <EGL/eglext.h>"], + [], + [$COGL_EGL_INCLUDES]) ++ AC_CHECK_HEADERS([EGL/eglmesaext.h], ++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE ++#include <EGL/eglmesaext.h>"], ++ [], ++ [$COGL_EGL_INCLUDES]) + + # Check for a GLES 1.x Common Profile library with/without EGL. + # +@@ -759,7 +764,9 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], + ) + + COGL_EGL_INCLUDES="#include <EGL/egl.h> +-#include <EGL/eglext.h>" ++#include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> ++" + AC_SUBST([COGL_EGL_INCLUDES]) + ]) + +diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h +index 8705e7d..db0b74f 100644 +--- a/src/backends/meta-egl-ext.h ++++ b/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 a/src/backends/meta-egl.c b/src/backends/meta-egl.c +index 755ec49..bd253c9 100644 +--- a/src/backends/meta-egl.c ++++ b/src/backends/meta-egl.c +@@ -31,6 +31,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 a/src/backends/meta-egl.h b/src/backends/meta-egl.h +index 060c7cd..2fef264 100644 +--- a/src/backends/meta-egl.h ++++ b/src/backends/meta-egl.h +@@ -27,6 +27,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 () |