- fix building for xserver 1.20

- rel 4

diff --git a/xorg-abi24.patch b/xorg-abi24.patch
new file mode 100644 (file)
index 0000000..66e1158
--- /dev/null
+++ b/xorg-abi24.patch
@@ -0,0 +1,21 @@
+--- xf86-video-s3virge-1.10.7/src/s3v_driver.c~        2015-09-27 01:28:11.000000000 +0900
++++ xf86-video-s3virge-1.10.7/src/s3v_driver.c 2018-05-23 22:00:43.635026154 +0900
+@@ -1203,18 +1203,6 @@
+    vga256InfoRec.directMode = XF86DGADirectPresent;
+ #endif
+ 
+-    /*
+-     * xf86ValidateModes will check that the mode HTotal and VTotal values
+-     * don't exceed the chipset's limit if pScrn->maxHValue and
+-     * pScrn->maxVValue are set.  
+-     */
+-
+-    /* todo -  The virge limit is 2048 vertical & horizontal */
+-    /* pixels, not clock register settings. */
+-                              /* true for all ViRGE? */
+-  pScrn->maxHValue = 2048;
+-  pScrn->maxVValue = 2048;
+-
+                               /* Lower depths default to config file */
+   pScrn->virtualX = pScrn->display->virtualX;
+                               /* Adjust the virtualX to meet ViRGE hardware */

diff --git a/xorg-driver-video-s3virge.spec b/xorg-driver-video-s3virge.spec
index 7e9997b67e917b1f277bd49eb00d80a84391fe43..1520a92440e29ddd1cfad132c508cce17125034f 100644 (file)
--- a/xorg-driver-video-s3virge.spec
+++ b/xorg-driver-video-s3virge.spec
@@ -2,11 +2,12 @@ Summary:      X.org video driver for S3 ViRGE and Trio3D video chips
 Summary(pl.UTF-8):     Sterownik obrazu X.org dla układów graficznych S3 ViRGE i Trio3D
 Name:          xorg-driver-video-s3virge
 Version:       1.10.7
-Release:       3
+Release:       4
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-%{version}.tar.bz2
 # Source0-md5: 9d4dd8060544d95a1ce7d0ce0853cbe6
+Patch0:                xorg-abi24.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -57,6 +58,7 @@ Obsługuje karty PCI i AGP oparte na następujących układach:
 
 %prep
 %setup -q -n xf86-video-s3virge-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}