From 6848c2df6f0e699aba92284fa4c9d18c7bf807c5 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Mon, 2 May 2011 23:13:15 +0200 Subject: [PATCH] Fix underlinkage of libmedia_plugin_webkit.so Fixed by updating indra/cmake/WebKitLibPlugin.cmake with version from imprudence. This commit also contains removal of execute permissions of source files and configure files, sorry... --- indra/cmake/WebKitLibPlugin.cmake | 61 +++++++++++++------ indra/llcrashlogger/llcrashlogger.cpp | 0 indra/llcrashlogger/llcrashlogger.h | 0 indra/llmessage/llsdmessagebuilder.cpp | 0 indra/llmessage/llsdmessagebuilder.h | 0 indra/llmessage/llsdmessagereader.cpp | 0 indra/llmessage/llsdmessagereader.h | 0 indra/llplugin/llpluginclassmedia.cpp | 0 indra/llplugin/llpluginclassmedia.h | 0 indra/llplugin/llpluginclassmediaowner.h | 0 indra/llplugin/llplugininstance.cpp | 0 indra/llplugin/llplugininstance.h | 0 indra/llplugin/llpluginmessage.cpp | 0 indra/llplugin/llpluginmessage.h | 0 indra/llplugin/llpluginmessageclasses.h | 0 indra/llplugin/llpluginmessagepipe.cpp | 0 indra/llplugin/llpluginmessagepipe.h | 0 indra/llplugin/llpluginprocesschild.cpp | 0 indra/llplugin/llpluginprocesschild.h | 0 indra/llplugin/llpluginprocessparent.cpp | 0 indra/llplugin/llpluginprocessparent.h | 0 indra/llplugin/llpluginsharedmemory.cpp | 0 indra/llplugin/llpluginsharedmemory.h | 0 indra/llplugin/slplugin/slplugin.cpp | 0 indra/llui/llmemberlistener.h | 0 indra/llui/lluistring.cpp | 0 indra/llui/lluistring.h | 0 indra/llvfs/llpidlock.cpp | 0 indra/llvfs/llpidlock.h | 0 indra/llwindow/glh/glh_linear.h | 0 indra/media_plugins/CMakeLists.txt | 0 .../media_plugins/base/media_plugin_base.cpp | 0 indra/media_plugins/base/media_plugin_base.h | 0 .../example/media_plugin_example.cpp | 0 indra/media_plugins/quicktime/CMakeLists.txt | 0 .../quicktime/media_plugin_quicktime.cpp | 0 indra/media_plugins/webkit/CMakeLists.txt | 0 .../webkit/dummy_volume_catcher.cpp | 0 .../webkit/linux_volume_catcher.cpp | 0 .../webkit/linux_volume_catcher_pa_syms.inc | 0 .../linux_volume_catcher_paglib_syms.inc | 0 .../webkit/mac_volume_catcher.cpp | 0 .../webkit/media_plugin_webkit.cpp | 0 indra/media_plugins/webkit/volume_catcher.h | 0 .../webkit/windows_volume_catcher.cpp | 0 indra/newview/hippofloaterxml.cpp | 0 indra/newview/hippofloaterxml.h | 0 indra/newview/llfloatersellland.cpp | 0 indra/newview/llfloatersellland.h | 0 indra/newview/llinventorybridge.h | 0 indra/newview/lltoolpipette.cpp | 0 indra/newview/lltoolpipette.h | 0 indra/newview/llviewerobjectbackup.cpp | 0 indra/newview/llviewerobjectbackup.h | 0 indra/test/llrandom_tut.cpp | 0 indra/test/llsdmessagebuilder_tut.cpp | 0 indra/test/llsdmessagereader_tut.cpp | 0 indra/test_apps/llplugintest/CMakeLists.txt | 0 indra/test_apps/llplugintest/bookmarks.txt | 0 .../llplugintest/demo_media_plugin.cpp | 0 .../llplugintest/demo_media_plugin_2.cpp | 0 indra/test_apps/llplugintest/demo_plugin.cpp | 0 .../llplugintest/llmediaplugintest.cpp | 0 .../llplugintest/llmediaplugintest.h | 0 .../test_apps/llplugintest/media_mappings.txt | 0 .../llplugintest/media_plugin_test.cpp | 0 .../llplugintest/media_simple_test.cpp | 0 indra/test_apps/llplugintest/plugin_host.cpp | 0 .../llplugintest/plugin_process_launcher.cpp | 0 69 files changed, 42 insertions(+), 19 deletions(-) mode change 100755 => 100644 indra/llcrashlogger/llcrashlogger.cpp mode change 100755 => 100644 indra/llcrashlogger/llcrashlogger.h mode change 100755 => 100644 indra/llmessage/llsdmessagebuilder.cpp mode change 100755 => 100644 indra/llmessage/llsdmessagebuilder.h mode change 100755 => 100644 indra/llmessage/llsdmessagereader.cpp mode change 100755 => 100644 indra/llmessage/llsdmessagereader.h mode change 100755 => 100644 indra/llplugin/llpluginclassmedia.cpp mode change 100755 => 100644 indra/llplugin/llpluginclassmedia.h mode change 100755 => 100644 indra/llplugin/llpluginclassmediaowner.h mode change 100755 => 100644 indra/llplugin/llplugininstance.cpp mode change 100755 => 100644 indra/llplugin/llplugininstance.h mode change 100755 => 100644 indra/llplugin/llpluginmessage.cpp mode change 100755 => 100644 indra/llplugin/llpluginmessage.h mode change 100755 => 100644 indra/llplugin/llpluginmessageclasses.h mode change 100755 => 100644 indra/llplugin/llpluginmessagepipe.cpp mode change 100755 => 100644 indra/llplugin/llpluginmessagepipe.h mode change 100755 => 100644 indra/llplugin/llpluginprocesschild.cpp mode change 100755 => 100644 indra/llplugin/llpluginprocesschild.h mode change 100755 => 100644 indra/llplugin/llpluginprocessparent.cpp mode change 100755 => 100644 indra/llplugin/llpluginprocessparent.h mode change 100755 => 100644 indra/llplugin/llpluginsharedmemory.cpp mode change 100755 => 100644 indra/llplugin/llpluginsharedmemory.h mode change 100755 => 100644 indra/llplugin/slplugin/slplugin.cpp mode change 100755 => 100644 indra/llui/llmemberlistener.h mode change 100755 => 100644 indra/llui/lluistring.cpp mode change 100755 => 100644 indra/llui/lluistring.h mode change 100755 => 100644 indra/llvfs/llpidlock.cpp mode change 100755 => 100644 indra/llvfs/llpidlock.h mode change 100755 => 100644 indra/llwindow/glh/glh_linear.h mode change 100755 => 100644 indra/media_plugins/CMakeLists.txt mode change 100755 => 100644 indra/media_plugins/base/media_plugin_base.cpp mode change 100755 => 100644 indra/media_plugins/base/media_plugin_base.h mode change 100755 => 100644 indra/media_plugins/example/media_plugin_example.cpp mode change 100755 => 100644 indra/media_plugins/quicktime/CMakeLists.txt mode change 100755 => 100644 indra/media_plugins/quicktime/media_plugin_quicktime.cpp mode change 100755 => 100644 indra/media_plugins/webkit/CMakeLists.txt mode change 100755 => 100644 indra/media_plugins/webkit/dummy_volume_catcher.cpp mode change 100755 => 100644 indra/media_plugins/webkit/linux_volume_catcher.cpp mode change 100755 => 100644 indra/media_plugins/webkit/linux_volume_catcher_pa_syms.inc mode change 100755 => 100644 indra/media_plugins/webkit/linux_volume_catcher_paglib_syms.inc mode change 100755 => 100644 indra/media_plugins/webkit/mac_volume_catcher.cpp mode change 100755 => 100644 indra/media_plugins/webkit/media_plugin_webkit.cpp mode change 100755 => 100644 indra/media_plugins/webkit/volume_catcher.h mode change 100755 => 100644 indra/media_plugins/webkit/windows_volume_catcher.cpp mode change 100755 => 100644 indra/newview/hippofloaterxml.cpp mode change 100755 => 100644 indra/newview/hippofloaterxml.h mode change 100755 => 100644 indra/newview/llfloatersellland.cpp mode change 100755 => 100644 indra/newview/llfloatersellland.h mode change 100755 => 100644 indra/newview/llinventorybridge.h mode change 100755 => 100644 indra/newview/lltoolpipette.cpp mode change 100755 => 100644 indra/newview/lltoolpipette.h mode change 100755 => 100644 indra/newview/llviewerobjectbackup.cpp mode change 100755 => 100644 indra/newview/llviewerobjectbackup.h mode change 100755 => 100644 indra/test/llrandom_tut.cpp mode change 100755 => 100644 indra/test/llsdmessagebuilder_tut.cpp mode change 100755 => 100644 indra/test/llsdmessagereader_tut.cpp mode change 100755 => 100644 indra/test_apps/llplugintest/CMakeLists.txt mode change 100755 => 100644 indra/test_apps/llplugintest/bookmarks.txt mode change 100755 => 100644 indra/test_apps/llplugintest/demo_media_plugin.cpp mode change 100755 => 100644 indra/test_apps/llplugintest/demo_media_plugin_2.cpp mode change 100755 => 100644 indra/test_apps/llplugintest/demo_plugin.cpp mode change 100755 => 100644 indra/test_apps/llplugintest/llmediaplugintest.cpp mode change 100755 => 100644 indra/test_apps/llplugintest/llmediaplugintest.h mode change 100755 => 100644 indra/test_apps/llplugintest/media_mappings.txt mode change 100755 => 100644 indra/test_apps/llplugintest/media_plugin_test.cpp mode change 100755 => 100644 indra/test_apps/llplugintest/media_simple_test.cpp mode change 100755 => 100644 indra/test_apps/llplugintest/plugin_host.cpp mode change 100755 => 100644 indra/test_apps/llplugintest/plugin_process_launcher.cpp diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 44f5619e1..a4befa495 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -3,7 +3,29 @@ include(Linking) include(Prebuilt) if (STANDALONE) - find_package(LLQtWebkit REQUIRED) + # The minimal version, 4.4.3, is rather arbitrary: it's the version in Debian/Lenny. + find_package(Qt4 4.4.3 COMPONENTS QtCore QtGui QtNetwork QtOpenGL QtWebKit REQUIRED) + include(${QT_USE_FILE}) + set(QTDIR $ENV{QTDIR}) + if (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin") + message(FATAL_ERROR "\"${QT_BINARY_DIR}\" is unequal \"${QTDIR}/bin\"; " + "Qt is found by looking for qmake in your PATH. " + "Please set your PATH such that 'qmake' is found in \$QTDIR/bin, " + "or unset QTDIR if the found Qt is correct.") + endif (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin") + find_package(LLQtWebkit REQUIRED QUIET) + # Add the plugins. + set(QT_PLUGIN_LIBRARIES) + foreach(qlibname qgif qjpeg) + find_library(QT_PLUGIN_${qlibname} ${qlibname} PATHS ${QT_PLUGINS_DIR}/imageformats NO_DEFAULT_PATH) + if (QT_PLUGIN_${qlibname}) + list(APPEND QT_PLUGIN_LIBRARIES ${QT_PLUGIN_${qlibname}}) + else (QT_PLUGIN_${qtlibname}) + message(FATAL_ERROR "Could not find the Qt plugin ${qlibname} in \"${QT_PLUGINS_DIR}/imageformats\"!") + endif (QT_PLUGIN_${qlibname}) + endforeach(qlibname) + # qjpeg depends on libjpeg + list(APPEND QT_PLUGIN_LIBRARIES jpeg) set(WEBKITLIBPLUGIN OFF CACHE BOOL "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") else (STANDALONE) @@ -32,25 +54,26 @@ if (WINDOWS) elseif (DARWIN) set(WEBKIT_PLUGIN_LIBRARIES optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib - debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib + debug ${ARCH_PREBUILT_DIRS_DEBUG}/libllqtwebkit.dylib ) elseif (LINUX) - if (STANDALONE) - set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY}) - else (STANDALONE) + if (STANDALONE) + set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY} ${QT_LIBRARIES} ${QT_PLUGIN_LIBRARIES}) + else (STANDALONE) set(WEBKIT_PLUGIN_LIBRARIES - llqtwebkit - qgif - qjpeg - QtWebKit - QtOpenGL - QtNetwork - QtGui - QtCore - fontconfig - X11 - Xrender - GL - ) - endif (STANDALONE) + llqtwebkit + qgif + qjpeg + QtWebKit + QtOpenGL + QtNetwork + QtGui + QtCore + jpeg + fontconfig + X11 + Xrender + GL + ) + endif (STANDALONE) endif (WINDOWS) diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp old mode 100755 new mode 100644 diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h old mode 100755 new mode 100644 diff --git a/indra/llmessage/llsdmessagebuilder.cpp b/indra/llmessage/llsdmessagebuilder.cpp old mode 100755 new mode 100644 diff --git a/indra/llmessage/llsdmessagebuilder.h b/indra/llmessage/llsdmessagebuilder.h old mode 100755 new mode 100644 diff --git a/indra/llmessage/llsdmessagereader.cpp b/indra/llmessage/llsdmessagereader.cpp old mode 100755 new mode 100644 diff --git a/indra/llmessage/llsdmessagereader.h b/indra/llmessage/llsdmessagereader.h old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginclassmediaowner.h b/indra/llplugin/llpluginclassmediaowner.h old mode 100755 new mode 100644 diff --git a/indra/llplugin/llplugininstance.cpp b/indra/llplugin/llplugininstance.cpp old mode 100755 new mode 100644 diff --git a/indra/llplugin/llplugininstance.h b/indra/llplugin/llplugininstance.h old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginmessage.cpp b/indra/llplugin/llpluginmessage.cpp old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginmessage.h b/indra/llplugin/llpluginmessage.h old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginmessageclasses.h b/indra/llplugin/llpluginmessageclasses.h old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginmessagepipe.cpp b/indra/llplugin/llpluginmessagepipe.cpp old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginmessagepipe.h b/indra/llplugin/llpluginmessagepipe.h old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginprocesschild.h b/indra/llplugin/llpluginprocesschild.h old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginsharedmemory.cpp b/indra/llplugin/llpluginsharedmemory.cpp old mode 100755 new mode 100644 diff --git a/indra/llplugin/llpluginsharedmemory.h b/indra/llplugin/llpluginsharedmemory.h old mode 100755 new mode 100644 diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp old mode 100755 new mode 100644 diff --git a/indra/llui/llmemberlistener.h b/indra/llui/llmemberlistener.h old mode 100755 new mode 100644 diff --git a/indra/llui/lluistring.cpp b/indra/llui/lluistring.cpp old mode 100755 new mode 100644 diff --git a/indra/llui/lluistring.h b/indra/llui/lluistring.h old mode 100755 new mode 100644 diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp old mode 100755 new mode 100644 diff --git a/indra/llvfs/llpidlock.h b/indra/llvfs/llpidlock.h old mode 100755 new mode 100644 diff --git a/indra/llwindow/glh/glh_linear.h b/indra/llwindow/glh/glh_linear.h old mode 100755 new mode 100644 diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/indra/media_plugins/base/media_plugin_base.cpp b/indra/media_plugins/base/media_plugin_base.cpp old mode 100755 new mode 100644 diff --git a/indra/media_plugins/base/media_plugin_base.h b/indra/media_plugins/base/media_plugin_base.h old mode 100755 new mode 100644 diff --git a/indra/media_plugins/example/media_plugin_example.cpp b/indra/media_plugins/example/media_plugin_example.cpp old mode 100755 new mode 100644 diff --git a/indra/media_plugins/quicktime/CMakeLists.txt b/indra/media_plugins/quicktime/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp old mode 100755 new mode 100644 diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/indra/media_plugins/webkit/dummy_volume_catcher.cpp b/indra/media_plugins/webkit/dummy_volume_catcher.cpp old mode 100755 new mode 100644 diff --git a/indra/media_plugins/webkit/linux_volume_catcher.cpp b/indra/media_plugins/webkit/linux_volume_catcher.cpp old mode 100755 new mode 100644 diff --git a/indra/media_plugins/webkit/linux_volume_catcher_pa_syms.inc b/indra/media_plugins/webkit/linux_volume_catcher_pa_syms.inc old mode 100755 new mode 100644 diff --git a/indra/media_plugins/webkit/linux_volume_catcher_paglib_syms.inc b/indra/media_plugins/webkit/linux_volume_catcher_paglib_syms.inc old mode 100755 new mode 100644 diff --git a/indra/media_plugins/webkit/mac_volume_catcher.cpp b/indra/media_plugins/webkit/mac_volume_catcher.cpp old mode 100755 new mode 100644 diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp old mode 100755 new mode 100644 diff --git a/indra/media_plugins/webkit/volume_catcher.h b/indra/media_plugins/webkit/volume_catcher.h old mode 100755 new mode 100644 diff --git a/indra/media_plugins/webkit/windows_volume_catcher.cpp b/indra/media_plugins/webkit/windows_volume_catcher.cpp old mode 100755 new mode 100644 diff --git a/indra/newview/hippofloaterxml.cpp b/indra/newview/hippofloaterxml.cpp old mode 100755 new mode 100644 diff --git a/indra/newview/hippofloaterxml.h b/indra/newview/hippofloaterxml.h old mode 100755 new mode 100644 diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp old mode 100755 new mode 100644 diff --git a/indra/newview/llfloatersellland.h b/indra/newview/llfloatersellland.h old mode 100755 new mode 100644 diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h old mode 100755 new mode 100644 diff --git a/indra/newview/lltoolpipette.cpp b/indra/newview/lltoolpipette.cpp old mode 100755 new mode 100644 diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h old mode 100755 new mode 100644 diff --git a/indra/newview/llviewerobjectbackup.cpp b/indra/newview/llviewerobjectbackup.cpp old mode 100755 new mode 100644 diff --git a/indra/newview/llviewerobjectbackup.h b/indra/newview/llviewerobjectbackup.h old mode 100755 new mode 100644 diff --git a/indra/test/llrandom_tut.cpp b/indra/test/llrandom_tut.cpp old mode 100755 new mode 100644 diff --git a/indra/test/llsdmessagebuilder_tut.cpp b/indra/test/llsdmessagebuilder_tut.cpp old mode 100755 new mode 100644 diff --git a/indra/test/llsdmessagereader_tut.cpp b/indra/test/llsdmessagereader_tut.cpp old mode 100755 new mode 100644 diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/indra/test_apps/llplugintest/bookmarks.txt b/indra/test_apps/llplugintest/bookmarks.txt old mode 100755 new mode 100644 diff --git a/indra/test_apps/llplugintest/demo_media_plugin.cpp b/indra/test_apps/llplugintest/demo_media_plugin.cpp old mode 100755 new mode 100644 diff --git a/indra/test_apps/llplugintest/demo_media_plugin_2.cpp b/indra/test_apps/llplugintest/demo_media_plugin_2.cpp old mode 100755 new mode 100644 diff --git a/indra/test_apps/llplugintest/demo_plugin.cpp b/indra/test_apps/llplugintest/demo_plugin.cpp old mode 100755 new mode 100644 diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp old mode 100755 new mode 100644 diff --git a/indra/test_apps/llplugintest/llmediaplugintest.h b/indra/test_apps/llplugintest/llmediaplugintest.h old mode 100755 new mode 100644 diff --git a/indra/test_apps/llplugintest/media_mappings.txt b/indra/test_apps/llplugintest/media_mappings.txt old mode 100755 new mode 100644 diff --git a/indra/test_apps/llplugintest/media_plugin_test.cpp b/indra/test_apps/llplugintest/media_plugin_test.cpp old mode 100755 new mode 100644 diff --git a/indra/test_apps/llplugintest/media_simple_test.cpp b/indra/test_apps/llplugintest/media_simple_test.cpp old mode 100755 new mode 100644 diff --git a/indra/test_apps/llplugintest/plugin_host.cpp b/indra/test_apps/llplugintest/plugin_host.cpp old mode 100755 new mode 100644 diff --git a/indra/test_apps/llplugintest/plugin_process_launcher.cpp b/indra/test_apps/llplugintest/plugin_process_launcher.cpp old mode 100755 new mode 100644