Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xdpyinfo for openSUSE:Factory
checked in at 2023-04-29 17:27:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdpyinfo (Old)
and /work/SRC/openSUSE:Factory/.xdpyinfo.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdpyinfo"
Sat Apr 29 17:27:43 2023 rev:10 rq:1083414 version:1.3.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdpyinfo/xdpyinfo.changes 2022-04-10
19:05:19.986546976 +0200
+++ /work/SRC/openSUSE:Factory/.xdpyinfo.new.1533/xdpyinfo.changes
2023-04-29 17:27:51.418470925 +0200
@@ -1,0 +2,14 @@
+Fri Apr 28 06:27:30 UTC 2023 - Stefan Dirsch <sndir...@suse.com>
+
+- Update to version 1.3.4
+ * This release stops compiling support for the XF86-Misc extension by
+ default, and thus stops linking with the deprecated libXxf86misc
+ library by default. This support can still be enabled for now by
+ passing --with-xf86misc to the configure script, but as the server
+ side of this extension was removed in the xserver-1.6.0 release in 2008
+ there is little reason to do so, and the support may be removed entirely
+ in a future release of xdpyinfo.
+- we have xorg-server >= 1.6 since sle11-sp1, so we are on the safe
+ side with our customers
+
+-------------------------------------------------------------------
Old:
----
xdpyinfo-1.3.3.tar.xz
New:
----
xdpyinfo-1.3.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdpyinfo.spec ++++++
--- /var/tmp/diff_new_pack.Yaa6Qp/_old 2023-04-29 17:27:51.854472750 +0200
+++ /var/tmp/diff_new_pack.Yaa6Qp/_new 2023-04-29 17:27:51.858472767 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xdpyinfo
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: xdpyinfo
-Version: 1.3.3
+Version: 1.3.4
Release: 0
Summary: Utility to display information about an X server
License: MIT
@@ -63,7 +63,8 @@
%files
%defattr(-,root,root)
-%doc ChangeLog COPYING README.md
+%license COPYING
+%doc ChangeLog README.md
%{_bindir}/xdpyinfo
%{_mandir}/man1/xdpyinfo.1%{?ext_man}
++++++ xdpyinfo-1.3.3.tar.xz -> xdpyinfo-1.3.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdpyinfo-1.3.3/ChangeLog new/xdpyinfo-1.3.4/ChangeLog
--- old/xdpyinfo-1.3.3/ChangeLog 2022-04-07 22:47:05.000000000 +0200
+++ new/xdpyinfo-1.3.4/ChangeLog 2023-04-28 02:11:39.000000000 +0200
@@ -1,3 +1,57 @@
+commit ea4083ccb2a5ce4252acabeb2eb7bf49f7be25e0
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Apr 27 16:58:51 2023 -0700
+
+ xdpyinfo 1.3.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit e4688bb9e4b6e0333a84420864bf39cf4c4fa86f
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Dec 8 18:46:20 2022 -0800
+
+ Call memset() instead of hand-coding our own equivalent
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 6bb053f46101e659c4f3a877bf8d17ad37a23225
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Dec 8 13:26:00 2022 -0800
+
+ Remove unnecessary downcast of double to float
+
+ The printf family always takes double arguments, not float.
+
+ Clears clang warning of:
+
+ xdpyinfo.c:767:5: warning: implicit conversion increases floating-point
+ precision: 'float' to 'double' [-Wdouble-promotion]
+ (float)dotclock/1000.0,
+ ^~~~~~~~~~~~~~~~
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 04f4911bedc988b917a268978d9592780aa34651
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Dec 8 13:24:47 2022 -0800
+
+ Variable scope reduction
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 563f4c9eb22b5389a2cf63276ec08025ad0d794b
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Tue Nov 22 14:12:16 2022 -0800
+
+ configure: Make xf86misc support disabled by default
+
+ Require --with-xf86misc to enable it.
+
+ The server side of the XF86-Misc extension was removed in the xserver-1.6.0
+ release in 2008, so this code is unusable on most systems now.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
commit 61bc4b764030bdc9a731ee74c7c56bf2b2a4bddf
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Thu Apr 7 13:43:48 2022 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdpyinfo-1.3.3/aclocal.m4
new/xdpyinfo-1.3.4/aclocal.m4
--- old/xdpyinfo-1.3.3/aclocal.m4 2022-04-07 22:46:57.000000000 +0200
+++ new/xdpyinfo-1.3.4/aclocal.m4 2023-04-28 02:11:25.000000000 +0200
@@ -1426,7 +1426,7 @@
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by
configure.
dnl
-dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights
reserved.
+dnl Copyright (c) 2005, 2023, Oracle and/or its affiliates.
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"),
@@ -1463,7 +1463,7 @@
# 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.3])
+m4_define([vers_have], [1.20.0])
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,,
@@ -1793,7 +1793,7 @@
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
-# the --with-xmlto option, it allows maximum flexibilty in making decisions
+# the --with-xmlto option, it allows maximum flexibility in making decisions
# as whether or not to use the xmlto package. When DEFAULT is not specified,
# --with-xmlto assumes 'auto'.
#
@@ -2007,7 +2007,7 @@
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
-# the --with-asciidoc option, it allows maximum flexibilty in making decisions
+# the --with-asciidoc option, it allows maximum flexibility in making decisions
# as whether or not to use the asciidoc package. When DEFAULT is not specified,
# --with-asciidoc assumes 'auto'.
#
@@ -2077,7 +2077,7 @@
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
-# the --with-doxygen option, it allows maximum flexibilty in making decisions
+# the --with-doxygen option, it allows maximum flexibility in making decisions
# as whether or not to use the doxygen package. When DEFAULT is not specified,
# --with-doxygen assumes 'auto'.
#
@@ -2161,7 +2161,7 @@
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
-# the --with-groff option, it allows maximum flexibilty in making decisions
+# the --with-groff option, it allows maximum flexibility in making decisions
# as whether or not to use the groff package. When DEFAULT is not specified,
# --with-groff assumes 'auto'.
#
@@ -2269,7 +2269,7 @@
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
-# the --with-fop option, it allows maximum flexibilty in making decisions
+# the --with-fop option, it allows maximum flexibility in making decisions
# as whether or not to use the fop package. When DEFAULT is not specified,
# --with-fop assumes 'auto'.
#
@@ -2363,7 +2363,7 @@
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
-# the --with-ps2pdf option, it allows maximum flexibilty in making decisions
+# the --with-ps2pdf option, it allows maximum flexibility in making decisions
# as whether or not to use the ps2pdf package. When DEFAULT is not specified,
# --with-ps2pdf assumes 'auto'.
#
@@ -2418,7 +2418,7 @@
# not at the appropriate level. This macro enables a builder to skip all
# documentation targets except traditional man pages.
# Combined with the specific tool checking macros XORG_WITH_*, it provides
-# maximum flexibilty in controlling documentation building.
+# maximum flexibility in controlling documentation building.
# Refer to:
# XORG_WITH_XMLTO --with-xmlto
# XORG_WITH_ASCIIDOC --with-asciidoc
@@ -2451,7 +2451,7 @@
#
# This macro enables a builder to skip all developer documentation.
# Combined with the specific tool checking macros XORG_WITH_*, it provides
-# maximum flexibilty in controlling documentation building.
+# maximum flexibility in controlling documentation building.
# Refer to:
# XORG_WITH_XMLTO --with-xmlto
# XORG_WITH_ASCIIDOC --with-asciidoc
@@ -2484,7 +2484,7 @@
#
# This macro enables a builder to skip all functional specification targets.
# Combined with the specific tool checking macros XORG_WITH_*, it provides
-# maximum flexibilty in controlling documentation building.
+# maximum flexibility in controlling documentation building.
# Refer to:
# XORG_WITH_XMLTO --with-xmlto
# XORG_WITH_ASCIIDOC --with-asciidoc
@@ -2959,7 +2959,11 @@
AC_DEFUN([XORG_COMPILER_BRAND], [
AC_LANG_CASE(
[C], [
- AC_REQUIRE([AC_PROG_CC_C99])
+ dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC
+ dnl and complains that AC_PROG_CC_C99 is obsolete
+ m4_version_prereq([2.70],
+ [AC_REQUIRE([AC_PROG_CC])],
+ [AC_REQUIRE([AC_PROG_CC_C99])])
],
[C++], [
AC_REQUIRE([AC_PROG_CXX])
@@ -2975,7 +2979,7 @@
# Minimum version: 1.16.0
#
# Test if the compiler works when passed the given flag as a command line
argument.
-# If it succeeds, the flag is appeneded to the given variable. If not, it
tries the
+# If it succeeds, the flag is appended to the given variable. If not, it
tries the
# next flag in the list until there are no more options.
#
# Note that this does not guarantee that the compiler supports the flag as some
@@ -2991,7 +2995,11 @@
AC_LANG_CASE(
[C], [
- AC_REQUIRE([AC_PROG_CC_C99])
+ dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC
+ dnl and complains that AC_PROG_CC_C99 is obsolete
+ m4_version_prereq([2.70],
+ [AC_REQUIRE([AC_PROG_CC])],
+ [AC_REQUIRE([AC_PROG_CC_C99])])
define([PREFIX], [C])
define([CACHE_PREFIX], [cc])
define([COMPILER], [$CC])
@@ -3132,7 +3140,7 @@
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
-# Turn some warnings into errors, so we don't accidently get successful builds
+# Turn some warnings into errors, so we don't accidentally get successful
builds
# when there are problems that should be fixed.
if test "x$SELECTIVE_WERROR" = "xyes" ; then
@@ -3241,23 +3249,35 @@
AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS]))
]) # XORG_STRICT_OPTION
+# XORG_DEFAULT_NOCODE_OPTIONS
+# ---------------------------
+# Minimum version: 1.20.0
+#
+# Defines default options for X.Org modules which don't compile code,
+# such as fonts, bitmaps, cursors, and docs.
+#
+AC_DEFUN([XORG_DEFAULT_NOCODE_OPTIONS], [
+AC_REQUIRE([AC_PROG_INSTALL])
+XORG_RELEASE_VERSION
+XORG_CHANGELOG
+XORG_INSTALL
+XORG_MANPAGE_SECTIONS
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
+ [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
+]) # XORG_DEFAULT_NOCODE_OPTIONS
+
# XORG_DEFAULT_OPTIONS
# --------------------
# Minimum version: 1.3.0
#
-# Defines default options for X.Org modules.
+# Defines default options for X.Org modules which compile code.
#
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
AC_REQUIRE([AC_PROG_INSTALL])
XORG_COMPILER_FLAGS
XORG_CWARNFLAGS
XORG_STRICT_OPTION
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-XORG_INSTALL
-XORG_MANPAGE_SECTIONS
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
- [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
+XORG_DEFAULT_NOCODE_OPTIONS
]) # XORG_DEFAULT_OPTIONS
# XORG_INSTALL()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdpyinfo-1.3.3/config.guess
new/xdpyinfo-1.3.4/config.guess
--- old/xdpyinfo-1.3.3/config.guess 2022-04-07 22:46:59.000000000 +0200
+++ new/xdpyinfo-1.3.4/config.guess 2023-04-28 02:11:27.000000000 +0200
@@ -1,14 +1,14 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2021 Free Software Foundation, Inc.
+# Copyright 1992-2023 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2021-06-03'
+timestamp='2023-01-01'
# This file 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 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -60,7 +60,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2021 Free Software Foundation, Inc.
+Copyright 1992-2023 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -437,7 +437,7 @@
# This test works for both compilers.
if test "$CC_FOR_BUILD" != no_compiler_found; then
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
SUN_ARCH=x86_64
@@ -929,6 +929,9 @@
i*:PW*:*)
GUESS=$UNAME_MACHINE-pc-pw32
;;
+ *:SerenityOS:*:*)
+ GUESS=$UNAME_MACHINE-pc-serenity
+ ;;
*:Interix*:*)
case $UNAME_MACHINE in
x86)
@@ -963,6 +966,12 @@
GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
;;
+ x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)
+ GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
+ ;;
+ *:[Mm]anagarm:*:*)
+ GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
+ ;;
*:Minix:*:*)
GUESS=$UNAME_MACHINE-unknown-minix
;;
@@ -1033,7 +1042,7 @@
k1om:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
- loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+ loongarch32:Linux:*:* | loongarch64:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
m32r*:Linux:*:*)
@@ -1148,16 +1157,27 @@
;;
x86_64:Linux:*:*)
set_cc_for_build
+ CPU=$UNAME_MACHINE
LIBCABI=$LIBC
if test "$CC_FOR_BUILD" != no_compiler_found; then
- if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_X32 >/dev/null
- then
- LIBCABI=${LIBC}x32
- fi
+ ABI=64
+ sed 's/^ //' << EOF > "$dummy.c"
+ #ifdef __i386__
+ ABI=x86
+ #else
+ #ifdef __ILP32__
+ ABI=x32
+ #endif
+ #endif
+EOF
+ cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' |
sed 's, ,,g'`
+ eval "$cc_set_abi"
+ case $ABI in
+ x86) CPU=i686 ;;
+ x32) LIBCABI=${LIBC}x32 ;;
+ esac
fi
- GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+ GUESS=$CPU-pc-linux-$LIBCABI
;;
xtensa*:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@@ -1364,8 +1384,11 @@
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
GUESS=i586-pc-haiku
;;
- x86_64:Haiku:*:*)
- GUESS=x86_64-unknown-haiku
+ ppc:Haiku:*:*) # Haiku running on Apple PowerPC
+ GUESS=powerpc-apple-haiku
+ ;;
+ *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat)
+ GUESS=$UNAME_MACHINE-unknown-haiku
;;
SX-4:SUPER-UX:*:*)
GUESS=sx4-nec-superux$UNAME_RELEASE
@@ -1522,6 +1545,9 @@
i*86:rdos:*:*)
GUESS=$UNAME_MACHINE-pc-rdos
;;
+ i*86:Fiwix:*:*)
+ GUESS=$UNAME_MACHINE-pc-fiwix
+ ;;
*:AROS:*:*)
GUESS=$UNAME_MACHINE-unknown-aros
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdpyinfo-1.3.3/config.sub
new/xdpyinfo-1.3.4/config.sub
--- old/xdpyinfo-1.3.3/config.sub 2022-04-07 22:46:59.000000000 +0200
+++ new/xdpyinfo-1.3.4/config.sub 2023-04-28 02:11:27.000000000 +0200
@@ -1,14 +1,14 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2021 Free Software Foundation, Inc.
+# Copyright 1992-2023 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2021-08-14'
+timestamp='2023-01-21'
# This file 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 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -76,7 +76,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2021 Free Software Foundation, Inc.
+Copyright 1992-2023 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +145,7 @@
nto-qnx* | linux-* | uclinux-uclibc* \
| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* |
netbsd*-gnu* \
| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
- | storm-chaos* | os2-emx* | rtmk-nova*)
+ | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*)
basic_machine=$field1
basic_os=$maybe_os
;;
@@ -1020,6 +1020,11 @@
;;
# Here we normalize CPU types with a missing or matching vendor
+ armh-unknown | armh-alt)
+ cpu=armv7l
+ vendor=alt
+ basic_os=${basic_os:-linux-gnueabihf}
+ ;;
dpx20-unknown | dpx20-bull)
cpu=rs6000
vendor=bull
@@ -1070,7 +1075,7 @@
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
cpu=i586
;;
- pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+ pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
cpu=i686
;;
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
@@ -1121,7 +1126,7 @@
xscale-* | xscalee[bl]-*)
cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
;;
- arm64-*)
+ arm64-* | aarch64le-*)
cpu=aarch64
;;
@@ -1202,7 +1207,7 @@
| k1om \
| le32 | le64 \
| lm32 \
- | loongarch32 | loongarch64 | loongarchx32 \
+ | loongarch32 | loongarch64 \
| m32c | m32r | m32rle \
| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 |
m68k \
| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
@@ -1304,7 +1309,7 @@
if test x$basic_os != x
then
-# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
+# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
# set os.
case $basic_os in
gnu/linux*)
@@ -1336,6 +1341,10 @@
kernel=linux
os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
;;
+ managarm*)
+ kernel=managarm
+ os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'`
+ ;;
*)
kernel=
os=$basic_os
@@ -1748,7 +1757,8 @@
| skyos* | haiku* | rdos* | toppers* | drops* | es* \
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
| midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*)
+ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
+ | fiwix* | mlibc* )
;;
# This one is extra strict with allowed versions
sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
@@ -1756,6 +1766,9 @@
;;
none)
;;
+ kernel* )
+ # Restricted further below
+ ;;
*)
echo Invalid configuration \`"$1"\': OS \`"$os"\' not
recognized 1>&2
exit 1
@@ -1766,16 +1779,26 @@
# (given a valid OS), if there is a kernel.
case $kernel-$os in
linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
- | linux-musl* | linux-relibc* | linux-uclibc* )
+ | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc*
)
;;
uclinux-uclibc* )
;;
- -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+ managarm-mlibc* | managarm-kernel* )
+ ;;
+ -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* )
# These are just libc implementations, not actual OSes, and thus
# require a kernel.
echo "Invalid configuration \`$1': libc \`$os' needs explicit
kernel." 1>&2
exit 1
;;
+ -kernel* )
+ echo "Invalid configuration \`$1': \`$os' needs explicit
kernel." 1>&2
+ exit 1
+ ;;
+ *-kernel* )
+ echo "Invalid configuration \`$1': \`$kernel' does not support
\`$os'." 1>&2
+ exit 1
+ ;;
kfreebsd*-gnu* | kopensolaris*-gnu*)
;;
vxworks-simlinux | vxworks-simwindows | vxworks-spe)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdpyinfo-1.3.3/configure new/xdpyinfo-1.3.4/configure
--- old/xdpyinfo-1.3.3/configure 2022-04-07 22:46:58.000000000 +0200
+++ new/xdpyinfo-1.3.4/configure 2023-04-28 02:11:26.000000000 +0200
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for xdpyinfo 1.3.3.
+# Generated by GNU Autoconf 2.71 for xdpyinfo 1.3.4.
#
-# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xdpyinfo/issues>.
+# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xdpyinfo/-/issues>.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -268,7 +268,7 @@
printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
else
printf "%s\n" "$0: Please tell bug-autoc...@gnu.org and
-$0: https://gitlab.freedesktop.org/xorg/app/xdpyinfo/issues
+$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
@@ -612,9 +612,9 @@
# Identity of this package.
PACKAGE_NAME='xdpyinfo'
PACKAGE_TARNAME='xdpyinfo'
-PACKAGE_VERSION='1.3.3'
-PACKAGE_STRING='xdpyinfo 1.3.3'
-PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xdpyinfo/issues'
+PACKAGE_VERSION='1.3.4'
+PACKAGE_STRING='xdpyinfo 1.3.4'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xdpyinfo/-/issues'
PACKAGE_URL=''
ac_unique_file="Makefile.am"
@@ -1401,7 +1401,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 xdpyinfo 1.3.3 to adapt to many kinds of systems.
+\`configure' configures xdpyinfo 1.3.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1472,7 +1472,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xdpyinfo 1.3.3:";;
+ short | recursive ) echo "Configuration of xdpyinfo 1.3.4:";;
esac
cat <<\_ACEOF
@@ -1497,7 +1497,7 @@
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--without-dga Disable dga support.
- --without-xf86misc Disable xf86misc support.
+ --with-xf86misc Enable xf86misc support.
--without-xinerama Disable xinerama support.
--with-dmx Enable dmx support.
--with-lint Use a lint-style source code checker (default:
@@ -1574,7 +1574,7 @@
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://gitlab.freedesktop.org/xorg/app/xdpyinfo/issues>.
+Report bugs to <https://gitlab.freedesktop.org/xorg/app/xdpyinfo/-/issues>.
_ACEOF
ac_status=$?
fi
@@ -1638,7 +1638,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xdpyinfo configure 1.3.3
+xdpyinfo configure 1.3.4
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1846,7 +1846,7 @@
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.3, which was
+It was created by xdpyinfo $as_me 1.3.4, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3120,7 +3120,7 @@
# Define the identity of the package.
PACKAGE='xdpyinfo'
- VERSION='1.3.3'
+ VERSION='1.3.4'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -4486,7 +4486,6 @@
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed
to detect all undeclared functions" >&5
printf %s "checking for $CC options needed to detect all undeclared
functions... " >&6; }
if test ${ac_cv_c_undeclared_builtin_options+y}
@@ -7151,7 +7150,7 @@
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
-# Turn some warnings into errors, so we don't accidently get successful builds
+# Turn some warnings into errors, so we don't accidentally get successful
builds
# when there are problems that should be fixed.
if test "x$SELECTIVE_WERROR" = "xyes" ; then
@@ -11006,6 +11005,8 @@
+
+
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF
@@ -11208,6 +11209,7 @@
+
# Checks for pkg-config packages
pkg_failed=no
@@ -11795,7 +11797,7 @@
then :
withval=$with_xf86misc; USE_XF86MISC="$withval"
else $as_nop
- USE_XF86MISC="yes"
+ USE_XF86MISC="no"
fi
if test "x$USE_XF86MISC" != "xno" ; then
@@ -13048,7 +13050,7 @@
# 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.3, which was
+This file was extended by xdpyinfo $as_me 1.3.4, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13108,7 +13110,7 @@
Configuration commands:
$config_commands
-Report bugs to <https://gitlab.freedesktop.org/xorg/app/xdpyinfo/issues>."
+Report bugs to <https://gitlab.freedesktop.org/xorg/app/xdpyinfo/-/issues>."
_ACEOF
ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
@@ -13116,7 +13118,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-xdpyinfo config.status 1.3.3
+xdpyinfo config.status 1.3.4
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdpyinfo-1.3.3/configure.ac
new/xdpyinfo-1.3.4/configure.ac
--- old/xdpyinfo-1.3.3/configure.ac 2022-04-07 22:46:55.000000000 +0200
+++ new/xdpyinfo-1.3.4/configure.ac 2023-04-28 02:11:23.000000000 +0200
@@ -23,8 +23,8 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xdpyinfo], [1.3.3],
- [https://gitlab.freedesktop.org/xorg/app/xdpyinfo/issues], [xdpyinfo])
+AC_INIT([xdpyinfo], [1.3.4],
+ [https://gitlab.freedesktop.org/xorg/app/xdpyinfo/-/issues], [xdpyinfo])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
@@ -76,8 +76,8 @@
fi
-AC_ARG_WITH(xf86misc, AS_HELP_STRING([--without-xf86misc],[Disable xf86misc
support.]),
- [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"])
+AC_ARG_WITH(xf86misc, AS_HELP_STRING([--with-xf86misc],[Enable xf86misc
support.]),
+ [USE_XF86MISC="$withval"], [USE_XF86MISC="no"])
if test "x$USE_XF86MISC" != "xno" ; then
PKG_CHECK_MODULES(DPY_XF86MISC, xxf86misc,
[SAVE_CPPFLAGS="$CPPFLAGS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdpyinfo-1.3.3/xdpyinfo.c
new/xdpyinfo-1.3.4/xdpyinfo.c
--- old/xdpyinfo-1.3.3/xdpyinfo.c 2022-04-07 22:46:55.000000000 +0200
+++ new/xdpyinfo-1.3.4/xdpyinfo.c 2023-04-28 02:11:23.000000000 +0200
@@ -170,12 +170,10 @@
printf ("number of extensions: %d\n", n);
if (extlist) {
- int i;
-
qsort(extlist, (size_t)n, sizeof(char *), StrCmp);
if (!queryExtensions) {
- for (i = 0; i < n; i++) {
+ for (int i = 0; i < n; i++) {
printf (" %s\n", extlist[i]);
}
} else {
@@ -192,7 +190,7 @@
* Generate all extension queries at once, so they can be
* sent to the xserver in a single batch
*/
- for (i = 0; i < n; i++) {
+ for (int i = 0; i < n; i++) {
qe_cookies[i] = xcb_query_extension (xcb_conn,
(uint16_t)strlen(extlist[i]),
extlist[i]);
@@ -203,7 +201,7 @@
* The first call will flush the queue to the server, then
* each one will wait, if needed, for its reply.
*/
- for (i = 0; i < n; i++) {
+ for (int i = 0; i < n; i++) {
xcb_query_extension_reply_t *rep
= xcb_query_extension_reply(xcb_conn, qe_cookies[i], NULL);
@@ -229,7 +227,7 @@
char dummybuf[40];
const char *cp;
int minkeycode, maxkeycode;
- int i, n;
+ int n;
long req_size;
XPixmapFormatValues *pmf;
Window focuswin;
@@ -364,7 +362,7 @@
printf ("number of supported pixmap formats: %d\n", n);
if (pmf) {
printf ("supported pixmap formats:\n");
- for (i = 0; i < n; i++) {
+ for (int i = 0; i < n; i++) {
printf (" depth %d, bits_per_pixel %d, scanline_pad %d\n",
pmf[i].depth, pmf[i].bits_per_pixel, pmf[i].scanline_pad);
}
@@ -457,7 +455,6 @@
XVisualInfo viproto; /* fill in for getting info */
XVisualInfo *vip; /* returned info */
int nvi; /* number of elements returned */
- int i; /* temp variable: iterator */
char eventbuf[80]; /* want 79 chars per line + nul */
static const char *yes = "YES", *no = "NO", *when = "WHEN MAPPED";
double xres, yres;
@@ -487,7 +484,7 @@
depths = XListDepths (dpy, scr, &ndepths);
if (!depths) ndepths = 0;
printf (" depths (%d): ", ndepths);
- for (i = 0; i < ndepths; i++) {
+ for (int i = 0; i < ndepths; i++) {
printf ("%d", depths[i]);
if (i < ndepths - 1) {
putchar (',');
@@ -526,7 +523,7 @@
printf (" number of visuals: %d\n", nvi);
printf (" default visual id: 0x%lx\n",
XVisualIDFromVisual (DefaultVisual (dpy, scr)));
- for (i = 0; i < nvi; i++) {
+ for (int i = 0; i < nvi; i++) {
print_visual_info (vip+i);
}
if (vip) XFree ((char *) vip);
@@ -576,18 +573,16 @@
int indent, /* amount by which to indent */
long mask) /* event mask */
{
- struct _event_table *etp;
int len;
int bitsfound = 0;
buf[0] = buf[lastcol] = '\0'; /* just in case */
-#define INDENT() { register int i; len = indent; \
- for (i = 0; i < indent; i++) buf[i] = ' '; }
+#define INDENT() do { len = indent; memset(buf, ' ', indent); } while (0)
INDENT ();
- for (etp = event_table; etp->name; etp++) {
+ for (struct _event_table *etp = event_table; etp->name; etp++) {
if (mask & etp->value) {
if (len + MASK_NAME_WIDTH > lastcol) {
puts (buf);
@@ -627,11 +622,7 @@
static int
print_multibuf_info(Display *dpy, const char *extname)
{
- int i, j; /* temp variable: iterator */
- int nmono, nstereo; /* count */
- XmbufBufferInfo *mono_info = NULL, *stereo_info = NULL; /* arrays */
#define MULTIBUF_FMT " visual id, max buffers, depth: 0x%lx, %d, %d\n"
- int scr = 0;
int majorrev, minorrev;
if (!XmbufGetVersion(dpy, &majorrev, &minorrev))
@@ -639,8 +630,12 @@
print_standard_extension_info(dpy, extname, majorrev, minorrev);
- for (i = 0; i < ScreenCount (dpy); i++)
+ for (int i = 0; i < ScreenCount (dpy); i++)
{
+ int nmono, nstereo; /* count */
+ XmbufBufferInfo *mono_info = NULL, *stereo_info = NULL; /* arrays */
+ const int scr = 0;
+
if (!XmbufGetScreenInfo (dpy, RootWindow(dpy, scr), &nmono, &mono_info,
&nstereo, &stereo_info)) {
fprintf (stderr,
@@ -648,12 +643,12 @@
ProgramName, scr);
} else {
printf (" screen %d number of mono multibuffer types: %d\n", i,
nmono);
- for (j = 0; j < nmono; j++) {
+ for (int j = 0; j < nmono; j++) {
printf (MULTIBUF_FMT, mono_info[j].visualid,
mono_info[j].max_buffers, mono_info[j].depth);
}
printf (" number of stereo multibuffer types: %d\n", nstereo);
- for (j = 0; j < nstereo; j++) {
+ for (int j = 0; j < nstereo; j++) {
printf (MULTIBUF_FMT, stereo_info[j].visualid,
stereo_info[j].max_buffers, stereo_info[j].depth);
}
@@ -681,7 +676,7 @@
{
int majorrev, minorrev;
XSyncSystemCounter *syscounters;
- int ncounters, i;
+ int ncounters;
if (!XSyncInitialize(dpy, &majorrev, &minorrev))
return 0;
@@ -689,7 +684,7 @@
syscounters = XSyncListSystemCounters(dpy, &ncounters);
printf(" system counters: %d\n", ncounters);
- for (i = 0; i < ncounters; i++)
+ for (int i = 0; i < ncounters; i++)
{
printf(" %s id: 0x%08x resolution_lo: %d resolution_hi: %d\n",
syscounters[i].name, (unsigned int)syscounters[i].counter,
@@ -768,7 +763,7 @@
unsigned int flags)
{
printf(" %6.2f %4d %4d %4d %4d %4d %4d %4d %4d ",
- (float)dotclock/1000.0,
+ dotclock/1000.0,
hdisplay, hsyncstart, hsyncend, htotal,
vdisplay, vsyncstart, vsyncend, vtotal);
if (flags & V_PHSYNC) printf(" +hsync");
@@ -786,10 +781,8 @@
static int
print_XF86VidMode_info(Display *dpy, const char *extname)
{
- int majorrev, minorrev, modecount, dotclock, i;
+ int majorrev, minorrev;
XF86VidModeMonitor monitor;
- XF86VidModeModeLine modeline;
- XF86VidModeModeInfo **modelines;
if (!XF86VidModeQueryVersion(dpy, &majorrev, &minorrev))
return 0;
@@ -802,11 +795,11 @@
monitor.model == NULL ? "" : monitor.model);
printf(" Num hsync: %d, Num vsync: %d\n",
monitor.nhsync, monitor.nvsync);
- for (i = 0; i < monitor.nhsync; i++) {
+ for (int i = 0; i < monitor.nhsync; i++) {
printf(" hsync range %d: %6.2f - %6.2f\n", i,
monitor.hsync[i].lo, monitor.hsync[i].hi);
}
- for (i = 0; i < monitor.nvsync; i++) {
+ for (int i = 0; i < monitor.nvsync; i++) {
printf(" vsync range %d: %6.2f - %6.2f\n", i,
monitor.vsync[i].lo, monitor.vsync[i].hi);
}
@@ -819,11 +812,15 @@
}
if ((majorrev > 0) || (majorrev == 0 && minorrev > 5)) {
+ int modecount, dotclock;
+ XF86VidModeModeLine modeline;
+ XF86VidModeModeInfo **modelines;
+
if (XF86VidModeGetAllModeLines(dpy, DefaultScreen(dpy), &modecount,
&modelines)) {
printf(" Available Video Mode Settings:\n");
printf(" Clock Hdsp Hbeg Hend Httl Vdsp Vbeg Vend Vttl
Flags\n");
- for (i = 0; i < modecount; i++) {
+ for (int i = 0; i < modecount; i++) {
print_XF86VidMode_modeline
(modelines[i]->dotclock, modelines[i]->hdisplay,
modelines[i]->hsyncstart, modelines[i]->hsyncend,
@@ -872,8 +869,6 @@
print_XF86Misc_info(Display *dpy, const char *extname)
{
int majorrev, minorrev;
- XF86MiscMouseSettings mouseinfo;
- XF86MiscKbdSettings kbdinfo;
if (!XF86MiscQueryVersion(dpy, &majorrev, &minorrev))
return 0;
@@ -882,6 +877,9 @@
old_handler = XSetErrorHandler(silent_errors);
if ((majorrev > 0) || (majorrev == 0 && minorrev > 0)) {
+ XF86MiscKbdSettings kbdinfo;
+ XF86MiscMouseSettings mouseinfo;
+
if (!XF86MiscGetKbdSettings(dpy, &kbdinfo))
return 0;
printf(" Keyboard Settings- Type: %s, Rate: %d, Delay: %d,
ServerNumLock: %s\n",
@@ -971,17 +969,16 @@
int majorrev, minorrev;
XdbeScreenVisualInfo *svi;
int numscreens = 0;
- int iscrn, ivis;
if (!XdbeQueryExtension(dpy, &majorrev, &minorrev))
return 0;
print_standard_extension_info(dpy, extname, majorrev, minorrev);
svi = XdbeGetVisualInfo(dpy, (Drawable *)NULL, &numscreens);
- for (iscrn = 0; iscrn < numscreens; iscrn++)
+ for (int iscrn = 0; iscrn < numscreens; iscrn++)
{
printf(" Double-buffered visuals on screen %d\n", iscrn);
- for (ivis = 0; ivis < svi[iscrn].count; ivis++)
+ for (int ivis = 0; ivis < svi[iscrn].count; ivis++)
{
printf(" visual id 0x%lx depth %d perflevel %d\n",
svi[iscrn].visinfo[ivis].visual,
@@ -1008,9 +1005,8 @@
static int
print_xinput_info(Display *dpy, const char *extname)
{
- int loop, num_extensions, num_devices;
+ int loop, num_extensions;
char **extensions;
- XDeviceInfo *devices;
XExtensionVersion *ext;
ext = XGetExtensionVersion(dpy, extname);
@@ -1027,6 +1023,9 @@
(strcmp(extensions[loop], extname) != 0); loop++);
XFreeExtensionList(extensions);
if (loop != num_extensions) {
+ int num_devices;
+ XDeviceInfo *devices;
+
printf(" Extended devices :\n");
devices = XListInputDevices(dpy, &num_devices);
for(loop=0; loop<num_devices; loop++) {
@@ -1070,18 +1069,7 @@
{
int loop, num_extensions;
char **extensions;
- XRenderPictFormat *pictform;
- int count;
int major, minor;
- int i, j;
- XVisualInfo viproto; /* fill in for getting info */
- XVisualInfo *vip; /* returned info */
- int nvi; /* number of elements returned */
- int ndepths = 0, *depths = NULL;
-#if RENDER_MAJOR > 0 || RENDER_MINOR >= 6
- XFilters *filters;
- int f;
-#endif
if (!XRenderQueryVersion (dpy, &major, &minor))
return 0;
@@ -1093,8 +1081,11 @@
(strcmp(extensions[loop], extname) != 0); loop++);
XFreeExtensionList(extensions);
if (loop != num_extensions) {
+ XRenderPictFormat *pictform;
+
printf (" Render formats :\n");
- for (count = 0; (pictform = XRenderFindFormat (dpy, 0, NULL, count));
count++)
+ for (int count = 0; (pictform = XRenderFindFormat (dpy, 0, NULL, count));
+ count++)
{
printf (" pict format:\n");
printf ("\tformat id: 0x%lx\n", pictform->id);
@@ -1111,7 +1102,15 @@
printf("\tcolormap 0x%lx\n", pictform->colormap);
}
printf (" Screen formats :\n");
- for (i = 0; i < ScreenCount (dpy); i++) {
+ for (int i = 0; i < ScreenCount (dpy); i++) {
+ int nvi; /* number of elements returned */
+ XVisualInfo viproto; /* fill in for getting info */
+ XVisualInfo *vip; /* returned info */
+ int ndepths = 0, *depths = NULL;
+#if RENDER_MAJOR > 0 || RENDER_MINOR >= 6
+ XFilters *filters;
+#endif
+
nvi = 0;
viproto.screen = i;
vip = XGetVisualInfo (dpy, VisualScreenMask, &viproto, &nvi);
@@ -1130,7 +1129,7 @@
if (filters)
{
printf (" filters: ");
- for (f = 0; f < filters->nfilter; f++)
+ for (int f = 0; f < filters->nfilter; f++)
{
printf ("%s", filters->filter[f]);
if (f < filters->nalias && filters->alias[f] != FilterAliasNone)
@@ -1142,7 +1141,7 @@
}
#endif
printf ("\n");
- for (j = 0; j < nvi; j++)
+ for (int j = 0; j < nvi; j++)
{
printf (" visual format:\n");
printf (" visual id: 0x%lx\n", vip[j].visualid);
@@ -1155,15 +1154,18 @@
if (vip) XFree ((char *) vip);
depths = XListDepths (dpy, i, &ndepths);
if (!depths) ndepths = 0;
- for (j = 0; j < ndepths; j++)
+ for (int j = 0; j < ndepths; j++)
{
XRenderPictFormat templ;
templ.depth = depths[j];
printf (" depth formats:\n");
printf (" depth %d\n", depths[j]);
- for (count = 0; (pictform = XRenderFindFormat (dpy, PictFormatDepth,
&templ, count)); count++)
+ for (int count = 0;
+ (pictform = XRenderFindFormat (dpy, PictFormatDepth, &templ,
count));
+ count++) {
printf(" pict format id: 0x%lx\n", pictform->id);
+ }
}
if (depths) XFree (depths);
}
@@ -1204,10 +1206,10 @@
if (!XineramaIsActive(dpy)) {
printf(" Xinerama is inactive.\n");
} else {
- int i, count = 0;
+ int count = 0;
XineramaScreenInfo *xineramaScreens = XineramaQueryScreens(dpy, &count);
- for (i = 0; i < count; i++) {
+ for (int i = 0; i < count; i++) {
XineramaScreenInfo *xs = &xineramaScreens[i];
printf(" head #%d: %dx%d @ %d,%d\n", xs->screen_number,
xs->width, xs->height, xs->x_org, xs->y_org);
@@ -1233,10 +1235,7 @@
{
int event_base, error_base;
int major_version, minor_version, patch_version;
- DMXScreenAttributes sinfo;
- DMXInputAttributes iinfo;
int count;
- int i;
if (!DMXQueryExtension(dpy, &event_base, &error_base)
|| !DMXQueryVersion(dpy, &major_version, &minor_version,
@@ -1246,7 +1245,9 @@
if (!DMXGetScreenCount(dpy, &count)) return 1;
printf(" Screen count: %d\n", count);
- for (i = 0; i < count; i++) {
+ for (int i = 0; i < count; i++) {
+ DMXScreenAttributes sinfo;
+
if (DMXGetScreenAttributes(dpy, i, &sinfo)) {
printf(" %2d %s %ux%u+%d+%d %d @%dx%d\n",
i, sinfo.displayName,
@@ -1263,7 +1264,8 @@
return 1;
printf(" Input count = %d\n", count);
- for (i = 0; i < count; i++) {
+ for (int i = 0; i < count; i++) {
+ DMXInputAttributes iinfo;
#ifdef XINPUT
Display *backend;
char *backendname = NULL;
@@ -1286,11 +1288,11 @@
if (ext
&& ext != (XExtensionVersion *)NoSuchExtension) {
- int dcount, d;
+ int dcount;
XDeviceInfo *devInfo = XListInputDevices(backend,
&dcount);
if (devInfo) {
- for (d = 0; d < dcount; d++) {
+ for (int d = 0; d < dcount; d++) {
if ((unsigned)iinfo.physicalId
== devInfo[d].id
&& devInfo[d].name) {
@@ -1403,16 +1405,14 @@
static void
mark_extension_for_printing(const char *extname)
{
- int i;
-
if (strcmp(extname, "all") == 0)
{
- for (i = 0; i < num_known_extensions; i++)
+ for (int i = 0; i < num_known_extensions; i++)
known_extensions[i].printit = True;
}
else
{
- for (i = 0; i < num_known_extensions; i++)
+ for (int i = 0; i < num_known_extensions; i++)
{
if (strcmp(extname, known_extensions[i].extname) == 0)
{
@@ -1427,8 +1427,7 @@
static void
print_marked_extensions(Display *dpy)
{
- int i;
- for (i = 0; i < num_known_extensions; i++)
+ for (int i = 0; i < num_known_extensions; i++)
{
if (known_extensions[i].printit)
{
@@ -1462,11 +1461,10 @@
{
Display *dpy; /* X connection */
char *displayname = NULL; /* server to contact */
- int i; /* temp variable: iterator */
ProgramName = argv[0];
- for (i = 1; i < argc; i++) {
+ for (int i = 1; i < argc; i++) {
char *arg = argv[i];
size_t len = strlen(arg);
@@ -1504,7 +1502,7 @@
}
print_display_info (dpy);
- for (i = 0; i < ScreenCount (dpy); i++) {
+ for (int i = 0; i < ScreenCount (dpy); i++) {
print_screen_info (dpy, i);
}
