diff --git a/autobuild.xml b/autobuild.xml index f6181d0d6e8189b12a630f10237127eaa96c48a9..284dc80c42065205eb7f659fd77b4609795d6433 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1948,11 +1948,11 @@ <key>archive</key> <map> <key>hash</key> - <string>6606a1fe5c22100bb3ade96ffebf3a64</string> + <string>43fc743eb397190ef670c4d0b69cc24c</string> <key>hash_algorithm</key> <string>md5</string> <key>url</key> - <string>http://depot.alchemyviewer.org/pub/darwin/lib/llceflib-3.2840.1518.gffd843c-darwin-201612292259.tar.bz2</string> + <string>http://depot.alchemyviewer.org/pub/darwin/lib/llceflib-3.2840.1518.gffd843c-darwin-201612300041.tar.bz2</string> </map> <key>name</key> <string>darwin</string> diff --git a/indra/cmake/LLSharedLibs.cmake b/indra/cmake/LLSharedLibs.cmake index e183866a4077d553ca6b771d07c8a8af88c97e4a..5252bc87c4216c2fe520abf02b06cce94048026b 100644 --- a/indra/cmake/LLSharedLibs.cmake +++ b/indra/cmake/LLSharedLibs.cmake @@ -60,7 +60,7 @@ macro(ll_stage_sharedlib DSO_TARGET) if (DARWIN) set_target_properties(${DSO_TARGET} PROPERTIES - BUILD_WITH_INSTALL_RPATH 1 + BUILD_WITH_INSTALL_RPATH TRUE INSTALL_NAME_DIR "@executable_path/../Resources" ) endif(DARWIN) diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 1254d509a8297a9a7f3612612baf8f95a2dbe173..b2e49c344f5152446170d7e968bbbe16ff118ddc 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -221,6 +221,7 @@ void LLPluginClassMedia::idle(void) mTextureSharedMemorySize = newsize; mTextureSharedMemoryName = mPlugin->addSharedMemory(mTextureSharedMemorySize); +#if 0 if(!mTextureSharedMemoryName.empty()) { void *addr = mPlugin->getSharedMemoryAddress(mTextureSharedMemoryName); @@ -232,6 +233,7 @@ void LLPluginClassMedia::idle(void) // so it may not be worthwhile. // mDirtyRect.setOriginAndSize(0, 0, mRequestedMediaWidth, mRequestedMediaHeight); } +#endif } // This is our local indicator that a change is in progress. @@ -356,12 +358,13 @@ void LLPluginClassMedia::setSizeInternal(void) mRequestedMediaWidth = nextPowerOf2(mRequestedMediaWidth); mRequestedMediaHeight = nextPowerOf2(mRequestedMediaHeight); } - +#if 0 if(mRequestedMediaWidth > 2048) mRequestedMediaWidth = 2048; if(mRequestedMediaHeight > 2048) mRequestedMediaHeight = 2048; +#endif } void LLPluginClassMedia::setAutoScale(bool auto_scale) diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index 0ec4b9e995ad3cfdb607069aed48bf57f0416989..9d794169a9de3a477f4f6954f3cee5e810f4d2de 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -104,17 +104,9 @@ if (DARWIN) media_plugin_cef PROPERTIES PREFIX "" - BUILD_WITH_INSTALL_RPATH 1 - INSTALL_NAME_DIR "@executable_path" + INSTALL_RPATH "@executable_path/../../../.." + BUILD_WITH_INSTALL_RPATH TRUE LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp" ) - add_custom_command(TARGET media_plugin_cef - POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "@executable_path/Chromium Embedded Framework" - "@executable_path/../../../../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" - "$<TARGET_FILE:media_plugin_cef>" - VERBATIM - COMMENT "Fixing path to CEF Framework" - ) - endif (DARWIN) diff --git a/indra/media_plugins/example/CMakeLists.txt b/indra/media_plugins/example/CMakeLists.txt index e5d1bd1b5fc8110fdfccb84325e8b179e5607e84..a5338fd46752e424b7e5263bb3da8831e95d5e61 100644 --- a/indra/media_plugins/example/CMakeLists.txt +++ b/indra/media_plugins/example/CMakeLists.txt @@ -71,7 +71,7 @@ if (DARWIN) media_plugin_example PROPERTIES PREFIX "" - BUILD_WITH_INSTALL_RPATH 1 + BUILD_WITH_INSTALL_RPATH TRUE INSTALL_NAME_DIR "@executable_path" LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp" ) diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt index 6e655cb8d8d65ffef589111295f068dc7f76a326..c74420cc5ff7a1568acfedde9d81cb9be8a799e4 100644 --- a/indra/media_plugins/libvlc/CMakeLists.txt +++ b/indra/media_plugins/libvlc/CMakeLists.txt @@ -66,7 +66,7 @@ if (DARWIN) media_plugin_libvlc PROPERTIES PREFIX "" - BUILD_WITH_INSTALL_RPATH 1 + BUILD_WITH_INSTALL_RPATH TRUE INSTALL_NAME_DIR "@executable_path" LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp" )