[Spice-commits] 3 commits - configure.ac server/Makefile.am server/spice-experimental.h server/tests spice-server.pc.in

Christophe Fergau teuf at kemper.freedesktop.org
Wed Aug 26 02:04:03 PDT 2015 

 configure.ac                       |    5 ++--
 server/Makefile.am                 |    4 ---
 server/spice-experimental.h        |    6 +++++
 server/tests/test_spice_version.sh |   42 -------------------------------------
 spice-server.pc.in                 |    1 
 5 files changed, 11 insertions(+), 47 deletions(-)

New commits:
commit 09394e857f7184dc8e7bb518b1647843be6cc431
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Fri Aug 14 10:46:13 2015 +0200

    build-sys: Remove test_spice_version.h
    
    This script was used at make distcheck time to verify consistency of the
    version number defined in configure.ac and in spice-server headers.
    Since commit ab12cf414c, these 2 version numbers can no longer be out of
    sync, so we can drop this script.

diff --git a/server/Makefile.am b/server/Makefile.am
index db1249d..f1da60b 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -149,6 +149,3 @@ EXTRA_DIST =					\
 	$(NULL)
 
 BUILT_SOURCES = $(spice_built_sources)
-
-dist-hook:
-	if test ./tests/test_spice_version.sh && ! test ./tests/test_spice_version.sh; then exit 1; fi
diff --git a/server/tests/test_spice_version.sh b/server/tests/test_spice_version.sh
deleted file mode 100755
index 5e5b173..0000000
--- a/server/tests/test_spice_version.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-ROOT=$(dirname $0)/../../
-INCLUDE="-I$ROOT -I$ROOT/spice-common/spice-protocol/"
-TEMP=`mktemp -d`
-
-cat > $TEMP/check_version.c <<EOF
-#include <stdio.h>
-#include "server/spice.h"
-
-int main(void)
-{
-        printf("%d.%d.%d\n", SPICE_SERVER_VERSION >> 16,
-               (SPICE_SERVER_VERSION >> 8) & 0xff,
-               SPICE_SERVER_VERSION & 0xff);
-        return 0;
-}
-EOF
-
-if ! gcc -o $TEMP/check_version $INCLUDE $TEMP/check_version.c ; then
-    echo "failed to compile tester"
-    exit -1
-fi
-
-INCLUDE_VERSION=`$TEMP/check_version`
-rm -Rf $TEMP
-
-CONF_MAJOR=`cat $ROOT/configure.ac | grep 'm4_define(\[SPICE_MAJOR\]' | sed -e 's/m4_define(\[SPICE_MAJOR\],\(.*\))/\1/'`
-CONF_MINOR=`cat $ROOT/configure.ac | grep 'm4_define(\[SPICE_MINOR\]' | sed -e 's/m4_define(\[SPICE_MINOR\],\(.*\))/\1/'`
-CONF_MICRO=`cat $ROOT/configure.ac | grep 'm4_define(\[SPICE_MICRO\]' | sed -e 's/m4_define(\[SPICE_MICRO\],\(.*\))/\1/'`
-CONF_VERSION=`printf %d.%d.%d $CONF_MAJOR $CONF_MINOR $CONF_MICRO`
-if [ $CONF_VERSION != $INCLUDE_VERSION ] ; then
-    echo "BAD: version in server/spice.h"
-    echo $INCLUDE_VERSION
-    echo "doesn't match version in configure.ac"
-    echo $CONF_VERSION
-    echo "please fix before doing a release"
-    exit 1
-else
-    echo "OK: both versions are $CONF_VERSION"
-fi
-exit 0
commit 2e88eb705bd584720d0940b4a5db5d99d1e9b38e
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Fri Aug 14 17:02:05 2015 +0200

    server: Readd spice-experimental.h
    
    Commit 3c6b4e41 removed spice-experimental.h as this header was not
    used, nor supposed to be used. However, QEMU had been including it
    (without using any of its symbols) until commit v2.3.0-rc0~135^2~1
    
    As this is fairly recent (Nov 2014), building older QEMUs with new
    spice-server releases, or even bisecting QEMU will be broken as they
    will be looking for a no-longer available header.
    
    This commit readds a spice-experimental.h file, however it only contains
    a #warning indicating this file is deprecated. This means older QEMU
    will build now, but only if they were configured with --disable-werror.

diff --git a/server/Makefile.am b/server/Makefile.am
index 09b4498..db1249d 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -52,6 +52,7 @@ libspice_serverinclude_HEADERS =		\
 	spice-audio.h				\
 	spice-char.h				\
 	spice-core.h				\
+	spice-experimental.h			\
 	spice-input.h				\
 	spice-migration.h			\
 	spice-qxl.h				\
diff --git a/server/spice-experimental.h b/server/spice-experimental.h
new file mode 100644
index 0000000..ad8abac
--- /dev/null
+++ b/server/spice-experimental.h
@@ -0,0 +1,6 @@
+#ifndef __SPICE_EXPERIMENTAL_H__
+#define __SPICE_EXPERIMENTAL_H__
+
+#warning spice-experimental.h is deprecated
+
+#endif // __SPICE_EXPERIMENTAL_H__
commit c615ebb01c11faf7db72938472dc70a1dd12c5ba
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Fri Aug 7 20:13:01 2015 +0200

    build-sys: Require a new enough spice-protocol in .pc file
    
    spice-server headers expose SpiceImageCompression which is only available
    from recent spice-protocol releases.
    This dependency must be expressed in Requires and not Requires.private

diff --git a/configure.ac b/configure.ac
index 5048c41..dee0a28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,8 +109,9 @@ AS_IF([test x"$have_smartcard" = "xyes"], [
     AS_VAR_APPEND([SPICE_REQUIRES], [" libcacard >= 0.1.2"])
 ])
 
-PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= 0.12.10])
-AS_VAR_APPEND([SPICE_REQUIRES], [" spice-protocol >= 0.12.10"])
+SPICE_PROTOCOL_MIN_VER=0.12.10
+PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= $SPICE_PROTOCOL_MIN_VER])
+AC_SUBST([SPICE_PROTOCOL_MIN_VER])
 
 PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.22])
 AS_VAR_APPEND([SPICE_REQUIRES], [" glib-2.0 >= 2.22"])
diff --git a/spice-server.pc.in b/spice-server.pc.in
index f65ddcf..6514c44 100644
--- a/spice-server.pc.in
+++ b/spice-server.pc.in
@@ -7,6 +7,7 @@ Name: spice
 Description: SPICE server library
 Version: @VERSION@
 
+Requires: spice-protocol >= @SPICE_PROTOCOL_MIN_VER@
 Requires.private: @SPICE_REQUIRES@
 Libs: -L${libdir} -lspice-server
 Libs.private: @SPICE_NONPKGCONFIG_LIBS@

More information about the Spice-commits mailing list