From e3e512dc53aab295eb2c8f156387c86689aff098 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Fri, 4 Nov 2022 04:42:04 +0900
Subject: [PATCH] waypipe: Bump to 0.8.4

---
 packages/waypipe/build.sh            |  4 +--
 packages/waypipe/src-waypipe.c.patch | 46 +++++++++++++++-------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/packages/waypipe/build.sh b/packages/waypipe/build.sh
index ffef9d9f5d..02b928de9a 100644
--- a/packages/waypipe/build.sh
+++ b/packages/waypipe/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gitlab.freedesktop.org/mstoeckl/waypipe
 TERMUX_PKG_DESCRIPTION="A proxy for Wayland clients"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.8.2
+TERMUX_PKG_VERSION=0.8.4
 TERMUX_PKG_SRCURL=https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${TERMUX_PKG_VERSION}/waypipe-v${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_SHA256=599ebe409516ced32679d3325ee17a1bc4da614f2636472d9138e39def6ad6b4
+TERMUX_PKG_SHA256=1efa009847f9ad980e1c5bda6b5d7a58be8596c1ab43ecb428bb54a9389eaec3
 TERMUX_PKG_DEPENDS="libandroid-spawn, liblz4, zstd"
 TERMUX_PKG_BUILD_DEPENDS="ffmpeg"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/waypipe/src-waypipe.c.patch b/packages/waypipe/src-waypipe.c.patch
index 2ad9124a7c..2878f11668 100644
--- a/packages/waypipe/src-waypipe.c.patch
+++ b/packages/waypipe/src-waypipe.c.patch
@@ -11,30 +11,32 @@
  		"                         ssh: sets the prefix for the socket path\n"
  		"      --version        print waypipe version and exit\n"
  		"      --allow-tiled    allow gpu buffers (DMABUFs) with format modifiers\n"
-@@ -743,7 +743,7 @@
+@@ -757,7 +757,7 @@
  		} else {
- 			strcpy(sockaddr.sun_path,
- 					socketpath ? socketpath
--						   : "/tmp/waypipe-client.sock");
-+						   : "@TERMUX_PREFIX@/tmp/waypipe-client.sock");
- 			int nmaxclients = oneshot ? 1 : 128;
- 			int channelsock =
- 					setup_nb_socket(&sockaddr, nmaxclients);
-@@ -776,7 +776,7 @@
+ 			struct socket_path client_sock_path;
+ 			client_sock_path.folder =
+-					socketpath ? socketpath : "/tmp/";
++					socketpath ? socketpath : "@TERMUX_PREFIX@/tmp/";
+ 			client_sock_path.filename = &sockaddr;
+ 			if (!socketpath) {
+ 				sockaddr.sun_family = AF_UNIX;
+@@ -799,7 +799,7 @@
  		} else {
- 			strcpy(sockaddr.sun_path,
- 					socketpath ? socketpath
--						   : "/tmp/waypipe-server.sock");
-+						   : "@TERMUX_PREFIX@/tmp/waypipe-server.sock");
- 
- 			ret = run_server(&sockaddr, wayland_display,
- 					control_path, &config, oneshot,
-@@ -784,7 +784,7 @@
- 		}
- 	} else {
- 		if (!socketpath) {
+ 			struct socket_path server_sock_path;
+ 			server_sock_path.folder =
+-					socketpath ? socketpath : "/tmp/";
++					socketpath ? socketpath : "@TERMUX_PREFIX@/tmp/";
+ 			server_sock_path.filename = &sockaddr;
+ 			if (!socketpath) {
+ 				sockaddr.sun_family = AF_UNIX;
+@@ -830,8 +830,8 @@
+ 		} else {
+ 			clientsock.sun_family = AF_UNIX;
+ 			strcpy(clientsock.sun_path, "waypipe");
+-			strcpy(socket_folder, "/tmp/");
 -			socketpath = "/tmp/waypipe";
++			strcpy(socket_folder, "@TERMUX_PREFIX@/tmp/");
 +			socketpath = "@TERMUX_PREFIX@/tmp/waypipe";
  		}
- 		const size_t spsz =
- 				sizeof(((struct sockaddr_un *)NULL)->sun_path);
+ 		if (strlen(clientsock.sun_path) +
+ 						sizeof("-server-88888888.sock") >=