From 57a8a48adeb804d060882d722e9ed5cb62b8da6a Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 27 Oct 2020 16:17:24 -0400
Subject: [PATCH] Fix ogg library on linux by changing to shared. I hate glibc.
---
autobuild.xml | 12 ++++++------
indra/cmake/Copy3rdPartyLibs.cmake | 4 ++++
indra/newview/viewer_manifest.py | 4 ++++
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index a7349a09a84..86a36348391 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2226,11 +2226,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>ad9f9a9ff399844c6269c3f7c5102e3b86caee535cbd2b6dbb9c2573309adfe0cbc207265467947158c180efafe4ce5c</string>
+ <string>ec0cff5e43a62c5814b97bd70499ae824ad937e0a5d6e7d04e39507766c8a4a955174aaccd201961a7fde9f200a08c1e</string>
<key>hash_algorithm</key>
<string>sha3_384</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/112/packages/generic/ogg_vorbis-546/1.3.4/ogg_vorbis-1.3.4-linux64-546.tar.xz</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/112/packages/generic/ogg_vorbis-596/1.3.4/ogg_vorbis-1.3.4-linux64-596.tar.xz</string>
</map>
<key>name</key>
<string>linux64</string>
@@ -2240,11 +2240,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>9cbcf8f2ffacc465e2ecec3906e4882a40d0b4c1002187e53f95a8314fb621529ef66fafc4b4ced80646aed6e25d60ef</string>
+ <string>28187678704036e7f03f6438040d6fec6c233c0897cf708e6b62f40b9a2dce95fe9233c54788c368207609d7025e6420</string>
<key>hash_algorithm</key>
<string>sha3_384</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/112/packages/generic/ogg_vorbis-546/1.3.4/ogg_vorbis-1.3.4-windows-546.tar.xz</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/112/packages/generic/ogg_vorbis-596/1.3.4/ogg_vorbis-1.3.4-windows-596.tar.xz</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2254,11 +2254,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>4fd821c68715521d43e9253a7cf514155b440e6781341561c3091ba557482d160a7ce1bfab3c4a47082c3e6c17851cc7</string>
+ <string>976ecebc3dab7f1bdf0083de09164093e76be1755fc1f21a4a9ba58362fb542af586d4fc1d68ebb4a1d5886b3feffe9d</string>
<key>hash_algorithm</key>
<string>sha3_384</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/112/packages/generic/ogg_vorbis-546/1.3.4/ogg_vorbis-1.3.4-windows64-546.tar.xz</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/112/packages/generic/ogg_vorbis-596/1.3.4/ogg_vorbis-1.3.4-windows64-596.tar.xz</string>
</map>
<key>name</key>
<string>windows64</string>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 5e9573165e7..b913f08b8b9 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -182,6 +182,10 @@ elseif(LINUX)
libepoxy.so
libepoxy.so.0
libepoxy.so.0.0.0
+ libogg.so
+ libvorbis.so
+ libvorbisenc.so
+ libvorbisfile.so
)
if (USE_FMODSTUDIO)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 95b3f056104..69301f04bd6 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1548,6 +1548,10 @@ def construct(self):
self.path("libepoxy.so.0.0.0")
self.path("libalut.so*")
self.path("libopenal.so*")
+ self.path("libogg.so*")
+ self.path("libvorbis.so*")
+ self.path("libvorbisenc.so*")
+ self.path("libvorbisfile.so*")
try:
self.path_optional("libfmod.so*")
--
GitLab