| 1 |
commit: 10a4f9686a67378a3c49aa2297091f420b7a5e4c |
| 2 |
Author: Mike Lothian <mike <AT> fireburn <DOT> co <DOT> uk> |
| 3 |
AuthorDate: Sun Aug 28 09:37:15 2022 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 28 17:57:08 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a4f968 |
| 7 |
|
| 8 |
x11-apps/mesa-progs-9999: Update patch |
| 9 |
|
| 10 |
This allows the patch to apply cleanly |
| 11 |
|
| 12 |
Signed-off-by: Mike Lothian <mike <AT> fireburn.co.uk> |
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/9999-Disable-things-we-don-t-want.patch | 28 +++++++++++----------- |
| 16 |
1 file changed, 14 insertions(+), 14 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index 9d923a9cbc5c..ec3219ae6ce3 100644 |
| 20 |
--- a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch |
| 21 |
+++ b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch |
| 22 |
@@ -1,21 +1,21 @@ |
| 23 |
-From caa6f31f1032f21756ab327429702feb4381045e Mon Sep 17 00:00:00 2001 |
| 24 |
+From e23cb684ce6ca066c73b426d9974a7c823891d88 Mon Sep 17 00:00:00 2001 |
| 25 |
From: Matt Turner <mattst88@×××××.com> |
| 26 |
-Date: Mon, 30 May 2022 12:16:24 -0400 |
| 27 |
+Date: Sun, 28 Aug 2022 10:34:42 +0100 |
| 28 |
Subject: [PATCH] Disable things we don't want |
| 29 |
|
| 30 |
--- |
| 31 |
meson.build | 11 +++-------- |
| 32 |
- src/egl/opengl/meson.build | 29 ---------------------------- |
| 33 |
+ src/egl/opengl/meson.build | 26 ------------------------- |
| 34 |
src/egl/opengles2/meson.build | 5 ----- |
| 35 |
src/glad/meson.build | 17 ----------------- |
| 36 |
src/meson.build | 2 -- |
| 37 |
src/util/gl_wrap.h | 2 -- |
| 38 |
src/util/meson.build | 20 ------------------- |
| 39 |
src/xdemos/meson.build | 36 ----------------------------------- |
| 40 |
- 8 files changed, 3 insertions(+), 119 deletions(-) |
| 41 |
+ 8 files changed, 3 insertions(+), 116 deletions(-) |
| 42 |
|
| 43 |
diff --git a/meson.build b/meson.build |
| 44 |
-index e1968fab..9d59c1ec 100644 |
| 45 |
+index 0c15274b..36276541 100644 |
| 46 |
--- a/meson.build |
| 47 |
+++ b/meson.build |
| 48 |
@@ -75,14 +75,7 @@ endif |
| 49 |
@@ -44,12 +44,12 @@ index e1968fab..9d59c1ec 100644 |
| 50 |
include_directories: glut_incdir, |
| 51 |
prefix : '#include <GL/freeglut.h>') |
| 52 |
diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build |
| 53 |
-index ba7cadc3..789b25a5 100644 |
| 54 |
+index c0d4792b..f27b6885 100644 |
| 55 |
--- a/src/egl/opengl/meson.build |
| 56 |
+++ b/src/egl/opengl/meson.build |
| 57 |
-@@ -4,41 +4,12 @@ executable( |
| 58 |
+@@ -4,32 +4,11 @@ executable( |
| 59 |
'eglgears_x11', files('eglgears.c'), |
| 60 |
- dependencies: [_deps, idep_eglut_x11] |
| 61 |
+ dependencies: [_deps, dep_glu, idep_eglut_x11] |
| 62 |
) |
| 63 |
-executable( |
| 64 |
- 'egltri_x11', files('egltri.c'), |
| 65 |
@@ -63,7 +63,7 @@ index ba7cadc3..789b25a5 100644 |
| 66 |
- 'xeglthreads', files('xeglthreads.c'), |
| 67 |
- dependencies: [_deps, dep_x11] |
| 68 |
-) |
| 69 |
-- |
| 70 |
+ |
| 71 |
executable( |
| 72 |
'eglgears_wayland', files('eglgears.c'), |
| 73 |
dependencies: [_deps, dep_glu, idep_eglut_wayland] |
| 74 |
@@ -77,13 +77,13 @@ index ba7cadc3..789b25a5 100644 |
| 75 |
- 'eglkms', 'eglkms.c', |
| 76 |
- dependencies: [_deps, dep_drm, dep_gbm, dep_egl] |
| 77 |
-) |
| 78 |
-- |
| 79 |
+ |
| 80 |
executable( |
| 81 |
'eglinfo', 'eglinfo.c', |
| 82 |
- dependencies: [dep_egl], |
| 83 |
+@@ -38,8 +17,3 @@ executable( |
| 84 |
install: true |
| 85 |
) |
| 86 |
-- |
| 87 |
+ |
| 88 |
-executable( |
| 89 |
- 'peglgears', 'peglgears.c', |
| 90 |
- dependencies: [dep_gl, dep_glu, dep_egl, dep_m, idep_util] |
| 91 |
@@ -156,7 +156,7 @@ index b2ff9c8f..f482df5e 100644 |
| 92 |
|
| 93 |
#ifndef GLAPIENTRY |
| 94 |
diff --git a/src/util/meson.build b/src/util/meson.build |
| 95 |
-index 9168aecf..066073cc 100644 |
| 96 |
+index 959e2170..066073cc 100644 |
| 97 |
--- a/src/util/meson.build |
| 98 |
+++ b/src/util/meson.build |
| 99 |
@@ -20,26 +20,6 @@ |
| 100 |
@@ -250,5 +250,5 @@ index d6d5d5d5..ce26699f 100644 |
| 101 |
foreach p : thread_progs |
| 102 |
executable( |
| 103 |
-- |
| 104 |
-2.35.1 |
| 105 |
+2.37.2 |
Archives