summaryrefslogtreecommitdiff
path: root/app/xdpyinfo
diff options
context:
space:
mode:
Diffstat (limited to 'app/xdpyinfo')
-rw-r--r--app/xdpyinfo/ChangeLog160
-rw-r--r--app/xdpyinfo/Makefile.am2
-rw-r--r--app/xdpyinfo/Makefile.in10
-rw-r--r--app/xdpyinfo/README30
-rw-r--r--app/xdpyinfo/README.md22
-rw-r--r--app/xdpyinfo/aclocal.m4288
-rw-r--r--app/xdpyinfo/compile17
-rw-r--r--app/xdpyinfo/configure218
-rw-r--r--app/xdpyinfo/configure.ac10
-rw-r--r--app/xdpyinfo/man/Makefile.in1
-rw-r--r--app/xdpyinfo/xdpyinfo.c44
11 files changed, 554 insertions, 248 deletions
diff --git a/app/xdpyinfo/ChangeLog b/app/xdpyinfo/ChangeLog
index dc1c52fde..c998c2fe7 100644
--- a/app/xdpyinfo/ChangeLog
+++ b/app/xdpyinfo/ChangeLog
@@ -1,3 +1,159 @@
+commit 61bc4b764030bdc9a731ee74c7c56bf2b2a4bddf
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Apr 7 13:43:48 2022 -0700
+
+ xdpyinfo 1.3.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 47770a9bd7b8af662ebaeb56911bfd4ee7ca5b9b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Feb 10 12:01:57 2022 -0500
+
+ xdpyinfo: Fix printing the X.Org release version for xserver >= 21
+
+ Without this you'd get 1.21.1.4 instead of 21.1.4.
+
+commit 0cde4d53d3fea82004ccefef5a059287a6e9e861
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Apr 6 14:56:53 2022 -0700
+
+ gitlab CI: stop requiring Signed-off-by in commits
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 46df61a5b8e7171d97614b8553221b5ea1debcdd
+Author: Thomas Kuehne <thomas@kuehne.cn>
+Date: Sat Dec 11 18:31:12 2021 +0100
+
+ fix -Wunused-[...] compiler warnings
+
+ xdpyinfo.c:148:1: warning: ‘silent_errors’ defined but not used [-Wunused-function]
+ 148 | silent_errors(_X_UNUSED Display *dpy, _X_UNUSED XErrorEvent *ev)
+ xdpyinfo.c:155:14: warning: ‘old_handler’ defined but not used [-Wunused-variable]
+ 155 | static int (*old_handler)(Display *, XErrorEvent *) = NULL;
+
+ Signed-off-by: Thomas Kuehne <thomas@kuehne.cn>
+
+commit 4158bd9d4269b237cacc24ce458ec7751a11a2cd
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Jan 9 13:13:41 2022 -0800
+
+ Fix spelling/wording issues
+
+ Found by using:
+ codespell --builtin clear,rare,usage,informal,code,names
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3fb972d2d81d341187adf6b5496a2ffcba733453
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 11:57:10 2021 -0800
+
+ Build xz tarballs instead of bzip2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c4e733af14dfefe524d3c5e3afec1b45ec09388a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 11:57:07 2021 -0800
+
+ gitlab CI: add a basic build test
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7a227dcfadefeb50a5dca333f3bb65c738567583
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Sep 12 07:53:32 2021 -0700
+
+ Disable DMX support by default, leave --with-dmx to enable it
+
+ Since Xserver 21 has removed DMX support, we can stop pulling in dependences
+ on libdmx on systems that won't be using it.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 67a512759f0d8d4e16585b1f04c071f3ea08b8fa
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Mar 24 16:27:00 2019 -0700
+
+ Add explicit casts to clear implicit conversion warnings
+
+ xdpyinfo.c:173:17: warning: implicit conversion changes signedness: 'int' to
+ 'size_t' (aka 'unsigned long') [-Wsign-conversion]
+ qsort(extlist, n, sizeof(char *), StrCmp);
+ ~~~~~ ^
+ xdpyinfo.c:183:26: warning: implicit conversion changes signedness: 'int' to
+ 'unsigned long' [-Wsign-conversion]
+ qe_cookies = calloc(n, sizeof(xcb_query_extension_cookie_t));
+ ~~~~~~ ^
+ xdpyinfo.c:195:12: warning: implicit conversion loses integer precision:
+ 'unsigned long' to 'uint16_t' (aka 'unsigned short') [-Wconversion]
+ strlen(extlist[i]),
+ ^~~~~~~~~~~~~~~~~~
+ xdpyinfo.c:1382:51: warning: implicit conversion loses integer precision:
+ 'unsigned long' to 'int' [-Wshorten-64-to-32]
+ int extlen = strlen(known_extensions[i].extname) + 1;
+ ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 4fc3902a090c8ed2aff11d6e8a2c0df600d69966
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Mar 3 11:22:22 2019 -0800
+
+ Only check for XFree86 if vendor string doesn't match X.Org
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ae5c4a040680b3889c8ea332c21d2caea2d918d1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Nov 21 17:01:52 2018 -0800
+
+ Update configure.ac bug URL for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 873220f791f494ab9659ba6fcb85737c1cd4b99d
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Nov 16 21:34:53 2018 -0800
+
+ Update README for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bbac7d201e78e2837e418baa3e0d16a475469c3b
+Author: Mihail Konev <k.mvc@ya.ru>
+Date: Thu Jan 26 14:00:21 2017 +1000
+
+ autogen: add default patch prefix
+
+ Signed-off-by: Mihail Konev <k.mvc@ya.ru>
+
+commit 84785447ba88a93cd1c2e3edbba7bdf11e37e7b5
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Mon Mar 9 12:00:52 2015 +0000
+
+ autogen.sh: use quoted string variables
+
+ Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
+ fall-outs, when they contain space.
+
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b9a3e30239cd890ff53f0f996cd99a1f4a7e7e12
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jan 24 10:32:07 2017 +1000
+
+ autogen.sh: use exec instead of waiting for configure to finish
+
+ Syncs the invocation of configure with the one from the server.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+
commit 122dfb8dbff5238f5272781f940c5a6f24086137
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Apr 16 23:00:15 2015 -0700
@@ -861,7 +1017,7 @@ Date: Fri Jul 8 04:54:09 2005 +0000
build)
commit d99fbcde4c892e8d84e02b40ed3f5862a731e9c2
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 6 19:56:47 2005 +0000
Add buildsystem for xdpyinfo
@@ -897,7 +1053,7 @@ Date: Thu Sep 2 05:50:38 2004 +0000
libXaw.
commit a667763d5b733f5ae2d8a3ca7e1e99d3deed2830
-Author: Kristian Høgsberg <krh@redhat.com>
+Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Aug 16 16:36:15 2004 +0000
As discussed and agreed on on the release-wranglers meeting of August 16,
diff --git a/app/xdpyinfo/Makefile.am b/app/xdpyinfo/Makefile.am
index 2f21ddad2..4cb8b5143 100644
--- a/app/xdpyinfo/Makefile.am
+++ b/app/xdpyinfo/Makefile.am
@@ -73,3 +73,5 @@ ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
lint:
$(LINT) $(ALL_LINT_FLAGS) $(AM_CFLAGS) $(xdpyinfo_SOURCES)
endif LINT
+
+EXTRA_DIST = README.md
diff --git a/app/xdpyinfo/Makefile.in b/app/xdpyinfo/Makefile.in
index 65f39fddc..116f10ef3 100644
--- a/app/xdpyinfo/Makefile.in
+++ b/app/xdpyinfo/Makefile.in
@@ -73,7 +73,7 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = xdpyinfo$(EXEEXT)
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog INSTALL compile \
config.guess config.sub depcomp install-sh missing \
@@ -185,9 +185,9 @@ am__relativize = \
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
GZIP_ENV = --best
-DIST_TARGETS = dist-bzip2 dist-gzip
+DIST_TARGETS = dist-xz dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -331,6 +331,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -376,6 +377,7 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS)
+EXTRA_DIST = README.md
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -702,6 +704,7 @@ distdir: $(DISTFILES)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__post_remove_distdir)
+
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__post_remove_distdir)
@@ -709,7 +712,6 @@ dist-bzip2: distdir
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__post_remove_distdir)
-
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
diff --git a/app/xdpyinfo/README b/app/xdpyinfo/README
deleted file mode 100644
index 9df1cc4a8..000000000
--- a/app/xdpyinfo/README
+++ /dev/null
@@ -1,30 +0,0 @@
-xdpyinfo is a utility for displaying information about an X server.
-
-It is used to examine the capabilities of a server, the predefined
-values for various parameters used in communicating between clients
-and the server, and the different types of screens, visuals, and X11
-protocol extensions that are available.
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/app/xdpyinfo
-
- http://cgit.freedesktop.org/xorg/app/xdpyinfo
-
-For patch submission instructions, see:
-
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
diff --git a/app/xdpyinfo/README.md b/app/xdpyinfo/README.md
new file mode 100644
index 000000000..2d80f7a24
--- /dev/null
+++ b/app/xdpyinfo/README.md
@@ -0,0 +1,22 @@
+xdpyinfo is a utility for displaying information about an X server.
+
+It is used to examine the capabilities of a server, the predefined
+values for various parameters used in communicating between clients
+and the server, and the different types of screens, visuals, and X11
+protocol extensions that are available.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ https://lists.x.org/mailman/listinfo/xorg
+
+The primary development code repository can be found at:
+
+ https://gitlab.freedesktop.org/xorg/app/xdpyinfo
+
+Please submit bug reports and requests to merge patches there.
+
+For patch submission instructions, see:
+
+ https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
diff --git a/app/xdpyinfo/aclocal.m4 b/app/xdpyinfo/aclocal.m4
index c0dbcfb1f..d0a818e1e 100644
--- a/app/xdpyinfo/aclocal.m4
+++ b/app/xdpyinfo/aclocal.m4
@@ -19,32 +19,63 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -66,18 +97,19 @@ if test -n "$PKG_CONFIG"; then
PKG_CONFIG=""
fi
fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
@@ -87,8 +119,10 @@ m4_ifvaln([$3], [else
$3])dnl
fi])
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
m4_define([_PKG_CONFIG],
[if test -n "$$1"; then
pkg_cv_[]$1="$$1"
@@ -100,10 +134,11 @@ m4_define([_PKG_CONFIG],
else
pkg_failed=untried
fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -111,26 +146,24 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
else
_pkg_short_errors_supported=no
fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -140,11 +173,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
- else
+ else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@@ -161,7 +194,7 @@ installed software in a non-standard prefix.
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -177,16 +210,40 @@ else
AC_MSG_RESULT([yes])
$3
fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
AC_DEFUN([PKG_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -197,16 +254,18 @@ AC_ARG_WITH([pkgconfigdir],
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -217,7 +276,24 @@ AC_ARG_WITH([noarch-pkgconfigdir],
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
@@ -1242,7 +1318,7 @@ AC_SUBST([am__untar])
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
-dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the "Software"),
@@ -1279,7 +1355,7 @@ dnl DEALINGS IN THE SOFTWARE.
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.19.0])
+m4_define([vers_have], [1.19.2])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -1357,6 +1433,17 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[
AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_PROG_SED])
+case $host_os in
+ solaris*)
+ # Solaris 2.0 - 11.3 use SysV man page section numbers, so we
+ # check for a man page file found in later versions that use
+ # traditional section numbers instead
+ AC_CHECK_FILE([/usr/share/man/man7/attributes.7],
+ [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true])
+ ;;
+ *) SYSV_MAN_SECTIONS=false ;;
+esac
+
if test x$APP_MAN_SUFFIX = x ; then
APP_MAN_SUFFIX=1
fi
@@ -1372,9 +1459,9 @@ if test x$LIB_MAN_DIR = x ; then
fi
if test x$FILE_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) FILE_MAN_SUFFIX=4 ;;
- *) FILE_MAN_SUFFIX=5 ;;
+ case $SYSV_MAN_SECTIONS in
+ true) FILE_MAN_SUFFIX=4 ;;
+ *) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
@@ -1382,9 +1469,9 @@ if test x$FILE_MAN_DIR = x ; then
fi
if test x$MISC_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) MISC_MAN_SUFFIX=5 ;;
- *) MISC_MAN_SUFFIX=7 ;;
+ case $SYSV_MAN_SECTIONS in
+ true) MISC_MAN_SUFFIX=5 ;;
+ *) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
@@ -1392,9 +1479,9 @@ if test x$MISC_MAN_DIR = x ; then
fi
if test x$DRIVER_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) DRIVER_MAN_SUFFIX=7 ;;
- *) DRIVER_MAN_SUFFIX=4 ;;
+ case $SYSV_MAN_SECTIONS in
+ true) DRIVER_MAN_SUFFIX=7 ;;
+ *) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
@@ -1402,9 +1489,9 @@ if test x$DRIVER_MAN_DIR = x ; then
fi
if test x$ADMIN_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) ADMIN_MAN_SUFFIX=1m ;;
- *) ADMIN_MAN_SUFFIX=8 ;;
+ case $SYSV_MAN_SECTIONS in
+ true) ADMIN_MAN_SUFFIX=1m ;;
+ *) ADMIN_MAN_SUFFIX=8 ;;
esac
fi
if test x$ADMIN_MAN_DIR = x ; then
@@ -1665,13 +1752,24 @@ m4_ifval([$1],
fi])
# Test for the ability of xmlto to generate a text target
+#
+# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the
+# following test for empty XML docbook files.
+# For compatibility reasons use the following empty XML docbook file and if
+# it fails try it again with a non-empty XML file.
have_xmlto_text=no
cat > conftest.xml << "EOF"
EOF
AS_IF([test "$have_xmlto" = yes],
[AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
[have_xmlto_text=yes],
- [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
+ [# Try it again with a non-empty XML file.
+ cat > conftest.xml << "EOF"
+<x></x>
+EOF
+ AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
+ [have_xmlto_text=yes],
+ [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])])
rm -f conftest.xml
AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
@@ -3067,8 +3165,9 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
-|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
-echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
+|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
+touch \$(top_srcdir)/INSTALL; \
+echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
AC_SUBST([INSTALL_CMD])
]) # XORG_INSTALL
dnl Copyright 2005 Red Hat, Inc
@@ -3129,10 +3228,11 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
#
#
AC_DEFUN([XORG_CHANGELOG], [
-CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
+CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
-|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
-echo 'git directory not found: installing possibly empty changelog.' >&2)"
+|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
+touch \$(top_srcdir)/ChangeLog; \
+echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
AC_SUBST([CHANGELOG_CMD])
]) # XORG_CHANGELOG
diff --git a/app/xdpyinfo/compile b/app/xdpyinfo/compile
index a85b723c7..df363c8fb 100644
--- a/app/xdpyinfo/compile
+++ b/app/xdpyinfo/compile
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@ func_file_conv ()
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/app/xdpyinfo/configure b/app/xdpyinfo/configure
index 962c0aff5..858604502 100644
--- a/app/xdpyinfo/configure
+++ b/app/xdpyinfo/configure
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xdpyinfo 1.3.2.
+# Generated by GNU Autoconf 2.69 for xdpyinfo 1.3.3.
#
-# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xdpyinfo/issues>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -267,7 +267,7 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+$0: https://gitlab.freedesktop.org/xorg/app/xdpyinfo/issues
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
@@ -581,9 +581,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xdpyinfo'
PACKAGE_TARNAME='xdpyinfo'
-PACKAGE_VERSION='1.3.2'
-PACKAGE_STRING='xdpyinfo 1.3.2'
-PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
+PACKAGE_VERSION='1.3.3'
+PACKAGE_STRING='xdpyinfo 1.3.3'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xdpyinfo/issues'
PACKAGE_URL=''
ac_unique_file="Makefile.am"
@@ -757,6 +757,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -868,6 +869,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1120,6 +1122,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1257,7 +1268,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1370,7 +1381,7 @@ if test "$ac_init_help" = "long"; then
# 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 xdpyinfo 1.3.2 to adapt to many kinds of systems.
+\`configure' configures xdpyinfo 1.3.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1410,6 +1421,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1440,7 +1452,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xdpyinfo 1.3.2:";;
+ short | recursive ) echo "Configuration of xdpyinfo 1.3.3:";;
esac
cat <<\_ACEOF
@@ -1470,7 +1482,7 @@ Optional Packages:
--without-dga Disable dga support.
--without-xf86misc Disable xf86misc support.
--without-xinerama Disable xinerama support.
- --without-dmx Disable dmx support.
+ --with-dmx Enable dmx support.
--with-lint Use a lint-style source code checker (default:
disabled)
@@ -1546,7 +1558,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+Report bugs to <https://gitlab.freedesktop.org/xorg/app/xdpyinfo/issues>.
_ACEOF
ac_status=$?
fi
@@ -1609,7 +1621,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xdpyinfo configure 1.3.2
+xdpyinfo configure 1.3.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1866,7 +1878,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xdpyinfo $as_me 1.3.2, which was
+It was created by xdpyinfo $as_me 1.3.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2695,7 +2707,7 @@ fi
# Define the identity of the package.
PACKAGE='xdpyinfo'
- VERSION='1.3.2'
+ VERSION='1.3.3'
cat >>confdefs.h <<_ACEOF
@@ -10339,10 +10351,11 @@ _ACEOF
-CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
+CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
-|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
-echo 'git directory not found: installing possibly empty changelog.' >&2)"
+|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
+touch \$(top_srcdir)/ChangeLog; \
+echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
@@ -10350,13 +10363,44 @@ echo 'git directory not found: installing possibly empty changelog.' >&2)"
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
-|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
-echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
+|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
+touch \$(top_srcdir)/INSTALL; \
+echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
+
+
+case $host_os in
+ solaris*)
+ # Solaris 2.0 - 11.3 use SysV man page section numbers, so we
+ # check for a man page file found in later versions that use
+ # traditional section numbers instead
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5
+$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; }
+if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ test "$cross_compiling" = yes &&
+ as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "/usr/share/man/man7/attributes.7"; then
+ ac_cv_file__usr_share_man_man7_attributes_7=yes
+else
+ ac_cv_file__usr_share_man_man7_attributes_7=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5
+$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; }
+if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then :
+ SYSV_MAN_SECTIONS=false
+else
+ SYSV_MAN_SECTIONS=true
+fi
+ ;;
+ *) SYSV_MAN_SECTIONS=false ;;
+esac
if test x$APP_MAN_SUFFIX = x ; then
APP_MAN_SUFFIX=1
@@ -10373,9 +10417,9 @@ if test x$LIB_MAN_DIR = x ; then
fi
if test x$FILE_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) FILE_MAN_SUFFIX=4 ;;
- *) FILE_MAN_SUFFIX=5 ;;
+ case $SYSV_MAN_SECTIONS in
+ true) FILE_MAN_SUFFIX=4 ;;
+ *) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
@@ -10383,9 +10427,9 @@ if test x$FILE_MAN_DIR = x ; then
fi
if test x$MISC_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) MISC_MAN_SUFFIX=5 ;;
- *) MISC_MAN_SUFFIX=7 ;;
+ case $SYSV_MAN_SECTIONS in
+ true) MISC_MAN_SUFFIX=5 ;;
+ *) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
@@ -10393,9 +10437,9 @@ if test x$MISC_MAN_DIR = x ; then
fi
if test x$DRIVER_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) DRIVER_MAN_SUFFIX=7 ;;
- *) DRIVER_MAN_SUFFIX=4 ;;
+ case $SYSV_MAN_SECTIONS in
+ true) DRIVER_MAN_SUFFIX=7 ;;
+ *) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
@@ -10403,9 +10447,9 @@ if test x$DRIVER_MAN_DIR = x ; then
fi
if test x$ADMIN_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) ADMIN_MAN_SUFFIX=1m ;;
- *) ADMIN_MAN_SUFFIX=8 ;;
+ case $SYSV_MAN_SECTIONS in
+ true) ADMIN_MAN_SUFFIX=1m ;;
+ *) ADMIN_MAN_SUFFIX=8 ;;
esac
fi
if test x$ADMIN_MAN_DIR = x ; then
@@ -10488,8 +10532,8 @@ AM_BACKSLASH='\'
# Checks for pkg-config packages
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDPYINFO" >&5
-$as_echo_n "checking for XDPYINFO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xext x11 xtst x11-xcb xcb xproto >= 7.0.22" >&5
+$as_echo_n "checking for xext x11 xtst x11-xcb xcb xproto >= 7.0.22... " >&6; }
if test -n "$XDPYINFO_CFLAGS"; then
pkg_cv_XDPYINFO_CFLAGS="$XDPYINFO_CFLAGS"
@@ -10529,7 +10573,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -10556,7 +10600,7 @@ Alternatively, you may set the environment variables XDPYINFO_CFLAGS
and XDPYINFO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -10581,8 +10625,8 @@ fi
# This is used below to allow <X11/Xlib.h> to be found
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPY_X11" >&5
-$as_echo_n "checking for DPY_X11... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11" >&5
+$as_echo_n "checking for x11... " >&6; }
if test -n "$DPY_X11_CFLAGS"; then
pkg_cv_DPY_X11_CFLAGS="$DPY_X11_CFLAGS"
@@ -10622,7 +10666,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -10649,7 +10693,7 @@ Alternatively, you may set the environment variables DPY_X11_CFLAGS
and DPY_X11_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -10673,8 +10717,8 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPY_XEXT" >&5
-$as_echo_n "checking for DPY_XEXT... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xext" >&5
+$as_echo_n "checking for xext... " >&6; }
if test -n "$DPY_XEXT_CFLAGS"; then
pkg_cv_DPY_XEXT_CFLAGS="$DPY_XEXT_CFLAGS"
@@ -10714,7 +10758,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -10732,7 +10776,7 @@ fi
echo "not found"
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
echo "not found"
else
@@ -10761,8 +10805,8 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPY_XKB" >&5
-$as_echo_n "checking for DPY_XKB... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11" >&5
+$as_echo_n "checking for x11... " >&6; }
if test -n "$DPY_XKB_CFLAGS"; then
pkg_cv_DPY_XKB_CFLAGS="$DPY_XKB_CFLAGS"
@@ -10802,7 +10846,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -10820,7 +10864,7 @@ fi
echo "not found"
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
echo "not found"
else
@@ -10849,8 +10893,8 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPY_XF86VIDMODE" >&5
-$as_echo_n "checking for DPY_XF86VIDMODE... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xxf86vm" >&5
+$as_echo_n "checking for xxf86vm... " >&6; }
if test -n "$DPY_XF86VIDMODE_CFLAGS"; then
pkg_cv_DPY_XF86VIDMODE_CFLAGS="$DPY_XF86VIDMODE_CFLAGS"
@@ -10890,7 +10934,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -10908,7 +10952,7 @@ fi
echo "not found"
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
echo "not found"
else
@@ -10946,8 +10990,8 @@ fi
if test "x$USE_DGA" != "xno" ; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPY_XF86DGA" >&5
-$as_echo_n "checking for DPY_XF86DGA... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xxf86dga" >&5
+$as_echo_n "checking for xxf86dga... " >&6; }
if test -n "$DPY_XF86DGA_CFLAGS"; then
pkg_cv_DPY_XF86DGA_CFLAGS="$DPY_XF86DGA_CFLAGS"
@@ -10987,7 +11031,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11005,7 +11049,7 @@ fi
echo "not found"
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
echo "not found"
else
@@ -11048,8 +11092,8 @@ fi
if test "x$USE_XF86MISC" != "xno" ; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPY_XF86MISC" >&5
-$as_echo_n "checking for DPY_XF86MISC... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xxf86misc" >&5
+$as_echo_n "checking for xxf86misc... " >&6; }
if test -n "$DPY_XF86MISC_CFLAGS"; then
pkg_cv_DPY_XF86MISC_CFLAGS="$DPY_XF86MISC_CFLAGS"
@@ -11089,7 +11133,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11107,7 +11151,7 @@ fi
echo "not found"
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
echo "not found"
else
@@ -11140,8 +11184,8 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPY_XINPUT" >&5
-$as_echo_n "checking for DPY_XINPUT... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xi" >&5
+$as_echo_n "checking for xi... " >&6; }
if test -n "$DPY_XINPUT_CFLAGS"; then
pkg_cv_DPY_XINPUT_CFLAGS="$DPY_XINPUT_CFLAGS"
@@ -11181,7 +11225,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11199,7 +11243,7 @@ fi
echo "not found"
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
echo "not found"
else
@@ -11227,8 +11271,8 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPY_XRENDER" >&5
-$as_echo_n "checking for DPY_XRENDER... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xrender" >&5
+$as_echo_n "checking for xrender... " >&6; }
if test -n "$DPY_XRENDER_CFLAGS"; then
pkg_cv_DPY_XRENDER_CFLAGS="$DPY_XRENDER_CFLAGS"
@@ -11268,7 +11312,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11286,7 +11330,7 @@ fi
echo "not found"
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
echo "not found"
else
@@ -11314,8 +11358,8 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPY_XCOMPOSITE" >&5
-$as_echo_n "checking for DPY_XCOMPOSITE... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xcomposite" >&5
+$as_echo_n "checking for xcomposite... " >&6; }
if test -n "$DPY_XCOMPOSITE_CFLAGS"; then
pkg_cv_DPY_XCOMPOSITE_CFLAGS="$DPY_XCOMPOSITE_CFLAGS"
@@ -11355,7 +11399,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11373,7 +11417,7 @@ fi
echo "not found"
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
echo "not found"
else
@@ -11410,8 +11454,8 @@ fi
if test "x$USE_XINERAMA" != "xno" ; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPY_XINERAMA" >&5
-$as_echo_n "checking for DPY_XINERAMA... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xinerama" >&5
+$as_echo_n "checking for xinerama... " >&6; }
if test -n "$DPY_XINERAMA_CFLAGS"; then
pkg_cv_DPY_XINERAMA_CFLAGS="$DPY_XINERAMA_CFLAGS"
@@ -11451,7 +11495,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11469,7 +11513,7 @@ fi
echo "not found"
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
echo "not found"
else
@@ -11503,14 +11547,14 @@ fi
if test "${with_dmx+set}" = set; then :
withval=$with_dmx; USE_DMX="$withval"
else
- USE_DMX="yes"
+ USE_DMX="no"
fi
if test "x$USE_DMX" != "xno" ; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPY_DMX" >&5
-$as_echo_n "checking for DPY_DMX... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmx" >&5
+$as_echo_n "checking for dmx... " >&6; }
if test -n "$DPY_DMX_CFLAGS"; then
pkg_cv_DPY_DMX_CFLAGS="$DPY_DMX_CFLAGS"
@@ -11550,7 +11594,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11568,7 +11612,7 @@ fi
echo "not found"
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
echo "not found"
else
@@ -11599,8 +11643,8 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPY_XTST" >&5
-$as_echo_n "checking for DPY_XTST... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xtst" >&5
+$as_echo_n "checking for xtst... " >&6; }
if test -n "$DPY_XTST_CFLAGS"; then
pkg_cv_DPY_XTST_CFLAGS="$DPY_XTST_CFLAGS"
@@ -11640,7 +11684,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11658,7 +11702,7 @@ fi
echo "not found"
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
echo "not found"
else
@@ -12326,7 +12370,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xdpyinfo $as_me 1.3.2, which was
+This file was extended by xdpyinfo $as_me 1.3.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12386,13 +12430,13 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>."
+Report bugs to <https://gitlab.freedesktop.org/xorg/app/xdpyinfo/issues>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xdpyinfo config.status 1.3.2
+xdpyinfo config.status 1.3.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/app/xdpyinfo/configure.ac b/app/xdpyinfo/configure.ac
index 73dce2646..83515dc54 100644
--- a/app/xdpyinfo/configure.ac
+++ b/app/xdpyinfo/configure.ac
@@ -23,13 +23,13 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xdpyinfo], [1.3.2],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xdpyinfo])
+AC_INIT([xdpyinfo], [1.3.3],
+ [https://gitlab.freedesktop.org/xorg/app/xdpyinfo/issues], [xdpyinfo])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
@@ -120,8 +120,8 @@ else
echo "without xinerama"
fi
-AC_ARG_WITH(dmx, AS_HELP_STRING([--without-dmx],[Disable dmx support.]),
- [USE_DMX="$withval"], [USE_DMX="yes"])
+AC_ARG_WITH(dmx, AS_HELP_STRING([--with-dmx],[Enable dmx support.]),
+ [USE_DMX="$withval"], [USE_DMX="no"])
if test "x$USE_DMX" != "xno" ; then
PKG_CHECK_MODULES(DPY_DMX, dmx,
[SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/app/xdpyinfo/man/Makefile.in b/app/xdpyinfo/man/Makefile.in
index efe14e2c2..2ba9cf3f1 100644
--- a/app/xdpyinfo/man/Makefile.in
+++ b/app/xdpyinfo/man/Makefile.in
@@ -249,6 +249,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/app/xdpyinfo/xdpyinfo.c b/app/xdpyinfo/xdpyinfo.c
index 152e32c52..b201ad379 100644
--- a/app/xdpyinfo/xdpyinfo.c
+++ b/app/xdpyinfo/xdpyinfo.c
@@ -144,6 +144,7 @@ in this Software without prior written authorization from The Open Group.
static char *ProgramName;
static Bool queryExtensions = False;
+#if defined(XF86MISC) || defined(XFreeXDGA)
static int
silent_errors(_X_UNUSED Display *dpy, _X_UNUSED XErrorEvent *ev)
{
@@ -151,6 +152,7 @@ silent_errors(_X_UNUSED Display *dpy, _X_UNUSED XErrorEvent *ev)
}
static int (*old_handler)(Display *, XErrorEvent *) = NULL;
+#endif
static int print_event_mask(char *buf, int lastcol, int indent, long mask);
@@ -170,7 +172,7 @@ print_extension_info(Display *dpy)
if (extlist) {
int i;
- qsort(extlist, n, sizeof(char *), StrCmp);
+ qsort(extlist, (size_t)n, sizeof(char *), StrCmp);
if (!queryExtensions) {
for (i = 0; i < n; i++) {
@@ -180,7 +182,7 @@ print_extension_info(Display *dpy)
xcb_connection_t *xcb_conn = XGetXCBConnection (dpy);
xcb_query_extension_cookie_t *qe_cookies;
- qe_cookies = calloc(n, sizeof(xcb_query_extension_cookie_t));
+ qe_cookies = calloc((size_t)n, sizeof(xcb_query_extension_cookie_t));
if (!qe_cookies) {
perror ("calloc failed to allocate memory for extensions");
return;
@@ -192,7 +194,7 @@ print_extension_info(Display *dpy)
*/
for (i = 0; i < n; i++) {
qe_cookies[i] = xcb_query_extension (xcb_conn,
- strlen(extlist[i]),
+ (uint16_t)strlen(extlist[i]),
extlist[i]);
}
@@ -239,7 +241,25 @@ print_display_info(Display *dpy)
printf ("vendor string: %s\n", ServerVendor (dpy));
printf ("vendor release number: %d\n", VendorRelease (dpy));
- if (strstr(ServerVendor (dpy), "XFree86")) {
+ if (strstr(ServerVendor (dpy), "X.Org")) {
+ int vendrel = VendorRelease(dpy);
+
+ printf("X.Org version: ");
+ if (vendrel >= 12100000) {
+ vendrel -= 10000000; /* Y2.1K compliant */
+ printf("%d.%d",
+ (vendrel / 100000) % 100,
+ (vendrel / 1000) % 100);
+ } else {
+ printf("%d.%d.%d", vendrel / 10000000,
+ (vendrel / 100000) % 100,
+ (vendrel / 1000) % 100);
+ }
+ if (vendrel % 1000)
+ printf(".%d", vendrel % 1000);
+ printf("\n");
+ }
+ else if (strstr(ServerVendor (dpy), "XFree86")) {
int vendrel = VendorRelease(dpy);
printf("XFree86 version: ");
@@ -280,18 +300,6 @@ print_display_info(Display *dpy)
printf("\n");
}
- if (strstr(ServerVendor (dpy), "X.Org")) {
- int vendrel = VendorRelease(dpy);
-
- printf("X.Org version: ");
- printf("%d.%d.%d", vendrel / 10000000,
- (vendrel / 100000) % 100,
- (vendrel / 1000) % 100);
- if (vendrel % 1000)
- printf(".%d", vendrel % 1000);
- printf("\n");
- }
-
if (strstr(ServerVendor (dpy), "DMX")) {
int vendrel = VendorRelease(dpy);
int major, minor, year, month, day;
@@ -1067,7 +1075,7 @@ print_xrender_info(Display *dpy, const char *extname)
int major, minor;
int i, j;
XVisualInfo viproto; /* fill in for getting info */
- XVisualInfo *vip; /* retured info */
+ XVisualInfo *vip; /* returned info */
int nvi; /* number of elements returned */
int ndepths = 0, *depths = NULL;
#if RENDER_MAJOR > 0 || RENDER_MINOR >= 6
@@ -1380,7 +1388,7 @@ print_known_extensions(FILE *f)
int i, col;
for (i = 0, col = 6; i < num_known_extensions; i++)
{
- int extlen = strlen(known_extensions[i].extname) + 1;
+ int extlen = (int) strlen(known_extensions[i].extname) + 1;
if ((col + extlen) > 79)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 06:38:57 +0000