From 24c7e08b4038e77792e4eca318c00bcc80138d7e Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 19 Feb 2010 12:55:11 +0000 Subject: EXT-5552 Linux viewer running out of address space, crashing frequently and untracably Yes, we were really hitting 3GB of address space. And quickly. Because we keep ~645 fonts mmap()d on a typical Linux system. Switch to a libfreetype that doesn't mmap(). This is lower risk than fixing the font system right now... --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 2461ac8786..c6100f53e2 100644 --- a/install.xml +++ b/install.xml @@ -436,9 +436,9 @@ linux md5sum - 978ad7c67fe4a2419bfc841e2956ff9f + 454c3d951d5c20bbf3f0f81cf3c9ecbc url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-20090521c.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-2010-02-19-nommap.tar.bz2 linux64 -- cgit v1.3 From 58de7148da0eeb988dc25a021df09fa687e31fb2 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 19 Feb 2010 15:55:00 +0000 Subject: Backed out changeset 241ba20f5e05 (EXT-5552 Linux viewer running out of address space, crashing frequently and untracably) A mis-build caused a side-effect. Another fix to follow. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index c6100f53e2..2461ac8786 100644 --- a/install.xml +++ b/install.xml @@ -436,9 +436,9 @@ linux md5sum - 454c3d951d5c20bbf3f0f81cf3c9ecbc + 978ad7c67fe4a2419bfc841e2956ff9f url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-2010-02-19-nommap.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-20090521c.tar.bz2 linux64 -- cgit v1.3 From 65f8b95ae8e93c3b946e43eea89bcb631723ca6c Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 19 Feb 2010 16:13:58 +0000 Subject: EXT-5552 Linux viewer running out of address space, crashing frequently and untracably re-fixed. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 2461ac8786..f09acde2b5 100644 --- a/install.xml +++ b/install.xml @@ -436,9 +436,9 @@ linux md5sum - 978ad7c67fe4a2419bfc841e2956ff9f + 9de3f44be65645c7f6af236139596942 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-20090521c.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-2010-02-19a-nommap.tar.bz2 linux64 -- cgit v1.3 From 8a02b64a5c572a5f2b0ed703509d95def99fb813 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 19 Feb 2010 21:30:01 -0500 Subject: New boost packages for all 3 platforms to fix boost.date_time link errors and SNOW-431. --- install.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index f09acde2b5..4c377a9f3e 100644 --- a/install.xml +++ b/install.xml @@ -193,16 +193,16 @@ darwin md5sum - 84821102cb819257a66c8f38732647fc + 5ff1e212bb9bcde21cb174228e2437f6 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20100119.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20100219.tar.bz2 linux md5sum - ee8e1b4bbcf137a84d6a85a1c51386ff + 9d4cbaac12d0068b3bb8ee73fcfbe9d7 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100119.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100219.tar.bz2 linux64 @@ -214,9 +214,9 @@ windows md5sum - acbf7a4165a917a4e087879d1756b355 + 94fd43f534e2055858d524086384907d url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20100119.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20100219.tar.bz2 -- cgit v1.3 From f43a9a181ee0233adaed03a93190dc518ff0047f Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 22 Feb 2010 16:50:26 +0000 Subject: Do the necessary stuff to package pulseaudio's headers and make it (in theory, not yet in practice) optional. --- indra/cmake/PulseAudio.cmake | 28 ++++++++++++++++++++++++++++ indra/media_plugins/webkit/CMakeLists.txt | 3 +++ install.xml | 19 +++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 indra/cmake/PulseAudio.cmake (limited to 'install.xml') diff --git a/indra/cmake/PulseAudio.cmake b/indra/cmake/PulseAudio.cmake new file mode 100644 index 0000000000..f8087a8083 --- /dev/null +++ b/indra/cmake/PulseAudio.cmake @@ -0,0 +1,28 @@ +# -*- cmake -*- +include(Prebuilt) + +if (STANDALONE) + include(FindPkgConfig) + + pkg_check_modules(PULSEAUDIO REQUIRED libpulse-mainloop-glib) + +elseif (LINUX) + use_prebuilt_binary(pulseaudio) + set(PULSEAUDIO_FOUND ON FORCE BOOL) + set(PULSEAUDIO_INCLUDE_DIRS + ${LIBS_PREBUILT_DIR}/include + ) + # We don't need to explicitly link against pulseaudio itself, because + # the viewer probes for the system's copy at runtime. + set(PULSEAUDIO_LIBRARIES + # none needed! + ) +endif (STANDALONE) + +if (PULSEAUDIO_FOUND) + set(PULSEAUDIO ON CACHE BOOL "Build with PulseAudio support, if available.") +endif (PULSEAUDIO_FOUND) + +if (PULSEAUDIO) + add_definitions(-DLL_PULSEAUDIO_ENABLED=1) +endif (PULSEAUDIO) diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 3ab5522386..9f66a77c64 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -14,10 +14,12 @@ include(Linking) include(PluginAPI) include(MediaPluginBase) include(FindOpenGL) +include(PulseAudio) include(WebKitLibPlugin) include_directories( + ${PULSEAUDIO_INCLUDE_DIRS} ${LLPLUGIN_INCLUDE_DIRS} ${MEDIA_PLUGIN_BASE_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} @@ -40,6 +42,7 @@ set(media_plugin_webkit_LINK_LIBRARIES ${LLCOMMON_LIBRARIES} ${WEBKIT_PLUGIN_LIBRARIES} ${PLUGIN_API_WINDOWS_LIBRARIES} + ${PULSEAUDIO_LIBRARIES} ) if (LINUX) diff --git a/install.xml b/install.xml index 4c377a9f3e..f02a1663e3 100644 --- a/install.xml +++ b/install.xml @@ -298,6 +298,25 @@ + pulseaudio + + copyright + Copyright 2004-2006 Lennart Poettering, Copyright 2006 Pierre Ossman (ossman@cendio.se) for Cendio AB + description + pulseaudio: headers only + license + lgpl + packages + + linux + + md5sum + 30cb00069fe2a545fbf7be1070386236 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2 + + + elfio license -- cgit v1.3