diff options
Diffstat (limited to 'x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch')
| -rw-r--r-- | x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch | 43 |
1 files changed, 16 insertions, 27 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 b889538a2fc2..417ee5b14185 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 04603e5b169edbbe9a6d7dc6a00906c1382b141a Mon Sep 17 00:00:00 2001 +From fa9eb6da5af8f55c49e4594b490d8af5904835f7 Mon Sep 17 00:00:00 2001 From: Matt Turner <mattst88@gmail.com> Date: Fri, 27 Jan 2023 06:40:05 -0800 Subject: [PATCH] Disable things we don't want @@ -7,16 +7,16 @@ v2: Enable libglad to satisfy egl dependencies v3: Enable most of libutil to fix undefined references in es2gears --- meson.build | 13 +++---------- - src/egl/opengl/meson.build | 33 -------------------------------- + src/egl/opengl/meson.build | 28 --------------------------- 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(+), 94 deletions(-) + 7 files changed, 4 insertions(+), 89 deletions(-) diff --git a/meson.build b/meson.build -index 29e5b41e..93a56b5f 100644 +index bc3278e1..66433403 100644 --- a/meson.build +++ b/meson.build @@ -87,16 +87,7 @@ endif @@ -36,8 +36,8 @@ index 29e5b41e..93a56b5f 100644 +dep_glu = disabler() dep_glx = dependency('glx', required: false, disabler : true) - if not dep_glx.found() and host_machine.system() == 'darwin' -@@ -144,6 +135,8 @@ else + if not dep_glx.found() +@@ -145,6 +136,8 @@ else dep_glut = dependency('', required : false) endif @@ -47,16 +47,16 @@ index 29e5b41e..93a56b5f 100644 dependencies: [dep_glut], prefix : '#include <GL/freeglut.h>') diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build -index a613eb43..1c91ae1b 100644 +index 9bca049c..e7122027 100644 --- a/src/egl/opengl/meson.build +++ b/src/egl/opengl/meson.build -@@ -25,38 +25,12 @@ executable( - dependencies: [_deps, dep_glu, idep_eglut_x11], +@@ -25,27 +25,6 @@ executable( + dependencies: [_deps, dep_glu, idep_eglut], install: true ) -executable( -- 'egltri_x11', files('egltri.c'), -- dependencies: [_deps, dep_glu, idep_eglut_x11], +- 'egltri', files('egltri.c'), +- dependencies: [_deps, dep_glu, idep_eglut], - install: true -) -executable( @@ -69,17 +69,6 @@ index a613eb43..1c91ae1b 100644 - dependencies: [_deps, dep_x11], - install: true -) - - executable( - 'eglgears_wayland', files('eglgears.c'), - dependencies: [_deps, dep_glu, idep_eglut_wayland], - install: true - ) --executable( -- 'egltri_wayland', files('egltri.c'), -- dependencies: [_deps, dep_glu, idep_eglut_wayland], -- install: true --) - -executable( - 'eglkms', 'eglkms.c', @@ -89,7 +78,7 @@ index a613eb43..1c91ae1b 100644 executable( 'eglinfo', 'eglinfo.c', -@@ -64,10 +38,3 @@ executable( +@@ -53,10 +32,3 @@ executable( include_directories: [inc_glad], install: true ) @@ -101,11 +90,11 @@ index a613eb43..1c91ae1b 100644 -) - diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build -index da083cf2..59b35d66 100644 +index 86062cbd..729c0df6 100644 --- a/src/egl/opengles2/meson.build +++ b/src/egl/opengles2/meson.build @@ -29,11 +29,6 @@ executable( - dependencies: [dep_gles2, idep_eglut_x11, idep_util], + dependencies: [dep_gles2, idep_eglut, idep_util], install: true ) -executable( @@ -114,8 +103,8 @@ index da083cf2..59b35d66 100644 - install: true -) executable( - 'es2gears_wayland', files('es2gears.c'), - dependencies: [dep_gles2, idep_eglut_wayland, idep_util], + 'texture_from_pixmap_glesv2', files('texture_from_pixmap_glesv2.c'), + dependencies: [_deps_x11, idep_util], diff --git a/src/meson.build b/src/meson.build index fd4a1673..cea622a6 100644 --- a/src/meson.build |