Tue Apr 6 23:43:40 2021 UTC ()
spice-server: fix build on macOS


(khorben)
diff -r1.4 -r1.5 pkgsrc/sysutils/spice-server/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c
diff -r1.2 -r1.3 pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/spice-server/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/spice-server/distinfo 2021/01/10 14:53:47 1.4
+++ pkgsrc/sysutils/spice-server/distinfo 2021/04/06 23:43:39 1.5
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.4 2021/01/10 14:53:47 jperkin Exp $ 1$NetBSD: distinfo,v 1.5 2021/04/06 23:43:39 khorben Exp $
2 2
3SHA1 (spice-0.14.3.tar.bz2) = f5968dd5df5f64805d093b4c85b4165959e6c65b 3SHA1 (spice-0.14.3.tar.bz2) = f5968dd5df5f64805d093b4c85b4165959e6c65b
4RMD160 (spice-0.14.3.tar.bz2) = fe99d8d0db4b275b1d19dc9a7231144133c5bfa0 4RMD160 (spice-0.14.3.tar.bz2) = fe99d8d0db4b275b1d19dc9a7231144133c5bfa0
5SHA512 (spice-0.14.3.tar.bz2) = 9ecdc455ff25c71ac1fe6c576654b51efbfb860110bd6828065d23f7462d5c5cac772074d1a40f033386258d970b77275b2007bcfdffb23fdff2137154ea46e4 5SHA512 (spice-0.14.3.tar.bz2) = 9ecdc455ff25c71ac1fe6c576654b51efbfb860110bd6828065d23f7462d5c5cac772074d1a40f033386258d970b77275b2007bcfdffb23fdff2137154ea46e4
6Size (spice-0.14.3.tar.bz2) = 1504304 bytes 6Size (spice-0.14.3.tar.bz2) = 1504304 bytes
7SHA1 (patch-server_red-stream.c) = b5aaee6e4bb7f0cfb89606ad026e4fa2c5f05da9 7SHA1 (patch-server_red-stream.c) = b5aaee6e4bb7f0cfb89606ad026e4fa2c5f05da9
8SHA1 (patch-server_red-worker.c) = 93699283fa99299bd672f930e8b90f5951d3726a 8SHA1 (patch-server_red-worker.c) = 8cee4cafa80812e133ec7883d3544a5245f3ca58
9SHA1 (patch-server_tests_test-stream.c) = 4b06d20626f06581c40164aa6d670e9b6530cdee 9SHA1 (patch-server_tests_test-stream.c) = 4b06d20626f06581c40164aa6d670e9b6530cdee
10SHA1 (patch-server_tests_test-websocket.c) = 19bca4dd6f441336588a1ae224f9d3d9b9984917 10SHA1 (patch-server_tests_test-websocket.c) = 19bca4dd6f441336588a1ae224f9d3d9b9984917
11SHA1 (patch-tools_reds__stat.c) = dcf0a7152577dcd12719971a13e5fd00f0cf15d6 11SHA1 (patch-tools_reds__stat.c) = 84f465dda5da0659f2fc80d1113616ea8b8e44ac
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c (expand / switch to unified diff)

--- pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c 2021/01/05 15:14:39 1.3
+++ pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c 2021/04/06 23:43:40 1.4
@@ -1,18 +1,28 @@ @@ -1,18 +1,28 @@
1$NetBSD: patch-server_red-worker.c,v 1.3 2021/01/05 15:14:39 jperkin Exp $ 1$NetBSD: patch-server_red-worker.c,v 1.4 2021/04/06 23:43:40 khorben Exp $
2 2
3Add NetBSD support. 3Add NetBSD support.
4 4
5--- server/red-worker.c.orig 2020-02-27 11:26:12.000000000 +0000 5--- server/red-worker.c.orig 2020-02-27 11:26:12.000000000 +0000
6+++ server/red-worker.c 6+++ server/red-worker.c
7@@ -1159,7 +1159,11 @@ bool red_worker_run(RedWorker *worker) 7@@ -1119,6 +1119,9 @@ static void *red_worker_main(void *arg)
 8 {
 9 RedWorker *worker = arg;
 10
 11+#if defined(__APPLE__)
 12+ pthread_setname_np("SPICE Worker");
 13+#endif
 14 spice_debug("begin");
 15 SPICE_VERIFY(MAX_PIPE_SIZE > WIDE_CLIENT_ACK_WINDOW &&
 16 MAX_PIPE_SIZE > NARROW_CLIENT_ACK_WINDOW); //ensure wakeup by ack message
 17@@ -1159,7 +1162,11 @@ bool red_worker_run(RedWorker *worker)
8 #ifndef _WIN32 18 #ifndef _WIN32
9 pthread_sigmask(SIG_SETMASK, &curr_sig_mask, NULL); 19 pthread_sigmask(SIG_SETMASK, &curr_sig_mask, NULL);
10 #endif 20 #endif
11+#if defined(__NetBSD__) 21+#if defined(__NetBSD__)
12+ pthread_setname_np(worker->thread, "%s", (void *)"SPICE Worker"); 22+ pthread_setname_np(worker->thread, "%s", (void *)"SPICE Worker");
13+#elif !defined(__sun) 23+#elif !defined(__sun) && !defined(__APPLE__)
14 pthread_setname_np(worker->thread, "SPICE Worker"); 24 pthread_setname_np(worker->thread, "SPICE Worker");
15+#endif 25+#endif
16  26
17 return r == 0; 27 return r == 0;
18 } 28 }
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c (expand / switch to unified diff)

--- pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c 2021/01/10 14:53:47 1.2
+++ pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c 2021/04/06 23:43:40 1.3
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-tools_reds__stat.c,v 1.2 2021/01/10 14:53:47 jperkin Exp $ 1$NetBSD: patch-tools_reds__stat.c,v 1.3 2021/04/06 23:43:40 khorben Exp $
2 2
3Add SunOS and NetBSD support. 3Add SunOS, NetBSD, and macOS support.
4 4
5--- tools/reds_stat.c.orig 2020-02-27 11:26:12.000000000 +0000 5--- tools/reds_stat.c.orig 2020-02-27 11:26:12.000000000 +0000
6+++ tools/reds_stat.c 6+++ tools/reds_stat.c
7@@ -144,7 +144,14 @@ int main(int argc, char **argv) 7@@ -144,7 +144,14 @@ int main(int argc, char **argv)
8 num_of_nodes = reds_stat->num_of_nodes; 8 num_of_nodes = reds_stat->num_of_nodes;
9 shm_old_size = shm_size; 9 shm_old_size = shm_size;
10 shm_size = header_size + num_of_nodes * sizeof(SpiceStatNode); 10 shm_size = header_size + num_of_nodes * sizeof(SpiceStatNode);
11+#if defined(__NetBSD__) 11+#if defined(__NetBSD__)
12+ reds_stat = mremap(reds_stat, shm_old_size, NULL, shm_size, 0); 12+ reds_stat = mremap(reds_stat, shm_old_size, NULL, shm_size, 0);
13+#elif defined(__sun) 13+#elif defined(__sun) || defined(__APPLE__)
14+ munmap(reds_stat, shm_old_size); 14+ munmap(reds_stat, shm_old_size);
15+ reds_stat = (SpiceStat *)mmap(NULL, shm_size, PROT_READ, MAP_SHARED, fd, 0); 15+ reds_stat = (SpiceStat *)mmap(NULL, shm_size, PROT_READ, MAP_SHARED, fd, 0);
16+#else 16+#else
17 reds_stat = mremap(reds_stat, shm_old_size, shm_size, MREMAP_MAYMOVE); 17 reds_stat = mremap(reds_stat, shm_old_size, shm_size, MREMAP_MAYMOVE);
18+#endif 18+#endif
19 if (reds_stat == (SpiceStat *)MAP_FAILED) { 19 if (reds_stat == (SpiceStat *)MAP_FAILED) {
20 perror("mremap"); 20 perror("mremap");
21 goto error; 21 goto error;