gentoo auto-resync : 02:02:2023 - 21:08:25

3 files changed, 22 insertions, 30 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 573724be9df2..a1639bfb4f56 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 afb246ca5141..13cf22f89fc0 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 5406 BLAKE2B 755fa47a1e3dfe7dda38ca06526324f81328035823bddc86717c6e06cc954eee1d11786facca971bc7e96f0f16f04f2449dd9de4a8712d457d1b131684ef4bc2 SHA512 0d200b5cca4c5ba7f3088cdc13cbf517889192345a7b8e7274b9a8a858f0a6113054385d2e6502ecb5df9d5cbcde4f23b734145c3e39b37ea2eae9ca82d79fa6
+AUX 9999-Disable-things-we-don-t-want.patch 5304 BLAKE2B 3e47f2c3d5c337a4e46418dcb97d16b3276261f9cf843ab99646fbac1ba74f0fdae5ff59674d6b08e854eeaaecd042bac0c9ce1029b521cd76e3cea35a09b968 SHA512 316b5d7e9ca3522dac3d1027197b5092efb4f112273229d8a40351cdc2777d4de2afd65ca6a70147429677133addc05b6a84913c70621cead84dfbc3aa039dab
 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 e000a568251ea02ac0abdbdc8102f05b7eee49633699c07dde71d6783d29b656fbda85b80aa60456692dbdb262a077636cc2d95ac80457c14f5ddb60844ed4b4 SHA512 4ce30ae2375e523dcf5ce89340bbd6ed7dd440d590ea8608b4bf5692e2108bda2afbe2730edffebe2a7c33c9befa995d53294ddbf1e5268fbc2a42b131f59a03
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 fe4ced863480..393330b56e6c 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,18 +1,19 @@
-From 0baebcca66eb06aba0831e6596ff5c3245038cae Mon Sep 17 00:00:00 2001
+From 60fbad38f9a394607ac265902fc56c13dd8c9afc 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
 
 v2: Enable libglad to satisfy egl dependencies
+v3: Enable most of libutil to fix undefined references in es2gears
 ---
  meson.build                   | 11 +++--------
  src/egl/opengl/meson.build    | 26 -------------------------
  src/egl/opengles2/meson.build |  5 -----
  src/meson.build               |  2 --
  src/util/gl_wrap.h            |  2 --
- src/util/meson.build          | 21 --------------------
+ src/util/meson.build          |  7 +------
  src/xdemos/meson.build        | 36 -----------------------------------
- 7 files changed, 3 insertions(+), 100 deletions(-)
+ 7 files changed, 4 insertions(+), 85 deletions(-)
 
 diff --git a/meson.build b/meson.build
 index 1fb8eeb1..76f035fb 100644
@@ -44,10 +45,10 @@ index 1fb8eeb1..76f035fb 100644
                                          dependencies: [dep_glut],
                                          prefix : '#include <GL/freeglut.h>')
 diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
-index 22b8d23c..18ec823d 100644
+index 6b7039dc..46e4bec7 100644
 --- a/src/egl/opengl/meson.build
 +++ b/src/egl/opengl/meson.build
-@@ -4,32 +4,11 @@ executable(
+@@ -24,32 +24,11 @@ executable(
    'eglgears_x11', files('eglgears.c'),
    dependencies: [_deps, dep_glu, idep_eglut_x11]
  )
@@ -80,7 +81,7 @@ index 22b8d23c..18ec823d 100644
  
  executable(
    'eglinfo', 'eglinfo.c',
-@@ -38,8 +17,3 @@ executable(
+@@ -58,8 +37,3 @@ executable(
    install: true
  )
  
@@ -90,10 +91,10 @@ index 22b8d23c..18ec823d 100644
 -)
 -
 diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build
-index 9a442988..e912333b 100644
+index de47a69c..9b073a88 100644
 --- a/src/egl/opengles2/meson.build
 +++ b/src/egl/opengles2/meson.build
-@@ -9,11 +9,6 @@ executable(
+@@ -29,11 +29,6 @@ executable(
    dependencies: [dep_gles2, idep_eglut_x11, idep_util],
    install: true
  )
@@ -131,37 +132,28 @@ index b2ff9c8f..f482df5e 100644
  
  #ifndef GLAPIENTRY
 diff --git a/src/util/meson.build b/src/util/meson.build
-index ddcd4834..066073cc 100644
+index ddcd4834..72e9480d 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
-@@ -20,27 +20,6 @@
- 
+@@ -21,17 +21,12 @@
  inc_util = include_directories('.')
  
--files_libutil = files(
+ files_libutil = files(
 -  'readtex.c',
--  'showbuffer.c',
--  'trackball.c',
--  'matrix.c',
--)
--
+   'showbuffer.c',
+   'trackball.c',
+   'matrix.c',
+ )
+ 
 -_deps = [dep_glu, dep_m]
 -if dep_glut.found()
 -  files_libutil += files('shaderutil.c')
 -  _deps += dep_glut
 -endif
--
--_libutil = static_library(
--  'util',
--  files_libutil,
--  include_directories: inc_glad,
--  dependencies: _deps,
--)
--
- idep_util = declare_dependency(
--  link_with: _libutil,
-   include_directories: inc_util,
- )
++_deps = [dep_m]
+ 
+ _libutil = static_library(
+   'util',
 diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build
 index d6d5d5d5..ce26699f 100644
 --- a/src/xdemos/meson.build