summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorxiota2023-08-25 12:53:12 -0700
committerxiota2023-08-25 12:53:12 -0700
commitdae96dad7654c13ecb50b7a7592da5cf8ff3982e (patch)
tree0af02b24a4b08130bb8552d0985a31cbdca4ba0a
parentd49cbf2f5ce47f140b06126315bdc8ee8999e3a5 (diff)
downloadaur-dae96dad7654c13ecb50b7a7592da5cf8ff3982e.tar.gz
switch to maintained fork
-rw-r--r--.SRCINFO23
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD61
3 files changed, 49 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fcccb307265c..be855118e668 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
pkgbase = zxing-cpp-git
- pkgdesc = A command-line tool to decode QRCode
- pkgver = r60.5aad474
+ pkgdesc = A C++ library to decode QRCode
+ pkgver = 2.1.0.r14.g81b405ba
pkgrel = 1
- url = https://github.com/glassechidna/zxing-cpp
- arch = any
- license = apache
- makedepends = git
+ url = https://github.com/nu-book/zxing-cpp
+ arch = x86_64
+ license = Apache
+ checkdepends = gtest
makedepends = cmake
- makedepends = cppunit
- optdepends = opencv: support for opencv
- optdepends = gtkglext: required if building with opencv
+ makedepends = git
+ depends = gcc-libs
provides = zxing-cpp
- source = zxing-cpp-git::git+https://github.com/glassechidna/zxing-cpp.git
- sha512sums = SKIP
+ conflicts = zxing-cpp
+ source = zxing-cpp::git+https://github.com/nu-book/zxing-cpp
+ sha256sums = SKIP
pkgname = zxing-cpp-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 6419fad1a4af..5caaea561f01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,50 @@
-# Maintainer: Maxime Arthaud <maxime@arthaud.me>
+# Maintainer:
+# Contributor: Maxime Arthaud <maxime@arthaud.me>
-pkgname=zxing-cpp-git
-pkgver=r60.5aad474
+_pkgname="zxing-cpp"
+pkgname="$_pkgname-git"
+pkgver=2.1.0.r14.g81b405ba
pkgrel=1
-pkgdesc="A command-line tool to decode QRCode"
-arch=('any')
-url="https://github.com/glassechidna/zxing-cpp"
-license=('apache')
+pkgdesc="A C++ library to decode QRCode"
+arch=(x86_64)
+url="https://github.com/nu-book/zxing-cpp"
+license=('Apache')
+
provides=('zxing-cpp')
-makedepends=('git' 'cmake' 'cppunit')
-optdepends=('opencv: support for opencv'
- 'gtkglext: required if building with opencv')
-source=("$pkgname::git+https://github.com/glassechidna/zxing-cpp.git")
-sha512sums=('SKIP')
+conflicts=('zxing-cpp')
+
+depends=(
+ gcc-libs
+)
+makedepends=(
+ cmake
+ git
+)
+checkdepends=(
+ gtest
+)
+
+source=("$_pkgname"::"git+$url")
+sha256sums=('SKIP')
pkgver() {
- cd "$srcdir/$pkgname"
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ cd "$srcdir/$_pkgname"
+ git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- cd "$srcdir/$pkgname"
- mkdir build
- cd build
- cmake -G "Unix Makefiles" \
- -DCMAKE_CXX_FLAGS=-fPIC \
+ cmake -B build -S "$_pkgname" \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=ON \
- ..
- make
+ -DCMAKE_BUILD_TYPE=None \
+ -DBUILD_EXAMPLES=OFF \
+ -DBUILD_UNIT_TESTS=ON
+ cmake --build build
}
check() {
- cd "$srcdir/$pkgname/build"
- ./testrunner
+ ctest --test-dir build --output-on-failure
}
package() {
- cd "$srcdir/$pkgname/build"
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
}