Update packages

2019-03-03 20:21:14 -05:00
parent e2fd47cde7
commit 59e4cffa8b
130 changed files with 1079 additions and 2539 deletions
--- a/src/filebot/PKGBUILD
+++ b/src/filebot/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Roman Vasilev <2rvasilev@live.ru>
 # Maintainer: max.bra <max dot bra at alice dot it>
 # Contributor: nadolph
 # Contributor: dcelasun
@@ -6,78 +7,68 @@
 # Contributor: Nathan Owe <ndowens04 at gmail>

 pkgname=filebot
-pkgver=4.8.4
+pkgver=4.8.5
 pkgrel=1
-_jnaver=4.5.2
-_fixedcommit=b9572f4501ba9d5af9d445a792fa902274f37679
-pkgdesc="The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums."
+pkgdesc="The ultimate TV and Movie Renamer"
 arch=('i686' 'x86_64' 'aarch64' 'armv7l' 'armv7h')
-url="https://github.com/filebot/filebot"
-license=('GPL')
+url="https://www.filebot.net/"
+license=('Commercial')
 install=$pkgname.install
-depends=('java-runtime>=9' 'fontconfig' 'chromaprint')
-makedepends=('unzip' 'apache-ivy' 'jdk>=9' 'git')
+install=()
+depends=('java-openjfx' 'jre8-openjdk' 'fontconfig' 'chromaprint')
+makedepends=()
+provides=('filebot')
+conflicts=('filebot47' 'filebot-git')

 [[ $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
-        $pkgname-arch.sh $pkgname.svg $pkgname.desktop)
+source=(#"https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-portable.tar.xz"
+        "https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-aur.tar.xz"
+        $pkgname-arch.sh
+        #$pkgname.svg
+        #$pkgname.desktop
+        )

-md5sums=('SKIP'
-         'fa7b8d4b811f5d9e0d27cffbb20dc0ee'
-         '04f46be047049448dba3f0de29fe192d'
-         'f37edd0bba7570904d28ab1681c7a7f3')
+md5sums=('91827d5a16358316c475e58ee86b552e'
+         '7c1128f94fcd9f4e29225a12eac83704')

-optdepends=('libzen: Support for additional subtitle search engines (Sublight)'
-	    'libmediainfo: Episode naming / Sublight usage'
+optdepends=('libzen: Required by libmediainfo'
+	    'libmediainfo: Read media info such as video codec, resolution or duration'
 	    'java-p7zip-binding: Extract archives'
-	    'gvfs: gvfs backends')
-
-#noextract=($(for i in ${source[@]}; do basename $i; done))
+	    'gvfs: Drag-n-Drop from GVFS remote filesystems')

 prepare() {
-  cd "$srcdir/$pkgname/"
-  git checkout $_fixedcommit
-  sed -i -E 's/release="([^"]*)"/target="\1" source="\1"/' build.xml
-  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
-
-apikey.fanart.tv: 780b986b22c35e6f7a134a2f392c2deb
-apikey.thetvdb: 694FAD89942D3827
-apikey.themoviedb: 66308fb6e3fd850dde4c7d21df2e8306
-apikey.omdb: 49d311ec
-apikey.acoustid: 0B3qZnQc
-apikey.anidb: filebot
-apikey.opensubtitles: FileBot
-EOT
-  #cd "$srcdir/jna-$_jnaver/lib/native/"
-  #unzip linux-$_intarch.jar 2>&1 >/dev/null
+  cd "$srcdir"
 }

 build() {
-  export JAVA_HOME=/usr/lib/jvm/java-10-jdk
-  cd $pkgname
-  ant resolve
-  ant jar
-  ant tar
-  cd dist
-  mkdir portable
-  tar -xf FileBot_$pkgver-portable.tar.gz -C ./portable
+  cd $srcdir
 }

 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/"
-
+  mkdir -p $pkgdir/usr/share/java/$pkgname/
+  
  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"
+
+  cd "$srcdir/usr/share"
+
+  install -Dm644 $pkgname/lib/$CARCH/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
+  cp -dpr --no-preserve=ownership $pkgname/jar/* "$pkgdir/usr/share/java/$pkgname/"
+
+  cp -dpr --no-preserve=ownership icons/* "$pkgdir/usr/share/icons/"
+
+  #install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
+  #install -Dm644 icons/hicolor/scalable/apps/$pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
+
+  #install -Dm644 applications/*.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+  mkdir -p $pkgdir/usr/share/applications/
+  cp -dpr --no-preserve=ownership applications/* "$pkgdir/usr/share/applications/"
+
+  mkdir -p $pkgdir/usr/share/mime/packages/
+  cp -dpr --no-preserve=ownership mime/* "$pkgdir/usr/share/mime/"
+  
 }
--- a/src/filebot/filebot-arch.sh
+++ b/src/filebot/filebot-arch.sh
@@ -5,7 +5,6 @@ export LANG="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"

 APP_ROOT=/usr/share/java/filebot
-cd $APP_ROOT

 # add APP_ROOT to LD_LIBRARY_PATH
 if [ ! -z "$LD_LIBRARY_PATH" ]; then
@@ -20,5 +19,5 @@ 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 -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/lib/jvm/java-8-openjdk/bin/java -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 "$@"

--- a/src/filebot/filebot.install
+++ b/src/filebot/filebot.install
@@ -1,6 +1,8 @@
 post_install() {
 echo -e "\e[1;33m==>\e[0m if you use OpenJDK as Java VM you \e[1;31mmust\e[0m also install OpenJFX"
 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
 }

 post_upgrade() {