- added custom fb.modes - combined of fb.modes.ATI and kernel modedb

- added modeline2fb utility (_noautoreq - fbset shouldn't depend on perl...)
- release 20

Changed files:
    fbset-fb.modes -> 1.1
    fbset.spec -> 1.39

diff --git a/fbset-fb.modes b/fbset-fb.modes
new file mode 100644 (file)
index 0000000..f426f09
--- /dev/null
+++ b/fbset-fb.modes
@@ -0,0 +1,589 @@
+# extracted from linux-2.4.18/drivers/video/modedb.c
+
+# 640x400 @ 70 Hz, 31.5 kHz hsync 
+mode "640x400@70"
+    geometry 640 400 640 400 8
+    timings 39721 40 24 39 9 96 2
+endmode
+
+# 640x480 @ 60 Hz, 31.5 kHz hsync
+mode "640x480@60"
+    geometry 640 480 640 480 8
+    timings 39721 40 24 32 11 96 2
+endmode
+
+# 800x600 @ 56 Hz, 35.15 kHz hsync
+mode "800x600@56"
+    geometry 800 600 800 600 8
+    timings 27777 128 24 22 1 72 2
+endmode
+
+# 1024x768 @ 87 Hz interlaced, 35.5 kHz hsync
+mode "1024x768@87i"
+    geometry 1024 768 1024 768 8
+    timings 22271 56 24 33 8 160 8
+    laced true
+endmode
+
+# 640x400 @ 85 Hz, 37.86 kHz hsync
+mode "640x400@85"
+    geometry 640 400 640 400 8
+    timings 31746 96 32 41 1 64 3
+    vsync high
+endmode
+
+# 640x480 @ 72 Hz, 36.5 kHz hsync
+mode "640x480@72"
+    geometry 640 480 640 480 8
+    timings 31746 144 40 30 8 40 3
+endmode
+
+# 640x480 @ 75 Hz, 37.50 kHz hsync
+mode "640x480@75"
+    geometry 640 480 640 480 8
+    timings 31746 120 16 16 1 64 3
+endmode
+
+# 800x600 @ 60 Hz, 37.8 kHz hsync
+mode "800x600@60"
+    geometry 800 600 800 600 8
+    timings 25000 88 40 23 1 128 4
+    hsync high
+    vsync high
+endmode
+
+# 640x480 @ 85 Hz, 43.27 kHz hsync
+mode "640x480@85"
+    geometry 640 480 640 480 8
+    timings 27777 80 56 25 1 56 3
+endmode
+
+# 1152x864 @ 89 Hz interlaced, 44 kHz hsync
+mode "1152x864@89i"
+    geometry 1152 864 1152 864 8
+    timings 15384 96 16 110 1 216 10
+    laced true
+endmode
+
+# 800x600 @ 72 Hz, 48.0 kHz hsync
+mode "800x600@72"
+    geometry 800 600 800 600 8
+    timings 20000 64 56 23 37 120 6
+    hsync high
+    vsync high
+endmode
+
+# 1024x768 @ 60 Hz, 48.4 kHz hsync
+mode "1024x768@60"
+    geometry 1024 768 1024 768 8
+    timings 15384 168 8 29 3 144 6
+endmode
+
+# 640x480 @ 100 Hz, 53.01 kHz hsync
+mode "640x480@100"
+    geometry 640 480 640 480 8
+    timings 21834 96 32 36 8 96 6
+endmode
+
+# 1152x864 @ 60 Hz, 53.5 kHz hsync
+mode "1152x864@60"
+    geometry 1152 864 1152 864 8
+    timings 11123 208 64 16 4 256 8
+endmode
+
+# 800x600 @ 85 Hz, 55.84 kHz hsync
+mode "800x600@85"
+    geometry 800 600 800 600 8
+    timings 16460 160 64 36 16 64 5
+endmode
+
+# 1024x768 @ 70 Hz, 56.5 kHz hsync
+mode "1024x768@70"
+    geometry 1024 768 1024 768 8
+    timings 13333 144 24 29 3 136 6
+endmode
+
+# 1280x1024 @ 87 Hz interlaced, 51 kHz hsync
+mode "1280x1024@87i"
+    geometry 1280 1024 1280 1024 8
+    timings 12500 56 16 128 1 216 12
+    laced true
+endmode
+
+# 800x600 @ 100 Hz, 64.02 kHz hsync
+mode "800x600@100"
+    geometry 800 600 800 600 8
+    timings 14357 160 64 30 4 64 6
+endmode
+
+# 1024x768 @ 76 Hz, 62.5 kHz hsync
+mode "1024x768@76"
+    geometry 1024 768 1024 768 8
+    timings 11764 208 8 36 16 120 3
+endmode
+
+# 1152x864 @ 70 Hz, 62.4 kHz hsync
+mode "1152x864@70"
+    geometry 1152 864 1152 864 8
+    timings 10869 106 56 20 1 160 10
+endmode
+
+# 1280x1024 @ 61 Hz, 64.2 kHz hsync
+mode "1280x1024@61"
+    geometry 1280 1024 1280 1024 8
+    timings 9090 200 48 26 1 184 3
+endmode
+
+# 1024x768 @ 85 Hz, 70.24 kHz hsync
+mode "1024x768@85"
+    geometry 1024 768 1024 768 8
+    timings 10111 192 32 34 14 160 6
+endmode
+
+# 1152x864 @ 78 Hz, 70.8 kHz hsync
+mode "1152x864@78"
+    geometry 1152 864 1152 864 8
+    timings 9090 228 88 32 0 84 12
+endmode
+
+# 1280x1024 @ 70 Hz, 74.59 kHz hsync
+mode "1280x1024@70"
+    geometry 1280 1024 1280 1024 8
+    timings 7905 224 32 28 8 160 8
+endmode
+
+# 1600x1200 @ 60Hz, 75.00 kHz hsync
+mode "1600x1200@60"
+    geometry 1600 1200 1600 1200 8
+    timings 6172 304 64 46 1 192 3
+    hsync high
+    vsync high
+endmode
+
+# 1152x864 @ 84 Hz, 76.0 kHz hsync
+mode "1152x864@84"
+    geometry 1152 864 1152 864 8
+    timings 7407 184 312 32 0 128 12
+endmode
+
+# 1280x1024 @ 74 Hz, 78.85 kHz hsync
+mode "1280x1024@74"
+    geometry 1280 1024 1280 1024 8
+    timings 7407 256 32 34 3 144 3
+endmode
+
+# 1024x768 @ 100Hz, 80.21 kHz hsync
+mode "1024x768@100"
+    geometry 1024 768 1024 768 8
+    timings 8658 192 32 21 3 192 10
+endmode
+
+# 1280x1024 @ 76 Hz, 81.13 kHz hsync
+mode "1280x1024@76"
+    geometry 1280 1024 1280 1024 8
+    timings 7407 248 32 34 3 104 3
+endmode
+
+# 1600x1200 @ 70 Hz, 87.50 kHz hsync
+mode "1600x1200@70"
+    geometry 1600 1200 1600 1200 8
+    timings 5291 304 64 46 1 192 3
+endmode
+
+# 1152x864 @ 100 Hz, 89.62 kHz hsync
+mode "1152x864@100"
+    geometry 1152 864 1152 864 8
+    timings 7264 224 32 17 2 128 19
+endmode
+
+# 1280x1024 @ 85 Hz, 91.15 kHz hsync
+mode "1280x1024@85"
+    geometry 1280 1024 1280 1024 8
+    timings 6349 224 64 44 1 160 3
+    hsync high
+    vsync high
+endmode
+
+# 1600x1200 @ 75 Hz, 93.75 kHz hsync
+mode "1600x1200@75"
+    geometry 1600 1200 1600 1200 8
+    timings 4938 304 64 46 1 192 3
+    hsync high
+    vsync high
+endmode
+
+# 1600x1200 @ 85 Hz, 105.77 kHz hsync
+mode "1600x1200@85"
+    geometry 1600 1200 1600 1200 8
+    timings 4545 272 16 37 4 192 3
+    hsync high
+    vsync high
+endmode
+
+# 1280x1024 @ 100 Hz, 107.16 kHz hsync
+mode "1280x1024@100"
+    geometry 1280 1024 1280 1024 8
+    timings 5502 256 32 26 7 128 15
+endmode
+
+# 1800x1440 @ 64Hz, 96.15 kHz hsync
+mode "1800x1440@64"
+    geometry 1800 1440 1800 1440 8
+    timings 4347 304 96 46 1 192 3
+    hsync high
+    vsync high
+endmode
+
+# 1800x1440 @ 70Hz, 104.52 kHz hsync
+mode "1800x1440@70"
+    geometry 1800 1440 1800 1440 8
+    timings 4000 304 96 46 1 192 3
+    hsync high
+    vsync high
+endmode
+
+# 512x384 @ 78 Hz, 31.50 kHz hsync
+mode "512x384@78"
+    geometry 512 384 512 384 8
+    timings 49603 48 16 16 1 64 3
+endmode
+
+# 512x384 @ 85 Hz, 34.38 kHz hsync
+mode "512x384@85"
+    geometry 512 384 512 384 8
+    timings 45454 48 16 16 1 64 3
+endmode
+
+# 320x200 @ 70 Hz, 31.5 kHz hsync, 8:5 aspect ratio
+mode "320x200@70"
+    geometry 320 200 320 200 8
+    timings 79440 16 16 20 4 48 1
+    double true
+endmode
+
+# 320x240 @ 60 Hz, 31.5 kHz hsync, 4:3 aspect ratio
+mode "320x240@60"
+    geometry 320 240 320 240 8
+    timings 79440 16 16 16 5 48 1
+    double true
+endmode
+
+# 320x240 @ 72 Hz, 36.5 kHz hsync
+mode "320x240@72"
+    geometry 320 240 320 240 8
+    timings 63492 16 16 16 4 48 2
+    double true
+endmode
+
+# 400x300 @ 56 Hz, 35.2 kHz hsync, 4:3 aspect ratio
+mode "400x300@56"
+    geometry 400 300 400 300 8
+    timings 55555 64 16 10 1 32 1
+    double true
+endmode
+
+# 400x300 @ 60 Hz, 37.8 kHz hsync
+mode "400x300@60"
+    geometry 400 300 400 300 8
+    timings 50000 48 16 11 1 64 2
+    double true
+endmode
+
+# 400x300 @ 72 Hz, 48.0 kHz hsync
+mode "400x300@72"
+    geometry 400 300 400 300 8
+    timings 40000 32 24 11 19 64 3
+    double true
+endmode
+
+# 480x300 @ 56 Hz, 35.2 kHz hsync, 8:5 aspect ratio
+mode "480x300@56"
+    geometry 480 300 480 300 8
+    timings 46176 80 16 10 1 40 1
+    double true
+endmode
+
+# 480x300 @ 60 Hz, 37.8 kHz hsync
+mode "480x300@60"
+    geometry 480 300 480 300 8
+    timings 41858 56 16 11 1 80 2
+    double true
+endmode
+
+# 480x300 @ 63 Hz, 39.6 kHz hsync
+mode "480x300@63"
+    geometry 480 300 480 300 8
+    timings 40000 56 16 11 1 80 2
+    double true
+endmode
+
+# 480x300 @ 72 Hz, 48.0 kHz hsync
+mode "480x300@72"
+    geometry 480 300 480 300 8
+    timings 33386 40 24 11 19 80 3
+    double true
+endmode
+
+
+
+# ATI modes supplied with fbset 2.1
+# (based on Mach64 Programmer's Guide, Appendix C)
+
+mode "640x480-60"
+    # D: 25.175 MHz, H: 31.469 kHz, V: 59.94 Hz
+    geometry 640 480 640 480 8
+    timings 39722 48 16 33 10 96 2
+endmode
+ 
+mode "640x480-72"
+    # D: 31.20 MHz, H: 37.500 kHz, V: 72.12 Hz
+    geometry 640 480 640 480 8
+    timings 32052 128 24 28 9 40 3
+endmode
+ 
+mode "640x480-75"
+    # D: 31.50 MHz, H: 37.500 kHz, V: 75.00 Hz
+    geometry 640 480 640 480 8
+    timings 31747 120 16 16 1 64 3
+endmode
+ 
+mode "640x480-90"
+    # D: 39.91 MHz, H: 47.969 kHz, V: 90.00 Hz
+    geometry 640 480 640 480 8
+    timings 25057 120 32 14 25 40 14
+endmode
+ 
+mode "640x480-100"
+    # D: 44.90 MHz, H: 52.948 kHz, V: 99.71 Hz
+    geometry 640 480 640 480 8
+    timings 22272 48 32 17 22 128 12
+endmode
+ 
+mode "800x600-48-lace"
+    # D: 36.00 MHz, H: 33.835 kHz, V: 96.39 Hz
+    geometry 800 600 800 600 8
+    timings 27778 56 80 79 11 128 12
+    laced true
+    hsync high
+    vsync high
+endmode
+ 
+mode "800x600-56"
+    # D: 36.00 MHz, H: 35.156 kHz, V: 56.25 Hz
+    geometry 800 600 800 600 8
+    timings 27778 128 24 22 1 72 2
+    hsync high
+    vsync high
+endmode
+ 
+mode "800x600-60"
+    # D: 40.00 MHz, H: 37.879 kHz, V: 60.32 Hz
+    geometry 800 600 800 600 8
+    timings 25000 88 40 23 1 128 4
+    hsync high
+    vsync high
+endmode
+ 
+mode "800x600-70"
+    # D: 44.90 MHz, H: 44.544 kHz, V: 70.04 Hz
+    geometry 800 600 800 600 8
+    timings 22272 40 24 15 9 144 12
+    hsync high
+endmode
+
+mode "800x600-72"
+    # D: 50.00 MHz, H: 48.090 kHz, V: 72.19 Hz
+    geometry 800 600 800 600 8
+    timings 20000 64 56 23 37 120 6
+    hsync high
+    vsync high
+endmode
+ 
+mode "800x600-75"
+    # D: 49.50 MHz, H: 46.875 kHz, V: 75.00 Hz
+    geometry 800 600 800 600 8
+    timings 20203 160 16 21 1 80 3
+    hsync high
+    vsync high
+endmode
+ 
+mode "800x600-90"
+    # D: 56.64 MHz, H: 57.097 kHz, V: 89.92 Hz
+    geometry 800 600 800 600 8
+    timings 17656 120 8 16 8 64 11
+    hsync high
+    vsync high
+endmode
+
+mode "800x600-100"
+    # D: 67.50 MHz, H: 62.500 kHz, V: 100.00 Hz
+    geometry 800 600 800 600 8
+    timings 14815 216 0 14 7 64 4
+    hsync high
+    vsync high
+endmode
+ 
+mode "1024x768-43-lace"
+    # D: 44.90 MHz, H: 35.522 kHz, V: 86.96 Hz
+    geometry 1024 768 1024 768 8
+    timings 22272 56 8 40 1 176 8
+    laced true
+    hsync high
+    vsync high
+endmode
+ 
+mode "1024x768-60"
+    # D: 65.00 MHz, H: 48.363 kHz, V: 60.00 Hz
+    geometry 1024 768 1024 768 8
+    timings 15385 160 24 29 3 136 6
+endmode
+ 
+mode "1024x768-70"
+    # D: 75.00 MHz, H: 56.476 kHz, V: 70.07 Hz
+    geometry 1024 768 1024 768 8
+    timings 13334 144 24 29 3 136 6
+endmode
+ 
+mode "1024x768-72"
+    # D: 75.00 MHz, H: 58.230 kHz, V: 72.245 Hz
+    geometry 1024 768 1024 768 8
+    timings 13334 104 24 29 3 136 6
+endmode
+ 
+mode "1024x768-75"
+    # D: 78.75 MHz, H: 60.023 kHz, V: 75.03 Hz
+    geometry 1024 768 1024 768 8
+    timings 12699 176 16 28 1 96 3
+    hsync high
+    vsync high
+endmode
+ 
+mode "1024x768-90"
+    # D: 100.0 MHz, H: 76.220 kHz, V: 90.20 Hz
+    geometry 1024 768 1024 768 8
+    timings 10000 192 0 41 21 96 15
+endmode
+ 
+mode "1024x768-100"
+    # D: 110.0 MHz, H: 79.023 kHz, V: 99.78 Hz
+    geometry 1024 768 1024 768 8
+    timings 9091 280 0 16 0 88 8
+endmode
+ 
+mode "1152x864-43-lace"
+    # D: 65.0 MHz, H: 45.904 kHz, V: 87.02 Hz
+    geometry 1152 864 1152 864 8
+    timings 15385 64 72 104 78 128 9
+    laced true
+    hsync high
+    vsync high
+endmode
+ 
+mode "1152x864-47-lace"
+    # D: 65.0 MHz, H: 44.890 kHz, V: 94.80 Hz
+    geometry 1152 864 1152 864 8
+    timings 15385 80 88 44 30 128 9
+    laced true
+    hsync high
+    vsync high
+endmode
+ 
+mode "1152x864-60"
+    # D: 80.0 MHz, H: 54.945 kHz, V: 59.98 Hz
+    geometry 1152 864 1152 864 8
+    timings 12500 128 64 41 6 112 5
+    hsync high
+    vsync high
+endmode
+ 
+mode "1152x864-70"
+    # D: 100.0 MHz, H: 66.138 kHz, V: 69.99 Hz
+    geometry 1152 864 1152 864 8
+    timings 10000 168 40 57 13 152 11
+    hsync high
+    vsync high
+endmode
+ 
+mode "1152x864-75"
+    # D: 110.0 MHz, H: 75.137 kHz, V: 74.99 Hz
+    geometry 1152 864 1152 864 8
+    timings 9091 144 24 85 45 144 8
+    hsync high
+    vsync high
+endmode
+ 
+mode "1152x864-80"
+    # D: 110.0 MHz, H: 76.389 kHz, V: 79.74 Hz
+    geometry 1152 864 1152 864 8
+    timings 9091 160 16 57 30 112 7
+    hsync high
+    vsync high
+endmode
+ 
+mode "1280x1024-43-lace"
+    # D: 80.00 MHz, H: 50.000 kHz, V: 87.03 Hz
+    geometry 1024 1024 1024 1024 8
+    timings 12500 160 80 65 50 80 10
+    laced true
+    hsync high
+    vsync high
+endmode
+ 
+mode "1280x1024-47-lace"
+    # D: 80.00 MHz, H: 50.000 kHz, V: 94.97 Hz
+    geometry 1280 1024 1280 1024 8
+    timings 12500 160 80 18 1 80 10
+    laced true
+    hsync high
+    vsync high
+endmode
+ 
+mode "1280x1024-60"
+    # D: 108.00 MHz, H: 63.981 kHz, V: 60.02 Hz
+    geometry 1280 1024 1280 1024 8
+    timings 9260 248 48 38 1 112 3
+    hsync high
+    vsync high
+endmode
+ 
+mode "1280x1024-70"
+    # D: 126.00 MHz, H: 74.645 kHz, V: 70.02 Hz
+    geometry 1280 1024 1280 1024 8
+    timings 7937 216 80 36 1 112 5
+    hsync high
+    vsync high
+endmode
+ 
+mode "1280x1024-74"
+    # D: 135.00 MHz, H: 78.855 kHz, V: 74.11 Hz
+    geometry 1280 1024 1280 1024 8
+    timings 7408 256 32 10 0 144 30
+    hsync high
+    vsync high
+endmode
+ 
+mode "1280x1024-75"
+    # D: 135.00 MHz, H: 79.976 kHz, V: 75.02 Hz
+    geometry 1280 1024 1280 1024 8
+    timings 7408 248 16 38 1 144 3
+    hsync high
+    vsync high
+endmode
+
+mode "1600x1200-60"
+    # D: 156.00 MHz, H: 76.200 kHz, V: 60.00 Hz
+    geometry 1600 1200 1600 1200 8
+    timings 6411 256 32 52 10 160 8
+endmode
+
+mode "1600x1200-66"
+    # D: 172.00 MHz, H: 82.700 kHz, V: 66.00 Hz
+    geometry 1600 1200 1600 1200 8
+    timings 5814 304 40 47 3 136 3
+endmode
+ 
+mode "1600x1200-76"
+    # D: 198.00 MHz, H: 95.200 kHz, V: 76.00 Hz
+    geometry 1600 1200 1600 1200 8
+    timings 5051 304 40 42 3 136 5
+endmode

diff --git a/fbset.spec b/fbset.spec
index afb83fdda95b7ede764b3472892ede082edecc08..5a5f68f671fa8c09cc09f07f2454fbc1af07f961 100644 (file)
--- a/fbset.spec
+++ b/fbset.spec
@@ -1,30 +1,39 @@
 Summary:       Framebuffer utilities for changing video modes
-Summary(pl):   Nardzêdzie do zmieniania trybu graficznego we framebufferze
+Summary(pl):   Narzêdzie do zmieniania trybu graficznego we framebufferze
 Name:          fbset
 Version:       2.1
-Release:       19
+Release:       20
 License:       GPL
 Group:         Applications/System
 Source0:       http://home.tvd.be/cr26864/Linux/fbdev/%{name}-%{version}.tar.gz
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
+Source3:       %{name}-fb.modes
 Patch0:                %{name}-fixmode.patch
 URL:           http://home.tvd.be/cr26864/Linux/fbdev/
 BuildRequires: bison
 BuildRequires: flex
-Prereq:                /sbin/chkconfig
+Requires(post,preun):  /sbin/chkconfig
 Requires:      open
 Requires:      sed
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _noautoreqfiles /usr/bin/modeline2fb
+
 %description
 fbset is a utility for querying and changing video modes of fbcon
 terminals.
 
+Note: modeline2fb script (which translates XFree86 modelines to
+fb.modes entries) requires perl.
+
 %description -l pl
 fbset jest narzêdziem do sprawdzania i zmieniania trybu graficznego na
 terminalach fbcon.
 
+Uwaga: skrypt modeline2fb (s³u¿±cy do t³umaczenia modeline'ów XFree86
+na wpisy fb.modes) wymaga perla.
+
 %prep
 %setup -q
 %patch -p1
@@ -34,17 +43,21 @@ terminalach fbcon.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_sbindir},%{_mandir}/man{5,8}}
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} \
+       $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man{5,8}}
 
 install fbset $RPM_BUILD_ROOT%{_sbindir}
+install modeline2fb $RPM_BUILD_ROOT%{_bindir}
 install fb.modes.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install fbset.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
-install etc/fb.modes.ATI $RPM_BUILD_ROOT%{_sysconfdir}/fb.modes
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/fb.modes
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/fbset
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/fbset
 
+gzip -9nf etc/fb.modes*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -58,7 +71,9 @@ fi
 
 %files
 %defattr(644,root,root,755)
+%doc etc/*
 %attr(755,root,root) %{_sbindir}/fbset
+%attr(755,root,root) %{_bindir}/modeline2fb
 %attr(754,root,root) /etc/rc.d/init.d/fbset
 %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/fbset
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/fb.modes