Improved support for FreeBSD-amd64

build.xml

@@ -550,10 +550,11 @@
 			<tarfileset prefix="jar" dir="${dir.dist}/lib" />
 
 			<!-- include native libraries for all supported platforms -->
-			<tarfileset prefix="lib/armv7l" dir="${dir.lib}/native/linux-armv7l" includes="*.so" />
-			<tarfileset prefix="lib/aarch64" dir="${dir.lib}/native/linux-armv8" includes="*.so" />
-			<tarfileset prefix="lib/i686" dir="${dir.lib}/native/linux-i686" includes="*.so" />
-			<tarfileset prefix="lib/x86_64" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
+			<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-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-x86_64" dir="${dir.lib}/native/freebsd-amd64" includes="*.so" />
 
 			<!-- include maintainer public key -->
 			<tarfileset dir="${dir.installer}/gpg" includes="maintainer.gpg" />
@@ -807,6 +808,11 @@
 			<param name="arch.jna" value="linux-aarch64" />
 			<param name="arch.7zj" value="linux-aarch64" />
 		</antcall>
+		<antcall target="resolve-import-native">
+			<param name="arch" value="freebsd-amd64" />
+			<param name="arch.jna" value="freebsd-x86-64" />
+			<param name="arch.7zj" value="FreeBSD-amd64" />
+		</antcall>
 	</target>
 
 

installer/tar/filebot.sh

@@ -17,7 +17,8 @@ PRG_DIR=`dirname "$PRG"`
 FILEBOT_HOME=`cd "$PRG_DIR" && pwd`
 
 # add package lib folder to library path
-PACKAGE_LIBRARY_PATH="$FILEBOT_HOME/lib/$(uname -m)"
+PACKAGE_LIBRARY_ARCH="$(uname -s)-$(uname -m)"
+PACKAGE_LIBRARY_PATH="$FILEBOT_HOME/lib/$PACKAGE_LIBRARY_ARCH"
 
 # make sure required environment variables are set
 if [ -z "$USER" ]; then
@@ -29,15 +30,23 @@ export LANG="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"
 
 # choose archive extractor / media characteristics parser
-if uname -m | egrep "i386|i686|amd64|x86_64"; then
-	# i686 or x86_64
-	ARCHIVE_EXTRACTOR="SevenZipNativeBindings"  # use lib7-Zip-JBinding.so
-	MEDIA_PARSER="libmediainfo"                 # use libmediainfo
-else
-	# armv7l or aarch64
-	ARCHIVE_EXTRACTOR="ApacheVFS"               # use Apache Commons VFS2
-	MEDIA_PARSER="ffprobe"                      # use ffprobe
-fi
+case $PACKAGE_LIBRARY_ARCH in
+	Linux-x86_64|Linux-i686)
+		# i686 or x86_64
+		ARCHIVE_EXTRACTOR="SevenZipNativeBindings"
+		MEDIA_PARSER="libmediainfo"
+	;;
+	FreeBSD-amd64)
+		PACKAGE_LIBRARY_PATH="$PACKAGE_LIBRARY_PATH:$(dirname $PACKAGE_LIBRARY_PATH)/Linux-x86_64"  # default to Linux binaries
+		ARCHIVE_EXTRACTOR="SevenZipNativeBindings"
+		MEDIA_PARSER="libmediainfo"
+	;;
+	*)
+		# armv7l or aarch64
+		ARCHIVE_EXTRACTOR="ApacheVFS"
+		MEDIA_PARSER="ffprobe"
+	;;
+;
 
 # select application data folder
 APP_DATA="$FILEBOT_HOME/data/$USER"