Update rgb to 1.1.0 · jcs.org/openbsd-xenocara@b8d2056

+142 -2

app/rgb/ChangeLog

··· 1 + commit 06cf6fa78bfec2ea4c9dc061900079f2cc9c9dd1 2 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 + Date: Sat Oct 29 10:31:35 2022 -0700 4 + 5 + rgb 1.1.0 6 + 7 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 8 + 9 + commit 5db536d77f99e9f425b5363af71f2abcdbbc4f4c 10 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 11 + Date: Sun Oct 16 12:28:36 2022 -0700 12 + 13 + gitlab CI: stop requiring Signed-off-by in commits 14 + 15 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 16 + 17 + commit fa59e95ca40aab93388f8b27b1c1a36acee8f4ec 18 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 19 + Date: Thu Oct 13 16:52:31 2022 -0700 20 + 21 + gitlab CI: build all 3 --with-rgb-db-type=(text|dbm|ndbm) options 22 + 23 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 24 + 25 + commit c4e6767272fd37b6464f67b4dde387895297eb63 26 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 27 + Date: Thu Oct 13 16:47:47 2022 -0700 28 + 29 + configure: Add --with-rgb-db-library option 30 + 31 + Allows builders to choose a specific database library instead of relying 32 + on the default auto-detection, which can allow use of libraries we don't 33 + normally search for (like gdbm_compat) or to bypass libraries we do 34 + normally search for (like Berkeley db). 35 + 36 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 37 + 38 + commit af3f9bd84de98baff8df88cf51fe2750829254c0 39 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 40 + Date: Fri Oct 7 18:00:11 2022 -0700 41 + 42 + README: provide more information on --with-rgb-db-type 43 + 44 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 45 + 46 + commit fd561bf3a80a9a23c130f11d26e93a4fded6d464 47 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 48 + Date: Thu Oct 6 20:01:29 2022 -0700 49 + 50 + rgb.c: if filename is too long, report error instead of truncating 51 + 52 + Avoid possibly creating a file of unknown name/location 53 + 54 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 55 + 56 + commit be9658d3380bbdee73a687d74a18ae22c8272ac5 57 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 58 + Date: Thu Oct 6 19:53:56 2022 -0700 59 + 60 + rgb.c: fix -Wdiscarded-qualifiers warning 61 + 62 + rgb.c: In function ‘main’: 63 + rgb.c:81:9: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] 64 + dbname = RGB_DB; 65 + ^ 66 + 67 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 68 + 69 + commit a413f34351b6e72100bdbef7ae32d1266dfa8942 70 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 71 + Date: Thu Oct 6 19:49:15 2022 -0700 72 + 73 + Remove unnecessary casts from malloc() & memcpy() calls 74 + 75 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 76 + 77 + commit f0d6e69279eaeb71a3e36b5cf40ba8384b1ec84c 78 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 79 + Date: Fri Dec 3 16:28:26 2021 -0800 80 + 81 + Build xz tarballs instead of bzip2 82 + 83 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 84 + 85 + commit a22ca19fa8920f3d28f6676b009ef9ea0770d06b 86 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 87 + Date: Fri Dec 3 16:28:22 2021 -0800 88 + 89 + gitlab CI: add a basic build test 90 + 91 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 92 + 93 + commit 97820e748eb496a1f6d3fc3bf89688f0ce1f64f9 94 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 95 + Date: Wed Nov 21 16:56:07 2018 -0800 96 + 97 + Update configure.ac bug URL for gitlab migration 98 + 99 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 100 + 101 + commit 3da8f3109f063952516b0782949a96f0c92a092f 102 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 103 + Date: Fri Nov 16 20:38:15 2018 -0800 104 + 105 + Update README for gitlab migration 106 + 107 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 108 + 109 + commit 33a89951afcc53a591294de24b08fee581d31c3c 110 + Author: Mihail Konev <k.mvc@ya.ru> 111 + Date: Thu Jan 26 14:00:20 2017 +1000 112 + 113 + autogen: add default patch prefix 114 + 115 + Signed-off-by: Mihail Konev <k.mvc@ya.ru> 116 + 117 + commit ea85c550234b928ac4add45f14bffba163d7684b 118 + Author: Emil Velikov <emil.l.velikov@gmail.com> 119 + Date: Mon Mar 9 12:00:52 2015 +0000 120 + 121 + autogen.sh: use quoted string variables 122 + 123 + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent 124 + fall-outs, when they contain space. 125 + 126 + Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> 127 + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 128 + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 129 + 130 + commit 2e5ed74deddd8f2c2fe7742f991a632e437dd03d 131 + Author: Peter Hutterer <peter.hutterer@who-t.net> 132 + Date: Tue Jan 24 10:32:07 2017 +1000 133 + 134 + autogen.sh: use exec instead of waiting for configure to finish 135 + 136 + Syncs the invocation of configure with the one from the server. 137 + 138 + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 139 + Reviewed-by: Emil Velikov <emil.velikov@collabora.com> 140 + 1 141 commit 41599a3703e7b95c73a44c548d2ba074aa3eb3d8 2 142 Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 143 Date: Sat Nov 8 11:31:26 2014 -0800 ··· 499 639 Fix distcheck for remaining apps 500 640 501 641 commit 794993251c8700061f84246f87ec3c060f2ffb37 502 - Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 642 + Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 503 643 Date: Wed Jul 27 19:40:28 2005 +0000 504 644 505 645 Check for xproto ··· 526 666 site.h & rgb.h from Xserver/includes) 527 667 528 668 commit 7a676fdf168ed250baef3b99393f3dccbda91a7e 529 - Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 669 + Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 530 670 Date: Wed Jun 29 18:20:16 2005 +0000 531 671 532 672 Add build system for rgb symlink.sh: Link pmconfig.cpp, link various text

+1

app/rgb/Makefile.am

··· 41 41 AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES) $(CWARNFLAGS) 42 42 43 43 EXTRA_DIST= \ 44 + README.md \ 44 45 rgb.txt \ 45 46 others/README \ 46 47 others/old-rgb.txt \

+6 -4

app/rgb/Makefile.in

··· 76 76 bin_PROGRAMS = showrgb$(EXEEXT) $(am__EXEEXT_1) 77 77 @RGB_DB_TRUE@am__append_1 = rgb 78 78 subdir = . 79 - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ 79 + DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ 80 80 $(srcdir)/Makefile.in $(srcdir)/config.h.in \ 81 81 $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \ 82 82 compile config.guess config.sub depcomp install-sh missing ··· 214 214 dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ 215 215 done; \ 216 216 reldir="$$dir2" 217 - DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 217 + DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz 218 218 GZIP_ENV = --best 219 - DIST_TARGETS = dist-bzip2 dist-gzip 219 + DIST_TARGETS = dist-xz dist-gzip 220 220 distuninstallcheck_listfiles = find . -type f -print 221 221 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ 222 222 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' ··· 340 340 prefix = @prefix@ 341 341 program_transform_name = @program_transform_name@ 342 342 psdir = @psdir@ 343 + runstatedir = @runstatedir@ 343 344 sbindir = @sbindir@ 344 345 sharedstatedir = @sharedstatedir@ 345 346 srcdir = @srcdir@ ··· 356 357 RGB_DB_DEFINES = -DRGB_DB=\"$(db_dir)/$(db_file)\" 357 358 AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES) $(CWARNFLAGS) 358 359 EXTRA_DIST = \ 360 + README.md \ 359 361 rgb.txt \ 360 362 others/README \ 361 363 others/old-rgb.txt \ ··· 714 716 dist-gzip: distdir 715 717 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz 716 718 $(am__post_remove_distdir) 719 + 717 720 dist-bzip2: distdir 718 721 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 719 722 $(am__post_remove_distdir) ··· 721 724 dist-lzip: distdir 722 725 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz 723 726 $(am__post_remove_distdir) 724 - 725 727 dist-xz: distdir 726 728 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz 727 729 $(am__post_remove_distdir)

-31

app/rgb/README

··· 1 - X color name database 2 - 3 - This package includes both the list mapping X color names to RGB values 4 - (rgb.txt) and, if configured to use a database for color lookup, the 5 - rgb program to convert the text file into the binary database format. 6 - 7 - The "others" subdirectory contains some alternate color databases. 8 - 9 - All questions regarding this software should be directed at the 10 - Xorg mailing list: 11 - 12 - http://lists.freedesktop.org/mailman/listinfo/xorg 13 - 14 - Please submit bug reports to the Xorg bugzilla: 15 - 16 - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg 17 - 18 - The master development code repository can be found at: 19 - 20 - git://anongit.freedesktop.org/git/xorg/app/rgb 21 - 22 - http://cgit.freedesktop.org/xorg/app/rgb 23 - 24 - For patch submission instructions, see: 25 - 26 - http://www.x.org/wiki/Development/Documentation/SubmittingPatches 27 - 28 - For more information on the git code manager, see: 29 - 30 - http://wiki.x.org/wiki/GitPage 31 -

+44

app/rgb/README.md

··· 1 + X color name database 2 + --------------------- 3 + 4 + This package includes both the list mapping X color names to RGB values 5 + (rgb.txt) and programs to read and write the color database. 6 + 7 + The "others" subdirectory contains some alternate color databases. 8 + 9 + The configure script accepts --with-rgb-db-type=(text|dbm|ndbm) to specify 10 + the type of database to use for the color name data. The default is "text". 11 + 12 + The configure script accepts --with-rgb-db-library=<library-name> to specify 13 + the dbm or ndbm compatible library to use for the color name data. The default 14 + is "auto" to search for known implementations. Library names should be 15 + specified as would be provided for the "-l" flag for the linker - for 16 + instance, "c" for libc, "dbm" for libdbm, etc. 17 + 18 + Distributors who do choose to enable the use of a database library are 19 + responsible for understanding the requirements of the license terms of 20 + the library they link with, which may impose additional restrictions 21 + beyond the MIT/X11 license used for this package. 22 + 23 + If the dbm or ndbm format are chosen, this package also builds the 24 + rgb command to build the database in that format from rgb.txt. 25 + 26 + Regardless of format, this package builds the showrgb command to show 27 + the contents of the database, from whichever of dbm, ndbm, or text file 28 + was chosen by the --with-rgb-db-type option when building. 29 + 30 + All questions regarding this software should be directed at the 31 + Xorg mailing list: 32 + 33 + https://lists.x.org/mailman/listinfo/xorg 34 + 35 + The master development code repository can be found at: 36 + 37 + https://gitlab.freedesktop.org/xorg/app/rgb 38 + 39 + Please submit bug reports and requests to merge patches there. 40 + 41 + For patch submission instructions, see: 42 + 43 + https://www.x.org/wiki/Development/Documentation/SubmittingPatches 44 +

+193 -93

app/rgb/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) 45 24 46 - # PKG_PROG_PKG_CONFIG([MIN-VERSION]) 47 - # ---------------------------------- 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 69 + 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 181 214 182 215 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. 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 236 + 237 + 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, 2006, Oracle and/or its affiliates. All rights reserved. 1321 + dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 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.0]) 1358 + m4_define([vers_have], [1.19.2]) 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,, ··· 1356 1432 AC_DEFUN([XORG_MANPAGE_SECTIONS],[ 1357 1433 AC_REQUIRE([AC_CANONICAL_HOST]) 1358 1434 AC_REQUIRE([AC_PROG_SED]) 1435 + 1436 + case $host_os in 1437 + solaris*) 1438 + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we 1439 + # check for a man page file found in later versions that use 1440 + # traditional section numbers instead 1441 + AC_CHECK_FILE([/usr/share/man/man7/attributes.7], 1442 + [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true]) 1443 + ;; 1444 + *) SYSV_MAN_SECTIONS=false ;; 1445 + esac 1359 1446 1360 1447 if test x$APP_MAN_SUFFIX = x ; then 1361 1448 APP_MAN_SUFFIX=1 ··· 1372 1459 fi 1373 1460 1374 1461 if test x$FILE_MAN_SUFFIX = x ; then 1375 - case $host_os in 1376 - solaris*) FILE_MAN_SUFFIX=4 ;; 1377 - *) FILE_MAN_SUFFIX=5 ;; 1462 + case $SYSV_MAN_SECTIONS in 1463 + true) FILE_MAN_SUFFIX=4 ;; 1464 + *) FILE_MAN_SUFFIX=5 ;; 1378 1465 esac 1379 1466 fi 1380 1467 if test x$FILE_MAN_DIR = x ; then ··· 1382 1469 fi 1383 1470 1384 1471 if test x$MISC_MAN_SUFFIX = x ; then 1385 - case $host_os in 1386 - solaris*) MISC_MAN_SUFFIX=5 ;; 1387 - *) MISC_MAN_SUFFIX=7 ;; 1472 + case $SYSV_MAN_SECTIONS in 1473 + true) MISC_MAN_SUFFIX=5 ;; 1474 + *) MISC_MAN_SUFFIX=7 ;; 1388 1475 esac 1389 1476 fi 1390 1477 if test x$MISC_MAN_DIR = x ; then ··· 1392 1479 fi 1393 1480 1394 1481 if test x$DRIVER_MAN_SUFFIX = x ; then 1395 - case $host_os in 1396 - solaris*) DRIVER_MAN_SUFFIX=7 ;; 1397 - *) DRIVER_MAN_SUFFIX=4 ;; 1482 + case $SYSV_MAN_SECTIONS in 1483 + true) DRIVER_MAN_SUFFIX=7 ;; 1484 + *) DRIVER_MAN_SUFFIX=4 ;; 1398 1485 esac 1399 1486 fi 1400 1487 if test x$DRIVER_MAN_DIR = x ; then ··· 1402 1489 fi 1403 1490 1404 1491 if test x$ADMIN_MAN_SUFFIX = x ; then 1405 - case $host_os in 1406 - solaris*) ADMIN_MAN_SUFFIX=1m ;; 1407 - *) ADMIN_MAN_SUFFIX=8 ;; 1492 + case $SYSV_MAN_SECTIONS in 1493 + true) ADMIN_MAN_SUFFIX=1m ;; 1494 + *) ADMIN_MAN_SUFFIX=8 ;; 1408 1495 esac 1409 1496 fi 1410 1497 if test x$ADMIN_MAN_DIR = x ; then ··· 1665 1752 fi]) 1666 1753 1667 1754 # Test for the ability of xmlto to generate a text target 1755 + # 1756 + # NOTE: xmlto 0.0.27 or higher return a non-zero return code in the 1757 + # following test for empty XML docbook files. 1758 + # For compatibility reasons use the following empty XML docbook file and if 1759 + # it fails try it again with a non-empty XML file. 1668 1760 have_xmlto_text=no 1669 1761 cat > conftest.xml << "EOF" 1670 1762 EOF 1671 1763 AS_IF([test "$have_xmlto" = yes], 1672 1764 [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], 1673 1765 [have_xmlto_text=yes], 1674 - [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])]) 1766 + [# Try it again with a non-empty XML file. 1767 + cat > conftest.xml << "EOF" 1768 + <x></x> 1769 + EOF 1770 + AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], 1771 + [have_xmlto_text=yes], 1772 + [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])]) 1675 1773 rm -f conftest.xml 1676 1774 AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) 1677 1775 AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) ··· 3067 3165 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` 3068 3166 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ 3069 3167 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ 3070 - || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ 3071 - echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" 3168 + || (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ 3169 + touch \$(top_srcdir)/INSTALL; \ 3170 + echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" 3072 3171 AC_SUBST([INSTALL_CMD]) 3073 3172 ]) # XORG_INSTALL 3074 3173 dnl Copyright 2005 Red Hat, Inc ··· 3129 3228 # 3130 3229 # 3131 3230 AC_DEFUN([XORG_CHANGELOG], [ 3132 - CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ 3231 + CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ 3133 3232 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ 3134 - || (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ 3135 - echo 'git directory not found: installing possibly empty changelog.' >&2)" 3233 + || (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ 3234 + touch \$(top_srcdir)/ChangeLog; \ 3235 + echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" 3136 3236 AC_SUBST([CHANGELOG_CMD]) 3137 3237 ]) # XORG_CHANGELOG 3138 3238

+9 -8

app/rgb/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-2013 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:

+213 -52

app/rgb/configure

··· 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 - # Generated by GNU Autoconf 2.69 for rgb 1.0.6. 3 + # Generated by GNU Autoconf 2.69 for rgb 1.1.0. 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/rgb/-/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/rgb/-/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='rgb' 583 583 PACKAGE_TARNAME='rgb' 584 - PACKAGE_VERSION='1.0.6' 585 - PACKAGE_STRING='rgb 1.0.6' 586 - PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' 584 + PACKAGE_VERSION='1.1.0' 585 + PACKAGE_STRING='rgb 1.1.0' 586 + PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/rgb/-/issues' 587 587 PACKAGE_URL='' 588 588 589 589 ac_unique_file="Makefile.am" ··· 737 737 docdir 738 738 oldincludedir 739 739 includedir 740 + runstatedir 740 741 localstatedir 741 742 sharedstatedir 742 743 sysconfdir ··· 766 767 enable_silent_rules 767 768 with_rgb_db_dir 768 769 with_rgb_db_type 770 + with_rgb_db_library 769 771 ' 770 772 ac_precious_vars='build_alias 771 773 host_alias ··· 821 823 sysconfdir='${prefix}/etc' 822 824 sharedstatedir='${prefix}/com' 823 825 localstatedir='${prefix}/var' 826 + runstatedir='${localstatedir}/run' 824 827 includedir='${prefix}/include' 825 828 oldincludedir='/usr/include' 826 829 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' ··· 1073 1076 | -silent | --silent | --silen | --sile | --sil) 1074 1077 silent=yes ;; 1075 1078 1079 + -runstatedir | --runstatedir | --runstatedi | --runstated \ 1080 + | --runstate | --runstat | --runsta | --runst | --runs \ 1081 + | --run | --ru | --r) 1082 + ac_prev=runstatedir ;; 1083 + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ 1084 + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ 1085 + | --run=* | --ru=* | --r=*) 1086 + runstatedir=$ac_optarg ;; 1087 + 1076 1088 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 1077 1089 ac_prev=sbindir ;; 1078 1090 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ ··· 1210 1222 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ 1211 1223 datadir sysconfdir sharedstatedir localstatedir includedir \ 1212 1224 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1213 - libdir localedir mandir 1225 + libdir localedir mandir runstatedir 1214 1226 do 1215 1227 eval ac_val=\$$ac_var 1216 1228 # Remove trailing slashes. ··· 1323 1335 # Omit some internal or obsolete options to make the list less imposing. 1324 1336 # This message is too long to be a string in the A/UX 3.1 sh. 1325 1337 cat <<_ACEOF 1326 - \`configure' configures rgb 1.0.6 to adapt to many kinds of systems. 1338 + \`configure' configures rgb 1.1.0 to adapt to many kinds of systems. 1327 1339 1328 1340 Usage: $0 [OPTION]... [VAR=VALUE]... 1329 1341 ··· 1363 1375 --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 1364 1376 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1365 1377 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1378 + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] 1366 1379 --libdir=DIR object code libraries [EPREFIX/lib] 1367 1380 --includedir=DIR C header files [PREFIX/include] 1368 1381 --oldincludedir=DIR C header files for non-gcc [/usr/include] ··· 1393 1406 1394 1407 if test -n "$ac_init_help"; then 1395 1408 case $ac_init_help in 1396 - short | recursive ) echo "Configuration of rgb 1.0.6:";; 1409 + short | recursive ) echo "Configuration of rgb 1.1.0:";; 1397 1410 esac 1398 1411 cat <<\_ACEOF 1399 1412 ··· 1425 1438 ${datadir}/X11/rgb) 1426 1439 --with-rgb-db-type=(text|dbm|ndbm) 1427 1440 rgb database type (default is text) 1441 + --with-rgb-db-library=<library-name> 1442 + rgb database library (default is to search for one) 1428 1443 1429 1444 Some influential environment variables: 1430 1445 CC C compiler command ··· 1448 1463 Use these variables to override the choices made by `configure' or to help 1449 1464 it to find libraries and programs with nonstandard names/locations. 1450 1465 1451 - Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. 1466 + Report bugs to <https://gitlab.freedesktop.org/xorg/app/rgb/-/issues>. 1452 1467 _ACEOF 1453 1468 ac_status=$? 1454 1469 fi ··· 1511 1526 test -n "$ac_init_help" && exit $ac_status 1512 1527 if $ac_init_version; then 1513 1528 cat <<\_ACEOF 1514 - rgb configure 1.0.6 1529 + rgb configure 1.1.0 1515 1530 generated by GNU Autoconf 2.69 1516 1531 1517 1532 Copyright (C) 2012 Free Software Foundation, Inc. ··· 1670 1685 $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} 1671 1686 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 1672 1687 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} 1673 - ( $as_echo "## ---------------------------------------------------------------------- ## 1674 - ## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## 1675 - ## ---------------------------------------------------------------------- ##" 1688 + ( $as_echo "## ------------------------------------------------------------------- ## 1689 + ## Report this to https://gitlab.freedesktop.org/xorg/app/rgb/-/issues ## 1690 + ## ------------------------------------------------------------------- ##" 1676 1691 ) | sed "s/^/$as_me: WARNING: /" >&2 1677 1692 ;; 1678 1693 esac ··· 1926 1941 This file contains any messages produced by compilers while 1927 1942 running configure, to aid debugging if configure makes a mistake. 1928 1943 1929 - It was created by rgb $as_me 1.0.6, which was 1944 + It was created by rgb $as_me 1.1.0, which was 1930 1945 generated by GNU Autoconf 2.69. Invocation command line was 1931 1946 1932 1947 $ $0 $@ ··· 4066 4081 4067 4082 # Define the identity of the package. 4068 4083 PACKAGE='rgb' 4069 - VERSION='1.0.6' 4084 + VERSION='1.1.0' 4070 4085 4071 4086 4072 4087 cat >>confdefs.h <<_ACEOF ··· 10460 10475 10461 10476 10462 10477 10463 - CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ 10478 + CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ 10464 10479 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ 10465 - || (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ 10466 - echo 'git directory not found: installing possibly empty changelog.' >&2)" 10480 + || (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ 10481 + touch \$(top_srcdir)/ChangeLog; \ 10482 + echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" 10467 10483 10468 10484 10469 10485 ··· 10471 10487 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` 10472 10488 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ 10473 10489 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ 10474 - || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ 10475 - echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" 10490 + || (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ 10491 + touch \$(top_srcdir)/INSTALL; \ 10492 + echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" 10476 10493 10477 10494 10478 10495 10479 10496 10480 10497 10481 10498 10499 + case $host_os in 10500 + solaris*) 10501 + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we 10502 + # check for a man page file found in later versions that use 10503 + # traditional section numbers instead 10504 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 10505 + $as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } 10506 + if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : 10507 + $as_echo_n "(cached) " >&6 10508 + else 10509 + test "$cross_compiling" = yes && 10510 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 10511 + if test -r "/usr/share/man/man7/attributes.7"; then 10512 + ac_cv_file__usr_share_man_man7_attributes_7=yes 10513 + else 10514 + ac_cv_file__usr_share_man_man7_attributes_7=no 10515 + fi 10516 + fi 10517 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 10518 + $as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } 10519 + if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : 10520 + SYSV_MAN_SECTIONS=false 10521 + else 10522 + SYSV_MAN_SECTIONS=true 10523 + fi 10524 + 10525 + ;; 10526 + *) SYSV_MAN_SECTIONS=false ;; 10527 + esac 10528 + 10482 10529 if test x$APP_MAN_SUFFIX = x ; then 10483 10530 APP_MAN_SUFFIX=1 10484 10531 fi ··· 10494 10541 fi 10495 10542 10496 10543 if test x$FILE_MAN_SUFFIX = x ; then 10497 - case $host_os in 10498 - solaris*) FILE_MAN_SUFFIX=4 ;; 10499 - *) FILE_MAN_SUFFIX=5 ;; 10544 + case $SYSV_MAN_SECTIONS in 10545 + true) FILE_MAN_SUFFIX=4 ;; 10546 + *) FILE_MAN_SUFFIX=5 ;; 10500 10547 esac 10501 10548 fi 10502 10549 if test x$FILE_MAN_DIR = x ; then ··· 10504 10551 fi 10505 10552 10506 10553 if test x$MISC_MAN_SUFFIX = x ; then 10507 - case $host_os in 10508 - solaris*) MISC_MAN_SUFFIX=5 ;; 10509 - *) MISC_MAN_SUFFIX=7 ;; 10554 + case $SYSV_MAN_SECTIONS in 10555 + true) MISC_MAN_SUFFIX=5 ;; 10556 + *) MISC_MAN_SUFFIX=7 ;; 10510 10557 esac 10511 10558 fi 10512 10559 if test x$MISC_MAN_DIR = x ; then ··· 10514 10561 fi 10515 10562 10516 10563 if test x$DRIVER_MAN_SUFFIX = x ; then 10517 - case $host_os in 10518 - solaris*) DRIVER_MAN_SUFFIX=7 ;; 10519 - *) DRIVER_MAN_SUFFIX=4 ;; 10564 + case $SYSV_MAN_SECTIONS in 10565 + true) DRIVER_MAN_SUFFIX=7 ;; 10566 + *) DRIVER_MAN_SUFFIX=4 ;; 10520 10567 esac 10521 10568 fi 10522 10569 if test x$DRIVER_MAN_DIR = x ; then ··· 10524 10571 fi 10525 10572 10526 10573 if test x$ADMIN_MAN_SUFFIX = x ; then 10527 - case $host_os in 10528 - solaris*) ADMIN_MAN_SUFFIX=1m ;; 10529 - *) ADMIN_MAN_SUFFIX=8 ;; 10574 + case $SYSV_MAN_SECTIONS in 10575 + true) ADMIN_MAN_SUFFIX=1m ;; 10576 + *) ADMIN_MAN_SUFFIX=8 ;; 10530 10577 esac 10531 10578 fi 10532 10579 if test x$ADMIN_MAN_DIR = x ; then ··· 10620 10667 10621 10668 10622 10669 pkg_failed=no 10623 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RGB" >&5 10624 - $as_echo_n "checking for RGB... " >&6; } 10670 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xproto" >&5 10671 + $as_echo_n "checking for xproto... " >&6; } 10625 10672 10626 10673 if test -n "$RGB_CFLAGS"; then 10627 10674 pkg_cv_RGB_CFLAGS="$RGB_CFLAGS" ··· 10661 10708 10662 10709 10663 10710 if test $pkg_failed = yes; then 10664 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10711 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10665 10712 $as_echo "no" >&6; } 10666 10713 10667 10714 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 10688 10735 and RGB_LIBS to avoid the need to call pkg-config. 10689 10736 See the pkg-config man page for more details." "$LINENO" 5 10690 10737 elif test $pkg_failed = untried; then 10691 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10738 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10692 10739 $as_echo "no" >&6; } 10693 10740 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 10694 10741 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ··· 10742 10789 10743 10790 RGB_DB_TYPE=$db_type 10744 10791 10792 + 10793 + # Check whether --with-rgb-db-library was given. 10794 + if test "${with_rgb_db_library+set}" = set; then : 10795 + withval=$with_rgb_db_library; db_lib=$withval 10796 + else 10797 + db_lib="auto" 10798 + fi 10799 + 10800 + 10745 10801 case $db_type in 10746 10802 text) 10747 10803 RGB_DB_FILES="" ··· 10750 10806 10751 10807 ;; 10752 10808 dbm) 10753 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dbminit" >&5 10809 + if test "x$db_lib" = "xauto"; then : 10810 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dbminit" >&5 10754 10811 $as_echo_n "checking for library containing dbminit... " >&6; } 10755 10812 if ${ac_cv_search_dbminit+:} false; then : 10756 10813 $as_echo_n "(cached) " >&6 ··· 10808 10865 as_fn_error $? "dbm requested but dbminit() not found in any libraries" "$LINENO" 5 10809 10866 fi 10810 10867 10868 + else 10869 + as_ac_Lib=`$as_echo "ac_cv_lib_$db_lib''_dbminit" | $as_tr_sh` 10870 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbminit in -l$db_lib" >&5 10871 + $as_echo_n "checking for dbminit in -l$db_lib... " >&6; } 10872 + if eval \${$as_ac_Lib+:} false; then : 10873 + $as_echo_n "(cached) " >&6 10874 + else 10875 + ac_check_lib_save_LIBS=$LIBS 10876 + LIBS="-l$db_lib $LIBS" 10877 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext 10878 + /* end confdefs.h. */ 10879 + 10880 + /* Override any GCC internal prototype to avoid an error. 10881 + Use char because int might match the return type of a GCC 10882 + builtin and then its argument prototype would still apply. */ 10883 + #ifdef __cplusplus 10884 + extern "C" 10885 + #endif 10886 + char dbminit (); 10887 + int 10888 + main () 10889 + { 10890 + return dbminit (); 10891 + ; 10892 + return 0; 10893 + } 10894 + _ACEOF 10895 + if ac_fn_c_try_link "$LINENO"; then : 10896 + eval "$as_ac_Lib=yes" 10897 + else 10898 + eval "$as_ac_Lib=no" 10899 + fi 10900 + rm -f core conftest.err conftest.$ac_objext \ 10901 + conftest$ac_exeext conftest.$ac_ext 10902 + LIBS=$ac_check_lib_save_LIBS 10903 + fi 10904 + eval ac_res=\$$as_ac_Lib 10905 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 10906 + $as_echo "$ac_res" >&6; } 10907 + if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : 10908 + cat >>confdefs.h <<_ACEOF 10909 + #define `$as_echo "HAVE_LIB$db_lib" | $as_tr_cpp` 1 10910 + _ACEOF 10911 + 10912 + LIBS="-l$db_lib $LIBS" 10913 + 10914 + else 10915 + as_fn_error $? "dbm requested but dbminit() not found when linking with -l$db_lib" "$LINENO" 5 10916 + fi 10917 + 10918 + fi 10811 10919 ac_fn_c_check_header_mongrel "$LINENO" "dbm.h" "ac_cv_header_dbm_h" "$ac_includes_default" 10812 10920 if test "x$ac_cv_header_dbm_h" = xyes; then : 10813 10921 DBM_HEADER='<dbm.h>' ··· 10825 10933 10826 10934 10827 10935 pkg_failed=no 10828 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG" >&5 10829 - $as_echo_n "checking for XORG... " >&6; } 10936 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xorg-server" >&5 10937 + $as_echo_n "checking for xorg-server... " >&6; } 10830 10938 10831 10939 if test -n "$XORG_CFLAGS"; then 10832 10940 pkg_cv_XORG_CFLAGS="$XORG_CFLAGS" ··· 10866 10974 10867 10975 10868 10976 if test $pkg_failed = yes; then 10869 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10977 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10870 10978 $as_echo "no" >&6; } 10871 10979 10872 10980 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 10893 11001 and XORG_LIBS to avoid the need to call pkg-config. 10894 11002 See the pkg-config man page for more details." "$LINENO" 5 10895 11003 elif test $pkg_failed = untried; then 10896 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 11004 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 10897 11005 $as_echo "no" >&6; } 10898 11006 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 10899 11007 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ··· 10919 11027 ;; 10920 11028 ndbm) 10921 11029 # Find a dbm or ndbm implementation 10922 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dbm_open" >&5 11030 + if test "x$db_lib" = "xauto"; then : 11031 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dbm_open" >&5 10923 11032 $as_echo_n "checking for library containing dbm_open... " >&6; } 10924 11033 if ${ac_cv_search_dbm_open+:} false; then : 10925 11034 $as_echo_n "(cached) " >&6 ··· 10973 11082 if test "$ac_res" != no; then : 10974 11083 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" 10975 11084 10976 - $as_echo "#define NDBM 1" >>confdefs.h 11085 + else 11086 + as_fn_error $? "ndbm requested but dbm_open() not found in any libraries" "$LINENO" 5 11087 + fi 11088 + 11089 + else 11090 + as_ac_Lib=`$as_echo "ac_cv_lib_$db_lib''_dbm_open" | $as_tr_sh` 11091 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -l$db_lib" >&5 11092 + $as_echo_n "checking for dbm_open in -l$db_lib... " >&6; } 11093 + if eval \${$as_ac_Lib+:} false; then : 11094 + $as_echo_n "(cached) " >&6 11095 + else 11096 + ac_check_lib_save_LIBS=$LIBS 11097 + LIBS="-l$db_lib $LIBS" 11098 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11099 + /* end confdefs.h. */ 11100 + 11101 + /* Override any GCC internal prototype to avoid an error. 11102 + Use char because int might match the return type of a GCC 11103 + builtin and then its argument prototype would still apply. */ 11104 + #ifdef __cplusplus 11105 + extern "C" 11106 + #endif 11107 + char dbm_open (); 11108 + int 11109 + main () 11110 + { 11111 + return dbm_open (); 11112 + ; 11113 + return 0; 11114 + } 11115 + _ACEOF 11116 + if ac_fn_c_try_link "$LINENO"; then : 11117 + eval "$as_ac_Lib=yes" 11118 + else 11119 + eval "$as_ac_Lib=no" 11120 + fi 11121 + rm -f core conftest.err conftest.$ac_objext \ 11122 + conftest$ac_exeext conftest.$ac_ext 11123 + LIBS=$ac_check_lib_save_LIBS 11124 + fi 11125 + eval ac_res=\$$as_ac_Lib 11126 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 11127 + $as_echo "$ac_res" >&6; } 11128 + if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : 11129 + cat >>confdefs.h <<_ACEOF 11130 + #define `$as_echo "HAVE_LIB$db_lib" | $as_tr_cpp` 1 11131 + _ACEOF 11132 + 11133 + LIBS="-l$db_lib $LIBS" 10977 11134 10978 11135 else 10979 - as_fn_error $? "ndbm requested but dbm_open() not found in any libraries" "$LINENO" 5 11136 + as_fn_error $? "ndbm requested but dbm_open() not found when linking with -l$db_lib" "$LINENO" 5 11137 + fi 11138 + 10980 11139 fi 11140 + 11141 + $as_echo "#define NDBM 1" >>confdefs.h 10981 11142 10982 11143 DBM_HEADER='<ndbm.h>' 10983 11144 10984 11145 pkg_failed=no 10985 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG" >&5 10986 - $as_echo_n "checking for XORG... " >&6; } 11146 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xorg-server" >&5 11147 + $as_echo_n "checking for xorg-server... " >&6; } 10987 11148 10988 11149 if test -n "$XORG_CFLAGS"; then 10989 11150 pkg_cv_XORG_CFLAGS="$XORG_CFLAGS" ··· 11023 11184 11024 11185 11025 11186 if test $pkg_failed = yes; then 11026 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 11187 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 11027 11188 $as_echo "no" >&6; } 11028 11189 11029 11190 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 11050 11211 and XORG_LIBS to avoid the need to call pkg-config. 11051 11212 See the pkg-config man page for more details." "$LINENO" 5 11052 11213 elif test $pkg_failed = untried; then 11053 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 11214 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 11054 11215 $as_echo "no" >&6; } 11055 11216 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 11056 11217 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ··· 11634 11795 # report actual input values of CONFIG_FILES etc. instead of their 11635 11796 # values after options handling. 11636 11797 ac_log=" 11637 - This file was extended by rgb $as_me 1.0.6, which was 11798 + This file was extended by rgb $as_me 1.1.0, which was 11638 11799 generated by GNU Autoconf 2.69. Invocation command line was 11639 11800 11640 11801 CONFIG_FILES = $CONFIG_FILES ··· 11694 11855 Configuration commands: 11695 11856 $config_commands 11696 11857 11697 - Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>." 11858 + Report bugs to <https://gitlab.freedesktop.org/xorg/app/rgb/-/issues>." 11698 11859 11699 11860 _ACEOF 11700 11861 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 11701 11862 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 11702 11863 ac_cs_version="\\ 11703 - rgb config.status 1.0.6 11864 + rgb config.status 1.1.0 11704 11865 configured by $0, generated by GNU Autoconf 2.69, 11705 11866 with options \\"\$ac_cs_config\\" 11706 11867

+20 -9

app/rgb/configure.ac

··· 23 23 24 24 # Initialize Autoconf 25 25 AC_PREREQ([2.60]) 26 - AC_INIT([rgb], [1.0.6], 27 - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [rgb]) 26 + AC_INIT([rgb], [1.1.0], 27 + [https://gitlab.freedesktop.org/xorg/app/rgb/-/issues], [rgb]) 28 28 AC_CONFIG_SRCDIR([Makefile.am]) 29 29 AC_CONFIG_HEADERS([config.h]) 30 30 AC_USE_SYSTEM_EXTENSIONS 31 31 32 32 # Initialize Automake 33 - AM_INIT_AUTOMAKE([foreign dist-bzip2]) 33 + AM_INIT_AUTOMAKE([foreign dist-xz]) 34 34 35 35 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS 36 36 m4_ifndef([XORG_MACROS_VERSION], ··· 63 63 64 64 RGB_DB_TYPE=$db_type 65 65 66 + AC_ARG_WITH([rgb-db-library], 67 + AS_HELP_STRING([--with-rgb-db-library=<library-name>], 68 + [rgb database library (default is to search for one)]), 69 + [db_lib=$withval], [db_lib="auto"]) 70 + 66 71 case $db_type in 67 72 text) 68 73 RGB_DB_FILES="" ··· 70 75 [Define to 1 to use plain text files for rgb database]) 71 76 ;; 72 77 dbm) 73 - AC_SEARCH_LIBS([dbminit], [db dbm nsl], [], 74 - AC_MSG_ERROR([dbm requested but dbminit() not found in any libraries])) 78 + AS_IF([test "x$db_lib" = "xauto"], 79 + [AC_SEARCH_LIBS([dbminit], [db dbm nsl], [], 80 + AC_MSG_ERROR([dbm requested but dbminit() not found in any libraries]))], 81 + [AC_CHECK_LIB([$db_lib], [dbminit], [], 82 + AC_MSG_ERROR([dbm requested but dbminit() not found when linking with -l$db_lib]))]) 75 83 AC_CHECK_HEADER([dbm.h], [DBM_HEADER='<dbm.h>'], 76 84 [AC_CHECK_HEADER([rpcsvc/dbm.h], [DBM_HEADER='<rpcsvc/dbm.h>'], 77 85 [AC_MSG_ERROR([dbm requested but dbm.h not found])])]) ··· 81 89 ;; 82 90 ndbm) 83 91 # Find a dbm or ndbm implementation 84 - AC_SEARCH_LIBS([dbm_open], [db ndbm dbm], 85 - AC_DEFINE([NDBM], [1], 86 - [Define to 1 if you have ndbm.h interfaces]), 87 - AC_MSG_ERROR([ndbm requested but dbm_open() not found in any libraries])) 92 + AS_IF([test "x$db_lib" = "xauto"], 93 + [AC_SEARCH_LIBS([dbm_open], [db ndbm dbm], [], 94 + AC_MSG_ERROR([ndbm requested but dbm_open() not found in any libraries]))], 95 + [AC_CHECK_LIB([$db_lib], [dbm_open], [], 96 + AC_MSG_ERROR([ndbm requested but dbm_open() not found when linking with -l$db_lib]))]) 97 + AC_DEFINE([NDBM], [1], 98 + [Define to 1 if you have ndbm.h interfaces]) 88 99 DBM_HEADER='<ndbm.h>' 89 100 PKG_CHECK_MODULES(XORG, [xorg-server]) 90 101 RGB_CFLAGS="$RGB_CFLAGS $XORG_CFLAGS"

+1

app/rgb/man/Makefile.in

··· 255 255 prefix = @prefix@ 256 256 program_transform_name = @program_transform_name@ 257 257 psdir = @psdir@ 258 + runstatedir = @runstatedir@ 258 259 sbindir = @sbindir@ 259 260 sharedstatedir = @sharedstatedir@ 260 261 srcdir = @srcdir@

+8 -1

app/rgb/rgb.c

··· 57 57 int 58 58 main(int argc, char **argv) 59 59 { 60 - char *dbname; 60 + const char *dbname; 61 61 char line[512]; 62 62 int red, green, blue; 63 63 RGB rgb; ··· 79 79 dbname = argv[1]; 80 80 else 81 81 dbname = RGB_DB; 82 + 83 + if (strlen(dbname) > (sizeof(name) - 5)) { 84 + fprintf (stderr, 85 + "%s: dbm file name too long: \"%s\" (%lu max allowed)\n", 86 + ProgramName, dbname, sizeof(name) - 5); 87 + exit (1); 88 + } 82 89 83 90 snprintf (name, sizeof(name), "%s.dir", dbname); 84 91 fd = open (name, O_WRONLY|O_CREAT, 0666);

+2 -2

app/rgb/showrgb.c

··· 94 94 if (value.dptr) { 95 95 RGB rgb; 96 96 unsigned short r, g, b; 97 - memcpy( (char *)&rgb, value.dptr, sizeof rgb); 97 + memcpy(&rgb, value.dptr, sizeof rgb); 98 98 #define N(x) (((x) >> 8) & 0xff) 99 99 r = N(rgb.red); 100 100 g = N(rgb.green); ··· 130 130 exit (1); 131 131 } 132 132 #else 133 - path = (char *)malloc(strlen(filename) + 5); 133 + path = malloc(strlen(filename) + 5); 134 134 strcpy(path, filename); 135 135 strcat(path, ".txt"); 136 136 #endif

Configure Feed

Configure Feed