diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-02-27 22:02:09 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-27 22:02:09 +0000 |
| commit | a87296ad796f00f3bba27339f6efe11b9a384e23 (patch) | |
| tree | 1a47aa193935e1eb80c6ce1c7ececdcf9d44dfb3 /x11-apps/mesa-progs | |
| parent | 724cccb689f2076a398ede6845749926c86ea647 (diff) | |
gentoo auto-resync : 27:02:2023 - 22:02:09
Diffstat (limited to 'x11-apps/mesa-progs')
| -rw-r--r-- | x11-apps/mesa-progs/Manifest | 2 | ||||
| -rw-r--r-- | x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest index 0ef676de1c37..58117457427e 100644 --- a/x11-apps/mesa-progs/Manifest +++ b/x11-apps/mesa-progs/Manifest @@ -1,5 +1,5 @@ AUX 8.5.0-Disable-things-we-don-t-want.patch 5868 BLAKE2B ed8b2e78ce7e05076a74f7ec415afa315db6d6e197936f03a2cb2a322d9ea33e2cdbb15431cc67d26c40ae07045d941fcad357a61eee56e1c26b6b21d1ad0e59 SHA512 8546b12244339fecbf49ce6d1e32701eefaf915d482adecc58c1190cdcf9a918ea7a135988381173c4742bb3b1ba78fcb96285ce6056744f0ed0cb4395855945 -AUX 9999-Disable-things-we-don-t-want.patch 5468 BLAKE2B f1fa7d7edeb81856cb57ddf1eaad100df337011ae5f63a9c14e2e6c3d2eeb085cc48c20926b2a56ecb44b7a160a4078e57f1d83684b77276e4f8096191b6849a SHA512 6e2e4329e6d32b43a058e96d6cec62a41e3d2754b753a72f5e9713d3e8862ac74055e1e9a25062d5ca7f25bde7329339b644b591aa01d69622bfcacb3a3e4b3b +AUX 9999-Disable-things-we-don-t-want.patch 5566 BLAKE2B cdfda3732d7a0998b634d00b073492bb085d93c15af3a448219d2e3cead6224656c7f9200f340361c6ef549eff42e38751b1e5b6db31632854218aa56e6e8724 SHA512 e46f08a3dc8ea24d24cd1eacc7ff5156889457dde4091593951334d3d07d8b3df441b24cc57ad749ac40f7d395cb2d8b2877b2e66bfe9c0721cbd7db84a29cf2 DIST mesa-demos-8.5.0.tar.bz2 10367517 BLAKE2B 60e9edfcfe6d28f73964b81ae4e016fdbeb45d9d6d91de71bf736c86fa6181749f2e12729c8c716f6e6f5d4e39075de131877d1f09c3e511a4338b0f44ddb6a6 SHA512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8 EBUILD mesa-progs-8.5.0.ebuild 1804 BLAKE2B c453575100a78f7b5599698e6eb13b538314e189e892cfef3670e10b9aa6f7de83995046131e7002352176cf1c10b6a05ddd44d5df01d5dc29171ef78ca99d56 SHA512 f388241bbabd38ec926cfa71d12ba8c5d4e494ca3aa33c7f38786df59c8fd870be198096e7e619353ae1e979b379a8a784d84573e8432738172afa7a45df096a EBUILD mesa-progs-9999.ebuild 1802 BLAKE2B f5d8f4d122a13362068a130dc96e737ef2c47a54b14279f3b797a0a06a640530dc4060ee05ee754057cfda161858d63d2b7e6698fdb993da3ffdb15e777ba9ea SHA512 7a2d94de70119c1f77f287e0947c3f9ca5eddfa5c7766dba11f0cadd2c6c28170eacb0dd39b0e0a93e51e9a41c0dcb073717497fcf096039f1837afc57fadbc5 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 e2f12ba51f8a..fd625c5baf89 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 aeb01fb49314017aa70b63531f728e61c983d4b9 Mon Sep 17 00:00:00 2001 +From f687e1297c9a26b219fc8b5a1faa6c1e3d1d6d16 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 @@ -6,36 +6,38 @@ 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 --- - meson.build | 11 +++-------- + meson.build | 13 +++---------- src/egl/opengl/meson.build | 33 -------------------------------- 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(+), 92 deletions(-) + 7 files changed, 4 insertions(+), 94 deletions(-) diff --git a/meson.build b/meson.build -index f93a731d..245d1655 100644 +index 6ad6ea7a..1c46da4f 100644 --- a/meson.build +++ b/meson.build -@@ -81,14 +81,7 @@ endif +@@ -87,16 +87,7 @@ endif dep_threads = dependency('threads') --dep_glu = dependency('glu', required : dep_x11.found()) --if not dep_glu.found() +-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') +- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h', +- required : dep_x11.found()) -endif +dep_glu = disabler() # GBM is needed for EGL on KMS dep_gbm = dependency('gbm', required : false, disabler : true) -@@ -127,6 +120,8 @@ else +@@ -135,6 +126,8 @@ else dep_glut = dependency('', required : false) endif |