[Spice-commits] 2 commits - configure.ac server/Makefile.am server/tests subprojects/spice-common tools/Makefile.am

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Mar 2 14:23:23 UTC 2020 

 configure.ac             |   18 ++----------------
 server/Makefile.am       |    3 +--
 server/tests/Makefile.am |    3 +--
 subprojects/spice-common |    2 +-
 tools/Makefile.am        |    3 +--
 5 files changed, 6 insertions(+), 23 deletions(-)

New commits:
commit 626ad248f5b22520c85d2215ca5ebe4f71e823ab
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Tue Nov 26 21:15:53 2019 +0000

    build: Update spice-common integration
    
    Use new common.m4 include file to make easier to integrate
    with spice-common repository.
    The new include will allow for instance spice-common to
    add additional dependencies without changes (or minor) to
    spice-server.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Kevin Pouget <kpouget at redhat.com>

diff --git a/configure.ac b/configure.ac
index 17edbbb9..18d6ddfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,6 @@ SPICE_SERVER_VERSION=`printf "0x%02x%02x%02x" $major $minor $micro`
 AC_SUBST(SPICE_SERVER_VERSION)
 
 AC_CONFIG_MACRO_DIR([m4])
-m4_include([subprojects/spice-common/m4/spice-deps.m4])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(.)
 
@@ -85,7 +84,6 @@ AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
 dnl =========================================================================
 dnl Check optional features
 SPICE_CHECK_SMARTCARD
-SPICE_EXTRA_CHECKS
 
 AC_ARG_ENABLE(gstreamer,
               AS_HELP_STRING([--enable-gstreamer=@<:@auto/0.10/1.0/yes/no@:>@],
@@ -148,18 +146,12 @@ AX_VALGRIND_CHECK
 
 SPICE_CHECK_LZ4
 SPICE_CHECK_SASL
-SPICE_CHECK_INSTRUMENTATION
 AM_CONDITIONAL(HAVE_SASL, test "x$have_sasl" = "xyes")
 
 dnl =========================================================================
 dnl Check deps
-AC_CONFIG_SUBDIRS([subprojects/spice-common])
-COMMON_CFLAGS='-I ${top_srcdir}/subprojects/spice-common/ -I ${top_builddir}/subprojects/spice-common/'
-COMMON_CFLAGS="$COMMON_CFLAGS -DG_LOG_DOMAIN=\\\"Spice\\\""
-AC_SUBST(COMMON_CFLAGS)
-
-SPICE_COMMON_DIR='${top_builddir}/subprojects/spice-common'
-AC_SUBST(SPICE_COMMON_DIR)
+m4_define([SPICE_PROTOCOL_MIN_VER],[0.14.0])
+m4_include([subprojects/spice-common/m4/common.m4])
 
 AC_CHECK_LIBM
 AC_SUBST(LIBM)
@@ -178,10 +170,6 @@ AS_IF([test x"$have_smartcard" = "xyes"], [
     AS_VAR_APPEND([SPICE_REQUIRES], [" libcacard >= 2.5.1"])
 ])
 
-SPICE_PROTOCOL_MIN_VER=0.14.0
-PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= $SPICE_PROTOCOL_MIN_VER])
-AC_SUBST([SPICE_PROTOCOL_MIN_VER])
-
 GLIB2_REQUIRED=2.38
 GLIB2_ENCODED_VERSION="GLIB_VERSION_2_38"
 PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= $GLIB2_REQUIRED gio-2.0 >= $GLIB2_REQUIRED])
@@ -202,8 +190,6 @@ AC_SUBST(PIXMAN_CFLAGS)
 AC_SUBST(PIXMAN_LIBS)
 AS_VAR_APPEND([SPICE_REQUIRES], [" pixman-1 >= $PIXMAN_REQUIRED"])
 
-SPICE_CHECK_CELT051
-
 PKG_CHECK_MODULES(SSL, openssl >= 1.0.0)
 AC_SUBST(SSL_CFLAGS)
 AC_SUBST(SSL_LIBS)
diff --git a/server/Makefile.am b/server/Makefile.am
index 2d148c14..166ea894 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -6,7 +6,7 @@ check-valgrind:
 
 AM_CPPFLAGS =					\
 	-DSPICE_SERVER_INTERNAL			\
-	$(COMMON_CFLAGS)			\
+	$(SPICE_COMMON_CFLAGS)			\
 	$(GLIB2_CFLAGS)				\
 	$(GOBJECT2_CFLAGS)			\
 	$(LZ4_CFLAGS)				\
@@ -15,7 +15,6 @@ AM_CPPFLAGS =					\
 	$(SMARTCARD_CFLAGS)			\
 	$(GSTREAMER_0_10_CFLAGS)		\
 	$(GSTREAMER_1_0_CFLAGS)			\
-	$(SPICE_PROTOCOL_CFLAGS)		\
 	$(SSL_CFLAGS)				\
 	$(VISIBILITY_HIDDEN_CFLAGS)		\
 	$(WARN_CFLAGS)				\
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index d749f888..f0daf046 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -16,13 +16,12 @@ AM_CPPFLAGS =					\
 	-I$(top_srcdir)/server			\
 	-I$(top_builddir)/server		\
 	-I$(top_srcdir)/server/tests		\
-	$(COMMON_CFLAGS)			\
+	$(SPICE_COMMON_CFLAGS)			\
 	$(GIO_UNIX_CFLAGS)			\
 	$(GLIB2_CFLAGS)				\
 	$(GOBJECT2_CFLAGS)			\
 	$(SMARTCARD_CFLAGS)			\
 	$(SPICE_NONPKGCONFIG_CFLAGS)		\
-	$(SPICE_PROTOCOL_CFLAGS)		\
 	$(WARN_CFLAGS)				\
 	$(NULL)
 
diff --git a/subprojects/spice-common b/subprojects/spice-common
index 2cec5f99..19ea6041 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit 2cec5f99afd40604b7a59ca1b473a04d9aea3588
+Subproject commit 19ea60416c301e0b4b69ea038618452f0845d173
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 702fcdd1..db9596e9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,8 +1,7 @@
 NULL =
 
 AM_CPPFLAGS = \
-	$(COMMON_CFLAGS) \
-	$(SPICE_PROTOCOL_CFLAGS) \
+	$(SPICE_COMMON_CFLAGS) \
 	$(WARN_CFLAGS) \
 	$(NULL)
 
commit a7f25ca5a82bd7278ea45ff5ff765babb299a99e
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon Mar 2 14:02:21 2020 +0000

    Update spice-common submodule
    
    This brings in the following changes:
    
    Eduardo Lima (Etrunko) (1):
          build: Unconditionally link with libm if found
    
    Frediano Ziglio (23):
          quic: Remove unused include header
          quic: Use G_UNLIKELY in some hot paths
          quic: Do not include quic_config.h in quic.h
          snd_codec: Avoid some useless casts declaring struct type
          snd_codec: Do not include not needed headers
          build: Clean up some configure checks
          test-quic: Convert image to get more testing (gray, rgb16)
          log: Add spice_extra_assert
          Reuse new spice_extra_assert macro
          marshallers: Avoid some useless pointers in SpiceMarshallerData
          lz_decompress: Constify some variable
          lz_decompress: Do not execute nested checks
          lz_decompress: Simplify loop
          lz_decompress: Reindented comment
          lz_decompress: Move variable declaration in nested scope
          lz_decompress: Read "ctrl" inside loop
          lz_compress: Cleanup unused macros
          codegen: Check unsafe values alone
          snd_codec: Update field names in function documentation
          test-quic: Avoid namespace conflict with Gdk API
          test-quic: Cache gdk_pixbuf_get_byte_length value
          test-quic: Reduce height of test image
          test-quic: Run 1 random quic test per color mode
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/subprojects/spice-common b/subprojects/spice-common
index 785ac8de..2cec5f99 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit 785ac8de4f86847d229d138ac5fc4898074d9cf4
+Subproject commit 2cec5f99afd40604b7a59ca1b473a04d9aea3588

More information about the Spice-commits mailing list