Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xvinfo for openSUSE:Factory checked in at 2026-07-13 14:28:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xvinfo (Old) and /work/SRC/openSUSE:Factory/.xvinfo.new.1991 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xvinfo" Mon Jul 13 14:28:45 2026 rev:11 rq:1365279 version:1.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/xvinfo/xvinfo.changes 2022-12-05 18:01:19.436621701 +0100 +++ /work/SRC/openSUSE:Factory/.xvinfo.new.1991/xvinfo.changes 2026-07-13 14:29:13.401789137 +0200 @@ -1,0 +2,11 @@ +Mon Jul 13 09:37:38 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.1.6 + * Add -help option + * Accept --help & --version as aliases to -help & -version + * man page: fix warnings from `mandoc -T lint` and `groff -rCHECKSTYLE=10` + * gitlab CI: drop the ci-fairy check-mr job + * meson: Add option to build with meson +- Switch to meson build + +------------------------------------------------------------------- Old: ---- xvinfo-1.1.5.tar.xz New: ---- xvinfo-1.1.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xvinfo.spec ++++++ --- /var/tmp/diff_new_pack.RUXnDZ/_old 2026-07-13 14:29:14.473825783 +0200 +++ /var/tmp/diff_new_pack.RUXnDZ/_new 2026-07-13 14:29:14.477825920 +0200 @@ -1,7 +1,7 @@ # # spec file for package xvinfo # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,21 @@ Name: xvinfo -Version: 1.1.5 +Version: 1.1.6 Release: 0 Summary: Utility to print X-Video extension adaptor information License: X11 Group: System/X11/Utilities -URL: http://xorg.freedesktop.org/ -Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz -BuildRequires: pkg-config +URL: https://xorg.freedesktop.org/ +Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz +BuildRequires: meson >= 1.1.0 +BuildRequires: ninja +BuildRequires: pkgconfig BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xproto) >= 7.0.25 BuildRequires: pkgconfig(xv) # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description xvinfo prints out the capabilities of any video adaptors associated @@ -40,14 +41,13 @@ %setup -q %build -%configure -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install +%meson_install %files -%defattr(-,root,root) %license COPYING %doc ChangeLog README.md %{_bindir}/xvinfo ++++++ xvinfo-1.1.5.tar.xz -> xvinfo-1.1.6.tar.xz ++++++ ++++ 14514 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xvinfo-1.1.5/ChangeLog new/xvinfo-1.1.6/ChangeLog --- old/xvinfo-1.1.5/ChangeLog 2022-12-04 01:32:29.000000000 +0100 +++ new/xvinfo-1.1.6/ChangeLog 2026-07-12 02:44:42.000000000 +0200 @@ -1,3 +1,76 @@ +commit 87503b084c7a281bab9bd501227145cac1506d25 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 11 17:40:39 2026 -0700 + + xvinfo 1.1.6 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit a5e82d175ad068e28161f1d08f14aa8637b4d989 +Author: Alan Coopersmith <[email protected]> +Date: Sun May 3 16:21:51 2026 -0700 + + meson: Add option to build with meson + + Also updates the gitlab CI config to test both build types + and compare the generated output/installed files. + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xvinfo/-/merge_requests/6> + +commit 3be29dd8249e2266963b0719d272670a67c9b465 +Author: Alan Coopersmith <[email protected]> +Date: Sun Jan 11 11:20:41 2026 -0800 + + gitlab CI: drop the ci-fairy check-mr job + + The only thing this checked was the checkbox for allowing maintainers to + edit the MR. Changed permissions checks now fail this job but luckily + the setting it checked has been the default for years anyway so we can + drop it. + + https://gitlab.freedesktop.org/freedesktop/ci-templates/-/issues/81 + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xvinfo/-/merge_requests/6> + +commit 9eb79cbe55af83d8186d95d57114959c2ff2e4df +Author: Alan Coopersmith <[email protected]> +Date: Sat May 31 13:08:56 2025 -0700 + + man page: fix warnings from `mandoc -T lint` and `groff -rCHECKSTYLE=10` + + mandoc: xvinfo.1:1:5: STYLE: lower case character in document title: TH xvinfo + mandoc: xvinfo.1:1:14: WARNING: cannot parse date, using it verbatim: TH xvinfo 1.1.5 + mandoc: xvinfo.1:11:2: WARNING: skipping paragraph macro: PP after SH + mandoc: xvinfo.1:16:2: WARNING: skipping paragraph macro: PP empty + mandoc: xvinfo.1:30:2: WARNING: skipping paragraph macro: PP empty + + an.tmac:xvinfo.1:34: style: blank line in input + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xvinfo/-/merge_requests/5> + +commit aa843bceb41508c15c33ab9482b92aa47be0e2ea +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 12 14:34:28 2025 -0700 + + Accept --help & --version as aliases to -help & -version + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xvinfo/-/merge_requests/4> + +commit 0560cbbd8d35857e8a65e3f1b6f142c725e3e438 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 12 14:26:44 2025 -0700 + + Add -help option + + Also uses more standard exit() status codes + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xvinfo/-/merge_requests/4> + commit 55e8dbb999ccad9378adf9410fc9c299f259a998 Author: Alan Coopersmith <[email protected]> Date: Sat Dec 3 16:29:33 2022 -0800 @@ -237,7 +310,7 @@ Signed-off-by: Alan Coopersmith <[email protected]> commit af9ea390e95320e683c761cbd61eaf1c0dbaefed -Author: Stéphane Aulery <[email protected]> +Author: Stéphane Aulery <[email protected]> Date: Sun Jul 7 03:15:39 2013 +0200 Use real program name for help message @@ -531,7 +604,7 @@ Debian bug #350313 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350313> commit 29190804b219bf3e6289426a832b32ad2f4c53a4 -Author: Michel Dänzer <[email protected]> +Author: Michel Dänzer <[email protected]> Date: Mon Jan 15 17:14:56 2007 +0100 Fix FourCC name output on big endian platforms. @@ -539,13 +612,13 @@ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=9665 . commit 69758559c5ddb85bbf6501ea8e58c0896c7c1f11 -Author: Michel Dänzer <[email protected]> +Author: Michel Dänzer <[email protected]> Date: Mon Jan 15 17:13:51 2007 +0100 Make git ignore object files and Emacs style backup files. commit f4363bef8760521d07a2b90d81dd85d19192bcf2 -Author: Michel Dänzer <[email protected]> +Author: Michel Dänzer <[email protected]> Date: Mon Jan 15 17:12:57 2007 +0100 Rename .cvsignore to .gitignore. @@ -647,7 +720,7 @@ configure cache, you cache it, and the cached value is probably wrong. commit d5c7c5891a774190d3a1fbf1727bfb8238be0f23 -Author: Søren Sandmann Pedersen <[email protected]> +Author: Søren Sandmann Pedersen <[email protected]> Date: Fri Jul 1 20:09:10 2005 +0000 xtrap.pc.in: s/Xfixes/XTrap/ xi.pc.in: s/Xt/Xi/ Xv/src/Makefile.am: remove diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xvinfo-1.1.5/Makefile.am new/xvinfo-1.1.6/Makefile.am --- old/xvinfo-1.1.5/Makefile.am 2022-12-04 01:32:21.000000000 +0100 +++ new/xvinfo-1.1.6/Makefile.am 2026-07-12 02:44:31.000000000 +0200 @@ -40,4 +40,4 @@ dist-hook: ChangeLog INSTALL -EXTRA_DIST = README.md +EXTRA_DIST = README.md meson.build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xvinfo-1.1.5/compile new/xvinfo-1.1.6/compile --- old/xvinfo-1.1.5/compile 2022-12-04 01:32:24.000000000 +0100 +++ new/xvinfo-1.1.6/compile 2026-07-12 02:44:36.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2018-03-07.03; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2025 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -37,11 +37,11 @@ file_conv= -# func_file_conv build_file lazy +# func_file_conv build_file unneeded_conversions # Convert a $build file to $host form and store it in $file # Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. +# type is listed in (the comma separated) UNNEEDED_CONVERSIONS, no +# conversion will take place. func_file_conv () { file=$1 @@ -51,9 +51,20 @@ # lazily determine how to convert abs files case `uname -s` in MINGW*) - file_conv=mingw + if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then + # MSYS2 environment. + file_conv=cygwin + else + # Original MinGW environment. + file_conv=mingw + fi ;; - CYGWIN* | MSYS*) + MSYS*) + # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. + file_conv=cygwin + ;; + CYGWIN*) + # Cygwin environment. file_conv=cygwin ;; *) @@ -63,12 +74,14 @@ fi case $file_conv/,$2, in *,$file_conv,*) + # This is the optimization mentioned above: + # If UNNEEDED_CONVERSIONS contains $file_conv, don't convert. ;; mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` + cygwin/*) + file=`cygpath -w "$file" || echo "$file"` ;; wine/*) file=`winepath -w "$file" || echo "$file"` @@ -143,7 +156,7 @@ # configure might choose to run compile as 'compile cc -o foo foo.c'. eat=1 case $2 in - *.o | *.[oO][bB][jJ]) + *.o | *.lo | *.[oO][bB][jJ]) func_file_conv "$2" set x "$@" -Fo"$file" shift @@ -248,14 +261,17 @@ right script to run: please start by reading the file 'INSTALL'. Report bugs to <[email protected]>. +GNU Automake home page: <https://www.gnu.org/software/automake/>. +General help using GNU software: <https://www.gnu.org/gethelp/>. EOF exit $? ;; -v | --v*) - echo "compile $scriptversion" + echo "compile (GNU Automake) $scriptversion" exit $? ;; cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; @@ -340,9 +356,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xvinfo-1.1.5/config.h.in new/xvinfo-1.1.6/config.h.in --- old/xvinfo-1.1.5/config.h.in 2022-12-04 01:32:24.000000000 +0100 +++ new/xvinfo-1.1.6/config.h.in 2026-07-12 02:44:35.000000000 +0200 @@ -57,7 +57,7 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xvinfo-1.1.5/configure.ac new/xvinfo-1.1.6/configure.ac --- old/xvinfo-1.1.5/configure.ac 2022-12-04 01:32:21.000000000 +0100 +++ new/xvinfo-1.1.6/configure.ac 2026-07-12 02:44:31.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xvinfo], [1.1.5], +AC_INIT([xvinfo], [1.1.6], [https://gitlab.freedesktop.org/xorg/app/xvinfo/-/issues], [xvinfo]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xvinfo-1.1.5/man/xvinfo.man new/xvinfo-1.1.6/man/xvinfo.man --- old/xvinfo-1.1.5/man/xvinfo.man 2022-12-04 01:32:21.000000000 +0100 +++ new/xvinfo-1.1.6/man/xvinfo.man 2026-07-12 02:44:31.000000000 +0200 @@ -1,33 +1,39 @@ -.TH xvinfo __appmansuffix__ __vendorversion__ +.TH XVINFO __appmansuffix__ 2025-04-12 __vendorversion__ .SH NAME xvinfo - Print out X-Video extension adaptor information .SH SYNOPSIS .B "xvinfo" -[-display \fIdisplayname\fP] -.SH DESCRIPTION +[\fB\-display\fP \fIdisplayname\fP] [\fB\-short\fP] .PP +.B "xvinfo" +\fB\-help\fP | \fB\-version\fP +.SH DESCRIPTION .B xvinfo prints out the capabilities of any video adaptors associated -with the display that are accessible through the X-Video extension. +with the display that are accessible through the X\-Video extension. .SH OPTIONS -.PP .TP 8 -.B "-display \fIdisplay\fP" +.B "\-display \fIdisplay\fP" This argument allows you to specify the server to query; see \fIX(__miscmansuffix__)\fP. .TP 8 -.B "-short" +.B "\-short" Output less details, to reduce the amount of text. .TP 8 -.B "-version" +.B "\-help" +Output program usage, then exit. +.TP 8 +.B "\-version" Output program version, then exit. .SH ENVIRONMENT -.PP .TP 8 .B DISPLAY This variable may be used to specify the server to query. - .SH SEE ALSO -X(__miscmansuffix__), xdpyinfo(__appmansuffix__), xwininfo(__appmansuffix__), -xdriinfo(__appmansuffix__), glxinfo(__appmansuffix__), xprop(__appmansuffix__) +.BR X (__miscmansuffix__), +.BR xdpyinfo (__appmansuffix__), +.BR xwininfo (__appmansuffix__), +.BR xdriinfo (__appmansuffix__), +.BR glxinfo (__appmansuffix__), +.BR xprop (__appmansuffix__) .SH AUTHORS Mark Vojkovich diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xvinfo-1.1.5/meson.build new/xvinfo-1.1.6/meson.build --- old/xvinfo-1.1.5/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xvinfo-1.1.6/meson.build 2026-07-12 02:44:31.000000000 +0200 @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2026, Oracle and/or its affiliates. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +project( + 'xvinfo', + 'c', + version: '1.1.6', + license: 'X11', + license_files: 'COPYING', + meson_version: '>= 1.1.0', +) + +conf = configuration_data() +package_string = ' '.join(meson.project_name(), meson.project_version()) +conf.set_quoted('PACKAGE_STRING', package_string) + +cc = meson.get_compiler('c') + +# Replacement for XORG_DEFAULT_OPTIONS +if cc.has_argument('-fno-strict-aliasing') + add_project_arguments('-fno-strict-aliasing', language: 'c') +endif + +# Checks for pkg-config packages +dep_libxv = dependency('xv', required: true) +dep_libx11 = dependency('x11', required: true) +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.25') +deps = [dep_libxv, dep_libx11, dep_xproto] + +config_h = configure_file(output: 'config.h', configuration: conf) +add_project_arguments('-DHAVE_CONFIG_H', language: ['c']) + +executable( + 'xvinfo', + [config_h, 'xvinfo.c'], + dependencies: deps, + install: true +) + +# Man page +prog_sed = find_program('sed') + +custom_target( + 'xvinfo.man', + input: 'man/xvinfo.man', + output: 'xvinfo.1', + command: [ + prog_sed, + '-e', f's/__vendorversion__/"@package_string@" "X Version 11"/', + '-e', 's/__appmansuffix__/1/g', + '-e', 's/__miscmansuffix__/7/g', + '@INPUT@', + ], + capture: true, + install: true, + install_dir: get_option('mandir') / 'man1', + install_tag: 'man', +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xvinfo-1.1.5/missing new/xvinfo-1.1.6/missing --- old/xvinfo-1.1.5/missing 2022-12-04 01:32:24.000000000 +0100 +++ new/xvinfo-1.1.6/missing 2026-07-12 02:44:36.000000000 +0200 @@ -1,9 +1,11 @@ #! /bin/sh -# Common wrapper for a few potentially missing GNU programs. +# Common wrapper for a few potentially missing GNU and other programs. -scriptversion=2018-03-07.03; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells + +# Copyright (C) 1996-2025 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -54,18 +56,20 @@ -v, --version output version information and exit Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man +aclocal autoconf autogen autoheader autom4te automake autoreconf +bison flex help2man lex makeinfo perl yacc Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. -Send bug reports to <[email protected]>." +Report bugs to <[email protected]>. +GNU Automake home page: <https://www.gnu.org/software/automake/>. +General help using GNU software: <https://www.gnu.org/gethelp/>." exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" + echo "missing (GNU Automake) $scriptversion" exit $? ;; @@ -108,7 +112,7 @@ program_details () { case $1 in - aclocal|automake) + aclocal|automake|autoreconf) echo "The '$1' program is part of the GNU Automake package:" echo "<$gnu_software_URL/automake>" echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" @@ -123,6 +127,9 @@ echo "<$gnu_software_URL/m4/>" echo "<$perl_URL>" ;; + *) + : + ;; esac } @@ -137,48 +144,55 @@ printf '%s\n' "'$1' is $msg." configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + autoheader_deps="'acconfig.h'" + automake_deps="'Makefile.am'" + aclocal_deps="'acinclude.m4'" case $normalized_program in + aclocal*) + echo "You should only need it if you modified $aclocal_deps or" + echo "$configure_deps." + ;; autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' + echo "You should only need it if you modified $configure_deps." + ;; + autogen*) + echo "You should only need it if you modified a '.def' or '.tpl' file." + echo "You may want to install the GNU AutoGen package:" + echo "<$gnu_software_URL/autogen/>" ;; autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" + echo "You should only need it if you modified $autoheader_deps or" echo "$configure_deps." - program_details 'autoheader' ;; automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" + echo "You should only need it if you modified $automake_deps or" echo "$configure_deps." - program_details 'aclocal' ;; - autom4te*) + autom4te*) echo "You might have modified some maintainer files that require" echo "the 'autom4te' program to be rebuilt." - program_details 'autom4te' + ;; + autoreconf*) + echo "You should only need it if you modified $aclocal_deps or" + echo "$automake_deps or $autoheader_deps or $automake_deps or" + echo "$configure_deps." ;; bison*|yacc*) echo "You should only need it if you modified a '.y' file." echo "You may want to install the GNU Bison package:" echo "<$gnu_software_URL/bison/>" ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; help2man*) echo "You should only need it if you modified a dependency" \ "of a man page." echo "You may want to install the GNU Help2man package:" echo "<$gnu_software_URL/help2man/>" ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; makeinfo*) echo "You should only need it if you modified a '.texi' file, or" echo "any other file indirectly affecting the aspect of the manual." @@ -189,6 +203,12 @@ echo "want to install GNU make:" echo "<$gnu_software_URL/make/>" ;; + perl*) + echo "You should only need it to run GNU Autoconf, GNU Automake, " + echo " assorted other tools, or if you modified a Perl source file." + echo "You may want to install the Perl 5 language interpreter:" + echo "<$perl_URL>" + ;; *) echo "You might have modified some files without having the proper" echo "tools for further handling them. Check the 'README' file, it" @@ -197,6 +217,7 @@ echo "case some other package contains this missing '$1' program." ;; esac + program_details "$normalized_program" } give_advice "$1" | sed -e '1s/^/WARNING: /' \ @@ -207,9 +228,9 @@ exit $st # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xvinfo-1.1.5/xvinfo.c new/xvinfo-1.1.6/xvinfo.c --- old/xvinfo-1.1.5/xvinfo.c 2022-12-04 01:32:21.000000000 +0100 +++ new/xvinfo-1.1.6/xvinfo.c 2026-07-12 02:44:31.000000000 +0200 @@ -13,11 +13,12 @@ static char *progname; static void _X_NORETURN _X_COLD -PrintUsage(void) +PrintUsage(int exitstatus) { - fprintf(stderr, "Usage: %s [-display host:dpy] [-short] [-version]\n", + fprintf(stderr, + "Usage: %s [-display host:dpy] [-help] [-short] [-version]\n", progname); - exit(0); + exit(exitstatus); } int @@ -32,28 +33,36 @@ progname = argv[0]; if ((argc > 4)) - PrintUsage(); + PrintUsage(EXIT_FAILURE); if (argc != 1) { for (int i = 1; i < argc; i++) { - if (!strcmp(argv[i], "-display")) { + const char *arg = argv[i]; + + /* accept '--arg' options as aliases to '-arg' form */ + if (arg[0] == '-' && arg[1] == '-' && arg[2] != '\0') + arg++; + + if (!strcmp(arg, "-display")) { if (++i >= argc) { fprintf (stderr, "%s: missing argument to -display\n", progname); - PrintUsage(); + PrintUsage(EXIT_FAILURE); } disname = argv[i]; } - else if (!strcmp(argv[i], "-short")) + else if (!strcmp(arg, "-help")) + PrintUsage(EXIT_SUCCESS); + else if (!strcmp(arg, "-short")) shortmode = 1; - else if (!strcmp(argv[i], "-version")) { - printf("%s\n", PACKAGE_STRING); - exit(0); + else if (!strcmp(arg, "-version")) { + puts(PACKAGE_STRING); + exit(EXIT_SUCCESS); } else { fprintf (stderr, "%s: unrecognized argument '%s'\n", progname, argv[i]); - PrintUsage(); + PrintUsage(EXIT_FAILURE); } } } @@ -61,13 +70,13 @@ if (!(dpy = XOpenDisplay(disname))) { fprintf(stderr, "%s: Unable to open display %s\n", progname, (disname != NULL) ? disname : XDisplayName(NULL)); - exit(-1); + exit(EXIT_FAILURE); } if (Success != XvQueryExtension(dpy, &ver, &rev, &reqB, &eventB, &errorB)) { fprintf(stderr, "%s: No X-Video Extension on %s\n", progname, (disname != NULL) ? disname : XDisplayName(NULL)); - exit(0); + exit(EXIT_SUCCESS); } else { fprintf(stdout, "X-Video Extension version %i.%i\n", ver, rev); @@ -84,7 +93,7 @@ &ainfo)) { fprintf(stderr, "%s: Failed to query adaptors on display %s\n", progname, (disname != NULL) ? disname : XDisplayName(NULL)); - exit(-1); + exit(EXIT_FAILURE); } if (!nadaptors) { @@ -191,7 +200,7 @@ "%s: Failed to query encodings on display %s\n", progname, (disname != NULL) ? disname : XDisplayName(NULL)); - exit(-1); + exit(EXIT_FAILURE); } if (encodings && nencode) {
