2 files changed, 20 insertions, 3 deletions

diff --git a/linden/indra/cmake/Audio.cmake b/linden/indra/cmake/Audio.cmake
index d23bc2f..10d11bb 100644
--- a/linden/indra/cmake/Audio.cmake
+++ b/linden/indra/cmake/Audio.cmake
@@ -32,6 +32,12 @@ else (STANDALONE)
     set(VORBISENC_LIBRARIES vorbisenc)
     set(VORBISFILE_LIBRARIES vorbisfile)
   endif (WINDOWS)
+  if(LINUX AND ${ARCH} STREQUAL "x86_64")
+    set(VORBIS_LIBRARY_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+    set(VORBISENC_LIBRARY_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+    set(VORBISFILE_LIBRARY_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+    set(OGG_LIBRARY_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+  endif(LINUX AND ${ARCH} STREQUAL "x86_64")
 endif (STANDALONE)
 
 link_directories(
@@ -40,3 +46,13 @@ link_directories(
     ${VORBISFILE_LIBRARY_DIRS}
     ${OGG_LIBRARY_DIRS}
     )
+
+if(NOT vorbis_link_msg)
+  set(vorbis_link_msg ON CACHE BOOL "ogg vorbis linked from:\n")
+  message("ogg vorbis linked from:\n"
+    ${VORBIS_LIBRARY_DIRS} "\n"
+    ${VORBISENC_LIBRARY_DIRS} "\n"
+    ${VORBISFILE_LIBRARY_DIRS} "\n"
+    ${OGG_LIBRARY_DIRS} "\n"
+  )
+endif(NOT vorbis_link_msg)
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 62a585f..601ac92 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1092,10 +1092,11 @@ class Linux_x86_64Manifest(LinuxManifest):
 
             # Gstreamer plugin dependencies
             self.path("libfaad.so.0")
-            self.path("libogg.so.0")
+            self.path("../lib/libogg.so.0.7.1", "libogg.so.0")
             self.path("libtheora.so.0")
-            self.path("libvorbis.so.0")
-            self.path("libvorbisenc.so.2")
+            self.path("../lib/libvorbis.so.0.4.5","libvorbis.so.0")
+            self.path("../lib/libvorbisenc.so.2.0.8","libvorbisenc.so.2")
+            self.path("../lib/libvorbisfile.so.3.3.4","libvorbisfile.so.3")
             self.path("liboil-0.3.so.0")
 
             # Gstreamer plugins