From 12dc764e3a6842aa60a59f29aca17e4dc46e3809 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 7 Mar 2013 18:09:22 +0000 Subject: main/xf86-video-sis: rebuild against xorg-server-1.14 --- main/xf86-video-sis/APKBUILD | 24 +++- main/xf86-video-sis/fix-bios-read-on-650-760.patch | 23 ---- main/xf86-video-sis/sis-0.10.7-git.patch | 121 +++++++++++++++++++++ 3 files changed, 139 insertions(+), 29 deletions(-) delete mode 100644 main/xf86-video-sis/fix-bios-read-on-650-760.patch create mode 100644 main/xf86-video-sis/sis-0.10.7-git.patch (limited to 'main/xf86-video-sis') diff --git a/main/xf86-video-sis/APKBUILD b/main/xf86-video-sis/APKBUILD index a0400f02f..18ba6e91c 100644 --- a/main/xf86-video-sis/APKBUILD +++ b/main/xf86-video-sis/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=xf86-video-sis pkgver=0.10.7 -pkgrel=2 +pkgrel=4 pkgdesc="X.org SiS video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -12,14 +12,21 @@ makedepends="pkgconfig xorg-server-dev videoproto renderproto xproto fontsproto xf86dgaproto xineramaproto randrproto xextproto mesa-dev xf86driproto glproto libxi-dev" -source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + sis-0.10.7-git.patch" +_builddir="$srcdir"/$pkgname-$pkgver prepare() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 @@ -27,9 +34,14 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="f01e5e20e37342acf1983d269886171b xf86-video-sis-0.10.7.tar.bz2" +md5sums="f01e5e20e37342acf1983d269886171b xf86-video-sis-0.10.7.tar.bz2 +268a460c217b9108c2e43608a066198a sis-0.10.7-git.patch" +sha256sums="be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0 xf86-video-sis-0.10.7.tar.bz2 +7cc3c746f0921b72b4a2cae599790d115424f813dde8b74a0fe8222152a9c4cf sis-0.10.7-git.patch" +sha512sums="095fd47803e8296ca3769b5c62e9399b6759023660c42b215b708dfed456e3cf2dad93b8abcb48887bd40e0d0b1435d4e1d711a721f5cb55bef4d7093ab387fa xf86-video-sis-0.10.7.tar.bz2 +985e067fbf21d5151b96d497a4325d98d1fcb4f8b3bb3fa7bf7be7574a343b4bca2460545cb60048ec8b023c03249c18062db0c80cadb899a20d9a3dc41563e4 sis-0.10.7-git.patch" diff --git a/main/xf86-video-sis/fix-bios-read-on-650-760.patch b/main/xf86-video-sis/fix-bios-read-on-650-760.patch deleted file mode 100644 index c948c833a..000000000 --- a/main/xf86-video-sis/fix-bios-read-on-650-760.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8370499d4035ec7a5c8e1f1b04d5a6c404883442 Mon Sep 17 00:00:00 2001 -From: Matteo Delfino -Date: Wed, 21 Oct 2009 14:26:45 +0000 -Subject: Fix BIOS read on 650 and 760. (#19070) - -Signed-off-by: Matteo Delfino -Signed-off-by: Adam Jackson ---- -diff --git a/src/sis_driver.c b/src/sis_driver.c -index 994b02d..b19e7a9 100644 ---- a/src/sis_driver.c -+++ b/src/sis_driver.c -@@ -4099,6 +4099,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - case SIS_315H: - case SIS_330: - case SIS_340: -+ case SIS_650: -+ case SIS_760: - case XGI_40: readpci = TRUE; - break; - case XGI_20: readpci = TRUE; --- -cgit v0.8.2 diff --git a/main/xf86-video-sis/sis-0.10.7-git.patch b/main/xf86-video-sis/sis-0.10.7-git.patch new file mode 100644 index 000000000..865237552 --- /dev/null +++ b/main/xf86-video-sis/sis-0.10.7-git.patch @@ -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); -- cgit v1.2.3