From d2f5fa9c5505a5c3df8170b498e890f50dfc9553 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Jun 2023 19:27:47 +0100 Subject: gentoo auto-resync : 24:06:2023 - 19:27:47 --- dev-libs/weston/Manifest | 8 +- .../files/weston-10.0.0-backend-default.patch | 27 ---- .../weston/files/weston-10.0.0-test-deps.patch | 34 ----- dev-libs/weston/metadata.xml | 1 - dev-libs/weston/weston-10.0.0.ebuild | 153 --------------------- dev-libs/weston/weston-11.0.1.ebuild | 2 +- 6 files changed, 3 insertions(+), 222 deletions(-) delete mode 100644 dev-libs/weston/files/weston-10.0.0-backend-default.patch delete mode 100644 dev-libs/weston/files/weston-10.0.0-test-deps.patch delete mode 100644 dev-libs/weston/weston-10.0.0.ebuild (limited to 'dev-libs/weston') diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index c9bdba807942..661d6989af53 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -1,11 +1,7 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786 -AUX weston-10.0.0-backend-default.patch 828 BLAKE2B 2c6712737bc6e2d1a37d89b5ba4ea93fb30d137b8d76b77496f82503892bc295d19e97d8de223377328f8aa32721544f7a67f904c22bd1f1483fa99bf6c5f15e SHA512 e3cf66567ed8878ceeb0cde40f3c3aac8d20a04ce501d4fba8429f9d7552dc53ef4eec0cf103bf7e1e93fc9bdf224b20c628c9dede3e545455735fd95ae5dfea -AUX weston-10.0.0-test-deps.patch 1052 BLAKE2B eaa6d9950a7a932686d11d9b9efb9ebfc602ac82db14348d4c1701a0420a85469e05c5af76568a6189546f4d8b5f05bac85c64e7168522af4cc0a5a3d31a8050 SHA512 7f59b5da1ec7a885d53bf48c12a13cceed6e7306c018e9921d64ec1856b8d125421f7af0aa227785d794924c6f035bc79a681eb9331adb17fb790f82c28d0f10 -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 -EBUILD weston-10.0.0.ebuild 3934 BLAKE2B fd140a51aeceac3251a2f5f0878cb5f4e37b630c4ad7807873ac041c863f490bb7845d29086dc17d169856dc8e9dd9a1e87c042b94c6e46ef2b5ae0810412ef1 SHA512 f48f41f7fdf96d2b1a9842150d57e1fd394b7e86725318aabb8bc472d7fab2483e1e4654c37271f13dc92efc92139e58c12bf8972d250028d9f7dc7dfd469921 -EBUILD weston-11.0.1.ebuild 3659 BLAKE2B d6ccf7efb9880e015c927211109e65a55481846ef6c8bc4ebfadd29f63f3d41e802365e4f0002fc5e38cd13631285eb65b9eb0bc41fc1bca389a247e8c012cd6 SHA512 a009f70f667485aab2496a5947e944854b09620db09ce70b8aaa1e669a347d4384b89bef35d004e4697716c36a4262340a597a8869bacb2c3b0df5dd6fee9459 +EBUILD weston-11.0.1.ebuild 3647 BLAKE2B 4ea2290da03417622e5b11c2c066bed9c0012fd573dd2a3e09e465ee78d1cdb6e4db82bba05033cc14cd6fe2123b6cf797fd96d092e47bbba6e91c7914082de6 SHA512 df50728e3cefe2439ecfc3bbeb44a33b66125d679ea126c6e985730485fc3c4f2bd8b09cae393ce2bfa0dc0be0dd4e5befbed6e33bf910b43cf7a68867dfe0bf EBUILD weston-12.0.1.ebuild 3686 BLAKE2B e84ee5c700efe156412620f048e47b54bb015b4a107c71f9c85ae7d9eefce40bdeae59b6b8837fb7be20666c12f89ef5269c1c0c08e068f0d3ee381f22e00d64 SHA512 1c7478c575d616e544451ea20fd6d92f0eb933731c8365ac19c389bf9d346db2c6a9eae1c3f5755e79e793e7b2e190992d8d2d30ebba1834a9a32ab577528e0c EBUILD weston-9999.ebuild 3705 BLAKE2B 80f5d38e267ea8e422b2bd6b9b935dac285573c761be1a4319c3c7e26687bf52d598f24a6aeab96dd5c6c7f8b6ed5b5467b60fc44232bcd2653e5476f76972fa SHA512 c1077cd94be525ee6c09c3871567eb4f1bd33e99c6aa8f33424ff779874839847efbb564eb3d698ea0a17e3ea6bbb1b5b9411ca521cd54d5e7636a812e6db708 -MISC metadata.xml 1608 BLAKE2B 179aa99a3445aca06bee40c9794b2e932a81d5160a375a501631938d855db8d785de876b7c674dacb5295fe33a422a85f1cd8df8da1fc230a6ad5286e5606a3b SHA512 daf7602fb7efa103a79f029d2c40825156dd787694364f5da33e43eea297022da2df070a9b051d3bbb55da5663a1550dca39db31b6c4fd9d38eea465ada909a1 +MISC metadata.xml 1549 BLAKE2B adfc4def87465ca322d87a45c8790244d9f05808608ac7d055356124f6cdd9602d97535e9751c04858825249fc17f2e6a43d52923b37b03d237df997d10386cd SHA512 7aafd337baa7b82533519a7082a6efe2cb88f67ad81f396f06268f1ff6512d4557016faddae49523aaafe83c6975bd798723a4a51b344abe3d77b2bc9b0326bc 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 -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 ---- - 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 -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 ---- - 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 @@ Enable the desktop shell Enable drm compositor support Install wayland-editor example application - Enable fbdev compositor support Enable fullscreen shell Use GLESv2 cairo instead of full GL Headless backend and a noop renderer, mainly for testing purposes 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 -} diff --git a/dev-libs/weston/weston-11.0.1.ebuild b/dev-libs/weston/weston-11.0.1.ebuild index 83deecda3ef6..4dd8288acf95 100644 --- a/dev-libs/weston/weston-11.0.1.ebuild +++ b/dev-libs/weston/weston-11.0.1.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="${SRC_PATCHES}" else SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/uploads/f5648c818fba5432edc3ea63c4db4813/${P}.tar.xz" - KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86" fi LICENSE="MIT CC-BY-SA-3.0" -- cgit v1.2.3