Merge pull request #6045 from Rmys/master

xorg:rebuild
2018-11-21 17:40:15 +00:00
parent bc1260425e 92a36a29fd
commit 67322828bb
5 changed files with 55495 additions and 2 deletions
@@ -0,0 +1,24 @@
+--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
+@@ -1212,8 +1212,6 @@
+     /* 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;
+@@ -2566,6 +2564,12 @@
+     if ((pScrn->bitsPerPixel + 7)/8 * mode->HDisplay > 4095)
+ 	return MODE_VIRTUAL_X;
+ 
+    if (mode->HTotal > 2048)
+        return MODE_BAD_HVALUE;
+
+    if (mode->VTotal > 2048)
+        return MODE_BAD_VVALUE;
+        
+     return MODE_OK;
+ }
+ 
@@ -18,7 +18,7 @@
            <Dependency>util-macros</Dependency>
        </BuildDependencies>
        <Patches>
-<!--             <Patch level="1">git-fixes.patch</Patch> -->
+            <Patch level="1">check-max-value.patch</Patch>
        </Patches>
    </Source>

@@ -8,6 +8,7 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools

 def setup():
+    autotools.autoreconf("-fiv")
    autotools.configure("\
                         --disable-static \
                         --disable-dri \
@@ -18,4 +19,4 @@ def build():

 def install():
    autotools.install()
-    pisitools.dodoc("COPYING", "ChangeLog", "README")
+    pisitools.dodoc("COPYING", "README*")
@@ -19,6 +19,9 @@
            <Dependency>xorg-server-devel</Dependency>
            <Dependency>util-macros</Dependency>
        </BuildDependencies>
+        <Patches>
+            <Patch level="1">git-video-savage.patch</Patch>
+        </Patches>
    </Source>

    <Package>