Merge pull request #2788 from sydarn/sway

Sway build fixes

packages/devel/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.378"
+PKG_SHA256="098ea8db12a50290f4b23f7f521edf9c5bab25935d2740de17e4a487110b40c8"
+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
+}

packages/wayland/compositor/sway/package.mk

@@ -10,13 +10,15 @@ PKG_URL="https://github.com/swaywm/sway/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain wayland wayland-protocols libdrm libxkbcommon libinput cairo pango libjpeg-turbo dbus json-c wlroots gdk-pixbuf swaybg foot bemenu"
 PKG_LONGDESC="i3-compatible Wayland compositor"
 
+# to enable xwayland package: https://gitlab.freedesktop.org/xorg/lib/libxcb-wm/-/tree/master/icccm?ref_type=heads
+
 PKG_MESON_OPTS_TARGET="-Ddefault-wallpaper=false \
                        -Dzsh-completions=false \
                        -Dbash-completions=false \
                        -Dfish-completions=false \
                        -Dswaybar=true \
                        -Dswaynag=true \
-                       -Dxwayland=enabled \
+                       -Dxwayland=disabled \
                        -Dtray=disabled \
                        -Dgdk-pixbuf=enabled \
                        -Dman-pages=disabled \
@@ -41,6 +43,3 @@ post_makeinstall_target() {
   safe_remove ${INSTALL}/usr/share/wayland-sessions
 }
 
-post_install() {
-  enable_service sway.service
-}

packages/wayland/lib/tllist/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="tllist"
 PKG_VERSION="1.1.0"
-PKG_SHA256="0e7b7094a02550dd80b7243bcffc3671550b0f1d8ba625e4dff52517827d5d23"
+PKG_SHA256="3f3fe2f7433719cec816c63937a7aa36e566bd317763ef46d11562073ab6361d"
 PKG_LICENSE="MIT"
 PKG_SITE="https://codeberg.org/dnkl/tllist"
 PKG_URL="https://codeberg.org/dnkl/tllist/archive/${PKG_VERSION}.tar.gz"

packages/wayland/lib/wlroots/package.mk

@@ -6,7 +6,7 @@ PKG_VERSION="0.16.2"
 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 xwayland"
+PKG_DEPENDS_TARGET="toolchain libinput libxkbcommon pixman libdrm wayland wayland-protocols seatd xwayland hwdata libxcb"
 PKG_LONGDESC="A modular Wayland compositor library"
 
 configure_package() {
@@ -15,9 +15,9 @@ configure_package() {
     PKG_DEPENDS_TARGET+=" ${OPENGLES}"
   fi
 }
-
+# to enable xwayland package: https://gitlab.freedesktop.org/xorg/lib/libxcb-wm/-/tree/master/icccm?ref_type=heads
 PKG_MESON_OPTS_TARGET="-Dxcb-errors=disabled \
-                       -Dxwayland=enabled \
+					   -Dxwayland=disabled \
                        -Dexamples=false \
                        -Drenderers=gles2"
 

packages/wayland/util/foot/package.mk

@@ -17,6 +17,10 @@ PKG_MESON_OPTS_TARGET="-Ddocs=disabled \
                        -Dterminfo=disabled \
                        -Ddefault-terminfo=xterm"
 
+pre_configure_target() {
+  export TARGET_CFLAGS=$(echo "${TARGET_CFLAGS} -Wno-error=switch")
+}
+
 post_makeinstall_target(){
   # clean up
   safe_remove ${INSTALL}/usr/share/*

packages/x11/lib/libxcb-wm/package.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="libxcb-wm"
+PKG_VERSION="0.4.2"
+
+PKG_LICENSE="OSS"
+PKG_SITE="https://wayland.freedesktop.org/"
+PKG_URL="https://gitlab.freedesktop.org/xorg/lib/libxcb-wm/-/archive/xcb-util-wm-${PKG_VERSION}/${PKG_NAME}-xcb-util-wm-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain libxcb util-macros xorgproto"
+PKG_LONGDESC="Reference implementation of a Wayland compositor"
+PKG_TOOLCHAIN="autotools"

packages/x11/lib/libxcb-wm/patches/001-build-fix.patch

@@ -0,0 +1,34 @@
+diff --git a/configure.ac b/configure.ac
+index 9551f0c..0fde264 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([foreign dist-xz])
+-
++LT_INIT
+ XCB_UTIL_M4_WITH_INCLUDE_PATH
+ XCB_UTIL_COMMON([1.4], [1.6])
+ 
+diff --git a/ewmh/Makefile.am b/ewmh/Makefile.am
+index 488d006..747d042 100644
+--- a/ewmh/Makefile.am
++++ b/ewmh/Makefile.am
+@@ -1,4 +1,4 @@
+-
++pkgconfigdir = $(libdir)/pkgconfig
+ lib_LTLIBRARIES = libxcb-ewmh.la
+ 
+ nodist_xcbinclude_HEADERS = xcb_ewmh.h
+diff --git a/icccm/Makefile.am b/icccm/Makefile.am
+index 8dc2680..5b56c14 100644
+--- a/icccm/Makefile.am
++++ b/icccm/Makefile.am
+@@ -1,4 +1,4 @@
+-
++pkgconfigdir = $(libdir)/pkgconfig
+ lib_LTLIBRARIES = libxcb-icccm.la
+ 
+ xcbinclude_HEADERS = xcb_icccm.h
+