xorgproto: Branch 'master' - 2 commits

[GitLab Mirror]

 configure.ac |   13 ++++++-------
 meson.build  |    2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 2bce6cefead06e3618387f19bd523c719fec3e55
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Feb 24 14:04:17 2021 +1000

    xorgproto 2021.2
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index 804db66..ea90b38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.60])
-AC_INIT([xorgproto], [2020.1],
+AC_INIT([xorgproto], [2021.2],
         [https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
diff --git a/meson.build b/meson.build
index fa44c38..de9b898 100644
--- a/meson.build
+++ b/meson.build
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-project('xorgproto', 'c', license : 'MIT', version : '2020.1')
+project('xorgproto', 'c', license : 'MIT', version : '2021.2')
 cc = meson.get_compiler('c')
 sed = find_program('sed')
 
commit 0fef97c1e28b8369301d6bdc6e4125251ed3c217
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Feb 24 14:04:32 2021 +1000

    configure.ac: remove trailing whitespaces
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index 5c7e6c7..804db66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
-dnl 
+dnl
 dnl  Copyright © 2017 Keith Packard
-dnl 
+dnl
 dnl  Permission to use, copy, modify, distribute, and sell this software and its
 dnl  documentation for any purpose is hereby granted without fee, provided that
 dnl  the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@ dnl  advertising or publicity pertaining to distribution of the software without
 dnl  specific, written prior permission.  Keith Packard makes no
 dnl  representations about the suitability of this software for any purpose.  It
 dnl  is provided "as is" without express or implied warranty.
-dnl 
+dnl
 dnl  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 dnl  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -55,7 +55,7 @@ case $host_os in
 esac
 
 if test "x$fds_bits_found" = xfalse ; then
-   AC_CHECK_MEMBER(fd_set.fds_bits, 
+   AC_CHECK_MEMBER(fd_set.fds_bits,
 			   [
 			       fds_bits_found=plain
 			       USE_FDS_BITS="fds_bits"
@@ -154,6 +154,5 @@ AC_CONFIG_FILES([applewmproto.pc
 		 xineramaproto.pc
 		 xproto.pc
 		 xproxymngproto.pc])
-		 
+
 AC_OUTPUT
-