Merge branch 'master-do-not-pull-request' into pre-merge

AiraYumi · Apr 6, 2024 · 96d1b7d · 96d1b7d
2 parents 06c8475 + 0795feb
commit 96d1b7d
Show file tree

Hide file tree

Showing 6 changed files with 103 additions and 194 deletions.
diff --git a/.github/workflows/build_linux_test.yaml b/.github/workflows/build_linux_test.yaml
@@ -0,0 +1,47 @@
+name: Linux build example
+on:
+  workflow_dispatch:
+  push:
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    env:
+      AUTOBUILD_ADDRSIZE: 64
+      AUTOBUILD_VARIABLES_FILE: ${{ github.workspace }}/.fs-build-variables/variables
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Checkout build variables
+        uses: actions/checkout@v4
+        with:
+          repository: FirestormViewer/fs-build-variables
+          path: .fs-build-variables
+
+      - name: Install autobuild and python dependencies
+        run: pip3 install autobuild llsd llbase
+
+      - name: Install Linux dependencies
+        if: runner.os == 'linux'
+        run: |
+          sudo apt update
+          sudo apt install -y libgl1-mesa-dev libglu1-mesa-dev libpulse-dev \
+            build-essential git libssl-dev libxinerama-dev libxrandr-dev \
+            libfontconfig-dev libfreetype6-dev ninja-build
+          sudo apt autoremove
+          sudo apt clean
+          df -h
+
+      - name: Build
+        id: build
+        shell: bash
+        run: |
+          autobuild configure -A 64 -c ReleaseFS_open -- --no-opensim --avx2 --ninja --vscode
+          cd build-linux-x86_64 && ninja -k0
diff --git a/autobuild.xml b/autobuild.xml
@@ -470,11 +470,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>a3bfbdba7e1977e7e65266ec654990bb13994bd3</string>
+              <string>a5552fcd343179c4c7d6dd6289675431a8c0fe8d</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-boost/releases/download/v1.81-3d0d7fc/boost-1.81-linux64-3d0d7fc.tar.zst</string>
+              <string>https://github.com/secondlife/3p-boost/releases/download/v1.84.0-r1/boost-1.84-linux64-8499892512.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -576,11 +576,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>cab0237b5194254c0c0ff6bf77bc6a2f946d4f57</string>
+              <string>aebc0ddcae18852e78143fbac793cd4a32f0f251</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-colladadom/releases/download/v2.3-2f532e1/colladadom-2.3.2f532e1-linux64-2f532e1.tar.zst</string>
+              <string>https://github.com/secondlife/3p-colladadom/releases/download/v2.3-r4/colladadom-2.3.8500178177-linux64-8500178177.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -960,11 +960,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>bbb978f21e690599aedcd44658dceeaf</string>
+              <string>7fbf32c0ecb2c8019ec48ecadf949993</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///opt/firestorm/fmodstudio-2.02.20-linux64-240390132.tar.bz2</string>
+              <string>file:///opt/firestorm/fmodstudio-2.02.20-linux64-240070233.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -1121,69 +1121,39 @@
         <key>description</key>
         <string>glh - is a platform-indepenedent C++ OpenGL helper library</string>
       </map>
-      <key>googlemock</key>
+      <key>gstreamer</key>
       <map>
         <key>platforms</key>
         <map>
-          <key>darwin64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>dce3174b12136746f5f910e311e895c1b47bf8fb</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
-              <key>url</key>
-              <string>https://github.com/secondlife/3p-googlemock/releases/download/v1.7.0.2b109d4/googlemock-1.7.0.2b109d4-darwin64-2b109d4.tar.zst</string>
-            </map>
-            <key>name</key>
-            <string>darwin64</string>
-          </map>
           <key>linux64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ff459b58695c76838782847a0b792104</string>
+              <string>86a358f1b5a2c2baf68444b2bfc5bb32</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/9697/45717/googlemock-1.7.0.509686-linux64-509686.tar.bz2</string>
+              <string>https://3p.firestormviewer.org/gstreamer-0.10.6.180841551-linux64-180841551.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>
           </map>
-          <key>windows64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>265813f84b04c3b03f3d7d33e149b3d5e3cf31db</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
-              <key>url</key>
-              <string>https://github.com/secondlife/3p-googlemock/releases/download/v1.7.0.2b109d4/googlemock-1.7.0.2b109d4-windows64-2b109d4.tar.zst</string>
-            </map>
-            <key>name</key>
-            <string>windows64</string>
-          </map>
         </map>
         <key>license</key>
-        <string>BSD</string>
+        <string>LGPL</string>
         <key>license_file</key>
-        <string>LICENSES/gmock.txt</string>
+        <string>LICENSES/gstreamer.txt</string>
         <key>copyright</key>
-        <string>Copyright 2008, Google Inc.</string>
+        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
         <key>version</key>
-        <string>1.7.0.2b109d4</string>
+        <string>0.10.6.314267</string>
         <key>name</key>
-        <string>googlemock</string>
-        <key>description</key>
-        <string>a library for writing and using C++ mock classes</string>
+        <string>gstreamer</string>
       </map>
       <key>havok-source</key>
       <map>
         <key>platforms</key>
         <map>
-          <key>darwin64</key>
+          <key>darwin64</ke
           <map>
             <key>archive</key>
             <map>
@@ -1270,8 +1240,7 @@
             </map>
             <key>name</key>
             <string>darwin64</string>
-          </map>
-          <key>linux64</key>
+          </map>          <key>linux64</key>
           <map>
             <key>archive</key>
             <map>
@@ -2763,21 +2732,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       <map>
         <key>platforms</key>
         <map>
-          <key>darwin64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>cfed00d8ea7265c035c2d86a234b28efb0b23756</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
-              <key>url</key>
-              <string>https://github.com/secondlife/3p-three_js/releases/download/v0.132.2-b8f6746/threejs-0.132.2-darwin64-b8f6746.tar.zst</string>
-            </map>
-            <key>name</key>
-            <string>darwin64</string>
-          </map>
-          <key>linux64</key>
+          <key>common</key>
           <map>
             <key>archive</key>
             <map>
@@ -2789,21 +2744,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
               <string>https://github.com/secondlife/3p-three_js/releases/download/v0.132.2-5da28d9/threejs-0.132.2-common-8454371083.tar.zst</string>
             </map>
             <key>name</key>
-            <string>linux64</string>
-          </map>
-          <key>windows64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>4141710fccbd1ea2b3b53d00e189bdfa2ee9d441</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
-              <key>url</key>
-              <string>https://github.com/secondlife/3p-three_js/releases/download/v0.132.2-b8f6746/threejs-0.132.2-windows64-b8f6746.tar.zst</string>
-            </map>
-            <key>name</key>
-            <string>windows64</string>
+            <string>common</string>
           </map>
         </map>
         <key>license</key>
@@ -2887,6 +2828,20 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>name</key>
             <string>windows64</string>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>0cac6af362861d90cdd3dc4adfff95f54e619f4a</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
+              <key>url</key>
+              <string>https://github.com/secondlife/3p-tracy/releases/download/v0.8.1%2Br1/tracy-v0.8.1.38bf5f3-linux64-38bf5f3.tar.zst</string>
+            </map>
+            <key>name</key>
+            <string>linux64</string>
+          </map>
         </map>
         <key>license</key>
         <string>bsd</string>
@@ -3076,11 +3031,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>f4677b0ebd9880f29c118af51ada50883dd0a1e4</string>
+              <string>42a5050b890c503ae4d0b3442ba67f8d2b88feff</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/viewer-manager/releases/download/v3.0-08bf5ee/viewer_manager-3.0-08bf5ee-linux64-08bf5ee.tar.zst</string>
+              <string>https://github.com/secondlife/viewer-manager/releases/download/v3.0-2c4be99/viewer_manager-3.0-2c4be99-linux64-2c4be99.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -4002,6 +3957,28 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
               <key>name</key>
               <string>ReleaseFS_open</string>
             </map>
+            <key>ReleaseFS_custom</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--build</string>
+                  <string>--platform linux</string>
+                  <string>--package</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--platform linux</string>
+                  <string>--package</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>ReleaseFS_custom</string>
+            </map>
           </map>
           <key>build_directory</key>
           <string>build-linux-x86_64</string>

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
@@ -28,7 +28,6 @@ set(cmake_SOURCE_FILES
         GLEXT.cmake
         GLH.cmake
         GLOD.cmake # <FS:Ansariel> Bring back GLOD
-        GoogleMock.cmake
         Havok.cmake
         Hunspell.cmake
         ICU4C.cmake

diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake
diff --git a/indra/llmessage/tests/llmockhttpclient.h b/indra/llmessage/tests/llmockhttpclient.h