jna access restored. no more any arch. x86, x86_64 and armv7h only.

3 files changed, 43 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4856a70aecd..48ebad69045f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,12 @@
 pkgbase = filebot
 	pkgdesc = The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums.
 	pkgver = 4.7.7
-	pkgrel = 2
+	pkgrel = 3
 	url = http://filebot.sourceforge.net/
 	install = filebot.install
-	arch = any
+	arch = i686
+	arch = x86_64
+	arch = armv7h
 	license = GPL
 	depends = java-runtime>=8
 	depends = fontconfig
@@ -18,9 +20,15 @@ pkgbase = filebot
 	source = filebot.svg
 	source = filebot.desktop
 	md5sums = 58d35910d5d164454c7840122a17dace
-	md5sums = 5fca1c27a1fa021eaee96666994990e4
+	md5sums = 3b51756c50a54447a5e6fb6c052e3453
 	md5sums = 04f46be047049448dba3f0de29fe192d
 	md5sums = f37edd0bba7570904d28ab1681c7a7f3
+	source_i686 = https://github.com/java-native-access/jna/raw/090b24870896dd719a5b5c6d2181ba0d4bb8d767/lib/native/linux-x86.jar
+	md5sums_i686 = 588794d32336fcc6029a7e6591265c79
+	source_x86_64 = https://github.com/java-native-access/jna/raw/3fa90d76f5c44523eaa619e68ad8ad81b5a0dc94/lib/native/linux-x86-64.jar
+	md5sums_x86_64 = 6e0b830e108ab05c8bdccd9902258882
+	source_armv7h = https://github.com/java-native-access/jna/raw/0547a9c3e24bd1219b54e92b3e38b14c477e21f8/lib/native/linux-arm.jar
+	md5sums_armv7h = 1c141c8ac6a659b3b593fece54270709
 
 pkgname = filebot
 
diff --git a/PKGBUILD b/PKGBUILD
index 4bd26bb5f1e9..8ac465e89f61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,20 +5,32 @@
 
 pkgname=filebot
 pkgver=4.7.7
-pkgrel=2
+pkgrel=3
 pkgdesc="The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums."
-arch=('any')
+arch=('i686' 'x86_64' 'armv7h')
 url="http://filebot.sourceforge.net/"
 license=('GPL')
 install=$pkgname.install
-
 depends=('java-runtime>=8' 'fontconfig' 'chromaprint')
+
+[[ $CARCH == "i686" ]] && _intarch=x86
+[[ $CARCH == "x86_64" ]] && _intarch=x86-64
+[[ $CARCH == "armv7h" ]] && _intarch=arm
+
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/FileBot_$pkgver/FileBot_$pkgver-portable.tar.xz
         $pkgname-arch.sh $pkgname.svg $pkgname.desktop)
+source_i686+=(https://github.com/java-native-access/jna/raw/090b24870896dd719a5b5c6d2181ba0d4bb8d767/lib/native/linux-x86.jar)
+source_x86_64+=(https://github.com/java-native-access/jna/raw/3fa90d76f5c44523eaa619e68ad8ad81b5a0dc94/lib/native/linux-x86-64.jar)
+source_armv7h+=(https://github.com/java-native-access/jna/raw/0547a9c3e24bd1219b54e92b3e38b14c477e21f8/lib/native/linux-arm.jar)
+
 md5sums=('58d35910d5d164454c7840122a17dace'
-         '5fca1c27a1fa021eaee96666994990e4'
+         '3b51756c50a54447a5e6fb6c052e3453'
          '04f46be047049448dba3f0de29fe192d'
          'f37edd0bba7570904d28ab1681c7a7f3')
+md5sums_i686=('588794d32336fcc6029a7e6591265c79')
+md5sums_x86_64=('6e0b830e108ab05c8bdccd9902258882')
+md5sums_armv7h=('1c141c8ac6a659b3b593fece54270709')
+
 #noextract=(FileBot_$pkgver.jar)
 optdepends=('libzen: Support for additional subtitle search engines (Sublight)'
 	    'libmediainfo: Episode naming / Sublight usage'
@@ -32,6 +44,7 @@ build() {
 package() {
   cd "$srcdir"
   install -Dm644 FileBot.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
+  install -Dm644 libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
   install -Dm755 $pkgname-arch.sh "$pkgdir/usr/bin/$pkgname"
   install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
   install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
diff --git a/filebot-arch.sh b/filebot-arch.sh
index 0a6a9f47c09a..a30aac768821 100644
--- a/filebot-arch.sh
+++ b/filebot-arch.sh
@@ -4,6 +4,13 @@
 export LANG="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"
 
+APP_ROOT=/usr/share/java/filebot
+# add APP_ROOT to LD_LIBRARY_PATH
+if [ ! -z "$LD_LIBRARY_PATH" ]; then
+	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$APP_ROOT"
+else
+	export LD_LIBRARY_PATH="$APP_ROOT"
+fi
 
 # choose extractor
 EXTRACTOR="ApacheVFS"			# use Apache Commons VFS2 with junrar plugin
@@ -11,4 +18,11 @@ EXTRACTOR="ApacheVFS"			# use Apache Commons VFS2 with junrar plugin
 # EXTRACTOR="SevenZipNativeBindings"	# use the lib7-Zip-JBinding.so native library
 
 # start filebot
-java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djava.net.useSystemProxies=false -Djna.nosys=true -Dapplication.deployment=portable -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir=$HOME/.config/filebot -Djava.io.tmpdir=/tmp/filebot -Dapplication.update=skip -Djna.library.path=/usr/share/java $JAVA_OPTS -jar /usr/share/java/filebot/filebot.jar "$@"
+java -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -DuseCreationDate=false \
+-Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djava.net.useSystemProxies=false \
+-Djna.nosys=false -Dapplication.deployment=portable \
+-Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" \
+-Dapplication.dir=$HOME/.config/filebot -Djava.io.tmpdir=/tmp/filebot -Dapplication.update=skip \
+-Djna.library.path=/usr/share/java \
+$JAVA_OPTS -jar /usr/share/java/filebot/filebot.jar "$@"
+