Update to xdriinfo 1.0.7 · jcs.org/openbsd-xenocara@5cfcbd2

+75

app/xdriinfo/ChangeLog

··· 1 + commit 149e46f06a661bd51f3a247dd41a49b553fdca65 2 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 + Date: Mon Dec 19 18:33:43 2022 -0800 4 + 5 + xdriiinfo 1.0.7 6 + 7 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 8 + 9 + commit c311687d90564f670e1ec943371c5cab4711f3e3 10 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 11 + Date: Thu Dec 8 14:47:33 2022 -0800 12 + 13 + Ensure screenNum is always initialized 14 + 15 + Clears this warning from clang, even though it seems like a 16 + false positive, as all the uses are behind the same conditions: 17 + 18 + xdriinfo.c:117:27: warning: variable 'screenNum' may be uninitialized 19 + when used here [-Wconditional-uninitialized] 20 + if (func == DRIVER && screenNum == -1) { 21 + ^~~~~~~~~ 22 + xdriinfo.c:61:28: note: initialize the variable 'screenNum' to silence 23 + this warning 24 + int nScreens, screenNum; 25 + 26 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 27 + 28 + commit a318124b38bbfac36f6bfe537839b0d3a9065b94 29 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 30 + Date: Thu Dec 8 14:45:02 2022 -0800 31 + 32 + Variable scope reduction 33 + 34 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 35 + 36 + commit 710f7c9e9fad765bfe4c31071a82460c473abee7 37 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 38 + Date: Thu Jul 28 17:30:21 2022 -0700 39 + 40 + gitlab CI: stop requiring Signed-off-by in commits 41 + 42 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 43 + 44 + commit 8567c4d6f5c7663cde7b7c0f0c6d7f5ded175e18 45 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 46 + Date: Sat Dec 4 12:01:08 2021 -0800 47 + 48 + Build xz tarballs instead of bzip2 49 + 50 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 51 + 52 + commit 4b1b5e4e826d739f203ab899af965f0557b10e0f 53 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 54 + Date: Sat Dec 4 12:01:05 2021 -0800 55 + 56 + gitlab CI: add a basic build test 57 + 58 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 59 + 60 + commit 8346a277d26d8b476709aa740cb1aaaa2824bb76 61 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 62 + Date: Wed Nov 21 17:02:07 2018 -0800 63 + 64 + Update configure.ac bug URL for gitlab migration 65 + 66 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 67 + 68 + commit 8f0c54ec113bb7502fa75d2057224f9c98d9cdf1 69 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 70 + Date: Fri Nov 16 21:36:46 2018 -0800 71 + 72 + Update README for gitlab migration 73 + 74 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 75 + 1 76 commit 3727e9dd2b964bed15083e79e55051132522a148 2 77 Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 78 Date: Tue Mar 6 23:22:03 2018 -0800

+1 -1

app/xdriinfo/Makefile.am

··· 40 40 41 41 dist-hook: ChangeLog INSTALL 42 42 43 - 43 + EXTRA_DIST = README.md

+6 -4

app/xdriinfo/Makefile.in

··· 72 72 host_triplet = @host@ 73 73 bin_PROGRAMS = xdriinfo$(EXEEXT) 74 74 subdir = . 75 - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ 75 + DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ 76 76 $(srcdir)/Makefile.in $(srcdir)/config.h.in \ 77 77 $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \ 78 78 compile config.guess config.sub depcomp install-sh missing ··· 178 178 dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ 179 179 done; \ 180 180 reldir="$$dir2" 181 - DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 181 + DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz 182 182 GZIP_ENV = --best 183 - DIST_TARGETS = dist-bzip2 dist-gzip 183 + DIST_TARGETS = dist-xz dist-gzip 184 184 distuninstallcheck_listfiles = find . -type f -print 185 185 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ 186 186 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' ··· 298 298 prefix = @prefix@ 299 299 program_transform_name = @program_transform_name@ 300 300 psdir = @psdir@ 301 + runstatedir = @runstatedir@ 301 302 sbindir = @sbindir@ 302 303 sharedstatedir = @sharedstatedir@ 303 304 srcdir = @srcdir@ ··· 314 315 xdriinfo.c 315 316 316 317 MAINTAINERCLEANFILES = ChangeLog INSTALL 318 + EXTRA_DIST = README.md 317 319 all: config.h 318 320 $(MAKE) $(AM_MAKEFLAGS) all-recursive 319 321 ··· 640 642 dist-gzip: distdir 641 643 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz 642 644 $(am__post_remove_distdir) 645 + 643 646 dist-bzip2: distdir 644 647 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 645 648 $(am__post_remove_distdir) ··· 647 650 dist-lzip: distdir 648 651 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz 649 652 $(am__post_remove_distdir) 650 - 651 653 dist-xz: distdir 652 654 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz 653 655 $(am__post_remove_distdir)

-29

app/xdriinfo/README

··· 1 - xdriinfo - query configuration information of X11 DRI drivers 2 - 3 - More information about the Direct Rendering Infrastructure project 4 - can be found at: 5 - http://dri.freedesktop.org/ 6 - 7 - All questions regarding this software should be directed at the 8 - Xorg mailing list: 9 - 10 - http://lists.freedesktop.org/mailman/listinfo/xorg 11 - 12 - Please submit bug reports to the Xorg bugzilla: 13 - 14 - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg 15 - 16 - The master development code repository can be found at: 17 - 18 - git://anongit.freedesktop.org/git/xorg/app/xdriinfo 19 - 20 - http://cgit.freedesktop.org/xorg/app/xdriinfo 21 - 22 - For patch submission instructions, see: 23 - 24 - http://www.x.org/wiki/Development/Documentation/SubmittingPatches 25 - 26 - For more information on the git code manager, see: 27 - 28 - http://wiki.x.org/wiki/GitPage 29 -

+22

app/xdriinfo/README.md

··· 1 + xdriinfo - query configuration information of X11 DRI drivers 2 + ------------------------------------------------------------- 3 + 4 + More information about the Direct Rendering Infrastructure project 5 + can be found at: 6 + https://dri.freedesktop.org/ 7 + 8 + All questions regarding this software should be directed at the 9 + Xorg mailing list: 10 + 11 + https://lists.x.org/mailman/listinfo/xorg 12 + 13 + The master development code repository can be found at: 14 + 15 + https://gitlab.freedesktop.org/xorg/app/xdriinfo 16 + 17 + Please submit bug reports and requests to merge patches there. 18 + 19 + For patch submission instructions, see: 20 + 21 + https://www.x.org/wiki/Development/Documentation/SubmittingPatches 22 +

+193 -97

app/xdriinfo/aclocal.m4

··· 19 19 If you have problems, you may need to regenerate the build system entirely. 20 20 To do so, use the procedure documented by the package, typically 'autoreconf'.])]) 21 21 22 - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 23 - # serial 1 (pkg-config-0.24) 24 - # 25 - # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 26 - # 27 - # This program is free software; you can redistribute it and/or modify 28 - # it under the terms of the GNU General Public License as published by 29 - # the Free Software Foundation; either version 2 of the License, or 30 - # (at your option) any later version. 31 - # 32 - # This program is distributed in the hope that it will be useful, but 33 - # WITHOUT ANY WARRANTY; without even the implied warranty of 34 - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 35 - # General Public License for more details. 36 - # 37 - # You should have received a copy of the GNU General Public License 38 - # along with this program; if not, write to the Free Software 39 - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 40 - # 41 - # As a special exception to the GNU General Public License, if you 42 - # distribute this file as part of a program that contains a 43 - # configuration script generated by Autoconf, you may include it under 44 - # the same distribution terms that you use for the rest of that program. 22 + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 23 + # serial 12 (pkg-config-0.29.2) 24 + 25 + dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 26 + dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> 27 + dnl 28 + dnl This program is free software; you can redistribute it and/or modify 29 + dnl it under the terms of the GNU General Public License as published by 30 + dnl the Free Software Foundation; either version 2 of the License, or 31 + dnl (at your option) any later version. 32 + dnl 33 + dnl This program is distributed in the hope that it will be useful, but 34 + dnl WITHOUT ANY WARRANTY; without even the implied warranty of 35 + dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 36 + dnl General Public License for more details. 37 + dnl 38 + dnl You should have received a copy of the GNU General Public License 39 + dnl along with this program; if not, write to the Free Software 40 + dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 41 + dnl 02111-1307, USA. 42 + dnl 43 + dnl As a special exception to the GNU General Public License, if you 44 + dnl distribute this file as part of a program that contains a 45 + dnl configuration script generated by Autoconf, you may include it under 46 + dnl the same distribution terms that you use for the rest of that 47 + dnl program. 48 + 49 + dnl PKG_PREREQ(MIN-VERSION) 50 + dnl ----------------------- 51 + dnl Since: 0.29 52 + dnl 53 + dnl Verify that the version of the pkg-config macros are at least 54 + dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's 55 + dnl installed version of pkg-config, this checks the developer's version 56 + dnl of pkg.m4 when generating configure. 57 + dnl 58 + dnl To ensure that this macro is defined, also add: 59 + dnl m4_ifndef([PKG_PREREQ], 60 + dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) 61 + dnl 62 + dnl See the "Since" comment for each macro you use to see what version 63 + dnl of the macros you require. 64 + m4_defun([PKG_PREREQ], 65 + [m4_define([PKG_MACROS_VERSION], [0.29.2]) 66 + m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, 67 + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) 68 + ])dnl PKG_PREREQ 45 69 46 - # PKG_PROG_PKG_CONFIG([MIN-VERSION]) 47 - # ---------------------------------- 70 + dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) 71 + dnl ---------------------------------- 72 + dnl Since: 0.16 73 + dnl 74 + dnl Search for the pkg-config tool and set the PKG_CONFIG variable to 75 + dnl first found in the path. Checks that the version of pkg-config found 76 + dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is 77 + dnl used since that's the first version where most current features of 78 + dnl pkg-config existed. 48 79 AC_DEFUN([PKG_PROG_PKG_CONFIG], 49 80 [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) 50 81 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) ··· 66 97 PKG_CONFIG="" 67 98 fi 68 99 fi[]dnl 69 - ])# PKG_PROG_PKG_CONFIG 100 + ])dnl PKG_PROG_PKG_CONFIG 70 101 71 - # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 72 - # 73 - # Check to see whether a particular set of modules exists. Similar 74 - # to PKG_CHECK_MODULES(), but does not set variables or print errors. 75 - # 76 - # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 77 - # only at the first occurence in configure.ac, so if the first place 78 - # it's called might be skipped (such as if it is within an "if", you 79 - # have to call PKG_CHECK_EXISTS manually 80 - # -------------------------------------------------------------- 102 + dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 103 + dnl ------------------------------------------------------------------- 104 + dnl Since: 0.18 105 + dnl 106 + dnl Check to see whether a particular set of modules exists. Similar to 107 + dnl PKG_CHECK_MODULES(), but does not set variables or print errors. 108 + dnl 109 + dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 110 + dnl only at the first occurence in configure.ac, so if the first place 111 + dnl it's called might be skipped (such as if it is within an "if", you 112 + dnl have to call PKG_CHECK_EXISTS manually 81 113 AC_DEFUN([PKG_CHECK_EXISTS], 82 114 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 83 115 if test -n "$PKG_CONFIG" && \ ··· 87 119 $3])dnl 88 120 fi]) 89 121 90 - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 91 - # --------------------------------------------- 122 + dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 123 + dnl --------------------------------------------- 124 + dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting 125 + dnl pkg_failed based on the result. 92 126 m4_define([_PKG_CONFIG], 93 127 [if test -n "$$1"; then 94 128 pkg_cv_[]$1="$$1" ··· 100 134 else 101 135 pkg_failed=untried 102 136 fi[]dnl 103 - ])# _PKG_CONFIG 137 + ])dnl _PKG_CONFIG 104 138 105 - # _PKG_SHORT_ERRORS_SUPPORTED 106 - # ----------------------------- 139 + dnl _PKG_SHORT_ERRORS_SUPPORTED 140 + dnl --------------------------- 141 + dnl Internal check to see if pkg-config supports short errors. 107 142 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], 108 143 [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 109 144 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 111 146 else 112 147 _pkg_short_errors_supported=no 113 148 fi[]dnl 114 - ])# _PKG_SHORT_ERRORS_SUPPORTED 149 + ])dnl _PKG_SHORT_ERRORS_SUPPORTED 115 150 116 151 117 - # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 118 - # [ACTION-IF-NOT-FOUND]) 119 - # 120 - # 121 - # Note that if there is a possibility the first call to 122 - # PKG_CHECK_MODULES might not happen, you should be sure to include an 123 - # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac 124 - # 125 - # 126 - # -------------------------------------------------------------- 152 + dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 153 + dnl [ACTION-IF-NOT-FOUND]) 154 + dnl -------------------------------------------------------------- 155 + dnl Since: 0.4.0 156 + dnl 157 + dnl Note that if there is a possibility the first call to 158 + dnl PKG_CHECK_MODULES might not happen, you should be sure to include an 159 + dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac 127 160 AC_DEFUN([PKG_CHECK_MODULES], 128 161 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 129 162 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl 130 163 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl 131 164 132 165 pkg_failed=no 133 - AC_MSG_CHECKING([for $1]) 166 + AC_MSG_CHECKING([for $2]) 134 167 135 168 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) 136 169 _PKG_CONFIG([$1][_LIBS], [libs], [$2]) ··· 140 173 See the pkg-config man page for more details.]) 141 174 142 175 if test $pkg_failed = yes; then 143 - AC_MSG_RESULT([no]) 176 + AC_MSG_RESULT([no]) 144 177 _PKG_SHORT_ERRORS_SUPPORTED 145 178 if test $_pkg_short_errors_supported = yes; then 146 179 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` 147 - else 180 + else 148 181 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` 149 182 fi 150 183 # Put the nasty error message in config.log where it belongs ··· 161 194 _PKG_TEXT])[]dnl 162 195 ]) 163 196 elif test $pkg_failed = untried; then 164 - AC_MSG_RESULT([no]) 197 + AC_MSG_RESULT([no]) 165 198 m4_default([$4], [AC_MSG_FAILURE( 166 199 [The pkg-config script could not be found or is too old. Make sure it 167 200 is in your PATH or set the PKG_CONFIG environment variable to the full ··· 177 210 AC_MSG_RESULT([yes]) 178 211 $3 179 212 fi[]dnl 180 - ])# PKG_CHECK_MODULES 213 + ])dnl PKG_CHECK_MODULES 214 + 215 + 216 + dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 217 + dnl [ACTION-IF-NOT-FOUND]) 218 + dnl --------------------------------------------------------------------- 219 + dnl Since: 0.29 220 + dnl 221 + dnl Checks for existence of MODULES and gathers its build flags with 222 + dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags 223 + dnl and VARIABLE-PREFIX_LIBS from --libs. 224 + dnl 225 + dnl Note that if there is a possibility the first call to 226 + dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to 227 + dnl include an explicit call to PKG_PROG_PKG_CONFIG in your 228 + dnl configure.ac. 229 + AC_DEFUN([PKG_CHECK_MODULES_STATIC], 230 + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 231 + _save_PKG_CONFIG=$PKG_CONFIG 232 + PKG_CONFIG="$PKG_CONFIG --static" 233 + PKG_CHECK_MODULES($@) 234 + PKG_CONFIG=$_save_PKG_CONFIG[]dnl 235 + ])dnl PKG_CHECK_MODULES_STATIC 181 236 182 237 183 - # PKG_INSTALLDIR(DIRECTORY) 184 - # ------------------------- 185 - # Substitutes the variable pkgconfigdir as the location where a module 186 - # should install pkg-config .pc files. By default the directory is 187 - # $libdir/pkgconfig, but the default can be changed by passing 188 - # DIRECTORY. The user can override through the --with-pkgconfigdir 189 - # parameter. 238 + dnl PKG_INSTALLDIR([DIRECTORY]) 239 + dnl ------------------------- 240 + dnl Since: 0.27 241 + dnl 242 + dnl Substitutes the variable pkgconfigdir as the location where a module 243 + dnl should install pkg-config .pc files. By default the directory is 244 + dnl $libdir/pkgconfig, but the default can be changed by passing 245 + dnl DIRECTORY. The user can override through the --with-pkgconfigdir 246 + dnl parameter. 190 247 AC_DEFUN([PKG_INSTALLDIR], 191 248 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) 192 249 m4_pushdef([pkg_description], ··· 197 254 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) 198 255 m4_popdef([pkg_default]) 199 256 m4_popdef([pkg_description]) 200 - ]) dnl PKG_INSTALLDIR 257 + ])dnl PKG_INSTALLDIR 201 258 202 259 203 - # PKG_NOARCH_INSTALLDIR(DIRECTORY) 204 - # ------------------------- 205 - # Substitutes the variable noarch_pkgconfigdir as the location where a 206 - # module should install arch-independent pkg-config .pc files. By 207 - # default the directory is $datadir/pkgconfig, but the default can be 208 - # changed by passing DIRECTORY. The user can override through the 209 - # --with-noarch-pkgconfigdir parameter. 260 + dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) 261 + dnl -------------------------------- 262 + dnl Since: 0.27 263 + dnl 264 + dnl Substitutes the variable noarch_pkgconfigdir as the location where a 265 + dnl module should install arch-independent pkg-config .pc files. By 266 + dnl default the directory is $datadir/pkgconfig, but the default can be 267 + dnl changed by passing DIRECTORY. The user can override through the 268 + dnl --with-noarch-pkgconfigdir parameter. 210 269 AC_DEFUN([PKG_NOARCH_INSTALLDIR], 211 270 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) 212 271 m4_pushdef([pkg_description], ··· 217 276 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) 218 277 m4_popdef([pkg_default]) 219 278 m4_popdef([pkg_description]) 220 - ]) dnl PKG_NOARCH_INSTALLDIR 279 + ])dnl PKG_NOARCH_INSTALLDIR 280 + 281 + 282 + dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, 283 + dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 284 + dnl ------------------------------------------- 285 + dnl Since: 0.28 286 + dnl 287 + dnl Retrieves the value of the pkg-config variable for the given module. 288 + AC_DEFUN([PKG_CHECK_VAR], 289 + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 290 + AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl 291 + 292 + _PKG_CONFIG([$1], [variable="][$3]["], [$2]) 293 + AS_VAR_COPY([$1], [pkg_cv_][$1]) 294 + 295 + AS_VAR_IF([$1], [""], [$5], [$4])dnl 296 + ])dnl PKG_CHECK_VAR 221 297 222 298 # Copyright (C) 2002-2012 Free Software Foundation, Inc. 223 299 # ··· 1242 1318 1243 1319 dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. 1244 1320 dnl 1245 - dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 1321 + dnl Copyright (c) 2005, 2023, Oracle and/or its affiliates. 1246 1322 dnl 1247 1323 dnl Permission is hereby granted, free of charge, to any person obtaining a 1248 1324 dnl copy of this software and associated documentation files (the "Software"), ··· 1279 1355 # See the "minimum version" comment for each macro you use to see what 1280 1356 # version you require. 1281 1357 m4_defun([XORG_MACROS_VERSION],[ 1282 - m4_define([vers_have], [1.19.2]) 1358 + m4_define([vers_have], [1.20.0]) 1283 1359 m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) 1284 1360 m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) 1285 1361 m4_if(m4_cmp(maj_have, maj_needed), 0,, ··· 1300 1376 # such as man pages and config files 1301 1377 AC_DEFUN([XORG_PROG_RAWCPP],[ 1302 1378 AC_REQUIRE([AC_PROG_CPP]) 1303 - AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], 1379 + AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}], 1304 1380 [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) 1305 1381 1306 1382 # Check for flag to avoid builtin definitions - assumes unix is predefined, ··· 1610 1686 # Documentation tools are not always available on all platforms and sometimes 1611 1687 # not at the appropriate level. This macro enables a module to test for the 1612 1688 # presence of the tool and obtain it's path in separate variables. Coupled with 1613 - # the --with-xmlto option, it allows maximum flexibilty in making decisions 1689 + # the --with-xmlto option, it allows maximum flexibility in making decisions 1614 1690 # as whether or not to use the xmlto package. When DEFAULT is not specified, 1615 1691 # --with-xmlto assumes 'auto'. 1616 1692 # ··· 1824 1900 # Documentation tools are not always available on all platforms and sometimes 1825 1901 # not at the appropriate level. This macro enables a module to test for the 1826 1902 # presence of the tool and obtain it's path in separate variables. Coupled with 1827 - # the --with-asciidoc option, it allows maximum flexibilty in making decisions 1903 + # the --with-asciidoc option, it allows maximum flexibility in making decisions 1828 1904 # as whether or not to use the asciidoc package. When DEFAULT is not specified, 1829 1905 # --with-asciidoc assumes 'auto'. 1830 1906 # ··· 1894 1970 # Documentation tools are not always available on all platforms and sometimes 1895 1971 # not at the appropriate level. This macro enables a module to test for the 1896 1972 # presence of the tool and obtain it's path in separate variables. Coupled with 1897 - # the --with-doxygen option, it allows maximum flexibilty in making decisions 1973 + # the --with-doxygen option, it allows maximum flexibility in making decisions 1898 1974 # as whether or not to use the doxygen package. When DEFAULT is not specified, 1899 1975 # --with-doxygen assumes 'auto'. 1900 1976 # ··· 1978 2054 # Documentation tools are not always available on all platforms and sometimes 1979 2055 # not at the appropriate level. This macro enables a module to test for the 1980 2056 # presence of the tool and obtain it's path in separate variables. Coupled with 1981 - # the --with-groff option, it allows maximum flexibilty in making decisions 2057 + # the --with-groff option, it allows maximum flexibility in making decisions 1982 2058 # as whether or not to use the groff package. When DEFAULT is not specified, 1983 2059 # --with-groff assumes 'auto'. 1984 2060 # ··· 2086 2162 # Documentation tools are not always available on all platforms and sometimes 2087 2163 # not at the appropriate level. This macro enables a module to test for the 2088 2164 # presence of the tool and obtain it's path in separate variables. Coupled with 2089 - # the --with-fop option, it allows maximum flexibilty in making decisions 2165 + # the --with-fop option, it allows maximum flexibility in making decisions 2090 2166 # as whether or not to use the fop package. When DEFAULT is not specified, 2091 2167 # --with-fop assumes 'auto'. 2092 2168 # ··· 2180 2256 # Documentation tools are not always available on all platforms and sometimes 2181 2257 # not at the appropriate level. This macro enables a module to test for the 2182 2258 # presence of the tool and obtain it's path in separate variables. Coupled with 2183 - # the --with-ps2pdf option, it allows maximum flexibilty in making decisions 2259 + # the --with-ps2pdf option, it allows maximum flexibility in making decisions 2184 2260 # as whether or not to use the ps2pdf package. When DEFAULT is not specified, 2185 2261 # --with-ps2pdf assumes 'auto'. 2186 2262 # ··· 2235 2311 # not at the appropriate level. This macro enables a builder to skip all 2236 2312 # documentation targets except traditional man pages. 2237 2313 # Combined with the specific tool checking macros XORG_WITH_*, it provides 2238 - # maximum flexibilty in controlling documentation building. 2314 + # maximum flexibility in controlling documentation building. 2239 2315 # Refer to: 2240 2316 # XORG_WITH_XMLTO --with-xmlto 2241 2317 # XORG_WITH_ASCIIDOC --with-asciidoc ··· 2268 2344 # 2269 2345 # This macro enables a builder to skip all developer documentation. 2270 2346 # Combined with the specific tool checking macros XORG_WITH_*, it provides 2271 - # maximum flexibilty in controlling documentation building. 2347 + # maximum flexibility in controlling documentation building. 2272 2348 # Refer to: 2273 2349 # XORG_WITH_XMLTO --with-xmlto 2274 2350 # XORG_WITH_ASCIIDOC --with-asciidoc ··· 2301 2377 # 2302 2378 # This macro enables a builder to skip all functional specification targets. 2303 2379 # Combined with the specific tool checking macros XORG_WITH_*, it provides 2304 - # maximum flexibilty in controlling documentation building. 2380 + # maximum flexibility in controlling documentation building. 2305 2381 # Refer to: 2306 2382 # XORG_WITH_XMLTO --with-xmlto 2307 2383 # XORG_WITH_ASCIIDOC --with-asciidoc ··· 2776 2852 AC_DEFUN([XORG_COMPILER_BRAND], [ 2777 2853 AC_LANG_CASE( 2778 2854 [C], [ 2779 - AC_REQUIRE([AC_PROG_CC_C99]) 2855 + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC 2856 + dnl and complains that AC_PROG_CC_C99 is obsolete 2857 + m4_version_prereq([2.70], 2858 + [AC_REQUIRE([AC_PROG_CC])], 2859 + [AC_REQUIRE([AC_PROG_CC_C99])]) 2780 2860 ], 2781 2861 [C++], [ 2782 2862 AC_REQUIRE([AC_PROG_CXX]) ··· 2792 2872 # Minimum version: 1.16.0 2793 2873 # 2794 2874 # Test if the compiler works when passed the given flag as a command line argument. 2795 - # If it succeeds, the flag is appeneded to the given variable. If not, it tries the 2875 + # If it succeeds, the flag is appended to the given variable. If not, it tries the 2796 2876 # next flag in the list until there are no more options. 2797 2877 # 2798 2878 # Note that this does not guarantee that the compiler supports the flag as some ··· 2808 2888 2809 2889 AC_LANG_CASE( 2810 2890 [C], [ 2811 - AC_REQUIRE([AC_PROG_CC_C99]) 2891 + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC 2892 + dnl and complains that AC_PROG_CC_C99 is obsolete 2893 + m4_version_prereq([2.70], 2894 + [AC_REQUIRE([AC_PROG_CC])], 2895 + [AC_REQUIRE([AC_PROG_CC_C99])]) 2812 2896 define([PREFIX], [C]) 2813 2897 define([CACHE_PREFIX], [cc]) 2814 2898 define([COMPILER], [$CC]) ··· 2939 3023 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow]) 2940 3024 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn]) 2941 3025 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute]) 2942 - # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) 3026 + XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) 2943 3027 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) 2944 3028 2945 3029 # These are currently disabled because they are noisy. They will be enabled ··· 2949 3033 # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) 2950 3034 # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) 2951 3035 2952 - # Turn some warnings into errors, so we don't accidently get successful builds 3036 + # Turn some warnings into errors, so we don't accidentally get successful builds 2953 3037 # when there are problems that should be fixed. 2954 3038 2955 3039 if test "x$SELECTIVE_WERROR" = "xyes" ; then ··· 3058 3142 AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS])) 3059 3143 ]) # XORG_STRICT_OPTION 3060 3144 3145 + # XORG_DEFAULT_NOCODE_OPTIONS 3146 + # --------------------------- 3147 + # Minimum version: 1.20.0 3148 + # 3149 + # Defines default options for X.Org modules which don't compile code, 3150 + # such as fonts, bitmaps, cursors, and docs. 3151 + # 3152 + AC_DEFUN([XORG_DEFAULT_NOCODE_OPTIONS], [ 3153 + AC_REQUIRE([AC_PROG_INSTALL]) 3154 + XORG_RELEASE_VERSION 3155 + XORG_CHANGELOG 3156 + XORG_INSTALL 3157 + XORG_MANPAGE_SECTIONS 3158 + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], 3159 + [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) 3160 + ]) # XORG_DEFAULT_NOCODE_OPTIONS 3161 + 3061 3162 # XORG_DEFAULT_OPTIONS 3062 3163 # -------------------- 3063 3164 # Minimum version: 1.3.0 3064 3165 # 3065 - # Defines default options for X.Org modules. 3166 + # Defines default options for X.Org modules which compile code. 3066 3167 # 3067 3168 AC_DEFUN([XORG_DEFAULT_OPTIONS], [ 3068 3169 AC_REQUIRE([AC_PROG_INSTALL]) 3069 3170 XORG_COMPILER_FLAGS 3070 3171 XORG_CWARNFLAGS 3071 3172 XORG_STRICT_OPTION 3072 - XORG_RELEASE_VERSION 3073 - XORG_CHANGELOG 3074 - XORG_INSTALL 3075 - XORG_MANPAGE_SECTIONS 3076 - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], 3077 - [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) 3173 + XORG_DEFAULT_NOCODE_OPTIONS 3078 3174 ]) # XORG_DEFAULT_OPTIONS 3079 3175 3080 3176 # XORG_INSTALL()

+9 -8

app/xdriinfo/compile

··· 1 1 #! /bin/sh 2 2 # Wrapper for compilers which do not understand '-c -o'. 3 3 4 - scriptversion=2012-10-14.11; # UTC 4 + scriptversion=2018-03-07.03; # UTC 5 5 6 - # Copyright (C) 1999-2014 Free Software Foundation, Inc. 6 + # Copyright (C) 1999-2021 Free Software Foundation, Inc. 7 7 # Written by Tom Tromey <tromey@cygnus.com>. 8 8 # 9 9 # This program is free software; you can redistribute it and/or modify ··· 17 17 # GNU General Public License for more details. 18 18 # 19 19 # You should have received a copy of the GNU General Public License 20 - # along with this program. If not, see <http://www.gnu.org/licenses/>. 20 + # along with this program. If not, see <https://www.gnu.org/licenses/>. 21 21 22 22 # As a special exception to the GNU General Public License, if you 23 23 # distribute this file as part of a program that contains a ··· 53 53 MINGW*) 54 54 file_conv=mingw 55 55 ;; 56 - CYGWIN*) 56 + CYGWIN* | MSYS*) 57 57 file_conv=cygwin 58 58 ;; 59 59 *) ··· 67 67 mingw/*) 68 68 file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` 69 69 ;; 70 - cygwin/*) 70 + cygwin/* | msys/*) 71 71 file=`cygpath -m "$file" || echo "$file"` 72 72 ;; 73 73 wine/*) ··· 255 255 echo "compile $scriptversion" 256 256 exit $? 257 257 ;; 258 - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) 258 + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ 259 + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) 259 260 func_cl_wrapper "$@" # Doesn't return... 260 261 ;; 261 262 esac ··· 339 340 # Local Variables: 340 341 # mode: shell-script 341 342 # sh-indentation: 2 342 - # eval: (add-hook 'write-file-hooks 'time-stamp) 343 + # eval: (add-hook 'before-save-hook 'time-stamp) 343 344 # time-stamp-start: "scriptversion=" 344 345 # time-stamp-format: "%:y-%02m-%02d.%02H" 345 - # time-stamp-time-zone: "UTC" 346 + # time-stamp-time-zone: "UTC0" 346 347 # time-stamp-end: "; # UTC" 347 348 # End:

+154 -22

app/xdriinfo/configure

··· 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 - # Generated by GNU Autoconf 2.69 for xdriinfo 1.0.6. 3 + # Generated by GNU Autoconf 2.69 for xdriinfo 1.0.7. 4 4 # 5 - # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. 5 + # Report bugs to <https://gitlab.freedesktop.org/xorg/app/xdriinfo/-/issues>. 6 6 # 7 7 # 8 8 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. ··· 267 267 $as_echo "$0: be upgraded to zsh 4.3.4 or later." 268 268 else 269 269 $as_echo "$0: Please tell bug-autoconf@gnu.org and 270 - $0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg 270 + $0: https://gitlab.freedesktop.org/xorg/app/xdriinfo/-/issues 271 271 $0: about your system, including any error possibly output 272 272 $0: before this message. Then install a modern shell, or 273 273 $0: manually run the script under such a shell if you do ··· 581 581 # Identity of this package. 582 582 PACKAGE_NAME='xdriinfo' 583 583 PACKAGE_TARNAME='xdriinfo' 584 - PACKAGE_VERSION='1.0.6' 585 - PACKAGE_STRING='xdriinfo 1.0.6' 586 - PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' 584 + PACKAGE_VERSION='1.0.7' 585 + PACKAGE_STRING='xdriinfo 1.0.7' 586 + PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xdriinfo/-/issues' 587 587 PACKAGE_URL='' 588 588 589 589 ac_unique_file="Makefile.am" ··· 729 729 docdir 730 730 oldincludedir 731 731 includedir 732 + runstatedir 732 733 localstatedir 733 734 sharedstatedir 734 735 sysconfdir ··· 809 810 sysconfdir='${prefix}/etc' 810 811 sharedstatedir='${prefix}/com' 811 812 localstatedir='${prefix}/var' 813 + runstatedir='${localstatedir}/run' 812 814 includedir='${prefix}/include' 813 815 oldincludedir='/usr/include' 814 816 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' ··· 1061 1063 | -silent | --silent | --silen | --sile | --sil) 1062 1064 silent=yes ;; 1063 1065 1066 + -runstatedir | --runstatedir | --runstatedi | --runstated \ 1067 + | --runstate | --runstat | --runsta | --runst | --runs \ 1068 + | --run | --ru | --r) 1069 + ac_prev=runstatedir ;; 1070 + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ 1071 + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ 1072 + | --run=* | --ru=* | --r=*) 1073 + runstatedir=$ac_optarg ;; 1074 + 1064 1075 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 1065 1076 ac_prev=sbindir ;; 1066 1077 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ ··· 1198 1209 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ 1199 1210 datadir sysconfdir sharedstatedir localstatedir includedir \ 1200 1211 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1201 - libdir localedir mandir 1212 + libdir localedir mandir runstatedir 1202 1213 do 1203 1214 eval ac_val=\$$ac_var 1204 1215 # Remove trailing slashes. ··· 1311 1322 # Omit some internal or obsolete options to make the list less imposing. 1312 1323 # This message is too long to be a string in the A/UX 3.1 sh. 1313 1324 cat <<_ACEOF 1314 - \`configure' configures xdriinfo 1.0.6 to adapt to many kinds of systems. 1325 + \`configure' configures xdriinfo 1.0.7 to adapt to many kinds of systems. 1315 1326 1316 1327 Usage: $0 [OPTION]... [VAR=VALUE]... 1317 1328 ··· 1351 1362 --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 1352 1363 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1353 1364 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1365 + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] 1354 1366 --libdir=DIR object code libraries [EPREFIX/lib] 1355 1367 --includedir=DIR C header files [PREFIX/include] 1356 1368 --oldincludedir=DIR C header files for non-gcc [/usr/include] ··· 1381 1393 1382 1394 if test -n "$ac_init_help"; then 1383 1395 case $ac_init_help in 1384 - short | recursive ) echo "Configuration of xdriinfo 1.0.6:";; 1396 + short | recursive ) echo "Configuration of xdriinfo 1.0.7:";; 1385 1397 esac 1386 1398 cat <<\_ACEOF 1387 1399 ··· 1427 1439 Use these variables to override the choices made by `configure' or to help 1428 1440 it to find libraries and programs with nonstandard names/locations. 1429 1441 1430 - Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. 1442 + Report bugs to <https://gitlab.freedesktop.org/xorg/app/xdriinfo/-/issues>. 1431 1443 _ACEOF 1432 1444 ac_status=$? 1433 1445 fi ··· 1490 1502 test -n "$ac_init_help" && exit $ac_status 1491 1503 if $ac_init_version; then 1492 1504 cat <<\_ACEOF 1493 - xdriinfo configure 1.0.6 1505 + xdriinfo configure 1.0.7 1494 1506 generated by GNU Autoconf 2.69 1495 1507 1496 1508 Copyright (C) 2012 Free Software Foundation, Inc. ··· 1747 1759 This file contains any messages produced by compilers while 1748 1760 running configure, to aid debugging if configure makes a mistake. 1749 1761 1750 - It was created by xdriinfo $as_me 1.0.6, which was 1762 + It was created by xdriinfo $as_me 1.0.7, which was 1751 1763 generated by GNU Autoconf 2.69. Invocation command line was 1752 1764 1753 1765 $ $0 $@ ··· 2576 2588 2577 2589 # Define the identity of the package. 2578 2590 PACKAGE='xdriinfo' 2579 - VERSION='1.0.6' 2591 + VERSION='1.0.7' 2580 2592 2581 2593 2582 2594 cat >>confdefs.h <<_ACEOF ··· 6397 6409 fi 6398 6410 6399 6411 6400 - # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) 6412 + 6413 + 6414 + 6415 + 6416 + 6417 + 6418 + 6419 + 6420 + 6421 + 6422 + 6423 + 6424 + 6425 + xorg_testset_save_CFLAGS="$CFLAGS" 6426 + 6427 + if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then 6428 + CFLAGS="$CFLAGS -Werror=unknown-warning-option" 6429 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 6430 + $as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } 6431 + if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : 6432 + $as_echo_n "(cached) " >&6 6433 + else 6434 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6435 + /* end confdefs.h. */ 6436 + int i; 6437 + _ACEOF 6438 + if ac_fn_c_try_compile "$LINENO"; then : 6439 + xorg_cv_cc_flag_unknown_warning_option=yes 6440 + else 6441 + xorg_cv_cc_flag_unknown_warning_option=no 6442 + fi 6443 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 6444 + fi 6445 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 6446 + $as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } 6447 + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option 6448 + CFLAGS="$xorg_testset_save_CFLAGS" 6449 + fi 6450 + 6451 + if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then 6452 + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then 6453 + CFLAGS="$CFLAGS -Werror=unknown-warning-option" 6454 + fi 6455 + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" 6456 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 6457 + $as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } 6458 + if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : 6459 + $as_echo_n "(cached) " >&6 6460 + else 6461 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6462 + /* end confdefs.h. */ 6463 + int i; 6464 + _ACEOF 6465 + if ac_fn_c_try_compile "$LINENO"; then : 6466 + xorg_cv_cc_flag_unused_command_line_argument=yes 6467 + else 6468 + xorg_cv_cc_flag_unused_command_line_argument=no 6469 + fi 6470 + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 6471 + fi 6472 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 6473 + $as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } 6474 + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument 6475 + CFLAGS="$xorg_testset_save_CFLAGS" 6476 + fi 6477 + 6478 + found="no" 6479 + 6480 + if test $found = "no" ; then 6481 + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then 6482 + CFLAGS="$CFLAGS -Werror=unknown-warning-option" 6483 + fi 6484 + 6485 + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then 6486 + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" 6487 + fi 6488 + 6489 + CFLAGS="$CFLAGS -Wredundant-decls" 6490 + 6491 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wredundant-decls" >&5 6492 + $as_echo_n "checking if $CC supports -Wredundant-decls... " >&6; } 6493 + cacheid=xorg_cv_cc_flag__Wredundant_decls 6494 + if eval \${$cacheid+:} false; then : 6495 + $as_echo_n "(cached) " >&6 6496 + else 6497 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6498 + /* end confdefs.h. */ 6499 + int i; 6500 + int 6501 + main () 6502 + { 6503 + 6504 + ; 6505 + return 0; 6506 + } 6507 + _ACEOF 6508 + if ac_fn_c_try_link "$LINENO"; then : 6509 + eval $cacheid=yes 6510 + else 6511 + eval $cacheid=no 6512 + fi 6513 + rm -f core conftest.err conftest.$ac_objext \ 6514 + conftest$ac_exeext conftest.$ac_ext 6515 + fi 6516 + 6517 + 6518 + CFLAGS="$xorg_testset_save_CFLAGS" 6519 + 6520 + eval supported=\$$cacheid 6521 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 6522 + $as_echo "$supported" >&6; } 6523 + if test "$supported" = "yes" ; then 6524 + BASE_CFLAGS="$BASE_CFLAGS -Wredundant-decls" 6525 + found="yes" 6526 + fi 6527 + fi 6528 + 6529 + 6401 6530 6402 6531 6403 6532 ··· 6524 6653 # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) 6525 6654 # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) 6526 6655 6527 - # Turn some warnings into errors, so we don't accidently get successful builds 6656 + # Turn some warnings into errors, so we don't accidentally get successful builds 6528 6657 # when there are problems that should be fixed. 6529 6658 6530 6659 if test "x$SELECTIVE_WERROR" = "xyes" ; then ··· 10196 10325 10197 10326 10198 10327 10328 + 10329 + 10199 10330 cat >>confdefs.h <<_ACEOF 10200 10331 #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` 10201 10332 _ACEOF ··· 10398 10529 10399 10530 10400 10531 10532 + 10401 10533 # Checks for pkg-config packages 10402 10534 10403 10535 pkg_failed=no 10404 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDRIINFO" >&5 10405 - $as_echo_n "checking for XDRIINFO... " >&6; } 10536 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xext x11 glproto" >&5 10537 + $as_echo_n "checking for xext x11 glproto... " >&6; } 10406 10538 10407 10539 if test -n "$XDRIINFO_CFLAGS"; then 10408 10540 pkg_cv_XDRIINFO_CFLAGS="$XDRIINFO_CFLAGS" ··· 10442 10574 10443 10575 10444 10576 if test $pkg_failed = yes; then 10445 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10577 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10446 10578 $as_echo "no" >&6; } 10447 10579 10448 10580 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 10469 10601 and XDRIINFO_LIBS to avoid the need to call pkg-config. 10470 10602 See the pkg-config man page for more details." "$LINENO" 5 10471 10603 elif test $pkg_failed = untried; then 10472 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10604 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10473 10605 $as_echo "no" >&6; } 10474 10606 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 10475 10607 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ··· 11090 11222 # report actual input values of CONFIG_FILES etc. instead of their 11091 11223 # values after options handling. 11092 11224 ac_log=" 11093 - This file was extended by xdriinfo $as_me 1.0.6, which was 11225 + This file was extended by xdriinfo $as_me 1.0.7, which was 11094 11226 generated by GNU Autoconf 2.69. Invocation command line was 11095 11227 11096 11228 CONFIG_FILES = $CONFIG_FILES ··· 11150 11282 Configuration commands: 11151 11283 $config_commands 11152 11284 11153 - Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>." 11285 + Report bugs to <https://gitlab.freedesktop.org/xorg/app/xdriinfo/-/issues>." 11154 11286 11155 11287 _ACEOF 11156 11288 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 11157 11289 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 11158 11290 ac_cs_version="\\ 11159 - xdriinfo config.status 1.0.6 11291 + xdriinfo config.status 1.0.7 11160 11292 configured by $0, generated by GNU Autoconf 2.69, 11161 11293 with options \\"\$ac_cs_config\\" 11162 11294

+3 -3

app/xdriinfo/configure.ac

··· 22 22 23 23 # Initialize Autoconf 24 24 AC_PREREQ([2.60]) 25 - AC_INIT([xdriinfo], [1.0.6], 26 - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xdriinfo]) 25 + AC_INIT([xdriinfo], [1.0.7], 26 + [https://gitlab.freedesktop.org/xorg/app/xdriinfo/-/issues], [xdriinfo]) 27 27 AC_CONFIG_SRCDIR([Makefile.am]) 28 28 AC_CONFIG_HEADERS([config.h]) 29 29 30 30 # Initialize Automake 31 - AM_INIT_AUTOMAKE([foreign dist-bzip2]) 31 + AM_INIT_AUTOMAKE([foreign dist-xz]) 32 32 33 33 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS 34 34 m4_ifndef([XORG_MACROS_VERSION],

+1

app/xdriinfo/man/Makefile.in

··· 222 222 prefix = @prefix@ 223 223 program_transform_name = @program_transform_name@ 224 224 psdir = @psdir@ 225 + runstatedir = @runstatedir@ 225 226 sbindir = @sbindir@ 226 227 sharedstatedir = @sharedstatedir@ 227 228 srcdir = @srcdir@

+5 -3

app/xdriinfo/xdriinfo.c

··· 58 58 59 59 int main (int argc, char *argv[]) { 60 60 Display *dpy; 61 - int nScreens, screenNum, i; 61 + int nScreens, screenNum; 62 62 enum INFO_FUNC func = LIST; 63 63 char *funcArg = NULL; 64 64 char *dpyName = NULL; ··· 71 71 } 72 72 73 73 /* parse the command line */ 74 - for (i = 1; i < argc; ++i) { 74 + for (int i = 1; i < argc; ++i) { 75 75 char **argPtr = NULL; 76 76 if (!strcmp (argv[i], "-display")) 77 77 argPtr = &dpyName; ··· 112 112 return 1; 113 113 } 114 114 } 115 + else 116 + screenNum = -1; 115 117 116 118 /* driver command needs a valid screen number */ 117 119 if (func == DRIVER && screenNum == -1) { ··· 179 181 break; 180 182 } 181 183 case LIST: 182 - for (i = 0; i < nScreens; ++i) { 184 + for (int i = 0; i < nScreens; ++i) { 183 185 const char *name = (*GetScreenDriver) (dpy, i); 184 186 if (name) 185 187 printf ("Screen %d: %s\n", i, name);

Configure Feed

Configure Feed