Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[xsrc/xorg]: xsrc/external/mit/xorgproto/dist initial import of xorgproto-2021.3



details:   https://anonhg.NetBSD.org/xsrc/rev/49faa3e5894b
branches:  xorg
changeset: 10675:49faa3e5894b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Apr 26 21:10:15 2021 +0000

description:
initial import of xorgproto-2021.3

diffstat:

 external/mit/xorgproto/dist/COPYING-x11proto                   |    2 +-
 external/mit/xorgproto/dist/Makefile.am                        |    4 +-
 external/mit/xorgproto/dist/Makefile.in                        |   15 +-
 external/mit/xorgproto/dist/README.md                          |   30 +-
 external/mit/xorgproto/dist/aclocal.m4                         |   48 +-
 external/mit/xorgproto/dist/applewmproto.pc.in                 |    1 -
 external/mit/xorgproto/dist/bigreqsproto.pc.in                 |    1 -
 external/mit/xorgproto/dist/compile                            |    6 +-
 external/mit/xorgproto/dist/compositeproto.pc.in               |    1 -
 external/mit/xorgproto/dist/configure                          |   25 +-
 external/mit/xorgproto/dist/configure.ac                       |   13 +-
 external/mit/xorgproto/dist/damageproto.pc.in                  |    1 -
 external/mit/xorgproto/dist/dmxproto.pc.in                     |    1 -
 external/mit/xorgproto/dist/dpmsproto.pc.in                    |    1 -
 external/mit/xorgproto/dist/dri2proto.pc.in                    |    1 -
 external/mit/xorgproto/dist/dri2proto.txt                      |    4 +-
 external/mit/xorgproto/dist/dri3proto.pc.in                    |    1 -
 external/mit/xorgproto/dist/evieproto.pc.in                    |    1 -
 external/mit/xorgproto/dist/fixesproto.pc.in                   |    1 -
 external/mit/xorgproto/dist/fixesproto.txt                     |    2 +-
 external/mit/xorgproto/dist/fontcacheproto.pc.in               |    1 -
 external/mit/xorgproto/dist/fontsproto.pc.in                   |    1 -
 external/mit/xorgproto/dist/glproto.pc.in                      |    1 -
 external/mit/xorgproto/dist/include/GL/glxint.h                |    2 +-
 external/mit/xorgproto/dist/include/GL/internal/glcore.h       |    2 +-
 external/mit/xorgproto/dist/include/X11/HPkeysym.h             |    2 +-
 external/mit/xorgproto/dist/include/X11/XF86keysym.h           |  239 +++++-
 external/mit/xorgproto/dist/include/X11/Xfuncproto.h           |    8 +
 external/mit/xorgproto/dist/include/X11/ap_keysym.h            |    2 +-
 external/mit/xorgproto/dist/include/X11/extensions/Printstr.h  |    8 +-
 external/mit/xorgproto/dist/include/X11/extensions/XKB.h       |    2 +-
 external/mit/xorgproto/dist/include/X11/extensions/XKBproto.h  |    7 +-
 external/mit/xorgproto/dist/include/X11/extensions/XKBstr.h    |    7 +-
 external/mit/xorgproto/dist/include/X11/extensions/syncconst.h |    2 +-
 external/mit/xorgproto/dist/include/X11/extensions/syncstr.h   |    2 +-
 external/mit/xorgproto/dist/include/X11/extensions/windowswm.h |    2 +-
 external/mit/xorgproto/dist/include/X11/fonts/FS.h             |    2 +-
 external/mit/xorgproto/dist/include/X11/keysymdef.h            |  193 ++--
 external/mit/xorgproto/dist/inputproto.pc.in                   |    1 -
 external/mit/xorgproto/dist/install-sh                         |   13 +-
 external/mit/xorgproto/dist/kbproto.pc.in                      |    1 -
 external/mit/xorgproto/dist/lg3dproto.pc.in                    |    1 -
 external/mit/xorgproto/dist/man/Xprint.man                     |    6 +-
 external/mit/xorgproto/dist/man/Xprint.sgml                    |    6 +-
 external/mit/xorgproto/dist/meson.build                        |  115 +-
 external/mit/xorgproto/dist/missing                            |    2 +-
 external/mit/xorgproto/dist/presentproto.pc.in                 |    1 -
 external/mit/xorgproto/dist/presentproto.txt                   |    2 +-
 external/mit/xorgproto/dist/printproto.pc.in                   |    1 -
 external/mit/xorgproto/dist/randrproto.pc.in                   |    1 -
 external/mit/xorgproto/dist/randrproto.txt                     |    2 +-
 external/mit/xorgproto/dist/recordproto.pc.in                  |    1 -
 external/mit/xorgproto/dist/renderproto.pc.in                  |    1 -
 external/mit/xorgproto/dist/resourceproto.pc.in                |    1 -
 external/mit/xorgproto/dist/scripts/keysym-generator.py        |  452 ++++++++++
 external/mit/xorgproto/dist/scrnsaverproto.pc.in               |    1 -
 external/mit/xorgproto/dist/specs/Makefile.in                  |    4 +-
 external/mit/xorgproto/dist/specs/bigreqsproto/Makefile.in     |    4 +-
 external/mit/xorgproto/dist/specs/fontsproto/Makefile.in       |    4 +-
 external/mit/xorgproto/dist/specs/kbproto/Makefile.in          |    4 +-
 external/mit/xorgproto/dist/specs/kbproto/appD.xml             |    6 +-
 external/mit/xorgproto/dist/specs/recordproto/Makefile.in      |    4 +-
 external/mit/xorgproto/dist/specs/recordproto/record.xml       |    2 +-
 external/mit/xorgproto/dist/specs/scrnsaverproto/Makefile.in   |    4 +-
 external/mit/xorgproto/dist/specs/scrnsaverproto/saver.xml     |   10 +-
 external/mit/xorgproto/dist/specs/xcmiscproto/Makefile.in      |    4 +-
 external/mit/xorgproto/dist/specs/xextproto/Makefile.in        |    4 +-
 external/mit/xorgproto/dist/specs/xextproto/appgrp.xml         |    6 +-
 external/mit/xorgproto/dist/specs/xextproto/dbe.xml            |    2 +-
 external/mit/xorgproto/dist/specs/xextproto/dpms.xml           |    4 +-
 external/mit/xorgproto/dist/specs/xextproto/evi.xml            |    2 +-
 external/mit/xorgproto/dist/specs/xextproto/security.xml       |    8 +-
 external/mit/xorgproto/dist/specs/xextproto/shm.xml            |    2 +-
 external/mit/xorgproto/dist/specs/xextproto/tog-cup.xml        |    6 +-
 external/mit/xorgproto/dist/specs/xproto/Makefile.in           |    4 +-
 external/mit/xorgproto/dist/specs/xproto/glossary.xml          |    2 +-
 external/mit/xorgproto/dist/specs/xproto/keysyms.xml           |    2 +-
 external/mit/xorgproto/dist/specs/xproto/sect1-9.xml           |    2 +-
 external/mit/xorgproto/dist/trapproto.pc.in                    |    1 -
 external/mit/xorgproto/dist/videoproto.pc.in                   |    1 -
 external/mit/xorgproto/dist/windowswmproto.pc.in               |    1 -
 external/mit/xorgproto/dist/xcalibrateproto.pc.in              |    1 -
 external/mit/xorgproto/dist/xcmiscproto.pc.in                  |    1 -
 external/mit/xorgproto/dist/xextproto.pc.in                    |    1 -
 external/mit/xorgproto/dist/xf86bigfontproto.pc.in             |    1 -
 external/mit/xorgproto/dist/xf86dgaproto.pc.in                 |    1 -
 external/mit/xorgproto/dist/xf86driproto.pc.in                 |    1 -
 external/mit/xorgproto/dist/xf86miscproto.pc.in                |    1 -
 external/mit/xorgproto/dist/xf86rushproto.pc.in                |    1 -
 external/mit/xorgproto/dist/xf86vidmodeproto.pc.in             |    1 -
 external/mit/xorgproto/dist/xineramaproto.pc.in                |    1 -
 external/mit/xorgproto/dist/xproto.pc.in                       |    3 +-
 external/mit/xorgproto/dist/xproxymngproto.pc.in               |    1 -
 external/mit/xorgproto/dist/xv-protocol-v2.txt                 |    2 +-
 94 files changed, 1035 insertions(+), 324 deletions(-)

diffs (truncated from 2707 to 300 lines):

diff -r 1fbdc6c57721 -r 49faa3e5894b external/mit/xorgproto/dist/COPYING-x11proto
--- a/external/mit/xorgproto/dist/COPYING-x11proto      Thu Feb 11 12:19:54 2021 +0000
+++ b/external/mit/xorgproto/dist/COPYING-x11proto      Mon Apr 26 21:10:15 2021 +0000
@@ -80,7 +80,7 @@
 distribution of the software without written prior permission.
 
 HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+TO THIS SOFTWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  Hewlett-Packard shall not be liable for errors
 contained herein or direct, indirect, special, incidental or
diff -r 1fbdc6c57721 -r 49faa3e5894b external/mit/xorgproto/dist/Makefile.am
--- a/external/mit/xorgproto/dist/Makefile.am   Thu Feb 11 12:19:54 2021 +0000
+++ b/external/mit/xorgproto/dist/Makefile.am   Mon Apr 26 21:10:15 2021 +0000
@@ -496,6 +496,8 @@
     meson.build \
     meson_options.txt \
     man/Xprint.man \
-    man/Xprint.sgml
+    man/Xprint.sgml \
+    scripts/keysym-generator.py
+
 
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-legacy
diff -r 1fbdc6c57721 -r 49faa3e5894b external/mit/xorgproto/dist/Makefile.in
--- a/external/mit/xorgproto/dist/Makefile.in   Thu Feb 11 12:19:54 2021 +0000
+++ b/external/mit/xorgproto/dist/Makefile.in   Mon Apr 26 21:10:15 2021 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -954,7 +954,8 @@
     meson.build \
     meson_options.txt \
     man/Xprint.man \
-    man/Xprint.sgml
+    man/Xprint.sgml \
+    scripts/keysym-generator.py
 
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-legacy
 all: all-recursive
@@ -2941,6 +2942,10 @@
        tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
        $(am__post_remove_distdir)
 
+dist-zstd: distdir
+       tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+       $(am__post_remove_distdir)
+
 dist-tarZ: distdir
        @echo WARNING: "Support for distribution archives compressed with" \
                       "legacy program 'compress' is deprecated." >&2
@@ -2983,6 +2988,8 @@
          eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
        *.zip*) \
          unzip $(distdir).zip ;;\
+       *.tar.zst*) \
+         zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
        esac
        chmod -R a-w $(distdir)
        chmod u+w $(distdir)
@@ -3246,7 +3253,7 @@
        am--refresh check check-am clean clean-cscope clean-generic \
        cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
        dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
-       distcheck distclean distclean-generic distclean-tags \
+       dist-zstd distcheck distclean distclean-generic distclean-tags \
        distcleancheck distdir distuninstallcheck dvi dvi-am html \
        html-am info info-am install install-XCalibrateincludeHEADERS \
        install-am install-applewmHEADERS \
diff -r 1fbdc6c57721 -r 49faa3e5894b external/mit/xorgproto/dist/README.md
--- a/external/mit/xorgproto/dist/README.md     Thu Feb 11 12:19:54 2021 +0000
+++ b/external/mit/xorgproto/dist/README.md     Mon Apr 26 21:10:15 2021 +0000
@@ -3,7 +3,7 @@
 
 This package provides the headers and specification documents defining
 the core protocol and (many) extensions for the X Window System. The
-extensions are those common among servers descended from X.Org 6.7. It
+extensions are those common among servers descended from X11R7. It
 also includes a number of headers that aren't purely protocol related,
 but are depended upon by many other X Window System packages to provide
 common definitions and porting layer.
@@ -15,14 +15,14 @@
 projects, please refer to the XCB project:
 
   https://xcb.freedesktop.org/
-  https://cgit.freedesktop.org/xcb/proto
+  https://gitlab.freedesktop.org/xorg/proto/xcbproto
 
 All questions regarding this software should be directed at the
 Xorg mailing list:
 
   https://lists.x.org/mailman/listinfo/xorg
 
-The master development code repository can be found at:
+The primary development code repository can be found at:
 
   https://gitlab.freedesktop.org/xorg/proto/xorgproto
 
@@ -32,3 +32,27 @@
 
   https://www.x.org/wiki/Development/Documentation/SubmittingPatches
 
+
+Updating for new Linux kernel releases
+--------------------------------------
+
+The XF86keysym.h header file needs updating whenever the Linux kernel
+adds a new keycode to linux/input-event-codes.h. See the comment in
+include/X11/XF86keysym.h for details on the format.
+
+The steps to update the file are:
+
+- if the kernel release did not add new `KEY_FOO` defines, no work is
+  required
+- ensure that libevdev has been updated to the new kernel headers. This may
+  require installing libevdev from git.
+- run `scripts/keysym-generator.py` to add new keysyms. See the `--help`
+  output for the correct invocation.
+- verify that the format for any keys added by this script is correct and
+  that the keys need to be mapped. Where a key code should not get a new
+  define or is already defined otherwise, comment the line.
+- file a merge request with the new changes
+- notify the xkeyboard-config maintainers that updates are needed
+
+Note that any #define added immediately becomes API. Due diligence is
+recommended.
diff -r 1fbdc6c57721 -r 49faa3e5894b external/mit/xorgproto/dist/aclocal.m4
--- a/external/mit/xorgproto/dist/aclocal.m4    Thu Feb 11 12:19:54 2021 +0000
+++ b/external/mit/xorgproto/dist/aclocal.m4    Mon Apr 26 21:10:15 2021 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2283,7 +2283,7 @@
 AC_SUBST([CHANGELOG_CMD])
 ]) # XORG_CHANGELOG
 
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2298,7 +2298,7 @@
 [am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.16.1], [],
+m4_if([$1], [1.16.2], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -2314,14 +2314,14 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.2])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2373,7 +2373,7 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2404,7 +2404,7 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2595,7 +2595,7 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2634,7 +2634,9 @@
   done
   if test $am_rc -ne 0; then
     AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
-    for automatic dependency tracking.  Try re-running configure with the
+    for automatic dependency tracking.  If GNU make was not used, consider
+    re-running the configure script with MAKE="gmake" (or whatever is
+    necessary).  You can also try re-running configure with the
     '--disable-dependency-tracking' option to at least be able to build
     the package (albeit without support for automatic dependency tracking).])
   fi
@@ -2661,7 +2663,7 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2858,7 +2860,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2879,7 +2881,7 @@
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2900,7 +2902,7 @@
 
 # Check to see how 'make' treats includes.                 -*- Autoconf -*-
 
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2943,7 +2945,7 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2982,7 +2984,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3011,7 +3013,7 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3058,7 +3060,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3077,7 +3079,7 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,



Home | Main Index | Thread Index | Old Index