Copy libmediainfo for aarch64 from the Debian repository (including all transitive dependencies)

build.xml

@@ -626,7 +626,7 @@
 
 			<!-- include native libraries for all supported platforms -->
 			<tarfileset prefix="lib/Linux-armv7l" dir="${dir.lib}/native/linux-armv7l" includes="*.so" />
-			<tarfileset prefix="lib/Linux-aarch64" dir="${dir.lib}/native/linux-armv8" includes="*.so" />
+			<tarfileset prefix="lib/Linux-aarch64" dir="${dir.lib}/native/linux-aarch64" includes="*.so" />
 			<tarfileset prefix="lib/Linux-i686" dir="${dir.lib}/native/linux-i686" includes="*.so" />
 			<tarfileset prefix="lib/Linux-x86_64" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
 			<tarfileset prefix="lib/FreeBSD-amd64" dir="${dir.lib}/native/freebsd-amd64" includes="*.so" />
@@ -654,7 +654,7 @@
 
 			<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/aarch64" dir="${dir.lib}/native/linux-aarch64" 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/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
@@ -730,7 +730,7 @@
 
 			<!-- include native libraries for all supported platforms -->
 			<package prefix="lib/armv7l" dir="${dir.lib}/native/linux-armv7l" includes="*.so" />
-			<package prefix="lib/aarch64" dir="${dir.lib}/native/linux-armv8" includes="*.so" />
+			<package prefix="lib/aarch64" dir="${dir.lib}/native/linux-aarch64" includes="*.so" />
 			<package prefix="lib/i686" dir="${dir.lib}/native/linux-i686" includes="*.so" />
 			<package prefix="lib/x86_64" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
 
@@ -767,7 +767,7 @@
 			<fileset dir="${dir.lib}/native/linux-armv7l" />
 		</copy>
 		<copy todir="${dir.base}/lib/aarch64">
-			<fileset dir="${dir.lib}/native/linux-armv8" />
+			<fileset dir="${dir.lib}/native/linux-aarch64" />
 		</copy>
 		<copy todir="${dir.base}/lib/i686">
 			<fileset dir="${dir.lib}/native/linux-i686" />
@@ -956,7 +956,7 @@
 			<param name="arch.7zj" value="linux-arm" />
 		</antcall>
 		<antcall target="resolve-import-native">
-			<param name="arch" value="linux-armv8" />
+			<param name="arch" value="linux-aarch64" />
 			<param name="arch.jna" value="linux-aarch64" />
 			<param name="arch.7zj" value="linux-aarch64" />
 		</antcall>
@@ -967,7 +967,7 @@
 		</antcall>
 
 		<!-- strip x86 and PPC native code from universal library -->
-		<exec executable="ditto" os="Mac OS X" dir="${dir.lib}/native/mac-x86_64">
+		<exec executable="ditto" dir="${dir.lib}/native/mac-x86_64" os="Mac OS X">
 			<arg line="--arch x86_64 libjnidispatch.jnilib libjnidispatch.dylib" />
 		</exec>
 		<delete verbose="yes">

installer/qpkg/shared/bin/filebot.sh

@@ -33,5 +33,8 @@ UNRAR="/usr/local/sbin/unrar"
 APP_DATA="$QPKG_ROOT/data/$USER"
 LIBRARY_PATH="$PACKAGE_LIBRARY_PATH:$LD_LIBRARY_PATH"
 
+# make sure transitive dependencies can be loaded
+export LD_LIBRARY_PATH="$LIBRARY_PATH"
+
 # start filebot
 java -Dapplication.deployment=qpkg -Dnet.filebot.license="$QPKG_ROOT/data/.license" -Dnet.filebot.media.parser="$MEDIA_PARSER" -Dnet.filebot.media.ffprobe="$FFPROBE" -Dnet.filebot.archive.extractor="$ARCHIVE_EXTRACTOR" -Dnet.filebot.archive.7z="$P7ZIP" -Dnet.filebot.archive.unrar="$UNRAR" -Djava.awt.headless=true @{java.application.options} @{linux.application.options} @{linux.portable.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$QPKG_ROOT/jar/filebot.jar" "$@"

installer/spk/package/filebot.sh

@@ -63,5 +63,8 @@ FFPROBE="/volume1/@appstore/MediaServer/bin/ffprobe"
 APP_DATA="$FILEBOT_HOME/data/$USER"
 LIBRARY_PATH="$SYNO_LIBRARY_PATH:$PACKAGE_LIBRARY_PATH"
 
+# make sure transitive dependencies can be loaded
+export LD_LIBRARY_PATH="$LIBRARY_PATH"
+
 # start filebot
 java -Dapplication.deployment=spk -Dnet.filebot.license="$FILEBOT_HOME/data/.license" -Dnet.filebot.media.parser="$MEDIA_PARSER" -Dnet.filebot.media.ffprobe="$FFPROBE" -Dnet.filebot.archive.extractor="$ARCHIVE_EXTRACTOR" -Djava.awt.headless=true @{java.application.options} @{linux.application.options} @{linux.portable.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"

installer/tar/filebot.sh

@@ -53,5 +53,8 @@ esac
 APP_DATA="$FILEBOT_HOME/data/$USER"
 LIBRARY_PATH="$PACKAGE_LIBRARY_PATH:$LD_LIBRARY_PATH"
 
+# make sure transitive dependencies can be loaded
+export LD_LIBRARY_PATH="$LIBRARY_PATH"
+
 # start filebot
 java -Dapplication.deployment=tar -Dnet.filebot.license="$FILEBOT_HOME/data/.license" -Dnet.filebot.media.parser="$MEDIA_PARSER" -Dnet.filebot.archive.extractor="$ARCHIVE_EXTRACTOR" @{java.application.options} @{linux.application.options} @{linux.portable.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"