bump(x11/wlroots): 0.18.1, bump(x11/sway): 1.10

termux · Oct 31, 2024 · e623fa1 · e623fa1
1 parent f3babc8
commit e623fa1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 23 deletions.
diff --git a/x11-packages/sway/0002-fix-include.patch b/x11-packages/sway/0002-fix-include.patch
@@ -8,25 +8,15 @@ diff -uNr a/include/sway/config.h b/include/sway/config.h
  #include <stdint.h>
  #include <string.h>
  #include <time.h>
---- a/include/sway/server.h
-+++ b/include/sway/server.h
-@@ -3,6 +3,7 @@
- #include <stdbool.h>
- #include <wayland-server-core.h>
- #include <wlr/backend.h>
-+#include <wlr/config.h>
- #include <wlr/render/allocator.h>
- #include <wlr/render/wlr_renderer.h>
- #include <wlr/types/wlr_compositor.h>
 --- a/include/sway/input/input-manager.h
 +++ b/include/sway/input/input-manager.h
 @@ -1,6 +1,5 @@
  #ifndef _SWAY_INPUT_INPUT_MANAGER_H
  #define _SWAY_INPUT_INPUT_MANAGER_H
 -#include <libinput.h>
- #include <wlr/types/wlr_input_inhibitor.h>
  #include <wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h>
  #include <wlr/types/wlr_virtual_keyboard_v1.h>
+ #include <wlr/types/wlr_virtual_pointer_v1.h>
 --- a/sway/config.c
 +++ b/sway/config.c
 @@ -9,7 +9,6 @@

diff --git a/x11-packages/sway/0005-fix-for-libinput-related-config.patch b/x11-packages/sway/0005-fix-for-libinput-related-config.patch
@@ -12,19 +12,20 @@
  	{ "new_float", cmd_new_float },
 --- a/sway/meson.build
 +++ b/sway/meson.build
-@@ -75,7 +75,6 @@
+@@ -76,7 +76,6 @@
  	'commands/max_render_time.c',
  	'commands/opacity.c',
  	'commands/include.c',
 -	'commands/input.c',
  	'commands/layout.c',
  	'commands/mode.c',
  	'commands/mouse_warping.c',
-@@ -151,6 +150,35 @@
+@@ -153,6 +152,37 @@
  	'commands/bar/workspace_min_width.c',
  	'commands/bar/wrap_scroll.c',
 
 +	'commands/output/adaptive_sync.c',
++	'commands/output/allow_tearing.c',
 +	'commands/output/background.c',
 +	'commands/output/disable.c',
 +	'commands/output/dpms.c',
@@ -40,6 +41,7 @@
 +	'commands/output/toggle.c',
 +	'commands/output/transform.c',
 +	'commands/output/unplug.c',
++	'commands/output/color_profile.c',
 +
 +	'tree/arrange.c',
 +	'tree/container.c',
@@ -56,12 +58,13 @@
  	'commands/input/accel_profile.c',
  	'commands/input/calibration_matrix.c',
  	'commands/input/click_method.c',
-@@ -183,31 +211,6 @@
+@@ -188,33 +218,6 @@
  	'commands/input/xkb_rules.c',
  	'commands/input/xkb_switch_layout.c',
  	'commands/input/xkb_variant.c',
 -
 -	'commands/output/adaptive_sync.c',
+-	'commands/output/allow_tearing.c',
 -	'commands/output/background.c',
 -	'commands/output/disable.c',
 -	'commands/output/dpms.c',
@@ -77,6 +80,7 @@
 -	'commands/output/toggle.c',
 -	'commands/output/transform.c',
 -	'commands/output/unplug.c',
+-	'commands/output/color_profile.c',
 -
 -	'tree/arrange.c',
 -	'tree/container.c',
@@ -88,7 +92,7 @@
  )
 
  sway_deps = [
-@@ -236,6 +239,7 @@
+@@ -242,6 +245,7 @@
 
  if wlroots_features['libinput_backend']
  	sway_sources += 'input/libinput.c'

diff --git a/x11-packages/sway/build.sh b/x11-packages/sway/build.sh
@@ -2,15 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/swaywm/sway
 TERMUX_PKG_DESCRIPTION="i3-compatible Wayland compositor"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.9"
+TERMUX_PKG_VERSION="1.10"
 TERMUX_PKG_SRCURL=https://github.com/swaywm/sway/releases/download/$TERMUX_PKG_VERSION/sway-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=a63b2df8722ee595695a0ec6c84bf29a055a9767e63d8e4c07ff568cb6ee0b51
-TERMUX_PKG_DEPENDS="gdk-pixbuf, json-c, libandroid-wordexp, libcairo, libevdev, libwayland, pango, pcre2, wlroots"
+TERMUX_PKG_SHA256=7472a7f11150212e0bed0bd0af9f591c9caac9f9ea87c35486e475a21f5ce81f
+TERMUX_PKG_DEPENDS="gdk-pixbuf, json-c, libandroid-wordexp, libcairo, libevdev, libwayland, pango, pcre2, wlroots (>= 0.18.1)"
 TERMUX_PKG_BUILD_DEPENDS="libwayland-protocols"
 TERMUX_PKG_RECOMMENDS="xwayland"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--Dxwayland=enabled
-"
 
 termux_step_pre_configure() {
 	export PATH="$TERMUX_PREFIX/opt/libwayland/cross/bin:$PATH"

diff --git a/x11-packages/wlroots/build.sh b/x11-packages/wlroots/build.sh
@@ -2,12 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://gitlab.freedesktop.org/wlroots/wlroots
 TERMUX_PKG_DESCRIPTION="Modular wayland compositor library"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="0.17.3"
+TERMUX_PKG_VERSION="0.18.1"
 TERMUX_PKG_SRCURL=https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${TERMUX_PKG_VERSION}/wlroots-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_SHA256=b916d9574367373d42334ea12ea3cead27ebc3b8de3bea375619e537d86b0757
+TERMUX_PKG_SHA256=c42269d6c6c3e2bc3b19d5254c0a9defb81b92707efa7af4c0cf1b550039a5d3
 TERMUX_PKG_DEPENDS="libdrm, libglvnd, libpixman, libwayland, libxcb, libxkbcommon, xcb-util-renderutil, xcb-util-wm"
 TERMUX_PKG_BUILD_DEPENDS="libglvnd-dev, libwayland-cross-scanner, libwayland-protocols, xwayland"
 TERMUX_PKG_RECOMMENDS="xwayland"
+TERMUX_PKG_BREAKS="sway (<< 1.10 )"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dexamples=false
 -Dxwayland=enabled