--- videogen-0.32.orig/debian/manpages +++ videogen-0.32/debian/manpages @@ -0,0 +1,2 @@ +videogen.1x +debian/some_modes.1x --- videogen-0.32.orig/debian/compat +++ videogen-0.32/debian/compat @@ -0,0 +1 @@ +5 --- videogen-0.32.orig/debian/some_modes.1x +++ videogen-0.32/debian/some_modes.1x @@ -0,0 +1,21 @@ +.TH SOME_MODES 1 "some_modes" "Szabolcs Rumi" \" -*- nroff -*- +.SH NAME +some_modes \- generate common Modelines for Xorg and fbset +.SH SYNOPSIS +.B some_modes +.SH DESCRIPTION +.B some_modes +is a wrapper for \fBvideogen\fP(1). It interactively asks the +user for monitor parameters. Then it prints commonly-used mode +lines for use with Xorg (or its predecessor, XFree86) and fbset. +.P +.SH FILES +The file \fI~/.videogen\fP is used to store the user's input between +invocations. +.SH SEE ALSO +videogen(1), Xorg(1), xorg.conf(5), xvidtune(1) +.SH AUTHOR +Szabolcs Rumi +.SH COPYING +GNU General Public License Version 2 (found in +/usr/share/common-licenses on Debian systems) --- videogen-0.32.orig/debian/examples +++ videogen-0.32/debian/examples @@ -0,0 +1 @@ +videogen.sample --- videogen-0.32.orig/debian/watch +++ videogen-0.32/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://www.dynaweb.hu/opensource/videogen/download/videogen-([\d.]+)\.tar\.gz --- videogen-0.32.orig/debian/docs +++ videogen-0.32/debian/docs @@ -0,0 +1,4 @@ +BUGS +CHANGES +README +THANKS --- videogen-0.32.orig/debian/copyright +++ videogen-0.32/debian/copyright @@ -0,0 +1,18 @@ +This package was originally debianized by Eduard Bloch +on Fri Mar 2 23:20:15 CET 2001. +It was maintained by Matthias Urlichs from +Jul 16, 2003 until Jul 12, 2006 +It is currently maintained by Bas Zoetekouw . + +It was originally downloaded from http://paranoia.rulez.org/videogen/. +The current homepage is at http://www.dynaweb.hu/opensource/videogen/ + +Upstream Author: Rumi Szabolcs + +Copyright (C) 1997-2002 Rumi Szabolcs +All rights reserved. + +You are free to distribute this software under the terms of the GNU +General Public License. On Debian systems, the complete text of the +GNU General Public License can be found in +/usr/share/common-licenses/GPL file on Debian systems. --- videogen-0.32.orig/debian/dirs +++ videogen-0.32/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/man/man1 --- videogen-0.32.orig/debian/control +++ videogen-0.32/debian/control @@ -0,0 +1,23 @@ +Source: videogen +Section: x11 +Priority: optional +Maintainer: Bas Zoetekouw +Standards-Version: 3.8.2 +Build-Depends: debhelper (>= 5), flex, bison, dpatch +Homepage: http://www.dynaweb.hu/opensource/videogen/ + +Package: videogen +Architecture: any +Depends: bc, ${shlibs:Depends} +Description: Create arbitrary-res modelines using hardware parameters + Videogen is a small but nice utility to create modelines you can + insert into your xorg.conf and fb.modes files. + . + Modeline is created by telling the program the resolution you want + and your video hardware parameters (maximum video adapter + bandwidth, maximum HCF and VCF of the monitor etc). + . + Note that for most modern installations, Xorg will handle its own modesetting + automatically, and you don't need videogen to generate any Modelines. + . + The tool 'some_modes' may help you to create some common modes fast. --- videogen-0.32.orig/debian/rules +++ videogen-0.32/debian/rules @@ -0,0 +1,71 @@ +#!/usr/bin/make -f +# debian/rules file for videogen. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +CFLAGS=-g -Wall +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +export CFLAGS + +build: build-stamp +build-stamp: patch + dh_testdir + + $(MAKE) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + test -f Makefile && $(MAKE) distclean + rm -f cfg.tab.c cfg.tab.h cfg.yy.c + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/videogen. + #$(MAKE) install DESTDIR=`pwd`/debian/videogen + install -m 755 videogen debian/videogen/usr/bin/ + install -m 755 debian/some_modes.sh debian/videogen/usr/bin/some_modes + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install +# dh_testversion + dh_testdir + dh_testroot + dh_installdocs + dh_installman + dh_installexamples + dh_installchangelogs CHANGES + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- videogen-0.32.orig/debian/NEWS +++ videogen-0.32/debian/NEWS @@ -0,0 +1,10 @@ +videogen (0.32-1) unstable; urgency=low + + Noteworthy changes / new features: + - Videogen can now process configuration files. + Enter your monitor parameters and preferred mode lines _once_! ;-) + - The interactive mode (-i) has been removed. + - Support for the non-free Nvidia driver is now included upstream. + + -- Matthias Urlichs Wed, 16 Jul 2003 05:01:10 +0200 + --- videogen-0.32.orig/debian/some_modes.sh +++ videogen-0.32/debian/some_modes.sh @@ -0,0 +1,159 @@ +#!/bin/bash +# +-----------------------------------------------------------+ +# | | +# | use this script to generate some mode lines automatically | +# | with videogen. | +# | | +# | (c) Szabolcs Rumi, 1997-2001 | +# | | +# +-----------------------------------------------------------+ + +# you may change this to the location of the videogen program +VIDEOGEN="${VIDEOGEN=videogen} -f=/dev/null" + +# set this to the maximum dot clock your video card can generate [MHz] +DOTCLOCK="225" +DEF_DOTCLOCK=$DOTCLOCK + +# set this to the maximum horizontal refresh rate of your monitor [kHz] +HORIZ="64" +DEF_HORIZ=$HORIZ + +# set this to the maximum vertical refresh rate of your monitor [Hz] +VERT="120" +DEF_VERT=$VERT + +# set this to the minimum horizontal sync pulse length of your monitor [us] +MINSYNC="0.5" +DEF_MINSYNC="0.5" + +NVIDIA="yes" + +# load our settings +if test -f ~/.videogenrc ; then +. ~/.videogenrc +fi + +if test -z "$DIALOG" ; then + which dialog > /dev/null && DIALOG=dialog + which whiptail > /dev/null && DIALOG=whiptail + which gdialog > /dev/null && DIALOG=gdialog +fi + +# The dialog part +#DIALOG=${DIALOG=whiptail} +tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$ +trap "rm -f $tempfile" 0 1 2 5 15 + +$DIALOG \ + --title "GENERAL WARNING" --clear --yesno \ +"WARNING! WARNING! WARNING! + +THE USE OF THIS PROGRAM CAN CAUSE PERMANENT DAMAGE TO YOUR MONITOR AND/OR VIDEO CARD. IF YOU ARE NOT SURE WHAT YOU ARE DOING, HIT 'NO' NOW, OTHERWISE, HIT 'YES' TO CONTINUE. + +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 SOFTWARE 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." 22 70 || exit 1 + + +$DIALOG --title "HINTS" --clear --msgbox \ +"There are no perfect modelines for all monitors. + +There are many monitors that can be damaged by using wrong and non-standard modes, so better make sure that it will power-off if an invalid mode is tried. + +Note that when the initial set of Modeline has been generated and you run X, you can use xvidtune for fine configuration. Using xvidtune's 'auto' mode, you can find the best working timing values, than you can hit 'show' to dump them to the console and replace the values of that Modeline with the dumped numbers." 20 60 + +$DIALOG \ + --title "INPUT BOX" --clear \ + --inputbox "Please enter the maximum dot clock your video card can generate [MHz]. (default: $DEF_DOTCLOCK)" 10 51 $DOTCLOCK 2> $tempfile +retval=$? + +case $retval in + 0) + read DOTCLOCK < $tempfile ;; + *) + exit 1;; +esac + +$DIALOG \ + --title "INPUT BOX" --clear \ + --inputbox "Please enter the maximum horizontal refresh rate of your monitor [kHz]. (default: $DEF_HORIZ)" 10 51 $HORIZ 2> $tempfile +retval=$? +case $retval in + 0) + read HORIZ < $tempfile ;; + *) + exit 1;; +esac + +$DIALOG \ + --title "INPUT BOX" --clear \ + --inputbox "Please enter the maximum vertical refresh rate of your monitor [Hz]. (default: $DEF_VERT)" 10 51 $VERT 2> $tempfile +retval=$? + +case $retval in + 0) + read VERT < $tempfile ;; + *) + exit 1;; +esac + +$DIALOG \ + --title "INPUT BOX" --clear \ + --inputbox "Please enter the minimum horizontal sync pulse length of your monitor [us]. (default: $DEF_MINSYNC)" 10 51 $MINSYNC 2> $tempfile +retval=$? + +case $retval in + 0) + read MINSYNC < $tempfile ;; + *) + exit 1;; +esac + +if test "$NVIDIA" = "yes" ; then + NV="" +else + NV="--defaultno" +fi +if $DIALOG $NV \ + --title "NVIDIA COMPATIBILITY" --yesno "The non-free Nvidia drivers available from www.nvidia.com require small changes in calculating algorithm. Without them, many Modelines are not accepted by the driver. Should videogen try to make compatible lines?" 10 51 2> $tempfile ; then + VIDEOGEN="$VIDEOGEN -nv" + NVIDIA="yes" +else + VIDEOGEN="$VIDEOGEN -nnv" + NVIDIA="no" +fi + +rm -rf ~/.videogenrc +(cat </dev/null +echo '-------------------------------------------------------------------------' +echo 'Now you can edit your XF86Config(-4) file, locate the "Monitor"' +echo 'section and input the generated lines there. For framebuffer lines,' +echo 'use "fbset" directly or enter them into /etc/fb.modes. Take a look at the' +echo 'manpages fbset(1) and fb.modes(5) to see what this is about.' +if [ -z "`echo \"-1.5 + $MINSYNC\" | bc | cut -f1 -d.`" ] ; then + MINSYNC=1.5 +fi +echo '' +echo 'NOTE: choosen minimal horizontal sync value is too high, choosing 1.5!' +echo '-------------------------------------------------------------------------' +tput sgr 0 2>/dev/null # turn off bold mode + +# these are the lines printing out the main thing +for M in "" "-fb" ; do + for R in 640x400 640x480 800x600 1024x768 1152x864 1280x960 \ + 1280x1024 1600x1200 ; do + $VIDEOGEN $M -m=$R -mdc=$DOTCLOCK -mhf=$HORIZ -mvf=$VERT -hsp=$MINSYNC + done +done + +# EOF --- videogen-0.32.orig/debian/changelog +++ videogen-0.32/debian/changelog @@ -0,0 +1,156 @@ +videogen (0.32-5) unstable; urgency=low + + * Move to debhelper version 5 + * Add explicit copyright notice to copyright file + * Move to standards-version 3.8.3: + - add Homepage field to control file + + -- Bas Zoetekouw Fri, 03 Jul 2009 11:06:04 +0200 + +videogen (0.32-4) unstable; urgency=low + + * Fix debian/controlto refer to xorg.conf instead of XF86Config-4 + * Fix manpages to refer to Xorg and fix bad language + Thanks to J. S. Bygott for the patches. + [07_videogen_man.dpatch] (Closes: #410361) + * Bump Standards-Version to 3.7.3 (no changes required) + * Don't ignore errors in call to make clean, as suggested by lintian + + -- Bas Zoetekouw Fri, 14 Dec 2007 16:56:02 +0100 + +videogen (0.32-3) unstable; urgency=low + + * Updated policy to 3.7.2 (no changes needed) + * Dpatchified debian/rules and build-depend on dpatch + * Added improved error messages by Michael Sebastian + (closes: #345620) + + -- Bas Zoetekouw Wed, 23 Aug 2006 14:40:39 +0200 + +videogen (0.32-2) unstable; urgency=low + + * New Maintainer. + * Acknowledge NMU (thanks Julien!) (closes: #370596) + * Added watch file + + -- Bas Zoetekouw Wed, 12 Jul 2006 14:11:14 +0200 + +videogen (0.32-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Stop installing files in /usr/X11R6 (Closes: #370596). + * Switch to dh_installman instead of the deprecated dh_installmanpages. + + -- Julien Cristau Sat, 10 Jun 2006 04:51:12 +0200 + +videogen (0.32-1) unstable; urgency=low + + * New maintainer (closes: #122708). + * New upstream version. + * Removed menu entry; the program is no longer interactive. + * Removed non-free Nvidia patch; included in upstream. + * Upgraded debhelper compatibility version to 4 (no substantial changes). + * Updated standards version to 3.6.0 (no changes). + * New debian/NEWS file. + * Resurrected and updated some_modes.sh script + (deleted by upstream in version 0.30). + - added some_modes.1x manpage. + * Changed the program so that it prints usage error messages. + * Eduard Bloch: + - workaround in some_modes.sh to not choose too high value for hsp + - fixed the copyright comments in videogen.1x, some_modes.1x + + -- Matthias Urlichs Wed, 16 Jul 2003 05:47:25 +0200 + +videogen (0.21-10) unstable; urgency=low + + * Maintainer set to QA group. + * Removed build-essentials depends + * Policy set to 3.5.8 + + -- Francesco Paolo Lovergine Mon, 13 Jan 2003 13:48:27 +0100 + +videogen (0.21-9) unstable; urgency=low + + * Upstream not responding, made my own modifications to make it behave more + Nvidia compatible. Closes: #113221 + * More resolutions in the script, more warning, more hints. + + -- Eduard Bloch Sun, 20 Jan 2002 18:15:49 +0100 + +videogen (0.21-8) unstable; urgency=low + + * fixed typo in Depends: :(( + + -- Eduard Bloch Mon, 24 Sep 2001 21:26:41 +0200 + +videogen (0.21-7) unstable; urgency=low + + * fixed dialog dependency + + -- Eduard Bloch Wed, 19 Sep 2001 23:42:08 +0200 + +videogen (0.21-6) unstable; urgency=low + + * Argh, gdialog can work like dialog, removed checking for $DISPLAY + + -- Eduard Bloch Sun, 16 Sep 2001 15:19:12 +0200 + +videogen (0.21-5) unstable; urgency=low + + * replaced stuck dependency on dialog and made some_modes.sh look for + replacements, i.e. whiptail or gdialog + * Improved description, copyright and control files + * Added a comment about NVIDIA trouble to the BUGS file + + -- Eduard Bloch Sun, 16 Sep 2001 01:25:41 +0200 + +videogen (0.21-4) unstable; urgency=low + + * changed Build-Depends to make it compile on any arch (Thx to Matt Taggart) + + -- Eduard Bloch Mon, 9 Jul 2001 21:12:12 +0200 + +videogen (0.21-3) unstable; urgency=low + + * changed menu files, Closes: #88715 + + -- Eduard Bloch Thu, 24 May 2001 23:01:44 +0200 + +videogen (0.21-2) unstable; urgency=low + + * removed duplicated dialog calls in some_modes.sh + * addition to previos changelog entry: still patching some_modes.sh to get dialog interaction + + -- Eduard Bloch Sun, 1 Apr 2001 10:27:11 +0200 + +videogen (0.21-1) unstable; urgency=low + + * New upstream release + + -- Eduard Bloch Sat, 24 Mar 2001 13:41:07 +0100 + +videogen (0.20-2) unstable; urgency=low + + * menu entry + * Forgot to close a bug in the last upload, so Closes: #63246 + + -- Eduard Bloch Tue, 6 Mar 2001 09:52:45 +0100 + +videogen (0.20-1) unstable; urgency=low + + * Impossible to contact Edvard, adopting the package + * New upstream release + * some_modes included + + -- Eduard Bloch Sun, 7 Jan 2001 17:50:05 +0100 + +videogen (0.16-1) unstable; urgency=low + + * Initial Release. + + -- Edvard Majakari Wed, 5 Jan 2000 16:03:59 +0200 + +Local variables: +mode: debian-changelog +End: --- videogen-0.32.orig/debian/patches/04_manpage.dpatch +++ videogen-0.32/debian/patches/04_manpage.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_manpage.dpatch by Bas Zoetekouw +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix man page + +@DPATCH@ + +--- videogen-0.32.orig/videogen.1x ++++ videogen-0.32/videogen.1x +@@ -194,13 +194,14 @@ + .I "~/.videogen" + This is the default location for the videogen configuration file. + .TP +-.I "/usr/X11/lib/X11/XF86Config" ++.I "/etc/X11/XF86Config(-4)" + This is the common Xserver configuration file where the Modelines generated with + .B videogen + can be used. Currently this must be done by hand. + .SH SEE ALSO +-X(1), XF86Setup(1), xvidtune(1), kvideogen(1) ++some_modes(1), X(1), XF86Setup(1), xvidtune(1), kvideogen(1), xf86cfg(1) + .SH AUTHOR + Szabolcs Rumi + .SH COPYING +-GNU General Public License Version 2 ++GNU General Public License Version 2 (found in ++/usr/share/common-licenses on Debian systems) --- videogen-0.32.orig/debian/patches/03_nicer_errors_messages.dpatch +++ videogen-0.32/debian/patches/03_nicer_errors_messages.dpatch @@ -0,0 +1,106 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_nicer_error_messages.dpatch by Bas Zoetekouw +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Improved error messages by Michael Sebastian +## (closes: #345620) + +@DPATCH@ + +diff -urN videogen-0.32/args.c videogen-0.32-new/args.c +--- videogen-0.32/args.c 2006-01-02 00:28:21.000000000 -0800 ++++ videogen-0.32-new/args.c 2006-01-01 23:56:35.000000000 -0800 +@@ -152,6 +152,44 @@ + break; + } + ++ case 2: ++ case -2: { ++ pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\": width must be between %u and %u\n", ++ ap->aindex, (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter, ++ CFG_WIDTH_MIN, CFG_WIDTH_MAX); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter: width must be between %u and %u\n", ++ ap->aindex, ap->argv[ap->aindex], CFG_WIDTH_MIN, CFG_WIDTH_MAX); ++ return (-1); ++ } ++ ++ case 3: ++ case -3: { ++ pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\": height must be between %u and %u\n", ++ ap->aindex, (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter, ++ CFG_HEIGHT_MIN, CFG_HEIGHT_MAX); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter: height must be between %u and %u\n", ++ ap->aindex, ap->argv[ap->aindex], CFG_HEIGHT_MIN, CFG_HEIGHT_MAX); ++ return (-1); ++ } ++ ++ case 4: ++ case -4: { ++ pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\": aspect ratio must be between %f and %f\n", ++ ap->aindex, (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter, ++ CFG_ASPECT_RATIO_MIN, CFG_ASPECT_RATIO_MAX); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter: aspect ratio must be between %f and %f\n", ++ ap->aindex, ap->argv[ap->aindex], CFG_ASPECT_RATIO_MIN, CFG_ASPECT_RATIO_MAX); ++ return (-1); ++ } ++ ++ case 6: { ++ pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\": width must be a multiple of 8\n", ++ ap->aindex, (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter: width must be a multiple of 8\n", ++ ap->aindex, ap->argv[ap->aindex]); ++ return (-1); ++ } ++ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +diff -urN videogen-0.32/cfg.y videogen-0.32-new/cfg.y +--- videogen-0.32/cfg.y 2002-10-29 20:51:57.000000000 -0800 ++++ videogen-0.32-new/cfg.y 2006-01-02 00:14:22.000000000 -0800 +@@ -168,9 +168,44 @@ + break; + } + ++ case 2: ++ case -2: { ++ pmsg (VL_DEBUG, "[cfgfile] line %u: invalid parameter %lux%lu: width must be between %u and %u\n", ++ lexer_num_lines, $2, $4, CFG_WIDTH_MIN, CFG_WIDTH_MAX); ++ pmsg (VL_VERBOSE, "error at line %u: invalid parameter %lux%lu: width must be between %u and %u\n", ++ lexer_num_lines, $2, $4, CFG_WIDTH_MIN, CFG_WIDTH_MAX); ++ YYABORT; ++ } ++ ++ case 3: ++ case -3: { ++ pmsg (VL_DEBUG, "[cfgfile] line %u: invalid parameter %lux%lu: height must be between %u and %u\n", ++ lexer_num_lines, $2, $4, CFG_HEIGHT_MIN, CFG_HEIGHT_MAX); ++ pmsg (VL_VERBOSE, "error at line %u: invalid parameter %lux%lu: height must be between %u and %u\n", ++ lexer_num_lines, $2, $4, CFG_HEIGHT_MIN, CFG_HEIGHT_MAX); ++ YYABORT; ++ } ++ ++ case 4: ++ case -4: { ++ pmsg (VL_DEBUG, "[cfgfile] line %u: invalid parameter %lux%lu: aspect ratio must be between %f and %f\n", ++ lexer_num_lines, $2, $4, CFG_ASPECT_RATIO_MIN, CFG_ASPECT_RATIO_MAX); ++ pmsg (VL_VERBOSE, "error at line %u: invalid parameter %lux%lu: aspect ratio must be between %f and %f\n", ++ lexer_num_lines, $2, $4, CFG_ASPECT_RATIO_MIN, CFG_ASPECT_RATIO_MAX); ++ YYABORT; ++ } ++ ++ case 6: { ++ pmsg (VL_DEBUG, "[cfgfile] line %u: invalid parameter %lux%lu: width must be a multiple of 8\n", ++ lexer_num_lines, $2, $4); ++ pmsg (VL_VERBOSE, "error at line %u: invalid parameter %lux%lu: width must be a multiple of 8\n", ++ lexer_num_lines, $2, $4); ++ YYABORT; ++ } ++ + default: { + pmsg (VL_DEBUG, "[cfgfile] line %u: invalid parameter %lux%lu\n", lexer_num_lines, $2, $4); +- pmsg (VL_VERBOSE, "error at line %u: invalid parameter\n", lexer_num_lines); ++ pmsg (VL_VERBOSE, "error at line %u: invalid parameter %lux%lu\n", lexer_num_lines, $2, $4); + YYABORT; + } + } --- videogen-0.32.orig/debian/patches/01_print_errors.dpatch +++ videogen-0.32/debian/patches/01_print_errors.dpatch @@ -0,0 +1,296 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_print_errors.dpatch by Bas Zoetekouw +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Actually print out errors, also in non-verbose mode + +@DPATCH@ + +--- videogen-0.32.orig/args.c ++++ videogen-0.32/args.c +@@ -31,27 +31,27 @@ + + arg_opt_t opts[] = + { +- { "-h", NULL, 0 }, +- { "-v", NULL, 0 }, +- { "-q", NULL, 0 }, +- { "-fb", NULL, 0 }, +- { "-nfb", NULL, 0 }, +- { "-nv", NULL, 0 }, +- { "-nnv", NULL, 0 }, +- { "-f", NULL, 0 }, +- { "-m", NULL, 0 }, +- { "-mdc", NULL, 0 }, +- { "-mhf", NULL, 0 }, +- { "-mvf", NULL, 0 }, +- { "-dvf", NULL, 0 }, +- { "-hv", NULL, 0 }, +- { "-vv", NULL, 0 }, +- { "-hfp", NULL, 0 }, +- { "-hbp", NULL, 0 }, +- { "-hsp", NULL, 0 }, +- { "-vfp", NULL, 0 }, +- { "-vbp", NULL, 0 }, +- { "-vsp", NULL, 0 }, ++ { "-h", NULL, 0 }, /* 0 */ ++ { "-v", NULL, 0 }, /* 1 */ ++ { "-q", NULL, 0 }, /* 2 */ ++ { "-fb", NULL, 0 }, /* 3 */ ++ { "-nfb", NULL, 0 }, /* 4 */ ++ { "-nv", NULL, 0 }, /* 5 */ ++ { "-nnv", NULL, 0 }, /* 6 */ ++ { "-f", NULL, 0 }, /* 7 */ ++ { "-m", NULL, 0 }, /* 8 */ ++ { "-mdc", NULL, 0 }, /* 9 */ ++ { "-mhf", NULL, 0 }, /* 10 */ ++ { "-mvf", NULL, 0 }, /* 11 */ ++ { "-dvf", NULL, 0 }, /* 12 */ ++ { "-hv", NULL, 0 }, /* 13 */ ++ { "-vv", NULL, 0 }, /* 14 */ ++ { "-hfp", NULL, 0 }, /* 15 */ ++ { "-hbp", NULL, 0 }, /* 16 */ ++ { "-hsp", NULL, 0 }, /* 17 */ ++ { "-vfp", NULL, 0 }, /* 18 */ ++ { "-vbp", NULL, 0 }, /* 19 */ ++ { "-vsp", NULL, 0 }, /* 20 */ + { NULL, NULL, 0 } + }; + +@@ -88,14 +88,14 @@ + } + + case 1: { +- if (commit_verbose (CFG_PREC_CMDLINE, &verbose, 1) == 0) ++ if (commit_verbose (CFG_PREC_CMDLINE, &verbose, 2) == 0) + pmsg (VL_DEBUG, "[cmdline] arg %u: verbose mode on\n", ap->aindex); + break; + } + + case 2: { + if (commit_verbose (CFG_PREC_CMDLINE, &verbose, 0) == 0) +- pmsg (VL_DEBUG, "[cmdline] arg %u: verbose mode off\n", ap->aindex); ++ pmsg (VL_DEBUG, "[cmdline] arg %u: quiet mode on\n", ap->aindex); + break; + } + +@@ -148,14 +148,14 @@ + + case 5: { + pmsg (VL_DEBUG, "[cmdline] arg %u: too many modes, dropping %ux%u\n", ap->aindex, x_uint, y_uint); +- pmsg (VL_VERBOSE, "no more than 256 modes are allowed, dropping %ux%u\n", x_uint, y_uint); ++ pmsg (VL_NORMAL, "no more than 256 modes are allowed, dropping %ux%u\n", x_uint, y_uint); + break; + } + + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -188,7 +188,7 @@ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -221,7 +221,7 @@ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -254,7 +254,7 @@ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -287,7 +287,7 @@ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -320,7 +320,7 @@ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -353,7 +353,7 @@ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -386,7 +386,7 @@ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -419,7 +419,7 @@ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -452,7 +452,7 @@ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -485,7 +485,7 @@ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -518,7 +518,7 @@ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -551,7 +551,7 @@ + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: %s has an invalid parameter \"%s\"\n", ap->aindex, + (*ap->options)[ap->oindex].ao_option, (*ap->options)[ap->oindex].ao_parameter); +- pmsg (VL_VERBOSE, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_NORMAL, "argument %u (%s) has an invalid parameter\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -567,7 +567,7 @@ + + default: { + pmsg (VL_DEBUG, "[cmdline] arg %u: unrecognized argument \"%s\"\n", ap->aindex, ap->argv[ap->aindex]); +- pmsg (VL_VERBOSE, "invalid argument %u (%s)\n", ap->aindex, ap->argv[ap->aindex]); ++ pmsg (VL_QUIET, "invalid argument %u (%s)\n", ap->aindex, ap->argv[ap->aindex]); + return (-1); + } + } +@@ -640,7 +640,7 @@ + ap->oindex++; + } + +- if (((*ap->options)[ap->oindex].ao_option != NULL) && (match == 0)) ++ if (match == 0) + { + ap->oindex = -1; /* signal unmatched argument */ + if ((*arg_action) (ap) < 0) +--- videogen-0.32.orig/videogen.c ++++ videogen-0.32/videogen.c +@@ -83,9 +83,9 @@ + void + usage (void) + { +- pmsg (VL_QUIET, "USAGE: videogen [-h] [-v|-q] [-fb|-nfb] [-nv|-nnv] [-f=] [-m=]\n"); +- pmsg (VL_QUIET, " [-mdc=] [-mhf=] [-mvf=] [-dvf=] [-hv=] [-vv=]\n"); +- pmsg (VL_QUIET, " [-hfp=] [-hbp=] [-hsp=] [-vfp=] [-vbp=] [-vsp=]\n\n"); ++ pmsg (VL_NORMAL, "USAGE: videogen [-h] [-v|-q] [-fb|-nfb] [-nv|-nnv] [-f=] [-m=]\n"); ++ pmsg (VL_NORMAL, " [-mdc=] [-mhf=] [-mvf=] [-dvf=] [-hv=] [-vv=]\n"); ++ pmsg (VL_NORMAL, " [-hfp=] [-hbp=] [-hsp=] [-vfp=] [-vbp=] [-vsp=]\n\n"); + } + + +@@ -112,7 +112,8 @@ + + if (arg_parse (&ap, &arg_action) < 0) + { +- pmsg (VL_VERBOSE, "command line syntax error\n"); ++ pmsg (VL_NORMAL, "command line syntax error\n"); ++ usage(); + exit (ERR_CMDLINE); + } + +@@ -127,7 +128,7 @@ + yyin = fopen (tpathexp (cfgfile, (char *)&pathname_buf), "r"); + if (yyin == NULL) + { +- pmsg (VL_VERBOSE, "could not open configuration file \"%s\" (errno=%i)\n", cfgfile, errno); ++ pmsg (VL_NORMAL, "could not open configuration file \"%s\" (errno=%i)\n", cfgfile, errno); + } + else + { +@@ -167,25 +168,25 @@ + + if (num_modes == 0) + { +- pmsg (VL_VERBOSE, "error: no modes (resolutions) have been specified\n"); ++ pmsg (VL_NORMAL, "error: no modes (resolutions) have been specified\n"); + exit (ERR_RES); + } + + if (max_dotclk == 0) + { +- pmsg (VL_VERBOSE, "error: the maximum dot clock rate has not been specified\n"); ++ pmsg (VL_NORMAL, "error: the maximum dot clock rate has not been specified\n"); + exit (ERR_MDC); + } + + if (max_hfreq == 0) + { +- pmsg (VL_VERBOSE, "error: the maximum horizontal refresh frequency has not been specified\n"); ++ pmsg (VL_NORMAL, "error: the maximum horizontal refresh frequency has not been specified\n"); + exit (ERR_MHF); + } + + if (max_vfreq == 0) + { +- pmsg (VL_VERBOSE, "error: the maximum vertical refresh frequency has not been specified\n"); ++ pmsg (VL_NORMAL, "error: the maximum vertical refresh frequency has not been specified\n"); + exit (ERR_MVF); + } + +--- videogen-0.32.orig/videogen.h ++++ videogen-0.32/videogen.h +@@ -32,8 +32,9 @@ + + + #define VL_QUIET 0 +-#define VL_VERBOSE 1 +-#define VL_DEBUG 2 ++#define VL_NORMAL 1 ++#define VL_VERBOSE 2 ++#define VL_DEBUG 3 + + --- videogen-0.32.orig/debian/patches/02_Makefile.dpatch +++ videogen-0.32/debian/patches/02_Makefile.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_Makefile.dpatch by Bas Zoetekouw +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix Makefile for Debian + +@DPATCH@ + +--- videogen-0.32.orig/Makefile ++++ videogen-0.32/Makefile +@@ -26,10 +26,10 @@ + # uncomment the definitions appropriate for your environment below + + # Linux, FreeBSD, NetBSD, etc. (GNU cc, GNU make) +-CC = gcc +-CFLAGS = -Wall -O -g +-CDEFS = -D_POSIX_SOURCE +-LIBS = -lm ++#CC = gcc ++#CFLAGS = -Wall -O -g ++#CDEFS = -D_POSIX_SOURCE ++#LIBS = -lm + + # SunOS 5.8 (Sun cc, GNU make) + #CC = cc +@@ -51,6 +51,13 @@ + #CFLAGS = -Ae -O + #LIBS = -lm + ++# Debian ++CC = gcc ++CDEFS = -D_POSIX_SOURCE ++#CFLAGS = -O2 -g ## set in debian/rules ++CFLAGS += -Wall ++LIBS = -lm ++ + # currently parser generation only works with GNU flex and bison, + # but the generated files are included in the source package so that + # you don't need any tools if you simply want to compile videogen --- videogen-0.32.orig/debian/patches/05_horiz_frame_length.dpatch +++ videogen-0.32/debian/patches/05_horiz_frame_length.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_horiz_frame_length.dpatch by Bas Zoetekouw +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix max visibly fraction of horizontal frame length + +@DPATCH@ + +--- videogen-0.32.orig/config.h ++++ videogen-0.32/config.h +@@ -74,7 +74,7 @@ + * how many percents of horizontal frame length is visible + * default: 80% + */ +-#define CFG_HORIZ_VISIBLE 80 ++#define CFG_HORIZ_VISIBLE 78 + + /* + * how many percents of vertical frame length is visible --- videogen-0.32.orig/debian/patches/00list +++ videogen-0.32/debian/patches/00list @@ -0,0 +1,5 @@ +01_print_errors.dpatch +02_Makefile.dpatch +03_nicer_errors_messages.dpatch +04_manpage.dpatch +05_horiz_frame_length.dpatch --- videogen-0.32.orig/debian/patches/07_videogen_man.dpatch +++ videogen-0.32/debian/patches/07_videogen_man.dpatch @@ -0,0 +1,258 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_videomode_man.datch by J S Bygott +## fixes: #410361 +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix man page + +@DPATCH@ + +--- videogen-old/videogen.1x 2006-08-23 14:19:34.000000000 +0100 ++++ videogen/videogen.1x 2007-02-10 01:56:42.000000000 +0000 +@@ -1,15 +1,20 @@ + .TH VIDEOGEN 1 "videogen" "Szabolcs Rumi" \" -*- nroff -*- + .SH NAME +-videogen \- generate Modelines for XFree86 servers ++videogen \- generate Modelines for Xorg servers + .SH SYNOPSIS ++.HP 2 + .B videogen +-[\-v|\-q] [\-fb|\-nfb] [\-nv|\-nnv] [\-f=] [\-m=] +-[\-mdc=] [\-mhf=] [\-mvf=] [\-dvf=] [\-hv=] [\-vv=] +-[\-hfp=] [\-hbp=] [\-hsp=] [\-vfp=] [\-vbp=] [\-vsp=] ++.RB [ \-v | \-q ] ++.RB [ \-fb | \-nfb ] ++.RB [ \-nv | \-nnv ] ++[\fB\-f=\fP<\fIfile\fP|\fB\-\fP>] [\fB\-m=\fImode\fR] ++[\fB\-mdc=\fIn\fR] [\fB\-mhf=\fIn\fR] [\fB\-mvf=\fIn\fR] [\fB\-dvf=\fIn\fR] ++[\fB\-hv=\fIn\fR] [\fB\-vv=\fIn\fR] [\fB\-hfp=\fIn\fR] [\fB\-hbp=\fIn\fR] ++[\fB\-hsp=\fIn\fR] [\fB\-vfp=\fIn\fR] [\fB\-vbp=\fIn\fR] [\fB\-vsp=\fIn\fR] + .SH DESCRIPTION + .B videogen +-can be used to generate Modelines for XFree86 servers to reach the +-highest possible vertical refresh (screen update) rate at all ++generates Modelines for Xorg servers (or XFree86 servers) ++to reach the highest possible vertical refresh rate at all + resolutions, or to match the refresh rate you desire. As a new + feature, it can obey the non-free NVidia driver's timing constraints. + It can print the calculated results in the Linux framebuffer device +@@ -30,10 +35,10 @@ + the default (~/.videogen) or read from stdin which might be helpful if + you want to call videogen from another program or from a script. + .P +-The general syntax rules are the following: the parameters can be specified ++The general syntax rules are the following: parameters are specified + using name=value pairs. The parameter names are matched in a case insensitive +-manner. Blanks are optional. More name=value pairs can be specified on a single +-line separated by ";" characters. Any string after a "#" character is ++manner. Blanks are optional. Multiple name=value pairs can be specified on a ++single line separated by ";" characters. Any string after a "#" character is + treated as a comment up to the end of the line. + .SS COMMAND LINE + The command line options always override the parameters set in the +@@ -45,40 +50,40 @@ + configuration file variable counterparts (if present). + .PD + .TP +-.I "\-v" ++.B \-v + .PD 0 + .TP +-.I "\-q" ++.B \-q + .TP +-.I "verbose=on|off" +-Turn on/off verbose output. FYI -q stands for quiet ;) ++\fBverbose=on\fP|\fBoff\fP ++Turn on/off verbose output. FYI \fB-q\fP stands for quiet ;) + (default=on) + .PD + .TP +-.I "\-fb" ++.B \-fb + .PD 0 + .TP +-.I "\-nfb" ++.B \-nfb + .TP +-.I "fbset=on|off" ++\fBfbset=on\fP|\fBoff\fP + Turn on/off fbset (Linux framebuffer timings) mode. In this mode + fbset timings are printed instead of Modelines. + (default=off) + .PD + .TP +-.I "\-nv" ++.B \-nv + .PD 0 + .TP +-.I "\-nnv" ++.B \-nnv + .TP +-.I "nvidia=on|off" ++\fBnvidia=on\fP|\fBoff\fP + Turn on/off non-free NVidia Linux driver compatibility mode. + (default=on) + .PD + .TP +-.I "\-f=filespec" ++.BI \-f= filespec + Use +-.B filespec ++.I filespec + as the configuration file. This accepts + .B - + to read the options from the standard input. The "~" character +@@ -86,79 +91,79 @@ + (default=~/.videogen) + .PD + .TP +-.I "\-m=modespec" ++.BI \-m= modespec + .PD 0 + .TP +-.I "mode=modespec" ++.BI mode= modespec + Adds +-.B modespec ++.I modespec + to the list of modes to calculate a Modeline for. This must + be in the form + .B 800x600 +-(width x height) and it can be specified more than once to add several modes. ++(\fIwidth\fP x \fIheight\fP) and it can be specified more than once to add several modes. + .PD + .TP +-.I "\-mdc=freq" ++.BI \-mdc= freq + Set +-.B freq ++.I freq + to the maximum dot clock rate of your video card or the + bandwidth of your monitor, whichever is lower, in MHz. + .TP +-.I "\-mhf=freq" ++.BI \-mhf= freq + Set +-.B freq ++.I freq + to the maximum horizontal refresh frequency of your monitor in kHz. + .TP +-.I "\-mvf=freq" ++.BI \-mvf= freq + Set +-.B freq ++.I freq + to the maximum vertical refresh frequency of your monitor in Hz. + .TP +-.I "\-dvf=freq" ++.BI \-dvf= freq + Set +-.B freq +-to the vertical refresh frequency which you think it would be optimal for you, in Hz. ++.I freq ++to the vertical refresh frequency which you think would be optimal for you, in Hz. + The program will try to match this frequency at all resolutions, instead of the maximum + frequency that would be technically possible. (optional) + .TP +-.I "\-hv=percent" ++.BI \-hv= percent + Set +-.B percent ++.I percent + to the percentage of the horizontal frame length you want the visible resolution to be. (optional) + .TP +-.I "\-vv=percent" ++.BI \-vv= percent + Set +-.B percent ++.I percent + to the percentage of the vertical frame length you want the visible resolution to be. (optional) + .TP +-.I "\-hfp=duration" ++.BI \-hfp= duration + Set +-.B duration ++.I duration + to the horizontal front porch duration of your monitor in clock ticks. (optional) + .TP +-.I "\-hbp=duration" ++.BI \-hbp= duration + Set +-.B duration ++.I duration + to the horizontal back porch duration of your monitor in clock ticks. (optional) + .TP +-.I "\-hsp=duration" ++.BI \-hsp= duration + Set +-.B duration ++.I duration + to the minimum horizontal sync pulse duration of your monitor. (optional) + .TP +-.I "\-vfp=duration" ++.BI \-vfp= duration + Set +-.B duration ++.I duration + to the vertical front porch duration of your monitor in clock ticks. (optional) + .TP +-.I "\-vbp=duration" ++.BI \-vbp= duration + Set +-.B duration ++.I duration + to the vertical back porch duration of your monitor in clock ticks. (optional) + .TP +-.I "\-vsp=duration" ++.BI \-vsp= duration + Set +-.B duration ++.I duration + to the minimum vertical sync pulse duration of your monitor. (optional) + .SS ERRORS + You can expect the following error codes to be returned by videogen: +@@ -176,13 +181,13 @@ + bad resolution error, currently returned when no (valid) modes have been specified anywhere + .TP + .I "104" +-bad maximum dot clock rate, currently returned when a proper value has not been specified anywhere ++bad maximum dot clock rate, currently returned when no proper value has been specified anywhere + .TP + .I "105" +-bad maximum horizontal refresh, currently returned when a proper value has not been specified anywhere ++bad maximum horizontal refresh, currently returned when no proper value has been specified anywhere + .TP + .I "106" +-bad maximum vertical refresh, currently returned when a proper value has not been specified anywhere ++bad maximum vertical refresh, currently returned when no proper value has been specified anywhere + .SS FIXED DOT CLOCKS + If your display adapter does not have a programmable clockchip then you will + need to get a list of available clocks somehow and enter these as the maximum +@@ -192,14 +197,21 @@ + .SH FILES + .TP + .I "~/.videogen" +-This is the default location for the videogen configuration file. ++The default location for the videogen configuration file. + .TP +-.I "/etc/X11/XF86Config(-4)" +-This is the common Xserver configuration file where the Modelines generated with ++.I "/etc/X11/xorg.conf" ++The Xserver configuration file where Modelines generated with + .B videogen +-can be used. Currently this must be done by hand. ++can be inserted. Currently this must be done by hand. ++.TP ++.I "/etc/X11/XF86Config" ++.PD 0 ++.TP ++.I "/etc/X11/XF86Config-4" ++Names of the Xserver configuration file in older releases of X. ++.PD + .SH SEE ALSO +-some_modes(1), X(1), XF86Setup(1), xvidtune(1), kvideogen(1), xf86cfg(1) ++.BR some_modes (1),\ Xorg (1),\ xorg.conf (5),\ xvidtune (1) + .SH AUTHOR + Szabolcs Rumi + .SH COPYING