spice-server: add non-building update

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: spice-server: add non-building update
From: Thomas Klausner <wiz%gatalith.at@localhost>
Date: Fri, 16 Jun 2023 22:11:11 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Sat Jun 17 00:11:11 2023 +0200
Changeset:	5f6f851f673df75181477c241ab65ad8e4cac2c0

Modified Files:
	Makefile
Added Files:
	spice-server/DESCR
	spice-server/Makefile
	spice-server/PLIST
	spice-server/TODO
	spice-server/buildlink3.mk
	spice-server/distinfo
	spice-server/patches/patch-server_red-stream.cpp
	spice-server/patches/patch-server_red-worker.cpp
	spice-server/patches/patch-server_tests_test-stream.c
	spice-server/patches/patch-server_tests_test-websocket.c
	spice-server/patches/patch-tools_reds__stat.c

Log Message:
spice-server: add non-building update

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5f6f851f673df75181477c241ab65ad8e4cac2c0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  4 ++-
 spice-server/DESCR                                 |  4 +++
 spice-server/Makefile                              | 32 ++++++++++++++++++++++
 spice-server/PLIST                                 | 13 +++++++++
 spice-server/TODO                                  |  1 +
 spice-server/buildlink3.mk                         | 19 +++++++++++++
 spice-server/distinfo                              | 10 +++++++
 spice-server/patches/patch-server_red-stream.cpp   | 20 ++++++++++++++
 spice-server/patches/patch-server_red-worker.cpp   | 15 ++++++++++
 .../patches/patch-server_tests_test-stream.c       | 21 ++++++++++++++
 .../patches/patch-server_tests_test-websocket.c    | 27 ++++++++++++++++++
 spice-server/patches/patch-tools_reds__stat.c      |  4 +++
 12 files changed, 169 insertions(+), 1 deletion(-)

diffs:
diff --git a/Makefile b/Makefile
index 11588998d9..ef7367bcf1 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,7 @@ SUBDIR+=	R-httpcode
 SUBDIR+=	R-lsei
 SUBDIR+=	R-mclust
 SUBDIR+=	R-mpfr
+SUBDIR+=	R-nloptr
 SUBDIR+=	R-np
 SUBDIR+=	R-npsurv
 SUBDIR+=	R-oai
@@ -141,7 +142,6 @@ SUBDIR+=	am-utils-git
 SUBDIR+=	amavis-logwatch
 SUBDIR+=	amlogic-meson-fwtools
 SUBDIR+=	analizo
-SUBDIR+=	and
 SUBDIR+=	android-tools-adb
 SUBDIR+=	angelscript
 SUBDIR+=	ansible-junos-stdlib
@@ -3145,6 +3145,7 @@ SUBDIR+=	php-xdiff
 SUBDIR+=	php-zmq
 SUBDIR+=	picolisp
 SUBDIR+=	picolisp64
+SUBDIR+=	picom
 SUBDIR+=	picosat
 SUBDIR+=	picprog
 SUBDIR+=	pidgin-evolution
@@ -5310,6 +5311,7 @@ SUBDIR+=	speed-dreams
 SUBDIR+=	speedx
 SUBDIR+=	spfmilter
 SUBDIR+=	spice-html5
+SUBDIR+=	spice-server
 SUBDIR+=	spice-vdagent
 SUBDIR+=	spid-compliant-certificates
 SUBDIR+=	spidermonkey24
diff --git a/spice-server/DESCR b/spice-server/DESCR
new file mode 100644
index 0000000000..600e78f5bb
--- /dev/null
+++ b/spice-server/DESCR
@@ -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.
diff --git a/spice-server/Makefile b/spice-server/Makefile
new file mode 100644
index 0000000000..558dd1323f
--- /dev/null
+++ b/spice-server/Makefile
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.8 2023/05/06 19:08:54 ryoon Exp $
+
+DISTNAME=	spice-0.15.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@localhost
+HOMEPAGE=	https://www.spice-space.org/
+COMMENT=	Simple Protocol for Independent Computing Environments
+LICENSE=	gnu-lgpl-v2.1
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake pkg-config
+USE_LANGUAGES=	c c++11
+
+PKGCONFIG_OVERRIDE+=	spice-server.pc.in
+
+LDFLAGS.SunOS+=	-lnsl -lsocket
+
+PYTHON_FOR_BUILD_ONLY=	tool
+
+.include "../../audio/libopus/buildlink3.mk"
+.include "../../lang/python/tool.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"
diff --git a/spice-server/PLIST b/spice-server/PLIST
new file mode 100644
index 0000000000..df4f19506a
--- /dev/null
+++ b/spice-server/PLIST
@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST,v 1.2 2020/11/01 19:36:37 maya Exp $
+include/spice-server/spice-audio.h
+include/spice-server/spice-char.h
+include/spice-server/spice-core.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
diff --git a/spice-server/TODO b/spice-server/TODO
new file mode 100644
index 0000000000..8957c6c7a2
--- /dev/null
+++ b/spice-server/TODO
@@ -0,0 +1 @@
+Doesn't build.
diff --git a/spice-server/buildlink3.mk b/spice-server/buildlink3.mk
new file mode 100644
index 0000000000..6090bdd204
--- /dev/null
+++ b/spice-server/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.5 2023/05/06 19:08:54 ryoon 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_ABI_DEPENDS.spice-server+=	spice-server>=0.14.3nb2
+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
diff --git a/spice-server/distinfo b/spice-server/distinfo
new file mode 100644
index 0000000000..a5467649a3
--- /dev/null
+++ b/spice-server/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.7 2021/10/26 11:20:14 nia Exp $
+
+BLAKE2s (spice-0.15.2.tar.bz2) = e9573c34de862ed41ab65988cb4df7475b8fd390294a1a7856c7eeedaba8e4c4
+SHA512 (spice-0.15.2.tar.bz2) = c8f273b9e97ef38a03b331f7d32c5f0a09d540523fe626568c845152cbd22273a92b3a08bc13fa2e061b913ad16ceb7cbddf142655cd9cdcd8eb5f646fa6aa26
+Size (spice-0.15.2.tar.bz2) = 1663326 bytes
+SHA1 (patch-server_red-stream.cpp) = b77cf5f56fcc097787cc3acc24e83d09f6a1a700
+SHA1 (patch-server_red-worker.cpp) = 68ba71b891bf373efda230bad389d944bd2d8d87
+SHA1 (patch-server_tests_test-stream.c) = 4b06d20626f06581c40164aa6d670e9b6530cdee
+SHA1 (patch-server_tests_test-websocket.c) = c2512523476950e94161806a1e6644f0a76a6f9d
+SHA1 (patch-tools_reds__stat.c) = a3bd92dd070a69e21148346c3ddddfd93e145186
diff --git a/spice-server/patches/patch-server_red-stream.cpp b/spice-server/patches/patch-server_red-stream.cpp
new file mode 100644
index 0000000000..02231b311e
--- /dev/null
+++ b/spice-server/patches/patch-server_red-stream.cpp
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- server/red-stream.cpp.orig	2023-05-12 08:37:06.000000000 +0000
++++ server/red-stream.cpp
+@@ -17,6 +17,15 @@
+ */
+ #include <config.h>
+ 
++#if defined(__sun)
++#define MSG_NOSIGNAL   0
++#  if __STDC_VERSION__ - 0 < 199901L
++#define _XOPEN_SOURCE  500
++#  else
++#define _XOPEN_SOURCE  600
++#  endif
++#endif
++
+ #include <cerrno>
+ 
+ #include <fcntl.h>
diff --git a/spice-server/patches/patch-server_red-worker.cpp b/spice-server/patches/patch-server_red-worker.cpp
new file mode 100644
index 0000000000..5179646b76
--- /dev/null
+++ b/spice-server/patches/patch-server_red-worker.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- server/red-worker.cpp.orig	2023-05-12 08:37:06.000000000 +0000
++++ server/red-worker.cpp
+@@ -1049,7 +1049,9 @@ bool red_worker_run(RedWorker *worker)
+ #ifndef _WIN32
+     pthread_sigmask(SIG_SETMASK, &curr_sig_mask, nullptr);
+ #endif
+-#if !defined(__APPLE__)
++#if defined(__NetBSD__)
++    pthread_setname_np(worker->thread, "%s", (void *)"SPICE Worker");
++#elif !defined(__sun) && !defined(__APPLE__)
+     pthread_setname_np(worker->thread, "SPICE Worker");
+ #endif
+ 
diff --git a/spice-server/patches/patch-server_tests_test-stream.c b/spice-server/patches/patch-server_tests_test-stream.c
new file mode 100644
index 0000000000..7c6aed0d48
--- /dev/null
+++ b/spice-server/patches/patch-server_tests_test-stream.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-server_tests_test-stream.c,v 1.1 2021/01/05 15:14:39 jperkin Exp $
+
+Fix build on SunOS.
+
+--- server/tests/test-stream.c.orig	2020-02-27 11:26:12.000000000 +0000
++++ server/tests/test-stream.c
+@@ -17,6 +17,14 @@
+ */
+ #include <config.h>
+ 
++#if defined(__sun)
++#  if __STDC_VERSION__ - 0 < 199901L
++#define _XOPEN_SOURCE	500
++#  else
++#define _XOPEN_SOURCE	600
++#  endif
++#endif
++
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <errno.h>
diff --git a/spice-server/patches/patch-server_tests_test-websocket.c b/spice-server/patches/patch-server_tests_test-websocket.c
new file mode 100644
index 0000000000..1eae4d1951
--- /dev/null
+++ b/spice-server/patches/patch-server_tests_test-websocket.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-server_tests_test-websocket.c,v 1.2 2021/01/05 15:14:39 jperkin Exp $
+
+Provide fallback definitions for MSG_NOSIGNAL (SunOS) and SOL_TCP (NetBSD)
+
+--- server/tests/test-websocket.c.orig	2023-05-12 08:37:06.000000000 +0000
++++ server/tests/test-websocket.c
+@@ -42,6 +42,10 @@
+ #include "net-utils.h"
+ #include "websocket.h"
+ 
++#if !defined(MSG_NOSIGNAL)
++#define MSG_NOSIGNAL	0
++#endif
++
+ /*
+ on data arrived on socket:
+   try to read data, read again till error, handle error, on EAGAIN polling again
+@@ -200,6 +204,9 @@ handle_client(int new_sock)
+ {
+     if (non_blocking) {
+         red_socket_set_non_blocking(new_sock, true);
++#ifndef SOL_TCP
++#define SOL_TCP IPPROTO_TCP
++#endif
+     }
+ 
+     int enable = 1;
diff --git a/spice-server/patches/patch-tools_reds__stat.c b/spice-server/patches/patch-tools_reds__stat.c
new file mode 100644
index 0000000000..43294bc5cf
--- /dev/null
+++ b/spice-server/patches/patch-tools_reds__stat.c
@@ -0,0 +1,4 @@
+$NetBSD: patch-tools_reds__stat.c,v 1.3 2021/04/06 23:43:40 khorben Exp $
+
+Add SunOS, NetBSD, and macOS support.
+
Prev by Date: qmediamanager: Add devpub-mount dep
Next by Date: desktop-installer: Update to 0.8.0.32
Previous by Thread: qmediamanager: Add devpub-mount dep
Next by Thread: desktop-installer: Update to 0.8.0.32
Indexes:
Home | Main Index | Thread Index | Old Index