summaryrefslogtreecommitdiff
path: root/x11-apps
diff options
context:
space:
mode:
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/Manifest.gzbin13835 -> 13834 bytes
-rw-r--r--x11-apps/bdftopcf/Manifest2
-rw-r--r--x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild2
-rw-r--r--x11-apps/mesa-progs/Manifest2
-rw-r--r--x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch13
-rw-r--r--x11-apps/rstart/Manifest2
-rw-r--r--x11-apps/rstart/rstart-1.0.6.ebuild2
-rw-r--r--x11-apps/sessreg/Manifest2
-rw-r--r--x11-apps/sessreg/sessreg-1.1.3.ebuild5
-rw-r--r--x11-apps/xisxwayland/Manifest4
-rw-r--r--x11-apps/xisxwayland/xisxwayland-2.ebuild25
-rw-r--r--x11-apps/xisxwayland/xisxwayland-9999.ebuild27
12 files changed, 38 insertions, 48 deletions
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 75df62d5c409..79e0c4931a89 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
Binary files differ
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index 4feb6d234a6f..e1a99f20f2a3 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -1,3 +1,3 @@
DIST bdftopcf-1.1.1.tar.xz 142716 BLAKE2B bef730ac65c0234ce027965d18b9e6e2bcfb8ebbd9e84a5a80d3cfc782a2f4b4124a833097867912592fc4a2accf3c067500a6b9c1f99383041a2df042df9ca6 SHA512 257dc9ae29f2cf1496aad91ccba534348d87f881d75431aa6611a8154cb817d17588c464ab6c6c6bc51e6060baa8dcfcb9fd8c037cdaea8d18287651fa6b7ea9
-EBUILD bdftopcf-1.1.1.ebuild 437 BLAKE2B d652e29b725c6e4560962a713d0fe509a5d65325678e98b78135d5d2fd446de26383f155ecca23725d9456c0b9312939c90183d18b9cc12201549fad81a48168 SHA512 d6d44327c500da39676b4c8c23acdd20f9dc1a7289bf999780b2a342b951318ec4da76df6db0370f3a86f7662e0b2c0e5a8d717446f6d7b503390b25999455af
+EBUILD bdftopcf-1.1.1.ebuild 439 BLAKE2B bba7111f6ad2e42e412b47704c08fbc37608cab8c0629d042d115352afe1ea26ec0de608e8049502165d56ff5dcbf59a1f7751620b1f7c6c357951f1a6eeaedd SHA512 5ee267cecd27d54f5df1bb96a358919ddd0f9212d2c36610b476f14655740dd5f5c2ae995e107736677c887f7827a3a7624bc37d62fe45e9c47d2ecd85e0c58d
MISC metadata.xml 340 BLAKE2B 2e0a214bb6e8a4a625ab5222d9c8a2a8724dfc846447f0515657fc9a1f9548b4212b12f021a26e0eb1f4ac0abce71ed131ce697882c83ae8128ae9de8ec39287 SHA512 1dacbc8993cc6b005ce5f0d26f0a6d7d08bbb629f25a2358a80607c84c5368856f63949f068747415128d1a880199d22636bc00184fa11d6aafe711cc2e505b8
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild
index 0eb12da1a750..d90a207f13d3 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://xorg.freedesktop.org/archive/individual/util/${P}.tar.xz"
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
DEPEND="x11-base/xorg-proto"
-RDEPEND=""
+# RDEPEND=""
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 26d66f1effaa..547629b98f84 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,5 +1,5 @@
AUX 9.0.0-Disable-things-we-don-t-want.patch 5612 BLAKE2B 2890a41155cff6c085789fe29330cbe9f4147cfa6adcade4e3bea94729f8c984fcde89d240977ad81502d7c8945258b323df13464ab00e854c73943ef03960df SHA512 3a00e2c00da613978f830f159634b848cb0ceba2a6f9faf6e1f71fb50d8a0a113038f23b3354745fbb586cc250f62b5645019a2b1f57f5a32408e56b61c07b2f
-AUX 9999-Disable-things-we-don-t-want.patch 5663 BLAKE2B 2359c7fa7e4b13969e59b1528cb7cdd81b6afcaecfb65b1f6f9530dc0fe93202ea1b29455e200d59ec952a750cc7e67443c0de519a89d1b069468d1a354f2062 SHA512 7d23fce376c9f0d1986eb3b82bd2d79b8528ffdf1dfe2ca8794e8ce8c89f0a12edf7a8646a8e702ecbe9e321658267da720dd1ea096376217116c53507b2b04d
+AUX 9999-Disable-things-we-don-t-want.patch 5684 BLAKE2B dd286c692f1c1cbe41814240ced62ebb8c0aabc0e860d942afcf9349019f5172c5cdeb7336fa956138f18aba3999d89a97ce7eeb2712bc3dbb4f03788484c51e SHA512 1d4132d5705c1f2d1ff1cc9d35970af39729f78c7c022d640d14c608a2665e8bc339f2c66bfc85a11030a0ab03860f99990157cc698bdb1e9945a0fc27194328
DIST mesa-demos-9.0.0.tar.xz 14839368 BLAKE2B 426211886344e88616670f0da8c71385e0ab86fd7dab60c7a477b165f33d2f7bd5fd9297f1f67c78e60fed5c98ab8851c1bd4ae92a6b0b486fd158196b109eb0 SHA512 af33ef72a521416e39d93370b2b4ccb768f08084c9e4c0aa62868210d9465c858e5cb8e5d23952295a3073946f609eb8723ee60b39dd9fb6696c4e45aafbb2c1
EBUILD mesa-progs-9.0.0.ebuild 2147 BLAKE2B c938f59f98c20b0583f4c47a5e741d2da52e7880f096a451bdd76259439d0618b0f589c6a49f5717feec95fe6b60de4b7e3229c0d04c0b901a2061164aae2bf8 SHA512 63249f5d28627cf32486d1d357051ababb64cedd6fcbb2cb43749ea67ceb07b103a5c5915f8e6ed15dd3607781ddbdaa7f66d93bb58e6a261463932a0a88e74d
EBUILD mesa-progs-9999.ebuild 2089 BLAKE2B 12341e3fea863e19ffea457d41ff8a140646c4cbb62f2ecdef6122a008cfdfd2088915cdeda680fe88009fba05fbe39ed42fa965f0b1c7690359d05c54182952 SHA512 7b3056dccbfdbae4ee552c90f0b3118ec03f940bcf5c6346886adaa3b24887dd0a7f3faf5bf3848a7106bd4b5d54cedc29ba1759e37ee49b11feab79361528a5
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 000383a45e6b..583ce62e5869 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 f716f5e654338cac2bdbf7b55efd0eb6648cfd3d Mon Sep 17 00:00:00 2001
+From 46213b2474e3a564a5f6d8b65ecaa428bd87fc7b 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
@@ -11,6 +11,7 @@ v6: Fix disabling GLU
v7: Link against libOpenGL rather than libGL
v8: Rebase
v9: Rebase
+v10: Rebase
---
meson.build | 13 ++-----------
src/egl/opengl/meson.build | 35 ----------------------------------
@@ -22,10 +23,10 @@ v9: Rebase
7 files changed, 3 insertions(+), 99 deletions(-)
diff --git a/meson.build b/meson.build
-index 8d495ec9..3f5c5c9b 100644
+index 4949c726..7f5ab5e7 100644
--- a/meson.build
+++ b/meson.build
-@@ -55,7 +55,7 @@ dep_drm = dependency('libdrm',
+@@ -60,7 +60,7 @@ dep_drm = dependency('libdrm',
required : get_option('libdrm'),
disabler : true
)
@@ -34,7 +35,7 @@ index 8d495ec9..3f5c5c9b 100644
required : get_option('x11'),
disabler : true
)
-@@ -90,16 +90,7 @@ endif
+@@ -95,16 +95,7 @@ endif
dep_threads = dependency('threads')
@@ -53,7 +54,7 @@ index 8d495ec9..3f5c5c9b 100644
dep_glx = dependency('glx', required: false, disabler : true)
if not dep_glx.found()
diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
-index be536280..e7122027 100644
+index 7ebd834f..e7122027 100644
--- a/src/egl/opengl/meson.build
+++ b/src/egl/opengl/meson.build
@@ -20,39 +20,11 @@
@@ -84,7 +85,7 @@ index be536280..e7122027 100644
-)
-executable(
- 'xeglthreads', files('xeglthreads.c'),
-- dependencies: [_deps, dep_x11],
+- dependencies: [_deps, dep_egl, dep_x11],
- install: true
-)
-
diff --git a/x11-apps/rstart/Manifest b/x11-apps/rstart/Manifest
index 5f3515212d18..8f11703929db 100644
--- a/x11-apps/rstart/Manifest
+++ b/x11-apps/rstart/Manifest
@@ -1,3 +1,3 @@
DIST rstart-1.0.6.tar.xz 144888 BLAKE2B d8ea7d48af6bffcbcd5c2f4ed4c6e7678f2d0ef17b5e104731c0a84fcd36d9c877b3f856a5137d066e671d1405d9ad21497c79885f02ba332fa059c0af59c3f6 SHA512 8c0840f172c9efade4557e9a28de19e76e510bd17f1e964936a957dde5ada3d9ae8b2fa0502f61da15cdfc0c69d3308599253ee03571017086a45e4e83958e8f
-EBUILD rstart-1.0.6.ebuild 296 BLAKE2B baab399d11a072d32138becb02d21a875abf29b92ec41eea8701de24399a91d84633e9b0e63aff9cfc4f69bccc2349720b3e1aa072533687e1c70fc0627e4a59 SHA512 3f4c1e2d4ae8f315476fde7a9ec887fa282ca7cc28829dec88fa75b6007819ad36deecb697cc0a161c991b5b4ed6d4d4bd42b7b2d0765300ac4beea3f4270def
+EBUILD rstart-1.0.6.ebuild 298 BLAKE2B c3d842ed1804bb7a7d61bf253247d3da9d2496999276e159dd457335f89f5e6b400f635a9e39d8af33aa7c684fd9a378f5843929b5ed5ed62c9b08a7c1874f89 SHA512 d3c7b2dd639be423549a10f768d63261621ca773cb8c87a5426c19386805774f668d411bcefa71f21a8082f5408adc1ef86609f555cecd8d4a170ee33e6bf5e8
MISC metadata.xml 337 BLAKE2B aaa00240efe2461a905f2c278cff69bb1ab21ac7d86b2cc64967cb4559e3db25c0e4a8b4f34c7dd4350f7d9a67edb3d6c09c715aeb777f7ae2f066f8684b4091 SHA512 b2047917ee39493ff4fb5de81dfce4f547a4ccd01e7b4da1e2d6e27e25834b5d296108f4b5de4879e3bdb48567845ce632d00b3fa5140350abf771c5c1625b8b
diff --git a/x11-apps/rstart/rstart-1.0.6.ebuild b/x11-apps/rstart/rstart-1.0.6.ebuild
index 0f8a112d4e6f..da12b3bbeb9b 100644
--- a/x11-apps/rstart/rstart-1.0.6.ebuild
+++ b/x11-apps/rstart/rstart-1.0.6.ebuild
@@ -11,4 +11,4 @@ DESCRIPTION="X.Org rstart application"
KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~s390 ~sparc x86"
DEPEND="x11-base/xorg-proto"
-RDEPEND=""
+# RDEPEND=""
diff --git a/x11-apps/sessreg/Manifest b/x11-apps/sessreg/Manifest
index 392b9fe3dcd5..4f9b38329352 100644
--- a/x11-apps/sessreg/Manifest
+++ b/x11-apps/sessreg/Manifest
@@ -1,3 +1,3 @@
DIST sessreg-1.1.3.tar.xz 131184 BLAKE2B 9da6b8c44db96edb5151856edffe37691004c1df0ae5bc7c32becb78595f8ff907291f090a708acb5bdf49dffc866385298a9de00df0e31533f61cbaa5296719 SHA512 bc1e83afc598ac5b4c6ab0861799b6c8727c123ee662c1fb9cbdd9ee926973b7a00cc62e32f6b4e462c0da3516f8b824337d9cf17587ebabd3f4753502641a60
-EBUILD sessreg-1.1.3.ebuild 353 BLAKE2B adbb9cb3140cfee5cded58eec3bd9f788cbbf0ea11da943c6e90449e0d3cf82459a74dc507ada382eea4089d6403b0f8d69ef2067ca0e0376641d9a0bf77c5fb SHA512 2eb960a3e94002fc5e4142e68829419c7c368deab956ab55b8e4b4f6731721441073b84b12887519c33153854bf99f0e082b14479ef331121321e9b20f23357a
+EBUILD sessreg-1.1.3.ebuild 343 BLAKE2B 3c03a0319dd4123789f58d2e067fe52cf87791bda0b098d6a2ea88917acc5db0f613ef209690e2baadcc0ab911b9f1e716d9a91d831f834363387e358d6a4a0f SHA512 57cd76d2abe7efca78a06b1620916854aac25ceb4a6cffc59a9cac457008faba7d487ef638c3b5e4909c5623a100ed5e7707d55c7f5f9dd473c2ea79319fdc12
MISC metadata.xml 338 BLAKE2B e25dd0f7e3bbffd2051258e976e618fd2b23dac5617e5623cbf3dc65dea14e2c92691ec4e4b82e9edc9b4ecef097255a94cd9ab822f59b29249d5f01fa16b913 SHA512 662e6497348739394cff1b169d96c777a0a247d041f04eac5180fafb04c790fff97fa5f8f5a460b213e4f280665e9bc9d9a6bc38e2e80d08da26bbc8a2f9ea8d
diff --git a/x11-apps/sessreg/sessreg-1.1.3.ebuild b/x11-apps/sessreg/sessreg-1.1.3.ebuild
index a10d986b07c1..b4f584988eba 100644
--- a/x11-apps/sessreg/sessreg-1.1.3.ebuild
+++ b/x11-apps/sessreg/sessreg-1.1.3.ebuild
@@ -10,6 +10,5 @@ DESCRIPTION="manage utmp/wtmp entries for non-init clients"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-RDEPEND=""
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
+DEPEND="x11-base/xorg-proto"
+# RDEPEND=""
diff --git a/x11-apps/xisxwayland/Manifest b/x11-apps/xisxwayland/Manifest
index 2ec51ea82868..cbcc0f77773a 100644
--- a/x11-apps/xisxwayland/Manifest
+++ b/x11-apps/xisxwayland/Manifest
@@ -1,4 +1,4 @@
DIST xisxwayland-2.tar.xz 5220 BLAKE2B 47bd626ad2cbeb5b0e114a4f603858c82f4f870f16de038bcadd3010f90e140fb8a3b0531e4102da7527c49bcc6bae6039aa6b42c6182da80467d5a3f040b817 SHA512 b89e19c85a5cd7e62a52e22772f80f03bfea069e31412ca11ac38174c4a2994be559e9d5fb49e6d1921b3f1b06ee71b50ede48990a1e7804a96207b08fc7827f
-EBUILD xisxwayland-2.ebuild 661 BLAKE2B 1990f4d4c829ffb120c0e9569aeba483b7219f995510435e937916d239c0d8f1ce0cf36269aeb435c86827c1bd018672f9c5363ac3222be30d0999388857aff5 SHA512 cad417e156f38b595593ca102e77e5908d96e3b7434e14aa0de6d7e9055f6acd878ee89ed8b3204ebacf46aab52a34fef0b0c6f082771a0810e5ff93b890b924
-EBUILD xisxwayland-9999.ebuild 662 BLAKE2B 635fcfe4558cb05792fc914001592ea832245db9e5d1edb540160ca07cdd6a31b282f04b92d42e0bb633112cdfccccecb78424ddd20fc1af21443a064a84abcd SHA512 59b4d65e59ac2476d165837473c1f467c94ac4ea30e142f788ec071c83240832a806e065b479d7a3ca79f0f1fd25a17988fd6f9695e36a478192a534f2385a7e
+EBUILD xisxwayland-2.ebuild 442 BLAKE2B 02e80e999a3ca0fbecf59a4cb2a4aec7e173291c20ecd26698ddfc42d28ddb58123b92e7b2157f5f6941b82ac5720285508808e399bfecd0f98825a2bb9d1e19 SHA512 1899aa7630a972d68b65bb78ffa72214805b584634cf7fc808d8f30bc9fd17e47ac133ac41dfcffe8fc3b77b73a612ceab3a29e6b9df04a182ededc440e00e97
+EBUILD xisxwayland-9999.ebuild 442 BLAKE2B 02e80e999a3ca0fbecf59a4cb2a4aec7e173291c20ecd26698ddfc42d28ddb58123b92e7b2157f5f6941b82ac5720285508808e399bfecd0f98825a2bb9d1e19 SHA512 1899aa7630a972d68b65bb78ffa72214805b584634cf7fc808d8f30bc9fd17e47ac133ac41dfcffe8fc3b77b73a612ceab3a29e6b9df04a182ededc440e00e97
MISC metadata.xml 342 BLAKE2B 22542ce434659a09b234891625d25ab44fb54fb27fc81950a9682ae3250c9b2826c6387460111227f8295ebfe5207a8f7ccb60b80ad79e96c47bfe5ae132170f SHA512 401c20493181e036e7117caa4562c0cf8075b17e1ee384b5e5d6d22a301d6e901fd0936a2cd1f52b50b79e2932f80ceb1a9fd47fc6ede220ce37c9bb2d50aeec
diff --git a/x11-apps/xisxwayland/xisxwayland-2.ebuild b/x11-apps/xisxwayland/xisxwayland-2.ebuild
index c82f6bbc37cd..ea94facec6af 100644
--- a/x11-apps/xisxwayland/xisxwayland-2.ebuild
+++ b/x11-apps/xisxwayland/xisxwayland-2.ebuild
@@ -1,29 +1,24 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+XORG_TARBALL_SUFFIX="xz"
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/app/${PN}.git"
-fi
-
-inherit ${GIT_ECLASS} meson
+inherit xorg-3 meson
-DESCRIPTION="Tool to determine whether the X server in use is Xwayland"
-HOMEPAGE="https://gitlab.freedesktop.org/xorg/app/xisxwayland"
-if [[ ${PV} = 9999* ]]; then
- SRC_URI=""
-else
+if [[ ${PV} != *9999* ]]; then
KEYWORDS="amd64 ~loong"
- SRC_URI="https://xorg.freedesktop.org/archive/individual/app/${P}.tar.xz"
fi
-LICENSE="MIT"
-SLOT="0"
+DESCRIPTION="Tool to determine whether the X server in use is Xwayland"
RDEPEND="
x11-libs/libX11
x11-libs/libXrandr"
DEPEND="${RDEPEND}
x11-base/xorg-proto"
+
+# Override xorg-3's src_prepare
+src_prepare() {
+ default
+}
diff --git a/x11-apps/xisxwayland/xisxwayland-9999.ebuild b/x11-apps/xisxwayland/xisxwayland-9999.ebuild
index c7f9d5034c09..ea94facec6af 100644
--- a/x11-apps/xisxwayland/xisxwayland-9999.ebuild
+++ b/x11-apps/xisxwayland/xisxwayland-9999.ebuild
@@ -1,29 +1,24 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+XORG_TARBALL_SUFFIX="xz"
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/app/${PN}.git"
-fi
-
-inherit ${GIT_ECLASS} meson
+inherit xorg-3 meson
-DESCRIPTION="Tool to determine whether the X server in use is Xwayland"
-HOMEPAGE="https://gitlab.freedesktop.org/xorg/app/xisxwayland"
-if [[ ${PV} = 9999* ]]; then
- SRC_URI=""
-else
- KEYWORDS="~amd64 ~loong"
- SRC_URI="https://xorg.freedesktop.org/archive/individual/app/${P}.tar.xz"
+if [[ ${PV} != *9999* ]]; then
+ KEYWORDS="amd64 ~loong"
fi
-LICENSE="MIT"
-SLOT="0"
+DESCRIPTION="Tool to determine whether the X server in use is Xwayland"
RDEPEND="
x11-libs/libX11
x11-libs/libXrandr"
DEPEND="${RDEPEND}
x11-base/xorg-proto"
+
+# Override xorg-3's src_prepare
+src_prepare() {
+ default
+}