diff --git a/.SRCINFO b/.SRCINFO index decf1f9b9aab..c3a8b1e1fd31 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = filebot pkgdesc = The ultimate TV and Movie Renamer pkgver = 4.9.1 - pkgrel = 3 + pkgrel = 4 url = https://www.filebot.net/ install = filebot.install arch = i686 @@ -10,8 +10,7 @@ pkgbase = filebot arch = armv7l arch = armv7h license = Commercial - depends = java8-openjfx - depends = jre8-openjdk + depends = liberica-jre-11-full-bin depends = fontconfig depends = chromaprint optdepends = libzen: Required by libmediainfo @@ -23,7 +22,7 @@ pkgbase = filebot source = https://get.filebot.net/filebot/FileBot_4.9.1/FileBot_4.9.1-aur.tar.xz source = filebot-arch.sh md5sums = 07dc606ca9a5132bb39bf1bb55088605 - md5sums = 3506d0f6c990fb918e91337c634ba70c + md5sums = 0176d5e120aecabce9f0a320ce8b0955 pkgname = filebot diff --git a/PKGBUILD b/PKGBUILD index 707745e421cc..9e095366a7d0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,14 +8,14 @@ pkgname=filebot pkgver=4.9.1 -pkgrel=3 +pkgrel=4 pkgdesc="The ultimate TV and Movie Renamer" arch=('i686' 'x86_64' 'aarch64' 'armv7l' 'armv7h') url="https://www.filebot.net/" license=('Commercial') install=$pkgname.install # install=() -depends=('java8-openjfx' 'jre8-openjdk' 'fontconfig' 'chromaprint') +depends=('liberica-jre-11-full-bin' 'fontconfig' 'chromaprint') makedepends=() provides=('filebot') conflicts=('filebot47' 'filebot-git') @@ -34,7 +34,7 @@ source=(#"https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-po ) md5sums=('07dc606ca9a5132bb39bf1bb55088605' - '3506d0f6c990fb918e91337c634ba70c') + '0176d5e120aecabce9f0a320ce8b0955') optdepends=('libzen: Required by libmediainfo' 'libmediainfo: Read media info such as video codec, resolution or duration' diff --git a/filebot-arch.sh b/filebot-arch.sh index 8847eb465359..32c48541d7a1 100644 --- a/filebot-arch.sh +++ b/filebot-arch.sh @@ -19,5 +19,5 @@ EXTRACTOR="ApacheVFS" # use Apache Commons VFS2 with junrar plugin # EXTRACTOR="SevenZipNativeBindings" # use the lib7-Zip-JBinding.so native library # start filebot -/usr/lib/jvm/java-8-openjdk/jre/bin/java -Dsun.java2d.opengl=true -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dapplication.deployment=AUR -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -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/filebot $JAVA_OPTS -cp /usr/share/java/filebot/filebot.jar net.filebot.Main "$@" +/usr/bin/java -Dsun.java2d.opengl=true -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dapplication.deployment=AUR -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -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/filebot $JAVA_OPTS -cp /usr/share/java/filebot/filebot.jar net.filebot.Main "$@" diff --git a/filebot.install b/filebot.install index bcbcebe1f254..3dbce3f05efa 100644 --- a/filebot.install +++ b/filebot.install @@ -3,6 +3,11 @@ echo -e "\e[1;33m==>\e[0m if you use OpenJDK as Java VM you \e[1;31mmust\e[0m al echo -e "\e[1;33m==>\e[0m \e[1;36mhttps://wiki.archlinux.org/index.php/Java#OpenJFX\e[0m" echo "" echo -e "\e[1;33m==>\e[0m \e[1;31mfilebot --license license.file\e[0m will activate your license.file" +echo "" +echo "This version of Filebot is using Java 11 + OpenJFX (liberica-jre-11-full-bin)" +echo "so java-8 dependency could be removed" + + filebot -script fn:properties --def net.filebot.archive.extractor=ShellExecutables }