From b6cfc0c19effe2d9f7b8ab303cd00636f16da253 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Apr 2024 12:05:02 +0100 Subject: gentoo auto-resync : 19:04:2024 - 12:05:02 --- x11-apps/Manifest.gz | Bin 13845 -> 13851 bytes x11-apps/mesa-progs/Manifest | 7 +- .../files/9.0.0-Disable-things-we-don-t-want.patch | 215 +++++++++++++++++++++ .../files/9999-Disable-things-we-don-t-want.patch | 78 ++++---- x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild | 93 +++++++++ x11-apps/mesa-progs/mesa-progs-9999.ebuild | 26 ++- x11-apps/mkfontscale/Manifest | 2 +- x11-apps/mkfontscale/mkfontscale-1.2.3.ebuild | 2 +- x11-apps/xauth/Manifest | 2 +- x11-apps/xauth/xauth-1.1.3.ebuild | 2 +- 10 files changed, 375 insertions(+), 52 deletions(-) create mode 100644 x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch create mode 100644 x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild (limited to 'x11-apps') diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz index bbc9173cc223..8cf45e96ae01 100644 Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest index bf71c2710187..5e1f69055dba 100644 --- a/x11-apps/mesa-progs/Manifest +++ b/x11-apps/mesa-progs/Manifest @@ -1,6 +1,9 @@ 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 5239 BLAKE2B a58b5726ed42a8ac9466433db5d54503d1ab4c605bf9f7083c35fd704613ba10cbb7c28daa10e40b9a2423cc3f3695cd2ab96f4f338b55f8b46d10f2a851d3fc SHA512 4a8a331bbb8aa1cd3d529d3c97993b3c62f43acf96105f68d2716b6f93d394ddd4c9aef1c582bb6f841803853bca58ef5fd4180d593efa0bf9446f76e2f03601 +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 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-9999.ebuild 1904 BLAKE2B fb83349574e55d14aacc678ff29b130ef6a8418c59167109ff5dccf94638dcb8f6f6fe4b6fab0ddb94d40e88b7f2e9ed9cee4d32a21627b4f55b7d874fb6fa4c SHA512 d65fc3d946ae6efa3981f3b0356bbdf353c0528accf349e6bf3dcc364aca010a9de30279b95e470eabc192e814f2a4e26f9b66b079e3c4859b9e1d3542220a52 +EBUILD mesa-progs-9.0.0.ebuild 2085 BLAKE2B e6e3e8232f4e92e0f2e3f96487f41b37092898270a6165534285145ed98d49e44cbd6ffd78ff4e46c1a6a90a83ee69c27188aed1fdec1757327c3822f80c324d SHA512 7b1d53ba4b85fa9667c175b889e432912d3dcd16069fdd34142c006f6e1b5e4c1341df43293e412263c996973f3d4fa5e7e1fc21d0f1c86d261d3f8067fc8231 +EBUILD mesa-progs-9999.ebuild 2051 BLAKE2B fcfea7243773905fceed9a0e06abddbe6c479decdcf9ccdf75dc1086aa0c42030d2e7dbeedaeab813a7704e9272b6cffbe7dc5456ba4874298676fd6dad3fb9c SHA512 f43747c791e029e007c7ad87c4e84457c71e5dd47b5444bb31f45ffbbff552b5a8456786033321e9859888efa37f334787cd3d4642559658ea899477a27fd322 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 new file mode 100644 index 000000000000..5b1104e71a13 --- /dev/null +++ b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch @@ -0,0 +1,215 @@ +From 0e87b772b5d291ecf2cdc3f209321ea586918375 Mon Sep 17 00:00:00 2001 +From: Matt Turner +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 | 9 +-------- + src/xdemos/meson.build | 36 ----------------------------------- + 7 files changed, 3 insertions(+), 82 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 +-# include + #else + # include +-# include + #endif + + #ifndef GLAPIENTRY +diff --git a/src/util/meson.build b/src/util/meson.build +index b4fe614f..d2c42dc2 100644 +--- a/src/util/meson.build ++++ b/src/util/meson.build +@@ -22,17 +22,10 @@ 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/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..9c352fea35db 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,60 @@ -From 639005a81abf915e7b6450baacf40ede01121cb7 Mon Sep 17 00:00:00 2001 +From b7bced77da267e51eaceeef68a213007ba54aa86 Mon Sep 17 00:00:00 2001 From: Matt Turner -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 +v5: Drop trackball.c and showbuffer.c --- - 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/util/meson.build | 9 +-------- src/xdemos/meson.build | 36 ----------------------------------- - 7 files changed, 4 insertions(+), 89 deletions(-) + 7 files changed, 3 insertions(+), 89 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 +82,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 ) @@ -131,16 +135,16 @@ index b2ff9c8f..f482df5e 100644 #ifndef GLAPIENTRY diff --git a/src/util/meson.build b/src/util/meson.build -index b4fe614f..e56b456e 100644 +index b4fe614f..d2c42dc2 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -22,17 +22,12 @@ inc_util = include_directories('.') +@@ -22,17 +22,10 @@ inc_util = include_directories('.') files_libutil = files( 'glinfo_common.c', - 'readtex.c', - 'showbuffer.c', - 'trackball.c', +- 'showbuffer.c', +- 'trackball.c', 'matrix.c', ) 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..273d964dbbc7 --- /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 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc" + 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 +} diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild index 9c5277ecec57..6b089521e986 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-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,9 +14,9 @@ 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.bz2 - https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.xz + https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi LICENSE="LGPL-2" @@ -24,15 +24,22 @@ SLOT="0" IUSE="gles2 vulkan wayland X" RDEPEND=" - media-libs/mesa[${MULTILIB_USEDEP},egl(+),gles2?,vulkan?,wayland?,X?] - wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) + 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}] - x11-libs/libXext[${MULTILIB_USEDEP}] + vulkan? ( + x11-libs/libxcb:=[${MULTILIB_USEDEP}] + x11-libs/libxkbcommon[${MULTILIB_USEDEP}] + ) ) " DEPEND="${RDEPEND} - vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) wayland? ( >=dev-libs/wayland-protocols-1.12 ) X? ( x11-base/xorg-proto ) " @@ -43,7 +50,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 +79,7 @@ multilib_src_configure() { -Degl=enabled -Dgles1=disabled $(meson_feature gles2) + -Dglut=disabled -Dosmesa=disabled $(meson_feature vulkan) $(meson_feature wayland) diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest index fdeed99461b4..15e958cd17f6 100644 --- a/x11-apps/mkfontscale/Manifest +++ b/x11-apps/mkfontscale/Manifest @@ -1,5 +1,5 @@ DIST mkfontscale-1.2.2.tar.xz 143436 BLAKE2B 796c6b95f4eb0959db93ccfb1ebae9c73afc618645d85b7ba382559fe4e008ece16c9d86ab32c815923cda9928f030d75c47f2dd5ee6c9857b9e861f9bab0dc9 SHA512 4c846816325347c91008d76b3a5610c1e58a8414fd55117e7ccf51310db4b20b8397ecf6c9177ff77322e27ee088bf034fd175c9210465c50b094bab8dada4b3 DIST mkfontscale-1.2.3.tar.xz 145584 BLAKE2B 93024a607ebe789682c00490528de1688d073f016b97f7c9fd86b225ee1ac96616c3666708b72e3984383f13f89025e12f591fada324b8a14e99764c5cdf33e9 SHA512 816e7b2885bb7a4b2eb0e506b659600011bfa4ec1a3010243c2cc2241fa0b792f3c8de1dec1855a4d13de89405973967074e379b0d01dcf9de8a1277a2fc4296 EBUILD mkfontscale-1.2.2.ebuild 540 BLAKE2B 2c1ec33636fc4af55c057a81dc93dbce11e244ae08b7364e1304c9b315313f0cffb992b710b25fad374743f5e215832515a84df12ff17dca454432218e52a43b SHA512 1e2dd1e88e6b1beb2b7cb4d6cebb56d379ff7a0954c7240fa30315c40f17a18c0427656636de095a37b410f5e939ffa9c879835ddf600161c0ca66f7797b7538 -EBUILD mkfontscale-1.2.3.ebuild 541 BLAKE2B 9e5ee3c298d98834d334112681c8cbf8ff03f894749108b99ab0ba6a394181bf6dace1865f155948af279fbe7c48fde50e41b45f4576d482514db748ed737dc5 SHA512 3e9843751e0d23c363540b2d8730298419a2a3f1b4a95c86a26a7051b194c51360ef8657c811747844370de28af04dbf24f84c072e3f5755af7dd55bdcb267b8 +EBUILD mkfontscale-1.2.3.ebuild 540 BLAKE2B 1dd80f87e59fca508f8f76f185c4d70969ff905de108704f828719b0db18a40d480aa96dd1ab13b66357b6c466f3e895d31b94a3bc8ef2a4a29c1011fce91cb4 SHA512 736faaa018fb379b20575a722afa1ee88395af3997e8bbec551956415e9afe6e127453b81261503f90683e2cb3c8e4931aac01a885016a32bd5532e90c877e08 MISC metadata.xml 342 BLAKE2B 5937f65d98e050b0d560044d2dead3165da6eb82f2865cb61c39ad19e707a5842f95342db2665ee787788d270af3ca4be919eda8f6d19c77c2fa34fa47b15bd6 SHA512 48963d11b414e4be679a173c42023101acbc716d437e279ca8c342376ffaaaaa6210b9dff8cc98aa05794b9a10213d123dcd7985ab4821d12486ce30a3a1f4e5 diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.3.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.3.ebuild index 42b2e3543822..b4a2a70c7081 100644 --- a/x11-apps/mkfontscale/mkfontscale-1.2.3.ebuild +++ b/x11-apps/mkfontscale/mkfontscale-1.2.3.ebuild @@ -8,7 +8,7 @@ inherit xorg-3 DESCRIPTION="create an index of scalable font files for X" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" x11-libs/libfontenc diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest index 7f66245076d0..7488fbbb354c 100644 --- a/x11-apps/xauth/Manifest +++ b/x11-apps/xauth/Manifest @@ -1,5 +1,5 @@ DIST xauth-1.1.2.tar.xz 156960 BLAKE2B 2ba168229bdf0c1d0fdd4c352e434abfc6f527cbafce35abac8d403a0dea91f00fd858f91f177128d13a0e618d1d95061c71ef32a3e12ac91b72a257dcfcd12b SHA512 ac23fcd166b45abf7b030994ff3332c9906023dc1ddfa9b9d3000e6a914dc5e0213c4a2aa409cb3ddb93e1f9f4f6374376109241a95ef8c36af842de1f6f76e8 DIST xauth-1.1.3.tar.xz 159500 BLAKE2B 6acc6f360b7ed947d5dbc0b197b7ed0a87916f38cd8a0c74215b96ca44e98ead45987614e88833b0d2a957776b6e6a1d69d1a3dc4563774e451c2d5f5c55394d SHA512 536434f6c607673c00b9658ea591bf32419cc151d138f991ea38167220563519a6a84a5504003da15820f2a7ed50ea2449c6ce9c991d1446ee9a7305c647d694 EBUILD xauth-1.1.2.ebuild 579 BLAKE2B d55c98e00d10c1eb227a52aa5af0fbb95abdb51946a58f61750cf1f9e754fbf93badb4452c05af65dd3a40ac61a484cc75a71357601bb9a5297aabe932b18780 SHA512 eb42c83edf30f49f2110c2cf04a08feb72c1cd5e6a3c0fb06ef28c8eb09feb8b97d143459ff0850a8b050d42090e2b1f3f851e43af72b21e6801a4ee80baaadb -EBUILD xauth-1.1.3.ebuild 478 BLAKE2B 84ccae160a7d2abe44c42f07fba81f5d431520e6bf661657fcf3ce0e37ab09fbd958475040dea89f8030b5d8ba6cf91350d99e326fec022f159edff603aad97d SHA512 1d0769aa2fdc4725582de2a193ee12cc9b0010495cb22306c4bfb6e065526e630341f88d46e23b9f9d6f67fb8ac2f4237bb3c273425ca9ef06727440019bfb8a +EBUILD xauth-1.1.3.ebuild 477 BLAKE2B 79d29c377f768ce4433573691bad3ef2c14291426ec9b2e5ae68dafa8221ee3de9642bd48c39d16171e54b152cf36fbe910b39d01a2c9c255a3c45f81e4ce2d9 SHA512 90ca6afb849b19d5b3c09739973e7ba164841026f57751724ea8f4980de46619c7c62750f781fd964e4cc471566e834f706278e1814fba033ea518bf2cb06a2c MISC metadata.xml 336 BLAKE2B e7efb568e90d3de70da870d88a12988c62c876085291bd426de3a6b3123e3f989eea78d4dc36e2e47cdd68b2f62c2f7c912c1f0e9ed8e92f4eecc017c63676ea SHA512 f210a30ab5f02fc443a1ba611bf07e72815d3089015ba5509dff6b62ee177cc50b6729157eff68633fe6163b7cd5d0d4a0b1a75f739984a50724639d043a2d58 diff --git a/x11-apps/xauth/xauth-1.1.3.ebuild b/x11-apps/xauth/xauth-1.1.3.ebuild index 3f54db1cac25..df8d00878546 100644 --- a/x11-apps/xauth/xauth-1.1.3.ebuild +++ b/x11-apps/xauth/xauth-1.1.3.ebuild @@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX=xz inherit xorg-3 DESCRIPTION="X authority file utility" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" x11-libs/libX11 -- cgit v1.2.3