| 1 |
commit: 042a0738bd4e57609c7744d4cf7b58cff46caaab |
| 2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Mon Feb 27 14:50:03 2023 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 27 18:44:04 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042a0738 |
| 7 |
|
| 8 |
x11-apps/mesa-progs: Rebase live patch |
| 9 |
|
| 10 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/29833 |
| 12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/9999-Disable-things-we-don-t-want.patch | 20 +++++++++++--------- |
| 15 |
1 file changed, 11 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index e2f12ba51f8a..fd625c5baf89 100644 |
| 19 |
--- a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch |
| 20 |
+++ b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-From aeb01fb49314017aa70b63531f728e61c983d4b9 Mon Sep 17 00:00:00 2001 |
| 23 |
+From f687e1297c9a26b219fc8b5a1faa6c1e3d1d6d16 Mon Sep 17 00:00:00 2001 |
| 24 |
From: Matt Turner <mattst88@×××××.com> |
| 25 |
Date: Fri, 27 Jan 2023 06:40:05 -0800 |
| 26 |
Subject: [PATCH] Disable things we don't want |
| 27 |
@@ -6,36 +6,38 @@ Subject: [PATCH] Disable things we don't want |
| 28 |
v2: Enable libglad to satisfy egl dependencies |
| 29 |
v3: Enable most of libutil to fix undefined references in es2gears |
| 30 |
--- |
| 31 |
- meson.build | 11 +++-------- |
| 32 |
+ meson.build | 13 +++---------- |
| 33 |
src/egl/opengl/meson.build | 33 -------------------------------- |
| 34 |
src/egl/opengles2/meson.build | 5 ----- |
| 35 |
src/meson.build | 2 -- |
| 36 |
src/util/gl_wrap.h | 2 -- |
| 37 |
src/util/meson.build | 7 +------ |
| 38 |
src/xdemos/meson.build | 36 ----------------------------------- |
| 39 |
- 7 files changed, 4 insertions(+), 92 deletions(-) |
| 40 |
+ 7 files changed, 4 insertions(+), 94 deletions(-) |
| 41 |
|
| 42 |
diff --git a/meson.build b/meson.build |
| 43 |
-index f93a731d..245d1655 100644 |
| 44 |
+index 6ad6ea7a..1c46da4f 100644 |
| 45 |
--- a/meson.build |
| 46 |
+++ b/meson.build |
| 47 |
-@@ -81,14 +81,7 @@ endif |
| 48 |
+@@ -87,16 +87,7 @@ endif |
| 49 |
|
| 50 |
dep_threads = dependency('threads') |
| 51 |
|
| 52 |
--dep_glu = dependency('glu', required : dep_x11.found()) |
| 53 |
--if not dep_glu.found() |
| 54 |
+-dep_glu = dependency('glu', required : false) |
| 55 |
+-# GLU is part of OpenGL.Framework |
| 56 |
+-if not dep_glu.found() and host_machine.system() != 'darwin' |
| 57 |
- _glu_name = 'GLU' |
| 58 |
- if host_machine.system() == 'windows' |
| 59 |
- _glu_name = 'glu32' |
| 60 |
- endif |
| 61 |
-- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') |
| 62 |
+- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h', |
| 63 |
+- required : dep_x11.found()) |
| 64 |
-endif |
| 65 |
+dep_glu = disabler() |
| 66 |
|
| 67 |
# GBM is needed for EGL on KMS |
| 68 |
dep_gbm = dependency('gbm', required : false, disabler : true) |
| 69 |
-@@ -127,6 +120,8 @@ else |
| 70 |
+@@ -135,6 +126,8 @@ else |
| 71 |
dep_glut = dependency('', required : false) |
| 72 |
endif |
Archives