[openchrome-devel] xf86-video-openchrome: 2 commits - configure.ac src/via_driver.c

[Kevin Brace]

 configure.ac     |    2 +-
 src/via_driver.c |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit b5e0b59ab7f0cb1408c9e3d1e5e58b78226c4968
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed May 29 12:47:45 2019 -0500

    Version bumped to 0.6.185
    
    Fix made for Version 0.6.184 introduced a new issue related to the fix
    made for that version, hence another fix had to be made.  Now this DDX
    should compile fine for X.Org X Server 1.20 as well as 1.19 and older.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 1224029..da8d716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.184],
+        [0.6.185],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 0ec6917c5c919e81b4e2444608f15da13ab00b7a
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed May 29 12:37:43 2019 -0500

    Use own thunk function instead of shadowUpdatePackedWeak
    
    Code change made to X.Org X Server 1.20 discontinued
    shadowUpdatePackedWeak function.
    
    https://gitlab.freedesktop.org/xorg/xserver/commit
    /a530dc2a62349d922de77a75786a3795102aec11
    
    This commit is based on the following xorg/xserver commit.
    
    https://gitlab.freedesktop.org/xorg/xserver/commit
    /042bae0b49f6192ec3cb8bb51423c90c44638134
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index 8d54f63..645c979 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1662,6 +1662,12 @@ LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
     }
 }
 
+static void
+viaUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+    shadowUpdatePacked(pScreen, pBuf);
+}
+
 static void *
 viaShadowWindow(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
 				CARD32 *size, void *closure)
@@ -1707,7 +1713,7 @@ VIACreateScreenResources(ScreenPtr pScreen)
         return FALSE;
 
     if (pVia->shadowFB) {
-        if (!shadowAdd(pScreen, rootPixmap, shadowUpdatePacked,
+        if (!shadowAdd(pScreen, rootPixmap, viaUpdatePacked,
                         viaShadowWindow, 0, NULL))
             return FALSE;
     }