xfree86/cvt: Drop cvt utility
The cvt utility is now replaced by the standalone version found in libxcvt, no need to build the one in xfree86 anymore. Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1142 Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
parent
f788289bdc
commit
f2781e9536
|
@ -2488,7 +2488,6 @@ hw/xfree86/x86emu/Makefile
|
|||
hw/xfree86/xkb/Makefile
|
||||
hw/xfree86/utils/Makefile
|
||||
hw/xfree86/utils/man/Makefile
|
||||
hw/xfree86/utils/cvt/Makefile
|
||||
hw/xfree86/utils/gtf/Makefile
|
||||
hw/dmx/config/Makefile
|
||||
hw/dmx/config/man/Makefile
|
||||
|
|
|
@ -171,15 +171,6 @@ if get_option('suid_wrapper')
|
|||
)
|
||||
endif
|
||||
|
||||
executable('cvt',
|
||||
['utils/cvt/cvt.c', 'modes/xf86cvt.c'],
|
||||
include_directories: [inc, xorg_inc],
|
||||
dependencies: [ xorg_deps, libxcvt_dep ],
|
||||
link_with: libxserver_os,
|
||||
c_args: xorg_c_args,
|
||||
install: true,
|
||||
)
|
||||
|
||||
executable('gtf',
|
||||
'utils/gtf/gtf.c',
|
||||
include_directories: [inc, xorg_inc],
|
||||
|
@ -234,12 +225,6 @@ install_man(configure_file(
|
|||
configuration: manpage_config,
|
||||
))
|
||||
|
||||
install_man(configure_file(
|
||||
input: 'utils/man/cvt.man',
|
||||
output: 'cvt.1',
|
||||
configuration: manpage_config,
|
||||
))
|
||||
|
||||
install_man(configure_file(
|
||||
input: 'utils/man/gtf.man',
|
||||
output: 'gtf.1',
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
SUBDIRS = \
|
||||
gtf \
|
||||
cvt \
|
||||
man
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
cvt
|
|
@ -1,36 +0,0 @@
|
|||
# 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 = cvt
|
||||
|
||||
AM_CPPFLAGS = $(XORG_INCS) \
|
||||
-I$(top_srcdir)/hw/xfree86/ddc \
|
||||
-I$(top_srcdir)/hw/xfree86/modes \
|
||||
-I$(top_srcdir)/hw/xfree86/parser
|
||||
|
||||
# gah
|
||||
cvt_SOURCES = cvt.c \
|
||||
$(top_srcdir)/hw/xfree86/modes/xf86cvt.c \
|
||||
$(top_srcdir)/os/xprintf.c
|
||||
|
||||
cvt_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
|
||||
cvt_LDADD = $(LIBXCVT_LIBS)
|
|
@ -1,294 +0,0 @@
|
|||
/*
|
||||
* Copyright 2005-2006 Luc Verhaegen.
|
||||
*
|
||||
* 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
|
||||
*
|
||||
*/
|
||||
|
||||
/* Standalone VESA CVT standard timing modelines generator. */
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86Modes.h"
|
||||
|
||||
/* FatalError implementation used by the server code we built in */
|
||||
void
|
||||
FatalError(const char *f, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_start(args, f);
|
||||
vfprintf(stderr, f, args);
|
||||
va_end(args);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/* xnfalloc implementation used by the server code we built in */
|
||||
void *
|
||||
XNFalloc(unsigned long n)
|
||||
{
|
||||
void *r;
|
||||
|
||||
r = malloc(n);
|
||||
if (!r) {
|
||||
perror("malloc failed");
|
||||
exit(1);
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
/* xnfcalloc implementation used by the server code we built in */
|
||||
void *
|
||||
XNFcallocarray(size_t nmemb, size_t size)
|
||||
{
|
||||
void *r;
|
||||
|
||||
r = calloc(nmemb, size);
|
||||
if (!r) {
|
||||
perror("calloc failed");
|
||||
exit(1);
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
/*
|
||||
* Quickly check whether this is a CVT standard mode.
|
||||
*/
|
||||
static Bool
|
||||
CVTCheckStandard(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
|
||||
Bool Verbose)
|
||||
{
|
||||
Bool IsCVT = TRUE;
|
||||
|
||||
if ((!(VDisplay % 3) && ((VDisplay * 4 / 3) == HDisplay)) ||
|
||||
(!(VDisplay % 9) && ((VDisplay * 16 / 9) == HDisplay)) ||
|
||||
(!(VDisplay % 10) && ((VDisplay * 16 / 10) == HDisplay)) ||
|
||||
(!(VDisplay % 4) && ((VDisplay * 5 / 4) == HDisplay)) ||
|
||||
(!(VDisplay % 9) && ((VDisplay * 15 / 9) == HDisplay)));
|
||||
else {
|
||||
if (Verbose)
|
||||
fprintf(stderr, "Warning: Aspect Ratio is not CVT standard.\n");
|
||||
IsCVT = FALSE;
|
||||
}
|
||||
|
||||
if ((VRefresh != 50.0) && (VRefresh != 60.0) &&
|
||||
(VRefresh != 75.0) && (VRefresh != 85.0)) {
|
||||
if (Verbose)
|
||||
fprintf(stderr, "Warning: Refresh Rate is not CVT standard "
|
||||
"(50, 60, 75 or 85Hz).\n");
|
||||
IsCVT = FALSE;
|
||||
}
|
||||
|
||||
return IsCVT;
|
||||
}
|
||||
|
||||
/*
|
||||
* I'm not documenting --interlaced for obvious reasons, even though I did
|
||||
* implement it. I also can't deny having looked at gtf here.
|
||||
*/
|
||||
static void
|
||||
PrintUsage(char *Name)
|
||||
{
|
||||
fprintf(stderr, "\n");
|
||||
fprintf(stderr, "usage: %s [-v|--verbose] [-r|--reduced] X Y [refresh]\n",
|
||||
Name);
|
||||
fprintf(stderr, "\n");
|
||||
fprintf(stderr, " -v|--verbose : Warn about CVT standard adherence.\n");
|
||||
fprintf(stderr, " -r|--reduced : Create a mode with reduced blanking "
|
||||
"(default: normal blanking).\n");
|
||||
fprintf(stderr, " X : Desired horizontal resolution "
|
||||
"(multiple of 8, required).\n");
|
||||
fprintf(stderr,
|
||||
" Y : Desired vertical resolution (required).\n");
|
||||
fprintf(stderr,
|
||||
" refresh : Desired refresh rate (default: 60.0Hz).\n");
|
||||
fprintf(stderr, "\n");
|
||||
|
||||
fprintf(stderr, "Calculates VESA CVT (Coordinated Video Timing) modelines"
|
||||
" for use with X.\n");
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
static void
|
||||
PrintComment(DisplayModeRec * Mode, Bool CVT, Bool Reduced)
|
||||
{
|
||||
printf("# %dx%d %.2f Hz ", Mode->HDisplay, Mode->VDisplay, Mode->VRefresh);
|
||||
|
||||
if (CVT) {
|
||||
printf("(CVT %.2fM",
|
||||
((float) Mode->HDisplay * Mode->VDisplay) / 1000000.0);
|
||||
|
||||
if (!(Mode->VDisplay % 3) &&
|
||||
((Mode->VDisplay * 4 / 3) == Mode->HDisplay))
|
||||
printf("3");
|
||||
else if (!(Mode->VDisplay % 9) &&
|
||||
((Mode->VDisplay * 16 / 9) == Mode->HDisplay))
|
||||
printf("9");
|
||||
else if (!(Mode->VDisplay % 10) &&
|
||||
((Mode->VDisplay * 16 / 10) == Mode->HDisplay))
|
||||
printf("A");
|
||||
else if (!(Mode->VDisplay % 4) &&
|
||||
((Mode->VDisplay * 5 / 4) == Mode->HDisplay))
|
||||
printf("4");
|
||||
else if (!(Mode->VDisplay % 9) &&
|
||||
((Mode->VDisplay * 15 / 9) == Mode->HDisplay))
|
||||
printf("9");
|
||||
|
||||
if (Reduced)
|
||||
printf("-R");
|
||||
|
||||
printf(") ");
|
||||
}
|
||||
else
|
||||
printf("(CVT) ");
|
||||
|
||||
printf("hsync: %.2f kHz; ", Mode->HSync);
|
||||
printf("pclk: %.2f MHz", ((float) Mode->Clock) / 1000.0);
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
/*
|
||||
* Originally grabbed from xf86Mode.c.
|
||||
*
|
||||
* Ignoring the actual Mode->name, as the user will want something solid
|
||||
* to grab hold of.
|
||||
*/
|
||||
static void
|
||||
PrintModeline(DisplayModePtr Mode, int HDisplay, int VDisplay, float VRefresh,
|
||||
Bool Reduced)
|
||||
{
|
||||
if (Reduced)
|
||||
printf("Modeline \"%dx%dR\" ", HDisplay, VDisplay);
|
||||
else
|
||||
printf("Modeline \"%dx%d_%.2f\" ", HDisplay, VDisplay, VRefresh);
|
||||
|
||||
printf("%6.2f %i %i %i %i %i %i %i %i", Mode->Clock / 1000.,
|
||||
Mode->HDisplay, Mode->HSyncStart, Mode->HSyncEnd, Mode->HTotal,
|
||||
Mode->VDisplay, Mode->VSyncStart, Mode->VSyncEnd, Mode->VTotal);
|
||||
|
||||
if (Mode->Flags & V_INTERLACE)
|
||||
printf(" interlace");
|
||||
if (Mode->Flags & V_PHSYNC)
|
||||
printf(" +hsync");
|
||||
if (Mode->Flags & V_NHSYNC)
|
||||
printf(" -hsync");
|
||||
if (Mode->Flags & V_PVSYNC)
|
||||
printf(" +vsync");
|
||||
if (Mode->Flags & V_NVSYNC)
|
||||
printf(" -vsync");
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
DisplayModeRec *Mode;
|
||||
int HDisplay = 0, VDisplay = 0;
|
||||
float VRefresh = 0.0;
|
||||
Bool Reduced = FALSE, Verbose = FALSE, IsCVT;
|
||||
Bool Interlaced = FALSE;
|
||||
int n;
|
||||
|
||||
if ((argc < 3) || (argc > 7)) {
|
||||
PrintUsage(argv[0]);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* This doesn't filter out bad flags properly. Bad flags get passed down
|
||||
* to atoi/atof, which then return 0, so that these variables can get
|
||||
* filled next time round. So this is just a cosmetic problem.
|
||||
*/
|
||||
for (n = 1; n < argc; n++) {
|
||||
if (!strcmp(argv[n], "-r") || !strcmp(argv[n], "--reduced"))
|
||||
Reduced = TRUE;
|
||||
else if (!strcmp(argv[n], "-i") || !strcmp(argv[n], "--interlaced"))
|
||||
Interlaced = TRUE;
|
||||
else if (!strcmp(argv[n], "-v") || !strcmp(argv[n], "--verbose"))
|
||||
Verbose = TRUE;
|
||||
else if (!strcmp(argv[n], "-h") || !strcmp(argv[n], "--help")) {
|
||||
PrintUsage(argv[0]);
|
||||
return 0;
|
||||
}
|
||||
else if (!HDisplay) {
|
||||
HDisplay = atoi(argv[n]);
|
||||
if (!HDisplay) {
|
||||
PrintUsage(argv[0]);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else if (!VDisplay) {
|
||||
VDisplay = atoi(argv[n]);
|
||||
if (!VDisplay) {
|
||||
PrintUsage(argv[0]);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else if (!VRefresh) {
|
||||
VRefresh = atof(argv[n]);
|
||||
if (!VRefresh) {
|
||||
PrintUsage(argv[0]);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else {
|
||||
PrintUsage(argv[0]);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (!HDisplay || !VDisplay) {
|
||||
PrintUsage(argv[0]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Default to 60.0Hz */
|
||||
if (!VRefresh)
|
||||
VRefresh = 60.0;
|
||||
|
||||
/* Horizontal timing is always a multiple of 8: round up. */
|
||||
if (HDisplay & 0x07) {
|
||||
HDisplay &= ~0x07;
|
||||
HDisplay += 8;
|
||||
}
|
||||
|
||||
if (Reduced) {
|
||||
if ((VRefresh / 60.0) != floor(VRefresh / 60.0)) {
|
||||
fprintf(stderr,
|
||||
"\nERROR: Multiple of 60Hz refresh rate required for "
|
||||
" reduced blanking.\n");
|
||||
PrintUsage(argv[0]);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
IsCVT = CVTCheckStandard(HDisplay, VDisplay, VRefresh, Reduced, Verbose);
|
||||
|
||||
Mode = xf86CVTMode(HDisplay, VDisplay, VRefresh, Reduced, Interlaced);
|
||||
|
||||
PrintComment(Mode, IsCVT, Reduced);
|
||||
PrintModeline(Mode, HDisplay, VDisplay, VRefresh, Reduced);
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -1,2 +1,2 @@
|
|||
include $(top_srcdir)/manpages.am
|
||||
appman_PRE = cvt.man gtf.man
|
||||
appman_PRE = gtf.man
|
||||
|
|
|
@ -1,41 +0,0 @@
|
|||
.TH CVT 1 @vendorversion@
|
||||
.SH NAME
|
||||
cvt - calculate VESA CVT mode lines
|
||||
.SH SYNOPSIS
|
||||
.B cvt
|
||||
.RB [ \-v | \-\-verbose ]
|
||||
.RB [ \-r | \-\-reduced ]
|
||||
.I h-resolution
|
||||
.I v-resolution
|
||||
.RB [ refresh ]
|
||||
.SH DESCRIPTION
|
||||
.I Cvt
|
||||
is a utility for calculating VESA Coordinated Video Timing modes. Given the
|
||||
desired horizontal and vertical resolutions, a modeline adhering to the CVT
|
||||
standard is printed. This modeline can be included in Xorg
|
||||
.B xorg.conf(@filemansuffix@)
|
||||
.
|
||||
|
||||
.SH OPTIONS
|
||||
.TP 8
|
||||
.BR refresh
|
||||
Provide a vertical refresh rate in Hz. The CVT standard prefers either 50.0,
|
||||
60.0, 75.0 or 85.0Hz. The default is 60.0Hz.
|
||||
.TP 8
|
||||
.BR \-v | \-\-verbose
|
||||
Warn verbosely when a given mode does not completely correspond with CVT
|
||||
standards.
|
||||
.TP 8
|
||||
.BR \-r | \-\-reduced
|
||||
Create a mode with reduced blanking. This allows for higher frequency signals,
|
||||
with a lower or equal dotclock. Not for Cathode Ray Tube based displays though.
|
||||
|
||||
.SH "SEE ALSO"
|
||||
xorg.conf(@filemansuffix@), gtf(@appmansuffix@)
|
||||
.SH AUTHOR
|
||||
Luc Verhaegen.
|
||||
.PP
|
||||
This program is based on the Coordinated Video Timing sample
|
||||
implementation written by Graham Loveridge. This file is publicly
|
||||
available at <http://www.vesa.org/Public/CVT/CVTd6r1.xls>. CVT is a
|
||||
VESA trademark.
|
Loading…
Reference in New Issue