[Spice-commits] 8 commits - AUTHORS configure.ac .gitlab-ci.yml server/gstreamer-encoder.c server/reds.cpp server/tests
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed May 10 14:54:25 UTC 2023
.gitlab-ci.yml | 6 ++++--
AUTHORS | 1 +
configure.ac | 19 ++++++++-----------
server/gstreamer-encoder.c | 8 ++++++++
server/reds.cpp | 3 +--
server/tests/valgrind/spice.supp | 12 ++++++++++++
6 files changed, 34 insertions(+), 15 deletions(-)
New commits:
commit 313932ea0202650eb8e7783f1fd476e849d96314
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Wed May 10 11:19:39 2023 +0100
ci: Remove broken OpenSSL configuration to fix makecheck-windows job
The configuration installed with mingw64-openssl cause OpenSSL
to fail to initialize during execution with Wine.
Delete it and use the compiled in options.
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ceb12d6..36dbafb5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,6 +163,8 @@ makecheck-windows:
- export G_TLS_GNUTLS_PRIORITY="NORMAL:%COMPAT"
- export WINEPATH='Z:\usr\x86_64-w64-mingw32\sys-root\mingw\bin'
- export LANG=en_US.UTF-8
+ # Remove configuration otherwise OpenSSL initialization will fail
+ - rm -f /usr/x86_64-w64-mingw32/sys-root/mingw/etc/pki/tls/openssl.cnf
- (cd server && exec mingw64-make LOG_COMPILE=wine check) || (cat server/tests/test-suite.log && exit 1)
websocket-autobahn:
commit e625a10a7a3104514a8bd56ee3ca36d8d9b1cf33
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Tue May 9 23:22:21 2023 +0100
Update OpenSSL call
SSLv23_method call was deprecated in favour of TLS_method.
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/server/reds.cpp b/server/reds.cpp
index 5e9a129a..56b77095 100644
--- a/server/reds.cpp
+++ b/server/reds.cpp
@@ -2817,8 +2817,7 @@ static int reds_init_ssl(RedsState *reds)
openssl_global_init();
/* Create our context*/
- /* SSLv23_method() handles TLSv1.x in addition to SSLv2/v3 */
- ssl_method = SSLv23_method();
+ ssl_method = TLS_method();
reds->ctx = SSL_CTX_new(ssl_method);
if (!reds->ctx) {
spice_warning("Could not allocate new SSL context");
commit 9213308fd39f6707741a8de3c0e278517a223f73
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Tue May 9 21:55:58 2023 +0100
ci: Fix compile error using new GStreamer library
Using Fedora 38 the compilation fails due to this warning:
In file included from /usr/include/gstreamer-1.0/gst/video/video.h:202,
from ../../server/gstreamer-encoder.c:27:
/usr/include/gstreamer-1.0/gst/video/video-sei.h:39:21: error: 'H265_MISP_NANOSECONDS' defined but not used [-Werror=unused-const-variable=]
39 | static const guint8 H265_MISP_NANOSECONDS[] = {
| ^~~~~~~~~~~~~~~~~~~~~
Ignore the warning for Gstreamer includes.
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/server/gstreamer-encoder.c b/server/gstreamer-encoder.c
index 5ea11f4b..13a1b6e6 100644
--- a/server/gstreamer-encoder.c
+++ b/server/gstreamer-encoder.c
@@ -21,11 +21,19 @@
#include <inttypes.h>
#include <pthread.h>
+// ignore static constants variable not used
+#if defined(__GNUC__) && (__GNUC__ >= 6)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wunused-const-variable"
+#endif
#include <gst/gst.h>
#include <gst/app/gstappsrc.h>
#include <gst/app/gstappsink.h>
#include <gst/video/video.h>
#include <orc/orcprogram.h>
+#if defined(__GNUC__) && (__GNUC__ >= 6)
+# pragma GCC diagnostic pop
+#endif
#include "red-common.h"
#include "video-encoder.h"
commit 6089c90a623a2763bddc43fb71c536e8ce5ea24b
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Wed May 10 10:56:42 2023 +0100
ci: Fix check-valgrind job
Avoid downgrading gstreamer1-plugins-good, no longer necessary.
Add suppression for pthread_create leak.
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdb095bf..0ceb12d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,7 +74,6 @@ check-valgrind:
dnf install valgrind
gstreamer1-libav gstreamer1-plugins-ugly gstreamer1-plugins-good gstreamer1-plugins-bad-free
-y
- - dnf downgrade -y gstreamer1-plugins-good-1.20.0-1.fc36
- >
CFLAGS='-O2 -pipe -g -D_FORTIFY_SOURCE=0'
CXXFLAGS='-O2 -pipe -g -D_FORTIFY_SOURCE=0'
diff --git a/server/tests/valgrind/spice.supp b/server/tests/valgrind/spice.supp
index 555bf109..a44f0b9c 100644
--- a/server/tests/valgrind/spice.supp
+++ b/server/tests/valgrind/spice.supp
@@ -146,3 +146,15 @@
...
fun:g_tls_client_connection_new
}
+
+{
+ fedora_38_pthread_leak
+ Memcheck:Leak
+ match-leak-kinds: possible
+ fun:calloc
+ ...
+ fun:allocate_dtv
+ fun:_dl_allocate_tls
+ ...
+ fun:pthread_create@@GLIBC_2.34
+}
commit d8cc54159d33abb749285d5527c7ddcb400f1557
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Wed May 10 10:55:42 2023 +0100
ci: Add missing packages for CentOS job
"cmp" and "diff" were not available.
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ecae652..bdb095bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,7 +99,7 @@ makecheck-centos:
- dnf config-manager --set-enabled powertools
- >
dnf install git libtool make libasan orc-devel glib-networking
- gcc glib2-devel
+ gcc glib2-devel diffutils
opus-devel pixman-devel openssl-devel libjpeg-devel
libcacard-devel cyrus-sasl-devel lz4-devel
gstreamer1-devel gstreamer1-plugins-base-devel
commit 71a1b11221e86d8d0c5c4daab243e581e2631633
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Wed May 10 10:55:08 2023 +0100
ci: Fix websocket-autobahn job
Last wsaccel library fails to install on the container.
This test has not been maintained for a while so libraries
are getting pretty old anyway.
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea222951..5ecae652 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -185,6 +185,7 @@ websocket-autobahn:
- *protocol
image: ubuntu:bionic
script:
+ - pip2 install 'wsaccel==0.6.3'
- pip2 install autobahntestsuite
- wstest -a
- git clean -fdx
commit 956cd26dbf82462d836557ff37537b242fe485a1
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Wed May 10 10:53:54 2023 +0100
build: Update syntax for Autoconf script
Used autoupdate and some manual changes.
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/configure.ac b/configure.ac
index b2038a54..cc7ba193 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.69])
# Follow the libtool manual for the so version:
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -30,7 +30,7 @@ SPICE_SERVER_VERSION=`printf "0x%02x%02x%02x" $major $minor $micro`
AC_SUBST(SPICE_SERVER_VERSION)
AC_CONFIG_MACRO_DIR([m4])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
AX_PTHREAD
@@ -39,7 +39,6 @@ AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip subdir-objects foreign])
AM_MAINTAINER_MODE
AC_PROG_CC
-AC_PROG_CC_C99
if test x"$ac_cv_prog_cc_c99" = xno; then
AC_MSG_ERROR([C99 compiler is required.])
fi
@@ -169,7 +168,7 @@ dnl Check deps
m4_define([SPICE_PROTOCOL_MIN_VER],[0.14.3])
m4_include([subprojects/spice-common/m4/common.m4])
-AC_CHECK_LIBM
+LT_LIB_M
AC_SUBST(LIBM)
AC_CHECK_LIB(rt, clock_gettime, LIBRT="-lrt")
@@ -219,15 +218,12 @@ CFLAGS="$save_CFLAGS"
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
AC_MSG_CHECKING([for jpeglib.h])
- AC_TRY_CPP(
-[#include <stdio.h>
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
#undef PACKAGE
#undef VERSION
#undef HAVE_STDLIB_H
-#include <jpeglib.h>],
- JPEG_LIBS='-ljpeg'
- AC_MSG_RESULT($jpeg_ok),
- AC_MSG_ERROR([jpeglib.h not found])),
+#include <jpeglib.h>]])],[JPEG_LIBS='-ljpeg'
+ AC_MSG_RESULT($jpeg_ok)],[AC_MSG_ERROR(jpeglib.h not found)]),
AC_MSG_ERROR([libjpeg not found]))
AC_SUBST(JPEG_LIBS)
@@ -307,7 +303,7 @@ AC_SUBST(SPICE_NONPKGCONFIG_LIBS)
AM_SILENT_RULES([yes])
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
spice-server.pc
server/Makefile
@@ -317,6 +313,7 @@ docs/Makefile
docs/manual/Makefile
tools/Makefile
])
+AC_OUTPUT
dnl ==========================================================================
AC_MSG_NOTICE([
commit 95702f1588db549191c31f3707bf75c44f809a18
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Tue May 9 03:52:16 2023 +0100
syntax-check: Add missing contributor name to AUTHORS
For previous commit a5d1d957d6c16e3fe213e10d0cab4bfe2504ba91
(cfr "sound: Fix pointer arithmetic in snd_record_handle_write()")
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
diff --git a/AUTHORS b/AUTHORS
index c5cf2ecd..6ad10e6e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -87,5 +87,6 @@ Patches also contributed by
Simon Chopin <simon.chopin at canonical.com>
Geoffrey McRae <geoff at hostfission.com>
Antonio Larrosa <antonio.larrosa at gmail.com>
+ Volker Rümelin <vr_qemu at t-online.de>
....send patches to get your name here...
More information about the Spice-commits
mailing list