summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--CMakelists.txt.patch2
-rw-r--r--PKGBUILD12
3 files changed, 11 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4814dfdf1931..fc91cf5e23c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xygrib-git
pkgdesc = Grib reader and weather visualization software. Zygrib fork.
- pkgver = 1.2.6.1.r107.gb58041c
+ pkgver = 1.2.6.1.r120.g88c425c
pkgrel = 1
url = https://opengribs.org/
arch = x86_64
@@ -22,8 +22,7 @@ pkgbase = xygrib-git
source = CMakelists.txt.patch
source = xygrib.install
sha1sums = SKIP
- sha1sums = add3722f418a64fd70e3a912793d3e5530fac4a0
+ sha1sums = 1cbac226906a24f9671558b043c072192f3df03f
sha1sums = 97eec7e40bd2d4f44986ffbf5096ac4ba37ebbfe
pkgname = xygrib-git
-
diff --git a/CMakelists.txt.patch b/CMakelists.txt.patch
index 422ec99b25d7..ae36089f9f42 100644
--- a/CMakelists.txt.patch
+++ b/CMakelists.txt.patch
@@ -7,7 +7,7 @@ index b066a04..0e286f2 100644
/opt/csw/include # Blastwave
/opt/include
- PATH_SUFFIXES openjpeg-2.3 openjpeg-2.2 openjpeg-2.1
-+ PATH_SUFFIXES openjpeg-2.4 openjpeg-2.3 openjpeg-2.2 openjpeg-2.1
++ PATH_SUFFIXES openjpeg-2.5
REQUIRED
)
include_directories(${OPENJPEG_INCLUDE_DIR})
diff --git a/PKGBUILD b/PKGBUILD
index 31fd699fe9df..dc4518a91e5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# ---------------------------------------------------------------
pkgname=xygrib-git
-pkgver=1.2.6.1.r107.gb58041c
+pkgver=1.2.6.1.r120.g88c425c
pkgrel=1
pkgdesc="Grib reader and weather visualization software. Zygrib fork."
arch=('x86_64' 'aarch64')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'zlib' 'bzip2' 'libpng')
url="https://opengribs.org/"
source=("$pkgname::git+https://github.com/opengribs/XyGrib.git" "CMakelists.txt.patch" "xygrib.install")
sha1sums=('SKIP'
- 'add3722f418a64fd70e3a912793d3e5530fac4a0'
+ '1cbac226906a24f9671558b043c072192f3df03f'
'97eec7e40bd2d4f44986ffbf5096ac4ba37ebbfe')
pkgver() {
@@ -23,13 +23,17 @@ pkgver() {
git describe --long --tags | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
}
-build() {
+prepare() {
cd $pkgname
patch --strip=1 -i $srcdir/CMakelists.txt.patch
+}
+
+build() {
+ cd $pkgname
mkdir -p build
cd build
cmake ../
- make
+ make -j $(nproc)
}
package() {