From efba46500654a6498b16e88fbbcf2fd35bb111e8 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sun, 21 Dec 2025 11:45:30 +0000 Subject: [PATCH 1/4] games-engines/zoom: Find libXft with pkg-config rather than xft-config Closes: https://bugs.gentoo.org/967824 Signed-off-by: James Le Cuirot --- .../zoom/files/zoom-1.1.5-xft-config.patch | 15 +++++++++++++++ games-engines/zoom/zoom-1.1.5-r2.ebuild | 17 +++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 games-engines/zoom/files/zoom-1.1.5-xft-config.patch diff --git a/games-engines/zoom/files/zoom-1.1.5-xft-config.patch b/games-engines/zoom/files/zoom-1.1.5-xft-config.patch new file mode 100644 index 0000000000000..892bd43f9c6d3 --- /dev/null +++ b/games-engines/zoom/files/zoom-1.1.5-xft-config.patch @@ -0,0 +1,15 @@ +--- a/configure.in ++++ b/configure.in +@@ -356,10 +356,10 @@ + + # If Xft is installed, then there will be a xft-config file on the current path + AC_MSG_CHECKING([for xft-config]) +- XFTCONFIG=`which xft-config` ++ XFTCONFIG="${PKG_CONFIG:-pkg-config} xft" + XFT_CFLAGS="" + XFT_LIBS="" +- if test -x ${XFTCONFIG}; then ++ if ${XFTCONFIG} --exists; then + AC_MSG_RESULT([$XFTCONFIG]) + XFT_CFLAGS=`${XFTCONFIG} --cflags` + XFT_LIBS=`${XFTCONFIG} --libs` diff --git a/games-engines/zoom/zoom-1.1.5-r2.ebuild b/games-engines/zoom/zoom-1.1.5-r2.ebuild index c9571f5e71793..5ec55ab944ab4 100644 --- a/games-engines/zoom/zoom-1.1.5-r2.ebuild +++ b/games-engines/zoom/zoom-1.1.5-r2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit autotools + DESCRIPTION="Fast, clean, modern Z-code interpreter for X" HOMEPAGE="https://www.logicalshift.co.uk/unix/zoom/" SRC_URI="https://www.logicalshift.co.uk/unix/zoom/${P}.tar.gz" @@ -20,8 +22,19 @@ RDEPEND="!net-im/zoom[zoom-symlink(+)] DEPEND="${RDEPEND} dev-lang/perl x11-base/xorg-proto" +BDEPEND=" + virtual/pkgconfig +" -PATCHES=( "${FILESDIR}"/${P}-gcc7.patch ) +PATCHES=( + "${FILESDIR}"/${P}-gcc7.patch + "${FILESDIR}"/${P}-xft-config.patch +) + +src_prepare() { + default + AT_M4DIR="m4" eautoreconf +} src_install() { default From a355ad581513dc7339fdac06fdf3be1d5ad496b0 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Wed, 17 Dec 2025 11:02:19 +0100 Subject: [PATCH 2/4] games-puzzle/magiccube4d: max jdk-25 Closes: https://bugs.gentoo.org/965729 Signed-off-by: Volkmar W. Pogatzki Part-of: https://github.com/gentoo/gentoo/pull/45060 Closes: https://github.com/gentoo/gentoo/pull/45060 Signed-off-by: James Le Cuirot --- ...ccube4d-4.3.343.ebuild => magiccube4d-4.3.343-r1.ebuild} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename games-puzzle/magiccube4d/{magiccube4d-4.3.343.ebuild => magiccube4d-4.3.343-r1.ebuild} (89%) diff --git a/games-puzzle/magiccube4d/magiccube4d-4.3.343.ebuild b/games-puzzle/magiccube4d/magiccube4d-4.3.343-r1.ebuild similarity index 89% rename from games-puzzle/magiccube4d/magiccube4d-4.3.343.ebuild rename to games-puzzle/magiccube4d/magiccube4d-4.3.343-r1.ebuild index 99641bd510a5e..e522645fcf21d 100644 --- a/games-puzzle/magiccube4d/magiccube4d-4.3.343.ebuild +++ b/games-puzzle/magiccube4d/magiccube4d-4.3.343-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=">=virtual/jre-1.8:*" -DEPEND=">=virtual/jdk-1.8:*" +DEPEND=" Date: Sun, 21 Dec 2025 11:54:27 +0000 Subject: [PATCH 3/4] dev-libs/weston: Drop old 14.0.1-r2 Signed-off-by: James Le Cuirot --- dev-libs/weston/Manifest | 1 - dev-libs/weston/weston-14.0.1-r2.ebuild | 155 ------------------------ 2 files changed, 156 deletions(-) delete mode 100644 dev-libs/weston/weston-14.0.1-r2.ebuild diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index e4ce51db57b19..4f6ea8e40ce47 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -1,2 +1 @@ -DIST weston-14.0.1.tar.xz 2043220 BLAKE2B 0129b0ca24d912fd7b0155f77ecbcb53c39ae7e761e79f45aa47eb66b729d798365c041f53079410b7e0913cf09b93ec2155f27a7cf5a6d82d6cbd7e1fb3d703 SHA512 2d782f98f28b39b990acecfc885f62ab34c9cdd22ef06b09c5d8df792112c47b365f89c2bf05d871e36ddfb4c49aa7e6d05ff60fe67a2657727162e4f564a412 DIST weston-14.0.2.tar.xz 2043392 BLAKE2B 5ba3a563925d966adf1fdb5f7e00f90ad0b27b0fdb3781f055f17f01e75ff234f9103529bd8a24d440047ec654db91f8f264da6228410dd2b668138ad458f6ae SHA512 e8214ec893e6c3ae94eb3c92feba104b0201843e9143f726a3e9a4d396d02523c94da706c1348cf934bc339fb1a4bc1fecdb865f0ea914115fd346d9eda091f5 diff --git a/dev-libs/weston/weston-14.0.1-r2.ebuild b/dev-libs/weston/weston-14.0.1-r2.ebuild deleted file mode 100644 index d12b8a3da15fb..0000000000000 --- a/dev-libs/weston/weston-14.0.1-r2.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git" - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python3_{10..13} ) -inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS} - -DESCRIPTION="Wayland reference compositor" -HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston" - -if [[ ${PV} = *9999* ]]; then - SRC_URI="${SRC_PATCHES}" -else - SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz" - KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" -fi - -LICENSE="MIT CC-BY-SA-3.0" -SLOT="0" - -IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - drm? ( gles2 ) - pipewire? ( drm ) - remoting? ( drm gles2 ) - screen-sharing? ( rdp ) - test? ( desktop headless lcms xwayland ) - wayland-compositor? ( gles2 ) - || ( drm headless rdp vnc wayland-compositor X ) -" - -RDEPEND=" - >=dev-libs/libinput-1.2.0 - >=dev-libs/wayland-1.22.0 - media-libs/libpng:0= - sys-auth/seatd:= - >=x11-libs/cairo-1.11.3 - >=x11-libs/libdrm-2.4.108 - >=x11-libs/libxkbcommon-0.5.0 - >=x11-libs/pixman-0.25.2 - x11-misc/xkeyboard-config - drm? ( - =media-libs/mesa-21.1.1 - >=sys-libs/mtdev-1.1.0 - >=virtual/udev-136 - ) - editor? ( x11-libs/pango ) - examples? ( - dev-libs/glib:2 - x11-libs/pango - gles2? ( - >=media-libs/mesa-21.1.1 - >=virtual/udev-136 - ) - ) - gles2? ( media-libs/libglvnd ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - lcms? ( >=media-libs/lcms-2.9:2 ) - pipewire? ( >=media-video/pipewire-0.3:= ) - rdp? ( >=net-misc/freerdp-2.3.0:=[server] ) - remoting? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - systemd? ( sys-apps/systemd ) - vnc? ( - =dev-libs/aml-0.3* - =gui-libs/neatvnc-0.8* - sys-libs/pam - ) - webp? ( media-libs/libwebp:0= ) - X? ( - >=x11-libs/libxcb-1.9 - x11-libs/libX11 - ) - xwayland? ( - x11-base/xwayland - x11-libs/cairo[X,xcb(+)] - >=x11-libs/libxcb-1.9 - x11-libs/libXcursor - >=x11-libs/xcb-util-cursor-0.1.4 - ) -" -DEPEND="${RDEPEND} - >=dev-libs/wayland-protocols-1.33 -" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/wayland-scanner - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-kiosk-test.patch -) - -src_configure() { - local emesonargs=( - $(meson_use drm backend-drm) - -Dbackend-drm-screencast-vaapi=false - $(meson_use headless backend-headless) - $(meson_use pipewire backend-pipewire) - $(meson_use rdp backend-rdp) - $(meson_use screen-sharing screenshare) - $(meson_use vnc backend-vnc) - $(meson_use wayland-compositor backend-wayland) - $(meson_use X backend-x11) - -Dbackend-default=auto - $(meson_use gles2 renderer-gl) - $(meson_use xwayland) - $(meson_use systemd) - $(meson_use remoting) - $(meson_use pipewire) - $(meson_use desktop shell-desktop) - $(meson_use fullscreen shell-fullscreen) - $(meson_use ivi shell-ivi) - $(meson_use kiosk shell-kiosk) - $(meson_use lcms color-management-lcms) - $(meson_use jpeg image-jpeg) - $(meson_use webp image-webp) - -Dtools=debug,info,terminal - $(meson_use examples demo-clients) - -Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-feedback,dmabuf-egl,egl "") "") - $(meson_use resize-optimization resize-pool) - $(meson_use test tests) - -Dtest-junit-xml=false - "${myconf[@]}" - ) - meson_src_configure -} - -src_test() { - xdg_environment_reset - addwrite /dev/dri/ - - # xwayland test can fail if X11 socket already exists. - cd "${BUILD_DIR}" || die - meson test $(meson test --list | grep -Exv "xwayland") || die -} - -src_install() { - meson_src_install - readme.gentoo_create_doc -} From a6dfaf6afefcda460cd09211932bf8d311f3dd0c Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sun, 21 Dec 2025 11:55:20 +0000 Subject: [PATCH 4/4] media-libs/libdisplay-info: Drop old 0.2.0-r1 Signed-off-by: James Le Cuirot --- media-libs/libdisplay-info/Manifest | 1 - .../libdisplay-info-0.2.0-r1.ebuild | 22 ------------------- 2 files changed, 23 deletions(-) delete mode 100644 media-libs/libdisplay-info/libdisplay-info-0.2.0-r1.ebuild diff --git a/media-libs/libdisplay-info/Manifest b/media-libs/libdisplay-info/Manifest index 3abff170a8224..1bb34961f1c07 100644 --- a/media-libs/libdisplay-info/Manifest +++ b/media-libs/libdisplay-info/Manifest @@ -1,2 +1 @@ -DIST libdisplay-info-0.2.0.tar.xz 95280 BLAKE2B bcfec916c1f30204e5e0af9e3e57a5ef9929c09912a5c1302fbfb76b54208ad4b96fe1c972afe1814c5762f9f78b0ff093f2249ee0dbf6f1b30202722bd05449 SHA512 6e910b832860d920a4be298a2b6925f701654bd7cdd8b3457e64663c25caa20a74b81b91f71878b9e7f5f70c5c067235f0c99293650231920c67d1241a61e1fb DIST libdisplay-info-0.3.0.tar.xz 113028 BLAKE2B 260b97feef6a10acaee62fd93aeabdeb061045ee73ec5aa56fe609a7779b37b8da0a86a98630f1ee936e7cb45a227c7e18f3965fd83973c551dcaab60b3b7157 SHA512 3266633d75ccd345dda5a8aad75f310e55a77654b48f17a247b35e18060b6db1047a69083cd286b43ec893125a36c4c43659af8f74a04da3278eea9fdd91efe9 diff --git a/media-libs/libdisplay-info/libdisplay-info-0.2.0-r1.ebuild b/media-libs/libdisplay-info/libdisplay-info-0.2.0-r1.ebuild deleted file mode 100644 index bc75827b7f373..0000000000000 --- a/media-libs/libdisplay-info/libdisplay-info-0.2.0-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) - -inherit meson python-any-r1 - -DESCRIPTION="EDID and DisplayID library" -HOMEPAGE="https://gitlab.freedesktop.org/emersion/libdisplay-info" -SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/${PV}/downloads/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0/$(ver_cut 2)" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" - -BDEPEND=" - ${PYTHON_DEPS} - sys-apps/hwdata - virtual/pkgconfig -"