diff options
author | Marc-Olivier Barre | 2021-01-19 18:53:55 +0100 |
---|---|---|
committer | Marc-Olivier Barre | 2021-01-19 18:53:55 +0100 |
commit | 1ec603c46a625780dbabab399544b7f9b3be1146 (patch) | |
tree | de0b4f251e8ccd1e8e7750da28c93c5edd75b914 | |
parent | 1aff9199b9a0987480fe760fe3107b90fd8be88a (diff) | |
download | aur-oacapture.tar.gz |
fix a duplicate macro in libhidapi configure.ac preventing bootstrap from working
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | libhidapi-configure-ac.diff | 11 |
3 files changed, 18 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = oacapture pkgdesc = A planetary imaging application using Qt5 pkgver = 1.8.0 - pkgrel = 1 + pkgrel = 2 url = http://www.openastroproject.org/oacapture/ arch = i686 arch = x86_64 @@ -17,8 +17,10 @@ pkgbase = oacapture conflicts = oacapture-git source = https://github.com/openastroproject/openastro/archive/v1.8.0.tar.gz source = oacapture-slash-lib.diff + source = libhidapi-configure-ac.diff sha256sums = 25dfa4e16ba5e19028d40313eadf4cc1734a6f123572cb8be484bd009f06067d sha256sums = 813e80ef718e0e9887c5293ef435b1cff43d03ae8c2bb6a2d53f0bbbf4a284f2 + sha256sums = 204c6d6dea820fa9564026df4d0bd15d866bd9904d0afd3e51c3fd7ddf69a844 pkgname = oacapture @@ -1,6 +1,6 @@ pkgname=oacapture pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A planetary imaging application using Qt5" provides=("oacapture") conflicts=("oacapture-git") @@ -10,12 +10,13 @@ depends=('qt5-base' 'qt5-tools' 'cfitsio' 'autoconf-archive' 'sdl' 'libdc1394') url="http://www.openastroproject.org/oacapture/" optdepends=('fxload: support for QHY5 cameras') -source=("https://github.com/openastroproject/openastro/archive/v${pkgver}.tar.gz" "oacapture-slash-lib.diff") -sha256sums=("25dfa4e16ba5e19028d40313eadf4cc1734a6f123572cb8be484bd009f06067d" "813e80ef718e0e9887c5293ef435b1cff43d03ae8c2bb6a2d53f0bbbf4a284f2") +source=("https://github.com/openastroproject/openastro/archive/v${pkgver}.tar.gz" "oacapture-slash-lib.diff" "libhidapi-configure-ac.diff") +sha256sums=("25dfa4e16ba5e19028d40313eadf4cc1734a6f123572cb8be484bd009f06067d" "813e80ef718e0e9887c5293ef435b1cff43d03ae8c2bb6a2d53f0bbbf4a284f2" "204c6d6dea820fa9564026df4d0bd15d866bd9904d0afd3e51c3fd7ddf69a844") build() { cd "openastro-${pkgver}" patch -Np1 < ${srcdir}/oacapture-slash-lib.diff + patch -Np1 < ${srcdir}/libhidapi-configure-ac.diff ./bootstrap ./configure --prefix=/usr make diff --git a/libhidapi-configure-ac.diff b/libhidapi-configure-ac.diff new file mode 100644 index 000000000000..98c6765f2687 --- /dev/null +++ b/libhidapi-configure-ac.diff @@ -0,0 +1,11 @@ +diff -ru a/ext/libhidapi/configure.ac b/ext/libhidapi/configure.ac +--- a/ext/libhidapi/configure.ac 2020-12-08 11:58:13.000000000 +0100 ++++ b/ext/libhidapi/configure.ac 2021-01-19 18:31:21.034233203 +0100 +@@ -18,7 +18,6 @@ + lt_age="0" + LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}" + +-AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([foreign -Wall -Werror]) + AC_CONFIG_MACRO_DIR([m4]) + |