From ff406be5dafbd3e08123f6c1cb05835d615b7ba4 Mon Sep 17 00:00:00 2001 From: Edgar Date: Tue, 23 May 2023 12:26:55 +0000 Subject: [PATCH] :bug: Fixed git packages --- ogre-caelum-git/PKGBUILD | 10 +++++++--- ogre-pagedgeometry-git/PKGBUILD | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ogre-caelum-git/PKGBUILD b/ogre-caelum-git/PKGBUILD index ce66f54..dbd0105 100644 --- a/ogre-caelum-git/PKGBUILD +++ b/ogre-caelum-git/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Edgar pkgname=ogre-caelum-git -pkgver=0.6.3.r38.g7763bff +pkgver=0.6.4.4bd1b05 pkgrel=1 pkgdesc="Library for OGRE targeted at helping to create nice-looking atmospheric effects." -arch=('i686' 'x86_64') +arch=('i686' 'amd64') url="https://ogrecave.github.io/ogre-caelum/" depends=('ogre') makedepends=('cmake' 'git') @@ -16,7 +16,11 @@ sha512sums=('SKIP') pkgver() { cd ${srcdir}/ogre-caelum - git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' + + _ver=$(grep -oP ' VERSION ([0-9]\.[0-9]\.[0-9])' "CMakeLists.txt" | awk '{print $2;}') + _gitcommit=$(git rev-parse --short HEAD) + + echo $_ver.$_gitcommit } build() { diff --git a/ogre-pagedgeometry-git/PKGBUILD b/ogre-pagedgeometry-git/PKGBUILD index b0edce2..d61df57 100644 --- a/ogre-pagedgeometry-git/PKGBUILD +++ b/ogre-pagedgeometry-git/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Edgar pkgname=ogre-pagedgeometry-git -pkgver=1.2.0.r59.g95194bc +pkgver=1.3.0.30965c8 pkgrel=1 pkgdesc="Paged Geometry plugin for OGRE for fast rendering of trees and grass." -arch=('i686' 'x86_64') +arch=('i686' 'amd64') url="https://ogrecave.github.io/ogre-pagedgeometry/" license=('MIT') depends=('ogre') @@ -16,7 +16,11 @@ sha512sums=('SKIP') pkgver() { cd ${srcdir}/ogre-pagedgeometry - git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' + + _ver=$(grep -oP ' VERSION ([0-9]\.[0-9]\.[0-9])' "CMakeLists.txt" | awk '{print $2;}') + _gitcommit=$(git rev-parse --short HEAD) + + echo $_ver.$_gitcommit } build() {