From e060e7b1cb5f15cd57a063218111ea8c1767930b Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Fri, 16 Dec 2016 16:26:34 +0800
Subject: [PATCH] SPK: include native libraries for all supported platforms

---
 build.xml                        | 6 ++++++
 installer/spk/package/filebot.sh | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index d53ce613..035b9082 100644
--- a/build.xml
+++ b/build.xml
@@ -715,6 +715,12 @@
 			<package dir="${dir.installer}/spk/package" includes="*.sh" filemode="755" />
 			<package file="${path.fatjar}" fullpath="FileBot.jar" />
 
+			<!-- include native libraries for all supported platforms -->
+			<package prefix="lib/armv7l" dir="${dir.lib}/native/linux-armv7l" />
+			<package prefix="lib/armv8" dir="${dir.lib}/native/linux-armv8" />
+			<package prefix="lib/i686" dir="${dir.lib}/native/linux-i686" />
+			<package prefix="lib/x86_64" dir="${dir.lib}/native/linux-amd64" />
+
 			<codesign secring="${dir.installer}/gpg/secring.gpg" keyid="${gpg.key}" password="${gpg.pwd}" />
 		</spk>
 	</target>
diff --git a/installer/spk/package/filebot.sh b/installer/spk/package/filebot.sh
index 9722a22d..4dda45dc 100644
--- a/installer/spk/package/filebot.sh
+++ b/installer/spk/package/filebot.sh
@@ -38,11 +38,14 @@ export LC_ALL="en_US.UTF-8"
 SYNO_FPCALC="/usr/local/chromaprint/bin/fpcalc"
 SYNO_LIBRARY_PATH="/usr/local/mediainfo/lib:/usr/local/chromaprint/lib"
 
-# add APP_ROOT to LD_LIBRARY_PATH
+# add package lib folder to library path
+PACKAGE_LIBRARY_PATH="$APP_ROOT/lib/$(uname -m)"
+
+# add PACKAGE_LIBRARY_PATH to LD_LIBRARY_PATH
 if [ ! -z "$LD_LIBRARY_PATH" ]; then
-	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SYNO_LIBRARY_PATH:$APP_ROOT"
+	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SYNO_LIBRARY_PATH:$PACKAGE_LIBRARY_PATH"
 else
-	export LD_LIBRARY_PATH="$SYNO_LIBRARY_PATH:$APP_ROOT"
+	export LD_LIBRARY_PATH="$SYNO_LIBRARY_PATH:$PACKAGE_LIBRARY_PATH"
 fi
 
 # choose extractor