summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsL1pKn072021-10-13 01:36:11 +0200
committersL1pKn072021-10-13 01:36:11 +0200
commit558563044ed11b4d48f6176312c843d58305c659 (patch)
tree0ac720855605a4b93ab93cca2339888172ce5e2c
parenta65cdda7a2b4c513cc7b09724222b40d60e71ece (diff)
downloadaur-558563044ed11b4d48f6176312c843d58305c659.tar.gz
bump
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD24
2 files changed, 20 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e1d98e9ce650..487332044d1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Sun Dec 25 18:47:14 UTC 2016
pkgbase = jxrlib-git
pkgdesc = Open source implementation of jpegxr (Git version)
- pkgver = 1.1.r309.98e615d
+ pkgver = 1.1.r326.12ce3f8
pkgrel = 1
- url = https://jxrlib.codeplex.com/
- arch = i686
+ url = https://jxrlib.codeplex.com
arch = x86_64
license = GPL
makedepends = git
@@ -28,4 +25,3 @@ pkgname = java-jxrlib-git
depends = java-environment
provides = java-jxrlib
conflicts = java-jxrlib
-
diff --git a/PKGBUILD b/PKGBUILD
index 8c0c513847e6..ad67b0009b0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@ pkgbase=jxrlib-git
pkgname=('jxrlib-git'
'java-jxrlib-git'
)
-pkgver=1.1.r309.98e615d
+pkgver=1.1.r326.12ce3f8
pkgrel=1
pkgdesc='Open source implementation of jpegxr (Git version)'
-arch=('i686' 'x86_64')
+arch=('x86_64')
license=('GPL')
-url='https://jxrlib.codeplex.com/'
+url='https://jxrlib.codeplex.com'
makedepends=('git'
'swig'
'maven'
@@ -22,11 +22,19 @@ sha256sums=('SKIP')
pkgver() {
cd jxrlib
- _ver="$(cat Makefile | grep -m1 JXR_VERSION | grep -o "[[:digit:]]*" | xargs)"
- echo -e "${_ver// /.}.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+ _ver="$(cat Makefile | grep -m1 JXR_VERSION | grep -o "[[:digit:]]*" | paste -sd'.')"
+ echo -e "${_ver}.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
}
prepare() {
+ mkdir -p garbagecollector
+
+ cat << EOF > "${srcdir}/garbagecollector/settings.xml"
+<settings>
+ <localRepository>${srcdir}/garbagecollector/Repository</localRepository>
+</settings>
+EOF
+
# Fix the prefix in libjxr.pc
sed 's|"DIR_INSTALL": "$(DIR_INSTALL)"|"PREFIX": "$(PREFIX)"|g' -i jxrlib/Makefile
sed 's|DIR_INSTALL|PREFIX|g' -i jxrlib/libjxr.pc.in
@@ -34,13 +42,14 @@ prepare() {
build() {
cd jxrlib
+
make \
SHARED=1 \
PREFIX=/usr \
swig all
# Build the java binding
- LD_LIBRARY_PATH="${srcdir}/jxrlib/build" mvn -f java package
+ LD_LIBRARY_PATH="${srcdir}/jxrlib/build" mvn -s "${srcdir}/garbagecollector/settings.xml" -f java package
}
package_jxrlib-git() {
@@ -49,6 +58,8 @@ package_jxrlib-git() {
conflicts=('jxrlib')
make -C jxrlib SHARED=1 PREFIX=/usr DIR_INSTALL="${pkgdir}/usr" install
+ ln -s libjpegxr.so "${pkgdir}/usr/lib/libjpegxr.so.0"
+ ln -s libjxrglue.so "${pkgdir}/usr/lib/libjxrglue.so.0"
}
package_java-jxrlib-git() {
@@ -60,5 +71,6 @@ package_java-jxrlib-git() {
conflicts=('java-jxrlib')
install -Dm744 jxrlib/build/libjxrjava.so "${pkgdir}/usr/lib/libjxrjava.so"
+ ln -s libjxrjava.so "${pkgdir}/usr/lib/libjxrjava.so.0"
install -Dm644 jxrlib/java/target/jxrlib-0.3.0-SNAPSHOT.jar "${pkgdir}/usr/share/java/jxrlib-0.3.0-SNAPSHOT.jar"
}