CEF via Linux binary compatibility attempt on FBSD

Since the condition is quite specific for now, debootstrapped
Debian/Ubuntu x86-64 only, paths are just hardcoded.
We got far enough that SLPlugin doesn't get killed, and there's
no notification that "text/html" cannot be handled any more,
it's just it hasn't worked yet, the built-in browser.

3 files changed, 20 insertions, 4 deletions

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 3c5d216938..453223b43e 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -33,7 +33,7 @@
 #include "llpluginmessageclasses.h"
 #include "llcontrol.h"
 
-#if LL_DARWIN || LL_LINUX
+#if LL_DARWIN || LL_LINUX || __FreeBSD__
 extern LLControlGroup gSavedSettings;
 #endif
 #if LL_DARWIN
@@ -936,7 +936,7 @@ void LLPluginClassMedia::setUserDataPath(const std::string &user_data_path_cache
     message.setValue("username", username); // cef shares cache between users but creates user-based contexts
     message.setValue("cef_log_file", user_data_path_cef_log);
 
-#if LL_DARWIN || LL_LINUX
+#if LL_DARWIN || LL_LINUX || __FreeBSD__
     bool cef_verbose_log = gSavedSettings.getBOOL("CefVerboseLog");
     message.setValueBoolean("cef_verbose_log", cef_verbose_log);
 #endif
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 975935ee6f..1048d36961 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -132,7 +132,7 @@
 #include "stringize.h"
 #include "llcoros.h"
 #include "llexception.h"
-#if LL_DARWIN || LL_LINUX
+#if LL_DARWIN || LL_LINUX || __FreeBSD__
 #include "cef/dullahan_version.h"
 #endif
 #include "vlc/libvlc_version.h"
@@ -3420,7 +3420,7 @@ LLSD LLAppViewer::getViewerInfo() const
         info["VOICE_VERSION"] = LLTrans::getString("NotConnected");
     }
 
-#if LL_DARWIN || LL_LINUX
+#if LL_DARWIN || LL_LINUX || __FreeBSD__
     std::ostringstream cef_ver_codec;
     cef_ver_codec << "Dullahan: ";
     cef_ver_codec << DULLAHAN_VERSION_MAJOR;
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index c8b7a9c29b..e86cb7ab39 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1719,6 +1719,13 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
     {
         std::string launcher_name = gDirUtilp->getLLPluginLauncher();
         std::string plugin_name = gDirUtilp->getLLPluginFilename(plugin_basename);
+#if __FreeBSD__
+        if (plugin_basename == "media_plugin_cef")
+        {
+            launcher_name = "/compat/linux/usr/libexec/megapahit/SLPlugin";
+            plugin_name = "/compat/linux/usr/lib/x86_64-linux-gnu/libmedia_plugin_cef.so";
+        }
+#endif
 
         std::string user_data_path_cache = gDirUtilp->getCacheDir(false);
         user_data_path_cache += gDirUtilp->getDirDelimiter();
@@ -1779,7 +1786,16 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 
             media_source->setTarget(target);
 
+#if __FreeBSD__
+            std::string plugin_dir = gDirUtilp->getLLPluginDir();
+            if (plugin_basename == "media_plugin_cef")
+            {
+                plugin_dir = "/compat/linux/usr/lib/x86_64-linux-gnu";
+                plugin_name = "/usr/lib/x86_64-linux-gnu/libmedia_plugin_cef.so";
+            }
+#else
             const std::string plugin_dir = gDirUtilp->getLLPluginDir();
+#endif
             if (media_source->init(launcher_name, plugin_dir, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins")))
             {
                 return media_source;