[Spice-commits] 2 commits - CHANGELOG.md configure.ac .gitlab-ci.yml Makefile.am meson.build

[GitLab Mirror]

 .gitlab-ci.yml |    9 +++++++++
 CHANGELOG.md   |    7 +++++++
 Makefile.am    |    1 +
 configure.ac   |    2 +-
 meson.build    |    2 +-
 5 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 0c2c1413a8b387ea597a95b6c867470a7c56c8ab
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Wed Nov 9 08:15:12 2022 +0000

    build: Prepare for 0.15.2 release
    
    Really minor release.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f59cb770..91cb7a33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Major Changes in 0.15.2:
+========================
+Really minor fix release, mainly to fix a distribution issue
+
+* Add missing file to distribution
+* Fix sound recording fix in case of buffer wrapping
+
 Major Changes in 0.15.1:
 ========================
 
diff --git a/configure.ac b/configure.ac
index cc7ba193..c025d346 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AC_PREREQ([2.69])
 #
 dnl TODO see server/spice-char.h TODO comment for API breakage
 m4_define([SPICE_CURRENT], [15])
-m4_define([SPICE_REVISION], [2])
+m4_define([SPICE_REVISION], [3])
 m4_define([SPICE_AGE], [14])
 
 AC_INIT(spice, [m4_esyscmd(build-aux/git-version-gen .tarball-version)],
diff --git a/meson.build b/meson.build
index ef8b41ad..ab05fa5a 100644
--- a/meson.build
+++ b/meson.build
@@ -32,7 +32,7 @@ run_command('build-aux/meson/check-spice-common', check : true)
 #
 #
 spice_server_current = 15
-spice_server_revision = 2
+spice_server_revision = 3
 spice_server_age = 14
 spice_server_so_version = '@0 at .@1 at .@2@'.format(spice_server_current - spice_server_age,
                                                spice_server_age,
commit 77611e5490ceebd321ee80f97c85166609409e6c
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Wed Oct 12 19:04:13 2022 +0100

    build: Add missing file to distribution
    
    Required to build using Meson.
    Also add a check to "distcheck" job to test you can build with
    Meson from distribution file.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36dbafb5..174ea517 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,8 +88,17 @@ syntax-check:
 
 distcheck:
   script:
+  - git clean -fdx
+  - git submodule foreach --recursive git clean -fdx
   - ./autogen.sh --enable-manual --enable-werror
   - make distcheck
+  - bz2=$( echo spice-*.bz2 )
+  - dir=${bz2%.tar.bz2}
+  - rm -rf "$dir"
+  - tar jxvf "$bz2"
+  - cd "$dir"
+  - meson --buildtype=release build
+  - ninja -C build
 
 # Same as makecheck job but use a Centos image
 makecheck-centos:
diff --git a/Makefile.am b/Makefile.am
index ec593b5b..851c2d01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@ EXTRA_DIST =					\
 	meson.build				\
 	meson_options.txt			\
 	build-aux/git-version-gen		\
+	build-aux/meson-dist			\
 	build-aux/meson/check-spice-common	\
 	CHANGELOG.md				\
 	doxygen.sh				\