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

To: source-changes-hg%NetBSD.org@localhost
Subject: [xsrc/xorg]: xsrc/external/mit/xorgproto/dist initial import of xorgproto-2019.2
From: mrg <mrg%NetBSD.org@localhost>
Date: Sun, 23 Feb 2020 09:46:00 +0000
details:   https://anonhg.NetBSD.org/xsrc/rev/1c338ae97c29
branches:  xorg
changeset: 10439:1c338ae97c29
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 23 09:09:23 2020 +0000

description:
initial import of xorgproto-2019.2

diffstat:

 external/mit/xorgproto/dist/Makefile.am                        |  10 +-
 external/mit/xorgproto/dist/Makefile.in                        |  53 +++++----
 external/mit/xorgproto/dist/configure                          |  20 +-
 external/mit/xorgproto/dist/configure.ac                       |   2 +-
 external/mit/xorgproto/dist/include/X11/extensions/meson.build |   8 +-
 external/mit/xorgproto/dist/meson.build                        |   4 +-
 6 files changed, 56 insertions(+), 41 deletions(-)

diffs (truncated from 316 to 300 lines):

diff -r 15311cb4fb71 -r 1c338ae97c29 external/mit/xorgproto/dist/Makefile.am
--- a/external/mit/xorgproto/dist/Makefile.am   Sun Feb 23 09:01:48 2020 +0000
+++ b/external/mit/xorgproto/dist/Makefile.am   Sun Feb 23 09:09:23 2020 +0000
@@ -130,11 +130,13 @@
 
 kbdir = $(includedir)/X11/extensions
 kb_HEADERS = \
-       include/X11/extensions/XKBgeom.h \
        include/X11/extensions/XKB.h \
        include/X11/extensions/XKBproto.h \
        include/X11/extensions/XKBsrv.h \
        include/X11/extensions/XKBstr.h
+if LEGACY
+kb_HEADERS += include/X11/extensions/XKBgeom.h
+endif
 
 kbprotopkgconfigdir = $(datadir)/pkgconfig
 kbprotopkgconfig_DATA = kbproto.pc
@@ -256,15 +258,18 @@
 
 videodir = $(includedir)/X11/extensions
 video_HEADERS = \
-       include/X11/extensions/vldXvMC.h \
        include/X11/extensions/Xv.h \
        include/X11/extensions/XvMC.h \
        include/X11/extensions/XvMCproto.h \
        include/X11/extensions/Xvproto.h
+if LEGACY
+video_HEADERS += include/X11/extensions/vldXvMC.h
+endif
 
 videoprotopkgconfigdir = $(datadir)/pkgconfig
 videoprotopkgconfig_DATA = videoproto.pc
 
+if LEGACY
 windowswmdir = $(includedir)/X11/extensions
 windowswm_HEADERS = \
         include/X11/extensions/windowswm.h \
@@ -272,6 +277,7 @@
 
 windowswmprotopkgconfigdir = $(datadir)/pkgconfig
 windowswmprotopkgconfig_DATA = windowswmproto.pc
+endif
 
 xprotodir = $(includedir)/X11
 xproto_HEADERS = \
diff -r 15311cb4fb71 -r 1c338ae97c29 external/mit/xorgproto/dist/Makefile.in
--- a/external/mit/xorgproto/dist/Makefile.in   Sun Feb 23 09:01:48 2020 +0000
+++ b/external/mit/xorgproto/dist/Makefile.in   Sun Feb 23 09:09:23 2020 +0000
@@ -89,6 +89,8 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@LEGACY_TRUE@am__append_1 = include/X11/extensions/XKBgeom.h
+@LEGACY_TRUE@am__append_2 = include/X11/extensions/vldXvMC.h
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -101,15 +103,16 @@
        $(damage_HEADERS) $(dmx_HEADERS) $(dri2_HEADERS) \
        $(dri3_HEADERS) $(am__evie_HEADERS_DIST) $(fixes_HEADERS) \
        $(am__fontcache_HEADERS_DIST) $(fonts_HEADERS) $(gl_HEADERS) \
-       $(glinternal_HEADERS) $(input_HEADERS) $(kb_HEADERS) \
+       $(glinternal_HEADERS) $(input_HEADERS) $(am__kb_HEADERS_DIST) \
        $(am__lg3d_HEADERS_DIST) $(present_HEADERS) \
        $(am__print_HEADERS_DIST) $(randr_HEADERS) $(record_HEADERS) \
        $(render_HEADERS) $(resource_HEADERS) $(scrnsaver_HEADERS) \
-       $(am__trap_HEADERS_DIST) $(video_HEADERS) $(windowswm_HEADERS) \
-       $(xcmisc_HEADERS) $(xext_HEADERS) $(xf86bigfont_HEADERS) \
-       $(xf86dga_HEADERS) $(xf86dri_HEADERS) \
-       $(am__xf86misc_HEADERS_DIST) $(am__xf86rush_HEADERS_DIST) \
-       $(xf86vidmode_HEADERS) $(xinerama_HEADERS) $(xproto_HEADERS) \
+       $(am__trap_HEADERS_DIST) $(am__video_HEADERS_DIST) \
+       $(am__windowswm_HEADERS_DIST) $(xcmisc_HEADERS) \
+       $(xext_HEADERS) $(xf86bigfont_HEADERS) $(xf86dga_HEADERS) \
+       $(xf86dri_HEADERS) $(am__xf86misc_HEADERS_DIST) \
+       $(am__xf86rush_HEADERS_DIST) $(xf86vidmode_HEADERS) \
+       $(xinerama_HEADERS) $(xproto_HEADERS) \
        $(am__xproxymng_HEADERS_DIST) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
@@ -266,6 +269,11 @@
 am__fontcache_HEADERS_DIST = include/X11/extensions/fontcache.h \
        include/X11/extensions/fontcacheP.h \
        include/X11/extensions/fontcachstr.h
+am__kb_HEADERS_DIST = include/X11/extensions/XKB.h \
+       include/X11/extensions/XKBproto.h \
+       include/X11/extensions/XKBsrv.h \
+       include/X11/extensions/XKBstr.h \
+       include/X11/extensions/XKBgeom.h
 am__lg3d_HEADERS_DIST = include/X11/extensions/lgewire.h
 am__print_HEADERS_DIST = include/X11/extensions/Print.h \
        include/X11/extensions/Printstr.h
@@ -276,6 +284,13 @@
        include/X11/extensions/xtraplib.h \
        include/X11/extensions/xtraplibp.h \
        include/X11/extensions/xtrapproto.h
+am__video_HEADERS_DIST = include/X11/extensions/Xv.h \
+       include/X11/extensions/XvMC.h \
+       include/X11/extensions/XvMCproto.h \
+       include/X11/extensions/Xvproto.h \
+       include/X11/extensions/vldXvMC.h
+am__windowswm_HEADERS_DIST = include/X11/extensions/windowswm.h \
+       include/X11/extensions/windowswmstr.h
 am__xf86misc_HEADERS_DIST = include/X11/extensions/xf86misc.h \
        include/X11/extensions/xf86mscstr.h
 am__xf86rush_HEADERS_DIST = include/X11/extensions/xf86rush.h \
@@ -633,13 +648,10 @@
 inputprotopkgconfigdir = $(datadir)/pkgconfig
 inputprotopkgconfig_DATA = inputproto.pc
 kbdir = $(includedir)/X11/extensions
-kb_HEADERS = \
-       include/X11/extensions/XKBgeom.h \
-       include/X11/extensions/XKB.h \
+kb_HEADERS = include/X11/extensions/XKB.h \
        include/X11/extensions/XKBproto.h \
        include/X11/extensions/XKBsrv.h \
-       include/X11/extensions/XKBstr.h
-
+       include/X11/extensions/XKBstr.h $(am__append_1)
 kbprotopkgconfigdir = $(datadir)/pkgconfig
 kbprotopkgconfig_DATA = kbproto.pc
 @LEGACY_TRUE@lg3ddir = $(includedir)/X11/extensions
@@ -723,22 +735,19 @@
 @LEGACY_TRUE@trapprotopkgconfigdir = $(datadir)/pkgconfig
 @LEGACY_TRUE@trapprotopkgconfig_DATA = trapproto.pc
 videodir = $(includedir)/X11/extensions
-video_HEADERS = \
-       include/X11/extensions/vldXvMC.h \
-       include/X11/extensions/Xv.h \
+video_HEADERS = include/X11/extensions/Xv.h \
        include/X11/extensions/XvMC.h \
        include/X11/extensions/XvMCproto.h \
-       include/X11/extensions/Xvproto.h
-
+       include/X11/extensions/Xvproto.h $(am__append_2)
 videoprotopkgconfigdir = $(datadir)/pkgconfig
 videoprotopkgconfig_DATA = videoproto.pc
-windowswmdir = $(includedir)/X11/extensions
-windowswm_HEADERS = \
-        include/X11/extensions/windowswm.h \
-       include/X11/extensions/windowswmstr.h
+@LEGACY_TRUE@windowswmdir = $(includedir)/X11/extensions
+@LEGACY_TRUE@windowswm_HEADERS = \
+@LEGACY_TRUE@        include/X11/extensions/windowswm.h \
+@LEGACY_TRUE@  include/X11/extensions/windowswmstr.h
 
-windowswmprotopkgconfigdir = $(datadir)/pkgconfig
-windowswmprotopkgconfig_DATA = windowswmproto.pc
+@LEGACY_TRUE@windowswmprotopkgconfigdir = $(datadir)/pkgconfig
+@LEGACY_TRUE@windowswmprotopkgconfig_DATA = windowswmproto.pc
 xprotodir = $(includedir)/X11
 xproto_HEADERS = \
        include/X11/ap_keysym.h \
diff -r 15311cb4fb71 -r 1c338ae97c29 external/mit/xorgproto/dist/configure
--- a/external/mit/xorgproto/dist/configure     Sun Feb 23 09:01:48 2020 +0000
+++ b/external/mit/xorgproto/dist/configure     Sun Feb 23 09:09:23 2020 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xorgproto 2019.1.
+# Generated by GNU Autoconf 2.69 for xorgproto 2019.2.
 #
 # Report bugs to <https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues>.
 #
@@ -641,8 +641,8 @@
 # Identity of this package.
 PACKAGE_NAME='xorgproto'
 PACKAGE_TARNAME='xorgproto'
-PACKAGE_VERSION='2019.1'
-PACKAGE_STRING='xorgproto 2019.1'
+PACKAGE_VERSION='2019.2'
+PACKAGE_STRING='xorgproto 2019.2'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues'
 PACKAGE_URL=''
 
@@ -1391,7 +1391,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xorgproto 2019.1 to adapt to many kinds of systems.
+\`configure' configures xorgproto 2019.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1461,7 +1461,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xorgproto 2019.1:";;
+     short | recursive ) echo "Configuration of xorgproto 2019.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1577,7 +1577,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorgproto configure 2019.1
+xorgproto configure 2019.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1982,7 +1982,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xorgproto $as_me 2019.1, which was
+It was created by xorgproto $as_me 2019.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2845,7 +2845,7 @@
 
 # Define the identity of the package.
  PACKAGE='xorgproto'
- VERSION='2019.1'
+ VERSION='2019.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12065,7 +12065,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xorgproto $as_me 2019.1, which was
+This file was extended by xorgproto $as_me 2019.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12122,7 +12122,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xorgproto config.status 2019.1
+xorgproto config.status 2019.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -r 15311cb4fb71 -r 1c338ae97c29 external/mit/xorgproto/dist/configure.ac
--- a/external/mit/xorgproto/dist/configure.ac  Sun Feb 23 09:01:48 2020 +0000
+++ b/external/mit/xorgproto/dist/configure.ac  Sun Feb 23 09:09:23 2020 +0000
@@ -22,7 +22,7 @@
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.60])
-AC_INIT([xorgproto], [2019.1],
+AC_INIT([xorgproto], [2019.2],
         [https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
diff -r 15311cb4fb71 -r 1c338ae97c29 external/mit/xorgproto/dist/include/X11/extensions/meson.build
--- a/external/mit/xorgproto/dist/include/X11/extensions/meson.build    Sun Feb 23 09:01:48 2020 +0000
+++ b/external/mit/xorgproto/dist/include/X11/extensions/meson.build    Sun Feb 23 09:09:23 2020 +0000
@@ -53,9 +53,6 @@
     'syncconst.h',
     'syncproto.h',
     'syncstr.h',
-    'vldXvMC.h',
-    'windowswm.h',
-    'windowswmstr.h',
     'xcmiscproto.h',
     'xcmiscstr.h',
     'xf86bigfont.h',
@@ -79,7 +76,6 @@
     'XI2proto.h',
     'XI.h',
     'XIproto.h',
-    'XKBgeom.h',
     'XKB.h',
     'XKBproto.h',
     'XKBsrv.h',
@@ -112,11 +108,15 @@
         'lgewire.h',
         'Print.h',
         'Printstr.h',
+        'vldXvMC.h',
+        'windowswm.h',
+        'windowswmstr.h',
         'xcalibrateproto.h',
         'xcalibratewire.h',
         'Xeviestr.h',
         'xf86rush.h',
         'xf86rushstr.h',
+        'XKBgeom.h',
         subdir : 'X11/extensions'
     )
 endif
diff -r 15311cb4fb71 -r 1c338ae97c29 external/mit/xorgproto/dist/meson.build
--- a/external/mit/xorgproto/dist/meson.build   Sun Feb 23 09:01:48 2020 +0000
+++ b/external/mit/xorgproto/dist/meson.build   Sun Feb 23 09:09:23 2020 +0000
@@ -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 : '2019.1')
+project('xorgproto', 'c', license : 'MIT', version : '2019.2')
 pkg = import('pkgconfig')
 cc = meson.get_compiler('c')
 sed = find_program('sed')
Prev by Date: [xsrc/xorg]: xsrc/external/mit/libXvMC/dist initial import of libXvMC-1.0.12
Next by Date: [xsrc/trunk]: xsrc/external/mit/libX11/dist initial import of libX11-1.6.9
Previous by Thread: [xsrc/xorg]: xsrc/external/mit/libXvMC/dist initial import of libXvMC-1.0.12
Next by Thread: [xsrc/trunk]: xsrc/external/mit/libX11/dist initial import of libX11-1.6.9
Indexes:
Home | Main Index | Thread Index | Old Index