From 329d4900366605116cef03d92be4e64acae6f785 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Mon, 22 Feb 2021 16:38:05 -0800 Subject: First set of changes to make Dullahan build with CEF v88 --- autobuild.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 08233ef403..08fd69f2f2 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -604,16 +604,16 @@ archive hash - 6f7bf7f915f3d75dbdad08a2d41ca74e + 0c0ef3d529fcde0d966d24af39175041 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/65003/607308/dullahan-1.7.0.202008031800_81.3.10_gb223419_chromium-81.0.4044.138-windows64-546064.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77425/734566/dullahan-1.9.1.202102230022_88.2.8_ge484012_chromium-88.0.4324.150-windows64-556277.tar.bz2 name windows64 version - 1.7.0.202008031800_81.3.10_gb223419_chromium-81.0.4044.138 + 1.9.1.202102230022_88.2.8_ge484012_chromium-88.0.4324.150 elfio -- cgit v1.2.3 From 2aea7cfc25d42e3d87db4fb759baa4419ec23dca Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 24 Feb 2021 15:20:39 -0800 Subject: Pull in new version of Dullahan with support for setting the host process path, tweak viewer manifest so it copies the SwiftShader folder (required but may be a Chromium bug) and improve background color matching --- autobuild.xml | 6 +++--- indra/media_plugins/cef/media_plugin_cef.cpp | 12 +++++++++++- indra/newview/viewer_manifest.py | 6 ++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 08fd69f2f2..fa21054499 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -604,16 +604,16 @@ archive hash - 0c0ef3d529fcde0d966d24af39175041 + 9e12e974d00d6f45b2cbb891fa8a4747 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77425/734566/dullahan-1.9.1.202102230022_88.2.8_ge484012_chromium-88.0.4324.150-windows64-556277.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77546/735174/dullahan-1.9.1.202102242217_88.2.8_ge484012_chromium-88.0.4324.150-windows64-556355.tar.bz2 name windows64 version - 1.9.1.202102230022_88.2.8_ge484012_chromium-88.0.4324.150 + 1.9.1.202102242217_88.2.8_ge484012_chromium-88.0.4324.150 elfio diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 0bb62d79ff..c658f35480 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -525,8 +525,18 @@ void MediaPluginCEF::receiveMessage(const char* message_string) mCEFLib->setOnJSDialogCallback(std::bind(&MediaPluginCEF::onJSDialogCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); dullahan::dullahan_settings settings; +#if LL_WINDOWS + // As of CEF version 83+, for Windows versions, we need to tell CEF + // where the host helper process is since this DLL is not in the same + // dir as the executable that loaded it (SLPlugin.exe). The code in + // Dullahan that tried to figure out the location automatically uses + // the location of the exe which isn't helpful so we tell it explicitly. + char cur_dir_str[MAX_PATH]; + GetCurrentDirectoryA(MAX_PATH, cur_dir_str); + settings.host_process_path = std::string(cur_dir_str); +#endif settings.accept_language_list = mHostLanguage; - settings.background_color = 0xffffffff; + settings.background_color = 0xff282828; // close to Viewer background color settings.cache_enabled = true; settings.root_cache_path = mRootCachePath; settings.cache_path = mCachePath; diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 6d231040f7..3ce3aae469 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -611,6 +611,12 @@ class WindowsManifest(ViewerManifest): self.path("msvcp140.dll") self.path("vcruntime140.dll") + # as of CEF 88, this (apparently software rendering support) + # folder is required - likely a Chromium bug - but including + # for now until the root cause is found - it's tiny + with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')): + self.path("swiftshader/") + # CEF files common to all configurations with self.prefix(src=os.path.join(pkgdir, 'resources')): self.path("cef.pak") -- cgit v1.2.3 From b1add74c31cfd28c1e671470991254b4545fb573 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 3 Mar 2021 10:09:27 -0800 Subject: Pull in the newest Dullahan 1.10.x with CEF/Chromium 89.x --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index fa21054499..8a27f1e859 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -592,9 +592,9 @@ archive hash - 4e5b9e2fe65d94e30a4f3d831c767199 + 6cb70830d145147a3286aaa80b09a21e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/65004/607304/dullahan-1.7.0.202008031759_81.3.10_gb223419_chromium-81.0.4044.138-windows-546064.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77816/736910/dullahan-1.10.0.202103031657_89.0.5_gc1f90d8_chromium-89.0.4389.40-windows-556509.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - 9e12e974d00d6f45b2cbb891fa8a4747 + 68429cb4095468255737e78d1d4a0a5e url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77546/735174/dullahan-1.9.1.202102242217_88.2.8_ge484012_chromium-88.0.4324.150-windows64-556355.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77815/736914/dullahan-1.10.0.202103031657_89.0.5_gc1f90d8_chromium-89.0.4389.40-windows64-556509.tar.bz2 name windows64 version - 1.9.1.202102242217_88.2.8_ge484012_chromium-88.0.4324.150 + 1.10.0.202103031657_89.0.5_gc1f90d8_chromium-89.0.4389.40 elfio -- cgit v1.2.3 From 2dbd5c57621a93941f95a4e053403e1d0c9caca9 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Thu, 1 Apr 2021 14:38:19 -0700 Subject: Pull in macOS version of CEF 89 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 5842062378..f3b5eea162 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 856ba0e5b7be4bf683cf2849bce845e0 + e8bb2a8171183cf5706e8b6e2588988c url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/72458/699860/dullahan-1.7.0.202011160759_81.3.10_gb223419_chromium-81.0.4044.138-darwin64-552313.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/79522/752376/dullahan-1.10.0.202104012011_89.0.12_g2b76680_chromium-89.0.4389.90-darwin64-557788.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - 6cb70830d145147a3286aaa80b09a21e + 6bbcbc01529da36c093c5800c777728f url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77816/736910/dullahan-1.10.0.202103031657_89.0.5_gc1f90d8_chromium-89.0.4389.40-windows-556509.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/79515/752323/dullahan-1.10.0.202104011942_89.0.5_gc1f90d8_chromium-89.0.4389.40-windows-557788.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - 68429cb4095468255737e78d1d4a0a5e + e9db2509e8d080f35569f6c8cb4810df url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77815/736914/dullahan-1.10.0.202103031657_89.0.5_gc1f90d8_chromium-89.0.4389.40-windows64-556509.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/79514/752327/dullahan-1.10.0.202104011942_89.0.5_gc1f90d8_chromium-89.0.4389.40-windows64-557788.tar.bz2 name windows64 version - 1.10.0.202103031657_89.0.5_gc1f90d8_chromium-89.0.4389.40 + 1.10.0.202104011942_89.0.5_gc1f90d8_chromium-89.0.4389.40 elfio -- cgit v1.2.3 From 75f26d123da0d90c13f1614118c4ace8c1f04598 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Tue, 13 Apr 2021 09:36:50 -0700 Subject: Update to Chromium version 89.0.4389.114 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index f3b5eea162..0c01260323 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - e8bb2a8171183cf5706e8b6e2588988c + a0dd76112ade26f5bcc47b801ca28d5f url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/79522/752376/dullahan-1.10.0.202104012011_89.0.12_g2b76680_chromium-89.0.4389.90-darwin64-557788.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80065/756313/dullahan-1.10.0.202104131525_89.0.17_ge7bbb1d_chromium-89.0.4389.114-darwin64-558200.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - 6bbcbc01529da36c093c5800c777728f + 520bafbf2d7f660297390d46632cce89 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/79515/752323/dullahan-1.10.0.202104011942_89.0.5_gc1f90d8_chromium-89.0.4389.40-windows-557788.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80066/756326/dullahan-1.10.0.202104131537_89.0.17_ge7bbb1d_chromium-89.0.4389.114-windows-558200.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - e9db2509e8d080f35569f6c8cb4810df + 37d579ff1f13b2a07b696e09cddc486d url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/79514/752327/dullahan-1.10.0.202104011942_89.0.5_gc1f90d8_chromium-89.0.4389.40-windows64-557788.tar.bz2 + https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80067/756330/dullahan-1.10.0.202104131537_89.0.17_ge7bbb1d_chromium-89.0.4389.114-windows64-558200.tar.bz2 name windows64 version - 1.10.0.202104011942_89.0.5_gc1f90d8_chromium-89.0.4389.40 + 1.10.0.202104131537_89.0.17_ge7bbb1d_chromium-89.0.4389.114 elfio -- cgit v1.2.3