diff options
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 36 | ||||
-rw-r--r-- | fix_defines.patch | 48 |
3 files changed, 27 insertions, 71 deletions
@@ -1,6 +1,6 @@ pkgbase = xf86-video-sis pkgdesc = X.org SiS video driver - pkgver = 0.11.0 + pkgver = 0.12.0 pkgrel = 1 url = https://xorg.freedesktop.org/ arch = i686 @@ -16,16 +16,16 @@ pkgbase = xf86-video-sis conflicts = xorg-server<1.20 conflicts = X-ABI-VIDEODRV_VERSION<24 conflicts = X-ABI-VIDEODRV_VERSION>=25 - source = https://xorg.freedesktop.org/archive/individual/driver/xf86-video-sis-0.11.0.tar.bz2 - source = https://xorg.freedesktop.org/archive/individual/driver/xf86-video-sis-0.11.0.tar.bz2.sig + source = https://x.org/archive/individual/driver/xf86-video-sis-0.12.0.tar.bz2 + source = https://x.org/archive/individual/driver/xf86-video-sis-0.12.0.tar.bz2.sig source = fix_defines.patch::https://ptpb.pw/2MVt validpgpkeys = CDA92E38A7A7A82237E9AB61C922784178BFFDB0 - md5sums = b4ad0e572bffa609f75df787ea7b3d11 + md5sums = b8ec9c21758043b1480f11baec296f5d md5sums = SKIP - md5sums = d607e1ae3d9cc52096769eb55209ebab - sha512sums = b8ad05b3faa24c6df65d825b576ddb8e2ce44705ce8b55d8cf0d9f37aa47a429ab43765d8daea57ff35c4cffed056fbec6dfe8ce95efcd6269cc7711115ea09c + md5sums = 21e11e901c326c572e058ce3a29b945a + sha512sums = 5aa101e5217f15667f2c94f7a76f4afcf47717b61f5d206ce65efe35dc3f674ca294f98ca8586971c6467f31decdd94d8255ebfc7dc220fac0179afc61995952 sha512sums = SKIP - sha512sums = a3f2653f5937d300afdd8d12e4c73bc0447321c426f30dd0d47171bdc640b5996712342d21a63965ad3a280e89e9d46da2fe807eebaef61665710a6a276aa31e + sha512sums = db0122d541b6f9416469ab42e88958792f987803254fc3b98593f9fceddbf35ae083dc16ec22c1cf876da5d600a33949978e247723f7aa091da2559670df2b85 pkgname = xf86-video-sis @@ -4,7 +4,7 @@ # see https://bbs.archlinux.org/viewtopic.php?id=237632 pkgname=xf86-video-sis -pkgver=0.11.0 +pkgver=0.12.0 pkgrel=1 pkgdesc="X.org SiS video driver" arch=('i686' 'x86_64') @@ -19,14 +19,14 @@ groups=('xorg-drivers') validpgpkeys=('CDA92E38A7A7A82237E9AB61C922784178BFFDB0') # The above is the fingerprint for key-id C922784178BFFDB0 # That key has been verified to belong to Kevin Brace, xorg developer -source=(https://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2{,.sig} +source=(https://x.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2{,.sig} 'fix_defines.patch::https://ptpb.pw/2MVt') -md5sums=('b4ad0e572bffa609f75df787ea7b3d11' +md5sums=('b8ec9c21758043b1480f11baec296f5d' 'SKIP' - 'd607e1ae3d9cc52096769eb55209ebab') -sha512sums=('b8ad05b3faa24c6df65d825b576ddb8e2ce44705ce8b55d8cf0d9f37aa47a429ab43765d8daea57ff35c4cffed056fbec6dfe8ce95efcd6269cc7711115ea09c' + '21e11e901c326c572e058ce3a29b945a') +sha512sums=('5aa101e5217f15667f2c94f7a76f4afcf47717b61f5d206ce65efe35dc3f674ca294f98ca8586971c6467f31decdd94d8255ebfc7dc220fac0179afc61995952' 'SKIP' - 'a3f2653f5937d300afdd8d12e4c73bc0447321c426f30dd0d47171bdc640b5996712342d21a63965ad3a280e89e9d46da2fe807eebaef61665710a6a276aa31e') + 'db0122d541b6f9416469ab42e88958792f987803254fc3b98593f9fceddbf35ae083dc16ec22c1cf876da5d600a33949978e247723f7aa091da2559670df2b85') # source=("git+https://anongit.freedesktop.org/git/xorg/driver/xf86-video-sis.git#commit=$_commit" # 'fix_defines.patch::https://ptpb.pw/2MVt') @@ -39,23 +39,23 @@ sha512sums=('b8ad05b3faa24c6df65d825b576ddb8e2ce44705ce8b55d8cf0d9f37aa47a429ab4 # } prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../fix_defines.patch - autoreconf -vfi + cd $pkgname-$pkgver + patch -Np1 -i ../fix_defines.patch + autoreconf -vfi } build() { - cd $pkgname-$pkgver - export CFLAGS=${CFLAGS/-fno-plt} - export CXXFLAGS=${CXXFLAGS/-fno-plt} - export LDFLAGS=${LDFLAGS/,-z,now} - ./configure --prefix=/usr - make + cd $pkgname-$pkgver + export CFLAGS=${CFLAGS/-fno-plt} + export CXXFLAGS=${CXXFLAGS/-fno-plt} + export LDFLAGS=${LDFLAGS/,-z,now} + ./configure --prefix=/usr + make } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - install -Dt "$pkgdir"/usr/share/licenses/$pkgname "$srcdir"/$pkgname-$pkgver/COPYING + install -Dt "$pkgdir"/usr/share/licenses/$pkgname "$srcdir"/$pkgname-$pkgver/COPYING } diff --git a/fix_defines.patch b/fix_defines.patch index 42423bfdf0d1..3b538dcf055b 100644 --- a/fix_defines.patch +++ b/fix_defines.patch @@ -1,8 +1,8 @@ diff --git a/src/sis_driver.c b/src/sis_driver.c -index 4e51e2e..13e6e24 100644 +index 51c9660..b1490d3 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c -@@ -4140,7 +4140,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) +@@ -4166,7 +4166,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) biossize = 0x8000; break; } @@ -11,50 +11,6 @@ index 4e51e2e..13e6e24 100644 if(readpci) { pSiS->PciInfo->rom_size = biossize; pci_device_read_rom(pSiS->PciInfo, pSiS->BIOS); -@@ -8973,11 +8973,11 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL) - case 24: refreshArea = SISRefreshArea24; break; - case 32: refreshArea = SISRefreshArea32; break; - } --#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) -+/*#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) - xf86DisableRandR(); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Driver rotation enabled, disabling RandR\n"); --#endif -+#endif*/ - } else if(pSiS->Reflect) { - switch(pScrn->bitsPerPixel) { - case 8: -@@ -8986,11 +8986,11 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL) - if(!pSiS->PointerMoved) pSiS->PointerMoved = pScrn->PointerMoved; - pScrn->PointerMoved = SISPointerMovedReflect; - refreshArea = SISRefreshAreaReflect; --#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) -+/*#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) - xf86DisableRandR(); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Driver reflection enabled, disabling RandR\n"); --#endif -+#endif*/ - break; - default: - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -@@ -9097,13 +9097,13 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL) - pSiS->Rotate = 0; - pSiS->Reflect = 0; - pSiS->ShadowFB = FALSE; --#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) -+/*#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) - if(pSiS->CRT1XOffs || pSiS->CRT1YOffs || pSiS->CRT2XOffs || pSiS->CRT2YOffs) { - xf86DisableRandR(); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "MergedFB: CRT2Position offset used, disabling RandR\n"); - } --#endif -+#endif*/ - #ifdef SISXINERAMA - if(pSiS->UseSiSXinerama) { - SiSnoPanoramiXExtension = FALSE; diff --git a/src/sis_vga.c b/src/sis_vga.c index 8b625d2..cf39d0c 100644 --- a/src/sis_vga.c |