diffstat of debian/ for xserver-xorg-video-sis_0.10.3-2 xserver-xorg-video-sis_0.10.7-0ubuntu6 changelog | 43 +++++++++++++++ control | 5 + patches/fix-exa-crash.diff | 38 ++++++++++++++ patches/fix-ftbfs.diff | 121 +++++++++++++++++++++++++++++++++++++++++++++ patches/series | 2 5 files changed, 207 insertions(+), 2 deletions(-) diff -Nru xserver-xorg-video-sis-0.10.3/debian/changelog xserver-xorg-video-sis-0.10.7/debian/changelog --- xserver-xorg-video-sis-0.10.3/debian/changelog 2019-04-09 02:00:53.000000000 +0000 +++ xserver-xorg-video-sis-0.10.7/debian/changelog 2019-04-09 02:00:53.000000000 +0000 @@ -1,3 +1,46 @@ +xserver-xorg-video-sis (1:0.10.7-0ubuntu6) trusty; urgency=medium + + * fix-exa-crash.diff: Don't crash on recent servers. (LP: #1066464) + + -- Timo Aaltonen Wed, 02 Apr 2014 12:35:35 +0300 + +xserver-xorg-video-sis (1:0.10.7-0ubuntu5) trusty; urgency=medium + + * Rebuild for xorg 1.15 abi. + + -- Maarten Lankhorst Wed, 05 Feb 2014 10:10:04 +0000 + +xserver-xorg-video-sis (1:0.10.7-0ubuntu4) raring; urgency=low + + * fix-ftbfs.diff: Replace remove-mibstore.diff with this. + + -- Timo Aaltonen Fri, 08 Feb 2013 15:29:09 +0200 + +xserver-xorg-video-sis (1:0.10.7-0ubuntu3) raring; urgency=low + + * remove-mibstore.diff: Remove mibstore.h. + + -- Timo Aaltonen Fri, 08 Feb 2013 14:21:22 +0200 + +xserver-xorg-video-sis (1:0.10.7-0ubuntu2) raring; urgency=low + + * Rebuild to pick up new Xserver dependencies. + + -- Timo Aaltonen Fri, 08 Feb 2013 14:16:19 +0200 + +xserver-xorg-video-sis (1:0.10.7-0ubuntu1) quantal-proposed; urgency=low + + * Sync from unreleased debian git. + + -- Timo Aaltonen Thu, 02 Aug 2012 00:35:36 +0300 + +xserver-xorg-video-sis (1:0.10.7-1) UNRELEASED; urgency=low + + * New upstream release + * Bump Standards-Version to 3.9.3 + + -- Maarten Lankhorst Wed, 18 Jul 2012 15:11:59 +0200 + xserver-xorg-video-sis (1:0.10.3-2) experimental; urgency=low * Build against Xserver 1.9.1 rc1. diff -Nru xserver-xorg-video-sis-0.10.3/debian/control xserver-xorg-video-sis-0.10.7/debian/control --- xserver-xorg-video-sis-0.10.3/debian/control 2019-04-09 02:00:53.000000000 +0000 +++ xserver-xorg-video-sis-0.10.7/debian/control 2019-04-09 02:00:53.000000000 +0000 @@ -1,7 +1,8 @@ Source: xserver-xorg-video-sis Section: x11 Priority: optional -Maintainer: Debian X Strike Force +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian X Strike Force Uploaders: David Nusinow , Brice Goglin , Cyril Brulebois Build-Depends: debhelper (>= 5.0.0), @@ -24,7 +25,7 @@ automake, libtool, xutils-dev (>= 1:7.5+1), -Standards-Version: 3.9.0 +Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sis Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sis.git diff -Nru xserver-xorg-video-sis-0.10.3/debian/patches/fix-exa-crash.diff xserver-xorg-video-sis-0.10.7/debian/patches/fix-exa-crash.diff --- xserver-xorg-video-sis-0.10.3/debian/patches/fix-exa-crash.diff 1970-01-01 00:00:00.000000000 +0000 +++ xserver-xorg-video-sis-0.10.7/debian/patches/fix-exa-crash.diff 2019-04-09 02:00:53.000000000 +0000 @@ -0,0 +1,38 @@ +--- a/src/sis310_accel.c ++++ b/src/sis310_accel.c +@@ -1874,7 +1874,7 @@ + { + ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen); + SISPtr pSiS = SISPTR(pScrn); +- unsigned char *dst = pDst->devPrivate.ptr; ++ unsigned char *dst = ((unsigned char *) pSiS->FbBase) + exaGetPixmapOffset(pDst); + int dst_pitch = exaGetPixmapPitch(pDst); + + (pSiS->SyncAccel)(pScrn); +@@ -1882,7 +1882,7 @@ + if(pDst->drawable.bitsPerPixel < 8) + return FALSE; + +- dst += (x * pDst->drawable.bitsPerPixel / 8) + (y * src_pitch); ++ dst += (x * pDst->drawable.bitsPerPixel / 8) + (y * dst_pitch); + while(h--) { + SiSMemCopyToVideoRam(pSiS, dst, (unsigned char *)src, + (w * pDst->drawable.bitsPerPixel / 8)); +@@ -1953,7 +1953,7 @@ + { + ScrnInfoPtr pScrn = xf86ScreenToScrn(pSrc->drawable.pScreen); + SISPtr pSiS = SISPTR(pScrn); +- unsigned char *src = pSrc->devPrivate.ptr; ++ unsigned char *src = ((unsigned char *) pSiS->FbBase) + exaGetPixmapOffset(pSrc); + int src_pitch = exaGetPixmapPitch(pSrc); + int size = src_pitch < dst_pitch ? src_pitch : dst_pitch; + +@@ -1964,7 +1964,7 @@ + + src += (x * pSrc->drawable.bitsPerPixel / 8) + (y * src_pitch); + while(h--) { +- SiSMemCopyFromVideoRam(pSiS, (unsigned char *)dst, src, size); ++ SiSMemCopyFromVideoRam(pSiS, (unsigned char *)dst, src, (w * pSrc->drawable.bitsPerPixel / 8)); + src += src_pitch; + dst += dst_pitch; + } diff -Nru xserver-xorg-video-sis-0.10.3/debian/patches/fix-ftbfs.diff xserver-xorg-video-sis-0.10.7/debian/patches/fix-ftbfs.diff --- xserver-xorg-video-sis-0.10.3/debian/patches/fix-ftbfs.diff 1970-01-01 00:00:00.000000000 +0000 +++ xserver-xorg-video-sis-0.10.7/debian/patches/fix-ftbfs.diff 2019-04-09 02:00:53.000000000 +0000 @@ -0,0 +1,121 @@ +diff --git a/src/sis.h b/src/sis.h +index 46fca2a..20e6134 100644 +--- a/src/sis.h ++++ b/src/sis.h +@@ -75,7 +75,6 @@ + + #include "compiler.h" + #include "xf86Pci.h" +-#include "xf86Priv.h" + #include "xf86_OSproc.h" + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86Resources.h" +diff --git a/src/sis_driver.c b/src/sis_driver.c +index 61e8075..0fd83d7 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -57,7 +57,6 @@ + #include "fb.h" + #include "micmap.h" + #include "mipointer.h" +-#include "mibstore.h" + #include "edid.h" + + #define SIS_NEED_inSISREG +@@ -94,6 +93,10 @@ + #include "dri.h" + #endif + ++#ifndef DEFAULT_DPI ++#define DEFAULT_DPI 96 ++#endif ++ + /* + * LookupWindow was removed with video abi 11. + */ +@@ -7344,7 +7347,11 @@ SISUnmapMem(ScrnInfoPtr pScrn) + if(pSiSEnt->MapCountIOBase) { + pSiSEnt->MapCountIOBase--; + if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) { ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, (pSiS->mmioSize * 1024)); ++#endif + pSiSEnt->IOBase = NULL; + pSiSEnt->MapCountIOBase = 0; + pSiSEnt->forceUnmapIOBase = FALSE; +@@ -7355,7 +7362,11 @@ SISUnmapMem(ScrnInfoPtr pScrn) + if(pSiSEnt->MapCountIOBaseDense) { + pSiSEnt->MapCountIOBaseDense--; + if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) { ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024)); ++#endif + pSiSEnt->IOBaseDense = NULL; + pSiSEnt->MapCountIOBaseDense = 0; + pSiSEnt->forceUnmapIOBaseDense = FALSE; +@@ -7366,7 +7377,11 @@ SISUnmapMem(ScrnInfoPtr pScrn) + if(pSiSEnt->MapCountFbBase) { + pSiSEnt->MapCountFbBase--; + if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) { ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize); ++#endif + pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL; + pSiSEnt->MapCountFbBase = 0; + pSiSEnt->forceUnmapFbBase = FALSE; +@@ -7376,13 +7391,25 @@ SISUnmapMem(ScrnInfoPtr pScrn) + } + } else { + #endif ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024)); ++#endif + pSiS->IOBase = NULL; + #ifdef __alpha__ ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024)); ++#endif + pSiS->IOBaseDense = NULL; + #endif ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, pSiS->FbMapSize); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->RealFbBase, pSiS->FbMapSize); ++#endif + pSiS->FbBase = pSiS->RealFbBase = NULL; + #ifdef SISDUALHEAD + } +@@ -8859,7 +8886,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL) + } + pSiS->SiSFastVidCopyDone = TRUE; + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +@@ -9352,7 +9378,14 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y) + } + if(doit) { + sigstate = xf86BlockSIGIO(); +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18 ++ { ++ double dx = x, dy = y; ++ miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy, NULL, NULL); ++ x = (int)dx; ++ y = (int)dy; ++ } ++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 + { + double dx = x, dy = y; + miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy); diff -Nru xserver-xorg-video-sis-0.10.3/debian/patches/series xserver-xorg-video-sis-0.10.7/debian/patches/series --- xserver-xorg-video-sis-0.10.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ xserver-xorg-video-sis-0.10.7/debian/patches/series 2019-04-09 02:00:53.000000000 +0000 @@ -0,0 +1,2 @@ +fix-ftbfs.diff +fix-exa-crash.diff