From ec9f79e1d3358df31a704f16a76a269ccceae2b2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Dec 2022 20:03:07 +0000 Subject: gentoo auto-resync : 24:12:2022 - 20:03:07 --- dev-libs/weston/Manifest | 6 +- dev-libs/weston/metadata.xml | 3 + dev-libs/weston/weston-11.0.0.ebuild | 140 ----------------------------------- dev-libs/weston/weston-9999.ebuild | 32 ++++---- 4 files changed, 20 insertions(+), 161 deletions(-) delete mode 100644 dev-libs/weston/weston-11.0.0.ebuild (limited to 'dev-libs/weston') diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index f6e60127900d..b9bc130eb45c 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -2,10 +2,8 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f 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.0.tar.xz 1900292 BLAKE2B 3ae083294dc48f4b152ef493c8a00ba87e682ebee4e1981fa5ccac96ad69436031fffed8510cffc525a8022294cae71650a09bb003448816b4774f7c3c3d19bf SHA512 71554dc870e9c6832fdfb8f0e8dbcd7ad01c3827041c2f7fe4b7679df33b242fd00e7f0c8728d1aeecc648f8296a9d3fc502a66c91ec662f03086d9a28aab3ea DIST weston-11.0.1.tar.xz 1900796 BLAKE2B 33d7d5b3340e7074265885bd54ee039e8b5d448fa9f58f4bf9f823efd2557da9b916d903119565a806ab698382fe185165c8ede8614e983c872dfe15b474b616 SHA512 d451230fc260b45aaaadb5cf0aa360629e45e72e3b3676c6ec040d6c6549dbb57d05683effd962c3b2d61482b47a6c990d12cc736c896b501d982c8c4d34834c EBUILD weston-10.0.0.ebuild 3934 BLAKE2B fd140a51aeceac3251a2f5f0878cb5f4e37b630c4ad7807873ac041c863f490bb7845d29086dc17d169856dc8e9dd9a1e87c042b94c6e46ef2b5ae0810412ef1 SHA512 f48f41f7fdf96d2b1a9842150d57e1fd394b7e86725318aabb8bc472d7fab2483e1e4654c37271f13dc92efc92139e58c12bf8972d250028d9f7dc7dfd469921 -EBUILD weston-11.0.0.ebuild 3649 BLAKE2B c3d8503787c028b506a8a8319b668ce25fb6909ec2eb78f88c654fe29cd189fd3d1bf4fd9647ca6070597c4f9c5e07929f9d47a7c3dff6b7ae3277519f30b8c9 SHA512 2162de77e7cfb48de3f7155d2b5e7e75a1da3049ec3eb37f71bd3bcd82cf75853b194b69222c713f67fac3bc14ae772308ac6b08ee9fea51d679b5a7f749d723 EBUILD weston-11.0.1.ebuild 3663 BLAKE2B fb661cbc0874b7c2fdb4ed92b4df7ef9cbfd6c67d63c8702adab10ce4d8613938f0722818a8787ec06b3052834c1f0bbd607aea012bac5c127678160e6cd7b49 SHA512 0861367b189da6eae0e39731f13165d248ee19102e4615b7bf51d2f57c4b366a71ff9fbe7efd14084e072b29a0c4d44ed344e1b2225afc3bbb7d286afa75ae69 -EBUILD weston-9999.ebuild 3650 BLAKE2B 9403ad3c525fbe78b0de108a9d6c9105f4f560f0a4dedcd8a6341c3f4709270de49c7e47ae2ed03b0bb3749db15619ab7592f4546fe2eeb057bacb99726764a1 SHA512 0cdb737b90e75b46f677da552bad29b20decf35ef8980710a4269152c0370aaea40161a86806a71259a8d3fc8a09e496e991b0d73da27b249f86ed4e37f06c2f -MISC metadata.xml 1520 BLAKE2B ac2338fd000b3549fa197f281e439a09974d1bfd13afa766f255727a58a793fc8b4a6bac2237afb59029d11b02fc7d1dfb69072d9db227dd6f7db783fd842fad SHA512 434b1fa93ce9e1b8329301333ea47b73def8377c068735ad12d57bd5fd2ebdb5fc9e778b8df04bc4ac7b71dc7cc004fd8750581a17624d3cb3d2ff6faf81218d +EBUILD weston-9999.ebuild 3602 BLAKE2B 11dc0d883632b406ea7d16af3ab6126b6588981e06a5d0afcff46bbea3f4e9e0378db7290f20e13fc16547c83bf675f650e70aa872ad2f3dd8b3469cdb483598 SHA512 63bce7c02610692bfc15cf1d84aa940f90e0fdd72190b5fc761562141a10d1721766f16c12201ef7d5c0f4cf4aaa83d9bab74ae492defe9f38379b9088dd0d35 +MISC metadata.xml 1608 BLAKE2B 179aa99a3445aca06bee40c9794b2e932a81d5160a375a501631938d855db8d785de876b7c674dacb5295fe33a422a85f1cd8df8da1fc230a6ad5286e5606a3b SHA512 daf7602fb7efa103a79f029d2c40825156dd787694364f5da33e43eea297022da2df070a9b051d3bbb55da5663a1550dca39db31b6c4fd9d38eea465ada909a1 diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml index a1da27e3da2e..8917f9795189 100644 --- a/dev-libs/weston/metadata.xml +++ b/dev-libs/weston/metadata.xml @@ -5,6 +5,9 @@ chewi@gentoo.org James Le Cuirot + + wayland/weston + Enable the desktop shell Enable drm compositor support diff --git a/dev-libs/weston/weston-11.0.0.ebuild b/dev-libs/weston/weston-11.0.0.ebuild deleted file mode 100644 index 74220565f1ac..000000000000 --- a/dev-libs/weston/weston-11.0.0.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2022 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_{9..11} ) -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 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~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 +seatd +suid systemd test 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 wayland-compositor X ) - || ( seatd systemd ) -" - -RDEPEND=" - >=dev-libs/libinput-0.8.0 - >=dev-libs/wayland-1.20.0 - >=dev-libs/wayland-protocols-1.24 - lcms? ( >=media-libs/lcms-2.9:2 ) - media-libs/libpng:0= - webp? ( media-libs/libwebp:0= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - >=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-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.3.0:=[server] ) - 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 -" - -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) - -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 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 - "${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-9999.ebuild b/dev-libs/weston/weston-9999.ebuild index 732cad2480b8..3b4017070562 100644 --- a/dev-libs/weston/weston-9999.ebuild +++ b/dev-libs/weston/weston-9999.ebuild @@ -25,7 +25,7 @@ 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 +seatd +suid systemd test wayland-compositor webp +X xwayland" +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=" @@ -33,20 +33,17 @@ REQUIRED_USE=" pipewire? ( drm ) remoting? ( drm gles2 ) screen-sharing? ( rdp ) - test? ( desktop headless lcms xwayland ) + test? ( desktop headless lcms xwayland ) wayland-compositor? ( gles2 ) - || ( drm headless rdp wayland-compositor X ) - || ( seatd systemd ) + || ( drm headless rdp vnc wayland-compositor X ) " RDEPEND=" >=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.24 - lcms? ( >=media-libs/lcms-2.9:2 ) media-libs/libpng:0= - webp? ( media-libs/libwebp:0= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) + sys-auth/seatd:= >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.108 >=x11-libs/libxkbcommon-0.5.0 @@ -59,21 +56,22 @@ RDEPEND=" ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) - gles2? ( - media-libs/mesa[gles2,wayland] - ) + 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:=[server] ) 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] + systemd? ( sys-apps/systemd ) + vnc? ( + =dev-libs/aml-0.2* + =gui-libs/neatvnc-0.5* + sys-libs/pam ) + webp? ( media-libs/libwebp:0= ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 @@ -98,12 +96,13 @@ src_configure() { $(meson_use headless backend-headless) $(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 seatd launcher-libseat) + -Dlauncher-libseat=true $(meson_use systemd) $(meson_use remoting) $(meson_use pipewire) @@ -112,7 +111,6 @@ src_configure() { $(meson_use ivi shell-ivi) $(meson_use kiosk shell-kiosk) $(meson_use lcms color-management-lcms) - $(meson_use systemd launcher-logind) $(meson_use jpeg image-jpeg) $(meson_use webp image-webp) -Dtools=debug,info,terminal -- cgit v1.2.3