summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2019-08-19 15:13:54 +0200
committerbartus2019-08-19 15:13:54 +0200
commitf69be9c0650db33673a63bfb2ded99441b531694 (patch)
tree1457097dd73da98ae6aa49d37d7f85a64ad949cb
parent5801e2b517759be711c798bb7a20e9f2a0f15b43 (diff)
downloadaur-f69be9c0650db33673a63bfb2ded99441b531694.tar.gz
Fix pkgver()
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD24
2 files changed, 16 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 32a632b09129..bd64c058e0e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = babl-qfix-git
pkgdesc = babl is a dynamic, any to any, pixel format translation library.
- pkgver = 0.1.70.14.g868a077
+ pkgver = 0.1.71.r27.5801e2b
pkgrel = 1
url = https://www.gegl.org/babl
arch = x86_64
@@ -10,7 +10,7 @@ pkgbase = babl-qfix-git
makedepends = lcms2
depends = glibc
depends = gobject-introspection
- provides = babl=0.1.70.14.g868a077
+ provides = babl=0.1.71.r27.5801e2b
conflicts = babl
options = !libtool
source = git+https://gitlab.gnome.org/GNOME/babl
diff --git a/PKGBUILD b/PKGBUILD
index a4e981e2d21f..6c68931006dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_pkgname=babl
pkgname="${_pkgname}-qfix-git"
-pkgver=0.1.70.14.g868a077
+pkgver=0.1.71.r27.5801e2b
pkgrel=1
pkgdesc="babl is a dynamic, any to any, pixel format translation library."
arch=('x86_64')
@@ -19,18 +19,27 @@ options=(!libtool)
source=(git+https://gitlab.gnome.org/GNOME/babl)
md5sums=('SKIP')
-_gitname=babl
-
-build() {
+prepare() {
mkdir "${srcdir}/build" -p
- meson "${srcdir}/${_gitname}"\
+ meson "${srcdir}/${_pkgname}"\
"${srcdir}/build" \
--prefix=/usr \
-Dbuildtype=release \
-Db_lto=true \
-Dwith-docs=false
+}
+
+pkgver() {
+ printf "%d.%d.%d.r%s.%s" \
+ $(grep -Po '^#define BABL_MAJOR_VERSION \K[0-9]*$' build/config.h) \
+ $(grep -Po '^#define BABL_MINOR_VERSION \K[0-9]*$' build/config.h) \
+ $(grep -Po '^#define BABL_MICRO_VERSION \K[0-9]*$' build/config.h) \
+ $(git rev-list --count HEAD) \
+ $(git rev-parse --short HEAD)
+}
+build() {
ninja -C "${srcdir}/build"
}
@@ -38,11 +47,6 @@ package() {
DESTDIR="${pkgdir}" ninja -C "${srcdir}/build" install
}
-pkgver() {
- cd "${_gitname}"
- git describe --always | sed -e 's/BABL_//g' -e 's/[_-]/./g'
-}
-
check() {
meson test -C "${srcdir}/build"
}