commit: f95e322b1275545e391e18515d1300233540ac46 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Mar 13 22:58:08 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Mar 13 22:58:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f95e322b
dev-libs/weston: Drop old 13.0.0-r4 and 13.0.3-r2 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> dev-libs/weston/Manifest | 2 - dev-libs/weston/files/weston-musl-basename.patch | 73 ----------- dev-libs/weston/files/weston-neatvnc-0.8.patch | 15 --- dev-libs/weston/weston-13.0.0-r4.ebuild | 151 ----------------------- dev-libs/weston/weston-13.0.3-r2.ebuild | 147 ---------------------- 5 files changed, 388 deletions(-) diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index aa57fca2e571..c4fa7edf9ee1 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -1,3 +1 @@ -DIST weston-13.0.0.tar.xz 1986520 BLAKE2B df0e73e451e39b329ed327c370f42bcae01eb5b8fad67711f069fa8f24900ac0c9a9e69b9a6445b67c76ab0ce441dcd2a5a1a8aa3ac0d89a647b9661d575a917 SHA512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc -DIST weston-13.0.3.tar.xz 1986952 BLAKE2B cc3e2be9f1fbcbfd45c9e75a9a34bbb7cd75256d851129e0d29cc0079cbaf4e35eb40b302f557ffe7b89edbc094b1823d667a54d44a9af765945e3ca541068fc SHA512 60e655b57cf418902ec6e4371883354165241d9a99a712aabe2165e11ac190dec22836fd885f5178def5416dc5f00e70042b022c96a8e0aa74827bbd4563f9cb DIST weston-14.0.1.tar.xz 2043220 BLAKE2B 0129b0ca24d912fd7b0155f77ecbcb53c39ae7e761e79f45aa47eb66b729d798365c041f53079410b7e0913cf09b93ec2155f27a7cf5a6d82d6cbd7e1fb3d703 SHA512 2d782f98f28b39b990acecfc885f62ab34c9cdd22ef06b09c5d8df792112c47b365f89c2bf05d871e36ddfb4c49aa7e6d05ff60fe67a2657727162e4f564a412 diff --git a/dev-libs/weston/files/weston-musl-basename.patch b/dev-libs/weston/files/weston-musl-basename.patch deleted file mode 100644 index 57b91331055f..000000000000 --- a/dev-libs/weston/files/weston-musl-basename.patch +++ /dev/null @@ -1,73 +0,0 @@ -From dbd134ca5a3c639819c6fd503de7e2c72762ada0 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Thu, 14 Dec 2023 09:13:54 -0800 -Subject: [PATCH] libweston,tools: Include libgen.h for basename signature -Upstream: https://gitlab.freedesktop.org/wayland/weston/-/commit/dbd134ca5a3c639819c6fd503de7e2c72762ada0 -Upstream-Status: Merged in main branch - -Latest musl has removed the declaration from string.h [1] as it only -implements POSIX version alone and string.h in glibc implements GNU -version of basename. This now results in compile errors on musl. - -This might be a warning with older compilers but it is error with -Clang-17+ as it treats -Wimplicit-function-declaration as error - -Switch the use in backlight_init function to use POSIX version - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Signed-off-by: Khem Raj <[email protected]> ---- - libweston/backend-drm/libbacklight.c | 8 +++++--- - tools/zunitc/src/zunitc_impl.c | 1 + - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/libweston/backend-drm/libbacklight.c b/libweston/backend-drm/libbacklight.c -index ca7f2d6806..973d15ff8c 100644 ---- a/libweston/backend-drm/libbacklight.c -+++ b/libweston/backend-drm/libbacklight.c -@@ -41,6 +41,7 @@ - #include <drm.h> - #include <fcntl.h> - #include <malloc.h> -+#include <libgen.h> - #include <string.h> - #include <errno.h> - -@@ -167,7 +168,7 @@ struct backlight *backlight_init(struct udev_device *drm_device, - DIR *backlights = NULL; - struct dirent *entry; - enum backlight_type type = 0; -- char buffer[100]; -+ char buffer[100], basename_buffer[100]; - struct backlight *backlight = NULL; - int ret; - -@@ -186,9 +187,10 @@ struct backlight *backlight_init(struct udev_device *drm_device, - free(path); - if (ret < 0) - return NULL; -- -+ strncpy(basename_buffer, buffer, ret); - buffer[ret] = '\0'; -- pci_name = basename(buffer); -+ basename_buffer[ret] = '\0'; -+ pci_name = basename(basename_buffer); - - if (connector_type <= 0) - return NULL; -diff --git a/tools/zunitc/src/zunitc_impl.c b/tools/zunitc/src/zunitc_impl.c -index 18f030158e..9b460fa03b 100644 ---- a/tools/zunitc/src/zunitc_impl.c -+++ b/tools/zunitc/src/zunitc_impl.c -@@ -27,6 +27,7 @@ - - #include <errno.h> - #include <fcntl.h> -+#include <libgen.h> - #include <stdarg.h> - #include <stdbool.h> - #include <stdio.h> --- -GitLab - diff --git a/dev-libs/weston/files/weston-neatvnc-0.8.patch b/dev-libs/weston/files/weston-neatvnc-0.8.patch deleted file mode 100644 index 03ffab596c3a..000000000000 --- a/dev-libs/weston/files/weston-neatvnc-0.8.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/930424 -https://gitlab.freedesktop.org/wayland/weston/-/issues/890 - -diff -Naur a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build ---- a/libweston/backend-vnc/meson.build 2023-11-27 18:01:53.000000000 +0000 -+++ b/libweston/backend-vnc/meson.build 2024-04-24 23:55:22.262121014 +0100 -@@ -3,7 +3,7 @@ - endif - - config_h.set('BUILD_VNC_COMPOSITOR', '1') --dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) -+dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep']) - if not dep_neatvnc.found() - error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.') - endif diff --git a/dev-libs/weston/weston-13.0.0-r4.ebuild b/dev-libs/weston/weston-13.0.0-r4.ebuild deleted file mode 100644 index a3c477a7802b..000000000000 --- a/dev-libs/weston/weston-13.0.0-r4.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2024 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..12} ) -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/libdisplay-info-0.1* - >=media-libs/mesa-17.1[gbm(+)] - >=sys-libs/mtdev-1.1.0 - >=virtual/udev-136 - ) - editor? ( x11-libs/pango ) - examples? ( x11-libs/pango ) - gles2? ( media-libs/mesa[gles2(+),wayland] ) - 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:2=[server] ) - remoting? ( - 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.24 -" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/wayland-scanner - virtual/pkgconfig - $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') -" - -PATCHES=( - "${FILESDIR}"/${PN}-neatvnc-0.8.patch -) - -python_check_deps() { - python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" -} - -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-egl,egl "") "") - $(meson_use resize-optimization resize-pool) - -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 -} diff --git a/dev-libs/weston/weston-13.0.3-r2.ebuild b/dev-libs/weston/weston-13.0.3-r2.ebuild deleted file mode 100644 index c6882dcd5452..000000000000 --- a/dev-libs/weston/weston-13.0.3-r2.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2024 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..12} ) -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/libdisplay-info-0.1* - >=media-libs/mesa-17.1[gbm(+)] - >=sys-libs/mtdev-1.1.0 - >=virtual/udev-136 - ) - editor? ( x11-libs/pango ) - examples? ( x11-libs/pango ) - gles2? ( media-libs/mesa[gles2(+),wayland] ) - 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:2=[server] ) - remoting? ( - 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.24 -" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/wayland-scanner - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-neatvnc-0.8.patch - "${FILESDIR}"/${PN}-musl-basename.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-egl,egl "") "") - $(meson_use resize-optimization resize-pool) - -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 -}
