summaryrefslogtreecommitdiff
path: root/x11-apps/mesa-progs
diff options
context:
space:
mode:
Diffstat (limited to 'x11-apps/mesa-progs')
-rw-r--r--x11-apps/mesa-progs/Manifest2
-rw-r--r--x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch22
2 files changed, 8 insertions, 16 deletions
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 221504dadc5a..8e18d79b5895 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,6 +1,6 @@
AUX 8.5.0-Disable-things-we-don-t-want.patch 5868 BLAKE2B ed8b2e78ce7e05076a74f7ec415afa315db6d6e197936f03a2cb2a322d9ea33e2cdbb15431cc67d26c40ae07045d941fcad357a61eee56e1c26b6b21d1ad0e59 SHA512 8546b12244339fecbf49ce6d1e32701eefaf915d482adecc58c1190cdcf9a918ea7a135988381173c4742bb3b1ba78fcb96285ce6056744f0ed0cb4395855945
AUX 9.0.0-Disable-things-we-don-t-want.patch 5612 BLAKE2B 2890a41155cff6c085789fe29330cbe9f4147cfa6adcade4e3bea94729f8c984fcde89d240977ad81502d7c8945258b323df13464ab00e854c73943ef03960df SHA512 3a00e2c00da613978f830f159634b848cb0ceba2a6f9faf6e1f71fb50d8a0a113038f23b3354745fbb586cc250f62b5645019a2b1f57f5a32408e56b61c07b2f
-AUX 9999-Disable-things-we-don-t-want.patch 5960 BLAKE2B fc62fe23cadf60e99beee8de58d0aba18e1370d3333a6ee9366cef5a79321fe0fbcf3d95f0e61b2327b9a72eddb6ae609bb1438891b36b626aef099bb4af17c2 SHA512 05d56e875c2cac70d8faf3e5614ba95bd87f3515712c45000013c54abdbfa281d2b735d18b68ab144176f2c65e60a4b4a2078305e9d8ff8f450be45e6c9f764d
+AUX 9999-Disable-things-we-don-t-want.patch 5636 BLAKE2B a86907f9f094aaef6f6e67b02fac30651d29f50b87ea85593557219f7db44c819f42b08c3a2bed40d1bb467ec3b08a97bd8e2816c72e14213d7fc46b31846622 SHA512 11ddb1a053a6206687337e313d394164bb7c3d882a864cbe22292b09035a589477b30a9c6eba9723d97eeecc49aee470789cde3a3514d4c7cda5237827bf3aa4
DIST mesa-demos-8.5.0.tar.bz2 10367517 BLAKE2B 60e9edfcfe6d28f73964b81ae4e016fdbeb45d9d6d91de71bf736c86fa6181749f2e12729c8c716f6e6f5d4e39075de131877d1f09c3e511a4338b0f44ddb6a6 SHA512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8
DIST mesa-demos-9.0.0.tar.xz 14839368 BLAKE2B 426211886344e88616670f0da8c71385e0ab86fd7dab60c7a477b165f33d2f7bd5fd9297f1f67c78e60fed5c98ab8851c1bd4ae92a6b0b486fd158196b109eb0 SHA512 af33ef72a521416e39d93370b2b4ccb768f08084c9e4c0aa62868210d9465c858e5cb8e5d23952295a3073946f609eb8723ee60b39dd9fb6696c4e45aafbb2c1
EBUILD mesa-progs-8.5.0.ebuild 1803 BLAKE2B 998a7cb2d24b3c86320af4f2be565cf416951898a05afe4dea7a89f05c8aad9767cf3eb1f969a692ffe3a09c1044e725b35346925b16fea6ddaa2ea68087b2ac SHA512 5eac4d8bb3d7041b8f504b73f5e6e463bfee23986c70e2049f10b4a6dc43f2e3e2509eec743c77ed35f3afbe4b56924037c8bf6c46b7438d9044cf4b5affa9ab
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')