author | Anatol Pomozov
<anatol.pomozov@gmail.com> 2016-08-22 05:14:50 UTC |
committer | Anatol Pomozov
<anatol.pomozov@gmail.com> 2016-08-22 05:14:58 UTC |
parent | 2a7ffe80d7d5f5538b625784737baca6898e4515 |
.SRCINFO | +6 | -2 |
PKGBUILD | +4 | -10 |
diff --git a/.SRCINFO b/.SRCINFO index 94c47f8..7eb1d4c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Mon Aug 22 05:14:53 UTC 2016 pkgbase = libsigrok-git pkgdesc = Client software that supports various hardware logic analyzers, core library (git version) - pkgver = 0.2.1.r1719.geb2373f + pkgver = 0.2.1.r2296.g817b744 pkgrel = 1 url = http://www.sigrok.org/wiki/Libsigrok arch = armv6h @@ -10,11 +12,13 @@ pkgbase = libsigrok-git license = GPL3 makedepends = git makedepends = autoconf-archive + makedepends = doxygen depends = libzip - depends = libftdi-compat + depends = libftdi depends = alsa-lib depends = libserialport-git depends = glibmm + depends = libieee1284 provides = libsigrok conflicts = libsigrok source = git://sigrok.org/libsigrok diff --git a/PKGBUILD b/PKGBUILD index d8f9d6a..2737f21 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,14 +5,14 @@ _gitname='libsigrok' pkgname="${_gitname}-git" -pkgver=0.2.1.r1719.geb2373f +pkgver=0.2.1.r2296.g817b744 pkgrel=1 pkgdesc="Client software that supports various hardware logic analyzers, core library (git version)" arch=('armv6h' 'armv7h' 'i686' 'x86_64') url="http://www.sigrok.org/wiki/Libsigrok" license=('GPL3') -depends=('libzip' 'libftdi-compat' 'alsa-lib' 'libserialport-git' 'glibmm') -makedepends=('git' 'autoconf-archive') +depends=('libzip' 'libftdi' 'alsa-lib' 'libserialport-git' 'glibmm' 'libieee1284') +makedepends=('git' 'autoconf-archive' 'doxygen') conflicts=("${_gitname}") provides=("${_gitname}") source=("git://sigrok.org/${_gitname}") @@ -20,11 +20,7 @@ sha512sums=('SKIP') pkgver() { cd "${srcdir}/${_gitname}" - ( - set -o pipefail - git describe --long 2>/dev/null | sed "s/\([^-]*-g\)/r\1/;s/-/./g;s/${_gitname}.//" || - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" - ) + git describe --long | sed 's/^libsigrok-//;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { @@ -43,5 +39,3 @@ package() { install -Dm 644 'contrib/z60_libsigrok.rules' "${pkgdir}/usr/lib/udev/rules.d/60-libsigrok.rules" } - -# vim:set et sw=2 sts=2 tw=80: \ No newline at end of file