public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Aaron Bauman" <bman@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/, gui-libs/wlroots/files/
Date: Sun,  8 Dec 2019 18:37:10 +0000 (UTC)	[thread overview]
Message-ID: <1575830222.5cc23f3882c4026d7b1a7d27c9d825bad6cf947b.bman@gentoo> (raw)

commit:     5cc23f3882c4026d7b1a7d27c9d825bad6cf947b
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  8 18:35:42 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 18:37:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc23f38

gui-libs/wlroots: add patch to include EGL/eglmesaext.h

* Patch is currently in upstream master. Expect it to hit on next release
(0.8.2+)

Closes: https://bugs.gentoo.org/700114

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/wlroots-0.8.1-eglmesaextfix.patch        | 25 ++++++++++++++++++++++
 gui-libs/wlroots/wlroots-0.8.1-r1.ebuild           |  3 +++
 2 files changed, 28 insertions(+)

diff --git a/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch b/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch
new file mode 100644
index 00000000000..614d0c7a2cd
--- /dev/null
+++ b/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch
@@ -0,0 +1,25 @@
+From d113e48a2a32542fe6e12f1759f07888364609bf Mon Sep 17 00:00:00 2001
+From: Ferdinand Bachmann <theferdi265@gmail.com>
+Date: Sat, 19 Oct 2019 13:33:22 +0200
+Subject: [PATCH] Add missing include required by mesa and libglvnd change
+
+eglext.h no longer inludes eglmesaext.h, include it within wlroots
+explicitly.
+
+Fixes #1862
+---
+ glgen.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/glgen.sh b/glgen.sh
+index 7324fdf6b..31af28120 100755
+--- a/glgen.sh
++++ b/glgen.sh
+@@ -75,6 +75,7 @@ cat > "$OUTDIR/$BASE.h" << EOF
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <GLES2/gl2.h>
+ #include <GLES2/gl2ext.h>
+ 

diff --git a/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild b/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild
index 50a4262598f..51f138afcfd 100644
--- a/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild
+++ b/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild
@@ -68,6 +68,9 @@ src_configure() {
 		emesonargs+=("-Dlogind=disabled")
 	fi
 
+	# Patch is currently in upstream master
+	eapply "${FILESDIR}/wlroots-0.8.1-eglmesaextfix.patch"
+
 	meson_src_configure
 }
 


             reply	other threads:[~2019-12-08 18:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-08 18:37 Aaron Bauman [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-10-04  1:17 [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/, gui-libs/wlroots/files/ Matthew Thode
2024-06-11  5:56 Arthur Zamarin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1575830222.5cc23f3882c4026d7b1a7d27c9d825bad6cf947b.bman@gentoo \
    --to=bman@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox