commit: 68371873bacbcd8ec53dd382fe0b9b1fd8d3dcb5
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 5 16:41:26 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 5 17:00:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68371873
dev-libs/weston: Version bump to 10.0.0
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-libs/weston/Manifest | 1 +
.../files/weston-10.0.0-backend-default.patch | 27 ++++++++++++++++++++++
.../{weston-9999.ebuild => weston-10.0.0.ebuild} | 26 ++++++++++-----------
dev-libs/weston/weston-9999.ebuild | 22 ++++++++----------
4 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index a34e308ad4f7..1d2bf61666d9 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1 +1,2 @@
+DIST weston-10.0.0.tar.xz 1774600 BLAKE2B
b2b8fa4f7542aba03970ca8abf504f340f8f8da9f9581c16ceac5c702eac355f5d4244778393a8804017f39dff490431e26a48580746033158bd2d2b721437f8
SHA512
77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4
DIST weston-9.0.0.tar.xz 1555212 BLAKE2B
6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852
SHA512
ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
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
new file mode 100644
index 000000000000..710639e7e9c5
--- /dev/null
+++ b/dev-libs/weston/files/weston-10.0.0-backend-default.patch
@@ -0,0 +1,27 @@
+From 35e3fb72ac28af628aa1d2b7ee804a3f81720c47 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <ch...@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 <ch...@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/weston-9999.ebuild
b/dev-libs/weston/weston-10.0.0.ebuild
similarity index 85%
copy from dev-libs/weston/weston-9999.ebuild
copy to dev-libs/weston/weston-10.0.0.ebuild
index 97a1005e1360..5ab9746b8514 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-10.0.0.ebuild
@@ -18,13 +18,13 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI="${SRC_PATCHES}"
else
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
fi
LICENSE="MIT CC-BY-SA-3.0"
SLOT="0"
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless
ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization
screen-sharing seatd +suid systemd test wayland-compositor webp +X xwayland"
+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="
@@ -40,14 +40,14 @@ REQUIRED_USE="
RDEPEND="
>=dev-libs/libinput-0.8.0
- >=dev-libs/wayland-1.17.0
- >=dev-libs/wayland-protocols-1.18
+ >=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.68
+ >=x11-libs/libdrm-2.4.95
>=x11-libs/libxkbcommon-0.5.0
>=x11-libs/pixman-0.25.2
x11-misc/xkeyboard-config
@@ -66,7 +66,7 @@ RDEPEND="
gles2? (
media-libs/mesa[gles2,wayland]
)
- pipewire? ( >=media-video/pipewire-0.2:= )
+ pipewire? ( >=media-video/pipewire-0.3:= )
rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
remoting? (
media-libs/gstreamer:1.0
@@ -78,7 +78,6 @@ RDEPEND="
>=sys-apps/dbus-1.6
>=sys-apps/systemd-209[pam]
)
- launch? ( sys-auth/pambase )
X? (
>=x11-libs/libxcb-1.9
x11-libs/libX11
@@ -95,6 +94,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.0.0-backend-default.patch
+)
+
src_configure() {
local emesonargs=(
$(meson_use drm backend-drm)
@@ -104,10 +107,9 @@ src_configure() {
$(meson_use screen-sharing screenshare)
$(meson_use wayland-compositor backend-wayland)
$(meson_use X backend-x11)
- $(meson_use fbdev backend-fbdev)
+ $(meson_use fbdev deprecated-backend-fbdev)
-Dbackend-default=auto
$(meson_use gles2 renderer-gl)
- $(meson_use launch weston-launch)
$(meson_use xwayland)
$(meson_use seatd launcher-libseat)
$(meson_use systemd)
@@ -137,14 +139,12 @@ 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 -Fxv devices) || die
+ meson test $(meson test --list | grep -Exv "devices|xwayland") || die
}
src_install() {
meson_src_install
- if use launch && use suid; then
- chmod u+s "${ED}"/usr/bin/weston-launch || die
- fi
readme.gentoo_create_doc
}
diff --git a/dev-libs/weston/weston-9999.ebuild
b/dev-libs/weston/weston-9999.ebuild
index 97a1005e1360..478f60d2b893 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -18,13 +18,13 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI="${SRC_PATCHES}"
else
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
fi
LICENSE="MIT CC-BY-SA-3.0"
SLOT="0"
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless
ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization
screen-sharing seatd +suid systemd test wayland-compositor webp +X xwayland"
+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="
@@ -40,14 +40,14 @@ REQUIRED_USE="
RDEPEND="
>=dev-libs/libinput-0.8.0
- >=dev-libs/wayland-1.17.0
- >=dev-libs/wayland-protocols-1.18
+ >=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.68
+ >=x11-libs/libdrm-2.4.95
>=x11-libs/libxkbcommon-0.5.0
>=x11-libs/pixman-0.25.2
x11-misc/xkeyboard-config
@@ -66,7 +66,7 @@ RDEPEND="
gles2? (
media-libs/mesa[gles2,wayland]
)
- pipewire? ( >=media-video/pipewire-0.2:= )
+ pipewire? ( >=media-video/pipewire-0.3:= )
rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
remoting? (
media-libs/gstreamer:1.0
@@ -78,7 +78,6 @@ RDEPEND="
>=sys-apps/dbus-1.6
>=sys-apps/systemd-209[pam]
)
- launch? ( sys-auth/pambase )
X? (
>=x11-libs/libxcb-1.9
x11-libs/libX11
@@ -104,10 +103,9 @@ src_configure() {
$(meson_use screen-sharing screenshare)
$(meson_use wayland-compositor backend-wayland)
$(meson_use X backend-x11)
- $(meson_use fbdev backend-fbdev)
+ $(meson_use fbdev deprecated-backend-fbdev)
-Dbackend-default=auto
$(meson_use gles2 renderer-gl)
- $(meson_use launch weston-launch)
$(meson_use xwayland)
$(meson_use seatd launcher-libseat)
$(meson_use systemd)
@@ -137,14 +135,12 @@ 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 -Fxv devices) || die
+ meson test $(meson test --list | grep -Exv "devices|xwayland") || die
}
src_install() {
meson_src_install
- if use launch && use suid; then
- chmod u+s "${ED}"/usr/bin/weston-launch || die
- fi
readme.gentoo_create_doc
}
