All/Linux: Update llqtwebkit to latest all-shared lib build. Linux package

assembly updated to deal with Qt libraries and discrete codec and imageformat
plugins (which live under bin/llplugin).  Functioning Linux viewer with MoaP
support with a few image problems (sRGB profile, zlib errors).  Much of this
expected to be due to the new 1.6.8/1.2.8 libpng/libz and we'll fix as needed.

2 files changed, 54 insertions, 16 deletions

diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index d9df78bfc8..9c4579ecf3 100755
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -53,8 +53,18 @@ if (WINDOWS)
     )
 elseif (DARWIN)
     set(WEBKIT_PLUGIN_LIBRARIES
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
-        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.a
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libQtWebKit.4.dylib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libQtOpenGL.4.dylib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libQtNetwork.4.dylib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libQtGui.4.dylib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libQtCore.4.dylib
+        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.a
+        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libQtWebKit.4.dylib
+        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libQtOpenGL.4.dylib
+        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libQtNetwork.4.dylib
+        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libQtGui.4.dylib
+        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libQtCore.4.dylib
         )
 elseif (LINUX)
     set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY} ${QT_LIBRARIES} ${QT_PLUGIN_LIBRARIES})
@@ -70,7 +80,7 @@ elseif (LINUX)
         QtNetwork
         QtGui
         QtCore
-        jscore
+#        jscore
 #        qgif
 #        qjpeg
 #        jpeg
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f077cd466b..3ba2e53cca 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1016,6 +1016,7 @@ class LinuxManifest(ViewerManifest):
             self.path("../media_plugins/gstreamer010/libmedia_plugin_gstreamer010.so", "libmedia_plugin_gstreamer.so")
             self.end_prefix("bin/llplugin")
 
+        # llcommon
         if not self.path("../llcommon/libllcommon.so", "lib/libllcommon.so"):
             print "Skipping llcommon.so (assuming llcommon was linked statically)"
 
@@ -1135,26 +1136,53 @@ class Linux_i686_Manifest(LinuxManifest):
                 pass
 
             try:
-                    self.path("libfmodex-*.so")
-                    self.path("libfmodex.so")
-                    pass
+                self.path("libfmodex-*.so")
+                self.path("libfmodex.so")
+                pass
             except:
-                    print "Skipping libfmodex.so - not found"
-                    pass
+                print "Skipping libfmodex.so - not found"
+                pass
 
             self.end_prefix("lib")
 
             # Vivox runtimes
             if self.prefix(src="../packages/lib/release", dst="bin"):
-                    self.path("SLVoice")
-                    self.end_prefix()
+                self.path("SLVoice")
+                self.end_prefix()
+            if self.prefix(src="../packages/lib/release", dst="lib"):
+                self.path("libortp.so")
+                self.path("libsndfile.so.1")
+                #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib
+                self.path("libvivoxsdk.so")
+                self.path("libvivoxplatform.so")
+                self.end_prefix("lib")
+
+            # plugin runtime
             if self.prefix(src="../packages/lib/release", dst="lib"):
-                    self.path("libortp.so")
-                    self.path("libsndfile.so.1")
-                    #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib
-                    self.path("libvivoxsdk.so")
-                    self.path("libvivoxplatform.so")
-                    self.end_prefix("lib")
+                self.path("libQtCore.so*")
+                self.path("libQtGui.so*")
+                self.path("libQtNetwork.so*")
+                self.path("libQtOpenGL.so*")
+                self.path("libQtWebKit.so*")
+                self.end_prefix("lib")
+
+            # For WebKit/Qt plugin runtimes (image format plugins)
+            if self.prefix(src="../packages/plugins/imageformats", dst="bin/llplugin/imageformats"):
+                self.path("libqgif.so")
+                self.path("libqico.so")
+                self.path("libqjpeg.so")
+                self.path("libqmng.so")
+                self.path("libqsvg.so")
+                self.path("libqtiff.so")
+                self.end_prefix("bin/llplugin/imageformats")
+
+            # For WebKit/Qt plugin runtimes (codec/character encoding plugins)
+            if self.prefix(src="../packages/plugins/codecs", dst="bin/llplugin/codecs"):
+                self.path("libqcncodecs.so")
+                self.path("libqjpcodecs.so")
+                self.path("libqkrcodecs.so")
+                self.path("libqtwcodecs.so")
+                self.end_prefix("bin/llplugin/codecs")
 
             self.strip_binaries()