From 456bbdfa2f3471896f6981e70a9daa56dae51d18 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 5 Feb 2010 09:03:09 +0000 Subject: fix hook whine. --- indra/media_plugins/webkit/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/media_plugins/webkit/CMakeLists.txt') diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 812760a116..4512c22b5d 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -88,4 +88,5 @@ if (DARWIN) DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ) -endif (DARWIN) \ No newline at end of file +endif (DARWIN) + -- cgit v1.2.3 From f9f6f1958db0fcaabf78f61ab86f9e533bb9cc02 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 5 Feb 2010 09:01:58 +0000 Subject: EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a mouse move event This should be a lot better now. But still not good overall. Performance is now just bad instead of intolerable. --- indra/media_plugins/webkit/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'indra/media_plugins/webkit/CMakeLists.txt') diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 5bccd589d8..812760a116 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -9,6 +9,7 @@ include(LLPlugin) include(LLMath) include(LLRender) include(LLWindow) +include(UI) include(Linking) include(PluginAPI) include(MediaPluginBase) @@ -38,7 +39,7 @@ add_library(media_plugin_webkit ${media_plugin_webkit_SOURCE_FILES} ) -target_link_libraries(media_plugin_webkit +set(media_plugin_webkit_LINK_LIBRARIES ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} ${LLCOMMON_LIBRARIES} @@ -46,6 +47,14 @@ target_link_libraries(media_plugin_webkit ${PLUGIN_API_WINDOWS_LIBRARIES} ) +if (LINUX) + list(APPEND media_plugin_webkit_LINK_LIBRARIES + ${UI_LIBRARIES} # for glib/GTK + ) +endif (LINUX) + +target_link_libraries(media_plugin_webkit ${media_plugin_webkit_LINK_LIBRARIES}) + add_dependencies(media_plugin_webkit ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} -- cgit v1.2.3 From b0791c3001f669a32abc4d4b40f4dc4f6f2bc912 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 9 Feb 2010 15:07:45 +0000 Subject: Backed out changeset 0664cf2c9edf --- indra/media_plugins/webkit/CMakeLists.txt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'indra/media_plugins/webkit/CMakeLists.txt') diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 812760a116..5bccd589d8 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -9,7 +9,6 @@ include(LLPlugin) include(LLMath) include(LLRender) include(LLWindow) -include(UI) include(Linking) include(PluginAPI) include(MediaPluginBase) @@ -39,7 +38,7 @@ add_library(media_plugin_webkit ${media_plugin_webkit_SOURCE_FILES} ) -set(media_plugin_webkit_LINK_LIBRARIES +target_link_libraries(media_plugin_webkit ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} ${LLCOMMON_LIBRARIES} @@ -47,14 +46,6 @@ set(media_plugin_webkit_LINK_LIBRARIES ${PLUGIN_API_WINDOWS_LIBRARIES} ) -if (LINUX) - list(APPEND media_plugin_webkit_LINK_LIBRARIES - ${UI_LIBRARIES} # for glib/GTK - ) -endif (LINUX) - -target_link_libraries(media_plugin_webkit ${media_plugin_webkit_LINK_LIBRARIES}) - add_dependencies(media_plugin_webkit ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} -- cgit v1.2.3 From b809b871369f5aeced50a81467f539cab9a9ed4e Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 9 Feb 2010 15:28:30 +0000 Subject: EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a mouse move event restore part of this fix - glib-compatible Qt needs it, and flash needs a glib-compatible Qt. --- indra/media_plugins/webkit/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'indra/media_plugins/webkit/CMakeLists.txt') diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index c4dd5fd79d..a46ffefdac 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -9,6 +9,7 @@ include(LLPlugin) include(LLMath) include(LLRender) include(LLWindow) +include(LLUI) include(Linking) include(PluginAPI) include(MediaPluginBase) @@ -38,7 +39,7 @@ add_library(media_plugin_webkit ${media_plugin_webkit_SOURCE_FILES} ) -target_link_libraries(media_plugin_webkit +set(media_plugin_webkit_LINK_LIBRARIES ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} ${LLCOMMON_LIBRARIES} @@ -46,6 +47,14 @@ target_link_libraries(media_plugin_webkit ${PLUGIN_API_WINDOWS_LIBRARIES} ) +if (LINUX) + list(APPEND media_plugin_webkit_LINK_LIBRARIES + ${UI_LIBRARIES} # for glib/GTK + ) +endif (LINUX) + +target_link_libraries(media_plugin_webkit ${media_plugin_webkit_LINK_LIBRARIES}) + add_dependencies(media_plugin_webkit ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} -- cgit v1.2.3 From c9b27bec33d601330afe854d0322d22fce9da76a Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 9 Feb 2010 15:56:34 +0000 Subject: EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a mouse move event use the proper cmake include() so glib is really found! --- indra/media_plugins/webkit/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/media_plugins/webkit/CMakeLists.txt') diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index a46ffefdac..4512c22b5d 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -9,7 +9,7 @@ include(LLPlugin) include(LLMath) include(LLRender) include(LLWindow) -include(LLUI) +include(UI) include(Linking) include(PluginAPI) include(MediaPluginBase) -- cgit v1.2.3 From 68ebf9d5a508f13487208c0e861078f4563a11b7 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 22 Feb 2010 11:12:54 +0000 Subject: start of work on EXT-5601 Linux: volume adjustment of web-based media / Flash these libs are a temporary requirement - we'll dlopen() them when this is finished. --- indra/media_plugins/webkit/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/media_plugins/webkit/CMakeLists.txt') diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 4512c22b5d..a9e202da99 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -50,6 +50,8 @@ set(media_plugin_webkit_LINK_LIBRARIES if (LINUX) list(APPEND media_plugin_webkit_LINK_LIBRARIES ${UI_LIBRARIES} # for glib/GTK + pulse + pulse-mainloop-glib ) endif (LINUX) -- cgit v1.2.3 From 7fb16ca505d8291448b5538b4f6203bf47bced40 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 22 Feb 2010 13:52:41 +0000 Subject: pretty fleshed-out, now needs fixing-up. --- indra/media_plugins/webkit/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'indra/media_plugins/webkit/CMakeLists.txt') diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index a9e202da99..a43680bb16 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -34,11 +34,6 @@ set(media_plugin_webkit_SOURCE_FILES media_plugin_webkit.cpp ) -add_library(media_plugin_webkit - SHARED - ${media_plugin_webkit_SOURCE_FILES} -) - set(media_plugin_webkit_LINK_LIBRARIES ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} @@ -48,6 +43,7 @@ set(media_plugin_webkit_LINK_LIBRARIES ) if (LINUX) + list(APPEND media_plugin_webkit_SOURCE_FILES linux_volume_catcher.cpp) list(APPEND media_plugin_webkit_LINK_LIBRARIES ${UI_LIBRARIES} # for glib/GTK pulse @@ -55,6 +51,11 @@ if (LINUX) ) endif (LINUX) +add_library(media_plugin_webkit + SHARED + ${media_plugin_webkit_SOURCE_FILES} +) + target_link_libraries(media_plugin_webkit ${media_plugin_webkit_LINK_LIBRARIES}) add_dependencies(media_plugin_webkit -- cgit v1.2.3 From 71efe007b233cf276d2c5a8b4fb1749f6187dd71 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 22 Feb 2010 15:29:57 +0000 Subject: start dynamic sym loading work. --- indra/media_plugins/webkit/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/media_plugins/webkit/CMakeLists.txt') diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index a43680bb16..3ab5522386 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -46,8 +46,6 @@ if (LINUX) list(APPEND media_plugin_webkit_SOURCE_FILES linux_volume_catcher.cpp) list(APPEND media_plugin_webkit_LINK_LIBRARIES ${UI_LIBRARIES} # for glib/GTK - pulse - pulse-mainloop-glib ) endif (LINUX) -- cgit v1.2.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/media_plugins/webkit/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/media_plugins/webkit/CMakeLists.txt') 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) -- cgit v1.2.3