From 9f62ef6cb34ebc91aa82715ce8b036c0af7affef Mon Sep 17 00:00:00 2001
From: mobserveur <mobserveur@gmail.com>
Date: Fri, 5 Jul 2024 20:13:59 +0200
Subject: Tuning floater and buffer mapping improvements

This commit adds the tuning floater accessible via the fps button,
and improvements to the buffer mapping optimisation modes.
---
 indra/newview/app_settings/settings.xml            |  28 ++++++
 indra/newview/llstatusbar.cpp                      |  13 ++-
 indra/newview/llstatusbar.h                        |   4 +-
 indra/newview/llviewerfloaterreg.cpp               |   4 +
 indra/newview/mpvfloatertuning.cpp                 |  90 ++++++++++++++++++
 indra/newview/mpvfloatertuning.h                   |  48 ++++++++++
 .../default/xui/en/floater_mpv_performance.xml     | 104 +++++++++++++++++++++
 .../skins/default/xui/en/panel_status_bar.xml      |  20 ++--
 8 files changed, 298 insertions(+), 13 deletions(-)
 create mode 100644 indra/newview/mpvfloatertuning.cpp
 create mode 100644 indra/newview/mpvfloatertuning.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_mpv_performance.xml

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 00c7eae9bc..81b35359be 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13485,6 +13485,17 @@
       <key>Value</key>
       <real>0</real>
     </map>
+    <key>MaxFPS</key>
+    <map>
+      <key>Comment</key>
+      <string>FPS Limiter.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <real>0</real>
+    </map>
     <key>ZoomDirect</key>
     <map>
       <key>Comment</key>
@@ -13744,6 +13755,23 @@
             <real>12</real>
         </map>
 
+
+    <!-- megapahit settings -->
+    <key>MPVBufferOptiMode</key>
+    <map>
+      <key>Comment</key>
+      <string>
+      OpenGL buffer mapping mode:
+      0:auto, 1:normal, 2:optimised, 3:unsynchronized.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+
+
     <!-- Settings below are for back compatibility only.
     They are not used in current viewer anymore. But they can't be removed to avoid
     influence on previous versions of the viewer in case of settings are not used or default value
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index a0a625c5fc..eecf9c60b6 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -166,7 +166,9 @@ BOOL LLStatusBar::postBuild()
     gMenuBarView->setRightMouseDownCallback(boost::bind(&show_navbar_context_menu, _1, _2, _3));
 
     mTextTime = getChild<LLTextBox>("TimeText" );
-    mTextFps = getChild<LLTextBox>("FpsText");
+
+    mTextFps = getChild<LLButton>("FpsText");
+    mTextFps->setClickedCallback( &LLStatusBar::onClickFps, this );
 
     getChild<LLUICtrl>("buyL")->setCommitCallback(
         boost::bind(&LLStatusBar::onClickBuyCurrency, this));
@@ -306,7 +308,8 @@ void LLStatusBar::refresh()
 
         S32 fps = (S32) llround(LLTrace::get_frame_recording().getPeriodMedianPerSec(LLStatViewer::FPS, 50));
         std::string fpsStr = std::to_string(fps);
-        mTextFps->setText(fpsStr);
+        //mTextFps->setText(fpsStr);
+        mTextFps->setLabel(fpsStr);
     }
 
     // update clock every 10 seconds
@@ -649,6 +652,12 @@ void LLStatusBar::onClickMediaToggle(void* data)
     LLViewerMedia::getInstance()->setAllMediaPaused(pause);
 }
 
+//static
+void LLStatusBar::onClickFps(void* data)
+{
+    LLFloaterReg::toggleInstance("mpv_performance");
+}
+
 BOOL can_afford_transaction(S32 cost)
 {
     return((cost <= 0)||((gStatusBar) && (gStatusBar->getBalance() >=cost)));
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index da3c4a71f1..650d7d6c40 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -109,6 +109,8 @@ private:
     static void onClickMediaToggle(void* data);
     static void onClickBalance(void* data);
 
+    static void onClickFps(void* data);
+
     LLSearchEditor *mFilterEdit;
     LLPanel *mSearchPanel;
     void onUpdateFilterTerm();
@@ -121,7 +123,7 @@ private:
 
 private:
     LLTextBox   *mTextTime;
-    LLTextBox   *mTextFps;
+    LLButton    *mTextFps;
 
     LLStatGraph *mSGBandwidth;
     LLStatGraph *mSGPacketLoss;
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index ceda2675d5..9ec5f4f122 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -81,6 +81,7 @@
 #include "llfloatergroups.h"
 #include "llfloaterhelpbrowser.h"
 #include "llfloaterhoverheight.h"
+#include "mpvfloatertuning.h"
 #include "llfloaterhowto.h"
 #include "llfloaterhud.h"
 #include "llfloaterimagepreview.h"
@@ -380,6 +381,9 @@ void LLViewerFloaterReg::registerFloaters()
     LLFloaterReg::add("edit_hover_height", "floater_edit_hover_height.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHoverHeight>);
     LLFloaterReg::add("hud", "floater_hud.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHUD>);
 
+    LLFloaterReg::add("mpv_performance", "floater_mpv_performance.xml", (LLFloaterBuildFunc)&
+    LLFloaterReg::build<MPVFloaterTuning>);
+
     LLFloaterReg::add("impanel", "floater_im_session.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterIMSession>);
     LLFloaterReg::add("im_container", "floater_im_container.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterIMContainer>);
     LLFloaterReg::add("im_well_window", "floater_sys_well.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLIMWellWindow>);
diff --git a/indra/newview/mpvfloatertuning.cpp b/indra/newview/mpvfloatertuning.cpp
new file mode 100644
index 0000000000..177bd3caa7
--- /dev/null
+++ b/indra/newview/mpvfloatertuning.cpp
@@ -0,0 +1,90 @@
+/**
+* @file mpvfloatertuning.cpp
+* @brief Controller for viewer tuning
+* @author observeur@megapahit.net
+*
+* $LicenseInfo:firstyear=2014&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2014, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "mpvfloatertuning.h"
+#include "llsliderctrl.h"
+#include "llcheckboxctrl.h"
+#include "llcombobox.h"
+#include "llviewercontrol.h"
+#include "llsdserialize.h"
+
+#include "../llrender/llvertexbuffer.cpp"
+
+MPVFloaterTuning::MPVFloaterTuning(const LLSD& key) : LLFloater(key)
+{
+}
+
+void MPVFloaterTuning::syncFromPreferenceSetting(void *user_data)
+{
+    MPVFloaterTuning *self = static_cast<MPVFloaterTuning*>(user_data);
+
+    U32 fps = gSavedSettings.getU32("MaxFPS");
+    LLSliderCtrl* fpsSliderCtrl = self->getChild<LLSliderCtrl>("fpsSlider");
+    fpsSliderCtrl->setValue(fps,FALSE);
+
+    U32 optBuf = gSavedSettings.getU32("MPVBufferOptiMode");
+    LLComboBox * optBufCtrl = self->getChild<LLComboBox>("MPVBuffModeComboBox");
+    optBufCtrl->setCurrentByIndex(optBuf);
+
+    LL_INFOS() << "syncFromPreferenceSetting optBuf=" << optBuf << LL_ENDL;
+}
+
+BOOL MPVFloaterTuning::postBuild()
+{
+    LLSliderCtrl* fpsSliderCtrl = getChild<LLSliderCtrl>("fpsSlider");
+    fpsSliderCtrl->setMinValue(0);
+    fpsSliderCtrl->setMaxValue(165);
+    fpsSliderCtrl->setSliderMouseUpCallback(boost::bind(&MPVFloaterTuning::onFinalCommit,this));
+
+    LLComboBox* optBufCtrl = getChild<LLComboBox>("MPVBuffModeComboBox");
+    optBufCtrl->setCommitCallback(boost::bind(&MPVFloaterTuning::onFinalCommit,this));
+
+    syncFromPreferenceSetting(this);
+
+    return TRUE;
+}
+
+// Do send-to-the-server work when slider drag completes, or new
+// value entered as text.
+void MPVFloaterTuning::onFinalCommit()
+{
+    LLSliderCtrl* fpsSliderCtrl = getChild<LLSliderCtrl>("fpsSlider");
+    U32 fps = (U32)fpsSliderCtrl->getValueF32();
+    gSavedSettings.setU32("MaxFPS",fps);
+
+    LLComboBox* optBufCtrl = getChild<LLComboBox>("MPVBuffModeComboBox");
+    S16 optBuf = optBufCtrl->getCurrentIndex();
+    gSavedSettings.setU32("MPVBufferOptiMode",optBuf);
+
+    LLVertexBuffer::sMappingMode = optBuf;
+}
+
+void MPVFloaterTuning::onClose(bool app_quitting)
+{
+}
\ No newline at end of file
diff --git a/indra/newview/mpvfloatertuning.h b/indra/newview/mpvfloatertuning.h
new file mode 100644
index 0000000000..ed91317eab
--- /dev/null
+++ b/indra/newview/mpvfloatertuning.h
@@ -0,0 +1,48 @@
+/**
+* @file mpvfloatertuning.h
+* @brief Controller for viewer tuning
+* @author observeur@megapahit.net
+*
+* $LicenseInfo:firstyear=2014&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2014, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_MPVFLOATERTUNING_H
+#define LL_MPVFLOATERTUNING_H
+
+#include "llfloater.h"
+
+class MPVFloaterTuning: public LLFloater
+{
+public:
+    MPVFloaterTuning(const LLSD& key);
+
+    BOOL postBuild();
+
+    void onFinalCommit();
+
+    static void syncFromPreferenceSetting(void *user_data);
+
+    //void updateEditEnabled();
+
+    /*virtual*/ void onClose(bool app_quitting);
+};
+
+#endif
diff --git a/indra/newview/skins/default/xui/en/floater_mpv_performance.xml b/indra/newview/skins/default/xui/en/floater_mpv_performance.xml
new file mode 100644
index 0000000000..5c54d366f2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_mpv_performance.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+ positioning="cascading"
+ legacy_header_height="40"
+ top="12"
+ right="2"
+ height="120"
+ min_height="120"
+ width="320"
+ min_width="320"
+ can_minimize="true"
+ can_close="true"
+ can_resize="false"
+ layout="topright"
+ name="mpv_performance"
+ single_instance="true"
+ save_rect="true"
+ save_visibility="true"
+ title="Megapahit Tuning">
+
+ <panel
+     name="panel_fps"
+     border="false"
+     width="300"
+     height="36"
+     left="10"
+     top="40"
+     follows="top|left"
+     layout="topleft"
+     >
+
+     <slider
+     name="fpsSlider"
+     width="300"
+     height="15"
+     layout="topleft"
+     enabled="true"
+     control_name="fpsSlider"
+     decimal_digits="0"
+     increment="5"
+     initial_value="0"
+     label="Max FPS"
+     label_width="50"
+     text_width="30"
+     can_edit_text="false"
+     show_text="true"
+     >
+     </slider>
+
+    </panel>
+
+    <panel
+     name="panel_mapping"
+     border="false"
+     width="300"
+     height="36"
+     left="10"
+     top="78"
+     follows="top|left"
+     layout="topleft"
+     >
+
+    <text
+     name="MPVBuffModeLabel"
+     width="100"
+     height="15"
+     left="2"
+     top="8">
+     Buffer mapping:
+    </text>
+
+    <combo_box
+     control_name="MPVBuffModeControl"
+     name="MPVBuffModeComboBox"
+     width="150"
+     height="23"
+     left="120"
+     top="4"
+     >
+        <combo_box.item
+         enabled="true"
+         label="Auto"
+         name="Auto"
+         value="0" />
+        <combo_box.item
+         enabled="true"
+         label="Normal"
+         name="Normal"
+         value="1" />
+        <combo_box.item
+         enabled="true"
+         label="Optimized (Apple GPU)"
+         name="Optimized"
+         value="2" />
+        <combo_box.item
+         enabled="true"
+         label="Optimized+ (AMD GPU)"
+         name="Optimized+"
+         value="3" />
+    </combo_box>
+
+    </panel>
+
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index dbc181855f..f337ad9038 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -55,11 +55,11 @@
 		 text_pad_left="6"
 		 tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the menu."
 		 top="0">
-			<search_button 
+			<search_button
 			 top_pad="4"
-			 left_pad="4" 
+			 left_pad="4"
 			 width="12"
-			 height="12" 
+			 height="12"
 			 image_unselected="Search"
 			 image_selected="Search"/>
 			<clear_button
@@ -77,20 +77,20 @@
     left="-398"
     width="185"
     top="1"
-    follows="right|top" 
+    follows="right|top"
     name="balance_bg">
     <text
      halign="center"
      font="SansSerifSmall"
      follows="all"
      height="18"
-     left="0" 
+     left="0"
      name="balance"
      tool_tip="Click to refresh your L$ balance"
      v_pad="4"
      top="0"
-     wrap="false" 
-     value="L$??" 
+     wrap="false"
+     value="L$??"
      width="40" />
     <button
      halign="center"
@@ -185,7 +185,7 @@
      top="2"
      name="volume_btn"
      width="16" />
-      <text
+     <button
      type="string"
      font="SansSerif"
      text_color="FpsTextColor"
@@ -195,10 +195,10 @@
      height="18"
      top="1"
      v_pad="0"
-     left_pad="0"
+     left_pad="4"
      name="FpsText"
      tool_tip="fps"
-     width="40">
+     width="32">
      60
      </text>
 </panel>
-- 
cgit v1.2.3


From 8662083cf4130922732aa8fba655310664b80d8b Mon Sep 17 00:00:00 2001
From: mobserveur <mobserveur@gmail.com>
Date: Fri, 5 Jul 2024 20:17:25 +0200
Subject: Fix for the fps limiter on intel and amd cpus

This commit fixes the fps limiter for intel and amd cpus
---
 indra/newview/llappviewer.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 0f1b5a789b..86da40fcf5 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -256,6 +256,8 @@ using namespace LL;
 #include "llcoproceduremanager.h"
 #include "llviewereventrecorder.h"
 
+#include <chrono>
+
 // *FIX: These extern globals should be cleaned up.
 // The globals either represent state/config/resource-storage of either
 // this app, or another 'component' of the viewer. App globals should be
@@ -1374,9 +1376,10 @@ bool LLAppViewer::doFrame()
 {
     static LLCachedControl<U32> fpsLimitMaxFps(gSavedSettings, "MaxFPS", 0);
 
+    using TimePoint = std::chrono::steady_clock::time_point;
+
     U64 fpsLimitSleepFor = 0;
-    U64 fpsLimitFrameStartTime = 0;
-    if(fpsLimitMaxFps > 0) fpsLimitFrameStartTime = LLTrace::BlockTimer::getCPUClockCount64();
+    TimePoint fpsLimitFrameStartTime = std::chrono::steady_clock::now();
 
     LL_RECORD_BLOCK_TIME(FTM_FRAME);
     {
@@ -1550,12 +1553,13 @@ bool LLAppViewer::doFrame()
 
         if(fpsLimitMaxFps > 0)
         {
-            U64 fpsLimitFrameTime = LLTrace::BlockTimer::getCPUClockCount64() - fpsLimitFrameStartTime;
-            U64 desired_time_ns = (U32)(1000000.f / fpsLimitMaxFps);
+            auto elapsed = std::chrono::steady_clock::now() - fpsLimitFrameStartTime;
 
-            if((fpsLimitFrameTime+1000) < desired_time_ns)
+            long long fpsLimitFrameTime = std::chrono::duration_cast<std::chrono::microseconds>(elapsed).count();
+            U64 desired_time_us = (U32)(1000000.f / fpsLimitMaxFps);
+            if((fpsLimitFrameTime+1000) < desired_time_us)
             {
-                fpsLimitSleepFor = (desired_time_ns - fpsLimitFrameTime - 1000) * 1.0;
+                fpsLimitSleepFor = (desired_time_us - fpsLimitFrameTime - 1000) * 1.0;
             }
         }
 
-- 
cgit v1.2.3


From ef34f2860a02ee5a129c17f3b210b8d470c1b700 Mon Sep 17 00:00:00 2001
From: mobserveur <mobserveur@gmail.com>
Date: Sat, 6 Jul 2024 02:54:20 +0200
Subject: tuning floater : missing cmakelists.txt

missing cmakelists.txt from previous commit
---
 indra/newview/CMakeLists.txt | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4b0c9b1886..2b85a1d89a 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -250,6 +250,7 @@ set(viewer_SOURCE_FILES
     llfloaterhandler.cpp
     llfloaterhelpbrowser.cpp
     llfloaterhoverheight.cpp
+    mpvfloatertuning.cpp
     llfloaterhowto.cpp
     llfloaterhud.cpp
     llfloaterimagepreview.cpp
@@ -912,6 +913,7 @@ set(viewer_HEADER_FILES
     llfloaterhandler.h
     llfloaterhelpbrowser.h
     llfloaterhoverheight.h
+    mpvfloatertuning.h
     llfloaterhowto.h
     llfloaterhud.h
     llfloaterimagepreview.h
@@ -1415,7 +1417,7 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt"
            "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\n")
 
 set_source_files_properties(
-   llversioninfo.cpp tests/llversioninfo_test.cpp 
+   llversioninfo.cpp tests/llversioninfo_test.cpp
    PROPERTIES
    COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" # see BuildVersion.cmake
    )
@@ -1622,7 +1624,7 @@ endif (WINDOWS)
 file(GLOB_RECURSE viewer_XUI_FILES LIST_DIRECTORIES FALSE
     ${CMAKE_CURRENT_SOURCE_DIR}/skins/*.xml)
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/skins PREFIX "XUI Files" FILES ${viewer_XUI_FILES})
-set_source_files_properties(${viewer_XUI_FILES} 
+set_source_files_properties(${viewer_XUI_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES})
 
@@ -1630,7 +1632,7 @@ list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES})
 file(GLOB_RECURSE viewer_SHADER_FILES LIST_DIRECTORIES FALSE
     ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/shaders/*.glsl)
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/shaders PREFIX "Shaders" FILES ${viewer_SHADER_FILES})
-set_source_files_properties(${viewer_SHADER_FILES} 
+set_source_files_properties(${viewer_SHADER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 list(APPEND viewer_SOURCE_FILES ${viewer_SHADER_FILES})
 
@@ -1922,7 +1924,7 @@ endif (WINDOWS)
 # one of these being libz where you can find four or more versions in play
 # at once.  On Linux, libz can be found at link and run time via a number
 # of paths:
-#     
+#
 #      => -lfreetype
 #        => libz.so.1 (on install machine, not build)
 #      => -lSDL
@@ -2039,7 +2041,7 @@ foreach(elem ${country_codes})
    set(emoji_mapping_src_file
       "${emoji_mapping_src_folder}/${elem}/emoji_characters.xml")
    set(emoji_mapping_dst_file
-      "${emoji_mapping_dst_folder}/${elem}/emoji_characters.xml")      
+      "${emoji_mapping_dst_folder}/${elem}/emoji_characters.xml")
    configure_file(${emoji_mapping_src_file} ${emoji_mapping_dst_file} COPYONLY)
 endforeach()
 
@@ -2143,7 +2145,7 @@ if (DARWIN)
 
   # https://blog.kitware.com/upcoming-in-cmake-2-8-12-osx-rpath-support/
   set(CMAKE_MACOSX_RPATH 1)
-  
+
   set_target_properties(
     ${VIEWER_BINARY_NAME}
     PROPERTIES
@@ -2331,7 +2333,7 @@ if (LL_TESTS)
 #    llremoteparcelrequest.cpp
     llviewerhelputil.cpp
     llversioninfo.cpp
-#    llvocache.cpp  
+#    llvocache.cpp
     llworldmap.cpp
     llworldmipmap.cpp
   )
@@ -2340,7 +2342,7 @@ if (LL_TESTS)
     llworldmap.cpp
     llworldmipmap.cpp
     PROPERTIES
-    LL_TEST_ADDITIONAL_SOURCE_FILES 
+    LL_TEST_ADDITIONAL_SOURCE_FILES
     tests/llviewertexture_stub.cpp
     #llviewertexturelist.cpp
   )
@@ -2374,7 +2376,7 @@ if (LL_TESTS)
     llworldmap.cpp
     llworldmipmap.cpp
     PROPERTIES
-    LL_TEST_ADDITIONAL_SOURCE_FILES 
+    LL_TEST_ADDITIONAL_SOURCE_FILES
     tests/llviewertexture_stub.cpp
   )
 
-- 
cgit v1.2.3


From 37f31d98f3a96a3f086f0c0bef515080b6ebeaab Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sun, 7 Jul 2024 10:12:29 +0800
Subject: `make install` on macOS installs CEF & Dullahan

Using file(CHMOD ... PERMISSIONS .._EXECUTE) somehow didn't work,
so I had to set it to reinstall the Dullahan executables, and they
are the only files that are required to be executable (CEF framework
and the .dylibs aren't).
---
 indra/newview/ViewerInstall.cmake | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index 7d9f160467..3103dcb6ce 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -52,6 +52,35 @@ if (DARWIN)
         )
     install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake)
 
+    install(DIRECTORY
+        "${AUTOBUILD_INSTALL_DIR}/lib/release/Chromium Embedded Framework.framework"
+        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Frameworks
+        )
+
+    file(CREATE_LINK "../../../../Frameworks/Chromium Embedded Framework.framework" "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/Chromium Embedded Framework.framework" SYMBOLIC)
+    install(DIRECTORY
+        "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper.app"
+        "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (GPU).app"
+        "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Plugin).app"
+        "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Renderer).app"
+        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks
+        )
+    install(PROGRAMS
+        "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper.app/Contents/MacOS/DullahanHelper"
+        DESTINATION "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper.app/Contents/MacOS"
+        )
+    install(PROGRAMS
+        "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (GPU).app/Contents/MacOS/DullahanHelper (GPU)"
+        DESTINATION "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (GPU).app/Contents/MacOS"
+        )
+    install(PROGRAMS
+        "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Plugin).app/Contents/MacOS/DullahanHelper (Plugin)"
+        DESTINATION "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (Plugin).app/Contents/MacOS"
+        )
+    install(PROGRAMS
+        "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Renderer).app/Contents/MacOS/DullahanHelper (Renderer)"
+        DESTINATION "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (Renderer).app/Contents/MacOS"
+        )
 else (DARWIN)
 
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME}
-- 
cgit v1.2.3


From dedf76e3f1eaebd053f193e92d6ffa3824a92c95 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sun, 7 Jul 2024 12:01:37 +0800
Subject: macOS install DESTINATIONs are relative paths now

but set CMAKE_INSTALL_PREFIX to newview/Megapahit.app/Contents.
---
 indra/newview/ViewerInstall.cmake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index 3103dcb6ce..8d91e2fc58 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -22,7 +22,7 @@ if (DARWIN)
         skins
         tr.lproj
         zh-Hans.lproj
-        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources
+        DESTINATION Resources
         )
 
     install(FILES
@@ -31,19 +31,19 @@ if (DARWIN)
         cube.dae
         featuretable_mac.txt
         secondlife.icns
-        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources
+        DESTINATION Resources
         )
 
     install(FILES
         licenses-mac.txt
         RENAME licenses.txt
-        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources
+        DESTINATION Resources
         )
 
     install(FILES
         ${SCRIPTS_DIR}/messages/message_template.msg
         ${SCRIPTS_DIR}/../etc/message.xml
-        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/app_settings
+        DESTINATION Resources/app_settings
         )
 
     configure_file(
@@ -54,7 +54,7 @@ if (DARWIN)
 
     install(DIRECTORY
         "${AUTOBUILD_INSTALL_DIR}/lib/release/Chromium Embedded Framework.framework"
-        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Frameworks
+        DESTINATION Frameworks
         )
 
     file(CREATE_LINK "../../../../Frameworks/Chromium Embedded Framework.framework" "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/Chromium Embedded Framework.framework" SYMBOLIC)
@@ -63,7 +63,7 @@ if (DARWIN)
         "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (GPU).app"
         "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Plugin).app"
         "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Renderer).app"
-        DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks
+        DESTINATION Resources/SLPlugin.app/Contents/Frameworks
         )
     install(PROGRAMS
         "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper.app/Contents/MacOS/DullahanHelper"
-- 
cgit v1.2.3


From faa8e3bc698ed3eb2ff21d08b8a3d093ab12ff6c Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sun, 7 Jul 2024 12:05:00 +0800
Subject: Link CEF & chmod a+x Dullahan execs after install

otherwise fixup_bundle would try to fix DullahanHelper executables
when otool -L somehow can't find files that contain spaces in their
names. By postponing the chmod until after fixup_bundle is called,
fixup_bundle will ignore the DullahanHelper apps since they contain
no executables yet by that time.
Apart from that, trying to link to CEF would fail before installation
cause SLPlugin's Frameworks directory wouldn't exist yet.
---
 indra/newview/FixBundle.cmake.in  | 12 ++++++++++++
 indra/newview/ViewerInstall.cmake | 28 ++++++----------------------
 2 files changed, 18 insertions(+), 22 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
index 73806642e4..08da5f5c0a 100644
--- a/indra/newview/FixBundle.cmake.in
+++ b/indra/newview/FixBundle.cmake.in
@@ -5,3 +5,15 @@ set(dirs
    )
 
 fixup_bundle(${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app "" "${dirs}")
+
+file(CREATE_LINK
+    "../../../../Frameworks/Chromium Embedded Framework.framework"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/Chromium Embedded Framework.framework" SYMBOLIC)
+
+file(CHMOD
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper.app/Contents/MacOS/DullahanHelper"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (GPU).app/Contents/MacOS/DullahanHelper (GPU)"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (Plugin).app/Contents/MacOS/DullahanHelper (Plugin)"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (Renderer).app/Contents/MacOS/DullahanHelper (Renderer)"
+    PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
+    )
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index 8d91e2fc58..b6f5569061 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -46,18 +46,11 @@ if (DARWIN)
         DESTINATION Resources/app_settings
         )
 
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/FixBundle.cmake.in
-        ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake
-        )
-    install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake)
-
     install(DIRECTORY
         "${AUTOBUILD_INSTALL_DIR}/lib/release/Chromium Embedded Framework.framework"
         DESTINATION Frameworks
         )
 
-    file(CREATE_LINK "../../../../Frameworks/Chromium Embedded Framework.framework" "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/Chromium Embedded Framework.framework" SYMBOLIC)
     install(DIRECTORY
         "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper.app"
         "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (GPU).app"
@@ -65,22 +58,13 @@ if (DARWIN)
         "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Renderer).app"
         DESTINATION Resources/SLPlugin.app/Contents/Frameworks
         )
-    install(PROGRAMS
-        "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper.app/Contents/MacOS/DullahanHelper"
-        DESTINATION "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper.app/Contents/MacOS"
-        )
-    install(PROGRAMS
-        "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (GPU).app/Contents/MacOS/DullahanHelper (GPU)"
-        DESTINATION "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (GPU).app/Contents/MacOS"
-        )
-    install(PROGRAMS
-        "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Plugin).app/Contents/MacOS/DullahanHelper (Plugin)"
-        DESTINATION "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (Plugin).app/Contents/MacOS"
-        )
-    install(PROGRAMS
-        "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Renderer).app/Contents/MacOS/DullahanHelper (Renderer)"
-        DESTINATION "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (Renderer).app/Contents/MacOS"
+
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/FixBundle.cmake.in
+        ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake
         )
+    install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake)
+
 else (DARWIN)
 
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME}
-- 
cgit v1.2.3


From e09c241ce61975306cab3804f2ac76e46f357b7a Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sun, 7 Jul 2024 14:24:22 +0800
Subject: Links to SLPlugin's dependencies after install

cause SLPlugin's Frameworks wouldn't exist yet before installation.
---
 indra/newview/FixBundle.cmake.in | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
index 08da5f5c0a..5e87e17736 100644
--- a/indra/newview/FixBundle.cmake.in
+++ b/indra/newview/FixBundle.cmake.in
@@ -6,6 +6,35 @@ set(dirs
 
 fixup_bundle(${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app "" "${dirs}")
 
+set(frameworks ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks)
+file(CREATE_LINK "../../../../Frameworks/libnghttp2.14.dylib" "${frameworks}/libnghttp2.14.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libxmlrpc-epi.0.dylib" "${frameworks}/libxmlrpc-epi.0.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libopenjp2.7.dylib" "${frameworks}/libopenjp2.7.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libpng16.16.dylib" "${frameworks}/libpng16.16.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libjpeg.8.dylib" "${frameworks}/libjpeg.8.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libmeshoptimizer.dylib" "${frameworks}/libmeshoptimizer.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libaprutil-1.0.dylib" "${frameworks}/libaprutil-1.0.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libiconv.2.dylib" "${frameworks}/libiconv.2.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libapr-1.0.dylib" "${frameworks}/libapr-1.0.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libjsoncpp.25.dylib" "${frameworks}/libjsoncpp.25.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libz.1.dylib" "${frameworks}/libz.1.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libboost_context-mt.dylib" "${frameworks}/libboost_context-mt.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libboost_fiber-mt.dylib" "${frameworks}/libboost_fiber-mt.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libboost_filesystem-mt.dylib" "${frameworks}/libboost_filesystem-mt.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libboost_program_options-mt.dylib" "${frameworks}/libboost_program_options-mt.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libboost_regex-mt.dylib" "${frameworks}/libboost_regex-mt.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libboost_system-mt.dylib" "${frameworks}/libboost_system-mt.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libboost_thread-mt.dylib" "${frameworks}/libboost_thread-mt.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/liburiparser.1.dylib" "${frameworks}/liburiparser.1.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libexpat.1.dylib" "${frameworks}/libexpat.1.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libfreetype.6.dylib" "${frameworks}/libfreetype.6.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libicudata.74.dylib" "${frameworks}/libicudata.74.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libicui18n.74.dylib" "${frameworks}/libicui18n.74.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libicuuc.74.dylib" "${frameworks}/libicuuc.74.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libbz2.1.0.dylib" "${frameworks}/libbz2.1.0.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libbrotlidec.1.1.0.dylib" "${frameworks}/libbrotlidec.1.1.0.dylib" SYMBOLIC)
+file(CREATE_LINK "../../../../Frameworks/libbrotlicommon.1.dylib" "${frameworks}/libbrotlicommon.1.dylib" SYMBOLIC)
+
 file(CREATE_LINK
     "../../../../Frameworks/Chromium Embedded Framework.framework"
     "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/Chromium Embedded Framework.framework" SYMBOLIC)
-- 
cgit v1.2.3


From 81f8c7f5f8e497d18701022422b587235dfae4c5 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sun, 7 Jul 2024 15:07:59 +0800
Subject: Not set var to shorten paths in install script

Somehow it wouldn't work.
---
 indra/newview/FixBundle.cmake.in | 173 ++++++++++++++++++++++++++++++++-------
 1 file changed, 143 insertions(+), 30 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
index 5e87e17736..0cc1569890 100644
--- a/indra/newview/FixBundle.cmake.in
+++ b/indra/newview/FixBundle.cmake.in
@@ -6,38 +6,151 @@ set(dirs
 
 fixup_bundle(${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app "" "${dirs}")
 
-set(frameworks ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks)
-file(CREATE_LINK "../../../../Frameworks/libnghttp2.14.dylib" "${frameworks}/libnghttp2.14.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libxmlrpc-epi.0.dylib" "${frameworks}/libxmlrpc-epi.0.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libopenjp2.7.dylib" "${frameworks}/libopenjp2.7.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libpng16.16.dylib" "${frameworks}/libpng16.16.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libjpeg.8.dylib" "${frameworks}/libjpeg.8.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libmeshoptimizer.dylib" "${frameworks}/libmeshoptimizer.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libaprutil-1.0.dylib" "${frameworks}/libaprutil-1.0.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libiconv.2.dylib" "${frameworks}/libiconv.2.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libapr-1.0.dylib" "${frameworks}/libapr-1.0.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libjsoncpp.25.dylib" "${frameworks}/libjsoncpp.25.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libz.1.dylib" "${frameworks}/libz.1.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libboost_context-mt.dylib" "${frameworks}/libboost_context-mt.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libboost_fiber-mt.dylib" "${frameworks}/libboost_fiber-mt.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libboost_filesystem-mt.dylib" "${frameworks}/libboost_filesystem-mt.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libboost_program_options-mt.dylib" "${frameworks}/libboost_program_options-mt.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libboost_regex-mt.dylib" "${frameworks}/libboost_regex-mt.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libboost_system-mt.dylib" "${frameworks}/libboost_system-mt.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libboost_thread-mt.dylib" "${frameworks}/libboost_thread-mt.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/liburiparser.1.dylib" "${frameworks}/liburiparser.1.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libexpat.1.dylib" "${frameworks}/libexpat.1.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libfreetype.6.dylib" "${frameworks}/libfreetype.6.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libicudata.74.dylib" "${frameworks}/libicudata.74.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libicui18n.74.dylib" "${frameworks}/libicui18n.74.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libicuuc.74.dylib" "${frameworks}/libicuuc.74.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libbz2.1.0.dylib" "${frameworks}/libbz2.1.0.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libbrotlidec.1.1.0.dylib" "${frameworks}/libbrotlidec.1.1.0.dylib" SYMBOLIC)
-file(CREATE_LINK "../../../../Frameworks/libbrotlicommon.1.dylib" "${frameworks}/libbrotlicommon.1.dylib" SYMBOLIC)
-
+file(CREATE_LINK
+    "../../../../Frameworks/libnghttp2.14.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libnghttp2.14.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libxmlrpc-epi.0.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libxmlrpc-epi.0.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libopenjp2.7.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libopenjp2.7.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libpng16.16.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libpng16.16.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libjpeg.8.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libjpeg.8.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libmeshoptimizer.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libmeshoptimizer.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libaprutil-1.0.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libaprutil-1.0.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libiconv.2.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libiconv.2.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libapr-1.0.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libapr-1.0.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libjsoncpp.25.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libjsoncpp.25.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libz.1.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libz.1.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libboost_context-mt.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_context-mt.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libboost_fiber-mt.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_fiber-mt.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libboost_filesystem-mt.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_filesystem-mt.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libboost_program_options-mt.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_program_options-mt.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libboost_regex-mt.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_regex-mt.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libboost_system-mt.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_system-mt.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libboost_thread-mt.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_thread-mt.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/liburiparser.1.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/liburiparser.1.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libexpat.1.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libexpat.1.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libfreetype.6.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libfreetype.6.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libicudata.74.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicudata.74.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libicui18n.74.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicui18n.74.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libicuuc.74.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicuuc.74.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libbz2.1.0.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libbz2.1.0.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libbrotlidec.1.1.0.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libbrotlidec.1.1.0.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libbrotlidec.1.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libbrotlidec.1.dylib"
+    SYMBOLIC
+    )
+file(CREATE_LINK
+    "../../../../Frameworks/libbrotlicommon.1.dylib"
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libbrotlicommon.1.dylib"
+    SYMBOLIC
+    )
 file(CREATE_LINK
     "../../../../Frameworks/Chromium Embedded Framework.framework"
-    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/Chromium Embedded Framework.framework" SYMBOLIC)
+    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/Chromium Embedded Framework.framework"
+    SYMBOLIC
+    )
 
 file(CHMOD
     "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper.app/Contents/MacOS/DullahanHelper"
-- 
cgit v1.2.3


From df882b8a1a84089f4415a0dce329b2feef96081b Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Mon, 8 Jul 2024 23:58:04 +0800
Subject: Explicit on every permission desired for Dullahan

otherwise those executables couldn't be read and therefore couldn't
be copied for bundle preparation, for example.
---
 indra/newview/FixBundle.cmake.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
index 0cc1569890..b2957cd9b5 100644
--- a/indra/newview/FixBundle.cmake.in
+++ b/indra/newview/FixBundle.cmake.in
@@ -157,5 +157,5 @@ file(CHMOD
     "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (GPU).app/Contents/MacOS/DullahanHelper (GPU)"
     "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (Plugin).app/Contents/MacOS/DullahanHelper (Plugin)"
     "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (Renderer).app/Contents/MacOS/DullahanHelper (Renderer)"
-    PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     )
-- 
cgit v1.2.3


From e44ccd4f19146c3313ecc67f813547a8c37b5c0f Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Tue, 9 Jul 2024 00:07:24 +0800
Subject: NDOF can be enabled for Space Navigator support

---
 indra/newview/ViewerInstall.cmake | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index b6f5569061..b6e670d09b 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -59,6 +59,13 @@ if (DARWIN)
         DESTINATION Resources/SLPlugin.app/Contents/Frameworks
         )
 
+    if (NDOF)
+        install(FILES
+            "${AUTOBUILD_INSTALL_DIR}/lib/release/libndofdev.dylib"
+            DESTINATION Resources
+            )
+    endif ()
+
     configure_file(
         ${CMAKE_CURRENT_SOURCE_DIR}/FixBundle.cmake.in
         ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake
-- 
cgit v1.2.3


From 723262ac50558b0b55ac6b37eed95895064b85b7 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Tue, 9 Jul 2024 20:45:54 +0800
Subject: Remove code that'll never be reached by non macOS

which would be to determine which media plugins should be added as
dependencies.
Plus minimise diff from SLv code.
---
 indra/newview/CMakeLists.txt | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 2b85a1d89a..f86e2cb2fb 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1417,7 +1417,7 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt"
            "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\n")
 
 set_source_files_properties(
-   llversioninfo.cpp tests/llversioninfo_test.cpp
+   llversioninfo.cpp tests/llversioninfo_test.cpp 
    PROPERTIES
    COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" # see BuildVersion.cmake
    )
@@ -1624,7 +1624,7 @@ endif (WINDOWS)
 file(GLOB_RECURSE viewer_XUI_FILES LIST_DIRECTORIES FALSE
     ${CMAKE_CURRENT_SOURCE_DIR}/skins/*.xml)
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/skins PREFIX "XUI Files" FILES ${viewer_XUI_FILES})
-set_source_files_properties(${viewer_XUI_FILES}
+set_source_files_properties(${viewer_XUI_FILES} 
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES})
 
@@ -1632,7 +1632,7 @@ list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES})
 file(GLOB_RECURSE viewer_SHADER_FILES LIST_DIRECTORIES FALSE
     ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/shaders/*.glsl)
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/shaders PREFIX "Shaders" FILES ${viewer_SHADER_FILES})
-set_source_files_properties(${viewer_SHADER_FILES}
+set_source_files_properties(${viewer_SHADER_FILES} 
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 list(APPEND viewer_SOURCE_FILES ${viewer_SHADER_FILES})
 
@@ -1924,7 +1924,7 @@ endif (WINDOWS)
 # one of these being libz where you can find four or more versions in play
 # at once.  On Linux, libz can be found at link and run time via a number
 # of paths:
-#
+#     
 #      => -lfreetype
 #        => libz.so.1 (on install machine, not build)
 #      => -lSDL
@@ -2041,7 +2041,7 @@ foreach(elem ${country_codes})
    set(emoji_mapping_src_file
       "${emoji_mapping_src_folder}/${elem}/emoji_characters.xml")
    set(emoji_mapping_dst_file
-      "${emoji_mapping_dst_folder}/${elem}/emoji_characters.xml")
+      "${emoji_mapping_dst_folder}/${elem}/emoji_characters.xml")      
    configure_file(${emoji_mapping_src_file} ${emoji_mapping_dst_file} COPYONLY)
 endforeach()
 
@@ -2145,7 +2145,7 @@ if (DARWIN)
 
   # https://blog.kitware.com/upcoming-in-cmake-2-8-12-osx-rpath-support/
   set(CMAKE_MACOSX_RPATH 1)
-
+  
   set_target_properties(
     ${VIEWER_BINARY_NAME}
     PROPERTIES
@@ -2197,11 +2197,7 @@ if (DARWIN)
   endif (NOT INSTALL)
 
   if (ENABLE_MEDIA_PLUGINS)
-      if (DARWIN OR LINUX)
   add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc media_plugin_cef)
-      else (DARWIN)
-          add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc)
-      endif (DARWIN OR LINUX)
   else (ENABLE_MEDIA_PLUGINS)
       add_dependencies(${VIEWER_BINARY_NAME} SLPlugin)
   endif (ENABLE_MEDIA_PLUGINS)
@@ -2333,7 +2329,7 @@ if (LL_TESTS)
 #    llremoteparcelrequest.cpp
     llviewerhelputil.cpp
     llversioninfo.cpp
-#    llvocache.cpp
+#    llvocache.cpp  
     llworldmap.cpp
     llworldmipmap.cpp
   )
@@ -2342,7 +2338,7 @@ if (LL_TESTS)
     llworldmap.cpp
     llworldmipmap.cpp
     PROPERTIES
-    LL_TEST_ADDITIONAL_SOURCE_FILES
+    LL_TEST_ADDITIONAL_SOURCE_FILES 
     tests/llviewertexture_stub.cpp
     #llviewertexturelist.cpp
   )
@@ -2376,7 +2372,7 @@ if (LL_TESTS)
     llworldmap.cpp
     llworldmipmap.cpp
     PROPERTIES
-    LL_TEST_ADDITIONAL_SOURCE_FILES
+    LL_TEST_ADDITIONAL_SOURCE_FILES 
     tests/llviewertexture_stub.cpp
   )
 
-- 
cgit v1.2.3


From ecdbdc8ea6fbd9a918584be1191e012af4b38af3 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Tue, 9 Jul 2024 20:55:02 +0800
Subject: Fix the variable used for macOS bundle identifier

---
 indra/newview/Info-SecondLife.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index cc8edfadb8..82f63519db 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-- 
cgit v1.2.3