From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/, x11-apps/mesa-progs/files/
Date: Wed, 15 Feb 2023 08:29:09 +0000 (UTC) [thread overview]
Message-ID: <1676449143.29ece98e6e61cd6049ece9d18c07b693dc3fd1bd.sam@gentoo> (raw)
commit: 29ece98e6e61cd6049ece9d18c07b693dc3fd1bd
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed Feb 15 02:57:32 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 08:19:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29ece98e
x11-apps/mesa-progs: Rebase patch + Add patch
The new patch fixes the build with USE=-wayland.
Upstream-PR: https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/114
Closes: https://github.com/gentoo/gentoo/pull/29588
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/9999-Disable-things-we-don-t-want.patch | 52 +++++++++++++---------
x11-apps/mesa-progs/files/9999-wayland-build.patch | 25 +++++++++++
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 1 +
3 files changed, 56 insertions(+), 22 deletions(-)
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..e6992ee40f50 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -42,6 +42,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/9999-Disable-things-we-don-t-want.patch
+ "${FILESDIR}"/9999-wayland-build.patch
)
pkg_setup() {
next reply other threads:[~2023-02-15 8:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 8:29 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-08 16:21 [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/, x11-apps/mesa-progs/files/ Matt Turner
2024-04-18 17:58 Matt Turner
2024-04-18 17:58 Matt Turner
2023-04-14 0:31 Sam James
2022-05-30 17:25 Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1676449143.29ece98e6e61cd6049ece9d18c07b693dc3fd1bd.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox