summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjerry732042020-10-23 03:35:11 +0800
committerjerry732042020-10-23 03:35:11 +0800
commitead6594709efa9481f6e6c1feacc7a6f8cd56e75 (patch)
treefb43f6c9ef09977b9d0be471aab7938acbc4e961
parentbf54c3a4672e2b1fa70021cdde36ee48a4dbde04 (diff)
downloadaur-ead6594709efa9481f6e6c1feacc7a6f8cd56e75.tar.gz
Bump to 3.1.3-1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--cmake.patch13
3 files changed, 28 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8647334b59d7..bf77edb05ae1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,14 @@
pkgbase = apriltag
pkgdesc = AprilTag is a visual fiducial system popular for robotics research.
- pkgver = 3.1.1
+ pkgver = 3.1.3
pkgrel = 1
url = https://april.eecs.umich.edu/software/apriltag
arch = x86_64
license = BSD
- source = https://github.com/AprilRobotics/apriltag/archive/3.1.1.tar.gz
- md5sums = 818e0087c8b752b3699b6fb0686ae134
+ source = https://github.com/AprilRobotics/apriltag/archive/v3.1.3.tar.gz
+ source = cmake.patch
+ sha256sums = a46ce9b63297f20423d7954a8cb0a4e409ab32449ceb45245616ad2d4dd61425
+ sha256sums = 04a589f47ce5d7eb194d509a800f77cc30c7cdea1fc17923f015e00753fa9c43
pkgname = apriltag
diff --git a/PKGBUILD b/PKGBUILD
index 54de81399585..23fbc1c30ef9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,33 @@
# Maintainer: jerry73204 <jerry73204@gmail.com>
pkgname=apriltag
-pkgver=3.1.1
+pkgver=3.1.3
pkgrel=1
pkgdesc="AprilTag is a visual fiducial system popular for robotics research."
arch=('x86_64')
url="https://april.eecs.umich.edu/software/apriltag"
license=('BSD')
-source=("https://github.com/AprilRobotics/apriltag/archive/${pkgver}.tar.gz")
-md5sums=('818e0087c8b752b3699b6fb0686ae134')
-sha256sum=('7349e1fcc8b2979230b46c0d62ccf2ba2bbd611d87ef80cfd37ffe74425f5efb')
+source=("https://github.com/AprilRobotics/apriltag/archive/v${pkgver}.tar.gz"
+ "cmake.patch")
+sha256sums=('a46ce9b63297f20423d7954a8cb0a4e409ab32449ceb45245616ad2d4dd61425'
+ '04a589f47ce5d7eb194d509a800f77cc30c7cdea1fc17923f015e00753fa9c43')
prepare() {
mkdir -p "$srcdir/build"
+
+ cd "$srcdir/${pkgname}-${pkgver}"
+ patch -Np1 -i "$srcdir/cmake.patch"
}
build() {
cd "$srcdir/build"
cmake \
+ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
"$srcdir/${pkgname}-${pkgver}"
}
package() {
cd "$srcdir/build"
- make DESTDIR="$pkgdir" install
+ make VERBOSE=1 DESTDIR="$pkgdir" install
}
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 000000000000..80f566236f4c
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6b00d03..c04c165 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,7 +70,7 @@ if (NOT Python3_NOT_FOUND AND NOT Numpy_NOT_FOUND AND PYTHONLIBS_FOUND)
+ # TODO deal with both python2/3
+ execute_process(COMMAND python3 ${CMAKE_SOURCE_DIR}/python_build_flags.py OUTPUT_VARIABLE PY_OUT)
+ set(PY_VARS CFLAGS LDFLAGS LINKER EXT_SUFFIX)
+-cmake_parse_arguments(PY "" "${PY_VARS}" "" ${PY_OUT})
++cmake_parse_arguments(PY "" ${PY_VARS} "" ${PY_OUT})
+ separate_arguments(PY_CFLAGS)
+ separate_arguments(PY_LDFLAGS)
+