From a13b75f056f9f9efcf6ecb8610b40ddbbb2bbb69 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 19 Jan 2011 17:29:52 +0000 Subject: xserver pixman mesa git update 19 jan 2011 --- xorg-server/hw/xfree86/utils/gtf/Makefile.am | 71 +++++++++++----------------- xorg-server/hw/xfree86/utils/gtf/gtf.man.pre | 45 ------------------ 2 files changed, 27 insertions(+), 89 deletions(-) delete mode 100644 xorg-server/hw/xfree86/utils/gtf/gtf.man.pre (limited to 'xorg-server/hw/xfree86/utils/gtf') diff --git a/xorg-server/hw/xfree86/utils/gtf/Makefile.am b/xorg-server/hw/xfree86/utils/gtf/Makefile.am index 0852541bd..f77bf608e 100644 --- a/xorg-server/hw/xfree86/utils/gtf/Makefile.am +++ b/xorg-server/hw/xfree86/utils/gtf/Makefile.am @@ -1,44 +1,27 @@ -# Copyright (c) 2005, Oracle and/or its affiliates. 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, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# - -bin_PROGRAMS = gtf - -gtf_SOURCES = gtf.c -gtf_CFLAGS = $(XORG_CFLAGS) -gtf_LDADD = -lm - -appmandir = $(APP_MAN_DIR) - -appman_PRE = gtf.man -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -include $(top_srcdir)/cpprules.in - -EXTRA_DIST = gtf.man.pre -BUILT_SOURCES = $(appman_PRE) -CLEANFILES = $(appman_PRE) $(appman_DATA) - -SUFFIXES += .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - -$(AM_V_at)rm -f $@ - $(AM_V_at)$(LN_S) $< $@ +# Copyright (c) 2005, Oracle and/or its affiliates. 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, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +bin_PROGRAMS = gtf + +gtf_SOURCES = gtf.c +gtf_CFLAGS = $(XORG_CFLAGS) +gtf_LDADD = -lm diff --git a/xorg-server/hw/xfree86/utils/gtf/gtf.man.pre b/xorg-server/hw/xfree86/utils/gtf/gtf.man.pre deleted file mode 100644 index 74ade74cb..000000000 --- a/xorg-server/hw/xfree86/utils/gtf/gtf.man.pre +++ /dev/null @@ -1,45 +0,0 @@ -.\" $XFree86$ -.TH GTF 1 __vendorversion__ -.SH NAME -gtf - calculate VESA GTF mode lines -.SH SYNOPSIS -.B gtf -.I h-resolution -.I v-resolution -.I refresh -.RB [ \-v | \-\-verbose ] -.RB [ \-f | \-\-fbmode ] -.RB [ \-x | \-\-xorgmode ] -.SH DESCRIPTION -.I Gtf -is a utility for calculating VESA GTF modes. Given the desired -horizontal and vertical resolutions and refresh rate (in Hz), the parameters -for a matching VESA GTF mode are printed out. Two output formats are -supported: mode lines suitable for the __xservername__ -.B __xconfigfile__(__filemansuffix__) -file, and mode parameters suitable for the Linux -.B fbset(8) -utility. - -.SH OPTIONS -.TP 8 -.BR \-v | \-\-verbose -Enable verbose printouts This shows a trace for each step of the -computation. -.TP 8 -.BR \-x | \-\-xorgmode -Print the mode parameters as __xservername__-style mode lines. This is the -default format. -.TP 8 -.BR \-f | \-\-fbset -Print the mode parameters in a format suitable for -.BR fbset(8) . -.SH "SEE ALSO" -__xconfigfile__(__filemansuffix__) -.SH AUTHOR -Andy Ritger. -.PP -This program is based on the Generalized Timing Formula (GTF(TM)) Standard -Version: 1.0, Revision: 1.0. The GTF Excel(TM) spreadsheet, a sample -(and the definitive) implementation of the GTF Timing Standard is -available at . -- cgit v1.2.3