gentoo auto-resync : 15:02:2023 - 14:01:08

4 files changed, 60 insertions, 25 deletions

diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 13cf22f89fc0..7fd15bc01e03 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,6 +1,7 @@
 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 5304 BLAKE2B 3e47f2c3d5c337a4e46418dcb97d16b3276261f9cf843ab99646fbac1ba74f0fdae5ff59674d6b08e854eeaaecd042bac0c9ce1029b521cd76e3cea35a09b968 SHA512 316b5d7e9ca3522dac3d1027197b5092efb4f112273229d8a40351cdc2777d4de2afd65ca6a70147429677133addc05b6a84913c70621cead84dfbc3aa039dab
+AUX 9999-Disable-things-we-don-t-want.patch 5468 BLAKE2B f1fa7d7edeb81856cb57ddf1eaad100df337011ae5f63a9c14e2e6c3d2eeb085cc48c20926b2a56ecb44b7a160a4078e57f1d83684b77276e4f8096191b6849a SHA512 6e2e4329e6d32b43a058e96d6cec62a41e3d2754b753a72f5e9713d3e8862ac74055e1e9a25062d5ca7f25bde7329339b644b591aa01d69622bfcacb3a3e4b3b
+AUX 9999-wayland-build.patch 694 BLAKE2B 06d9f6c96a6a92b3a53ea0e06b411752bcc1ab73ec093689b269105634fd2ed268249fd33ce1e7e605f405002b0a40720534fcd154c1a87d69ad6831e3af5c9c SHA512 ad0f7463d05f2dad971bcf14d59ceafedc23e3ffc57a3859976fa65b4163b1bee9d2caf12d8e11a7c0ea76f6decf09f58fc2dc449f4943899ecd0db6036186c3
 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
+EBUILD mesa-progs-9999.ebuild 1842 BLAKE2B 4962536e94bf0329089a7d8056ba2848eb61484c8ec2b5368fd39f6e67d07eb74448a0952f84a9042cf442369287bb7ae20defb1eaba31171ea114345c3541d4 SHA512 1f1a452efddfff7c044f16457c4767e23774b2dff0e7ac506c894f7ea263d1f774ad67d70659699a9d3518702b779c593788d3ac47b8f66754f02d6948d06436
 MISC metadata.xml 407 BLAKE2B a57974ad1e8692dcd29d18592373de51fa793d25760d395f8f67d99d10046f71642d998ea1c1ed8c2b07f2e8cac55c0c4d4b2b3d37ed560e2bf73c22873c24cc SHA512 773c8b796384d95273f0847a6e457d2d19c083f1d0b6a472a1672ff39a6e4cc462b5116cfcb7527a91eb6f398ceea1a0cd26006725e1d9f2f0fd9269f2b45ec3
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 393330b56e6c..e2f12ba51f8a 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 60fbad38f9a394607ac265902fc56c13dd8c9afc Mon Sep 17 00:00:00 2001
+From aeb01fb49314017aa70b63531f728e61c983d4b9 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,19 +7,19 @@ 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/opengl/meson.build    | 33 --------------------------------
  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(+), 85 deletions(-)
+ 7 files changed, 4 insertions(+), 92 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 1fb8eeb1..76f035fb 100644
+index f93a731d..245d1655 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -80,14 +80,7 @@ endif
+@@ -81,14 +81,7 @@ endif
  
  dep_threads = dependency('threads')
  
@@ -35,7 +35,7 @@ index 1fb8eeb1..76f035fb 100644
  
  # GBM is needed for EGL on KMS
  dep_gbm = dependency('gbm', required : false, disabler : true)
-@@ -126,6 +119,8 @@ else
+@@ -127,6 +120,8 @@ else
    dep_glut = dependency('', required : false)
  endif
  
@@ -45,53 +45,61 @@ 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 6b7039dc..46e4bec7 100644
+index 434adf21..e4b0c83a 100644
 --- a/src/egl/opengl/meson.build
 +++ b/src/egl/opengl/meson.build
-@@ -24,32 +24,11 @@ executable(
-   'eglgears_x11', files('eglgears.c'),
-   dependencies: [_deps, dep_glu, idep_eglut_x11]
+@@ -25,38 +25,12 @@ executable(
+   dependencies: [_deps, dep_glu, idep_eglut_x11],
+   install: true
  )
 -executable(
 -  'egltri_x11', files('egltri.c'),
--  dependencies: [_deps, dep_glu, idep_eglut_x11]
+-  dependencies: [_deps, dep_glu, idep_eglut_x11],
+-  install: true
 -)
 -executable(
 -  'xeglgears', files('xeglgears.c'),
--  dependencies: [_deps, dep_glu, dep_egl, dep_x11]
+-  dependencies: [_deps, dep_glu, dep_egl, dep_x11],
+-  install: true
 -)
 -executable(
 -  'xeglthreads', files('xeglthreads.c'),
--  dependencies: [_deps, dep_x11]
+-  dependencies: [_deps, dep_x11],
+-  install: true
 -)
  
  executable(
    'eglgears_wayland', files('eglgears.c'),
-   dependencies: [_deps, dep_glu, idep_eglut_wayland]
+   dependencies: [_deps, dep_glu, idep_eglut_wayland],
+   install: true
  )
 -executable(
 -  'egltri_wayland', files('egltri.c'),
--  dependencies: [_deps, dep_glu, idep_eglut_wayland]
+-  dependencies: [_deps, dep_glu, idep_eglut_wayland],
+-  install: true
 -)
 -
 -executable(
 -  'eglkms', 'eglkms.c',
--  dependencies: [_deps, dep_drm, dep_gbm, dep_egl]
+-  dependencies: [_deps, dep_drm, dep_gbm, dep_egl],
+-  install: true
 -)
  
  executable(
    'eglinfo', 'eglinfo.c',
-@@ -58,8 +37,3 @@ executable(
+@@ -64,10 +38,3 @@ executable(
+   include_directories: [inc_glad, '../../xdemos'],
    install: true
  )
- 
+-
 -executable(
 -  'peglgears', 'peglgears.c',
--  dependencies: [dep_gl, dep_glu, dep_egl, dep_m, idep_util]
+-  dependencies: [dep_gl, dep_glu, dep_egl, dep_m, idep_util],
+-  install: true
 -)
 -
 diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build
-index de47a69c..9b073a88 100644
+index da083cf2..59b35d66 100644
 --- a/src/egl/opengles2/meson.build
 +++ b/src/egl/opengles2/meson.build
 @@ -29,11 +29,6 @@ executable(
@@ -107,10 +115,10 @@ index de47a69c..9b073a88 100644
    'es2gears_wayland', files('es2gears.c'),
    dependencies: [dep_gles2, idep_eglut_wayland, idep_util],
 diff --git a/src/meson.build b/src/meson.build
-index e230057a..198ab59d 100644
+index fd4a1673..cea622a6 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -58,5 +58,3 @@ endif
+@@ -57,5 +57,3 @@ endif
  if host_machine.system() == 'windows'
    subdir('wgl')
  endif
diff --git a/x11-apps/mesa-progs/files/9999-wayland-build.patch b/x11-apps/mesa-progs/files/9999-wayland-build.patch
new file mode 100644
index 000000000000..24af53dbc450
--- /dev/null
+++ b/x11-apps/mesa-progs/files/9999-wayland-build.patch
@@ -0,0 +1,25 @@
+Upstream-PR:
+https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/114
+
+From 84e12c852937c03218e39048d7a2642d27e5d037 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 10 Feb 2023 07:44:54 -0800
+Subject: [PATCH] meson: dep_libdecor is disabled without wayland
+
+---
+ meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index f93a731d..cd3f6048 100644
+--- a/meson.build
++++ b/meson.build
+@@ -77,6 +77,8 @@ if dep_wayland.found()
+     'xdg-shell', 'xdg-shell.xml'
+   )
+   dep_libdecor = dependency('libdecor-0', version : '>= 0.1')
++else
++  dep_libdecor = dependency('', required : false)
+ endif
+ 
+ dep_threads = dependency('threads')
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index cc49098d3e76..50eb10914473 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,6 +42,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/9999-Disable-things-we-don-t-want.patch
+	"${FILESDIR}"/9999-wayland-build.patch
 )
 
 pkg_setup() {