gentoo auto-resync : 22:04:2024 - 12:05:36

5 files changed, 43 insertions, 20 deletions

diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 5e1f69055dba..856eab21def7 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,9 +1,9 @@
 AUX 8.5.0-Disable-things-we-don-t-want.patch 5868 BLAKE2B ed8b2e78ce7e05076a74f7ec415afa315db6d6e197936f03a2cb2a322d9ea33e2cdbb15431cc67d26c40ae07045d941fcad357a61eee56e1c26b6b21d1ad0e59 SHA512 8546b12244339fecbf49ce6d1e32701eefaf915d482adecc58c1190cdcf9a918ea7a135988381173c4742bb3b1ba78fcb96285ce6056744f0ed0cb4395855945
-AUX 9.0.0-Disable-things-we-don-t-want.patch 5041 BLAKE2B 1ba9db48d675c3dc57327074d0ec48d5968de2b9ab8a50d16af7009897ae0cfdcfcdfed5751f7ceec1fdd0bb687077cbca914caec953a6ea13cf1feaa60f9760 SHA512 ee7ff231520742dd090290837faab3d7d2bdc73b92b47e84daea8e665a745aa18aac9ee905e3e4e84367888aae6d32d17b735777fb9671b93260ffec70d6005f
-AUX 9999-Disable-things-we-don-t-want.patch 5321 BLAKE2B 03a82c7f4d0705ba5b4e86cbbacaa320fcb5d5ec076cc690699c737aebc46634734852717b8a9785f29e6cfa8ab981199db9a0b92813096da79b62d094a86b2e SHA512 bfce315c804637bcb2ab079e07149d876e169419f18cd109f9bf0158e272d8d48002c38565d5327643416a7a5056b5867c392665a1f65f2fd3bd57c1a1bcb7ed
+AUX 9.0.0-Disable-things-we-don-t-want.patch 5278 BLAKE2B fd62af8ac9d08bdf6167d873745f3c436d4c66892a4eae562f0babe25068edd2de8cf21893c856b61dece90a3a0ef3dddea1550d3486f23f1f246143d8391e9d SHA512 8c4248f5363b6d406c3ae1c8448d77bfd0f28a4cf3c58ab1b088f0f2b547774f9ac0c959f6a5d85c3b7aa191b9a3f7370d1ac8a524c7569bb41a18f265644b5e
+AUX 9999-Disable-things-we-don-t-want.patch 5580 BLAKE2B 99de3b214895095cacc2c200517cf7ccd03eca121fdf339f728ef23ef16032f82558a80f9cbdab964c482ff6e27c389b2575779bd23f7eb335bb0296711977f3 SHA512 59b83c62c872f76b2c08235b87add8846b3b8ea9ba1e58fc1d4c461f09153db934e84b23423bd68a7e258ac57b01a67622c66ae45afb331a6b053d157bf5e7a4
 DIST mesa-demos-8.5.0.tar.bz2 10367517 BLAKE2B 60e9edfcfe6d28f73964b81ae4e016fdbeb45d9d6d91de71bf736c86fa6181749f2e12729c8c716f6e6f5d4e39075de131877d1f09c3e511a4338b0f44ddb6a6 SHA512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8
 DIST mesa-demos-9.0.0.tar.xz 14839368 BLAKE2B 426211886344e88616670f0da8c71385e0ab86fd7dab60c7a477b165f33d2f7bd5fd9297f1f67c78e60fed5c98ab8851c1bd4ae92a6b0b486fd158196b109eb0 SHA512 af33ef72a521416e39d93370b2b4ccb768f08084c9e4c0aa62868210d9465c858e5cb8e5d23952295a3073946f609eb8723ee60b39dd9fb6696c4e45aafbb2c1
 EBUILD mesa-progs-8.5.0.ebuild 1803 BLAKE2B 998a7cb2d24b3c86320af4f2be565cf416951898a05afe4dea7a89f05c8aad9767cf3eb1f969a692ffe3a09c1044e725b35346925b16fea6ddaa2ea68087b2ac SHA512 5eac4d8bb3d7041b8f504b73f5e6e463bfee23986c70e2049f10b4a6dc43f2e3e2509eec743c77ed35f3afbe4b56924037c8bf6c46b7438d9044cf4b5affa9ab
-EBUILD mesa-progs-9.0.0.ebuild 2085 BLAKE2B e6e3e8232f4e92e0f2e3f96487f41b37092898270a6165534285145ed98d49e44cbd6ffd78ff4e46c1a6a90a83ee69c27188aed1fdec1757327c3822f80c324d SHA512 7b1d53ba4b85fa9667c175b889e432912d3dcd16069fdd34142c006f6e1b5e4c1341df43293e412263c996973f3d4fa5e7e1fc21d0f1c86d261d3f8067fc8231
-EBUILD mesa-progs-9999.ebuild 2051 BLAKE2B fcfea7243773905fceed9a0e06abddbe6c479decdcf9ccdf75dc1086aa0c42030d2e7dbeedaeab813a7704e9272b6cffbe7dc5456ba4874298676fd6dad3fb9c SHA512 f43747c791e029e007c7ad87c4e84457c71e5dd47b5444bb31f45ffbbff552b5a8456786033321e9859888efa37f334787cd3d4642559658ea899477a27fd322
+EBUILD mesa-progs-9.0.0.ebuild 2129 BLAKE2B f02fd4a537c9079debc242fde541db92bb100f5c144a563dc401a16736a664706af17992ffeab833448084e868abd50ecff50a0e14bb46ee33a7a1bf89efdcf1 SHA512 2d2c90b177fd7f0e52cb31e5d3cc91947dcc7bd90476fcbfc5b123a659c404c8f3d74ac91d1a166fcec7457ba87a6768fa8b2f816fabbfe8574dedb8623bb9bd
+EBUILD mesa-progs-9999.ebuild 2095 BLAKE2B 7ce407fc67808684f05498a72c8ebd6572f431a6c435da221309109bb9e1688d22ab70db5619915e5ab4177409e9e223d53072be5ac9f517cadbaf7e52bf65ed SHA512 874e02458f238b84de3752ad4a523c6f7f7389d7eda98597145788c1b9049496496bdf1b161c194e7be20c262f8a12dd65ce133e924424281155e284bb10d46b
 MISC metadata.xml 332 BLAKE2B e04fff442530a88cc9d5601e87b439c2dacf38443bce413174f0bf5923a490140c7f43d8c1808e6011936e4bd77306d6d7e5be4f18d0cfecdd4841f252714a19 SHA512 c1f234a2663a6c51177ee9dcb7b33a94deed4dde8c13b53018b5bc429efe269faae54ac7693608186d939d9e7e493209a450852f2f68310e41422e31836f71ca
diff --git a/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
index 5b1104e71a13..dcf7fdcc17ac 100644
--- a/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
@@ -1,20 +1,20 @@
-From 0e87b772b5d291ecf2cdc3f209321ea586918375 Mon Sep 17 00:00:00 2001
+From beccb3024fee949bfb7bdfd19225e93a7cb0e906 Mon Sep 17 00:00:00 2001
 From: Matt Turner <mattst88@gmail.com>
 Date: Thu, 18 Apr 2024 13:24:18 -0400
 Subject: [PATCH] Disable things we don't want
 
 ---
- meson.build                   |  3 ++-
+ meson.build                   | 13 ++-----------
  src/egl/opengl/meson.build    | 28 ---------------------------
  src/egl/opengles2/meson.build |  5 -----
  src/meson.build               |  2 --
  src/util/gl_wrap.h            |  2 --
  src/util/meson.build          |  9 +--------
  src/xdemos/meson.build        | 36 -----------------------------------
- 7 files changed, 3 insertions(+), 82 deletions(-)
+ 7 files changed, 3 insertions(+), 92 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index c1853f94..5424dc73 100644
+index c1853f94..d1457a35 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
@@ -26,10 +26,20 @@ index c1853f94..5424dc73 100644
    required : get_option('x11'),
    disabler : true
  )
-@@ -97,6 +97,7 @@ if not dep_glu.found() and host_machine.system() != 'darwin'
-   dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
-     required : dep_x11.found())
- endif
+@@ -87,16 +87,7 @@ endif
+ 
+ dep_threads = dependency('threads')
+ 
+-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',
+-    required : dep_x11.found())
+-endif
 +dep_glu = disabler()
  
  dep_glx = dependency('glx', required: false, disabler : true)
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 9c352fea35db..02855c749e3d 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 b7bced77da267e51eaceeef68a213007ba54aa86 Mon Sep 17 00:00:00 2001
+From 6622a4e4a170d6c784d46638a128068ea5203493 Mon Sep 17 00:00:00 2001
 From: Matt Turner <mattst88@gmail.com>
 Date: Thu, 18 Apr 2024 13:24:18 -0400
 Subject: [PATCH] Disable things we don't want
@@ -7,18 +7,19 @@ v2: Enable libglad to satisfy egl dependencies
 v3: Enable most of libutil to fix undefined references in es2gears
 v4: Disable dmabufshare and remove dep on libXext
 v5: Drop trackball.c and showbuffer.c
+v6: Fix disabling GLU
 ---
- meson.build                   |  3 ++-
+ meson.build                   | 13 ++-----------
  src/egl/opengl/meson.build    | 35 ----------------------------------
  src/egl/opengles2/meson.build |  5 -----
  src/meson.build               |  2 --
  src/util/gl_wrap.h            |  2 --
  src/util/meson.build          |  9 +--------
  src/xdemos/meson.build        | 36 -----------------------------------
- 7 files changed, 3 insertions(+), 89 deletions(-)
+ 7 files changed, 3 insertions(+), 99 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index d487a11f..ff360c2e 100644
+index d487a11f..4cd6abf7 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
@@ -30,10 +31,20 @@ index d487a11f..ff360c2e 100644
    required : get_option('x11'),
    disabler : true
  )
-@@ -97,6 +97,7 @@ if not dep_glu.found() and host_machine.system() != 'darwin'
-   dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
-     required : dep_x11.found())
- endif
+@@ -87,16 +87,7 @@ endif
+ 
+ dep_threads = dependency('threads')
+ 
+-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',
+-    required : dep_x11.found())
+-endif
 +dep_glu = disabler()
  
  dep_glx = dependency('glx', required: false, disabler : true)
diff --git a/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild b/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
index 273d964dbbc7..78556231c06d 100644
--- a/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
@@ -22,6 +22,7 @@ fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="gles2 vulkan wayland X"
+REQUIRED_USE="vulkan? ( || ( X wayland ) )"
 
 RDEPEND="
 	media-libs/libglvnd[${MULTILIB_USEDEP},X?]
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 6b089521e986..087690bcddb1 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -22,6 +22,7 @@ fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="gles2 vulkan wayland X"
+REQUIRED_USE="vulkan? ( || ( X wayland ) )"
 
 RDEPEND="
 	media-libs/libglvnd[${MULTILIB_USEDEP},X?]