pixman: Branch 'master' - 3 commits

[GitLab Mirror]

 Makefile.am  |    2 ++
 configure.ac |    2 +-
 meson.build  |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e21ebfb13f486b73248bc0d8c1c81f209ffe0420
Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Apr 10 10:25:18 2019 -0700

    Post-release version bump to 0.38.5
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/configure.ac b/configure.ac
index 4cbd454..1ca3974 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 38)
-m4_define([pixman_micro], 4)
+m4_define([pixman_micro], 5)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
diff --git a/meson.build b/meson.build
index fad22ee..1a11587 100644
--- a/meson.build
+++ b/meson.build
@@ -21,7 +21,7 @@
 project(
   'pixman',
   ['c'],
-  version : '0.38.4',
+  version : '0.38.5',
   license : 'MIT',
   meson_version : '>= 0.47.2',
   default_options : ['buildtype=debugoptimized'],
commit e8df10eea9609609568bf4cbc05796594c1b978d
Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Apr 10 10:17:47 2019 -0700

    Pre-release version bump to 0.38.4
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/configure.ac b/configure.ac
index d057d59..4cbd454 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 38)
-m4_define([pixman_micro], 3)
+m4_define([pixman_micro], 4)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
diff --git a/meson.build b/meson.build
index 596c1e2..fad22ee 100644
--- a/meson.build
+++ b/meson.build
@@ -21,7 +21,7 @@
 project(
   'pixman',
   ['c'],
-  version : '0.38.3',
+  version : '0.38.4',
   license : 'MIT',
   meson_version : '>= 0.47.2',
   default_options : ['buildtype=debugoptimized'],
commit 23f036d461f73a2d41cdaf918cf324ac23f3ecd5
Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Apr 10 10:10:47 2019 -0700

    Makefile.am: Ship Meson assembly test files in the tarball
    
    These were forgotten in commit 0ea37df4286e (meson: store ARM SIMD and
    NEON tests as text files) and since autotools doesn't use them make
    distcheck still succeeded.
    
    Fixes #30
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 212d0a1..e33b2b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,8 @@ EXTRA_DIST =				\
 	Makefile.win32.common		\
 	meson.build			\
 	meson_options.txt		\
+	neon-test.S			\
+	arm-simd-test.S			\
 	$(NULL)
 
 tar_gz = $(PACKAGE)-$(VERSION).tar.gz