gentoo auto-resync : 04:03:2023 - 13:38:04

3 files changed, 13 insertions, 13 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 2a69ed19ff42..c63356fa9a0d 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 58117457427e..362478d7d1a0 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 5566 BLAKE2B cdfda3732d7a0998b634d00b073492bb085d93c15af3a448219d2e3cead6224656c7f9200f340361c6ef549eff42e38751b1e5b6db31632854218aa56e6e8724 SHA512 e46f08a3dc8ea24d24cd1eacc7ff5156889457dde4091593951334d3d07d8b3df441b24cc57ad749ac40f7d395cb2d8b2877b2e66bfe9c0721cbd7db84a29cf2
+AUX 9999-Disable-things-we-don-t-want.patch 5609 BLAKE2B ec4c5fb0016334aa7ef2a9e9cddbf12fd4e1308d441ee8ad80a8de78483cfe1417caf6f0ba7201cd3793f9b0829405a5df5976ee96c7a77da45bb4bf33ac7991 SHA512 8fb74720f19f5f72f75e2adc8281cbc3521b15169e9d4ef292d9300747eb30948d658782b70683ce707cb78c853ed877b3f4e87842f8adab8c2196b7011c1813
 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 fd625c5baf89..b889538a2fc2 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 f687e1297c9a26b219fc8b5a1faa6c1e3d1d6d16 Mon Sep 17 00:00:00 2001
+From 04603e5b169edbbe9a6d7dc6a00906c1382b141a 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(+), 94 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 6ad6ea7a..1c46da4f 100644
+index 29e5b41e..93a56b5f 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -87,16 +87,7 @@ endif
@@ -35,9 +35,9 @@ index 6ad6ea7a..1c46da4f 100644
 -endif
 +dep_glu = disabler()
  
- # GBM is needed for EGL on KMS
- dep_gbm = dependency('gbm', required : false, disabler : true)
-@@ -135,6 +126,8 @@ else
+ dep_glx = dependency('glx', required: false, disabler : true)
+ if not dep_glx.found() and host_machine.system() == 'darwin'
+@@ -144,6 +135,8 @@ else
    dep_glut = dependency('', required : false)
  endif
  
@@ -47,7 +47,7 @@ index 6ad6ea7a..1c46da4f 100644
                                          dependencies: [dep_glut],
                                          prefix : '#include <GL/freeglut.h>')
 diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
-index 434adf21..e4b0c83a 100644
+index a613eb43..1c91ae1b 100644
 --- a/src/egl/opengl/meson.build
 +++ b/src/egl/opengl/meson.build
 @@ -25,38 +25,12 @@ executable(
@@ -90,7 +90,7 @@ index 434adf21..e4b0c83a 100644
  executable(
    'eglinfo', 'eglinfo.c',
 @@ -64,10 +38,3 @@ executable(
-   include_directories: [inc_glad, '../../xdemos'],
+   include_directories: [inc_glad],
    install: true
  )
 -
@@ -142,13 +142,13 @@ index b2ff9c8f..f482df5e 100644
  
  #ifndef GLAPIENTRY
 diff --git a/src/util/meson.build b/src/util/meson.build
-index ddcd4834..72e9480d 100644
+index b4fe614f..e56b456e 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
-@@ -21,17 +21,12 @@
- inc_util = include_directories('.')
+@@ -22,17 +22,12 @@ inc_util = include_directories('.')
  
  files_libutil = files(
+   'glinfo_common.c',
 -  'readtex.c',
    'showbuffer.c',
    'trackball.c',
@@ -165,11 +165,11 @@ index ddcd4834..72e9480d 100644
  _libutil = static_library(
    'util',
 diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build
-index d6d5d5d5..ce26699f 100644
+index a569fde5..40007616 100644
 --- a/src/xdemos/meson.build
 +++ b/src/xdemos/meson.build
 @@ -21,25 +21,7 @@
- glx_deps = [dep_gl, dep_x11, dep_m]
+ glx_deps = [dep_gl, dep_glx, dep_x11, dep_m]
  
  progs = [
 -  'glsync',