summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit/CMakeLists.txt
AgeCommit message (Collapse)Author
2010-10-08Merge fixes for VWR-23047, VWR-20911, and SNOW-748Oz Linden
2010-09-28merged SNOW-599/SNOW-747: Pulseaudio should be optional on Linux.Boroondas Gupte
2010-09-16Merged VWR-23047 (SNOW-512, -fPIC for 64bit) and follow-ups (VWR-20911 & ↵Boroondas Gupte
SNOW-748)
2010-08-31SNOW-748 FIXED Building on OSX 10.6 fails with "warning: -mdynamic-no-pic ↵Boroondas Gupte (original patches by Aimee Linden)
overrides - fpic or -fPIC" Originally commited at http://svn.secondlife.com/trac/linden/changeset/3499/projects/2010/snowglobe and http://svn.secondlife.com/trac/linden/changeset/3501 SVN changeset 3499 partially applied with --ignore-whitespace: Hunk #1 FAILED at 259. Hunk #2 FAILED at 265. 2 out of 2 hunks FAILED -- saving rejects to file indra/llcommon/CMakeLists.txt.rej patching file indra/media_plugins/webkit/CMakeLists.txt Hunk #1 succeeded at 33 with fuzz 1 (offset -8 lines). patching file indra/media_plugins/base/CMakeLists.txt patching file indra/media_plugins/gstreamer010/CMakeLists.txt patching file indra/media_plugins/example/CMakeLists.txt patching file indra/llplugin/CMakeLists.txt Manually applied to indra/llcommon/CMakeLists.txt (straight forward). SVN changeset 3501 applied with fuzz 1: patching file indra/media_plugins/webkit/CMakeLists.txt Hunk #1 succeeded at 33 with fuzz 1 (offset -8 lines). Hunk #2 succeeded at 39 with fuzz 1 (offset -8 lines). No further changes other than that.
2010-09-16SNOW-512/SNOW-287: Build of LLPlugin fails on 64bit linux due to non PIC ↵Boroondas Gupte (daggyfied changeset by Techwolf Lupindo, original fix by Robin Cornelius)
code linking into the DSO Formatting, cleanup, and one minor change by Techwolf Lupindo. Minor change was a move of the hunk in indra/media_plugins/webkit/CmakeLists.txt to same area as the other plugins CmakeLists.txt files. daggyfied version of https://bitbucket.org/Techwolf/viewer-development/changeset/00bd21962052
2010-09-25VWR-23181 (port of SNOW-650) 'Tries to build pulseaudio when pulseaudio not ↵Tofu Linden
found.'
2010-08-22SNOW-599/SNOW-747: Pulseaudio should be optional on Linux.Techwolf Lupindo
2010-06-22hairy merge of glib restorationTofu Linden
2010-06-22EXT-7889 PARTIAL Linux fails to load splash screen and side panel home tab.Tofu Linden
Start to restore manual glib handling. Backed out changeset ff86a9f5b917
2010-04-16removed tabs from cmakelist.txtRichard Linden
2010-04-16windows_volume_catcher.cpp, now with comments!Richard Linden
also added volume_catcher.h to project
2010-04-15EXT-6888 - Implement per-media instance volume controlRichard Linden
2010-04-13Initial implementation of mac_volume_catcher.cpp.Monroe Linden
2010-04-09Set up volume control code in webkit plugin for platform-specific ↵Monroe Linden
implementations Renamed LinuxVolumeCatcher class to VolumeCatcher. Everything in the header except the class name was already platform-agnostic, so I just renamed it to volume_catcher.h. Moved the stub implementation from the end of linux_volume_catcher.cpp (previously only used if LL_PULSEAUDIO_ENABLED was not defined) to dummy_volume_catcher.cpp, and made CMakeList.txt file use the dummy impl on Linux if PULSEAUDIO is not defined. Removed the ifdefs on the use of VolumeCatcher in MediaPluginWebkit, so it gets called on all platforms. Added a setPan() function to VolumeCatcher (currently unimplemented, but we'd like to have this capability in the future).
2010-02-22Do the necessary stuff to package pulseaudio's headers and make it (in ↵Tofu Linden
theory, not yet in practice) optional.
2010-02-22start dynamic sym loading work.Tofu Linden
2010-02-22pretty fleshed-out, now needs fixing-up.Tofu Linden
2010-02-22start of work on EXT-5601 Linux: volume adjustment of web-based media / FlashTofu Linden
these libs are a temporary requirement - we'll dlopen() them when this is finished.
2010-02-09EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a ↵Tofu Linden
mouse move event use the proper cmake include() so glib is really found!
2010-02-09EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a ↵Tofu Linden
mouse move event restore part of this fix - glib-compatible Qt needs it, and flash needs a glib-compatible Qt.
2010-02-09mergeTofu Linden
2010-02-09Backed out changeset 0664cf2c9edfTofu Linden
2010-02-05EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a ↵Tofu Linden
mouse move event This should be a lot better now. But still not good overall. Performance is now just bad instead of intolerable.
2010-02-05fix hook whine.Tofu Linden
2009-09-25Changes force no crt manifest linking in windows plugin files.Mark Palange (Mani)
2009-08-31svn merge -r130875:131962 ↵Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 21:43:57 +0000