Received: by mail.netbsd.org (Postfix, from userid 605) id 2F65D84DE3; Tue, 6 Apr 2021 23:43:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6979984DCC for ; Tue, 6 Apr 2021 23:43:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id TWZlFJQRJdE4 for ; Tue, 6 Apr 2021 23:43:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5399F84DB1 for ; Tue, 6 Apr 2021 23:43:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 478FDFA95; Tue, 6 Apr 2021 23:43:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_161775262062980" MIME-Version: 1.0 Date: Tue, 6 Apr 2021 23:43:40 +0000 From: "Pierre Pronchery" Subject: CVS commit: pkgsrc/sysutils/spice-server To: pkgsrc-changes@NetBSD.org Reply-To: khorben@netbsd.org X-Mailer: log_accum Message-Id: <20210406234340.478FDFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_161775262062980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: khorben Date: Tue Apr 6 23:43:40 UTC 2021 Modified Files: pkgsrc/sysutils/spice-server: distinfo pkgsrc/sysutils/spice-server/patches: patch-server_red-worker.c patch-tools_reds__stat.c Log Message: spice-server: fix build on macOS To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/spice-server/distinfo cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_161775262062980 Content-Disposition: inline Content-Length: 3993 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/spice-server/distinfo diff -u pkgsrc/sysutils/spice-server/distinfo:1.4 pkgsrc/sysutils/spice-server/distinfo:1.5 --- pkgsrc/sysutils/spice-server/distinfo:1.4 Sun Jan 10 14:53:47 2021 +++ pkgsrc/sysutils/spice-server/distinfo Tue Apr 6 23:43:39 2021 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.4 2021/01/10 14:53:47 jperkin Exp $ +$NetBSD: distinfo,v 1.5 2021/04/06 23:43:39 khorben Exp $ SHA1 (spice-0.14.3.tar.bz2) = f5968dd5df5f64805d093b4c85b4165959e6c65b RMD160 (spice-0.14.3.tar.bz2) = fe99d8d0db4b275b1d19dc9a7231144133c5bfa0 SHA512 (spice-0.14.3.tar.bz2) = 9ecdc455ff25c71ac1fe6c576654b51efbfb860110bd6828065d23f7462d5c5cac772074d1a40f033386258d970b77275b2007bcfdffb23fdff2137154ea46e4 Size (spice-0.14.3.tar.bz2) = 1504304 bytes SHA1 (patch-server_red-stream.c) = b5aaee6e4bb7f0cfb89606ad026e4fa2c5f05da9 -SHA1 (patch-server_red-worker.c) = 93699283fa99299bd672f930e8b90f5951d3726a +SHA1 (patch-server_red-worker.c) = 8cee4cafa80812e133ec7883d3544a5245f3ca58 SHA1 (patch-server_tests_test-stream.c) = 4b06d20626f06581c40164aa6d670e9b6530cdee SHA1 (patch-server_tests_test-websocket.c) = 19bca4dd6f441336588a1ae224f9d3d9b9984917 -SHA1 (patch-tools_reds__stat.c) = dcf0a7152577dcd12719971a13e5fd00f0cf15d6 +SHA1 (patch-tools_reds__stat.c) = 84f465dda5da0659f2fc80d1113616ea8b8e44ac Index: pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c diff -u pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c:1.3 pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c:1.4 --- pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c:1.3 Tue Jan 5 15:14:39 2021 +++ pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c Tue Apr 6 23:43:40 2021 @@ -1,16 +1,26 @@ -$NetBSD: patch-server_red-worker.c,v 1.3 2021/01/05 15:14:39 jperkin Exp $ +$NetBSD: patch-server_red-worker.c,v 1.4 2021/04/06 23:43:40 khorben Exp $ Add NetBSD support. --- server/red-worker.c.orig 2020-02-27 11:26:12.000000000 +0000 +++ server/red-worker.c -@@ -1159,7 +1159,11 @@ bool red_worker_run(RedWorker *worker) +@@ -1119,6 +1119,9 @@ static void *red_worker_main(void *arg) + { + RedWorker *worker = arg; + ++#if defined(__APPLE__) ++ pthread_setname_np("SPICE Worker"); ++#endif + spice_debug("begin"); + SPICE_VERIFY(MAX_PIPE_SIZE > WIDE_CLIENT_ACK_WINDOW && + MAX_PIPE_SIZE > NARROW_CLIENT_ACK_WINDOW); //ensure wakeup by ack message +@@ -1159,7 +1162,11 @@ bool red_worker_run(RedWorker *worker) #ifndef _WIN32 pthread_sigmask(SIG_SETMASK, &curr_sig_mask, NULL); #endif +#if defined(__NetBSD__) + pthread_setname_np(worker->thread, "%s", (void *)"SPICE Worker"); -+#elif !defined(__sun) ++#elif !defined(__sun) && !defined(__APPLE__) pthread_setname_np(worker->thread, "SPICE Worker"); +#endif Index: pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c diff -u pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c:1.2 pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c:1.3 --- pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c:1.2 Sun Jan 10 14:53:47 2021 +++ pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c Tue Apr 6 23:43:40 2021 @@ -1,6 +1,6 @@ -$NetBSD: patch-tools_reds__stat.c,v 1.2 2021/01/10 14:53:47 jperkin Exp $ +$NetBSD: patch-tools_reds__stat.c,v 1.3 2021/04/06 23:43:40 khorben Exp $ -Add SunOS and NetBSD support. +Add SunOS, NetBSD, and macOS support. --- tools/reds_stat.c.orig 2020-02-27 11:26:12.000000000 +0000 +++ tools/reds_stat.c @@ -10,7 +10,7 @@ Add SunOS and NetBSD support. shm_size = header_size + num_of_nodes * sizeof(SpiceStatNode); +#if defined(__NetBSD__) + reds_stat = mremap(reds_stat, shm_old_size, NULL, shm_size, 0); -+#elif defined(__sun) ++#elif defined(__sun) || defined(__APPLE__) + munmap(reds_stat, shm_old_size); + reds_stat = (SpiceStat *)mmap(NULL, shm_size, PROT_READ, MAP_SHARED, fd, 0); +#else --_----------=_161775262062980--