[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/

["Matt Turner" <mattst88@gentoo.org>]

commit:     78ed12b887ff02fab48a27d5985876db76a4477f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 18:21:38 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed May 15 18:22:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78ed12b8

x11-apps/mesa-progs: Rebase live patch

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../files/9999-Disable-things-we-don-t-want.patch  | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 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 5566a8de45d3..5e0dccb6445b 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 c2e2f995bca3086cfc40b698533e7ec0bba98d85 Mon Sep 17 00:00:00 2001
+From 5736ae25541e414a0e950e8c8bcf80d374f3308d 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
@@ -9,30 +9,22 @@ 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
+v8: Rebase
 ---
- meson.build                   | 15 +++------------
+ meson.build                   | 13 ++-----------
  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, 4 insertions(+), 100 deletions(-)
+ 7 files changed, 3 insertions(+), 99 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index d487a11f..31625a99 100644
+index 8d495ec9..3f5c5c9b 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',
+@@ -55,7 +55,7 @@ dep_drm = dependency('libdrm',
    required : get_option('libdrm'),
    disabler : true
  )
@@ -41,7 +33,7 @@ index d487a11f..31625a99 100644
    required : get_option('x11'),
    disabler : true
  )
-@@ -87,16 +87,7 @@ endif
+@@ -90,16 +90,7 @@ endif
  
  dep_threads = dependency('threads')