summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Mueller2023-07-18 10:50:35 +0200
committerRalf Mueller2023-07-18 10:50:35 +0200
commit0ba2ae0400ad44490efcfd4bf00aa07c2de902c4 (patch)
treeb43d5b15528c942d3c9a6ab36f108b28d869d0be
parentc7b7b2d5040e955ebb1dba35759c0bde01af70cf (diff)
downloadaur-0ba2ae0400ad44490efcfd4bf00aa07c2de902c4.tar.gz
remove old openjpeg dependency
eccodes switched over to openjpeg2, works better with libtool now
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
2 files changed, 5 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3b9d38e137dd..85089f732f1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = cdi
pkgdesc = CDI is a general purpose C-library with an additional Fortran interface for file IO in the geoscience area. Supported data formats are GRIB, netCDF, SERVICE, EXTRA and IEG. CDI is the IO part of CDO
pkgver = 2.2.0
- pkgrel = 0
+ pkgrel = 1
url = https://code.zmaw.de/projects/cdi
arch = i686
arch = x86_64
@@ -9,11 +9,9 @@ pkgbase = cdi
makedepends = netcdf
makedepends = eccodes
makedepends = libaec
- makedepends = openjpeg
depends = netcdf
depends = eccodes
depends = libaec
- depends = openjpeg
source = https://code.zmaw.de/attachments/download/28692/cdi-2.2.0.tar.gz
sha256sums = 241544f54765c5e1a91170901f65b3665eafbbf184b7fba021686b4dddc8db17
diff --git a/PKGBUILD b/PKGBUILD
index 08c54cd2c924..b99ce07a192d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@ flavour=
pkgname=${pkg}${flavour}
pkgver=2.2.0
fileID=28692
-pkgrel=0
+pkgrel=1
pkgdesc="CDI is a general purpose C-library with an additional Fortran interface for file IO in the geoscience area. Supported data formats are GRIB, netCDF, SERVICE, EXTRA and IEG. CDI is the IO part of CDO"
url="https://code.zmaw.de/projects/cdi"
license=('GPLv2')
-depends=('netcdf' 'eccodes' 'libaec' 'openjpeg')
-makedepends=('netcdf' 'eccodes' 'libaec' 'openjpeg')
+depends=('netcdf' 'eccodes' 'libaec')
+makedepends=('netcdf' 'eccodes' 'libaec')
provides=()
conflicts=()
replaces=()
@@ -21,7 +21,7 @@ sha256sums=('241544f54765c5e1a91170901f65b3665eafbbf184b7fba021686b4dddc8db17')
build() {
cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --with-netcdf=/usr --with-eccodes=/usr --with-szlib CFLAGS='-g -O2' LIBS='-lpng -lopenjpeg' --enable-iso-c-interface --enable-hirlam-extensions --enable-openmp
+ ./configure --prefix=/usr --with-netcdf=/usr --with-eccodes=/usr --with-szlib CFLAGS='-g -O2' --enable-iso-c-interface --enable-hirlam-extensions --enable-openmp
make -j12 || return 1
}
package() {