From 5c069f43e5776a7956daa5c26a86e9bf0389850b Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Mon, 20 Jun 2011 19:07:47 +0200 Subject: use qt/webkit 4.7.4 on linux --- linden/indra/cmake/WebKitLibPlugin.cmake | 7 ++- linden/indra/cmake/ZLIB.cmake | 6 +- .../media_plugins/webkit/media_plugin_webkit.cpp | 3 + linden/indra/newview/llfloaterabout.cpp | 5 +- linden/indra/newview/viewer_manifest.py | 64 +++++----------------- linden/install.xml | 50 ++++++++++++----- 6 files changed, 68 insertions(+), 67 deletions(-) diff --git a/linden/indra/cmake/WebKitLibPlugin.cmake b/linden/indra/cmake/WebKitLibPlugin.cmake index a4befa4..034eed5 100644 --- a/linden/indra/cmake/WebKitLibPlugin.cmake +++ b/linden/indra/cmake/WebKitLibPlugin.cmake @@ -29,6 +29,9 @@ if (STANDALONE) set(WEBKITLIBPLUGIN OFF CACHE BOOL "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") else (STANDALONE) + if(LINUX) + use_prebuilt_binary(kokua-qt) + endif(LINUX) use_prebuilt_binary(llqtwebkit) set(WEBKITLIBPLUGIN ON CACHE BOOL "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") @@ -62,8 +65,6 @@ elseif (LINUX) else (STANDALONE) set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit - qgif - qjpeg QtWebKit QtOpenGL QtNetwork @@ -74,6 +75,8 @@ elseif (LINUX) X11 Xrender GL + jscore ) + endif (STANDALONE) endif (WINDOWS) diff --git a/linden/indra/cmake/ZLIB.cmake b/linden/indra/cmake/ZLIB.cmake index 48e5130..8a16a0e 100644 --- a/linden/indra/cmake/ZLIB.cmake +++ b/linden/indra/cmake/ZLIB.cmake @@ -17,6 +17,10 @@ else (STANDALONE) set(ZLIB_LIBRARIES z) endif (WINDOWS) if (WINDOWS OR LINUX) - set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib) + if(LINUX AND ${ARCH} STREQUAL "x86_64") + set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + else(LINUX AND ${ARCH} STREQUAL "x86_64") + set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib) + endif(LINUX AND ${ARCH} STREQUAL "x86_64") endif (WINDOWS OR LINUX) endif (STANDALONE) diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp index 4a00557..2cae8d2 100755 --- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -81,6 +81,7 @@ extern "C" { #ifdef LL_STANDALONE #include #elif defined(LL_LINUX) + // We don't provide Qt headers for non-standalone, therefore define this here. // Our prebuilt is built with QT_NAMESPACE undefined. #define QT_MANGLE_NAMESPACE(name) name @@ -1156,7 +1157,9 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) std::string url = message_in.getValue("url"); if ( 404 == code ) // browser lib only supports 404 right now { +#if LLQTWEBKIT_API_VERSION < 8 LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url ); +#endif }; } else if(message_name == "set_user_agent") diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp index 13795e5..06bee7d 100644 --- a/linden/indra/newview/llfloaterabout.cpp +++ b/linden/indra/newview/llfloaterabout.cpp @@ -261,8 +261,11 @@ LLFloaterAbout::LLFloaterAbout() support.append("\n"); // TODO: Implement media plugin version query - +#if LL_LINUX + support.append("Qt Webkit Version: 4.7.4 (version number hard-coded)"); +#else support.append("Qt Webkit Version: 4.6 (version number hard-coded)"); +#endif support.append("\n"); if (gPacketsIn > 0) diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 9ad43ad..c13cf1a 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -1059,19 +1059,30 @@ class Linux_x86_64Manifest(LinuxManifest): self.path("libapr-1.so.0") self.path("libaprutil-1.so.0") self.path("libdb-4.2.so") - self.path("libcrypto.so.0.9.8") + self.path("libcrypto.so") + self.path("libcrypto.so.1.0.0") self.path("libexpat.so.1") self.path("libhunspell-1.2.so.0.0.0", "libhunspell-1.2.so.0") - self.path("libssl.so.0.9.8") + self.path("libssl.so") + self.path("libssl.so.1.0.0") self.path("libuuid.so", "libuuid.so.1") self.path("libSDL-1.2.so.0") self.path("libELFIO.so") self.path("libjpeg.so.7") self.path("libpng12.so.0") self.path("libopenjpeg.so.2") - #self.path("libz.so.1") #not needed + self.path("libcares.so") + self.path("libcares.so.2") + self.path("libcares.so.2.0.0") + self.path("libcurl.so") + self.path("libcurl.so.4") + self.path("libcurl.so.4.2.0") + self.path("libz.so.1.2.5") + self.path("libz.so.1") + self.path("libz.so") # OpenAL + self.path("libopenal.so") self.path("libopenal.so.1") self.path("libopenal.so.1.13.0") @@ -1112,54 +1123,9 @@ class Linux_x86_64Manifest(LinuxManifest): #self.path("libgsttag-0.10.so.0") #self.path("libgstvideo-0.10.so.0") - ## Gstreamer plugin dependencies - #self.path("libfaad.so.0") - #self.path("libogg.so.0") - #self.path("libtheora.so.0") - #self.path("libvorbis.so.0") - #self.path("libvorbisenc.so.2") - #self.path("liboil-0.3.so.0") - ## Gstreamer plugins - #if self.prefix("gstreamer-plugins"): - #self.path("libgstalsa.so") - #self.path("libgstasf.so") - #self.path("libgstaudioconvert.so") - #self.path("libgstaudioresample.so") - #self.path("libgstautodetect.so") - #self.path("libgstavi.so") - #self.path("libgstcoreelements.so") - #self.path("libgstcoreindexers.so") - #self.path("libgstdecodebin2.so") - #self.path("libgstdecodebin.so") - #self.path("libgstesd.so") - #self.path("libgstfaad.so") - #self.path("libgstffmpeg.so") - #self.path("libgstffmpegcolorspace.so") - #self.path("libgstgnomevfs.so") - #self.path("libgsticydemux.so") - #self.path("libgstid3demux.so") - #self.path("libgstmpegdemux.so") - #self.path("libgstmultifile.so") - #self.path("libgstmultipart.so") - #self.path("libgstogg.so") - #self.path("libgstossaudio.so") - #self.path("libgstplaybin.so") - #self.path("libgstpulse.so") - #self.path("libgstqtdemux.so") - #self.path("libgstqueue2.so") - #self.path("libgsttcp.so") - #self.path("libgsttheora.so") - #self.path("libgsttypefindfunctions.so") - #self.path("libgstudp.so") - #self.path("libgstvideoscale.so") - #self.path("libgstvolume.so") - #self.path("libgstvorbis.so") - #self.path("libgstwavparse.so") - - #self.end_prefix("gstreamer-plugins") self.end_prefix("lib64") - + # Vivox runtimes and libs if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): diff --git a/linden/install.xml b/linden/install.xml index 97a520d..e8fb391 100755 --- a/linden/install.xml +++ b/linden/install.xml @@ -153,9 +153,9 @@ linux64 md5sum - c4242416e0b2e642c0bf062a19a250e4 + 301a1317c7d5bebbdc396e1a4874175b url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.3.0-linux64-20080909.tar.bz2 + http://download.kokuaviewer.org/files/libs/ares-1.7.1-Linux-x86_64-20110405.tar.bz2 windows @@ -261,9 +261,9 @@ linux64 md5sum - 6e9242d11d785f643f34d925a29967e7 + 7e698e37a1425d66f709163a36ce0b5a url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4-linux64-20080909.tar.bz2 + http://download.kokuaviewer.org/files/libs/curl-7.21.4-Linux-x86_64-20110405.tar.bz2 windows @@ -998,12 +998,34 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura - llqtwebkit + kokua-qt license lgpl packages + linux + + md5sum + 380775ee42191982c22fa5f5f5428250 + url + http://download.kokuaviewer.org/files/libs/kokua-qt4.7.4-Linux-i686-20110620.tar.bz2 + + linux64 + + md5sum + 4c6c0f607f7cc9ebaa5446fd9ca3371a + url + http://download.kokuaviewer.org/files/libs/kokua-qt4.7.4-Linux-x86_64-20110620.tar.bz2 + + + + llqtwebkit + + license + gpl + packages + darwin md5sum @@ -1014,16 +1036,16 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura linux md5sum - 5d743c93b970abe685b185de83001a6e + d2f69c0d72e28037f5377538d4ec8dfe url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20100923.tar.bz2 + http://download.kokuaviewer.org/files/libs/kokua-llqtwebkit-Linux-i686-20110620.tar.bz2 linux64 md5sum - d5deaf897fe8effa3d3537c875060379 - url - http://imprudenceviewer.org/download/libs/llqtwebkit-linux64-20100907.tar.bz2 + 28fe808f318a2b66146e4bbcf1f96306 + url + http://download.kokuaviewer.org/files/libs/kokua-llqtwebkit-Linux-x86_64-20110620.tar.bz2 windows @@ -1244,9 +1266,9 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn linux64 md5sum - 00b23f28a2457d9dabbaff0b29ee7323 + d02fd5e08e7300e418ac86f00a321b23 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8g-linux64-20080909.tar.bz2 + http://download.kokuaviewer.org/files/libs/openSSL-1.0.0-Linux-x86_64-20110405.tar.bz2 windows @@ -1551,9 +1573,9 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn linux64 md5sum - d085a173e3c05ff3bb0ee36ba42deb2c + 36716acbb29ed2adbc8d82d9ddbdec65 url - http://imprudenceviewer.org/download/libs/zlib-1.2.3-linux64-lenny-20091202.tar.bz2 + http://download.kokuaviewer.org/files/libs/z-lib-1.2.5-Linux-x86_64-20110405.tar.bz2 windows -- cgit v1.1