From 469ee7f9563103add6d19af2044ad11a39819a05 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 11 Sep 2020 15:01:11 -0400
Subject: [PATCH] Update to latest oggvorbis packages
---
autobuild.xml | 14 +++++++++-----
indra/cmake/Audio.cmake | 18 ++++++------------
indra/cmake/Copy3rdPartyLibs.cmake | 3 +++
indra/cmake/LLAudio.cmake | 2 +-
indra/llaudio/CMakeLists.txt | 2 --
indra/newview/viewer_manifest.py | 5 +++++
6 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index f3cded3389a..53d25dd373d 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2362,9 +2362,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>d4b8ed3fd679a2b484d2d1a66c063908</string>
+ <string>05efbdbed9162e730c1205e50e7487fe</string>
+ <key>hash_algorithm</key>
+ <string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54981/511789/ogg_vorbis-1.3.3-1.3.6.538971-windows-538971.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/ogg-vorbis/windows/ogg_vorbis-1.3.4-1.3.7.330-windows-330.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2374,16 +2376,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>ec4a657fe639bb458ee5132062146a7a</string>
+ <string>66f64b4640c884c0e3ddf269e32f8022</string>
+ <key>hash_algorithm</key>
+ <string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54980/511782/ogg_vorbis-1.3.3-1.3.6.538971-windows64-538971.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/ogg-vorbis/windows64/ogg_vorbis-1.3.4-1.3.7.330-windows64-330.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>1.3.3-1.3.6.538971</string>
+ <string>1.3.4-1.3.7.330</string>
</map>
<key>open-libndofdev</key>
<map>
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
index f95439245aa..45436edacae 100644
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -10,33 +10,27 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS)
use_prebuilt_binary(ogg_vorbis)
set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
- set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
if (WINDOWS)
set(OGG_LIBRARIES
- optimized ogg_static
- debug ogg_static_d)
+ optimized libogg
+ debug libogg)
set(VORBIS_LIBRARIES
- optimized vorbis_static
- debug vorbis_static_d)
- set(VORBISENC_LIBRARIES
- optimized vorbisenc_static
- debug vorbisenc_static_d)
+ optimized libvorbis
+ debug libvorbis)
set(VORBISFILE_LIBRARIES
- optimized vorbisfile_static
- debug vorbisfile_static_d)
+ optimized libvorbisfile
+ debug libvorbisfile)
else (WINDOWS)
set(OGG_LIBRARIES ogg)
set(VORBIS_LIBRARIES vorbis)
- set(VORBISENC_LIBRARIES vorbisenc)
set(VORBISFILE_LIBRARIES vorbisfile)
endif (WINDOWS)
endif (USESYSTEMLIBS)
link_directories(
${VORBIS_LIBRARY_DIRS}
- ${VORBISENC_LIBRARY_DIRS}
${VORBISFILE_LIBRARY_DIRS}
${OGG_LIBRARY_DIRS}
)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 3f7cb8be5fb..ac3b701b81c 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -72,7 +72,10 @@ if(WINDOWS)
libcurl.dll
libeay32.dll
libhunspell.dll
+ libogg.dll
libpng16.dll
+ libvorbis.dll
+ libvorbisfile.dll
libwebp.dll
libxml2.dll
minizip.dll
diff --git a/indra/cmake/LLAudio.cmake b/indra/cmake/LLAudio.cmake
index 7c248dfc720..7b156c0cb05 100644
--- a/indra/cmake/LLAudio.cmake
+++ b/indra/cmake/LLAudio.cmake
@@ -7,4 +7,4 @@ set(LLAUDIO_INCLUDE_DIRS
)
# be exhaustive here
-set(LLAUDIO_LIBRARIES llaudio ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISENC_LIBRARIES} ${OGG_LIBRARIES} ${OPENAL_LIBRARIES})
+set(LLAUDIO_LIBRARIES llaudio ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${OGG_LIBRARIES} ${OPENAL_LIBRARIES})
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index 77f023f71e7..e36cd8c103d 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -18,7 +18,6 @@ include_directories(
${LLMESSAGE_INCLUDE_DIRS}
${LLVFS_INCLUDE_DIRS}
${OGG_INCLUDE_DIRS}
- ${VORBISENC_INCLUDE_DIRS}
${VORBISFILE_INCLUDE_DIRS}
${VORBIS_INCLUDE_DIRS}
${OPENAL_LIB_INCLUDE_DIRS}
@@ -84,7 +83,6 @@ target_link_libraries(
${LLMATH_LIBRARIES}
${LLMESSAGE_LIBRARIES}
${LLVFS_LIBRARIES}
- ${VORBISENC_LIBRARIES}
${VORBISFILE_LIBRARIES}
${VORBIS_LIBRARIES}
${OGG_LIBRARIES}
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 4aee3af8630..e76f398156e 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -552,6 +552,11 @@ def construct(self):
# Hunspell
self.path("libhunspell.dll")
+ # Audio
+ self.path("libogg.dll")
+ self.path("libvorbis.dll")
+ self.path("libvorbisfile.dll")
+
# Misc
self.path("libexpat.dll")
self.path("libxml2.dll")
--
GitLab