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: Thu, 9 May 2024 23:24:35 +0000 (UTC) [thread overview]
Message-ID: <1715297070.a1824d39d36224b9d5673cea1dda8c017dbc79d3.mattst88@gentoo> (raw)
commit: a1824d39d36224b9d5673cea1dda8c017dbc79d3
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu May 9 23:17:45 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu May 9 23:24:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1824d39
x11-apps/mesa-progs: Link against libOpenGL
Closes: https://bugs.gentoo.org/931647
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/9.0.0-Disable-things-we-don-t-want.patch | 17 +++++++++++++----
.../files/9999-Disable-things-we-don-t-want.patch | 18 ++++++++++++++----
2 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
index dcf7fdcc17ac..49a47f92bdc7 100644
--- a/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
@@ -1,22 +1,31 @@
-From beccb3024fee949bfb7bdfd19225e93a7cb0e906 Mon Sep 17 00:00:00 2001
+From 77e41ec954f7e366bf4dccbd9c867ff7ddcca600 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
---
- meson.build | 13 ++-----------
+ meson.build | 15 +++------------
src/egl/opengl/meson.build | 28 ---------------------------
src/egl/opengles2/meson.build | 5 -----
src/meson.build | 2 --
src/util/gl_wrap.h | 2 --
src/util/meson.build | 9 +--------
src/xdemos/meson.build | 36 -----------------------------------
- 7 files changed, 3 insertions(+), 92 deletions(-)
+ 7 files changed, 4 insertions(+), 93 deletions(-)
diff --git a/meson.build b/meson.build
-index c1853f94..d1457a35 100644
+index c1853f94..e3012fb0 100644
--- a/meson.build
+++ b/meson.build
+@@ -39,7 +39,7 @@ add_project_arguments(
+ dep_m = cc.find_library('m', required : false)
+ dep_winmm = cc.find_library('winmm', required : false)
+
+-dep_gl = dependency('gl')
++dep_gl = dependency('opengl')
+
+ dep_epoll = dependency('epoll-shim', required : false)
+ dep_gles1 = dependency('glesv1_cm', required : get_option('gles1'))
@@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
required : get_option('libdrm'),
disabler : true
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 02855c749e3d..5566a8de45d3 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 6622a4e4a170d6c784d46638a128068ea5203493 Mon Sep 17 00:00:00 2001
+From c2e2f995bca3086cfc40b698533e7ec0bba98d85 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
@@ -8,20 +8,30 @@ v3: Enable most of libutil to fix undefined references in es2gears
v4: Disable dmabufshare and remove dep on libXext
v5: Drop trackball.c and showbuffer.c
v6: Fix disabling GLU
+v7: Link against libOpenGL rather than libGL
---
- meson.build | 13 ++-----------
+ meson.build | 15 +++------------
src/egl/opengl/meson.build | 35 ----------------------------------
src/egl/opengles2/meson.build | 5 -----
src/meson.build | 2 --
src/util/gl_wrap.h | 2 --
src/util/meson.build | 9 +--------
src/xdemos/meson.build | 36 -----------------------------------
- 7 files changed, 3 insertions(+), 99 deletions(-)
+ 7 files changed, 4 insertions(+), 100 deletions(-)
diff --git a/meson.build b/meson.build
-index d487a11f..4cd6abf7 100644
+index d487a11f..31625a99 100644
--- a/meson.build
+++ b/meson.build
+@@ -39,7 +39,7 @@ add_project_arguments(
+ dep_m = cc.find_library('m', required : false)
+ dep_winmm = cc.find_library('winmm', required : false)
+
+-dep_gl = dependency('gl')
++dep_gl = dependency('opengl')
+
+ dep_epoll = dependency('epoll-shim', required : false)
+ dep_gles1 = dependency('glesv1_cm', required : get_option('gles1'))
@@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
required : get_option('libdrm'),
disabler : true
next reply other threads:[~2024-05-09 23:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 23:24 Matt Turner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-25 3:40 [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/ Matt Turner
2024-09-09 14:26 Matt Turner
2024-05-15 18:22 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=1715297070.a1824d39d36224b9d5673cea1dda8c017dbc79d3.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