diff --git a/devel/libspice-server/Makefile b/devel/libspice-server/Makefile index 55ad990f7b30..c81b200a5de5 100644 --- a/devel/libspice-server/Makefile +++ b/devel/libspice-server/Makefile @@ -1,56 +1,56 @@ # Created by: olevole@olevole.ru PORTNAME= libspice-server -DISTVERSION= 0.14.0 -PORTREVISION= 4 +DISTVERSION= 0.15.0 CATEGORIES= devel -MASTER_SITES= https://www.spice-space.org/download/releases/ +MASTER_SITES= https://www.spice-space.org/download/releases/spice-server/ DISTNAME= spice-${PORTVERSION} MAINTAINER= portmaster@BSDforge.com COMMENT= Implements the server side of the SPICE protocol LICENSE= GPLv2 LIB_DEPENDS= libopus.so:audio/opus -BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol +BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive \ + spice-protocol>=0.12.10:devel/spice-protocol OPTIONS_DEFINE= GSTREAMER LZ4 SASL STATISTICS OPTIONS_DEFAULT= GSTREAMER LZ4 SASL STATISTICS_DESC= Statistic code GSTREAMER_CONFIGURE_ON= --enable-gstreamer=1.0 GSTREAMER_CONFIGURE_OFF= --enable-gstreamer=no GSTREAMER_USE= gstreamer1=yes GSTREAMER_LIB_DEPENDS= liborc-0.4.so:devel/orc LZ4_CONFIGURE_ENABLE= lz4 LZ4_LIB_DEPENDS+= liblz4.so:archivers/liblz4 SASL_CONFIGURE_WITH= sasl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 STATISTICS_CONFIGURE_ENABLE= statistics USES= autoreconf compiler:c++11-lang cpe gmake gnome jpeg libtool \ localbase:ldflag pkgconfig python ssl tar:bzip2 xorg USE_GNOME= glib20 USE_XORG= pixman USE_LDCONFIG= yes CPE_VENDOR= redhat GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-celt051 \ --enable-manual=no SPICE_SSL_CFLAGS= -I${OPENSSLINC} SPICE_SSL_LIBS= -L${OPENSSLLIB} -lcrypto -lssl CONFIGURE_ENV+= SSL_CFLAGS="${SPICE_SSL_CFLAGS}" SSL_LIBS="${SPICE_SSL_LIBS}" \ OPENSSL_CFLAGS="${SPICE_SSL_CFLAGS}" OPENSSL_LIBS="${SPICE_SSL_LIBS}" \ PYTHON=${PYTHON_CMD} INSTALL_TARGET= install-strip .include diff --git a/devel/libspice-server/distinfo b/devel/libspice-server/distinfo index d7dc5866ead7..f75380e4ef4e 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 = 1618969647 +SHA256 (spice-0.15.0.tar.bz2) = b320cf8f4bd2852750acb703c15b72856027e5a8554f8217dfbb3cc09deba0f5 +SIZE (spice-0.15.0.tar.bz2) = 1537970 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..90652f2697f3 --- /dev/null +++ b/devel/libspice-server/files/patch-server_net-utils.c @@ -0,0 +1,11 @@ +--- server/net-utils.c.orig 2021-04-21 06:31:14 UTC ++++ server/net-utils.c +@@ -48,7 +48,7 @@ + static inline bool + darwin_einval_on_unix_socket(int fd, int err) + { +-#if defined(__APPLE__) ++#if defined(__APPLE__) || defined(__FreeBSD__) + if (err == EINVAL) { + union { + struct sockaddr sa; diff --git a/devel/libspice-server/files/patch-server_red-stream.cpp b/devel/libspice-server/files/patch-server_red-stream.cpp new file mode 100644 index 000000000000..53a88d57b098 --- /dev/null +++ b/devel/libspice-server/files/patch-server_red-stream.cpp @@ -0,0 +1,10 @@ +--- server/red-stream.cpp.orig 2021-04-21 06:29:28 UTC ++++ server/red-stream.cpp +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #else + #include + #endif diff --git a/devel/libspice-server/files/patch-tools-reds_stat.c b/devel/libspice-server/files/patch-tools-reds_stat.c deleted file mode 100644 index a6963c104829..000000000000 --- a/devel/libspice-server/files/patch-tools-reds_stat.c +++ /dev/null @@ -1,60 +0,0 @@ ---- tools/reds_stat.c.orig 2017-09-21 11:05:07 UTC -+++ tools/reds_stat.c -@@ -34,11 +34,47 @@ - #define VALUE_TABS 7 - #define INVALID_STAT_REF (~(uint32_t)0) - -+#define MREMAP_MAYMOVE 1 -+ - verify(sizeof(SpiceStat) == 20 || sizeof(SpiceStat) == 24); - - static SpiceStatNode *reds_nodes = NULL; - static uint64_t *values = NULL; - -+void *mremap(int fd,void *oldaddr,size_t oldlen,size_t newlen,int prot,int flags); -+ -+void *mremap(int fd,void *oldaddr,size_t oldlen, -+ size_t newlen,int prot,int flags){ -+ void *ret; -+ -+ // From mmap(2) on freebsd 6.3: A successful FIXED mmap deletes any -+ // previous mapping in the allocated address range. This means: -+ // remapping over a current map will blow it away (unless FIXED isn't -+ // provided, in which case it can't overlap an old mapping. See bug -+ // 733 for extensive discussion of this issue for Linux and FreeBSD). -+ if((ret = mmap((char *)oldaddr + oldlen,newlen - oldlen,prot,flags,fd,oldlen)) == MAP_FAILED){ -+ // We couldn't get the memory whatsoever (or we were a fresh -+ // allocation that succeeded). Return the immediate result... -+ return ret; -+ } // ret != MAP_FAILED. Did we squash? -+ if(ret != (char *)oldaddr + oldlen){ -+ // We got the memory, but not where we wanted it. Copy over the -+ // old map, and then free it up... -+ //nag("Wanted %p, got %p\n",(char *)oldaddr + oldlen,ret); -+ munmap(ret,newlen - oldlen); -+// Munmap(ret,newlen - oldlen); -+ if((ret = mmap(NULL,newlen,prot,flags,fd,0)) == MAP_FAILED){ -+ return ret; -+ } -+ memcpy(ret,oldaddr,oldlen); -+ munmap(oldaddr,oldlen); // Free the old mapping -+// Munmap(oldaddr,oldlen); // Free the old mapping -+ return ret; -+ } // We successfully squashed. Return a pointer to the first buf. -+ return oldaddr; -+} -+ -+ - static void print_stat_tree(int32_t node_index, int depth) - { - SpiceStatNode *node = &reds_nodes[node_index]; -@@ -144,7 +180,8 @@ 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); -- reds_stat = mremap(reds_stat, shm_old_size, shm_size, MREMAP_MAYMOVE); -+// todo -+// reds_stat = mremap(reds_stat, shm_old_size, shm_size, MREMAP_MAYMOVE); - if (reds_stat == (SpiceStat *)MAP_FAILED) { - perror("mremap"); - goto error; diff --git a/devel/libspice-server/pkg-plist b/devel/libspice-server/pkg-plist index b7ca357ad4e0..90ec383198f5 100644 --- a/devel/libspice-server/pkg-plist +++ b/devel/libspice-server/pkg-plist @@ -1,15 +1,14 @@ 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 include/spice-server/spice-core.h include/spice-server/spice-migration.h include/spice-server/spice-input.h 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.1 lib/libspice-server.so lib/libspice-server.so.1