Merge pull request #269 from kisslinux/wayland

Wayland

extra/adwaita-icon-theme/checksums

@@ -0,0 +1 @@
+0b6c436ed6ad9887a88ada1f72a0197b1eb73b020d8d344abab4c7fa7250f8f6

extra/adwaita-icon-theme/sources

@@ -0,0 +1 @@
+https://download.gnome.org/sources/adwaita-icon-theme/40/adwaita-icon-theme-40.1.1.tar.xz

extra/adwaita-icon-theme/version

@@ -0,0 +1 @@
+40.1.1 1

extra/cairo/build

@@ -15,12 +15,10 @@ mv -f _ Makefile.in
     --prefix=/usr \
     --disable-static \
     --enable-tee \
-    --enable-gl \
-    --enable-egl \
-    --enable-xlib-xcb \
-    --enable-xcb \
-    --enable-xlib-xrender \
-    --enable-xlib \
+    --disable-xlib-xcb \
+    --disable-xcb \
+    --disable-xlib-xrender \
+    --disable-xlib \
     --disable-trace \
     --disable-valgrind \
     --disable-gtk-doc-html

extra/cairo/depends

@@ -2,8 +2,6 @@ fontconfig
 glib
 libffi
 libpng
-libXext
-libXrender
 mesa
 pixman
 pkgconf make

extra/ffmpeg/build

@@ -7,6 +7,11 @@
     --disable-debug \
     --disable-libxml2 \
     --disable-static \
+    --disable-libxcb \
+    --disable-libxcb-shm \
+    --disable-libxcb-xfixes \
+    --disable-libxcb-shape \
+    --disable-xlib \
     --enable-gpl \
     --enable-libass \
     --enable-libdrm \

extra/firefox/build

@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
 patch -p1 < no-gtk2.patch
+patch -p1 < no-x11.patch
 
 # Remove fribidi dependency.
 sed '/fribidi/d' config/system-headers.mozbuild > _
@@ -51,6 +52,7 @@ export MOZ_DEBUG_FLAGS=-g0
 export MOZ_NOSPAM=1
 
 cat > .mozconfig << EOF
+ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
 ac_add_options --enable-alsa
@@ -89,6 +91,13 @@ ac_add_options --disable-parental-controls
 ac_add_options --disable-system-extension-dirs
 EOF
 
+# Currently required for X11-less builds.
+# See: https://bugzilla.mozilla.org/show_bug.cgi?id=1661450
+#      https://bugzilla.mozilla.org/show_bug.cgi?id=1654112
+cat >> .mozconfig <<EOF
+ac_add_options --disable-webrtc
+EOF
+
 ./mach build
 DESTDIR="$1" ./mach install
 

extra/firefox/checksums

@@ -2,3 +2,4 @@
 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
 f18d00475ab9d7c4e8bd2dfcda00dc7ff4a1f930e3ffcee420aeadf636469cef
+e8d9d077e5bd2750643337167ff822d1476aad1838a23b066eb0fde11b66b7b1

extra/firefox/depends

@@ -11,29 +11,12 @@ freetype-harfbuzz
 gdk-pixbuf
 glib
 gtk+3
-libICE
-libSM
-libX11
-libXau
-libXcomposite
-libXcursor
-libXdamage
-libXext
-libXfixes
-libXi
-libXinerama
-libXrandr
-libXrender
-libXt
-libXxf86vm
 libdrm
 libepoxy
 libffi
 libjpeg-turbo
 libpng
 libvpx
-libxcb
-libxshmfence
 llvm          make
 m4            make
 mesa
@@ -45,5 +28,6 @@ pixman
 pkgconf       make
 python        make
 rust          make
+wayland
 zip           make
 zlib

extra/firefox/post-install

@@ -2,13 +2,11 @@
 
 cat <<EOF
 
-NOTE: Install the 'hicolor-icon-theme' package if
-      no other icon themes are installed.
+Run 'kiss help firefox' for setup
+information and general troubleshooting.
 
-NOTE: Install the 'firefox-privacy' package to
-      enable extra privacy restrictions.
+Also available here:
 
-NOTE: This includes more telemetry removals,
-      hardened settings, no phoning-home etc.
+https://kisslinux.xyz/wiki/software/firefox
 
 EOF

extra/firefox/sources

@@ -2,3 +2,4 @@ https://ftp.mozilla.org/pub/firefox/releases/89.0.2/source/firefox-89.0.2.source
 https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/
 https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz yasm/
 patches/no-gtk2.patch
+patches/no-x11.patch

extra/freetype-harfbuzz/checksums

@@ -1,2 +1,2 @@
 86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
-b3f17394c5bccee456172b2b30ddec0bb87e9c5df38b4559a973d14ccd04509d
+4164f68103e7b52757a732227cfa2a16cfa9984da513843bb4eb7669adc6f220

extra/freetype-harfbuzz/depends

@@ -1,17 +1,8 @@
 bzip2
 expat
 glib
-libX11
-libXau
-libXdamage
-libXext
-libXfixes
-libXrender
-libXxf86vm
 libdrm
 libpng
-libxcb
-libxshmfence
 mesa
 meson   make
 pixman

extra/freetype-harfbuzz/sources

@@ -1,2 +1,2 @@
 https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.xz freetype
-https://github.com/harfbuzz/harfbuzz/archive/2.8.1.tar.gz harfbuzz
+https://github.com/harfbuzz/harfbuzz/archive/2.8.2.tar.gz harfbuzz

extra/freetype-harfbuzz/version

@@ -1 +1 @@
-2.10.4+2.8.1 1
+2.10.4+2.8.2 1

extra/gdk-pixbuf/depends

@@ -1,5 +1,4 @@
 glib
-libX11
 libjpeg-turbo
 libpng
 meson   make

extra/gtk+3/build

@@ -1,6 +1,27 @@
 #!/bin/sh -e
 
 patch -p1 < no-fribidi.patch
+patch -p1 < schemas.patch
+
+# GTK+3 on Wayland requires gsettings-desktop-schemas
+# for gsettings to work correctly. Install the bare
+# minimum needed (currently one schema).
+#
+# This fixes cursor icon issues and console spam when
+# running Firefox.
+(
+    cd schemas
+
+    meson \
+        --prefix=/usr \
+        -Dintrospection=false \
+        . output
+
+    export DESTDIR="$1"
+
+    ninja -C output
+    ninja -C output install
+)
 
 # Remove configure check for atk-bridge and fribidi.
 sed -e 's/\(ATK_PACKAGES="atk\) atk-bridge-2.0"/\1"/' \
@@ -22,13 +43,8 @@ mv -f _ Makefile.in
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
-    --enable-xkb \
-    --enable-xinerama \
-    --enable-xrandr \
-    --enable-xfixes \
-    --enable-xcomposite \
-    --enable-xdamage \
-    --enable-x11-backend \
+    --enable-wayland-backend \
+    --disable-x11-backend \
     --disable-schemas-compile \
     --disable-cups \
     --disable-papi \

extra/gtk+3/checksums

@@ -1,2 +1,4 @@
 f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa
+7b57e54220110f00ee768536138f80e155e44b0f90d912610802c72a25a59510
 e44b643a9ec01ea153817602241d6d7e6fd2d121b3ce4e29f99a87d8836a3ff0
+7ee815e1d04b47d780bdbca3a30a22e1fa74a385a5443174c96315d625822216

extra/gtk+3/depends

@@ -1,13 +1,13 @@
 atk
+cairo
+fontconfig
+freetype-harfbuzz
 gdk-pixbuf
-libXcomposite
-libXcursor
-libXdamage
-libXext
-libXi
-libXinerama
-libXrandr
+glib
 libepoxy
+libxkbcommon
+meson   make
 pango
 pkgconf make
 python  make
+wayland

extra/gtk+3/patches/schemas.patch

@@ -0,0 +1,37 @@
+diff --git a/schemas/meson.build b/schemas/meson.build
+index 69a3f98..d10b8cd 100644
+--- a/schemas/schemas/meson.build
++++ b/schemas/schemas/meson.build
+@@ -1,32 +1,5 @@
+ schemas = [
+-  'org.gnome.desktop.default-applications.gschema.xml',
+   'org.gnome.desktop.interface.gschema.xml',
+-  'org.gnome.desktop.lockdown.gschema.xml',
+-  'org.gnome.system.locale.gschema.xml',
+-  'org.gnome.system.location.gschema.xml',
+-  'org.gnome.system.proxy.gschema.xml',
+-  'org.gnome.desktop.sound.gschema.xml',
+-  'org.gnome.desktop.thumbnail-cache.gschema.xml',
+-  'org.gnome.desktop.a11y.gschema.xml',
+-  'org.gnome.desktop.a11y.keyboard.gschema.xml',
+-  'org.gnome.desktop.a11y.applications.gschema.xml',
+-  'org.gnome.desktop.a11y.magnifier.gschema.xml',
+-  'org.gnome.desktop.a11y.mouse.gschema.xml',
+-  'org.gnome.desktop.thumbnailers.gschema.xml',
+-  'org.gnome.desktop.session.gschema.xml',
+-  'org.gnome.desktop.background.gschema.xml',
+-  'org.gnome.desktop.calendar.gschema.xml',
+-  'org.gnome.desktop.datetime.gschema.xml',
+-  'org.gnome.desktop.media-handling.gschema.xml',
+-  'org.gnome.desktop.screensaver.gschema.xml',
+-  'org.gnome.desktop.search-providers.gschema.xml',
+-  'org.gnome.desktop.wm.keybindings.gschema.xml',
+-  'org.gnome.desktop.wm.preferences.gschema.xml',
+-  'org.gnome.desktop.input-sources.gschema.xml',
+-  'org.gnome.desktop.privacy.gschema.xml',
+-  'org.gnome.desktop.notifications.gschema.xml',
+-  'org.gnome.desktop.app-folders.gschema.xml',
+-  'org.gnome.desktop.peripherals.gschema.xml',
+ ]
+ 
+ conf = configuration_data()

extra/gtk+3/sources

@@ -1,2 +1,4 @@
 https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz
+https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/archive/40.0/gsettings-desktop-schemas-40.0.tar.gz schemas
 patches/no-fribidi.patch
+patches/schemas.patch

extra/json-c/build

@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+export DESTDIR="$1"
+
+cmake -B build \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF
+
+cmake --build   build
+cmake --install build

extra/json-c/checksums

@@ -0,0 +1 @@
+4ba9a090a42cf1e12b84c64e4464bb6fb893666841d5843cc5bef90774028882

extra/json-c/depends

@@ -0,0 +1 @@
+cmake make

extra/json-c/sources

@@ -0,0 +1 @@
+https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz

extra/json-c/version

@@ -0,0 +1 @@
+0.15 1

extra/libepoxy/build

@@ -7,7 +7,10 @@ meson \
     --sysconfdir=/etc \
     --mandir=/usr/share/man \
     -Dhas-dlvsym=false \
-    -Dx11=true \
+    -Degl=yes \
+    -Dtests=false \
+    -Dglx=no \
+    -Dx11=false \
     . output
 
 ninja -C output

extra/libepoxy/depends

@@ -1,3 +1,2 @@
-libX11 make
 mesa   make
 meson  make

extra/libevdev/checksums

@@ -1 +0,0 @@
-63f4ea1489858a109080e0b40bd43e4e0903a1e12ea888d581db8c495747c2d0

extra/libevdev/depends

@@ -1,2 +0,0 @@
-linux-headers make
-python        make

extra/libevdev/sources

@@ -1 +0,0 @@
-https://www.freedesktop.org/software/libevdev/libevdev-1.11.0.tar.xz

extra/libevdev/version

@@ -1 +0,0 @@
-1.11.0 1

extra/libinput/build

@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-export DESTDIR="$1"
-
-meson \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --libexecdir=/usr/lib \
-    -Ddebug-gui=false \
-    -Ddocumentation=false \
-    -Dtests=false \
-    -Dlibwacom=false \
-    . output
-
-ninja -C output
-ninja -C output install

extra/libinput/checksums

@@ -1 +0,0 @@
-65a657490de896081935cf0830a9773aa76756b8e9961edeffcce1074706bbe6

extra/libinput/sources

@@ -1 +0,0 @@
-https://github.com/wayland-project/libinput/archive/1.18.0.tar.gz

extra/libva/build

@@ -6,6 +6,9 @@ meson \
     --prefix=/usr \
     --sysconfdir=/etc \
     --mandir=/usr/share/man \
+    -Dwith_wayland=yes \
+    -Dwith_x11=no \
+    -Dwith_glx=no \
     -Ddocs=false \
     -Dintrospection=false \
     . output

extra/libva/depends

@@ -1,8 +1,6 @@
-libX11
-libXext
-libXfixes
 libdrm
 linux-headers make
 mesa
 meson         make
 pkgconf       make
+wayland

extra/mesa/build

@@ -33,14 +33,21 @@ export CFLAGS="$CFLAGS -DGLX_X86_READONLY_TEXT"
 sed "/pre_args += '-DUSE_ELF_TLS'/d" meson.build > _
 mv -f _ meson.build
 
+# To prevent the need for users to fork the mesa package to add
+# libglvnd support, the below code checks for its availability
+# and enables it if present. ie: install glvnd, rebuild mesa.
+! kiss l libglvnd >/dev/null 2>&1 || glvnd_enabled=true
+
 meson \
     --prefix=/usr \
     --sysconfdir=/etc \
     --mandir=/usr/share/man \
     --localstatedir=/var \
     --buildtype=release \
-    -Dplatforms=x11 \
+    -Dplatforms=wayland \
+    -Dglx=disabled \
     -Dzstd=false \
+    -Dglvnd="${glvnd_enabled:-false}" \
     . output
 
 ninja -C output

extra/mesa/depends

@@ -1,21 +1,14 @@
-bison        make
+bison make
 expat
-flex         make
-libX11
-libXdamage
-libXext
-libXrandr
-libXrender
-libXxf86vm
+flex  make
 libdrm
 libelf
-libxcb
-libxshmfence
 linux-headers make
 llvm
-m4            make
-meson         make
-pkgconf       make
-python        make
-xorgproto
+m4 make
+meson make
+pkgconf make
+python make
+wayland
+wayland-protocols make
 zlib

extra/mesa/post-install

@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+cat <<EOF
+
+NOTE: Mesa + amdgpu requires CHECKPOINT_RESTORE be enabled
+      in your kernel or things will subtly break.
+      See: https://lwn.net/Articles/845448/
+
+      CONFIG_CHECKPOINT_RESTORE=y
+
+EOF

extra/mpv/build

@@ -6,7 +6,9 @@ python waf configure \
     --prefix=/usr \
     --mandir=/usr/share/man \
     --confdir=/etc/mpv \
-    --enable-alsa
+    --enable-alsa \
+    --enable-wayland \
+    --disable-x11
 
 python waf build
 python waf install --destdir="$1"

extra/mpv/depends

@@ -2,9 +2,7 @@ alsa-lib
 ffmpeg
 freetype-harfbuzz
 libass
-libXScrnSaver
-libXinerama
-libXrandr
 mesa
 pkgconf make
 python  make
+wayland

extra/mtdev/checksums

@@ -1 +0,0 @@
-15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0

extra/mtdev/depends

@@ -1 +0,0 @@
-linux-headers make

extra/mtdev/sources

@@ -1 +0,0 @@
-https://bitmath.org/code/mtdev/mtdev-1.1.6.tar.bz2

extra/mtdev/version

@@ -1 +0,0 @@
-1.1.6 1

extra/pango/build

@@ -16,6 +16,7 @@ meson \
     --prefix=/usr \
     -Dgir=false \
     -Dgtk_doc=false \
+    -Dxft=disabled \
     -Dintrospection=disabled \
     -Dinstalled_tests=false \
     . build

extra/pango/depends

@@ -2,7 +2,5 @@ cairo
 fontconfig
 freetype-harfbuzz
 glib
-libXft
-libXrender
 meson   make
 pkgconf make

extra/pcre/build

@@ -2,7 +2,9 @@
 
 ./configure \
     --prefix=/usr \
-    --disable-gcov
+    --enable-unicode-properties
 
 make
 make DESTDIR="$1" install
+
+rm -rf "${1:?}/usr/share"

extra/pcre/checksums

@@ -0,0 +1 @@
+4e6ce03e0336e8b4a3d6c2b70b1c5e18590a5673a98186da90d4f33c23defc09

extra/pcre/sources

@@ -0,0 +1 @@
+https://ftp.pcre.org/pub/pcre/pcre-8.45.tar.gz

extra/pcre/version

@@ -0,0 +1 @@
+8.45 1

wayland/foot-pgo/build

@@ -0,0 +1,77 @@
+#!/bin/sh -e
+
+[ "$WAYLAND_DISPLAY" ] || {
+    printf 'error: foot-pgo requires a running wayland session\n' >&2
+    exit 1
+}
+
+export DESTDIR="$1"
+
+# Avoid scdoc dependency.
+sed "/subdir('doc')/d" meson.build > _
+mv -f _ meson.build
+
+# PGO with < -O3 is slow > GCC 10.1.X.
+export CFLAGS="$CFLAGS -O3"
+
+# Clang requires this for PGO.
+case $("${CC:-cc}" --version) in *clang*)
+    export CFLAGS="$CFLAGS -Wno-ignored-optimization-argument"
+esac
+
+mkdir -p bld/release
+cd bld/release
+
+meson \
+    --prefix=/usr \
+    --buildtype=release \
+    --force-fallback-for=fcft,tllist \
+    -Db_lto=true \
+    ../..
+
+# Generate PGO data.
+{
+    meson configure \
+        -Db_pgo=generate \
+
+    ninja
+    ninja test
+
+    # Required (gives some profiling data).
+    ./footclient --version
+
+    set -- \
+        "$OLDPWD/scripts/generate-alt-random-writes.py" \
+        --scroll \
+        --scroll-region \
+        --colors-regular \
+        --colors-bright \
+        --colors-256 \
+        --colors-rgb \
+        --attr-bold \
+        --attr-italic \
+        --attr-underline \
+        --sixel \
+        .pgotmp
+
+    ./foot \
+        --config=/dev/null \
+        --term=xterm \
+        sh -c "$* && cat .pgotmp"
+}
+
+# Clang requires this for PGO.
+case $("${CC:-cc}" --version) in *clang*)
+    llvm-profdata merge default_*profraw --output=default.profdata
+esac
+
+meson configure -Db_pgo=use
+
+ninja
+ninja install
+
+rm -rf \
+    "$DESTDIR/usr/share/doc" \
+    "$DESTDIR/usr/share/zsh" \
+    "$DESTDIR/usr/share/fish" \
+    "$DESTDIR/usr/share/bash-completion"

wayland/foot-pgo/checksums

@@ -0,0 +1 @@
+../foot/checksums

wayland/foot-pgo/depends

@@ -0,0 +1 @@
+../foot/depends

wayland/foot-pgo/sources

@@ -0,0 +1 @@
+../foot/sources

wayland/foot-pgo/version

@@ -0,0 +1 @@
+../foot/version

wayland/foot/build

@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+# Avoid scdoc dependency.
+sed "/subdir('doc')/d" meson.build > _
+mv -f _ meson.build
+
+export DESTDIR="$1"
+
+meson \
+    --prefix=/usr \
+    --buildtype=release \
+    --force-fallback-for=fcft,tllist \
+    . output
+
+ninja -C output
+ninja -C output install
+
+rm -rf \
+    "$1/usr/share/doc" \
+    "$1/usr/share/zsh" \
+    "$1/usr/share/fish" \
+    "$1/usr/share/bash-completion"

wayland/foot/checksums

@@ -0,0 +1,3 @@
+53df83617f7fbdd0f8f4c7a06e6e1716da61dbdcfb16aa65383ed31f4996195d
+2fd05bde524aff59b6f3742471415316bffc18670eba2e743abf723ec45e7dfd
+b0f32c9b2c2015c8d8dd068fd4e8b586aa91ca1670badc274ec962559ee0aadd

wayland/foot/depends

@@ -0,0 +1,7 @@
+fontconfig
+libxkbcommon
+ncurses make
+pkgconf make
+python  make
+wayland
+wayland-protocols make

wayland/foot/sources

@@ -0,0 +1,3 @@
+https://codeberg.org/dnkl/foot/archive/1.8.1.tar.gz
+https://codeberg.org/dnkl/fcft/archive/2.4.2.tar.gz subprojects/fcft
+https://codeberg.org/dnkl/tllist/archive/1.0.5.tar.gz subprojects/tllist

wayland/foot/version

@@ -0,0 +1 @@
+1.8.1 1

wayland/grim/build

@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+export DESTDIR="$1"
+
+meson \
+    --prefix=/usr \
+    -Djpeg=disabled \
+    . build
+
+ninja -C build
+ninja -C build install

wayland/grim/checksums

@@ -0,0 +1 @@
+42c2952e98389506156c08e40e0c37afdc2ec5ef4d55a5a4febde6acdac4d1c8

wayland/grim/depends

@@ -0,0 +1,3 @@
+cairo
+wayland
+wayland-protocols make

wayland/grim/sources

@@ -0,0 +1 @@
+https://github.com/emersion/grim/releases/download/v1.3.2/grim-1.3.2.tar.gz

wayland/libinput/build

@@ -0,0 +1,37 @@
+#!/bin/sh -e
+
+patch -p1 < evdev-wrap.patch
+
+export CFLAGS="$CFLAGS -fPIC"
+
+for pkg in mtdev evdev; do (
+    cd "$pkg"
+
+    ./configure \
+        --prefix=/usr \
+        --disable-shared \
+        --disable-gcov
+
+    make
+    make DESTDIR="$OLDPWD" install
+) done
+
+export PKG_CONFIG_PATH="$PWD/usr/lib/pkgconfig"
+export CFLAGS="$CFLAGS -I$PWD/usr/include -L$PWD/usr/lib"
+export CFLAGS="$CFLAGS -I$PWD/usr/include/libevdev-1.0"
+export DESTDIR="$1"
+
+meson \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --mandir=/usr/share/man \
+    --libexecdir=/usr/lib \
+    -Ddefault_library=both \
+    -Ddebug-gui=false \
+    -Ddocumentation=false \
+    -Dtests=false \
+    -Dlibwacom=false \
+    . output
+
+ninja -C output
+ninja -C output install

wayland/libinput/checksums

@@ -0,0 +1,4 @@
+65a657490de896081935cf0830a9773aa76756b8e9961edeffcce1074706bbe6
+15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0
+63f4ea1489858a109080e0b40bd43e4e0903a1e12ea888d581db8c495747c2d0
+9667e17dada5e8f7383b547a165a4df9d335fa5540787f53e4f46b45750652b6

wayland/libinput/depends

@@ -1,6 +1,4 @@
-libevdev
 libudev-zero
 linux-headers make
 meson         make
-mtdev
 pkgconf       make

wayland/libinput/patches/evdev-wrap.patch

@@ -0,0 +1,114 @@
+diff --git a/src/evdev.c b/src/evdev.c
+index 0f892b8..12fdaf2 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -133,6 +133,17 @@ evdev_update_key_down_count(struct evdev_device *device,
+ 	return key_count;
+ }
+ 
++int 
++evdev_event_code_from_name(unsigned int type, const char *name) 
++{
++    return libevdev_event_code_from_name(type, name);
++}
++
++const char *
++evdev_event_code_get_name (unsigned int type, unsigned int code) {
++    return libevdev_event_code_get_name(type, code);
++}
++
+ enum libinput_switch_state
+ evdev_device_switch_get_state(struct evdev_device *device,
+ 			      enum libinput_switch sw)
+diff --git a/src/evdev.h b/src/evdev.h
+index 0a4798f..352c22b 100644
+--- a/src/evdev.h
++++ b/src/evdev.h
+@@ -401,6 +401,12 @@ evdev_device_has_model_quirk(struct evdev_device *device,
+ 	return result;
+ }
+ 
++int 
++evdev_event_code_from_name(unsigned int type, const char *name);
++
++const char *
++evdev_event_code_get_name (unsigned int type, unsigned int code);
++
+ void
+ evdev_transform_absolute(struct evdev_device *device,
+ 			 struct device_coords *point);
+diff --git a/src/libinput.c b/src/libinput.c
+index b4164e2..b2ff1f3 100644
+--- a/src/libinput.c
++++ b/src/libinput.c
+@@ -310,6 +310,17 @@ log_msg_ratelimit(struct libinput *libinput,
+ 			us2ms(ratelimit->interval));
+ }
+ 
++LIBINPUT_EXPORT int 
++libinput_event_code_from_name(unsigned int type, const char *name) 
++{
++    return evdev_event_code_from_name(type, name);
++}
++
++LIBINPUT_EXPORT const char *
++libinput_event_code_get_name (unsigned int type, unsigned int code) {
++    return evdev_event_code_get_name(type, code);
++}
++
+ LIBINPUT_EXPORT void
+ libinput_log_set_priority(struct libinput *libinput,
+ 			  enum libinput_log_priority priority)
+diff --git a/src/libinput.h b/src/libinput.h
+index a15d627..edb8849 100644
+--- a/src/libinput.h
++++ b/src/libinput.h
+@@ -416,6 +416,35 @@ enum libinput_tablet_tool_tip_state {
+  */
+ struct libinput_tablet_pad_mode_group;
+ 
++
++/**
++ * @ingroup base
++ *
++ * A wrapper around libevdev_event_code_from_name for use in sway.
++ * For use in KISS Linux.
++ *
++ * @param type The event type (EV_* constant) where to look for the name.
++ * @param name A non-NULL string describing an input-event code, zero-terminated.
++ *
++ * @return The given code constant for the passed name or -1 if not found. 
++ */
++int 
++libinput_event_code_from_name(unsigned int type, const char *name);
++
++/**
++ * @ingroup base
++ *
++ * A wrapper around libevdev_event_code_get_name for use in sway.
++ * For use in KISS Linux.
++ *
++ * @param type The event type for the code to query (EV_SYN, EV_REL, etc.)
++ * @param code The event code to return the name for (e.g. ABS_X)
++ *
++ * @return The name of the given event code or NULL for an invalid type or code.
++ */
++const char *
++libinput_event_code_get_name(unsigned int type, unsigned int code);
++
+ /**
+  * @ingroup tablet_pad_modes
+  *
+diff --git a/src/libinput.sym b/src/libinput.sym
+index b45838e..ce88063 100644
+--- a/src/libinput.sym
++++ b/src/libinput.sym
+@@ -61,6 +61,8 @@ global:
+ 	libinput_device_set_user_data;
+ 	libinput_device_unref;
+ 	libinput_dispatch;
++	libinput_event_code_from_name;
++	libinput_event_code_get_name;
+ 	libinput_event_destroy;
+ 	libinput_event_device_notify_get_base_event;
+ 	libinput_event_get_context;

wayland/libinput/sources

@@ -0,0 +1,4 @@
+https://github.com/wayland-project/libinput/archive/1.18.0.tar.gz
+https://bitmath.org/code/mtdev/mtdev-1.1.6.tar.bz2 mtdev
+https://freedesktop.org/software/libevdev/libevdev-1.11.0.tar.xz evdev
+patches/evdev-wrap.patch

wayland/libseat/build

@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+export DESTDIR="$1"
+
+meson \
+    --prefix=/usr \
+    -Ddefault_library=both \
+    . build
+
+ninja -C build
+ninja -C build install

wayland/libseat/checksums

@@ -0,0 +1 @@
+274b56324fc81ca6002bc1cdd387668dee34a6e1063e5f3896805c3770948988

wayland/libseat/depends

@@ -0,0 +1 @@
+meson make

wayland/libseat/sources

@@ -0,0 +1 @@
+https://git.sr.ht/~kennylevinsen/seatd/archive/0.5.0.tar.gz

wayland/libseat/version

@@ -0,0 +1 @@
+0.5.0 1

wayland/libxkbcommon/build

@@ -7,7 +7,8 @@ meson \
     --libexecdir=/usr/lib \
     -Ddefault_library=both \
     -Denable-docs=false \
-    -Denable-wayland=false \
+    -Denable-wayland=true \
+    -Denable-x11=false \
     -Denable-xkbregistry=false \
     . output
 

wayland/libxkbcommon/depends

@@ -1,3 +1,5 @@
 bison   make
 meson   make
 pkgconf make
+wayland
+wayland-protocols make

wayland/slurp/build

@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+export DESTDIR="$1"
+
+meson \
+    --prefix=/usr \
+    --buildtype=release \
+    . output
+
+ninja -C output
+ninja -C output install