From b89dabfc8446116909f168e6a018d443014ae416 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 12 Nov 2022 02:11:42 +0000 Subject: [PATCH 1/5] wlroots: update to 0.16.0 --- packages/wayland/lib/wlroots/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/wayland/lib/wlroots/package.mk b/packages/wayland/lib/wlroots/package.mk index c5591d8ad2..3a59349ca6 100644 --- a/packages/wayland/lib/wlroots/package.mk +++ b/packages/wayland/lib/wlroots/package.mk @@ -2,12 +2,12 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="wlroots" -PKG_VERSION="0.15.1" -PKG_SHA256="8bb791aed9405abc20253c570de1a3b7af91ad65bee2b60293fbbab27ea62c8d" +PKG_VERSION="0.16.0" +PKG_SHA256="3be91163208577761969a8ae499d737c4dbb764f73c46aa8f76a512ee36b7da4" PKG_LICENSE="MIT" PKG_SITE="https://gitlab.freedesktop.org/wlroots/wlroots/" PKG_URL="https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS_TARGET="toolchain libinput libxkbcommon pixman libdrm wayland wayland-protocols seatd" +PKG_DEPENDS_TARGET="toolchain hwdata libinput libxkbcommon pixman libdrm wayland wayland-protocols seatd" PKG_LONGDESC="A modular Wayland compositor library" configure_package() { From 0435fec0dbbf217eb9fe0cb8968ac56cbcb58cc5 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 12 Nov 2022 05:17:09 +0000 Subject: [PATCH 2/5] hwdata: initial package --- packages/wayland/lib/hwdata/package.mk | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/wayland/lib/hwdata/package.mk diff --git a/packages/wayland/lib/hwdata/package.mk b/packages/wayland/lib/hwdata/package.mk new file mode 100644 index 0000000000..fa4c43e7b4 --- /dev/null +++ b/packages/wayland/lib/hwdata/package.mk @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="hwdata" +PKG_VERSION="0.365" +PKG_SHA256="d6ae2436a69c6f5e04d926f5d753a99d90deb864065a2e2f8a8eda87b70dcdd5" +PKG_LICENSE="GPL-2.0" +PKG_SITE="https://github.com/vcrhonek/hwdata" +PKG_URL="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain" +PKG_LONGDESC="hwdata contains various hardware identification and configuration data, such as the pci.ids and usb.ids databases" + +pre_configure_target() { +# hwdata fails to build in subdirs + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} + + sed -i "s&@prefix@|&@prefix@|${PKG_INSTALL}&" Makefile + sed -i "s&prefix=@prefix@&prefix=/usr&" hwdata.pc.in +} From 0c22fe734d4f92bfbb6e5e384a9b97e52e650784 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 4 Dec 2022 23:41:39 +0000 Subject: [PATCH 3/5] swaybg: update to 1.2.0 --- packages/wayland/util/swaybg/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wayland/util/swaybg/package.mk b/packages/wayland/util/swaybg/package.mk index 943580f349..8feb5d42c2 100644 --- a/packages/wayland/util/swaybg/package.mk +++ b/packages/wayland/util/swaybg/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="swaybg" -PKG_VERSION="1.1.1" -PKG_SHA256="71cc8fc2cb7ae5ad3af772ab286b0b42f1c7cb17bea131e78c2d40a2fb8e6c59" +PKG_VERSION="1.2.0" +PKG_SHA256="cfeab55b983da24352407279556c035b495890422578812d9a9c0bba1dc3ce75" PKG_LICENSE="MIT" PKG_SITE="https://swaywm.org/" PKG_URL="https://github.com/swaywm/swaybg/archive/v${PKG_VERSION}.tar.gz" From f3bd0106abd9f4fbf8ef0e5afbe0dc1e90c065d5 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 27 Nov 2022 10:21:30 +0000 Subject: [PATCH 4/5] sway: update to 1.8 Co-authored-by: SupervisedThinking --- packages/wayland/compositor/sway/package.mk | 6 +-- .../sway-100.02-allow-running-as-root.patch | 40 +++++++++++++++---- .../sway-100.03-do-not-use-git-version.patch | 22 ++++++++++ 3 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 packages/wayland/compositor/sway/patches/sway-100.03-do-not-use-git-version.patch diff --git a/packages/wayland/compositor/sway/package.mk b/packages/wayland/compositor/sway/package.mk index bfcbcd47a8..d9a685f12f 100644 --- a/packages/wayland/compositor/sway/package.mk +++ b/packages/wayland/compositor/sway/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="sway" -PKG_VERSION="1.7" -PKG_SHA256="0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84" +PKG_VERSION="1.8" +PKG_SHA256="fae0422bca8f528027f77e3a7bbea2be0498bba2ad3f0d22554ff8827e37f04e" PKG_LICENSE="MIT" PKG_SITE="https://swaywm.org/" PKG_URL="https://github.com/swaywm/sway/archive/${PKG_VERSION}.tar.gz" @@ -24,7 +24,7 @@ PKG_MESON_OPTS_TARGET="-Ddefault-wallpaper=false \ pre_configure_target() { # sway does not build without -Wno flags as all warnings being treated as errors - export TARGET_CFLAGS=$(echo "${TARGET_CFLAGS} -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-function -Wno-maybe-uninitialized -Wno-stringop-truncation -Wno-address") + export TARGET_CFLAGS=$(echo "${TARGET_CFLAGS} -Wno-unused-variable") } post_makeinstall_target() { diff --git a/packages/wayland/compositor/sway/patches/sway-100.02-allow-running-as-root.patch b/packages/wayland/compositor/sway/patches/sway-100.02-allow-running-as-root.patch index 36526dc558..b499b6bf83 100644 --- a/packages/wayland/compositor/sway/patches/sway-100.02-allow-running-as-root.patch +++ b/packages/wayland/compositor/sway/patches/sway-100.02-allow-running-as-root.patch @@ -1,13 +1,37 @@ --- a/sway/main.c +++ b/sway/main.c -@@ -152,6 +152,10 @@ static void log_kernel(void) { +@@ -151,7 +151,8 @@ + } - - static bool drop_permissions(void) { -+ if (getuid() == 0 || getgid() == 0) { + static bool detect_suid(void) { +- if (geteuid() != 0 && getegid() != 0) { ++ if (geteuid() == 0 && getegid() == 0) { + sway_log(SWAY_INFO, "Running sway as root user"); -+ return true; + return false; + } + +@@ -309,11 +310,6 @@ + } + } + +- // SUID operation is deprecated, so block it for now. +- if (detect_suid()) { +- exit(EXIT_FAILURE); +- } +- + // Since wayland requires XDG_RUNTIME_DIR to be set, abort with just the + // clear error message (when not running as an IPC client). + if (!getenv("XDG_RUNTIME_DIR") && optind == argc) { +@@ -363,6 +359,11 @@ + return 0; + } + ++ // SUID operation is deprecated, so block it for now. ++ if (detect_suid()) { ++ exit(EXIT_FAILURE); + } - if (getuid() != geteuid() || getgid() != getegid()) { - sway_log(SWAY_ERROR, "!!! DEPRECATION WARNING: " - "SUID privilege drop will be removed in a future release, please migrate to seatd-launch"); ++ + detect_proprietary(allow_unsupported_gpu); + increase_nofile_limit(); + + diff --git a/packages/wayland/compositor/sway/patches/sway-100.03-do-not-use-git-version.patch b/packages/wayland/compositor/sway/patches/sway-100.03-do-not-use-git-version.patch new file mode 100644 index 0000000000..1468a05813 --- /dev/null +++ b/packages/wayland/compositor/sway/patches/sway-100.03-do-not-use-git-version.patch @@ -0,0 +1,22 @@ +--- a/meson.build ++++ b/meson.build +@@ -158,18 +158,6 @@ + add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') + + version = '"@0@"'.format(meson.project_version()) +-git = find_program('git', native: true, required: false) +-if git.found() +- git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false) +- git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false) +- if git_commit.returncode() == 0 and git_branch.returncode() == 0 +- version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format( +- meson.project_version(), +- git_commit.stdout().strip(), +- git_branch.stdout().strip(), +- ) +- endif +-endif + add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c') + + # Compute the relative path used by compiler invocations. + From 9c131e724a02126979e1f9c3ee36d38a2cb20d01 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 26 Dec 2022 04:53:55 +0000 Subject: [PATCH 5/5] wlroots: update to 0.16.1 release notes: - https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.16.1 --- packages/wayland/lib/wlroots/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wayland/lib/wlroots/package.mk b/packages/wayland/lib/wlroots/package.mk index 3a59349ca6..93ab42d0ed 100644 --- a/packages/wayland/lib/wlroots/package.mk +++ b/packages/wayland/lib/wlroots/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="wlroots" -PKG_VERSION="0.16.0" -PKG_SHA256="3be91163208577761969a8ae499d737c4dbb764f73c46aa8f76a512ee36b7da4" +PKG_VERSION="0.16.1" +PKG_SHA256="1ea948d044d7c475f91c89719986482fe427eb48223cfe2ddf9426ff60b94674" PKG_LICENSE="MIT" PKG_SITE="https://gitlab.freedesktop.org/wlroots/wlroots/" PKG_URL="https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"