Update to latest oggvorbis packages

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>

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}
     )

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

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})

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}

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")