gentoo auto-resync : 14:04:2023 - 05:44:49

5 files changed, 28 insertions, 35 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 38d6ac10e5a8..d4fda9d604f7 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 362478d7d1a0..e699510258da 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,6 +1,6 @@
 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 5609 BLAKE2B ec4c5fb0016334aa7ef2a9e9cddbf12fd4e1308d441ee8ad80a8de78483cfe1417caf6f0ba7201cd3793f9b0829405a5df5976ee96c7a77da45bb4bf33ac7991 SHA512 8fb74720f19f5f72f75e2adc8281cbc3521b15169e9d4ef292d9300747eb30948d658782b70683ce707cb78c853ed877b3f4e87842f8adab8c2196b7011c1813
+AUX 9999-Disable-things-we-don-t-want.patch 5295 BLAKE2B 580c2f43274e4a3285a33dfb82d8532e30e7fa4697b036f4271bba81f83bd17fca4df002d85e10db13e5fee3a22020533f2ae4ec5f67ccf5556984598db68109 SHA512 a46066a421050e4e1d844b7d5394a81df1e9c40fcac6325ac9e40ff0a536233dd21d49335d18e5f2f0bff1148daf011fe771926b0a7f9111ecb8b6ce7173c506
 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
-MISC metadata.xml 407 BLAKE2B a57974ad1e8692dcd29d18592373de51fa793d25760d395f8f67d99d10046f71642d998ea1c1ed8c2b07f2e8cac55c0c4d4b2b3d37ed560e2bf73c22873c24cc SHA512 773c8b796384d95273f0847a6e457d2d19c083f1d0b6a472a1672ff39a6e4cc462b5116cfcb7527a91eb6f398ceea1a0cd26006725e1d9f2f0fd9269f2b45ec3
+EBUILD mesa-progs-9999.ebuild 1904 BLAKE2B fb83349574e55d14aacc678ff29b130ef6a8418c59167109ff5dccf94638dcb8f6f6fe4b6fab0ddb94d40e88b7f2e9ed9cee4d32a21627b4f55b7d874fb6fa4c SHA512 d65fc3d946ae6efa3981f3b0356bbdf353c0528accf349e6bf3dcc364aca010a9de30279b95e470eabc192e814f2a4e26f9b66b079e3c4859b9e1d3542220a52
+MISC metadata.xml 461 BLAKE2B 00afe049ec0f888d14b85c4b1f4878fa8dea5f90af7f53fb1498be23ff0dae525ffb638218888df4ca7232abce40bc0647fb8e252b50c6c36436289c6f5b92b5 SHA512 5546b9625ebe06c5c3af78e0ab600f388e406d81ce5bc18e19ce4570a4545a2581b6bb15c7d73f7b1882ccf41d9129df0e0570b4d02485e9f60bb839aa768443
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 b889538a2fc2..417ee5b14185 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 04603e5b169edbbe9a6d7dc6a00906c1382b141a Mon Sep 17 00:00:00 2001
+From fa9eb6da5af8f55c49e4594b490d8af5904835f7 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
@@ -7,16 +7,16 @@ v2: Enable libglad to satisfy egl dependencies
 v3: Enable most of libutil to fix undefined references in es2gears
 ---
  meson.build                   | 13 +++----------
- src/egl/opengl/meson.build    | 33 --------------------------------
+ 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          |  7 +------
  src/xdemos/meson.build        | 36 -----------------------------------
- 7 files changed, 4 insertions(+), 94 deletions(-)
+ 7 files changed, 4 insertions(+), 89 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 29e5b41e..93a56b5f 100644
+index bc3278e1..66433403 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -87,16 +87,7 @@ endif
@@ -36,8 +36,8 @@ index 29e5b41e..93a56b5f 100644
 +dep_glu = disabler()
  
  dep_glx = dependency('glx', required: false, disabler : true)
- if not dep_glx.found() and host_machine.system() == 'darwin'
-@@ -144,6 +135,8 @@ else
+ if not dep_glx.found()
+@@ -145,6 +136,8 @@ else
    dep_glut = dependency('', required : false)
  endif
  
@@ -47,16 +47,16 @@ index 29e5b41e..93a56b5f 100644
                                          dependencies: [dep_glut],
                                          prefix : '#include <GL/freeglut.h>')
 diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
-index a613eb43..1c91ae1b 100644
+index 9bca049c..e7122027 100644
 --- a/src/egl/opengl/meson.build
 +++ b/src/egl/opengl/meson.build
-@@ -25,38 +25,12 @@ executable(
-   dependencies: [_deps, dep_glu, idep_eglut_x11],
+@@ -25,27 +25,6 @@ executable(
+   dependencies: [_deps, dep_glu, idep_eglut],
    install: true
  )
 -executable(
--  'egltri_x11', files('egltri.c'),
--  dependencies: [_deps, dep_glu, idep_eglut_x11],
+-  'egltri', files('egltri.c'),
+-  dependencies: [_deps, dep_glu, idep_eglut],
 -  install: true
 -)
 -executable(
@@ -69,17 +69,6 @@ index a613eb43..1c91ae1b 100644
 -  dependencies: [_deps, dep_x11],
 -  install: true
 -)
- 
- executable(
-   'eglgears_wayland', files('eglgears.c'),
-   dependencies: [_deps, dep_glu, idep_eglut_wayland],
-   install: true
- )
--executable(
--  'egltri_wayland', files('egltri.c'),
--  dependencies: [_deps, dep_glu, idep_eglut_wayland],
--  install: true
--)
 -
 -executable(
 -  'eglkms', 'eglkms.c',
@@ -89,7 +78,7 @@ index a613eb43..1c91ae1b 100644
  
  executable(
    'eglinfo', 'eglinfo.c',
-@@ -64,10 +38,3 @@ executable(
+@@ -53,10 +32,3 @@ executable(
    include_directories: [inc_glad],
    install: true
  )
@@ -101,11 +90,11 @@ index a613eb43..1c91ae1b 100644
 -)
 -
 diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build
-index da083cf2..59b35d66 100644
+index 86062cbd..729c0df6 100644
 --- a/src/egl/opengles2/meson.build
 +++ b/src/egl/opengles2/meson.build
 @@ -29,11 +29,6 @@ executable(
-   dependencies: [dep_gles2, idep_eglut_x11, idep_util],
+   dependencies: [dep_gles2, idep_eglut, idep_util],
    install: true
  )
 -executable(
@@ -114,8 +103,8 @@ index da083cf2..59b35d66 100644
 -  install: true
 -)
  executable(
-   'es2gears_wayland', files('es2gears.c'),
-   dependencies: [dep_gles2, idep_eglut_wayland, idep_util],
+   'texture_from_pixmap_glesv2', files('texture_from_pixmap_glesv2.c'),
+   dependencies: [_deps_x11, idep_util],
 diff --git a/src/meson.build b/src/meson.build
 index fd4a1673..cea622a6 100644
 --- a/src/meson.build
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index e41db480b343..9c5277ecec57 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -21,10 +21,10 @@ else
 fi
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="gles2 wayland X"
+IUSE="gles2 vulkan wayland X"
 
 RDEPEND="
-	media-libs/mesa[${MULTILIB_USEDEP},egl(+),gles2?,wayland?,X?]
+	media-libs/mesa[${MULTILIB_USEDEP},egl(+),gles2?,vulkan?,wayland?,X?]
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11[${MULTILIB_USEDEP}]
@@ -32,11 +32,13 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
 	wayland? ( >=dev-libs/wayland-protocols-1.12 )
 	X? ( x11-base/xorg-proto )
 "
 BDEPEND="
 	virtual/pkgconfig
+	vulkan? ( dev-util/glslang )
 	wayland? ( dev-util/wayland-scanner )
 "
 
@@ -56,11 +58,11 @@ pkg_setup() {
 
 	use gles2 && use X && MULTILIB_CHOST_TOOLS+=(
 		/usr/bin/es2_info
-		/usr/bin/es2gears_x11
+		/usr/bin/es2gears
 	)
 
-	use gles2 && use wayland && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/es2gears_wayland
+	use vulkan && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkgears
 	)
 }
 
@@ -71,6 +73,7 @@ multilib_src_configure() {
 		-Dgles1=disabled
 		$(meson_feature gles2)
 		-Dosmesa=disabled
+		$(meson_feature vulkan)
 		$(meson_feature wayland)
 		$(meson_feature X x11)
 	)
diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml
index 4f7f34493419..0ec5a5a457cc 100644
--- a/x11-apps/mesa-progs/metadata.xml
+++ b/x11-apps/mesa-progs/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name="gles2">Build OpenGL ES 2 utilities</flag>
+    <flag name="vulkan">Build Vulkan utilities</flag>
   </use>
   <upstream>
     <remote-id type="freedesktop-gitlab">mesa/demos</remote-id>