updated to work with xorg server 1.20

1 files changed, 29 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 942ff2de566d..ac0301743e72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,49 @@
-# $Id: PKGBUILD 281737 2016-11-21 13:46:51Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: lone_Wolf <lonewolf@xs4all.nl>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Porting this to xorg-server 1.20 made possible by : loqs, progandy, regid
+# see https://bbs.archlinux.org/viewtopic.php?id=237632
 
 pkgname=xf86-video-sis
-pkgver=0.10.8
-pkgrel=3
+pkgver=0.10.9.r7.ga50b2b3
+pkgrel=1
 pkgdesc="X.org SiS video driver"
-arch=(i686 x86_64)
+arch=(x86_64)
 url="https://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'xf86dgaproto')
-conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=24.0' 'xf86dgaproto' 'git' 'pixman')
+conflicts=('xorg-server<1.20' 'X-ABI-VIDEODRV_VERSION<24' 'X-ABI-VIDEODRV_VERSION>=25')
 optdepends=('sis-dri: DRI1 support from community repo')
 groups=('xorg-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-sha256sums=('c8f3f2577f69334dfcc4bf96477dce45161170555f3abdfa105599e61bc7d3fe'
-            'b3cbb937a94c5e0ea21e05005238b247ee146ba8640eda7bfbe8b382b25dde7b')
+_commit=a50b2b3412dd8e7f3916acb142c942e85ffcb3e5
+source=("git+https://anongit.freedesktop.org/git/xorg/driver/xf86-video-sis.git#commit=$_commit"
+        'fix_defines.patch::https://ptpb.pw/2MVt')
+sha256sums=('SKIP'
+            '8338641b519c25d9a8387608ea562970b4313e7602f890ff0331a0742c3f7f8b')
+
+pkgver() {
+  cd ${pkgname}
+  git describe --long | sed 's/^xf86-video-sis.//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
 prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/git-fixes.patch
+  cd ${pkgname}
+  patch -Np1 -i ../fix_defines.patch
+  autoreconf -vfi
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname
+  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
+  make DESTDIR="$pkgdir" install
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -Dt  "$pkgdir"/usr/share/licenses/$pkgname "$srcdir"/$pkgname/COPYING
 }