From e1e37228f7542e46bd75c5f3519ffea56bbd7262 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Wed, 6 Dec 2023 16:08:49 +0800
Subject: Revert "Not build libvlc on macOS for now"

This reverts commit 46273f40e8116a06bf7460903a1451e88ca2fad4.
---
 indra/newview/CMakeLists.txt  | 4 +---
 indra/newview/llappviewer.cpp | 8 +++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 13cb8f9af9..e486bb8802 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2139,10 +2139,8 @@ if (DARWIN)
 
   if (USE_AUTOBUILD_3P OR USE_CONAN)
   add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc media_plugin_cef)
-  elseif (NOT DARWIN)
-    add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc)
   else ()
-    add_dependencies(${VIEWER_BINARY_NAME} SLPlugin)
+    add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc)
   endif ()
 
   if (ENABLE_SIGNING)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 772c95a85b..1b09d72bc5 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -132,12 +132,12 @@
 #include "stringize.h"
 #include "llcoros.h"
 #include "llexception.h"
-#if !LL_DARWIN
+//#if !LL_LINUX
 #ifndef LL_USESYSTEMLIBS
 #include "cef/dullahan_version.h"
 #endif
 #include "vlc/libvlc_version.h"
-#endif // LL_DARWIN
+//#endif // LL_LINUX
 
 #if LL_DARWIN
 #include "llwindowsdl.h"
@@ -3397,7 +3397,7 @@ LLSD LLAppViewer::getViewerInfo() const
 	info["LIBCEF_VERSION"] = "Undefined";
 #endif
 
-#if !LL_DARWIN
+//#if !LL_LINUX
 	std::ostringstream vlc_ver_codec;
 	vlc_ver_codec << LIBVLC_VERSION_MAJOR;
 	vlc_ver_codec << ".";
@@ -3405,9 +3405,11 @@ LLSD LLAppViewer::getViewerInfo() const
 	vlc_ver_codec << ".";
 	vlc_ver_codec << LIBVLC_VERSION_REVISION;
 	info["LIBVLC_VERSION"] = vlc_ver_codec.str();
+/*
 #else
 	info["LIBVLC_VERSION"] = "Undefined";
 #endif
+*/
 
 	S32 packets_in = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN);
 	if (packets_in > 0)
-- 
cgit v1.2.3