[arch-commits] Commit in xf86-video-ati/trunk (PKGBUILD)

[Andreas Radke]

    Date: Sunday, November 7, 2021 @ 10:52:33
  Author: andyrtr
Revision: 427448

upgpkg: xf86-video-ati 1:19.1.0.r9.g5eba006e-1: upstream to latest git commit; xorg-server-21.1.1 rebuild

Modified:
  xf86-video-ati/trunk/PKGBUILD

----------+
 PKGBUILD |   40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-07 09:43:22 UTC (rev 427447)
+++ PKGBUILD	2021-11-07 10:52:33 UTC (rev 427448)
@@ -1,9 +1,11 @@
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 
 pkgname=xf86-video-ati
-pkgver=19.1.0
-pkgrel=2
+_commit=5eba006e4129e8015b822f9e1d2f1e613e252cda
+pkgver=19.1.0.r9.g5eba006e
+pkgrel=1
 epoch=1
 pkgdesc="X.org ati video driver"
 arch=('x86_64')
@@ -10,18 +12,32 @@
 url="https://xorg.freedesktop.org/"
 license=('custom')
 depends=('systemd-libs' 'mesa')
-makedepends=('xorg-server-devel' 'systemd' 'X-ABI-VIDEODRV_VERSION=24.0')
-conflicts=('xorg-server<1.20.0' 'X-ABI-VIDEODRV_VERSION<24' 'X-ABI-VIDEODRV_VERSION>=25')
+makedepends=('xorg-server-devel' 'systemd' 'X-ABI-VIDEODRV_VERSION=25.2' 'git')
+conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<25' 'X-ABI-VIDEODRV_VERSION>=26')
 groups=('xorg-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha512sums=('73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6'
-            'SKIP')
+#source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
+#sha512sums=('73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6'
+#            'SKIP')
+source=("${pkgname}-${pkgver}::git+https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati#commit=${_commit}")
+sha512sums=('SKIP')
 validpgpkeys=('B09FAF35BE914521980951145A81AF8E6ADBB200') # Michel Daenzer <michel at daenzer.net>
 
+pkgver() {
+  cd ${pkgname}*
+  # from ati-git AUR pkg
+  git describe --long | sed 's/^xf86-video-ati-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+
+prepare() {
+  cd ${pkgname}*
+  NOCONFIGURE=1 ./autogen.sh
+}
+
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}* #-${pkgver}
 
-  CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
+#  CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
 
   # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
   # With them, module fail to load with undefined symbol.
@@ -35,12 +51,12 @@
 }
 
 check() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}* #-${pkgver}
   make check
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}* #-${pkgver}
 
   make "DESTDIR=${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"