mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-04 20:06:43 +02:00
testing/proj: upgrade to 6.1.1
This commit is contained in:
parent
3f93e03728
commit
dcd02fb98d
@ -1,7 +1,7 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=proj
|
||||
pkgver=6.1.0
|
||||
pkgrel=4
|
||||
pkgver=6.1.1
|
||||
pkgrel=0
|
||||
_datumgridver=1.8
|
||||
_jdkver=11
|
||||
pkgdesc="PROJ coordinate transformation software library"
|
||||
@ -10,7 +10,7 @@ arch="s390x aarch64 x86_64 ppc64le"
|
||||
license="MIT"
|
||||
makedepends="
|
||||
apache-ant
|
||||
openjdk${_jdkver}-jdk
|
||||
openjdk$_jdkver-jdk
|
||||
sqlite
|
||||
sqlite-dev
|
||||
"
|
||||
@ -29,20 +29,19 @@ source="
|
||||
TestJni.java
|
||||
"
|
||||
|
||||
builddir="$srcdir/proj-$pkgver"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
unzip -o "$srcdir/proj-datumgrid-$_datumgridver.zip" -d data/
|
||||
}
|
||||
|
||||
build () {
|
||||
build() {
|
||||
./configure \
|
||||
CPPFLAGS=-I/usr/lib/jvm/java-${_jdkver}-openjdk/include/linux \
|
||||
CPPFLAGS=-I/usr/lib/jvm/java-$_jdkver-openjdk/include/linux \
|
||||
--build=$CBUILD \
|
||||
--host=$CHOST \
|
||||
--prefix=/usr \
|
||||
--with-jni=/usr/lib/jvm/java-${_jdkver}-openjdk/include
|
||||
--with-jni=/usr/lib/jvm/java-$_jdkver-openjdk/include
|
||||
make
|
||||
|
||||
cd "$builddir/jniwrap"
|
||||
@ -73,12 +72,12 @@ java() {
|
||||
|
||||
cd "$builddir/jniwrap"
|
||||
mkdir -p "$subpkgdir/usr/share/java/"
|
||||
local _javabindingsver=`grep "name=\"version\"" build.xml | cut -d'"' -f 4`
|
||||
mv out/proj.jar "$subpkgdir/usr/share/java/proj-${_javabindingsver}.jar"
|
||||
ln -s "proj-${_javabindingsver}.jar" "$subpkgdir/usr/share/java/proj.jar"
|
||||
local _javabindingsver=$(grep "name=\"version\"" build.xml | cut -d'"' -f 4)
|
||||
mv out/proj.jar "$subpkgdir/usr/share/java/proj-$_javabindingsver.jar"
|
||||
ln -s "proj-$_javabindingsver.jar" "$subpkgdir/usr/share/java/proj.jar"
|
||||
|
||||
local _libfilepath=`ls $pkgdir/usr/lib/libproj.so.??`
|
||||
local _libfilename=`basename $_libfilepath`
|
||||
local _libfilepath=$(ls $pkgdir/usr/lib/libproj.so.??)
|
||||
local _libfilename=$(basename $_libfilepath)
|
||||
mkdir -p "$subpkgdir/usr/java/packages/lib/"
|
||||
ln -s "/usr/lib/$_libfilename" "$subpkgdir/usr/java/packages/lib/libproj.so"
|
||||
}
|
||||
@ -96,14 +95,14 @@ check() {
|
||||
# Test JNI bindings
|
||||
cp $srcdir/TestJni.java TestJni.java
|
||||
/usr/lib/jvm/default-jvm/bin/javac -cp "$builddir/jniwrap/out/proj.jar" TestJni.java
|
||||
PROJ_LIB="$builddir"/data /usr/lib/jvm/java-${_jdkver}-openjdk/bin/java \
|
||||
PROJ_LIB="$builddir"/data /usr/lib/jvm/java-$_jdkver-openjdk/bin/java \
|
||||
-Djava.library.path="$builddir/src/.libs/" \
|
||||
-cp "$builddir/jniwrap/out/proj.jar":. \
|
||||
TestJni | \
|
||||
grep "\[9.0, 0.0, 8.101251062924646, 0.904618578893133, 9.898748937075354, -0.904618578893133\]"
|
||||
}
|
||||
|
||||
sha512sums="7e7af901031801aa799df5dd2c863f31f0fb98eef7cc6883257bc4778b2df1b8eeee30f8ffca2f882261655ebfb04d46804dd87192bb47a58e9a253d4c461c69 proj-6.1.0.tar.gz
|
||||
sha512sums="a92a920b7fdb1249c50a092dcdebac6791402367715b3956ca89d501eb33532e5627b572ce9c9745b404e93ddc8a7c879683b446ac08d9731d972dc8c5818ed9 proj-6.1.1.tar.gz
|
||||
991206f17348b3de484eb5364d773cd06577057228c2d1a0a1c1658308e2596ca13338a666fa71ddd76d538f23dd5bf21e178fd26a785717edd847a17e5c0cd1 proj-datumgrid-1.8.zip
|
||||
d26e7e4c87e322682fad2bb6e4dec09f610dfc9f9d82b3c96fe379167fef47ad67449701c32efc6cd44f66621354585a436130148df3fbbbf085adda1371bf7a 10-test-tolerance.patch
|
||||
36fe2482f89c6ca38883db99b7f1bf5c650a499c678f799f6b10040e3c90873f6c8bfae08f80eaca99b8957a5361b6966f1925184b4050885af1808e05d063e9 TestJni.java"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user