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

[Andreas Radke]

    Date: Sunday, November 7, 2021 @ 11:28:46
  Author: andyrtr
Revision: 427458

upgpkg: xf86-video-openchrome 0.6.0.r754.g15c868a-1: upstream to latest git commit; xorg-server-21.1.1 rebuild

Modified:
  xf86-video-openchrome/trunk/PKGBUILD

----------+
 PKGBUILD |   46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-07 11:08:40 UTC (rev 427457)
+++ PKGBUILD	2021-11-07 11:28:46 UTC (rev 427458)
@@ -3,10 +3,10 @@
 # Contributor: Juergen Hoetzel <juergen at hoetzel.info>
 
 pkgname=xf86-video-openchrome
-#_commit=8c819ed # 7 digits # = 0.6.0 RC1
-#pkgver=0.5.0+279+g8c819ed
-pkgver=0.6.0
-pkgrel=4
+_commit=15c868a # 7 digits # = 0.6.0 RC1
+pkgver=0.6.0.r754.g15c868a
+#pkgver=0.6.0
+pkgrel=1
 pkgdesc="X.Org Openchrome drivers"
 arch=(x86_64)
 license=('custom')
@@ -13,34 +13,36 @@
 url="https://www.freedesktop.org/wiki/Openchrome/"
 depends=('libdrm' 'libxvmc' 'systemd-libs')
 optdepends=('unichrome-dri')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=24.0' 'systemd' 'libxv')
-#             'git')
-conflicts=('xorg-server<1.20' 'X-ABI-VIDEODRV_VERSION<24' 'X-ABI-VIDEODRV_VERSION>=25'
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=25.2' 'systemd' 'libxv'
+             'git')
+conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<25' 'X-ABI-VIDEODRV_VERSION>=26'
            'xf86-video-via' 'xf86-video-unichrome' 'openchrome')
 replaces=('openchrome' 'xf86-video-via')
 groups=('xorg-drivers')
 options=('!emptydirs')
-source=(https://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
-#source=("git://anongit.freedesktop.org/openchrome/xf86-video-openchrome#commit=${_commit}")
-sha256sums=('da2975c6379358de52c1257710c67eb59139a7f0a1cd28d00cc64cc3e1c02f75'
-            'SKIP')
+#source=(https://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
+#sha256sums=('da2975c6379358de52c1257710c67eb59139a7f0a1cd28d00cc64cc3e1c02f75'
+#            'SKIP')
+source=("git://anongit.freedesktop.org/openchrome/xf86-video-openchrome#commit=${_commit}")
+sha256sums=('SKIP')
 validpgpkeys=('CDA92E38A7A7A82237E9AB61C922784178BFFDB0') # "Kevin Brace <kevinbrace at gmx.com>"
 
-#pkgver() {
-#  cd $pkgname
-#  git describe --long | sed 's/-/+/g'
+pkgver() {
+  cd $pkgname
+  #git describe --long | sed 's/-/+/g'
 #  git describe --long | sed "s/openchrome-//;s/-/./g"
+  git describe --long | sed 's/^xf86-video-openchrome-//;s/\([^-]*-g\)/r\1/;s/-/./g'
 #  git describe --long | sed "s/openchrome-//;s/0.5/0.5.200/;s/-/+/g"
 #  git describe --long | sed "s/openchrome-//;s/0.5/0.5.0/;s/-/+/g"
-#}
+}
 
-#prepare() {
-#  cd $pkgname
-#  NOCONFIGURE=1 ./autogen.sh
-#}
+prepare() {
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname} #-${pkgver}
 
   # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
   # With them, module fail to load with undefined symbol.
@@ -54,13 +56,13 @@
 }
 
 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}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"