summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorØystein Sture2023-11-19 12:09:01 +0100
committerØystein Sture2023-11-19 12:09:01 +0100
commit91ad320a1a3e82f0acb563d090e297ea3b463589 (patch)
tree90ad1c218852908fcfc1e384e33832a8f2e3260d
parent9f47cebabf12180b31ab2632f4b142bf08193771 (diff)
downloadaur-91ad320a1a3e82f0acb563d090e297ea3b463589.tar.gz
Cherry-pick fix for Gaussian std-dev crash
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD16
2 files changed, 16 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d61924576aae..03030e2e5566 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
pkgbase = gz-sensors8
pkgdesc = Provides numerous sensor models designed to generate realistic data from simulation environments.
pkgver = 8.0.0
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/gazebosim/gz-sensors
arch = any
license = Apache
makedepends = cmake
makedepends = doxygen
makedepends = gz-cmake=3
+ makedepends = git
depends = gz-common=5
depends = gz-math=7
depends = gz-msgs=10
@@ -16,7 +17,7 @@ pkgbase = gz-sensors8
depends = protobuf
depends = sdformat=14
provides = gz-sensors=8
- source = https://github.com/gazebosim/gz-sensors/archive/gz-sensors8_8.0.0.tar.gz
- sha256sums = f86d6572f31efc199a623462faaa1b380c91a3706a60561aa498562aa939184e
+ source = git+https://github.com/gazebosim/gz-sensors.git#tag=gz-sensors8_8.0.0
+ sha256sums = SKIP
pkgname = gz-sensors8
diff --git a/PKGBUILD b/PKGBUILD
index 36fe1e8f9b70..eb06bce08e11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=gz-sensors8
pkgver=8.0.0
-pkgrel=2
+pkgrel=3
_pkgmaj=${pkgver%%.*}
_pkgbase=${pkgname::-${#_pkgmaj}}
pkgdesc="Provides numerous sensor models designed to generate realistic data from simulation environments."
@@ -22,13 +22,21 @@ makedepends=(
'cmake'
'doxygen'
'gz-cmake=3'
+ 'git'
)
provides=("${_pkgbase}=${_pkgmaj}")
-source=("https://github.com/gazebosim/${_pkgbase}/archive/${pkgname}_${pkgver}.tar.gz")
-sha256sums=('f86d6572f31efc199a623462faaa1b380c91a3706a60561aa498562aa939184e')
+source=("git+https://github.com/gazebosim/${_pkgbase}.git#tag=${pkgname}_${pkgver}")
+sha256sums=('SKIP')
+
+prepare() {
+ cd "$_pkgbase"
+
+ # Avoid calling DblNormal with invalid standard deviation (issue #396)
+ git cherry-pick -n "ac0c44f7da0a6d3c9e129571c7910421664f1181"
+}
build() {
- cmake -B build -S "${_pkgbase}-${pkgname}_${pkgver}" \
+ cmake -B build -S "${_pkgbase}" \
-DCMAKE_BUILD_TYPE='None' \
-DCMAKE_INSTALL_PREFIX='/usr' \
-DBUILD_TESTING=OFF \