back to java8

2 files changed, 14 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cfafe0f054e1..7c3517d5fc42 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = filebot
 	pkgdesc = The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums.
 	pkgver = 4.8.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/filebot/filebot
 	install = filebot.install
 	arch = i686
@@ -12,8 +12,8 @@ pkgbase = filebot
 	license = GPL
 	makedepends = unzip
 	makedepends = apache-ivy
-	makedepends = jdk>=9
-	depends = java-runtime>=9
+	makedepends = jdk>=8
+	depends = java-runtime>=8
 	depends = fontconfig
 	depends = chromaprint
 	optdepends = libzen: Support for additional subtitle search engines (Sublight)
diff --git a/PKGBUILD b/PKGBUILD
index 13c6a26818b2..3fe7c4ca3e83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=filebot
 pkgver=4.8.4
-pkgrel=1
+pkgrel=2
 _jnaver=4.5.2
 _fixedcommit=b9572f4501ba9d5af9d445a792fa902274f37679
 pkgdesc="The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums."
@@ -15,13 +15,14 @@ arch=('i686' 'x86_64' 'aarch64' 'armv7l' 'armv7h')
 url="https://github.com/filebot/filebot"
 license=('GPL')
 install=$pkgname.install
-depends=('java-runtime>=9' 'fontconfig' 'chromaprint')
-makedepends=('unzip' 'apache-ivy' 'jdk>=9')
+depends=('java-runtime>=8' 'fontconfig' 'chromaprint')
+makedepends=('unzip' 'apache-ivy' 'jdk>=8')
 
 [[ $CARCH == "i686" ]]   && _intarch=i686
-[[ $CARCH == "x86_64" ]] && _intarch=x86_64
+[[ $CARCH == "x86_64" ]] && _intarch=amd64
 [[ $CARCH == "armv7l" ]] && _intarch=armv7l
 [[ $CARCH == "armv7h" ]] && _intarch=armv7l
+[[ $CARCH == "aarch64" ]] && _intarch=armv8
 
 source=("${pkgname}::git+https://github.com/filebot/filebot.git"
         #https://github.com/java-native-access/jna/archive/$_jnaver.tar.gz
@@ -42,11 +43,12 @@ optdepends=('libzen: Support for additional subtitle search engines (Sublight)'
 prepare() {
   cd "$srcdir/$pkgname/"
   git checkout $_fixedcommit
-  sed -i -E 's/release="([^"]*)"/target="\1" source="\1"/' build.xml
+
+  patch -p1 -i jdk8.patch
+
   sed -i -E 's/-portable.tar.xz/-portable.tar.gz/' build.xml
-  sed -i -E 's/jre.version: 10/jre.version: 9/' app.properties
-  sed -i -E 's/jvm.version: 10/jvm.version: 9/' app.properties
   sed -i -E 's/tar.compression: xz/tar.compression: gzip/' app.properties
+
 cat <<EOT >> app.properties
 url.data: https://app.filebot.net/data
 
@@ -58,23 +60,17 @@ apikey.acoustid: 0B3qZnQc
 apikey.anidb: filebot
 apikey.opensubtitles: FileBot
 EOT
-  #cd "$srcdir/jna-$_jnaver/lib/native/"
-  #unzip linux-$_intarch.jar 2>&1 >/dev/null
 }
 
 build() {
   cd $pkgname
   ant resolve
   ant jar
-  ant tar
-  cd dist
-  mkdir portable
-  tar -xf FileBot_$pkgver-portable.tar.gz -C ./portable
 }
 
 package() {
-  install -Dm644 $pkgname/dist/portable/lib/Linux-$_intarch/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
-  cp -dpr --no-preserve=ownership $pkgname/dist/portable/jar/* "$pkgdir/usr/share/java/$pkgname/"
+  install -Dm644 $pkgname/lib/native/linux-$_intarch/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
+  cp -dpr --no-preserve=ownership $pkgname/dist/lib/* "$pkgdir/usr/share/java/$pkgname/"
 
   install -Dm755 $pkgname-arch.sh "$pkgdir/usr/bin/$pkgname"
   install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"