From 589498fece769446310c085e9feb08ccd8400c2c Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Wed, 1 Oct 2025 17:50:28 -0700
Subject: Reenable havok llphysicsextensions on Darwin x86_64 with
 llphysicsextensions_stub used for aarch64

---
 build.sh | 1 -
 1 file changed, 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 36e332cf42..325386e7e9 100755
--- a/build.sh
+++ b/build.sh
@@ -158,7 +158,6 @@ pre_build()
 
         if [[ "$arch" == "Darwin" ]]
         then
-            HAVOK=OFF
             SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
                           "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
         fi
-- 
cgit v1.3


From c440843513b9d9688db019034be4d8c24a3e6f8b Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Fri, 3 Oct 2025 11:39:57 -0700
Subject: disable package_llphysicsextensions_tpv for now

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 325386e7e9..694b03c42e 100755
--- a/build.sh
+++ b/build.sh
@@ -261,8 +261,8 @@ build()
         done
     fi
 
-    # *TODO: Make this a build extension.
-    package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
+    # *TODO: Make this a build extension. disabled for now
+    # package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
     end_section "extensions $variant"
 
   else
-- 
cgit v1.3


From ad374a0176737df94c3a004a1386684ff185ff26 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Thu, 16 Oct 2025 20:14:17 +0300
Subject: #4701 Fix incorrect architecture in package's name

---
 build.sh                         |  2 +-
 indra/newview/viewer_manifest.py | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 36e332cf42..edd18bbad6 100755
--- a/build.sh
+++ b/build.sh
@@ -70,7 +70,7 @@ installer_Darwin()
 {
   local package_name="$1"
   local package_dir="$(build_dir_Darwin)/newview/"
-  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_x86_64\\.dmg\$"
+  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_universal\\.dmg\$"
   # since the additional packages are built after the base package,
   # sorting oldest first ensures that the unqualified package is returned
   # even if someone makes a qualified name that duplicates the last word of the base name
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e46073057e..0e2c9d177e 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -245,6 +245,16 @@ class ViewerManifest(LLManifest):
             }
         return "%(channel_vendor_base)s%(channel_variant_underscores)s_%(version_underscores)s_%(arch)s" % substitution_strings
 
+    def installer_base_name_mac(self):
+        global CHANNEL_VENDOR_BASE
+        # a standard map of strings for replacing in the templates
+        substitution_strings = {
+            'channel_vendor_base' : '_'.join(CHANNEL_VENDOR_BASE.split()),
+            'channel_variant_underscores':self.channel_variant_app_suffix(),
+            'version_underscores' : '_'.join(self.args['version'])
+            }
+        return "%(channel_vendor_base)s%(channel_variant_underscores)s_%(version_underscores)s_universal" % substitution_strings
+
     def app_name(self):
         global CHANNEL_VENDOR_BASE
         channel_type=self.channel_type()
@@ -1068,7 +1078,7 @@ class Darwin_x86_64_Manifest(ViewerManifest):
 
 
     def package_finish(self):
-        imagename = self.installer_base_name()
+        imagename = self.installer_base_name_mac()
         self.set_github_output('imagename', imagename)
         finalname = imagename + ".dmg"
         self.package_file = finalname
-- 
cgit v1.3