* [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/, x11-apps/mesa-progs/files/
@ 2022-05-30 17:25 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2022-05-30 17:25 UTC (permalink / raw
To: gentoo-commits
commit: 579a702668e5ce1e81586c7f5596814e89cb70b5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 16:03:09 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May 30 17:24:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=579a7026
x11-apps/mesa-progs: Switch to meson
Closes: https://bugs.gentoo.org/845072
Co-authored-by: Mike Lothian <mike <AT> fireburn.co.uk>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/8.5.0-Disable-things-we-don-t-want.patch | 254 +++++++++++++++++++++
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 91 ++++----
2 files changed, 304 insertions(+), 41 deletions(-)
diff --git a/x11-apps/mesa-progs/files/8.5.0-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/8.5.0-Disable-things-we-don-t-want.patch
new file mode 100644
index 000000000000..666f568e461f
--- /dev/null
+++ b/x11-apps/mesa-progs/files/8.5.0-Disable-things-we-don-t-want.patch
@@ -0,0 +1,254 @@
+From caa6f31f1032f21756ab327429702feb4381045e Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 30 May 2022 12:16:24 -0400
+Subject: [PATCH] Disable things we don't want
+
+---
+ meson.build | 11 +++--------
+ src/egl/opengl/meson.build | 29 ----------------------------
+ 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(-)
+
+diff --git a/meson.build b/meson.build
+index e1968fab..9d59c1ec 100644
+--- a/meson.build
++++ b/meson.build
+@@ -75,14 +75,7 @@ endif
+
+ dep_threads = dependency('threads')
+
+-dep_glu = dependency('glu', required : dep_x11.found())
+-if not dep_glu.found()
+- _glu_name = 'GLU'
+- if host_machine.system() == 'windows'
+- _glu_name = 'glu32'
+- endif
+- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h')
+-endif
++dep_glu = disabler()
+
+ # GBM is needed for EGL on KMS
+ dep_gbm = dependency('gbm', required : false, disabler : true)
+@@ -117,6 +110,8 @@ else
+ )
+ endif
+
++dep_glut = disabler()
++
+ if dep_glut.found() and cc.has_function('glutInitContextProfile',
+ 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
+--- a/src/egl/opengl/meson.build
++++ b/src/egl/opengl/meson.build
+@@ -4,41 +4,12 @@ executable(
+ 'eglgears_x11', files('eglgears.c'),
+ dependencies: [_deps, idep_eglut_x11]
+ )
+-executable(
+- 'egltri_x11', files('egltri.c'),
+- dependencies: [_deps, idep_eglut_x11]
+-)
+-executable(
+- 'xeglgears', files('xeglgears.c'),
+- dependencies: [_deps, dep_egl, dep_x11]
+-)
+-executable(
+- 'xeglthreads', files('xeglthreads.c'),
+- dependencies: [_deps, dep_x11]
+-)
+-
+ executable(
+ 'eglgears_wayland', files('eglgears.c'),
+ dependencies: [_deps, idep_eglut_wayland]
+ )
+-executable(
+- 'egltri_wayland', files('egltri.c'),
+- dependencies: [_deps, idep_eglut_wayland]
+-)
+-
+-executable(
+- 'eglkms', 'eglkms.c',
+- dependencies: [_deps, dep_drm, dep_gbm, dep_egl]
+-)
+-
+ executable(
+ 'eglinfo', 'eglinfo.c',
+ dependencies: [dep_egl],
+ install: true
+ )
+-
+-executable(
+- 'peglgears', 'peglgears.c',
+- dependencies: [dep_gl, dep_egl, dep_m, idep_util]
+-)
+-
+diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build
+index 59f69ed7..7137a961 100644
+--- a/src/egl/opengles2/meson.build
++++ b/src/egl/opengles2/meson.build
+@@ -9,11 +9,6 @@ executable(
+ dependencies: [dep_gles2, idep_eglut_x11, dep_m],
+ install: true
+ )
+-executable(
+- 'es2tri', files('es2tri.c'),
+- dependencies: [_deps_x11, dep_m],
+- install: true
+-)
+ executable(
+ 'es2gears_wayland', files('es2gears.c'),
+ dependencies: [dep_gles2, idep_eglut_wayland, dep_m],
+diff --git a/src/glad/meson.build b/src/glad/meson.build
+index 2d107609..23dacd45 100644
+--- a/src/glad/meson.build
++++ b/src/glad/meson.build
+@@ -19,20 +19,3 @@
+ # SOFTWARE.
+
+ inc_glad = include_directories('include')
+-
+-_libglad_files = files('src/glad.c')
+-if host_machine.system() == 'windows'
+- _libglad_files += files('src/glad_wgl.c')
+-endif
+-
+-_libglad = static_library(
+- 'glad',
+- _libglad_files,
+- include_directories: inc_glad
+-)
+-
+-idep_glad = declare_dependency(
+- link_with: _libglad,
+- dependencies: dep_dl,
+- include_directories: inc_glad,
+-)
+diff --git a/src/meson.build b/src/meson.build
+index 39cac78d..4d4abbf8 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -55,5 +55,3 @@ endif
+ if host_machine.system() == 'windows'
+ subdir('wgl')
+ endif
+-
+-subdir('data')
+diff --git a/src/util/gl_wrap.h b/src/util/gl_wrap.h
+index b2ff9c8f..f482df5e 100644
+--- a/src/util/gl_wrap.h
++++ b/src/util/gl_wrap.h
+@@ -7,10 +7,8 @@
+
+ #ifdef __APPLE__
+ # include <OpenGL/gl.h>
+-# include <OpenGL/glu.h>
+ #else
+ # include <GL/gl.h>
+-# include <GL/glu.h>
+ #endif
+
+ #ifndef GLAPIENTRY
+diff --git a/src/util/meson.build b/src/util/meson.build
+index 9168aecf..066073cc 100644
+--- a/src/util/meson.build
++++ b/src/util/meson.build
+@@ -20,26 +20,6 @@
+
+ inc_util = include_directories('.')
+
+-files_libutil = files(
+- 'readtex.c',
+- 'showbuffer.c',
+- 'trackball.c',
+-)
+-
+-_deps = []
+-if dep_glut.found()
+- files_libutil += files('shaderutil.c')
+- _deps += dep_glut
+-endif
+-
+-_libutil = static_library(
+- 'util',
+- files_libutil,
+- include_directories: inc_glad,
+- dependencies: _deps,
+-)
+-
+ idep_util = declare_dependency(
+- link_with: _libutil,
+ include_directories: inc_util,
+ )
+diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build
+index d6d5d5d5..ce26699f 100644
+--- a/src/xdemos/meson.build
++++ b/src/xdemos/meson.build
+@@ -21,25 +21,7 @@
+ glx_deps = [dep_gl, dep_x11, dep_m]
+
+ progs = [
+- 'glsync',
+- 'glxdemo',
+ 'glxgears',
+- 'glxgears_pixmap',
+- 'glxcontexts',
+- 'glxheads',
+- 'glxpixmap',
+- 'glxpbdemo',
+- 'glxsnoop',
+- 'glxswapcontrol',
+- 'manywin',
+- 'multictx',
+- 'offset',
+- 'overlay',
+- 'shape',
+- 'sharedtex',
+- 'texture_from_pixmap',
+- 'wincopy',
+- 'xfont',
+ ]
+ foreach p : progs
+ executable(
+@@ -56,23 +38,7 @@ executable(
+ install: true
+ )
+
+-executable(
+- 'xrotfontdemo',
+- files('xrotfontdemo.c', 'xuserotfont.c'),
+- dependencies: glx_deps,
+- install: true
+-)
+-
+-_libpbutil = static_library(
+- 'pbutil',
+- files('pbutil.c'),
+- dependencies: glx_deps
+-)
+-
+ pbutil_progs = [
+- 'glxgears_fbconfig',
+- 'pbinfo',
+- 'pbdemo',
+ ]
+ foreach p : pbutil_progs
+ executable(
+@@ -84,8 +50,6 @@ foreach p : pbutil_progs
+ endforeach
+
+ thread_progs = [
+- 'glthreads',
+- 'sharedtex_mt',
+ ]
+ foreach p : thread_progs
+ executable(
+--
+2.35.1
+
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index ac2f9b7db41f..0de99d7b802b 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+inherit meson-multilib
MY_PN="${PN/progs/demos}"
MY_P="${MY_PN}-${PV}"
@@ -9,10 +11,8 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos"
if [[ ${PV} = 9999* ]]; then
- inherit autotools git-r3
+ inherit git-r3
EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
- EGIT_CHECKOUT_DIR="${S}"
- EXPERIMENTAL="true"
else
SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
@@ -21,49 +21,58 @@ else
fi
LICENSE="LGPL-2"
SLOT="0"
-IUSE="egl gles2"
+IUSE="gles2 wayland X"
RDEPEND="
- media-libs/mesa[egl(+)?,gles2?]
- virtual/opengl
- x11-libs/libX11"
+ media-libs/mesa[${MULTILIB_USEDEP},egl(+),gles2?,wayland?,X?]
+ wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+ X? (
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ )
+"
DEPEND="${RDEPEND}
- virtual/glu
- x11-base/xorg-proto"
-BDEPEND="sys-apps/grep
- sys-apps/file"
+ wayland? ( >=dev-libs/wayland-protocols-1.12 )
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+ virtual/pkgconfig
+ wayland? ( dev-util/wayland-scanner )
+"
-src_prepare() {
- default
- [[ ${PV} = 9999* ]] && eautoreconf
-}
+PATCHES=(
+ "${FILESDIR}"/8.5.0-Disable-things-we-don-t-want.patch
+)
-src_compile() {
- emake -C src/glad libglad.la
- emake -C src/xdemos glxgears glxinfo
+pkg_setup() {
+ MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/eglinfo
+ )
- if use egl; then
- emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
- emake -C src/egl/eglut/ libeglut_x11.la
- emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+ use X && MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/glxgears
+ /usr/bin/glxinfo
+ )
- if use gles2; then
- emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
- emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
- fi
- fi
-}
+ use gles2 && use X && MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/es2_info
+ /usr/bin/es2gears_x11
+ )
-src_install() {
- local demo='src/xdemos'
- if use egl; then
- demo="${demo} src/egl/opengl"
-
- use gles2 && demo="${demo} src/egl/opengles2"
- fi
+ use gles2 && use wayland && MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/es2gears_wayland
+ )
+}
- # Ensure only the binaries are installed and not a similarly named wrapper script
- find ${demo} -type f -print0 |
- xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
- xargs -I '{}' dobin '{}' || die
+multilib_src_configure() {
+ local emesonargs=(
+ -Dlibdrm=disabled
+ -Degl=enabled
+ -Dgles1=disabled
+ $(meson_feature gles2)
+ -Dosmesa=disabled
+ $(meson_feature wayland)
+ $(meson_feature X x11)
+ )
+ meson_src_configure
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/, x11-apps/mesa-progs/files/
@ 2023-02-15 8:29 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-02-15 8:29 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/, x11-apps/mesa-progs/files/
@ 2023-04-14 0:31 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-04-14 0:31 UTC (permalink / raw
To: gentoo-commits
commit: 7af570fc9b9f881444b1861f605b213a84b59b03
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Apr 6 22:54:09 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 00:28:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af570fc
x11-apps/mesa-progs: Update live ebuild
* Rebases the live patch
* Add USE=vulkan for vkgears
* es2gears_wayland was removed upstream
* es2gears_x11 was renamed to es2gears upstream
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30506
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/9999-Disable-things-we-don-t-want.patch | 43 ++++++++--------------
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 13 ++++---
x11-apps/mesa-progs/metadata.xml | 1 +
3 files changed, 25 insertions(+), 32 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 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(
@@ -68,17 +68,6 @@ index a613eb43..1c91ae1b 100644
- 'xeglthreads', files('xeglthreads.c'),
- 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(
@@ -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>
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/, x11-apps/mesa-progs/files/
@ 2024-04-18 17:58 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2024-04-18 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 0091729d79a09037884984c31c2cb57aea495416
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 17:25:47 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 17:58:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0091729d
x11-apps/mesa-progs: Update disabler patch
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/9999-Disable-things-we-don-t-want.patch | 67 +++++++++++-----------
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 3 +-
2 files changed, 37 insertions(+), 33 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 55483ad5ec23..fd00abd227e7 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,56 +1,59 @@
-From 639005a81abf915e7b6450baacf40ede01121cb7 Mon Sep 17 00:00:00 2001
+From edef3e745190669dcaedcb6c7798f5bd625254a7 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
-Date: Fri, 27 Jan 2023 06:40:05 -0800
+Date: Thu, 18 Apr 2024 13:24:18 -0400
Subject: [PATCH] Disable things we don't want
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
---
- meson.build | 13 +++----------
- src/egl/opengl/meson.build | 28 ---------------------------
+ meson.build | 3 ++-
+ 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 | 7 +------
src/xdemos/meson.build | 36 -----------------------------------
- 7 files changed, 4 insertions(+), 89 deletions(-)
+ 7 files changed, 3 insertions(+), 87 deletions(-)
diff --git a/meson.build b/meson.build
-index 3e39b5a2..6d064ef6 100644
+index d487a11f..ff360c2e 100644
--- a/meson.build
+++ b/meson.build
-@@ -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
+@@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
+ required : get_option('libdrm'),
+ disabler : true
+ )
+-dep_x11 = dependency('x11, xext',
++dep_x11 = dependency('x11',
+ 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
+dep_glu = disabler()
dep_glx = dependency('glx', required: false, disabler : true)
if not dep_glx.found()
-@@ -165,6 +156,8 @@ else
- dep_glut = dependency('', required : false)
- endif
-
-+dep_glut = disabler()
-+
- if dep_glut.found() and (dep_glut.type_name() == 'internal' or
- cc.has_function('glutInitContextProfile',
- dependencies: [dep_glut],
diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
-index 9bca049c..e7122027 100644
+index be536280..e7122027 100644
--- a/src/egl/opengl/meson.build
+++ b/src/egl/opengl/meson.build
-@@ -25,27 +25,6 @@ executable(
+@@ -20,39 +20,11 @@
+
+ _deps = [dep_gl, dep_m, idep_util]
+
+-if target_machine.system() == 'linux'
+- executable(
+- 'dmabufshare', files('dmabufshare.c'),
+- dependencies: [_deps, idep_glad, idep_eglut],
+- install: true
+- )
+-endif
+ executable(
+ 'eglgears', files('eglgears.c'),
dependencies: [_deps, dep_glu, idep_eglut],
install: true
)
@@ -78,7 +81,7 @@ index 9bca049c..e7122027 100644
executable(
'eglinfo', 'eglinfo.c',
-@@ -53,10 +32,3 @@ executable(
+@@ -60,10 +32,3 @@ executable(
include_directories: [inc_glad],
install: true
)
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index c6aec667b2c8..c01564170135 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/9999-Disable-things-we-don-t-want.patch
+ "${FILESDIR}"/${PV}-Disable-things-we-don-t-want.patch
)
pkg_setup() {
@@ -72,6 +72,7 @@ multilib_src_configure() {
-Degl=enabled
-Dgles1=disabled
$(meson_feature gles2)
+ -Dglut=disabled
-Dosmesa=disabled
$(meson_feature vulkan)
$(meson_feature wayland)
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/, x11-apps/mesa-progs/files/
@ 2024-04-18 17:58 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2024-04-18 17:58 UTC (permalink / raw
To: gentoo-commits
commit: ba4a4ca9d57c3f62630f0344c11c6163af388c42
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 17:46:24 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 17:58:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4a4ca9
x11-apps/mesa-progs: Version bump to 9.0.0
Closes: https://bugs.gentoo.org/857018
Closes: https://bugs.gentoo.org/894156
Closes: https://bugs.gentoo.org/924439
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-apps/mesa-progs/Manifest | 1 +
.../files/9.0.0-Disable-things-we-don-t-want.patch | 215 +++++++++++++++++++++
x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild | 93 +++++++++
3 files changed, 309 insertions(+)
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index b2cdeecce696..0bb6b296cda9 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1 +1,2 @@
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
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
new file mode 100644
index 000000000000..b2374db36ba4
--- /dev/null
+++ b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
@@ -0,0 +1,215 @@
+From 4fa5131036f8db3186a9f7a9cce74261411c4ed9 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 ++-
+ 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, 3 insertions(+), 80 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index c1853f94..5424dc73 100644
+--- a/meson.build
++++ b/meson.build
+@@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
+ required : get_option('libdrm'),
+ disabler : true
+ )
+-dep_x11 = dependency('x11, xext',
++dep_x11 = dependency('x11',
+ 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
++dep_glu = disabler()
+
+ dep_glx = dependency('glx', required: false, disabler : true)
+ if not dep_glx.found() and host_machine.system() == 'darwin'
+diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
+index a613eb43..cc481bee 100644
+--- a/src/egl/opengl/meson.build
++++ b/src/egl/opengl/meson.build
+@@ -25,21 +25,6 @@ executable(
+ dependencies: [_deps, dep_glu, idep_eglut_x11],
+ install: true
+ )
+-executable(
+- 'egltri_x11', files('egltri.c'),
+- dependencies: [_deps, dep_glu, idep_eglut_x11],
+- install: true
+-)
+-executable(
+- 'xeglgears', files('xeglgears.c'),
+- dependencies: [_deps, dep_glu, dep_egl, dep_x11],
+- install: true
+-)
+-executable(
+- 'xeglthreads', files('xeglthreads.c'),
+- dependencies: [_deps, dep_x11],
+- install: true
+-)
+
+ executable(
+ 'eglgears_wayland', files('eglgears.c'),
+@@ -52,22 +37,9 @@ executable(
+ install: true
+ )
+
+-executable(
+- 'eglkms', 'eglkms.c',
+- dependencies: [_deps, dep_drm, dep_gbm, dep_egl],
+- install: true
+-)
+-
+ executable(
+ 'eglinfo', 'eglinfo.c',
+ dependencies: [dep_egl, idep_glad, idep_util],
+ include_directories: [inc_glad],
+ install: true
+ )
+-
+-executable(
+- 'peglgears', 'peglgears.c',
+- 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 da083cf2..59b35d66 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],
+ install: true
+ )
+-executable(
+- 'es2tri', files('es2tri.c'),
+- dependencies: [_deps_x11, dep_m],
+- install: true
+-)
+ executable(
+ 'es2gears_wayland', files('es2gears.c'),
+ dependencies: [dep_gles2, idep_eglut_wayland, idep_util],
+diff --git a/src/meson.build b/src/meson.build
+index fd4a1673..cea622a6 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -57,5 +57,3 @@ endif
+ if host_machine.system() == 'windows'
+ subdir('wgl')
+ endif
+-
+-subdir('data')
+diff --git a/src/util/gl_wrap.h b/src/util/gl_wrap.h
+index b2ff9c8f..f482df5e 100644
+--- a/src/util/gl_wrap.h
++++ b/src/util/gl_wrap.h
+@@ -7,10 +7,8 @@
+
+ #ifdef __APPLE__
+ # include <OpenGL/gl.h>
+-# include <OpenGL/glu.h>
+ #else
+ # include <GL/gl.h>
+-# include <GL/glu.h>
+ #endif
+
+ #ifndef GLAPIENTRY
+diff --git a/src/util/meson.build b/src/util/meson.build
+index b4fe614f..e56b456e 100644
+--- a/src/util/meson.build
++++ b/src/util/meson.build
+@@ -22,17 +22,12 @@ inc_util = include_directories('.')
+
+ files_libutil = files(
+ 'glinfo_common.c',
+- 'readtex.c',
+ 'showbuffer.c',
+ 'trackball.c',
+ 'matrix.c',
+ )
+
+-_deps = [dep_glu, dep_m]
+-if dep_glut.found()
+- files_libutil += files('shaderutil.c')
+- _deps += dep_glut
+-endif
++_deps = [dep_m]
+
+ _libutil = static_library(
+ 'util',
+diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build
+index a569fde5..40007616 100644
+--- a/src/xdemos/meson.build
++++ b/src/xdemos/meson.build
+@@ -21,25 +21,7 @@
+ glx_deps = [dep_gl, dep_glx, dep_x11, dep_m]
+
+ progs = [
+- 'glsync',
+- 'glxdemo',
+ 'glxgears',
+- 'glxgears_pixmap',
+- 'glxcontexts',
+- 'glxheads',
+- 'glxpixmap',
+- 'glxpbdemo',
+- 'glxsnoop',
+- 'glxswapcontrol',
+- 'manywin',
+- 'multictx',
+- 'offset',
+- 'overlay',
+- 'shape',
+- 'sharedtex',
+- 'texture_from_pixmap',
+- 'wincopy',
+- 'xfont',
+ ]
+ foreach p : progs
+ executable(
+@@ -56,23 +38,7 @@ executable(
+ install: true
+ )
+
+-executable(
+- 'xrotfontdemo',
+- files('xrotfontdemo.c', 'xuserotfont.c'),
+- dependencies: glx_deps,
+- install: true
+-)
+-
+-_libpbutil = static_library(
+- 'pbutil',
+- files('pbutil.c'),
+- dependencies: glx_deps
+-)
+-
+ pbutil_progs = [
+- 'glxgears_fbconfig',
+- 'pbinfo',
+- 'pbdemo',
+ ]
+ foreach p : pbutil_progs
+ executable(
+@@ -84,8 +50,6 @@ foreach p : pbutil_progs
+ endforeach
+
+ thread_progs = [
+- 'glthreads',
+- 'sharedtex_mt',
+ ]
+ foreach p : thread_progs
+ executable(
+--
+2.43.2
+
diff --git a/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild b/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
new file mode 100644
index 000000000000..d8e4f5ca1891
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+MY_PN="${PN/progs/demos}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos"
+if [[ ${PV} = 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
+else
+ SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.xz
+ https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.xz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/${MY_P}"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="gles2 vulkan wayland X"
+
+RDEPEND="
+ media-libs/libglvnd[${MULTILIB_USEDEP},X?]
+ vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+ wayland? (
+ dev-libs/wayland[${MULTILIB_USEDEP}]
+ gui-libs/libdecor[${MULTILIB_USEDEP}]
+ x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+ )
+ X? (
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ vulkan? (
+ x11-libs/libxcb:=[${MULTILIB_USEDEP}]
+ x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+ )
+ )
+"
+DEPEND="${RDEPEND}
+ wayland? ( >=dev-libs/wayland-protocols-1.12 )
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+ virtual/pkgconfig
+ vulkan? ( dev-util/glslang )
+ wayland? ( dev-util/wayland-scanner )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-Disable-things-we-don-t-want.patch
+)
+
+pkg_setup() {
+ MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/eglinfo
+ )
+
+ use X && MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/glxgears
+ /usr/bin/glxinfo
+ )
+
+ use gles2 && use X && MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/es2_info
+ /usr/bin/es2gears_x11
+ )
+
+ use gles2 && use wayland && MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/es2gears_wayland
+ )
+
+ use vulkan && MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/vkgears
+ )
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dlibdrm=disabled
+ -Degl=enabled
+ -Dgles1=disabled
+ $(meson_feature gles2)
+ -Dglut=disabled
+ -Dosmesa=disabled
+ $(meson_feature vulkan)
+ $(meson_feature wayland)
+ $(meson_feature X x11)
+ )
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-18 17:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-30 17:25 [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/, x11-apps/mesa-progs/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2023-02-15 8:29 Sam James
2023-04-14 0:31 Sam James
2024-04-18 17:58 Matt Turner
2024-04-18 17:58 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox