diff --git a/autobuild.xml b/autobuild.xml
index b7cc327cea..ac30b5752b 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -619,11 +619,11 @@
archive
name
linux
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index ee2d333121..78e8b92a9e 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -278,8 +278,8 @@ elseif(LINUX)
set(debug_files ${debug_files} "libfmodL.so")
set(release_files ${release_files} "libfmod.so")
else( NOT ND_BUILD64BIT_ARCH )
- set(debug_files ${debug_files} "libfmodL64.so")
- set(release_files ${release_files} "libfmod64.so")
+ set(debug_files ${debug_files} "libfmodL.so")
+ set(release_files ${release_files} "libfmod.so")
endif( NOT ND_BUILD64BIT_ARCH )
endif (FMODSTUDIO)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ac829705ca..4c1c223229 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1665,6 +1665,15 @@ class Linux_i686_Manifest(LinuxManifest):
print "Skipping libfmodex.so - not found"
pass
+ try:
+ self.path("libfmod-*.so")
+ self.path("libfmod.so")
+ self.path("libfmod.so*")
+ pass
+ except:
+ print "Skipping libfmodstudio.so - not found"
+ pass
+
self.end_prefix("lib")
# Vivox runtimes
@@ -1701,14 +1710,21 @@ class Linux_x86_64_Manifest(LinuxManifest):
try:
self.path("libfmodex64-*.so")
self.path("libfmodex64.so")
- self.path("libfmod64.so")
- self.path("libfmod.so")
- self.path("libfmod.so*")
+ self.path("libfmodex64.so*")
pass
except:
print "Skipping libfmodex.so - not found"
pass
+ try:
+ self.path("libfmod-*.so")
+ self.path("libfmod.so")
+ self.path("libfmod.so*")
+ pass
+ except:
+ print "Skipping libfmod.so - not found"
+ pass
+
self.end_prefix("lib")
self.prefix(src="../packages/lib/release/x64", dst="lib")
diff --git a/package_override_gcc.ini b/package_override_gcc.ini
index fcaf1a5d21..c84b012dfa 100644
--- a/package_override_gcc.ini
+++ b/package_override_gcc.ini
@@ -1,6 +1,9 @@
[firestorm]
linux = build_directory|build-linux-x86_64
+[fmodstudio]
+linux = file:///opt/firestorm/fmodstudio-1.10.02-linux-x64-201801091648.tar.bz2|8787b777a49d41ccbb3cbd6c4a1d768d
+
[gstreamer]
linux = http://downloads.phoenixviewer.com/gstreamer-0.10.6.201505150224-r5-linux-x64-201505150224-r5.tar.bz2|22d197890dd99756250912f396cb1abb