commit: 76eadd4eb864bd27c6916e0246dd93854d1dc742
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 18:52:15 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 18:56:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76eadd4e
x11-apps/mesa-progs: Drop some unnecessary utility code
These are not used by any of the programs we install, and they add
explicit dependence on desktop OpenGL.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/9.0.0-Disable-things-we-don-t-want.patch | 14 +++++++-------
.../files/9999-Disable-things-we-don-t-want.patch | 15 ++++++++-------
2 files changed, 15 insertions(+), 14 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 b2374db36ba4..5b1104e71a13 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,4 +1,4 @@
-From 4fa5131036f8db3186a9f7a9cce74261411c4ed9 Mon Sep 17 00:00:00 2001
+From 0e87b772b5d291ecf2cdc3f209321ea586918375 Mon Sep 17 00:00:00 2001
From: Matt Turner <matts...@gmail.com>
Date: Thu, 18 Apr 2024 13:24:18 -0400
Subject: [PATCH] Disable things we don't want
@@ -9,9 +9,9 @@ Subject: [PATCH] Disable things we don't want
src/egl/opengles2/meson.build | 5 -----
src/meson.build | 2 --
src/util/gl_wrap.h | 2 --
- src/util/meson.build | 7 +------
+ src/util/meson.build | 9 +--------
src/xdemos/meson.build | 36 -----------------------------------
- 7 files changed, 3 insertions(+), 80 deletions(-)
+ 7 files changed, 3 insertions(+), 82 deletions(-)
diff --git a/meson.build b/meson.build
index c1853f94..5424dc73 100644
@@ -125,16 +125,16 @@ index b2ff9c8f..f482df5e 100644
#ifndef GLAPIENTRY
diff --git a/src/util/meson.build b/src/util/meson.build
-index b4fe614f..e56b456e 100644
+index b4fe614f..d2c42dc2 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
-@@ -22,17 +22,12 @@ inc_util = include_directories('.')
+@@ -22,17 +22,10 @@ inc_util = include_directories('.')
files_libutil = files(
'glinfo_common.c',
- 'readtex.c',
- 'showbuffer.c',
- 'trackball.c',
+- 'showbuffer.c',
+- 'trackball.c',
'matrix.c',
)
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 fd00abd227e7..9c352fea35db 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 edef3e745190669dcaedcb6c7798f5bd625254a7 Mon Sep 17 00:00:00 2001
+From b7bced77da267e51eaceeef68a213007ba54aa86 Mon Sep 17 00:00:00 2001
From: Matt Turner <matts...@gmail.com>
Date: Thu, 18 Apr 2024 13:24:18 -0400
Subject: [PATCH] Disable things we don't want
@@ -6,15 +6,16 @@ Subject: [PATCH] Disable things we don't want
v2: Enable libglad to satisfy egl dependencies
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
---
meson.build | 3 ++-
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 | 7 +------
+ src/util/meson.build | 9 +--------
src/xdemos/meson.build | 36 -----------------------------------
- 7 files changed, 3 insertions(+), 87 deletions(-)
+ 7 files changed, 3 insertions(+), 89 deletions(-)
diff --git a/meson.build b/meson.build
index d487a11f..ff360c2e 100644
@@ -134,16 +135,16 @@ index b2ff9c8f..f482df5e 100644
#ifndef GLAPIENTRY
diff --git a/src/util/meson.build b/src/util/meson.build
-index b4fe614f..e56b456e 100644
+index b4fe614f..d2c42dc2 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
-@@ -22,17 +22,12 @@ inc_util = include_directories('.')
+@@ -22,17 +22,10 @@ inc_util = include_directories('.')
files_libutil = files(
'glinfo_common.c',
- 'readtex.c',
- 'showbuffer.c',
- 'trackball.c',
+- 'showbuffer.c',
+- 'trackball.c',
'matrix.c',
)
