commit: 0091729d79a09037884984c31c2cb57aea495416
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 17:25:47 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 17:58:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0091729d
x11-apps/mesa-progs: Update disabler patch
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/9999-Disable-things-we-don-t-want.patch | 67 +++++++++++-----------
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 3 +-
2 files changed, 37 insertions(+), 33 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 55483ad5ec23..fd00abd227e7 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,56 +1,59 @@
-From 639005a81abf915e7b6450baacf40ede01121cb7 Mon Sep 17 00:00:00 2001
+From edef3e745190669dcaedcb6c7798f5bd625254a7 Mon Sep 17 00:00:00 2001
From: Matt Turner <matts...@gmail.com>
-Date: Fri, 27 Jan 2023 06:40:05 -0800
+Date: Thu, 18 Apr 2024 13:24:18 -0400
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
---
- meson.build | 13 +++----------
- src/egl/opengl/meson.build | 28 ---------------------------
+ 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/xdemos/meson.build | 36 -----------------------------------
- 7 files changed, 4 insertions(+), 89 deletions(-)
+ 7 files changed, 3 insertions(+), 87 deletions(-)
diff --git a/meson.build b/meson.build
-index 3e39b5a2..6d064ef6 100644
+index d487a11f..ff360c2e 100644
--- a/meson.build
+++ b/meson.build
-@@ -87,16 +87,7 @@ endif
-
- dep_threads = dependency('threads')
-
--dep_glu = dependency('glu', required : false)
--# GLU is part of OpenGL.Framework
--if not dep_glu.found() and host_machine.system() != 'darwin'
-- _glu_name = 'GLU'
-- if host_machine.system() == 'windows'
-- _glu_name = 'glu32'
-- endif
-- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
-- required : dep_x11.found())
--endif
+@@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
+ required : get_option('libdrm'),
+ disabler : true
+ )
+-dep_x11 = dependency('x11, xext',
++dep_x11 = dependency('x11',
+ required : get_option('x11'),
+ disabler : true
+ )
+@@ -97,6 +97,7 @@ if not dep_glu.found() and host_machine.system() != 'darwin'
+ dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
+ required : dep_x11.found())
+ endif
+dep_glu = disabler()
dep_glx = dependency('glx', required: false, disabler : true)
if not dep_glx.found()
-@@ -165,6 +156,8 @@ else
- dep_glut = dependency('', required : false)
- endif
-
-+dep_glut = disabler()
-+
- if dep_glut.found() and (dep_glut.type_name() == 'internal' or
- cc.has_function('glutInitContextProfile',
- dependencies: [dep_glut],
diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
-index 9bca049c..e7122027 100644
+index be536280..e7122027 100644
--- a/src/egl/opengl/meson.build
+++ b/src/egl/opengl/meson.build
-@@ -25,27 +25,6 @@ executable(
+@@ -20,39 +20,11 @@
+
+ _deps = [dep_gl, dep_m, idep_util]
+
+-if target_machine.system() == 'linux'
+- executable(
+- 'dmabufshare', files('dmabufshare.c'),
+- dependencies: [_deps, idep_glad, idep_eglut],
+- install: true
+- )
+-endif
+ executable(
+ 'eglgears', files('eglgears.c'),
dependencies: [_deps, dep_glu, idep_eglut],
install: true
)
@@ -78,7 +81,7 @@ index 9bca049c..e7122027 100644
executable(
'eglinfo', 'eglinfo.c',
-@@ -53,10 +32,3 @@ executable(
+@@ -60,10 +32,3 @@ executable(
include_directories: [inc_glad],
install: true
)
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index c6aec667b2c8..c01564170135 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/9999-Disable-things-we-don-t-want.patch
+ "${FILESDIR}"/${PV}-Disable-things-we-don-t-want.patch
)
pkg_setup() {
@@ -72,6 +72,7 @@ multilib_src_configure() {
-Degl=enabled
-Dgles1=disabled
$(meson_feature gles2)
+ -Dglut=disabled
-Dosmesa=disabled
$(meson_feature vulkan)
$(meson_feature wayland)
