From a3c0323fd60795c90fbbf0ca6fbb9a3698a818f3 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Wed, 28 Nov 2018 23:15:37 +0700
Subject: [PATCH] Revert to amd64 only DEB package due to JavaFX native
 dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

➔ https://www.filebot.net/forums/viewtopic.php?f=11&t=6028&p=40242#p40241
---
 app.properties                |  2 +-
 build.xml                     | 16 ++++++----------
 installer/deb/control/control |  4 ++--
 installer/deb/filebot.sh      |  7 ++++---
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app.properties b/app.properties
index e3bcda50..68089af1 100644
--- a/app.properties
+++ b/app.properties
@@ -68,7 +68,7 @@ mac.application.category: public.app-category.utilities
 deb.application.categories: AudioVideo;Video;Utility;FileTools;
 deb.application.mimetype: inode/directory;video/*;audio/*;text/*;application/*;
 deb.application.class: net-filebot-Main
-deb.application.depends: openjdk-11-jre, openjfx, mediainfo, libchromaprint-tools, p7zip-full, p7zip-rar
+deb.application.depends: openjdk-11-jre, libmediainfo0v5, libchromaprint-tools, p7zip-full, p7zip-rar
 deb.jna.depends: libjnidispatch.so
 
 # Package Options
diff --git a/build.xml b/build.xml
index 2d6fe268..da97d6c9 100644
--- a/build.xml
+++ b/build.xml
@@ -538,18 +538,17 @@
 	<target name="deb" depends="revision" description="Build Debian package">
 		<property name="dir.staging" location="${dir.dist}/deb" />
 
+		<get-linux-jre dest="${dir.staging}/jre" />
+
 		<copy-replace todir="${dir.staging}">
 			<fileset dir="${dir.installer}/deb" />
 		</copy-replace>
 
 		<jdeb destfile="${dir.dist}/${application.name}_${application.version}.deb" control="${dir.staging}/control" compression="${tar.compression}" verbose="true">
 			<tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" />
+			<tarfileset prefix="/usr/share/filebot/mod" dir="${dir.staging}/jre/ext/modules/lib" />
 			<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" />
-
-			<tarfileset prefix="/usr/share/filebot/lib/x86_64" dir="${dir.lib}/native/linux-amd64" includes="${deb.jna.depends}" />
-			<tarfileset prefix="/usr/share/filebot/lib/i686" dir="${dir.lib}/native/linux-i686" includes="${deb.jna.depends}" />
-			<tarfileset prefix="/usr/share/filebot/lib/aarch64" dir="${dir.lib}/native/linux-armv8" includes="${deb.jna.depends}" />
-			<tarfileset prefix="/usr/share/filebot/lib/armv7l" dir="${dir.lib}/native/linux-armv7l" includes="${deb.jna.depends}" />
+			<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-amd64" includes="${deb.jna.depends}" />
 
 			<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
 			<tarfileset prefix="/usr/share" dir="${dir.staging}/share" />
@@ -619,12 +618,9 @@
 
 		<tar destfile="${dir.dist}/${application.name}_${application.version}-aur.tar.xz" compression="${tar.compression}" longfile="posix" encoding="utf-8">
 			<tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" />
+			<tarfileset prefix="/usr/share/filebot/mod" dir="${dir.staging}/jre/ext/modules/lib" />
 			<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" />
-
-			<tarfileset prefix="/usr/share/filebot/lib/x86_64" dir="${dir.lib}/native/linux-amd64" includes="${deb.jna.depends}" />
-			<tarfileset prefix="/usr/share/filebot/lib/i686" dir="${dir.lib}/native/linux-i686" includes="${deb.jna.depends}" />
-			<tarfileset prefix="/usr/share/filebot/lib/aarch64" dir="${dir.lib}/native/linux-armv8" includes="${deb.jna.depends}" />
-			<tarfileset prefix="/usr/share/filebot/lib/armv7l" dir="${dir.lib}/native/linux-armv7l" includes="${deb.jna.depends}" />
+			<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-amd64" includes="${deb.jna.depends}" />
 
 			<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
 			<tarfileset prefix="/usr/share" dir="${dir.staging}/share" />
diff --git a/installer/deb/control/control b/installer/deb/control/control
index 4b7c92d7..c326134e 100644
--- a/installer/deb/control/control
+++ b/installer/deb/control/control
@@ -1,11 +1,11 @@
 Package: @{package.name}
 Version: @{application.version}
-Architecture: all
+Architecture: amd64
 Maintainer: @{package.developer} <@{package.maintainer}>
 Description: @{package.synopsis}
  @{package.description}
 Homepage: @{package.homepage}
 Section: utils
 Priority: extra
-Recommends: @{deb.application.depends}
+Depends: @{deb.application.depends}
 Enhances: nautilus-actions
diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh
index 7270cb11..a56dcfa3 100644
--- a/installer/deb/filebot.sh
+++ b/installer/deb/filebot.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 FILEBOT_HOME="/usr/share/filebot"
+JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
 
 if [ -z "$HOME" ]; then
 	echo '$HOME must be set'
@@ -8,7 +9,7 @@ fi
 
 # select application data folder
 APP_DATA="$HOME/.filebot"
-LIBRARY_PATH="$FILEBOT_HOME/lib/$(uname -m):/usr/lib/$(uname -m)-linux-gnu/jni"
-MODULE_PATH="/usr/share/openjfx/lib"
+LIBRARY_PATH="$FILEBOT_HOME/lib"
+MODULE_PATH="$FILEBOT_HOME/mod"
 
-java -Dapplication.deployment=deb --module-path "$MODULE_PATH" --add-modules ALL-MODULE-PATH -Dnet.filebot.Archive.extractor=SevenZipExecutable @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"
+$JAVA_HOME/bin/java -Dapplication.deployment=deb --module-path "$MODULE_PATH" --add-modules ALL-MODULE-PATH -Dnet.filebot.Archive.extractor=SevenZipExecutable @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"