From 8af28e26add554f20006dbdf8a8d898f6ece9476 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Wed, 26 Apr 2023 02:03:29 +0300 Subject: [PATCH] upg git xf86-video-ati --- git/PKGBUILD | 9 ++--- git/PKGBUILD-arch | 4 +- git/time | 6 +-- xf86-video-ati/PKGBUILD | 76 +++++++++++++++++++++--------------- xf86-video-ati/PKGBUILD-arch | 35 +++++------------ xf86-video-ati/deps | 2 +- xf86-video-ati/time | 6 +-- 7 files changed, 68 insertions(+), 70 deletions(-) diff --git a/git/PKGBUILD b/git/PKGBUILD index 25f6118..2464112 100644 --- a/git/PKGBUILD +++ b/git/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=git -pkgver=2.40.0 +pkgver=2.40.1 pkgrel=01 pkgdesc='the fast distributed version control system w/o systemd' url='https://git-scm.com/' @@ -128,10 +128,9 @@ license=('GPL2') validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano -sha256sums=(b17a598fbf58729ef13b577465eb93b2d484df1201518b708b5044ff623bf46d # git-2.40.0.tar.xz - a4d74395ae89149935208e4620a7fa341b94bc9e215f9cf977bca12ff511d961 # git-2.40.0.tar.sign +sha256sums=(4893b8b98eefc9fdc4b0e7ca249e340004faa7804a433d17429e311e1fef21d2 # git-2.40.1.tar.xz + e95fcb5c6d15e21204c64d2b9913e30f7bf15ed448e60e44b04be1ed13714ade # git-2.40.1.tar.sign 7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45) # git-sysusers.conf -## 781a14566b78df9b0237a7ac0ee9e6519f4149626949182cd5f9b7408ce7334e git-2.40.0-01-x86_64.pkg.tar.lz - +## ad706ff4a9aa75673b93f826bce4b9e5ccbcff3b9059b1081799c921c5bef4f3 git-2.40.1-01-x86_64.pkg.tar.lz diff --git a/git/PKGBUILD-arch b/git/PKGBUILD-arch index effa558..0d04ef2 100644 --- a/git/PKGBUILD-arch +++ b/git/PKGBUILD-arch @@ -2,7 +2,7 @@ # Maintainer: Dan McGee pkgname=git -pkgver=2.40.0 +pkgver=2.40.1 pkgrel=1 pkgdesc='the fast distributed version control system' arch=('x86_64') @@ -30,7 +30,7 @@ source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar."{xz,sign} 'git-daemon@.service' 'git-daemon.socket' 'git-sysusers.conf') -sha256sums=('b17a598fbf58729ef13b577465eb93b2d484df1201518b708b5044ff623bf46d' +sha256sums=('4893b8b98eefc9fdc4b0e7ca249e340004faa7804a433d17429e311e1fef21d2' 'SKIP' '14c0b67cfe116b430645c19d8c4759419657e6809dfa28f438c33a005245ad91' 'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203' diff --git a/git/time b/git/time index 7e1d093..b159a37 100644 --- a/git/time +++ b/git/time @@ -1,6 +1,6 @@ -real 22m26.651s -user 15m9.197s -sys 7m27.510s +real 19m24.001s +user 13m13.344s +sys 5m24.501s diff --git a/xf86-video-ati/PKGBUILD b/xf86-video-ati/PKGBUILD index 8180766..8972153 100644 --- a/xf86-video-ati/PKGBUILD +++ b/xf86-video-ati/PKGBUILD @@ -1,43 +1,46 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=xf86-video-ati -_commit=7a6a34af026f0bef8080b91baf97a729380bca01 -pkgver=19.1.0.r15.g7a6a34af +#_commit=7a6a34af026f0bef8080b91baf97a729380bca01 +#pkgver=19.1.0.r15.g7a6a34af +pkgver=22.0.0 pkgrel=01 epoch=1 pkgdesc="X.org ati video driver" -arch=('x86_64') url="https://xorg.freedesktop.org/" depends=('mesa') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=25.2' 'git') +makedepends=('xorg-server-devel' '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=("${pkgname}-${pkgver}::git+https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati#commit=${_commit}") +#source=("${pkgname}-${pkgver}::git+https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati#commit=${_commit}") +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.xz{,.sig}) -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}* - -# # fix a crash under Xorg-server 21.1.1 -# # https://bugs.archlinux.org/task/72759 -# # https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/merge_requests/9 -# patch -Np1 -i ../0001_dont_set_sourcevalidate_pointer_to_null.diff - - NOCONFIGURE=1 ./autogen.sh -} +#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}* +# +## # fix a crash under Xorg-server 21.1.1 +## # https://bugs.archlinux.org/task/72759 +## # https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/merge_requests/9 +## patch -Np1 -i ../0001_dont_set_sourcevalidate_pointer_to_null.diff +# +# NOCONFIGURE=1 ./autogen.sh +#} build() { - cd ${pkgname}* #-${pkgver} +# cd ${pkgname}* #-${pkgver} + cd ${pkgname}-${pkgver} # CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common @@ -53,24 +56,35 @@ build() { } check() { - cd ${pkgname}* #-${pkgver} +# cd ${pkgname}* #-${pkgver} + cd ${pkgname}-${pkgver} make check } package() { - cd ${pkgname}* #-${pkgver} +# 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}/" } -#---- license gpg-key sha256sums ---- + +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('custom') -validpgpkeys=('B09FAF35BE914521980951145A81AF8E6ADBB200') # Michel Daenzer +#validpgpkeys=('B09FAF35BE914521980951145A81AF8E6ADBB200') # Michel Daenzer +validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner + +sha512sums=('fba9ffc7b0eeb0c369eb1a6f8ef0bb3061cfeca26bc269baf6e3d16dcd943fbf4092f1e37adfb1bc71051cee0b7a0e6fb253f0b8bcd210732ccaf99e8f2356fe' + 'SKIP') + +sha256sums=(c8c8bb56d3f6227c97e59c3a3c85a25133584ceb82ab5bc05a902a743ab7bf6d # xf86-video-ati-22.0.0.tar.xz + 4002f7e9f5431fa860efb06e39727536307886e34080e1a2be057161d672dc93) # xf86-video-ati-22.0.0.tar.xz.sig + +## ab20b93e3083bdfdb90ab6b7345eb62fead746977926c8f6790c93f82b472b41 xf86-video-ati-1:22.0.0-01-x86_64.pkg.tar.lz -sha256sums=(SKIP) - - diff --git a/xf86-video-ati/PKGBUILD-arch b/xf86-video-ati/PKGBUILD-arch index ee8408f..282d8ea 100644 --- a/xf86-video-ati/PKGBUILD-arch +++ b/xf86-video-ati/PKGBUILD-arch @@ -3,8 +3,7 @@ # Contributor: Alexander Baldeck pkgname=xf86-video-ati -_commit=7a6a34af026f0bef8080b91baf97a729380bca01 -pkgver=19.1.0.r15.g7a6a34af +pkgver=22.0.0 pkgrel=1 epoch=1 pkgdesc="X.org ati video driver" @@ -12,31 +11,17 @@ arch=('x86_64') url="https://xorg.freedesktop.org/" license=('custom') depends=('systemd-libs' 'mesa') -makedepends=('xorg-server-devel' 'systemd' 'X-ABI-VIDEODRV_VERSION=25.2' 'git') +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=("${pkgname}-${pkgver}::git+https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati#commit=${_commit}") -sha512sums=('SKIP') -validpgpkeys=('B09FAF35BE914521980951145A81AF8E6ADBB200') # Michel Daenzer - -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 -} +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.xz{,.sig}) +sha512sums=('fba9ffc7b0eeb0c369eb1a6f8ef0bb3061cfeca26bc269baf6e3d16dcd943fbf4092f1e37adfb1bc71051cee0b7a0e6fb253f0b8bcd210732ccaf99e8f2356fe' + 'SKIP') +#validpgpkeys=('B09FAF35BE914521980951145A81AF8E6ADBB200') # Michel Daenzer +validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner build() { - cd ${pkgname}* #-${pkgver} + cd ${pkgname}-${pkgver} # CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common @@ -52,12 +37,12 @@ build() { } 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}" diff --git a/xf86-video-ati/deps b/xf86-video-ati/deps index 51abd69..1eadd09 100644 --- a/xf86-video-ati/deps +++ b/xf86-video-ati/deps @@ -1,6 +1,6 @@ xorg-server-devel xorg-server -git autoconf automake + diff --git a/xf86-video-ati/time b/xf86-video-ati/time index 33cc76a..6668373 100644 --- a/xf86-video-ati/time +++ b/xf86-video-ati/time @@ -1,6 +1,6 @@ -real 0m53.173s -user 0m26.724s -sys 0m2.263s +real 0m20.982s +user 0m19.253s +sys 0m2.334s