From aac05b611c7e80d730e454e97bef45d86de91498 Mon Sep 17 00:00:00 2001 From: Roman Bogorodskiy Date: Sat, 17 Apr 2021 05:26:05 +0400 Subject: [PATCH] devel/libspice-server: update to 0.14.3 --- devel/libspice-server/Makefile | 3 +- devel/libspice-server/distinfo | 6 ++-- .../libspice-server/files/patch-configure.ac | 31 ------------------- .../files/patch-server-net-utils.c | 23 -------------- .../files/patch-server-red-worker.c | 27 ---------------- .../files/patch-server-sound.c | 11 ------- .../patch-server-tests-test-display-base.c | 10 ------ .../files/patch-server_net-utils.c | 29 +++++++++++++++++ .../files/patch-server_red-stream.c | 10 ++++++ .../files/patch-server_tests_test-websocket.c | 11 +++++++ devel/libspice-server/pkg-plist | 3 +- 11 files changed, 55 insertions(+), 109 deletions(-) delete mode 100644 devel/libspice-server/files/patch-configure.ac delete mode 100644 devel/libspice-server/files/patch-server-net-utils.c delete mode 100644 devel/libspice-server/files/patch-server-red-worker.c delete mode 100644 devel/libspice-server/files/patch-server-sound.c delete mode 100644 devel/libspice-server/files/patch-server-tests-test-display-base.c create mode 100644 devel/libspice-server/files/patch-server_net-utils.c create mode 100644 devel/libspice-server/files/patch-server_red-stream.c create mode 100644 devel/libspice-server/files/patch-server_tests_test-websocket.c diff --git a/devel/libspice-server/Makefile b/devel/libspice-server/Makefile index 2ffe3d4747ff..69a1a5fe64fe 100644 --- a/devel/libspice-server/Makefile +++ b/devel/libspice-server/Makefile @@ -1,8 +1,7 @@ # Created by: olevole@olevole.ru PORTNAME= libspice-server -DISTVERSION= 0.14.0 -PORTREVISION= 4 +DISTVERSION= 0.14.3 CATEGORIES= devel MASTER_SITES= https://www.spice-space.org/download/releases/ DISTNAME= spice-${PORTVERSION} diff --git a/devel/libspice-server/distinfo b/devel/libspice-server/distinfo index d7dc5866ead7..0d7507c63224 100644 --- a/devel/libspice-server/distinfo +++ b/devel/libspice-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514376420 -SHA256 (spice-0.14.0.tar.bz2) = 3adb9495b51650e5eab53c74dd6a74919af4b339ff21721d9ab2a45b2e3bb848 -SIZE (spice-0.14.0.tar.bz2) = 1330195 +TIMESTAMP = 1618031169 +SHA256 (spice-0.14.3.tar.bz2) = 551d4be4a07667cf0543f3c895beb6da8a93ef5a9829f2ae47817be5e616a114 +SIZE (spice-0.14.3.tar.bz2) = 1504304 diff --git a/devel/libspice-server/files/patch-configure.ac b/devel/libspice-server/files/patch-configure.ac deleted file mode 100644 index 48b226749f2b..000000000000 --- a/devel/libspice-server/files/patch-configure.ac +++ /dev/null @@ -1,31 +0,0 @@ ---- configure.ac.orig 2018-01-13 04:00:56 UTC -+++ configure.ac -@@ -62,7 +62,7 @@ AC_SUBST(SPICE_LT_VERSION) - - # Check for the CPU we are using - case $host_cpu in -- x86_64) -+ x86_64|amd64) - ;; - *) - SPICE_WARNING([spice-server on non-x86_64 architectures has not been extensively tested]) -@@ -186,10 +186,18 @@ if test "x$enable_celt051" = "xyes"; then - AS_VAR_APPEND([SPICE_REQUIRES], [" celt051 >= $CELT051_REQUIRED"])) - fi - -+OPENSSL_PKGCONF_USED=1 -+if test -n "${OPENSSL_LIBS}" || test -n "${OPENSSL_CFLAGS}"; then -+ OPENSSL_PKGCONF_USED=0 -+fi - PKG_CHECK_MODULES(SSL, openssl) - AC_SUBST(SSL_CFLAGS) - AC_SUBST(SSL_LIBS) --AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"]) -+if test "{OPENSSL_PKGCONF_USED}" = 1; then -+ AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"]) -+else -+ AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" $SSL_LIBS"]) -+fi - - AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, - AC_MSG_CHECKING([for jpeglib.h]) diff --git a/devel/libspice-server/files/patch-server-net-utils.c b/devel/libspice-server/files/patch-server-net-utils.c deleted file mode 100644 index 21913229f250..000000000000 --- a/devel/libspice-server/files/patch-server-net-utils.c +++ /dev/null @@ -1,23 +0,0 @@ ---- server/net-utils.c.orig 2017-09-12 12:00:11 UTC -+++ server/net-utils.c -@@ -23,6 +23,9 @@ - #include - #include - #include -+#include -+#include -+#include - #include - #include - #include -@@ -31,6 +34,10 @@ - - #include "net-utils.h" - -+#if !defined(SOL_TCP) && defined(IPPROTO_TCP) -+#define SOL_TCP IPPROTO_TCP -+#endif -+ - /** - * red_socket_set_keepalive: - * @fd: a socket file descriptor diff --git a/devel/libspice-server/files/patch-server-red-worker.c b/devel/libspice-server/files/patch-server-red-worker.c deleted file mode 100644 index 2e52726fe3ba..000000000000 --- a/devel/libspice-server/files/patch-server-red-worker.c +++ /dev/null @@ -1,27 +0,0 @@ ---- server/red-worker.c.orig 2017-09-21 11:05:07 UTC -+++ server/red-worker.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -52,6 +53,16 @@ - - #define INF_EVENT_WAIT ~0 - -+int pthread_setname_np(pthread_t, const char *); -+ -+ -+int pthread_setname_np(pthread_t id, const char *name) -+{ -+ /* this BSD function returns no error */ -+ pthread_set_name_np(id, name); -+ return 0; -+} -+ - struct RedWorker { - pthread_t thread; - QXLInstance *qxl; diff --git a/devel/libspice-server/files/patch-server-sound.c b/devel/libspice-server/files/patch-server-sound.c deleted file mode 100644 index 5e1ea7ccb547..000000000000 --- a/devel/libspice-server/files/patch-server-sound.c +++ /dev/null @@ -1,11 +0,0 @@ ---- server/sound.c.orig 2017-09-21 11:05:07 UTC -+++ server/sound.c -@@ -22,6 +22,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include diff --git a/devel/libspice-server/files/patch-server-tests-test-display-base.c b/devel/libspice-server/files/patch-server-tests-test-display-base.c deleted file mode 100644 index ba3a5512de21..000000000000 --- a/devel/libspice-server/files/patch-server-tests-test-display-base.c +++ /dev/null @@ -1,10 +0,0 @@ ---- server/tests/test-display-base.c.orig 2017-09-21 15:45:56 UTC -+++ server/tests/test-display-base.c -@@ -22,7 +22,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/devel/libspice-server/files/patch-server_net-utils.c b/devel/libspice-server/files/patch-server_net-utils.c new file mode 100644 index 000000000000..0b9cd8896701 --- /dev/null +++ b/devel/libspice-server/files/patch-server_net-utils.c @@ -0,0 +1,29 @@ +--- server/net-utils.c.orig 2021-04-17 01:15:39 UTC ++++ server/net-utils.c +@@ -47,7 +47,7 @@ bool red_socket_set_keepalive(int fd, bool enable, int + int keepalive = !!enable; + + if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &keepalive, sizeof(keepalive)) == -1) { +- if (errno != ENOTSUP) { ++ if (errno != ENOTSUP && errno != EINVAL) { + g_warning("setsockopt for keepalive failed, %s", strerror(errno)); + return false; + } +@@ -59,7 +59,7 @@ bool red_socket_set_keepalive(int fd, bool enable, int + + #ifdef HAVE_TCP_KEEPIDLE + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &timeout, sizeof(timeout)) == -1) { +- if (errno != ENOTSUP) { ++ if (errno != ENOTSUP && errno != EINVAL) { + g_warning("setsockopt for keepalive timeout failed, %s", strerror(errno)); + return false; + } +@@ -82,7 +82,7 @@ bool red_socket_set_no_delay(int fd, bool no_delay) + + if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, + &optval, sizeof(optval)) != 0) { +- if (errno != ENOTSUP && errno != ENOPROTOOPT) { ++ if (errno != ENOTSUP && errno != ENOPROTOOPT && errno != EINVAL) { + spice_warning("setsockopt failed, %s", strerror(errno)); + return false; + } diff --git a/devel/libspice-server/files/patch-server_red-stream.c b/devel/libspice-server/files/patch-server_red-stream.c new file mode 100644 index 000000000000..4e828d7bb4bc --- /dev/null +++ b/devel/libspice-server/files/patch-server_red-stream.c @@ -0,0 +1,10 @@ +--- server/red-stream.c.orig 2021-04-10 05:13:57 UTC ++++ server/red-stream.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #else + #include + #endif diff --git a/devel/libspice-server/files/patch-server_tests_test-websocket.c b/devel/libspice-server/files/patch-server_tests_test-websocket.c new file mode 100644 index 000000000000..5de898716736 --- /dev/null +++ b/devel/libspice-server/files/patch-server_tests_test-websocket.c @@ -0,0 +1,11 @@ +--- server/tests/test-websocket.c.orig 2021-04-10 05:22:05 UTC ++++ server/tests/test-websocket.c +@@ -200,7 +200,7 @@ handle_client(int new_sock) + } + + int enable = 1; +- setsockopt(new_sock, SOL_TCP, TCP_NODELAY, (const void *) &enable, sizeof(enable)); ++ setsockopt(new_sock, IPPROTO_TCP, TCP_NODELAY, (const void *) &enable, sizeof(enable)); + + // wait header + wait_for(new_sock, POLLIN); diff --git a/devel/libspice-server/pkg-plist b/devel/libspice-server/pkg-plist index b7ca357ad4e0..6c7a04348508 100644 --- a/devel/libspice-server/pkg-plist +++ b/devel/libspice-server/pkg-plist @@ -1,5 +1,4 @@ libdata/pkgconfig/spice-server.pc -include/spice-server/spice-experimental.h include/spice-server/spice-server.h include/spice-server/spice-replay.h include/spice-server/spice-char.h @@ -10,6 +9,6 @@ include/spice-server/spice.h include/spice-server/spice-audio.h include/spice-server/spice-version.h include/spice-server/spice-qxl.h -lib/libspice-server.so.1.12.4 +lib/libspice-server.so.1.14.0 lib/libspice-server.so lib/libspice-server.so.1 -- 2.30.1