diff options
| author | root <root@alpha.trunkmasters.com> | 2026-06-20 14:54:46 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-06-20 14:54:46 -0500 |
| commit | 1a4479b4e0368c8d5ff241ebad17b2541a7e3ba0 (patch) | |
| tree | 18e2e784f9fb0dbc3546537acc42ad51b366d90e /x11-misc | |
| parent | 9f6a581d94412ab1cf4b35c33101f6be0ddc7777 (diff) | |
| download | baldeagleos-repo-1a4479b4e0368c8d5ff241ebad17b2541a7e3ba0.tar.gz baldeagleos-repo-1a4479b4e0368c8d5ff241ebad17b2541a7e3ba0.tar.xz baldeagleos-repo-1a4479b4e0368c8d5ff241ebad17b2541a7e3ba0.zip | |
Adding metadata
Diffstat (limited to 'x11-misc')
23 files changed, 93 insertions, 470 deletions
diff --git a/x11-misc/bgs/Manifest b/x11-misc/bgs/Manifest deleted file mode 100644 index 2e78040c008d..000000000000 --- a/x11-misc/bgs/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bgs-0.8.tar.gz 5122 BLAKE2B f2d90e945e087c1e45d66c0a5e35dfa3057f422f8f3220a1665e812bc1db824f8dbc50e066387437b91b65e634bbfa43d6dddd55bc168e195abb84b61a37aa40 SHA512 4f7aa32d9cf60252abfc87cf72c7bc20ac691af3684a0923d3e2a3506407bddee9d2e5f49da97a154ed2acf1a876b2952ab61dd412f2de39c1303e7551acaec8 diff --git a/x11-misc/bgs/bgs-0.8.ebuild b/x11-misc/bgs/bgs-0.8.ebuild deleted file mode 100644 index 605c241a0336..000000000000 --- a/x11-misc/bgs/bgs-0.8.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2021 Liguros Authors -# Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Simple background setter based on imlib2" -HOMEPAGE="https://github.com/Gottox/bgs" -SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -LICENSE="MIT" -SLOT="0" -IUSE="xinerama" - -DEPEND=" - xinerama? ( x11-libs/libXinerama ) - media-libs/imlib2 - x11-libs/libX11 -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - sed -e "s/^CC.*/CC = $(tc-getCC)/" \ - -i config.mk || die - - if ! use xinerama; then - sed -e '/XINERAMALIBS =/d' \ - -e '/XINERAMAFLAGS =/d' \ - -i config.mk || die - fi - - default -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - dodoc README -} diff --git a/x11-misc/bgs/metadata.xml b/x11-misc/bgs/metadata.xml deleted file mode 100644 index 898259de385b..000000000000 --- a/x11-misc/bgs/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> - <maintainer type="person"> - <email>azahi@teknik.io</email> - <name>azahi</name> - </maintainer> - <origin>baldeagleos-repo</origin> -</pkgmetadata> diff --git a/x11-misc/setroot/Manifest b/x11-misc/setroot/Manifest deleted file mode 100644 index 2c9cec995d00..000000000000 --- a/x11-misc/setroot/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST setroot-2.0.2.tar.gz 27659 BLAKE2B 79593dd85b0e5d04e09052f7069db105fea74959f960fb0c9719b192cf6aa80f098304ab089822b3a7b7dc58b6033b60fd11bb004348588149e3f9750417e4ba SHA512 1f636c2aed140ac011bab7d4dee6e7f21c8d0ddb6ebfbd45d81db2fe807d2d3882ca6bbd3594f7038710efe3bdff3be0874e5ba4944de40e4897591566e777ae diff --git a/x11-misc/setroot/files/imlib2-config.patch b/x11-misc/setroot/files/imlib2-config.patch deleted file mode 100644 index 82ade8461431..000000000000 --- a/x11-misc/setroot/files/imlib2-config.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN setroot-2.0.2.orig/Makefile setroot-2.0.2/Makefile ---- setroot-2.0.2.orig/Makefile 2022-02-20 11:26:50.214184882 +0100 -+++ setroot-2.0.2/Makefile 2022-02-20 11:36:24.049169767 +0100 -@@ -6,7 +6,7 @@ - CC := gcc - OFLAG := - CFLAGS := -std=c99 -Wall -g -Wextra ${OFLAG} --LIBS := -lX11 `imlib2-config --libs` -+LIBS := -lX11 `pkg-config --libs imlib2` - - SRC := setroot.c - diff --git a/x11-misc/setroot/metadata.xml b/x11-misc/setroot/metadata.xml deleted file mode 100644 index 898259de385b..000000000000 --- a/x11-misc/setroot/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> - <maintainer type="person"> - <email>azahi@teknik.io</email> - <name>azahi</name> - </maintainer> - <origin>baldeagleos-repo</origin> -</pkgmetadata> diff --git a/x11-misc/setroot/setroot-2.0.2-r1.ebuild b/x11-misc/setroot/setroot-2.0.2-r1.ebuild deleted file mode 100644 index c4fde06ccca1..000000000000 --- a/x11-misc/setroot/setroot-2.0.2-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2021-2022 Liguros Authors -# Distributed under the terms of the GNU General Public License v2 -EAPI=8 - -DESCRIPTION="simple X background setter inspired by imlibsetroot and feh" -HOMEPAGE="https://github.com/ttzhou/setroot" -SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -LICENSE="GPL-3" -SLOT="0" -IUSE="xinerama" - -DEPEND=" - media-libs/imlib2 - x11-libs/libX11 - xinerama? ( x11-libs/libXinerama ) -" -RDEPEND="${DEPEND}" -DOCS=( README.asciidoc ) -PATCHES=( - ${FILESDIR}/imlib2-config.patch -) - -src_compile() { - emake xinerama=$(usex xinerama 1 0) -} - -src_install() { - einstalldocs - emake DESTDIR="${D}" PREFIX="/usr" install -} diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest index 527135ee1d4a..186863af4a1c 100644 --- a/x11-misc/virtualgl/Manifest +++ b/x11-misc/virtualgl/Manifest @@ -1,2 +1,2 @@ -DIST virtualgl-3.1.3.tar.gz 2112787 BLAKE2B 17aace908430550d005e0a2e2fd7343b740423a49cce3fe1925bb3d71f4eb419b0d7a6e0ab729eeed66067755d97868e724eb994ae9a8c69c48616456935a61a SHA512 3d291701795c23362ad447fe6b786766b44c443836cd011107e95b99001f3a23b6815f967865e30a405cba3a107e2e5f3a976d8e1d24f6a74d1eb09f039b2e56 -DIST virtualgl-3.1.4.tar.gz 2113699 BLAKE2B b32485b0247ad91df166abed7e22ce18ea7b0d57c016f8fd62db614c8bceba69009a9488a802015860528bdc546114b867e428b5abcfb629f4bab7df9143a1b4 SHA512 286486a979e72b8ced6c8b9813e2d1060140cb6ac4ac3b6d4d8e28b1f9f92134ca5be05987ed9845c42059658b682c6866f91e6a3e31c22b39e2f4438cdf3c86 +DIST VirtualGL-3.1.3.tar.gz 2112779 BLAKE2B 54c171b2ba6b8dd6676104ed34dd0044eae30319e3a7e9886948f9fd624460ce04fe206b1a5448f7401d3726e99ea6187a4c437bd6d2673852e75114b343aa55 SHA512 43e57626efaa86bd5568c61620db5f915db92d6bda2c16f43c6f5d99e9d093bcface8fd0c043af02c58f5d06e9b5f56bbc3cc9fe9b5ec7201902325d49592a92 +DIST VirtualGL-3.1.4.tar.gz 2113747 BLAKE2B d651fd657befff706b846ff0e33801b659b50944fb9abc1b9cb8333fe1b897790e513a9156bea903d9337d093f78d6a74964be5711bdd4d1d43d76923dd96a7c SHA512 266af1ddb923e07f52bba166cd6dd6066b371928946a0cd7cf5d200dde2b4bad6d3c7f1477dd6c575f830b42705468d444e413eedb4305ec34dfefab138d949f diff --git a/x11-misc/virtualgl/files/vgl.initd-r3 b/x11-misc/virtualgl/files/vgl.initd-r3 deleted file mode 100644 index 951d73287d23..000000000000 --- a/x11-misc/virtualgl/files/vgl.initd-r3 +++ /dev/null @@ -1,45 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# TODO: description="*" and other OpenRC 0.9+ candies - -depend() { - need xdm - after sshd -} - -start() { - ebegin "Starting VirtualGL" - truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key - - set_xauth - - if [ -z "$XAUTHORITY" ]; then - - einfo "Waiting for xauthority..." - - # wait for xauth file - while true; do - set_xauth - - if [ -e "$XAUTHORITY" ]; then - break; - fi - - sleep 1 - done - fi - - - xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . $(xauth -f $XAUTHORITY list | awk '{print $3;exit}') && \ - chmod 644 /var/lib/VirtualGL/vgl_xauth_key - eend $? -} - -stop() { - ebegin "Stopping VirtualGL" - [ -f /var/lib/VirtualGL/vgl_xauth_key ] && \ - rm /var/lib/VirtualGL/vgl_xauth_key - eend $? -} diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml index 92c056da86cd..ca7c20eafc5f 100644 --- a/x11-misc/virtualgl/metadata.xml +++ b/x11-misc/virtualgl/metadata.xml @@ -1,23 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> - <maintainer type="person"> - <email>np-hardass@gentoo.org</email> - <name>Adam Feldman</name> - </maintainer> <maintainer type="person"> <email>pacho@gentoo.org</email> <name>Pacho Ramos</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>rei4dan@gmail.com</email> <name>My Th</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/x11-misc/virtualgl/virtualgl-3.1.3.ebuild b/x11-misc/virtualgl/virtualgl-3.1.3.ebuild index 3df93d9b2f50..89fef3628cc5 100644 --- a/x11-misc/virtualgl/virtualgl-3.1.3.ebuild +++ b/x11-misc/virtualgl/virtualgl-3.1.3.ebuild @@ -1,24 +1,28 @@ -# Copyright 2021-2025 Liguros Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 + EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib flag-o-matic systemd -SRC_URI="https://github.com/VirtualGL/virtualgl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git" + inherit git-r3 +else + MY_PN="VirtualGL" + MY_P="${MY_PN}-${PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/VirtualGL/${PN}/releases/download/${PV}/${MY_P}.tar.gz" + KEYWORDS="amd64 x86" +fi + DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" HOMEPAGE="https://www.virtualgl.org/" +LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" SLOT="0" -LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" -IUSE=" ssl" RDEPEND=" - ssl? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - - ) media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] @@ -40,7 +44,9 @@ RDEPEND=" >=virtual/opengl-7.0-r1[abi_x86_32] ) ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-util/opencl-headers +" src_prepare() { # Use /var/lib, bug #428122 @@ -57,7 +63,6 @@ src_configure() { abi_configure() { local mycmakeargs=( - -DVGL_USESSL="$(usex ssl)" -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" -DTJPEG_INCLUDE_DIR=/usr/include -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL @@ -73,7 +78,7 @@ src_install() { cmake-multilib_src_install # Make config dir - dodir /var/lib/VirtualGL + keepdir /var/lib/VirtualGL fowners root:video /var/lib/VirtualGL fperms 0750 /var/lib/VirtualGL newinitd "${FILESDIR}/vgl.initd-r4" vgl @@ -84,11 +89,10 @@ src_install() { systemd_dounit "${FILESDIR}/vgl.service" # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs + # and eglinfo to veglinto because of conflict with mesa-progs[egl] mv "${D}"/usr/bin/{,v}glxinfo || die + mv "${D}"/usr/bin/{,v}eglinfo || die # Remove license files, bug 536284 rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die - - # Directory is created if needed at runtime - rm -r "${D}"/var/lib || die } diff --git a/x11-misc/virtualgl/virtualgl-3.1.4.ebuild b/x11-misc/virtualgl/virtualgl-3.1.4.ebuild index 3df93d9b2f50..89fef3628cc5 100644 --- a/x11-misc/virtualgl/virtualgl-3.1.4.ebuild +++ b/x11-misc/virtualgl/virtualgl-3.1.4.ebuild @@ -1,24 +1,28 @@ -# Copyright 2021-2025 Liguros Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 + EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib flag-o-matic systemd -SRC_URI="https://github.com/VirtualGL/virtualgl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git" + inherit git-r3 +else + MY_PN="VirtualGL" + MY_P="${MY_PN}-${PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/VirtualGL/${PN}/releases/download/${PV}/${MY_P}.tar.gz" + KEYWORDS="amd64 x86" +fi + DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" HOMEPAGE="https://www.virtualgl.org/" +LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" SLOT="0" -LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" -IUSE=" ssl" RDEPEND=" - ssl? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - - ) media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] @@ -40,7 +44,9 @@ RDEPEND=" >=virtual/opengl-7.0-r1[abi_x86_32] ) ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-util/opencl-headers +" src_prepare() { # Use /var/lib, bug #428122 @@ -57,7 +63,6 @@ src_configure() { abi_configure() { local mycmakeargs=( - -DVGL_USESSL="$(usex ssl)" -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" -DTJPEG_INCLUDE_DIR=/usr/include -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL @@ -73,7 +78,7 @@ src_install() { cmake-multilib_src_install # Make config dir - dodir /var/lib/VirtualGL + keepdir /var/lib/VirtualGL fowners root:video /var/lib/VirtualGL fperms 0750 /var/lib/VirtualGL newinitd "${FILESDIR}/vgl.initd-r4" vgl @@ -84,11 +89,10 @@ src_install() { systemd_dounit "${FILESDIR}/vgl.service" # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs + # and eglinfo to veglinto because of conflict with mesa-progs[egl] mv "${D}"/usr/bin/{,v}glxinfo || die + mv "${D}"/usr/bin/{,v}eglinfo || die # Remove license files, bug 536284 rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die - - # Directory is created if needed at runtime - rm -r "${D}"/var/lib || die } diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest index cfad26a89b74..6b118ccd04c1 100644 --- a/x11-misc/x11vnc/Manifest +++ b/x11-misc/x11vnc/Manifest @@ -1,2 +1 @@ -DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec DIST x11vnc-0.9.17.tar.gz 1691520 BLAKE2B c8b61b2d48517e68a579faa077bef5d2de371fb5567294908ef824d2521cf439cdf7f4efa076e659a20bf4c726d19fc88e4481b4e3c2f745b1a8aa3e39880376 SHA512 687c41e03cca43dbca6ffdeb40960dddfba54ba00cf890f89f63fd66b9559a4c09602f84c1d4b7ffd7ac58818b90893013925d94a45a6feb83ab8cf7a02c1fe8 diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch deleted file mode 100644 index 12f65b94fb62..000000000000 --- a/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= <guenal.davalan@uca.fr> -Date: Wed, 18 Nov 2020 08:40:45 +0100 -Subject: [PATCH] scan: limit access to shared memory segments to current user - ---- - src/scan.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/scan.c b/src/scan.c -index 43e00d2..12994d5 100644 ---- a/src/scan.c -+++ b/src/scan.c -@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage **ximg_ptr, int w, int h, - - #if HAVE_XSHM - shm->shmid = shmget(IPC_PRIVATE, -- xim->bytes_per_line * xim->height, IPC_CREAT | 0777); -+ xim->bytes_per_line * xim->height, IPC_CREAT | 0600); - - if (shm->shmid == -1) { - rfbErr("shmget(%s) failed.\n", name); --- -2.26.2 - diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch deleted file mode 100644 index 21872e73cb7c..000000000000 --- a/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3024af3685be9eb618352bd17ba37953d8076946 Mon Sep 17 00:00:00 2001 -From: Christian Beier <dontmind@freeshell.org> -Date: Thu, 17 Jan 2019 14:05:53 +0100 -Subject: [PATCH] unixpw: don't try to use crypt() when it isn't available - -Closes #86 ---- - src/unixpw.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/unixpw.c b/src/unixpw.c -index 9a43cec..e2cb016 100644 ---- a/src/unixpw.c -+++ b/src/unixpw.c -@@ -757,7 +757,7 @@ int unixpw_list_match(char *user) { - } - - int crypt_verify(char *user, char *pass) { --#ifndef UNIXPW_CRYPT -+#if !defined UNIXPW_CRYPT || !defined HAVE_LIBCRYPT - return 0; - #else - struct passwd *pwd; diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch deleted file mode 100644 index 504159efe92f..000000000000 --- a/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexander@tsoy.me> -Date: Tue, 28 Jan 2020 22:21:01 +0300 -Subject: [PATCH] Fix build with -fno-common - -GCC 10 defaults to -fno-common ---- - src/util.c | 3 +++ - src/util.h | 6 +++--- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/util.c b/src/util.c -index a82a1a4..6a52ebf 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -47,6 +47,9 @@ int hxl = 0; - #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD - MUTEX(x11Mutex); - MUTEX(scrollMutex); -+MUTEX(clientMutex); -+MUTEX(inputMutex); -+MUTEX(pointerMutex); - #endif - - int nfix(int i, int n); -diff --git a/src/util.h b/src/util.h -index 35c1afd..99b5dd1 100644 ---- a/src/util.h -+++ b/src/util.h -@@ -102,9 +102,9 @@ extern struct timeval _mysleep; - #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD - extern MUTEX(x11Mutex); - extern MUTEX(scrollMutex); --MUTEX(clientMutex); --MUTEX(inputMutex); --MUTEX(pointerMutex); -+extern MUTEX(clientMutex); -+extern MUTEX(inputMutex); -+extern MUTEX(pointerMutex); - #endif - - #define X_INIT INIT_MUTEX(x11Mutex) --- -2.24.1 - diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.17-implicit-function-declaration.patch b/x11-misc/x11vnc/files/x11vnc-0.9.17-implicit-function-declaration.patch new file mode 100644 index 000000000000..55481783a3c4 --- /dev/null +++ b/x11-misc/x11vnc/files/x11vnc-0.9.17-implicit-function-declaration.patch @@ -0,0 +1,26 @@ +From f71fa6e9159b4514c9a1bec813ac166f47d58ed9 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <alexander@tsoy.me> +Date: Mon, 6 Mar 2023 00:57:20 +0300 +Subject: [PATCH] configure: drop AC_FUNC_STAT macro + +This macro is obsolescent and doesn't work with +-Werror=implicit-function-declaration compiler flag +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2fd443a..f891d81 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -496,7 +496,6 @@ if test $inaddrt = no ; then + fi + # Checks for library functions. + AC_FUNC_MEMCMP +-AC_FUNC_STAT + AC_FUNC_STRFTIME + AC_FUNC_VPRINTF + AC_FUNC_FORK +-- +2.49.0 + diff --git a/x11-misc/x11vnc/files/x11vnc.conf.d b/x11-misc/x11vnc/files/x11vnc.conf.d index 91f2a137675a..7df3a1317a97 100644 --- a/x11-misc/x11vnc/files/x11vnc.conf.d +++ b/x11-misc/x11vnc/files/x11vnc.conf.d @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Configuration for running x11vnc as a service. This allows VNC diff --git a/x11-misc/x11vnc/files/x11vnc.init.d b/x11-misc/x11vnc/files/x11vnc.init.d deleted file mode 100644 index 4adcb2388e86..000000000000 --- a/x11-misc/x11vnc/files/x11vnc.init.d +++ /dev/null @@ -1,70 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="The x11vnc daemon init script" - -depend() { - need net - need xdm -} - -checkconfig() { - - # Set Defaults - X11VNC_RFBAUTH=${X11VNC_RFBAUTH:-/etc/x11vnc.pass} - X11VNC_RFBPORT=${X11VNC_RFBPORT:-5900} - X11VNC_DISPLAY=${X11VNC_DISPLAY:-:0} - X11VNC_LOG=${X11VNC_LOG:-/var/log/x11vnc} - - X11VNC_AUTH="/var/run/x11vnc-${X11VNC_DISPLAY}" - - if [ -n "${X11VNC_AUTOPORT}" ]; then - X11VNC_PORT="" - fi - - if [ ! -f "${X11VNC_RFBAUTH}" -o ! -s "${X11VNC_RFBAUTH}" ]; then - eerror "VNC Password not set, please set one by running: \`x11vnc -storepasswd ${X11VNC_RFBAUTH}\`" - return 1 - fi - checkpath -q -f -m 0600 -o root:root "${X11VNC_RFBAUTH}" - - # Attempt to find X-Auth file - if ! type xauth > /dev/null 2>&1 || - ! xauth -f /root/.Xauthority extract - "${X11VNC_DISPLAY}" > "${X11VNC_AUTH}" 2>/dev/null || - [ ! -s "${X11VNC_AUTH}" ]; then - # Let x11vnc guess at auth - X11VNC_AUTH_OPTS="--env FD_XDM=1 -auth guess" - else - # We found the proper auth - X11VNC_AUTH_OPTS="-auth ${X11VNC_AUTH}" - fi - - if [ ! -f "${X11VNC_AUTH}" ]; then - eerror "Specified X-Authority file '${X11VNC_AUTH}' not found!" - return 1 - fi -} - -start() { - checkconfig || return 1 - - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start \ - --exec /usr/bin/x11vnc -- \ - ${X11VNC_AUTH_OPTS} \ - -rfbauth ${X11VNC_RFBAUTH} \ - ${X11VNC_RFBPORT:+-rfbport} ${X11VNC_RFBPORT} \ - ${X11VNC_AUTOPORT:+-autoport} ${X11VNC_AUTOPORT} \ - -display ${X11VNC_DISPLAY} \ - -o ${X11VNC_LOG} \ - -bg -forever \ - ${X11VNC_OPTS} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop /usr/bin/x11vnc - eend $? -} diff --git a/x11-misc/x11vnc/files/x11vnc.init.d-r1 b/x11-misc/x11vnc/files/x11vnc.init.d-r1 index 04c36ea361db..8907b3858a31 100644 --- a/x11-misc/x11vnc/files/x11vnc.init.d-r1 +++ b/x11-misc/x11vnc/files/x11vnc.init.d-r1 @@ -16,8 +16,8 @@ checkconfig() { X11VNC_RFBPORT=${X11VNC_RFBPORT:-5900} X11VNC_DISPLAY=${X11VNC_DISPLAY:-:0} X11VNC_LOG=${X11VNC_LOG:-/var/log/x11vnc} - - X11VNC_AUTH="/var/run/x11vnc-${X11VNC_DISPLAY}" + + X11VNC_AUTH="/var/run/x11vnc-${X11VNC_DISPLAY}" if [ -n "${X11VNC_AUTOPORT}" ]; then X11VNC_PORT="" @@ -30,7 +30,7 @@ checkconfig() { checkpath -q -f -m 0600 -o root:root "${X11VNC_RFBAUTH}" # Attempt to find X-Auth file - if ! type xauth > /dev/null 2>&1 || + if ! command -v xauth > /dev/null 2>&1 || ! xauth -f /root/.Xauthority extract - "${X11VNC_DISPLAY}" > "${X11VNC_AUTH}" 2>/dev/null || [ ! -s "${X11VNC_AUTH}" ]; then # Let x11vnc guess at auth @@ -43,7 +43,7 @@ checkconfig() { if [ ! -f "${X11VNC_AUTH}" ]; then eerror "Specified X-Authority file '${X11VNC_AUTH}' not found!" return 1 - fi + fi } start() { diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml index 71c1472b1a46..27a10fea6f48 100644 --- a/x11-misc/x11vnc/metadata.xml +++ b/x11-misc/x11vnc/metadata.xml @@ -1,15 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>alexander@tsoy.me</email> <name>Alexander Tsoy</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> @@ -18,10 +14,8 @@ simple command-line server utility that allows a VNC viewer to connect to an actual X display. </longdescription> - <upstream> - <remote-id type="cpe">cpe:/a:x11vnc_project:x11vnc</remote-id> - </upstream> <use> + <flag name="drm">Use x11-libs/libdrm to support shm key and drm schema in -rawfb option</flag> <flag name="xdamage">Enable support for the Xdamage library</flag> <flag name="xfixes">Enable support for the Xfixes library</flag> <flag name="xrandr">Enable support for the X xrandr extension</flag> diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild deleted file mode 100644 index 1f3e9c959993..000000000000 --- a/x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 2021-2022 Ligutos Authors -# Distributed under the terms of the GNU General Public License v2 -EAPI=8 - -inherit autotools - -DESCRIPTION="VNC server for real X displays" -HOMEPAGE="https://libvnc.github.io/" -SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" - -COMMON_DEPEND=" - >=net-libs/libvncserver-0.9.8[ssl=] - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - >=x11-libs/libXtst-1.1.0 - ssl? ( - dev-libs/openssl:0= - - ) - xcomposite? ( x11-libs/libXcomposite ) - xdamage? ( x11-libs/libXdamage ) - xfixes? ( x11-libs/libXfixes ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr ) - zeroconf? ( >=net-dns/avahi-0.6.4 ) -" -DEPEND=" - ${COMMON_DEPEND} - virtual/libcrypt - x11-base/xorg-proto - x11-libs/libXt -" -# https://bugzilla.redhat.com/show_bug.cgi?id=920554 -RDEPEND="${COMMON_DEPEND} - dev-lang/tk:0 -" - -PATCHES=( - "${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86 - "${FILESDIR}"/${P}-fno-common.patch - "${FILESDIR}"/${P}-CVE-2020-29074.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # --without-v4l because of missing video4linux 2.x support wrt #389079 - local myconf=( - --without-v4l - --without-xkeyboard - --without-fbpm - --without-dpms - $(use_with crypt) - $(use_with fbcon fbdev) - $(use_with ssl) - $(use_with ssl crypto) - $(use_with xcomposite) - $(use_with xdamage) - $(use_with xfixes) - $(use_with xinerama) - $(use_with xrandr) - $(use_with zeroconf avahi) - ) - econf "${myconf[@]}" -} - -src_install() { - default - newinitd "${FILESDIR}/x11vnc.init.d-r1" x11vnc - newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc -} diff --git a/x11-misc/x11vnc/x11vnc-0.9.17.ebuild b/x11-misc/x11vnc/x11vnc-0.9.17.ebuild index 3dc50a5a209a..eb46cc7cd042 100644 --- a/x11-misc/x11vnc/x11vnc-0.9.17.ebuild +++ b/x11-misc/x11vnc/x11vnc-0.9.17.ebuild @@ -1,5 +1,6 @@ -# Copyright 2021-2025 Ligutos Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 + EAPI=8 inherit autotools @@ -10,8 +11,8 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris" +IUSE="crypt drm fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" COMMON_DEPEND=" >=net-libs/libvncserver-0.9.8[ssl=] @@ -19,10 +20,9 @@ COMMON_DEPEND=" x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 - ssl? ( - dev-libs/openssl:0= - - ) + virtual/libcrypt:= + drm? ( x11-libs/libdrm ) + ssl? ( dev-libs/openssl:0= ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) @@ -30,9 +30,7 @@ COMMON_DEPEND=" xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) " -DEPEND=" - ${COMMON_DEPEND} - virtual/libcrypt +DEPEND="${COMMON_DEPEND} x11-base/xorg-proto x11-libs/libXt " @@ -41,6 +39,12 @@ RDEPEND="${COMMON_DEPEND} dev-lang/tk:0 " +DOCS=( NEWS README doc/. ) + +PATCHES=( + "${FILESDIR}"/${P}-implicit-function-declaration.patch # https://github.com/LibVNC/x11vnc/pull/268 +) + src_prepare() { default eautoreconf @@ -54,6 +58,7 @@ src_configure() { --without-fbpm --without-dpms $(use_with crypt) + $(use_with drm) $(use_with fbcon fbdev) $(use_with ssl) $(use_with ssl crypto) |
