gentoo auto-resync : 15:08:2023 - 21:27:55

3 files changed, 7 insertions, 7 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index c9e18b383855..1e08677e16e3 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 3888ccd2cb05..905282dd1307 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 5295 BLAKE2B 580c2f43274e4a3285a33dfb82d8532e30e7fa4697b036f4271bba81f83bd17fca4df002d85e10db13e5fee3a22020533f2ae4ec5f67ccf5556984598db68109 SHA512 a46066a421050e4e1d844b7d5394a81df1e9c40fcac6325ac9e40ff0a536233dd21d49335d18e5f2f0bff1148daf011fe771926b0a7f9111ecb8b6ce7173c506
+AUX 9999-Disable-things-we-don-t-want.patch 5239 BLAKE2B a58b5726ed42a8ac9466433db5d54503d1ab4c605bf9f7083c35fd704613ba10cbb7c28daa10e40b9a2423cc3f3695cd2ab96f4f338b55f8b46d10f2a851d3fc SHA512 4a8a331bbb8aa1cd3d529d3c97993b3c62f43acf96105f68d2716b6f93d394ddd4c9aef1c582bb6f841803853bca58ef5fd4180d593efa0bf9446f76e2f03601
 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 1904 BLAKE2B fb83349574e55d14aacc678ff29b130ef6a8418c59167109ff5dccf94638dcb8f6f6fe4b6fab0ddb94d40e88b7f2e9ed9cee4d32a21627b4f55b7d874fb6fa4c SHA512 d65fc3d946ae6efa3981f3b0356bbdf353c0528accf349e6bf3dcc364aca010a9de30279b95e470eabc192e814f2a4e26f9b66b079e3c4859b9e1d3542220a52
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 417ee5b14185..55483ad5ec23 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 fa9eb6da5af8f55c49e4594b490d8af5904835f7 Mon Sep 17 00:00:00 2001
+From 639005a81abf915e7b6450baacf40ede01121cb7 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
@@ -16,7 +16,7 @@ v3: Enable most of libutil to fix undefined references in es2gears
  7 files changed, 4 insertions(+), 89 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index bc3278e1..66433403 100644
+index 3e39b5a2..6d064ef6 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -87,16 +87,7 @@ endif
@@ -37,15 +37,15 @@ index bc3278e1..66433403 100644
  
  dep_glx = dependency('glx', required: false, disabler : true)
  if not dep_glx.found()
-@@ -145,6 +136,8 @@ else
+@@ -165,6 +156,8 @@ else
    dep_glut = dependency('', required : false)
  endif
  
 +dep_glut = disabler()
 +
- if dep_glut.found() and cc.has_function('glutInitContextProfile',
-                                         dependencies: [dep_glut],
-                                         prefix : '#include <GL/freeglut.h>')
+ 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
 --- a/src/egl/opengl/meson.build