gentoo auto-resync : 28:08:2022 - 22:45:09

3 files changed, 15 insertions, 15 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 422865f96cb4..b0bc963e9543 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 b3f15bdc8494..e3878b3b1cf0 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 5920 BLAKE2B 91a2a1e986d351d1224c28cc03af4128cce698609a0544e28559539ffc166787010a18423ce47e8cf574ddbfedf755e833d32cbe1f76f7d72bac504882f079fc SHA512 1b7a0ed30b2deb472c47408cc51a5733404c655653dfd7e25c15fc17e0f4da04012506c4b1de3fead689fe7315ad202ed55fb5b4ec884a4d0946c5c895377564
+AUX 9999-Disable-things-we-don-t-want.patch 5928 BLAKE2B bad40e19e7779ba38918924b0f379fa8f9e24702eb12784f29d67f2a9c8265146f3d06495dbef604f789306d311c32bc3b33afc2e4aa02fab2edd5d06149bbce SHA512 1f19fbceba6dd2d122c98a4930e569366ddf12ecde7ec47af57f1353fd901d7fcd9169115bd95a08b0a6555cbc8fdb4f55c12513756cb749eab92b44e5965206
 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 9d923a9cbc5c..ec3219ae6ce3 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,21 +1,21 @@
-From caa6f31f1032f21756ab327429702feb4381045e Mon Sep 17 00:00:00 2001
+From e23cb684ce6ca066c73b426d9974a7c823891d88 Mon Sep 17 00:00:00 2001
 From: Matt Turner <mattst88@gmail.com>
-Date: Mon, 30 May 2022 12:16:24 -0400
+Date: Sun, 28 Aug 2022 10:34:42 +0100
 Subject: [PATCH] Disable things we don't want
 
 ---
  meson.build                   | 11 +++--------
- src/egl/opengl/meson.build    | 29 ----------------------------
+ src/egl/opengl/meson.build    | 26 -------------------------
  src/egl/opengles2/meson.build |  5 -----
  src/glad/meson.build          | 17 -----------------
  src/meson.build               |  2 --
  src/util/gl_wrap.h            |  2 --
  src/util/meson.build          | 20 -------------------
  src/xdemos/meson.build        | 36 -----------------------------------
- 8 files changed, 3 insertions(+), 119 deletions(-)
+ 8 files changed, 3 insertions(+), 116 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index e1968fab..9d59c1ec 100644
+index 0c15274b..36276541 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -75,14 +75,7 @@ endif
@@ -44,12 +44,12 @@ index e1968fab..9d59c1ec 100644
                                          include_directories: glut_incdir,
                                          prefix : '#include <GL/freeglut.h>')
 diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
-index ba7cadc3..789b25a5 100644
+index c0d4792b..f27b6885 100644
 --- a/src/egl/opengl/meson.build
 +++ b/src/egl/opengl/meson.build
-@@ -4,41 +4,12 @@ executable(
+@@ -4,32 +4,11 @@ executable(
    'eglgears_x11', files('eglgears.c'),
-   dependencies: [_deps, idep_eglut_x11]
+   dependencies: [_deps, dep_glu, idep_eglut_x11]
  )
 -executable(
 -  'egltri_x11', files('egltri.c'),
@@ -63,7 +63,7 @@ index ba7cadc3..789b25a5 100644
 -  'xeglthreads', files('xeglthreads.c'),
 -  dependencies: [_deps, dep_x11]
 -)
--
+ 
  executable(
    'eglgears_wayland', files('eglgears.c'),
    dependencies: [_deps, dep_glu, idep_eglut_wayland]
@@ -77,13 +77,13 @@ index ba7cadc3..789b25a5 100644
 -  'eglkms', 'eglkms.c',
 -  dependencies: [_deps, dep_drm, dep_gbm, dep_egl]
 -)
--
+ 
  executable(
    'eglinfo', 'eglinfo.c',
-   dependencies: [dep_egl],
+@@ -38,8 +17,3 @@ executable(
    install: true
  )
--
+ 
 -executable(
 -  'peglgears', 'peglgears.c',
 -  dependencies: [dep_gl, dep_glu, dep_egl, dep_m, idep_util]
@@ -156,7 +156,7 @@ index b2ff9c8f..f482df5e 100644
  
  #ifndef GLAPIENTRY
 diff --git a/src/util/meson.build b/src/util/meson.build
-index 9168aecf..066073cc 100644
+index 959e2170..066073cc 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
 @@ -20,26 +20,6 @@
@@ -250,5 +250,5 @@ index d6d5d5d5..ce26699f 100644
  foreach p : thread_progs
    executable(
 -- 
-2.35.1
+2.37.2