mirror of
https://github.com/openbsd/xenocara.git
synced 2025-12-09 18:59:00 +00:00
Update to rgb 1.0.3
This commit is contained in:
matthieu
@@ -21,3 +21,30 @@ Except as contained in this notice, the name of The Open Group shall
|
||||
not be used in advertising or otherwise to promote the sale, use or
|
||||
other dealings in this Software without prior written authorization
|
||||
from The Open Group.
|
||||
|
||||
Copyright 1994, 2008 Sun Microsystems, Inc. All rights reserved.
|
||||
|
||||
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, and/or sell copies of the Software, and to permit persons
|
||||
to whom the Software is furnished to do so, provided that the above
|
||||
copyright notice(s) and this permission notice appear in all copies of
|
||||
the Software and that both the above copyright notice(s) and this
|
||||
permission notice appear in supporting documentation.
|
||||
|
||||
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
|
||||
OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
||||
HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
|
||||
INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
|
||||
FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
|
||||
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
|
||||
WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of a copyright holder
|
||||
shall not be used in advertising or otherwise to promote the sale, use
|
||||
or other dealings in this Software without prior written authorization
|
||||
of the copyright holder.
|
||||
|
||||
@@ -1,53 +1,276 @@
|
||||
2006-05-15 Adam Jackson <ajax@freedesktop.org>
|
||||
commit f0c7399100f25d2c512ee7c922cf13a4bd9c507e
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Jun 5 20:17:09 2008 -0700
|
||||
|
||||
* configure.ac:
|
||||
Bump to 1.0.1
|
||||
rgb version 1.0.3
|
||||
|
||||
Don't you hate it when you push out a new version and then realize minutes
|
||||
later than you've got a manpage in your distro that's not in upstream you
|
||||
could have included?
|
||||
|
||||
2006-04-28 Jeremy C. Reed <reed@reedmedia.net>
|
||||
commit 2e8b928b2176a67a0d533748f385078ad8829cc3
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Jun 5 20:13:35 2008 -0700
|
||||
|
||||
reviewed by: Adam Jackson
|
||||
Include rgb(1) man page from Solaris
|
||||
|
||||
* configure.ac:
|
||||
pkg-config check for xproto instead of x11.
|
||||
commit bd94a52404b0e23a61e6ca330b759fdd82a59996
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Jun 5 18:25:47 2008 -0700
|
||||
|
||||
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
rgb version 1.0.2
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for final X11R7 release candidate.
|
||||
commit 7bb6478c651dcb576e2a0ff756365f52d9db04e4
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Jun 4 20:24:05 2008 -0700
|
||||
|
||||
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
Update showrgb man page to better match current implementation
|
||||
|
||||
* Makefile.am:
|
||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||
commit 749182c37cb455939ba327e9420dd652c0ff58a1
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Jun 4 20:16:12 2008 -0700
|
||||
|
||||
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
Nuke CVS version tags
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC3 release.
|
||||
commit 11193caceaa02f639d1e8a701ed92947e7eaad36
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Jun 4 20:09:01 2008 -0700
|
||||
|
||||
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
Fix build to work with --with-rgb-db-type=dbm
|
||||
|
||||
* configure.ac:
|
||||
Change the default rgb dir to be the same path as the X server.
|
||||
commit 0351f14a999264c152d7c585fc91ad4901e3c776
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Jun 4 19:40:44 2008 -0700
|
||||
|
||||
2005-11-23 Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Fix build to work with --with-rgb-db-type=ndbm
|
||||
|
||||
Also remove #includes of unused headers & convert K&R to ANSI C
|
||||
|
||||
* configure.ac:
|
||||
Fix --with-rgb-dir help string to give the right flag name.
|
||||
commit 7a327431337875e81094aaed0002c89041a0f570
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Dec 6 16:37:05 2007 -0500
|
||||
|
||||
2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
Replace static ChangeLog with dist-hook to generate from git log
|
||||
|
||||
* Makefile.am:
|
||||
* configure.ac:
|
||||
Update dependencies to work with separate build roots.
|
||||
commit 42c6e9a89d45c897c82f7ec1973f66aa1190d241
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Mon Sep 3 05:51:08 2007 -0400
|
||||
|
||||
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
Add *~ to .gitignore to skip patch/emacs droppings
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC2 release.
|
||||
commit 654ea29b1abed12d88e5a38abbf538779c679922
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Aug 23 19:24:33 2007 -0400
|
||||
|
||||
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
Rename .cvsignore to .gitignore
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for RC1 release.
|
||||
commit d96f362956d9e58cbb46740f825d5bad50f0fbf1
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Fri May 19 18:30:39 2006 +0000
|
||||
|
||||
Bump to 1.0.1
|
||||
|
||||
commit 808ad54d56095cc09138e2d25580009daed47c8f
|
||||
Author: Jeremy C. Reed <reed@reedmedia.net>
|
||||
Date: Fri Apr 28 17:13:37 2006 +0000
|
||||
|
||||
pkg-config check for xproto instead of x11.
|
||||
|
||||
commit 4a9b01708d7d0ea08534e0699311a41e8b55a9d7
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Dec 15 00:24:03 2005 +0000
|
||||
|
||||
Update package version number for final X11R7 release candidate.
|
||||
|
||||
commit a5dfa8230f98bf7f21046f9217cee5461587e620
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Tue Dec 6 22:48:18 2005 +0000
|
||||
|
||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||
|
||||
commit 159ab1fbe0dbb05699cc847862f135a216cfa8a0
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Dec 3 05:49:17 2005 +0000
|
||||
|
||||
Update package version number for X11R7 RC3 release.
|
||||
|
||||
commit f1226de089929e89ed0e77535ae129373935f4b5
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Dec 2 01:40:06 2005 +0000
|
||||
|
||||
Change the default rgb dir to be the same path as the X server.
|
||||
|
||||
commit 93b6b4cda7a0a2323a10405bb8b7af0e4a1a6110
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Nov 28 22:01:38 2005 +0000
|
||||
|
||||
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
|
||||
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
|
||||
|
||||
commit 7b13cbbdbd82403fff16fbbde0c0150f051ebdfa
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Thu Nov 24 00:25:59 2005 +0000
|
||||
|
||||
Fix --with-rgb-dir help string to give the right flag name.
|
||||
|
||||
commit 191f46bdd6a7ed44e22d5a8a095939697649e669
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Mon Nov 21 10:34:57 2005 +0000
|
||||
|
||||
Another pass at .cvsignores for apps.
|
||||
|
||||
commit 46f1e5df56048a5d93aca3cb800e78dbba084846
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Sun Nov 20 22:08:49 2005 +0000
|
||||
|
||||
Add/improve .cvsignore files for apps.
|
||||
|
||||
commit f9fe12f84b6f774b696cc3075ec22b9605fdbb65
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Nov 19 07:15:35 2005 +0000
|
||||
|
||||
Update pkgconfig files to separate library build-time dependencies from
|
||||
application build-time dependencies, and update package deps to work
|
||||
with separate build roots.
|
||||
|
||||
commit 3a2f377dbbea0b5aca6986f90e92b54ddc106dfb
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Nov 9 21:09:20 2005 +0000
|
||||
|
||||
Update package version number for X11R7 RC2 release.
|
||||
|
||||
commit 93b884959f2a9ef4c893ffa3d26ecef13c1ca4e8
|
||||
Author: Kean Johnson <kean@armory.com>
|
||||
Date: Tue Nov 8 06:33:31 2005 +0000
|
||||
|
||||
See ChangeLog entry 2005-11-07 for details.
|
||||
|
||||
commit cb599821a3c8dd2136b3d207911c74c2e5ad571c
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Oct 19 02:47:49 2005 +0000
|
||||
|
||||
Update package version number for RC1 release.
|
||||
|
||||
commit e6ddb673f5835bf7b9804fa29e62edd20419ea47
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Oct 17 23:56:20 2005 +0000
|
||||
|
||||
Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
|
||||
work better with BSD make
|
||||
|
||||
commit 15bccd547d6038edb9cbc4f9ad02dfbed6f9dcb8
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Fri Oct 14 00:25:42 2005 +0000
|
||||
|
||||
Use sed to fill in variables in man page
|
||||
|
||||
commit 9ee0a8cb83cfcf475441e393bfa04ea4fcbf49f9
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Aug 1 22:35:37 2005 +0000
|
||||
|
||||
Change default install dir for rgb.txt from libdir to libdir/X11, since
|
||||
that's where Xorg looks for it
|
||||
|
||||
commit fbb5f013d40c7a0ea26ac33a5abce1e9dd0ccadc
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Aug 1 20:25:28 2005 +0000
|
||||
|
||||
Install man pages to section 1 instead of section m (Patch from Donnie
|
||||
Berkholz)
|
||||
|
||||
commit 321c5f16ba1851a96a12bc5bafa832c3b9ac08e9
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Jul 29 21:22:30 2005 +0000
|
||||
|
||||
Various changes preparing packages for RC0:
|
||||
- Verify and update package version numbers as needed
|
||||
- Implement versioning scheme
|
||||
- Change bug address to point to bugzilla bug entry form
|
||||
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
|
||||
reenable it)
|
||||
- Fix makedepend to use pkgconfig and pass distcheck
|
||||
- Update build script to build macros first
|
||||
- Update modular Xorg version
|
||||
|
||||
commit 1dda7081659c8d5eacbfed77ee0aa594b17440a0
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Jul 28 15:57:12 2005 +0000
|
||||
|
||||
Fix distcheck for remaining apps
|
||||
|
||||
commit 794993251c8700061f84246f87ec3c060f2ffb37
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Wed Jul 27 19:40:28 2005 +0000
|
||||
|
||||
Check for xproto
|
||||
|
||||
commit 4531a95fde3e9e0dac1e24c0e140094d24503ce2
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Sat Jul 23 15:32:50 2005 +0000
|
||||
|
||||
Don't link in -lucb on Solaris
|
||||
#ifdef HAVE_CONFIG_H/#include "config.h" for modularization
|
||||
|
||||
commit d468fba83ec0d963f70ac0f6be47c41ce4080803
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Thu Jul 21 04:21:06 2005 +0000
|
||||
|
||||
oops, forgot to cvs add autogen.sh
|
||||
|
||||
commit ab0ad07c8529ee5d5da88de28956f81b9ecf833c
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Thu Jul 21 04:20:35 2005 +0000
|
||||
|
||||
Initial autotooling of rgb/showrgb (Defaults to flat text file - dbm/ndbm
|
||||
support partially implemented, but not yet buildable since it requires
|
||||
site.h & rgb.h from Xserver/includes)
|
||||
|
||||
commit 7a676fdf168ed250baef3b99393f3dccbda91a7e
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Wed Jun 29 18:20:16 2005 +0000
|
||||
|
||||
Add build system for rgb symlink.sh: Link pmconfig.cpp, link various text
|
||||
files for rgb xc/programs/rgb/showrgb.c: Don't include rgb.h and site.h
|
||||
when USE_RGB_TXT is defined
|
||||
|
||||
commit ad45da26f8f399bad12c6af78cc211f1dc563e58
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Fri Apr 23 19:54:36 2004 +0000
|
||||
|
||||
Merging XORG-CURRENT into trunk
|
||||
|
||||
commit a1edb12b592188781e4a18898fb1cd3fab472e4f
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Sun Mar 14 08:34:55 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
|
||||
|
||||
commit 2c7849cf40d3f24e14a9668110a93e35a9120cd9
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Wed Mar 3 12:12:53 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
|
||||
|
||||
commit 3798295f9b9e66543233d7fd44e95a244f0f8b06
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 13:36:15 2004 +0000
|
||||
|
||||
readding XFree86's cvs IDs
|
||||
|
||||
commit 3bfe5e286e3ca975e1a0e12bbb527f73bbf443aa
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 09:23:57 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
|
||||
|
||||
commit da58b20fd4fd40bccb34ce2e8f1401fc994c973c
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:48:58 2003 +0000
|
||||
|
||||
XFree86 4.3.0.1
|
||||
|
||||
commit 1f2079d6943e2c85edbeeb4309f7ec5e216ee640
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 15:54:53 2003 +0000
|
||||
|
||||
R6.6 is the Xorg base-line
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
|
||||
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||
# copy of this software and associated documentation files (the
|
||||
@@ -27,24 +27,28 @@
|
||||
#
|
||||
|
||||
|
||||
if RGB_TXT
|
||||
bin_PROGRAMS = showrgb
|
||||
else
|
||||
bin_PROGRAMS = rgb showrgb
|
||||
|
||||
rgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
|
||||
showrgb_SOURCES = showrgb.c
|
||||
|
||||
appman_PRE = showrgb.man
|
||||
|
||||
if RGB_DB
|
||||
bin_PROGRAMS += rgb
|
||||
|
||||
rgb_SOURCES = rgb.c
|
||||
|
||||
appman_PRE += rgb.man
|
||||
|
||||
$(RGB_DB_FILES): rgb rgb.txt
|
||||
-rm -f $(RGB_DB_FILES)
|
||||
./rgb rgb < $(srcdir)/rgb.txt
|
||||
endif
|
||||
|
||||
rgbdir = $(db_dir)
|
||||
rgb_DATA = $(db_file).txt $(RGB_DB_FILES)
|
||||
RGB_DB_DEFINES = -DRGB_DB=\"$(db_dir)/$(db_file)\"
|
||||
|
||||
showrgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
|
||||
showrgb_SOURCES = showrgb.c
|
||||
|
||||
appman_PRE = \
|
||||
showrgb.man
|
||||
AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
|
||||
|
||||
EXTRA_DIST= \
|
||||
rgb.txt \
|
||||
@@ -58,7 +62,7 @@ appmandir = $(APP_MAN_DIR)
|
||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||
|
||||
EXTRA_DIST += $(appman_PRE)
|
||||
CLEANFILES = $(appman_DATA)
|
||||
CLEANFILES = $(appman_DATA) $(RGB_DB_FILES)
|
||||
|
||||
SED = sed
|
||||
|
||||
@@ -67,6 +71,10 @@ XORGRELSTRING = @PACKAGE_STRING@
|
||||
XORGMANNAME = X Version 11
|
||||
|
||||
MAN_SUBSTS = \
|
||||
-e 's|__RGB_DB__|$(db_dir)/$(db_file)|' \
|
||||
-e 's|__RGB_DB_DIR__|$(db_dir)|' \
|
||||
-e 's|__RGB_DB_TYPE__|$(RGB_DB_TYPE)|' \
|
||||
-e 's|__RGB_DB_FILES__|$(RGB_DB_FILES)|' \
|
||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
@@ -83,3 +91,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
EXTRA_DIST += ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
|
||||
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||
# copy of this software and associated documentation files (the
|
||||
@@ -65,8 +65,9 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
@RGB_TXT_FALSE@bin_PROGRAMS = rgb$(EXEEXT) showrgb$(EXEEXT)
|
||||
@RGB_TXT_TRUE@bin_PROGRAMS = showrgb$(EXEEXT)
|
||||
bin_PROGRAMS = showrgb$(EXEEXT) $(am__EXEEXT_1)
|
||||
@RGB_DB_TRUE@am__append_1 = rgb
|
||||
@RGB_DB_TRUE@am__append_2 = rgb.man
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
|
||||
@@ -81,15 +82,16 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
||||
mkinstalldirs = $(SHELL) $(install_sh) -d
|
||||
CONFIG_HEADER = config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
@RGB_DB_TRUE@am__EXEEXT_1 = rgb$(EXEEXT)
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
|
||||
"$(DESTDIR)$(rgbdir)"
|
||||
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
||||
PROGRAMS = $(bin_PROGRAMS)
|
||||
am__rgb_SOURCES_DIST = rgb.c
|
||||
@RGB_TXT_FALSE@am_rgb_OBJECTS = rgb-rgb.$(OBJEXT)
|
||||
@RGB_DB_TRUE@am_rgb_OBJECTS = rgb.$(OBJEXT)
|
||||
rgb_OBJECTS = $(am_rgb_OBJECTS)
|
||||
rgb_LDADD = $(LDADD)
|
||||
am_showrgb_OBJECTS = showrgb-showrgb.$(OBJEXT)
|
||||
am_showrgb_OBJECTS = showrgb.$(OBJEXT)
|
||||
showrgb_OBJECTS = $(am_showrgb_OBJECTS)
|
||||
showrgb_LDADD = $(LDADD)
|
||||
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
|
||||
@@ -138,6 +140,7 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
@@ -147,6 +150,7 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
@@ -176,14 +180,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
RGB_CFLAGS = @RGB_CFLAGS@
|
||||
RGB_DB_FALSE = @RGB_DB_FALSE@
|
||||
RGB_DB_FILES = @RGB_DB_FILES@
|
||||
RGB_DB_TRUE = @RGB_DB_TRUE@
|
||||
RGB_DB_TYPE = @RGB_DB_TYPE@
|
||||
RGB_LIBS = @RGB_LIBS@
|
||||
RGB_TXT_FALSE = @RGB_TXT_FALSE@
|
||||
RGB_TXT_TRUE = @RGB_TXT_TRUE@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
@@ -224,27 +231,28 @@ sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
@RGB_TXT_FALSE@rgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
|
||||
@RGB_TXT_FALSE@rgb_SOURCES = rgb.c
|
||||
showrgb_SOURCES = showrgb.c
|
||||
appman_PRE = showrgb.man $(am__append_2)
|
||||
@RGB_DB_TRUE@rgb_SOURCES = rgb.c
|
||||
rgbdir = $(db_dir)
|
||||
rgb_DATA = $(db_file).txt $(RGB_DB_FILES)
|
||||
RGB_DB_DEFINES = -DRGB_DB=\"$(db_dir)/$(db_file)\"
|
||||
showrgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
|
||||
showrgb_SOURCES = showrgb.c
|
||||
appman_PRE = \
|
||||
showrgb.man
|
||||
|
||||
AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
|
||||
EXTRA_DIST = rgb.txt others/README others/old-rgb.txt \
|
||||
others/raveling.txt others/thomas.txt $(appman_PRE)
|
||||
others/raveling.txt others/thomas.txt $(appman_PRE) ChangeLog
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||
CLEANFILES = $(appman_DATA)
|
||||
CLEANFILES = $(appman_DATA) $(RGB_DB_FILES)
|
||||
SED = sed
|
||||
|
||||
# Strings to replace in man pages
|
||||
XORGRELSTRING = @PACKAGE_STRING@
|
||||
XORGMANNAME = X Version 11
|
||||
MAN_SUBSTS = \
|
||||
-e 's|__RGB_DB__|$(db_dir)/$(db_file)|' \
|
||||
-e 's|__RGB_DB_DIR__|$(db_dir)|' \
|
||||
-e 's|__RGB_DB_TYPE__|$(RGB_DB_TYPE)|' \
|
||||
-e 's|__RGB_DB_FILES__|$(RGB_DB_FILES)|' \
|
||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
@@ -258,6 +266,7 @@ MAN_SUBSTS = \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
|
||||
@@ -349,8 +358,8 @@ mostlyclean-compile:
|
||||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgb-rgb.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showrgb-showrgb.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgb.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showrgb.Po@am__quote@
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||
@@ -365,34 +374,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
||||
|
||||
rgb-rgb.o: rgb.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rgb_CFLAGS) $(CFLAGS) -MT rgb-rgb.o -MD -MP -MF "$(DEPDIR)/rgb-rgb.Tpo" -c -o rgb-rgb.o `test -f 'rgb.c' || echo '$(srcdir)/'`rgb.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/rgb-rgb.Tpo" "$(DEPDIR)/rgb-rgb.Po"; else rm -f "$(DEPDIR)/rgb-rgb.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rgb.c' object='rgb-rgb.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rgb_CFLAGS) $(CFLAGS) -c -o rgb-rgb.o `test -f 'rgb.c' || echo '$(srcdir)/'`rgb.c
|
||||
|
||||
rgb-rgb.obj: rgb.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rgb_CFLAGS) $(CFLAGS) -MT rgb-rgb.obj -MD -MP -MF "$(DEPDIR)/rgb-rgb.Tpo" -c -o rgb-rgb.obj `if test -f 'rgb.c'; then $(CYGPATH_W) 'rgb.c'; else $(CYGPATH_W) '$(srcdir)/rgb.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/rgb-rgb.Tpo" "$(DEPDIR)/rgb-rgb.Po"; else rm -f "$(DEPDIR)/rgb-rgb.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rgb.c' object='rgb-rgb.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rgb_CFLAGS) $(CFLAGS) -c -o rgb-rgb.obj `if test -f 'rgb.c'; then $(CYGPATH_W) 'rgb.c'; else $(CYGPATH_W) '$(srcdir)/rgb.c'; fi`
|
||||
|
||||
showrgb-showrgb.o: showrgb.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showrgb_CFLAGS) $(CFLAGS) -MT showrgb-showrgb.o -MD -MP -MF "$(DEPDIR)/showrgb-showrgb.Tpo" -c -o showrgb-showrgb.o `test -f 'showrgb.c' || echo '$(srcdir)/'`showrgb.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/showrgb-showrgb.Tpo" "$(DEPDIR)/showrgb-showrgb.Po"; else rm -f "$(DEPDIR)/showrgb-showrgb.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='showrgb.c' object='showrgb-showrgb.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showrgb_CFLAGS) $(CFLAGS) -c -o showrgb-showrgb.o `test -f 'showrgb.c' || echo '$(srcdir)/'`showrgb.c
|
||||
|
||||
showrgb-showrgb.obj: showrgb.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showrgb_CFLAGS) $(CFLAGS) -MT showrgb-showrgb.obj -MD -MP -MF "$(DEPDIR)/showrgb-showrgb.Tpo" -c -o showrgb-showrgb.obj `if test -f 'showrgb.c'; then $(CYGPATH_W) 'showrgb.c'; else $(CYGPATH_W) '$(srcdir)/showrgb.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/showrgb-showrgb.Tpo" "$(DEPDIR)/showrgb-showrgb.Po"; else rm -f "$(DEPDIR)/showrgb-showrgb.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='showrgb.c' object='showrgb-showrgb.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showrgb_CFLAGS) $(CFLAGS) -c -o showrgb-showrgb.obj `if test -f 'showrgb.c'; then $(CYGPATH_W) 'showrgb.c'; else $(CYGPATH_W) '$(srcdir)/showrgb.c'; fi`
|
||||
uninstall-info-am:
|
||||
install-appmanDATA: $(appman_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
@@ -507,6 +488,9 @@ distdir: $(DISTFILES)
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||
@@ -636,6 +620,7 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
|
||||
@@ -691,8 +676,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
||||
|
||||
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
|
||||
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
|
||||
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
|
||||
distclean-compile distclean-generic distclean-hdr \
|
||||
dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
|
||||
distclean distclean-compile distclean-generic distclean-hdr \
|
||||
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-appmanDATA install-binPROGRAMS install-data \
|
||||
@@ -705,8 +690,19 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
||||
uninstall-info-am uninstall-rgbDATA
|
||||
|
||||
|
||||
@RGB_DB_TRUE@$(RGB_DB_FILES): rgb rgb.txt
|
||||
@RGB_DB_TRUE@ -rm -f $(RGB_DB_FILES)
|
||||
@RGB_DB_TRUE@ ./rgb rgb < $(srcdir)/rgb.txt
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
||||
12
app/rgb/aclocal.m4
vendored
12
app/rgb/aclocal.m4
vendored
@@ -1042,7 +1042,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
|
||||
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
|
||||
[XORG_MACROS_version=1.1.5
|
||||
[XORG_MACROS_version=1.1.6
|
||||
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
|
||||
@@ -1191,7 +1191,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
HAVE_DEFS_ENT=
|
||||
|
||||
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
||||
if test x"$cross_compiling" = x"yes" ; then
|
||||
HAVE_DEFS_ENT=no
|
||||
else
|
||||
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(LINUXDOC, linuxdoc)
|
||||
AC_PATH_PROG(PS2PDF, ps2pdf)
|
||||
@@ -1463,14 +1467,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
|
||||
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
||||
[Major version of this package])
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
|
||||
if test "x$PVM" = "x"; then
|
||||
PVM="0"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
|
||||
[$PVM],
|
||||
[Minor version of this package])
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
|
||||
if test "x$PVP" = "x"; then
|
||||
PVP="0"
|
||||
fi
|
||||
|
||||
@@ -1,5 +1,35 @@
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Header file to include for dbm functions */
|
||||
#undef DBM_HEADER
|
||||
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
#undef HAVE_STDLIB_H
|
||||
|
||||
/* Define to 1 if you have the <strings.h> header file. */
|
||||
#undef HAVE_STRINGS_H
|
||||
|
||||
/* Define to 1 if you have the <string.h> header file. */
|
||||
#undef HAVE_STRING_H
|
||||
|
||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||
#undef HAVE_SYS_STAT_H
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
#undef HAVE_SYS_TYPES_H
|
||||
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
/* Define to 1 if you have ndbm.h interfaces */
|
||||
#undef NDBM
|
||||
|
||||
@@ -30,6 +60,9 @@
|
||||
/* Patch version of this package */
|
||||
#undef PACKAGE_VERSION_PATCHLEVEL
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Define to 1 to use plain text files for rgb database */
|
||||
#undef USE_RGB_TXT
|
||||
|
||||
|
||||
1760
app/rgb/configure
vendored
1760
app/rgb/configure
vendored
File diff suppressed because it is too large
Load Diff
@@ -28,7 +28,7 @@ dnl
|
||||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT(rgb,[1.0.1],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],rgb)
|
||||
AC_INIT(rgb,[1.0.3],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],rgb)
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
@@ -37,6 +37,8 @@ AM_CONFIG_HEADER(config.h)
|
||||
AC_PROG_CC
|
||||
AC_PROG_INSTALL
|
||||
|
||||
PKG_CHECK_MODULES(RGB, xproto)
|
||||
|
||||
AC_MSG_CHECKING([for rgb database location])
|
||||
AC_ARG_WITH([rgb-db-dir],
|
||||
AC_HELP_STRING([--with-rgb-db-dir=<path>],
|
||||
@@ -56,6 +58,8 @@ AC_ARG_WITH([rgb-db-type],
|
||||
[db_type=$withval], [db_type="text"])
|
||||
AC_MSG_RESULT([$db_type])
|
||||
|
||||
RGB_DB_TYPE=$db_type
|
||||
|
||||
case $db_type in
|
||||
text)
|
||||
RGB_DB_FILES=""
|
||||
@@ -63,23 +67,35 @@ case $db_type in
|
||||
[Define to 1 to use plain text files for rgb database])
|
||||
;;
|
||||
dbm)
|
||||
AC_SEARCH_LIBS([dbminit], [db dbm], [],
|
||||
AC_SEARCH_LIBS([dbminit], [db dbm nsl], [],
|
||||
AC_MSG_ERROR([dbm requested but dbminit() not found in any libraries]))
|
||||
RGB_DB_FILES="$(db_file).dir $(db_file).pag"
|
||||
AC_CHECK_HEADER([dbm.h], [DBM_HEADER='<dbm.h>'],
|
||||
[AC_CHECK_HEADER([rpcsvc/dbm.h], [DBM_HEADER='<rpcsvc/dbm.h>'],
|
||||
[AC_MSG_ERROR([dbm requested but dbm.h not found])])])
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server])
|
||||
RGB_CFLAGS="$RGB_CFLAGS $XORG_CFLAGS"
|
||||
RGB_DB_FILES='$(db_file).dir $(db_file).pag'
|
||||
;;
|
||||
ndbm)
|
||||
# Find a dbm or ndbm implementation
|
||||
AC_SEARCH_LIBS([dbm_open], [db ndbm dbm],
|
||||
AC_DEFINE([NDBM], [1],
|
||||
AC_SEARCH_LIBS([dbm_open], [db ndbm dbm],
|
||||
AC_DEFINE([NDBM], [1],
|
||||
[Define to 1 if you have ndbm.h interfaces]),
|
||||
AC_MSG_ERROR([ndbm requested but dbm_open() not found in any libraries]))
|
||||
RGB_DB_FILES="$(db_file).dir $(db_file).pag"
|
||||
DBM_HEADER='<ndbm.h>'
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server])
|
||||
RGB_CFLAGS="$RGB_CFLAGS $XORG_CFLAGS"
|
||||
RGB_DB_FILES='$(db_file).dir $(db_file).pag'
|
||||
;;
|
||||
esac
|
||||
if test x$DBM_HEADER != x ; then
|
||||
AC_DEFINE_UNQUOTED([DBM_HEADER], [$DBM_HEADER],
|
||||
[Header file to include for dbm functions])
|
||||
fi
|
||||
AC_SUBST([RGB_DB_TYPE])
|
||||
AC_SUBST([RGB_DB_FILES])
|
||||
AM_CONDITIONAL(RGB_TXT, [test x$db_type = xtext])
|
||||
AM_CONDITIONAL(RGB_DB, [test x$db_type != xtext])
|
||||
|
||||
PKG_CHECK_MODULES(RGB, xproto)
|
||||
AC_SUBST(RGB_CFLAGS)
|
||||
|
||||
XORG_MANPAGE_SECTIONS
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
/* $Xorg: rgb.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ */
|
||||
/* $XdotOrg: app/rgb/rgb.c,v 1.4 2005/11/08 06:33:31 jkj Exp $ */
|
||||
/*
|
||||
|
||||
Copyright 1985, 1998 The Open Group
|
||||
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
|
||||
from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/programs/rgb/rgb.c,v 3.8tsi Exp $ */
|
||||
|
||||
|
||||
/* reads from standard input lines of the form:
|
||||
@@ -39,14 +36,8 @@ from The Open Group.
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef NDBM
|
||||
#include <ndbm.h>
|
||||
#else
|
||||
#if defined(SVR4)
|
||||
#include <rpcsvc/dbm.h>
|
||||
#else
|
||||
#include <dbm.h>
|
||||
#endif
|
||||
#include DBM_HEADER
|
||||
#ifndef NDBM
|
||||
#define dbm_open(name,flags,mode) (!dbminit(name))
|
||||
#define dbm_store(db,key,content,flags) (store(key,content))
|
||||
#define dbm_close(db) dbmclose()
|
||||
@@ -57,23 +48,14 @@ from The Open Group.
|
||||
#include <stdlib.h>
|
||||
#include <X11/Xos.h>
|
||||
#include "rgb.h"
|
||||
#include "site.h"
|
||||
#include <ctype.h>
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
char *ProgramName;
|
||||
|
||||
char *SysError ()
|
||||
{
|
||||
register char *s = strerror(errno);
|
||||
return s ? s : "?";
|
||||
}
|
||||
static char *ProgramName;
|
||||
|
||||
int
|
||||
main(argc, argv)
|
||||
int argc;
|
||||
char **argv;
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
char *dbname;
|
||||
char line[512];
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
! $Xorg: rgb.txt,v 1.3 2000/08/17 19:54:00 cpqbld Exp $
|
||||
255 250 250 snow
|
||||
248 248 255 ghost white
|
||||
248 248 255 GhostWhite
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
/*
|
||||
* $Xorg: showrgb.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $
|
||||
* $XdotOrg: app/rgb/showrgb.c,v 1.5 2005/11/08 06:33:31 jkj Exp $
|
||||
*
|
||||
Copyright 1989, 1998 The Open Group
|
||||
|
||||
@@ -27,21 +25,13 @@ in this Software without prior written authorization from The Open Group.
|
||||
* Author: Jim Fulton, MIT X Consortium
|
||||
*/
|
||||
|
||||
/* $XFree86: xc/programs/rgb/showrgb.c,v 3.8 2001/12/14 20:01:04 dawes Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifndef USE_RGB_TXT
|
||||
#ifdef NDBM
|
||||
#include <ndbm.h>
|
||||
#else
|
||||
#if defined(SVR4)
|
||||
#include <rpcsvc/dbm.h>
|
||||
#else
|
||||
#include <dbm.h>
|
||||
#endif
|
||||
#include DBM_HEADER
|
||||
#ifndef NDBM
|
||||
#define dbm_open(name,flags,mode) (!dbminit(name))
|
||||
#define dbm_firstkey(db) (firstkey())
|
||||
#define dbm_fetch(db,key) (fetch(key))
|
||||
@@ -55,11 +45,10 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include <stdlib.h>
|
||||
#ifndef USE_RGB_TXT
|
||||
#include "rgb.h" /* off in server/include/ */
|
||||
#include "site.h"
|
||||
#endif
|
||||
#include <X11/Xfuncs.h>
|
||||
|
||||
char *ProgramName;
|
||||
static char *ProgramName;
|
||||
static void dumprgb(char *filename);
|
||||
|
||||
int
|
||||
@@ -77,8 +66,7 @@ main (int argc, char *argv[])
|
||||
|
||||
#ifndef USE_RGB_TXT
|
||||
static void
|
||||
dumprgb (filename)
|
||||
char *filename;
|
||||
dumprgb (char *filename)
|
||||
{
|
||||
#ifdef NDBM
|
||||
DBM *rgb_dbm;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
.\" $Xorg: showrgb.man,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $
|
||||
.\" Copyright 1993, 1998 The Open Group
|
||||
.\"
|
||||
.\" Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@@ -23,11 +22,9 @@
|
||||
.\" other dealings in this Software without prior written authorization
|
||||
.\" from The Open Group.
|
||||
.\"
|
||||
.\" $XFree86: xc/programs/rgb/showrgb.man,v 1.7 2001/12/14 20:01:04 dawes Exp $
|
||||
.\"
|
||||
.TH SHOWRGB 1 __xorgversion__
|
||||
.SH NAME
|
||||
showrgb \- uncompile an rgb color-name database
|
||||
showrgb \- display an rgb color-name database
|
||||
.SH SYNOPSIS
|
||||
.B showrgb
|
||||
[
|
||||
@@ -36,13 +33,13 @@ showrgb \- uncompile an rgb color-name database
|
||||
.SH DESCRIPTION
|
||||
The
|
||||
.I showrgb
|
||||
program reads an rgb color-name database compiled for use with the dbm
|
||||
database routines and converts it back to source form, printing the
|
||||
program reads an rgb color-name database from a __RGB_DB_TYPE__ file
|
||||
and converts it back to source form, printing the
|
||||
result to standard output. The default
|
||||
database is the one that X was built with, and may be overridden on
|
||||
the command line. Specify the database name without
|
||||
the \fI.pag\fP or \fI.dir\fP suffix.
|
||||
the \fI.txt\fP, \fI.pag\fP or \fI.dir\fP suffix.
|
||||
.SH FILES
|
||||
.TP 20
|
||||
.I __projectroot__/lib/X11/rgb
|
||||
.I __RGB_DB__
|
||||
default database.
|
||||
|
||||
Reference in New Issue
Block a user