Received: by mail.netbsd.org (Postfix, from userid 605) id 392FC84DC8; Thu, 6 Feb 2020 21:57:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B767284DBF for ; Thu, 6 Feb 2020 21:57:43 +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 mfoBXGdXvujK for ; Thu, 6 Feb 2020 21:57:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EE3B884C85 for ; Thu, 6 Feb 2020 21:57:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E5CE0FBF4; Thu, 6 Feb 2020 21:57:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1581026262242630" MIME-Version: 1.0 Date: Thu, 6 Feb 2020 21:57:42 +0000 From: "Kamil Rytarowski" Subject: CVS commit: pkgsrc/sysutils/spice-server To: pkgsrc-changes@NetBSD.org Reply-To: kamil@netbsd.org X-Mailer: log_accum Message-Id: <20200206215742.E5CE0FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1581026262242630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kamil Date: Thu Feb 6 21:57:42 UTC 2020 Added Files: pkgsrc/sysutils/spice-server: DESCR Makefile PLIST buildlink3.mk distinfo pkgsrc/sysutils/spice-server/patches: patch-server_red-stream.c patch-server_red-worker.c patch-tools_reds__stat.c Log Message: sysutils/spice-server: import spice-server-0.14.2 SPICE is a remote display system built for virtual environments which allows you to view a computing 'desktop' environment not only on the machine where it is running, but from anywhere on the Internet and from a wide variety of machine architectures. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/spice-server/DESCR \ pkgsrc/sysutils/spice-server/Makefile pkgsrc/sysutils/spice-server/PLIST \ pkgsrc/sysutils/spice-server/buildlink3.mk \ pkgsrc/sysutils/spice-server/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.c \ pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c \ 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. --_----------=_1581026262242630 Content-Disposition: inline Content-Length: 6997 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/sysutils/spice-server/DESCR diff -u /dev/null pkgsrc/sysutils/spice-server/DESCR:1.1 --- /dev/null Thu Feb 6 21:57:42 2020 +++ pkgsrc/sysutils/spice-server/DESCR Thu Feb 6 21:57:42 2020 @@ -0,0 +1,4 @@ +SPICE is a remote display system built for virtual environments which +allows you to view a computing 'desktop' environment not only on the +machine where it is running, but from anywhere on the Internet and +from a wide variety of machine architectures. Index: pkgsrc/sysutils/spice-server/Makefile diff -u /dev/null pkgsrc/sysutils/spice-server/Makefile:1.1 --- /dev/null Thu Feb 6 21:57:42 2020 +++ pkgsrc/sysutils/spice-server/Makefile Thu Feb 6 21:57:42 2020 @@ -0,0 +1,26 @@ +# $NetBSD: Makefile,v 1.1 2020/02/06 21:57:42 kamil Exp $ + +DISTNAME= spice-0.14.2 +PKGNAME= ${DISTNAME:S/spice/spice-server/} +CATEGORIES= sysutils +MASTER_SITES= https://www.spice-space.org/download/releases/ +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://www.spice-space.org/download/releases/ +COMMENT= Simple Protocol for Independent Computing Environments +LICENSE= gnu-lgpl-v2.1 + +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= gmake pkg-config + +PKGCONFIG_OVERRIDE+= spice-server.pc.in + +.include "../../audio/libopus/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../sysutils/spice-protocol/buildlink3.mk" +.include "../../x11/pixman/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/spice-server/PLIST diff -u /dev/null pkgsrc/sysutils/spice-server/PLIST:1.1 --- /dev/null Thu Feb 6 21:57:42 2020 +++ pkgsrc/sysutils/spice-server/PLIST Thu Feb 6 21:57:42 2020 @@ -0,0 +1,14 @@ +@comment $NetBSD: PLIST,v 1.1 2020/02/06 21:57:42 kamil Exp $ +include/spice-server/spice-audio.h +include/spice-server/spice-char.h +include/spice-server/spice-core.h +include/spice-server/spice-experimental.h +include/spice-server/spice-input.h +include/spice-server/spice-migration.h +include/spice-server/spice-qxl.h +include/spice-server/spice-replay.h +include/spice-server/spice-server.h +include/spice-server/spice-version.h +include/spice-server/spice.h +lib/libspice-server.la +lib/pkgconfig/spice-server.pc Index: pkgsrc/sysutils/spice-server/buildlink3.mk diff -u /dev/null pkgsrc/sysutils/spice-server/buildlink3.mk:1.1 --- /dev/null Thu Feb 6 21:57:42 2020 +++ pkgsrc/sysutils/spice-server/buildlink3.mk Thu Feb 6 21:57:42 2020 @@ -0,0 +1,18 @@ +# $NetBSD: buildlink3.mk,v 1.1 2020/02/06 21:57:42 kamil Exp $ + +BUILDLINK_TREE+= spice-server + +.if !defined(SPICE_SERVER_BUILDLINK3_MK) +SPICE_SERVER_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.spice-server+= spice-server>=0.14.2 +BUILDLINK_PKGSRCDIR.spice-server?= ../../sysutils/spice-server + +.include "../../audio/libopus/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../sysutils/spice-protocol/buildlink3.mk" +.include "../../x11/pixman/buildlink3.mk" +.endif # SPICE_SERVER_BUILDLINK3_MK + +BUILDLINK_TREE+= -spice-server Index: pkgsrc/sysutils/spice-server/distinfo diff -u /dev/null pkgsrc/sysutils/spice-server/distinfo:1.1 --- /dev/null Thu Feb 6 21:57:42 2020 +++ pkgsrc/sysutils/spice-server/distinfo Thu Feb 6 21:57:42 2020 @@ -0,0 +1,9 @@ +$NetBSD: distinfo,v 1.1 2020/02/06 21:57:42 kamil Exp $ + +SHA1 (spice-0.14.2.tar.bz2) = 83a93e47546d496cf2dcc3f4641db3a285044b9e +RMD160 (spice-0.14.2.tar.bz2) = 30aaafe30af5a9781d630b9f076973dbc4f59eac +SHA512 (spice-0.14.2.tar.bz2) = 1093b618ea4a7ff31944429ce2903abecfc8d20c35f2d9c8c837a6e053ee429c0115e40665542637a717869209523ac05d15cdb5e77563102d5d3915e4aaaf76 +Size (spice-0.14.2.tar.bz2) = 1406009 bytes +SHA1 (patch-server_red-stream.c) = 453ee9b8e5007c552f2ef3b46f508c7cdba6d14c +SHA1 (patch-server_red-worker.c) = f684dafdc9eab808e36759fba19340586c90cb62 +SHA1 (patch-tools_reds__stat.c) = 3464bbb8b25aa871adfbc501412f84ad925f6509 Index: pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.c diff -u /dev/null pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.c:1.1 --- /dev/null Thu Feb 6 21:57:42 2020 +++ pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.c Thu Feb 6 21:57:42 2020 @@ -0,0 +1,28 @@ +$NetBSD: patch-server_red-stream.c,v 1.1 2020/02/06 21:57:42 kamil Exp $ + +Add NetBSD support. + +--- server/red-stream.c.orig 2019-04-30 08:51:11.000000000 +0000 ++++ server/red-stream.c +@@ -27,6 +27,9 @@ + #include + #include + #endif ++#ifdef __NetBSD__ ++#include ++#endif + + #include + +@@ -109,7 +112,11 @@ struct RedStreamPrivate { + static int socket_set_cork(int socket, int enabled) + { + SPICE_VERIFY(sizeof(enabled) == sizeof(int)); ++#if defined(__NetBSD__) ++ return 1; /* Not supported */ ++#else + return setsockopt(socket, IPPROTO_TCP, TCP_CORK, &enabled, sizeof(enabled)); ++#endif + } + + static ssize_t stream_write_cb(RedStream *s, const void *buf, size_t size) Index: pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c diff -u /dev/null pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c:1.1 --- /dev/null Thu Feb 6 21:57:42 2020 +++ pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c Thu Feb 6 21:57:42 2020 @@ -0,0 +1,18 @@ +$NetBSD: patch-server_red-worker.c,v 1.1 2020/02/06 21:57:42 kamil Exp $ + +Add NetBSD support. + +--- server/red-worker.c.orig 2019-04-30 08:51:11.000000000 +0000 ++++ server/red-worker.c +@@ -1161,7 +1161,11 @@ bool red_worker_run(RedWorker *worker) + spice_error("create thread failed %d", r); + } + pthread_sigmask(SIG_SETMASK, &curr_sig_mask, NULL); ++#if defined(__NetBSD__) ++ pthread_setname_np(worker->thread, "%s", (void *)"SPICE Worker"); ++#else + pthread_setname_np(worker->thread, "SPICE Worker"); ++#endif + + return r == 0; + } Index: pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c diff -u /dev/null pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c:1.1 --- /dev/null Thu Feb 6 21:57:42 2020 +++ pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c Thu Feb 6 21:57:42 2020 @@ -0,0 +1,18 @@ +$NetBSD: patch-tools_reds__stat.c,v 1.1 2020/02/06 21:57:42 kamil Exp $ + +Add NetBSD support. + +--- tools/reds_stat.c.orig 2019-04-30 08:51:05.000000000 +0000 ++++ tools/reds_stat.c +@@ -144,7 +144,11 @@ int main(int argc, char **argv) + num_of_nodes = reds_stat->num_of_nodes; + shm_old_size = shm_size; + shm_size = header_size + num_of_nodes * sizeof(SpiceStatNode); ++#if defined(__NetBSD__) ++ reds_stat = mremap(reds_stat, shm_old_size, NULL, shm_size, 0); ++#else + reds_stat = mremap(reds_stat, shm_old_size, shm_size, MREMAP_MAYMOVE); ++#endif + if (reds_stat == (SpiceStat *)MAP_FAILED) { + perror("mremap"); + goto error; --_----------=_1581026262242630--