mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
x11-apps/mesa-progs: rebase live patch
Signed-off-by: orbea <orbea@riseup.net> Closes: https://github.com/gentoo/gentoo/pull/38764 Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From f716f5e654338cac2bdbf7b55efd0eb6648cfd3d Mon Sep 17 00:00:00 2001
|
||||
From 46213b2474e3a564a5f6d8b65ecaa428bd87fc7b 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
|
||||
@@ -11,6 +11,7 @@ v6: Fix disabling GLU
|
||||
v7: Link against libOpenGL rather than libGL
|
||||
v8: Rebase
|
||||
v9: Rebase
|
||||
v10: Rebase
|
||||
---
|
||||
meson.build | 13 ++-----------
|
||||
src/egl/opengl/meson.build | 35 ----------------------------------
|
||||
@@ -22,10 +23,10 @@ v9: Rebase
|
||||
7 files changed, 3 insertions(+), 99 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 8d495ec9..3f5c5c9b 100644
|
||||
index 4949c726..7f5ab5e7 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -55,7 +55,7 @@ dep_drm = dependency('libdrm',
|
||||
@@ -60,7 +60,7 @@ dep_drm = dependency('libdrm',
|
||||
required : get_option('libdrm'),
|
||||
disabler : true
|
||||
)
|
||||
@@ -34,7 +35,7 @@ index 8d495ec9..3f5c5c9b 100644
|
||||
required : get_option('x11'),
|
||||
disabler : true
|
||||
)
|
||||
@@ -90,16 +90,7 @@ endif
|
||||
@@ -95,16 +95,7 @@ endif
|
||||
|
||||
dep_threads = dependency('threads')
|
||||
|
||||
@@ -53,7 +54,7 @@ index 8d495ec9..3f5c5c9b 100644
|
||||
dep_glx = dependency('glx', required: false, disabler : true)
|
||||
if not dep_glx.found()
|
||||
diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
|
||||
index be536280..e7122027 100644
|
||||
index 7ebd834f..e7122027 100644
|
||||
--- a/src/egl/opengl/meson.build
|
||||
+++ b/src/egl/opengl/meson.build
|
||||
@@ -20,39 +20,11 @@
|
||||
@@ -84,7 +85,7 @@ index be536280..e7122027 100644
|
||||
-)
|
||||
-executable(
|
||||
- 'xeglthreads', files('xeglthreads.c'),
|
||||
- dependencies: [_deps, dep_x11],
|
||||
- dependencies: [_deps, dep_egl, dep_x11],
|
||||
- install: true
|
||||
-)
|
||||
-
|
||||
|
||||
Reference in New Issue
Block a user