public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/
Date: Mon,  9 Sep 2024 14:26:50 +0000 (UTC)	[thread overview]
Message-ID: <1725891996.c7f02841f9414bc18474f7d88fd4c191daf689e4.mattst88@gentoo> (raw)

commit:     c7f02841f9414bc18474f7d88fd4c191daf689e4
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri Sep  6 05:14:39 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep  9 14:26:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f02841

x11-apps/mesa-progs: rebase the 9999 patch

Closes: https://github.com/gentoo/gentoo/pull/38474
Signed-off-by: orbea <orbea <AT> riseup.net>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
index 5e0dccb6445b..000383a45e6b 100644
--- a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From 5736ae25541e414a0e950e8c8bcf80d374f3308d Mon Sep 17 00:00:00 2001
+From f716f5e654338cac2bdbf7b55efd0eb6648cfd3d Mon Sep 17 00:00:00 2001
 From: Matt Turner <mattst88@gmail.com>
 Date: Thu, 18 Apr 2024 13:24:18 -0400
 Subject: [PATCH] Disable things we don't want
@@ -10,6 +10,7 @@ v5: Drop trackball.c and showbuffer.c
 v6: Fix disabling GLU
 v7: Link against libOpenGL rather than libGL
 v8: Rebase
+v9: Rebase
 ---
  meson.build                   | 13 ++-----------
  src/egl/opengl/meson.build    | 35 ----------------------------------
@@ -107,7 +108,7 @@ index be536280..e7122027 100644
 -)
 -
 diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build
-index 86062cbd..729c0df6 100644
+index abf9eeee..729c0df6 100644
 --- a/src/egl/opengles2/meson.build
 +++ b/src/egl/opengles2/meson.build
 @@ -29,11 +29,6 @@ executable(
@@ -116,7 +117,7 @@ index 86062cbd..729c0df6 100644
  )
 -executable(
 -  'es2tri', files('es2tri.c'),
--  dependencies: [_deps_x11, dep_m],
+-  dependencies: [dep_gles2, idep_eglut, idep_util],
 -  install: true
 -)
  executable(


             reply	other threads:[~2024-09-09 14:26 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-09 14:26 Matt Turner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-02 15:13 [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/ Matt Turner
2024-09-25  3:40 Matt Turner
2024-05-15 18:22 Matt Turner
2024-05-09 23:24 Matt Turner
2024-04-21 17:46 Matt Turner
2024-04-18 18:56 Matt Turner
2023-08-15 14:39 Matt Turner
2023-03-04  7:18 Sam James
2023-02-27 18:44 Matt Turner
2023-02-02 17:11 Matt Turner
2023-02-01 15:59 Matt Turner
2022-08-28 17:57 Matt Turner
2019-03-25 20:29 Matt Turner

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=1725891996.c7f02841f9414bc18474f7d88fd4c191daf689e4.mattst88@gentoo \
    --to=mattst88@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