diff options
author | James Le Cuirot <chewi@gentoo.org> | 2023-06-24 14:18:22 +0100 |
---|---|---|
committer | James Le Cuirot <chewi@gentoo.org> | 2023-06-24 14:41:11 +0100 |
commit | 6682d4c677229bc9c3d63488669c8c7d1b3d1a4a (patch) | |
tree | 5495e615cf93e222d1ba15929f36d174fda3389f | |
parent | dev-lang/perl: move to -r2 to clean up the mess, sorry (diff) | |
download | gentoo-6682d4c677229bc9c3d63488669c8c7d1b3d1a4a.tar.gz gentoo-6682d4c677229bc9c3d63488669c8c7d1b3d1a4a.tar.bz2 gentoo-6682d4c677229bc9c3d63488669c8c7d1b3d1a4a.zip |
dev-libs/weston: Drop old 10.0.0
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
-rw-r--r-- | dev-libs/weston/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/weston/files/weston-10.0.0-backend-default.patch | 27 | ||||
-rw-r--r-- | dev-libs/weston/files/weston-10.0.0-test-deps.patch | 34 | ||||
-rw-r--r-- | dev-libs/weston/metadata.xml | 1 | ||||
-rw-r--r-- | dev-libs/weston/weston-10.0.0.ebuild | 153 |
5 files changed, 0 insertions, 216 deletions
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index 13a8b5ea909a..a7a46a867df7 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -1,3 +1,2 @@ -DIST weston-10.0.0.tar.xz 1774600 BLAKE2B b2b8fa4f7542aba03970ca8abf504f340f8f8da9f9581c16ceac5c702eac355f5d4244778393a8804017f39dff490431e26a48580746033158bd2d2b721437f8 SHA512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4 DIST weston-11.0.1.tar.xz 1900796 BLAKE2B 33d7d5b3340e7074265885bd54ee039e8b5d448fa9f58f4bf9f823efd2557da9b916d903119565a806ab698382fe185165c8ede8614e983c872dfe15b474b616 SHA512 d451230fc260b45aaaadb5cf0aa360629e45e72e3b3676c6ec040d6c6549dbb57d05683effd962c3b2d61482b47a6c990d12cc736c896b501d982c8c4d34834c DIST weston-12.0.1.tar.xz 1969772 BLAKE2B d7a76ad6e11b76b73b91aeb9b3b49e823ecc8170bd1306f9a8ed90fa49d9bc7734e4c0595ca67f11421ecf5b4dbf04289cf803726c508e8c979a9850c0e94ccb SHA512 3dcfa1a2a6b9a605d3ecd597bf7ac0f87b0fd1971845b6e5c44b5e34296943ac146dae6e1cfea9be14ad7a9a8b6d30dc765f9289ef80920d7c516ebba1ba4688 diff --git a/dev-libs/weston/files/weston-10.0.0-backend-default.patch b/dev-libs/weston/files/weston-10.0.0-backend-default.patch deleted file mode 100644 index 710639e7e9c5..000000000000 --- a/dev-libs/weston/files/weston-10.0.0-backend-default.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 35e3fb72ac28af628aa1d2b7ee804a3f81720c47 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Fri, 4 Feb 2022 23:43:50 +0000 -Subject: [PATCH] meson.build: Fix -Dbackend-default=auto following fbdev - deprecation - -Signed-off-by: James Le Cuirot <chewi@gentoo.org> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 1c73e130..d761903e 100644 ---- a/meson.build -+++ b/meson.build -@@ -121,7 +121,7 @@ config_h.set10('TEST_GL_RENDERER', get_option('test-gl-renderer')) - - backend_default = get_option('backend-default') - if backend_default == 'auto' -- foreach b : [ 'headless', 'fbdev', 'x11', 'wayland', 'drm' ] -+ foreach b : [ 'headless', 'x11', 'wayland', 'drm' ] - if get_option('backend-' + b) - backend_default = b - endif --- -2.34.1 - diff --git a/dev-libs/weston/files/weston-10.0.0-test-deps.patch b/dev-libs/weston/files/weston-10.0.0-test-deps.patch deleted file mode 100644 index cc6ad8c6e130..000000000000 --- a/dev-libs/weston/files/weston-10.0.0-test-deps.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9516859b9fdb2899a37116b55200fb04f7726b45 Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniels@collabora.com> -Date: Tue, 8 Feb 2022 22:39:42 +0000 -Subject: [PATCH] tests: Add dependency on screenshooter client protocol - -Given that the test-helper code relies on the screenshooter protocol, -make sure it's available for us to build, and the dependency ensures we -build in order. - -Fixes: #588 - -Signed-off-by: Daniel Stone <daniels@collabora.com> ---- - tests/meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/meson.build b/tests/meson.build -index d8e96e77d..955c4226c 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -29,8 +29,9 @@ lib_test_client = static_library( - 'weston-test-client-helper.c', - 'weston-test-fixture-compositor.c', - weston_test_client_protocol_h, -- weston_screenshooter_protocol_c, - weston_test_protocol_c, -+ weston_screenshooter_client_protocol_h, -+ weston_screenshooter_protocol_c, - viewporter_client_protocol_h, - viewporter_protocol_c, - 'color_util.h', --- -GitLab - diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml index 8917f9795189..c135c4f506a8 100644 --- a/dev-libs/weston/metadata.xml +++ b/dev-libs/weston/metadata.xml @@ -12,7 +12,6 @@ <flag name="desktop">Enable the desktop shell</flag> <flag name="drm">Enable drm compositor support</flag> <flag name="editor">Install wayland-editor example application</flag> - <flag name="fbdev">Enable fbdev compositor support</flag> <flag name="fullscreen">Enable fullscreen shell</flag> <flag name="gles2">Use GLESv2 cairo instead of full GL</flag> <flag name="headless">Headless backend and a noop renderer, mainly for testing purposes</flag> diff --git a/dev-libs/weston/weston-10.0.0.ebuild b/dev-libs/weston/weston-10.0.0.ebuild deleted file mode 100644 index d5a772f0976e..000000000000 --- a/dev-libs/weston/weston-10.0.0.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git" - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python3_{9..10} ) -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://wayland.freedesktop.org/releases/${P}.tar.xz" - KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86" -fi - -LICENSE="MIT CC-BY-SA-3.0" -SLOT="0" - -IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - colord? ( lcms ) - drm? ( gles2 ) - pipewire? ( drm ) - remoting? ( drm gles2 ) - screen-sharing? ( rdp ) - test? ( desktop headless xwayland ) - wayland-compositor? ( gles2 ) - || ( drm fbdev headless rdp wayland-compositor X ) -" - -RDEPEND=" - >=dev-libs/libinput-0.8.0 - >=dev-libs/wayland-1.18.0 - >=dev-libs/wayland-protocols-1.24 - lcms? ( media-libs/lcms:2 ) - media-libs/libpng:0= - webp? ( media-libs/libwebp:0= ) - jpeg? ( virtual/jpeg:0= ) - >=x11-libs/cairo-1.11.3 - >=x11-libs/libdrm-2.4.95 - >=x11-libs/libxkbcommon-0.5.0 - >=x11-libs/pixman-0.25.2 - x11-misc/xkeyboard-config - fbdev? ( - >=sys-libs/mtdev-1.1.0 - >=virtual/udev-136 - ) - colord? ( >=x11-misc/colord-0.1.27 ) - drm? ( - >=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] - ) - pipewire? ( >=media-video/pipewire-0.3:= ) - rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) - remoting? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - seatd? ( sys-auth/seatd:= ) - systemd? ( - sys-auth/pambase[systemd] - >=sys-apps/dbus-1.6 - >=sys-apps/systemd-209[pam] - ) - 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 - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-10.0.0-backend-default.patch - "${FILESDIR}"/${PN}-10.0.0-test-deps.patch -) - -src_configure() { - local emesonargs=( - $(meson_use drm backend-drm) - -Dbackend-drm-screencast-vaapi=false - $(meson_use headless backend-headless) - $(meson_use rdp backend-rdp) - $(meson_use screen-sharing screenshare) - $(meson_use wayland-compositor backend-wayland) - $(meson_use X backend-x11) - $(meson_use fbdev deprecated-backend-fbdev) - -Dbackend-default=auto - $(meson_use gles2 renderer-gl) - $(meson_use xwayland) - $(meson_use seatd launcher-libseat) - $(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 colord color-management-colord) - $(meson_use systemd launcher-logind) - $(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 - -Dtest-gl-renderer=false - "${myconf[@]}" - ) - meson_src_configure -} - -src_test() { - xdg_environment_reset - - # devices test usually fails. - # xwayland test can fail if X11 socket already exists. - cd "${BUILD_DIR}" || die - meson test $(meson test --list | grep -Exv "devices|xwayland") || die -} - -src_install() { - meson_src_install - readme.gentoo_create_doc -} |