From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 50141138334 for ; Sat, 23 Nov 2019 21:41:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F56BE079E; Sat, 23 Nov 2019 21:41:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 59388E079E for ; Sat, 23 Nov 2019 21:41:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A99234D28A for ; Sat, 23 Nov 2019 21:41:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7DB148B5 for ; Sat, 23 Nov 2019 21:41:44 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1574545280.44dc733c0dc81aeb5f3476f0de495278eb8a449f.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/mutter/files/3.30-eglmesaext-include.patch x11-wm/mutter/files/3.32-eglmesaext-include.patch x11-wm/mutter/mutter-3.30.2-r4.ebuild x11-wm/mutter/mutter-3.32.2.ebuild X-VCS-Directories: x11-wm/mutter/files/ x11-wm/mutter/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 44dc733c0dc81aeb5f3476f0de495278eb8a449f X-VCS-Branch: master Date: Sat, 23 Nov 2019 21:41:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 21d69ed1-1e67-4a81-91cb-cfe02eb52dbf X-Archives-Hash: bf58b03ae04d75598e49152bcc5adfa2 commit: 44dc733c0dc81aeb5f3476f0de495278eb8a449f Author: Matt Turner gentoo org> AuthorDate: Sat Nov 23 19:49:33 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Nov 23 21:41:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44dc733c x11-wm/mutter: Add patch to build with mesa-19.3 Closes: https://bugs.gentoo.org/698736 Signed-off-by: Matt Turner gentoo.org> x11-wm/mutter/files/3.30-eglmesaext-include.patch | 69 +++++++++++++++++++++++ x11-wm/mutter/files/3.32-eglmesaext-include.patch | 68 ++++++++++++++++++++++ x11-wm/mutter/mutter-3.30.2-r4.ebuild | 2 + x11-wm/mutter/mutter-3.32.2.ebuild | 2 + 4 files changed, 141 insertions(+) diff --git a/x11-wm/mutter/files/3.30-eglmesaext-include.patch b/x11-wm/mutter/files/3.30-eglmesaext-include.patch new file mode 100644 index 00000000000..884d57cc6f0 --- /dev/null +++ b/x11-wm/mutter/files/3.30-eglmesaext-include.patch @@ -0,0 +1,69 @@ +From 813ea4e5743920ecf325aac8efe420bd5fe3baf2 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sun, 20 Oct 2019 12:04:31 +0200 +Subject: [PATCH] EGL: Include EGL/eglmesaext.h + +The eglext.h shipped by libglvnd does not include the Mesa extensions, +unlike the header shipped in Mesa. + +Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876 +--- + cogl/configure.ac | 3 ++- + src/backends/meta-egl-ext.h | 1 + + src/backends/meta-egl.c | 1 + + src/backends/meta-egl.h | 1 + + 4 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/cogl/configure.ac b/cogl/configure.ac +index 3be282fc2..f333b0512 100644 +--- a/cogl/configure.ac ++++ b/cogl/configure.ac +@@ -759,7 +759,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], + ) + + COGL_EGL_INCLUDES="#include +-#include " ++#include ++#include " + AC_SUBST([COGL_EGL_INCLUDES]) + ]) + +diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h +index 8705e7d5b..db0b74f76 100644 +--- a/src/backends/meta-egl-ext.h ++++ b/src/backends/meta-egl-ext.h +@@ -29,6 +29,7 @@ + + #include + #include ++#include + + /* + * 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 755ec4908..bd253c956 100644 +--- a/src/backends/meta-egl.c ++++ b/src/backends/meta-egl.c +@@ -31,6 +31,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h +index 060c7cd2d..2fef2642e 100644 +--- a/src/backends/meta-egl.h ++++ b/src/backends/meta-egl.h +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + + #define META_EGL_ERROR meta_egl_error_quark () +-- +2.23.0 + diff --git a/x11-wm/mutter/files/3.32-eglmesaext-include.patch b/x11-wm/mutter/files/3.32-eglmesaext-include.patch new file mode 100644 index 00000000000..c91c56235f3 --- /dev/null +++ b/x11-wm/mutter/files/3.32-eglmesaext-include.patch @@ -0,0 +1,68 @@ +From a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sun, 20 Oct 2019 12:04:31 +0200 +Subject: [PATCH] EGL: Include EGL/eglmesaext.h + +The eglext.h shipped by libglvnd does not include the Mesa extensions, +unlike the header shipped in Mesa. + +Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876 +--- + 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 a/cogl/cogl/meson.build b/cogl/cogl/meson.build +index 261955796..b0e66bff3 100644 +--- a/cogl/cogl/meson.build ++++ b/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 \n#include ' ++ cogl_egl_includes_string = '#include \n#include \n#include ' + else + cogl_egl_includes_string = '' + endif +diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h +index 8705e7d5b..db0b74f76 100644 +--- a/src/backends/meta-egl-ext.h ++++ b/src/backends/meta-egl-ext.h +@@ -29,6 +29,7 @@ + + #include + #include ++#include + + /* + * 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 6554be935..fdeff4f77 100644 +--- a/src/backends/meta-egl.c ++++ b/src/backends/meta-egl.c +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h +index f2a816445..4591e7d85 100644 +--- a/src/backends/meta-egl.h ++++ b/src/backends/meta-egl.h +@@ -28,6 +28,7 @@ + + #include + #include ++#include + #include + + #define META_EGL_ERROR meta_egl_error_quark () +-- +2.22.0 + diff --git a/x11-wm/mutter/mutter-3.30.2-r4.ebuild b/x11-wm/mutter/mutter-3.30.2-r4.ebuild index 8f07d9a2c97..79b230df1ed 100644 --- a/x11-wm/mutter/mutter-3.30.2-r4.ebuild +++ b/x11-wm/mutter/mutter-3.30.2-r4.ebuild @@ -88,6 +88,8 @@ PATCHES=( "${WORKDIR}"/patches/ # Hack to not fail USE="-wayland,-gles2" builds with no mesa[gles2] "${FILESDIR}"/3.28.3-no-gles2-fix.patch # requires eautoreconf + + "${FILESDIR}"/3.30-eglmesaext-include.patch ) src_prepare() { diff --git a/x11-wm/mutter/mutter-3.32.2.ebuild b/x11-wm/mutter/mutter-3.32.2.ebuild index 4685bb23716..099d7ded03d 100644 --- a/x11-wm/mutter/mutter-3.32.2.ebuild +++ b/x11-wm/mutter/mutter-3.32.2.ebuild @@ -97,6 +97,8 @@ PATCHES=( "${WORKDIR}"/patches/ # Allow building USE=wayland without cogl-gles2 from USE=gles2 "${FILESDIR}"/${PV}-no-cogl-gles2.patch + + "${FILESDIR}"/3.32-eglmesaext-include.patch ) src_configure() {