Skip to content

Commit 47e36e5

Browse files
RyeMuttRyeMutt
committed
Update cef-bin to 149.0.7827.201 use standard distrib to support debug builds
1 parent 4bce714 commit 47e36e5

7 files changed

Lines changed: 84 additions & 46 deletions

File tree

‎indra/cmake/CEFPlugin.cmake‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,24 @@ add_library(ll::cef INTERFACE IMPORTED)
55
if(DARWIN)
66
find_library(APPKIT_LIBRARY AppKit REQUIRED)
77
find_library(LIBCEF_DLL_WRAPPER_LIBRARY_RELEASE NAMES cef_dll_wrapper REQUIRED)
8+
find_library(LIBCEF_DLL_WRAPPER_LIBRARY_DEBUG NAMES cef_dll_wrapper PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
89
target_link_libraries(ll::cef INTERFACE
9-
${LIBCEF_DLL_WRAPPER_LIBRARY_RELEASE}
10+
optimized ${LIBCEF_DLL_WRAPPER_LIBRARY_RELEASE}
11+
debug ${LIBCEF_DLL_WRAPPER_LIBRARY_DEBUG}
1012
${APPKIT_LIBRARY}
1113
)
1214
set(CEF_FRAMEWORK_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/Chromium Embedded Framework.framework")
1315
else()
1416
find_library(LIBCEF_LIBRARY_RELEASE NAMES cef libcef PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" REQUIRED NO_DEFAULT_PATH)
1517
find_library(LIBCEF_DLL_WRAPPER_LIBRARY_RELEASE NAMES cef_dll_wrapper PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" REQUIRED NO_DEFAULT_PATH)
16-
target_link_libraries(ll::cef INTERFACE ${LIBCEF_DLL_WRAPPER_LIBRARY_RELEASE} ${LIBCEF_LIBRARY_RELEASE})
18+
find_library(LIBCEF_LIBRARY_DEBUG NAMES cef libcef PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
19+
find_library(LIBCEF_DLL_WRAPPER_LIBRARY_DEBUG NAMES cef_dll_wrapper PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
20+
target_link_libraries(ll::cef INTERFACE
21+
optimized ${LIBCEF_DLL_WRAPPER_LIBRARY_RELEASE}
22+
debug ${LIBCEF_DLL_WRAPPER_LIBRARY_DEBUG}
23+
optimized ${LIBCEF_LIBRARY_RELEASE}
24+
debug ${LIBCEF_LIBRARY_DEBUG}
25+
)
1726
endif()
1827

1928
set(CEF_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/cef/include")

‎indra/dullahan‎

‎indra/media_plugins/cef/CMakeLists.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,33 +120,33 @@ if (WINDOWS)
120120
# below) so the CEF runtime resolves from its own dir.
121121
set_target_properties(media_plugin_cef
122122
PROPERTIES
123-
EXCLUDE_FROM_DEFAULT_BUILD_DEBUG ON
124123
RUNTIME_OUTPUT_DIRECTORY "${VIEWER_STAGING_DIR}/llplugin"
125124
LIBRARY_OUTPUT_DIRECTORY "${VIEWER_STAGING_DIR}/llplugin"
126125
)
127126
target_link_options(media_plugin_cef PRIVATE /IGNORE:4099)
128127

129128
set(CEF_BIN_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/cef-bin")
129+
set(CEF_BIN_BINARY_DIR "$<IF:$<CONFIG:Debug>,${CEF_BIN_DIR}/Debug,${CEF_BIN_DIR}/Release>")
130130

131131
# Ship CEF's bootstrap.exe renamed to media_plugin_cef.exe; matching base name
132132
# makes it load media_plugin_cef.dll and call our exported RunWinMain with the
133133
# sandbox info. The bootstrap.exe is part of the CEF Release payload copied below.
134134
add_custom_command(TARGET media_plugin_cef POST_BUILD
135-
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CEF_BIN_DIR}/Release/bootstrap.exe" "${VIEWER_STAGING_DIR}/llplugin/media_plugin_cef.exe"
135+
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CEF_BIN_BINARY_DIR}/bootstrap.exe" "${VIEWER_STAGING_DIR}/llplugin/media_plugin_cef.exe"
136136
)
137137

138138
# Copy the CEF runtime + resources to the packaging directory.
139139
set(CEF_BIN_FILES
140-
"${CEF_BIN_DIR}/Release/chrome_elf.dll"
141-
"${CEF_BIN_DIR}/Release/d3dcompiler_47.dll"
142-
"${CEF_BIN_DIR}/Release/dxcompiler.dll"
143-
"${CEF_BIN_DIR}/Release/dxil.dll"
144-
"${CEF_BIN_DIR}/Release/libEGL.dll"
145-
"${CEF_BIN_DIR}/Release/libGLESv2.dll"
146-
"${CEF_BIN_DIR}/Release/v8_context_snapshot.bin"
147-
"${CEF_BIN_DIR}/Release/vk_swiftshader.dll"
148-
"${CEF_BIN_DIR}/Release/vk_swiftshader_icd.json"
149-
"${CEF_BIN_DIR}/Release/vulkan-1.dll"
140+
"${CEF_BIN_BINARY_DIR}/chrome_elf.dll"
141+
"${CEF_BIN_BINARY_DIR}/d3dcompiler_47.dll"
142+
"${CEF_BIN_BINARY_DIR}/dxcompiler.dll"
143+
"${CEF_BIN_BINARY_DIR}/dxil.dll"
144+
"${CEF_BIN_BINARY_DIR}/libEGL.dll"
145+
"${CEF_BIN_BINARY_DIR}/libGLESv2.dll"
146+
"${CEF_BIN_BINARY_DIR}/v8_context_snapshot.bin"
147+
"${CEF_BIN_BINARY_DIR}/vk_swiftshader.dll"
148+
"${CEF_BIN_BINARY_DIR}/vk_swiftshader_icd.json"
149+
"${CEF_BIN_BINARY_DIR}/vulkan-1.dll"
150150
)
151151
add_custom_command(
152152
TARGET media_plugin_cef POST_BUILD

‎indra/newview/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2022,7 +2022,7 @@ if (WINDOWS)
20222022
add_custom_target(copy_input_dependencies
20232023
DEPENDS
20242024
stage_third_party_libs
2025-
$<$<CONFIG:OptDebug,RelWithDebInfo,Release>:$<TARGET_NAME_IF_EXISTS:media_plugin_cef>>
2025+
$<TARGET_NAME_IF_EXISTS:media_plugin_cef>
20262026
$<TARGET_NAME_IF_EXISTS:media_plugin_gstreamer10>
20272027
$<$<CONFIG:OptDebug,RelWithDebInfo,Release>:$<TARGET_NAME_IF_EXISTS:media_plugin_libvlc>>
20282028
$<TARGET_NAME_IF_EXISTS:media_plugin_example>

‎indra/newview/viewer_manifest.py‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -514,23 +514,21 @@ def construct(self):
514514
self.path(self.final_exe())
515515
self.path("*.dll")
516516

517-
# Plugins are only built in non-debug builds on windows
518-
if self.args['buildtype'].lower() != 'debug':
519-
with self.prefix(src_dst=os.path.join(self.get_dst_prefix(), 'llplugin')):
520-
# Per-plugin host executables (media_plugin_*.exe, including the
521-
# renamed CEF bootstrap media_plugin_cef.exe) and their dependency
522-
# DLLs (media_plugin_cef.dll, libcef.dll, ...). The *.exe / *.dll
523-
# globs below pick them all up.
524-
self.path("*.dll")
525-
# CEF files
526-
self.path("*.exe")
527-
self.path("*.pak")
528-
self.path("*.bin")
529-
self.path("*.json")
530-
# VLC files
531-
self.path("*.dat")
532-
self.path("locales")
533-
self.path("plugins")
517+
with self.prefix(src_dst=os.path.join(self.get_dst_prefix(), 'llplugin')):
518+
# Per-plugin host executables (media_plugin_*.exe, including the
519+
# renamed CEF bootstrap media_plugin_cef.exe) and their dependency
520+
# DLLs (media_plugin_cef.dll, libcef.dll, ...). The *.exe / *.dll
521+
# globs below pick them all up.
522+
self.path("*.dll")
523+
# CEF files
524+
self.path("*.exe")
525+
self.path("*.pak")
526+
self.path("*.bin")
527+
self.path("*.json")
528+
# VLC files
529+
self.path("*.dat")
530+
self.path("locales")
531+
self.path("plugins")
534532

535533
self.path(src="licenses-win32.txt", dst="licenses.txt")
536534
self.path("featuretable.txt")

‎indra/vcpkg/ports/cef-bin/portfile.cmake‎

Lines changed: 43 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,35 @@
1-
set(VCPKG_POLICY_ALLOW_EMPTY_FOLDERS enabled)
21
set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled)
3-
set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled)
42
set(VCPKG_FIXUP_MACHO_RPATH OFF)
53
set(VCPKG_FIXUP_ELF_RPATH OFF)
6-
set(VCPKG_BUILD_TYPE release)
74
set(VCPKG_LIBRARY_LINKAGE static)
85

96
if(VCPKG_TARGET_IS_WINDOWS)
107
vcpkg_download_distfile(ARCHIVE
11-
URLS "https://cef-builds.spotifycdn.com/cef_binary_148.0.9%2Bg0d9d52a%2Bchromium-148.0.7778.180_windows64_minimal.tar.bz2"
8+
URLS "https://cef-builds.spotifycdn.com/cef_binary_149.0.6%2Bg0d0eeb6%2Bchromium-149.0.7827.201_windows64.tar.bz2"
129
FILENAME "cef.${VERSION}.windows64.tar.bz2"
13-
SHA512 f38218298e44e7fedfa55438101a0d6ff11f03a95c13664fb5747089cdf25ff08be9648d03ae3b899c7e8bc2e8db17035cfbaf762213c47e63ce6fcc59349d20
10+
SHA512 66200e0050721e2d5df68fcd737daa48080ae616cc063d0cc452d0059ae9e355b5c50182fe532120ba19d92a91559db1a8b68f7ae51d5e281f189474bdf8da52
1411
)
1512
elseif(VCPKG_TARGET_IS_OSX)
1613
if(VCPKG_OSX_ARCHITECTURES MATCHES "arm64")
1714
set(MACOS_ARCH_FLAG "-DPROJECT_ARCH=arm64")
1815
vcpkg_download_distfile(ARCHIVE
19-
URLS "https://cef-builds.spotifycdn.com/cef_binary_148.0.9%2Bg0d9d52a%2Bchromium-148.0.7778.180_macosarm64_minimal.tar.bz2"
16+
URLS "https://cef-builds.spotifycdn.com/cef_binary_149.0.6%2Bg0d0eeb6%2Bchromium-149.0.7827.201_macosarm64.tar.bz2"
2017
FILENAME "cef.${VERSION}.macosarm64.tar.bz2"
21-
SHA512 3bb9f7cb5ee62bde7ac68e377341b7de3df64f32d8de1c2dbafd92da33146f8a5845ebbbe803e7660d921206e987ab651482e716357806cb30c9061a4f8684b5
18+
SHA512 93a547aa37226c4a7715a0b142249f1e654d97f21c2e6b63bf78e2d3c6ec6f7f3ea35bc34e319125972ae48670c78dfc636b996881a11e1dc8b34110bf9b29b0
2219
)
2320
else()
2421
set(MACOS_ARCH_FLAG "-DPROJECT_ARCH=x86_64")
2522
vcpkg_download_distfile(ARCHIVE
26-
URLS "https://cef-builds.spotifycdn.com/cef_binary_148.0.9%2Bg0d9d52a%2Bchromium-148.0.7778.180_macosx64_minimal.tar.bz2"
23+
URLS "https://cef-builds.spotifycdn.com/cef_binary_149.0.6%2Bg0d0eeb6%2Bchromium-149.0.7827.201_macosx64.tar.bz2"
2724
FILENAME "cef.${VERSION}.macosx64.tar.bz2"
28-
SHA512 4280392cdddc7524fcf38ddabef81386083a73c624d412deb88f6888534690327a0713b30abc65dab2379f5e5a53f06c445f665405716762bc34df867bc54001
25+
SHA512 dcd06bdf58c19731f2eeedabc92ce8476510aea3074418d57f1b1c7a8e5753b848ca4bf5744906cca9ee3685af4f8c6b081d0c8350bb2a87b1366cf80b46f4a1
2926
)
3027
endif()
3128
elseif(VCPKG_TARGET_IS_LINUX)
3229
vcpkg_download_distfile(ARCHIVE
33-
URLS "https://cef-builds.spotifycdn.com/cef_binary_148.0.9%2Bg0d9d52a%2Bchromium-148.0.7778.180_linux64_minimal.tar.bz2"
30+
URLS "https://cef-builds.spotifycdn.com/cef_binary_149.0.6%2Bg0d0eeb6%2Bchromium-149.0.7827.201_linux64.tar.bz2"
3431
FILENAME "cef.${VERSION}.linux64.tar.bz2"
35-
SHA512 197a1598f56b636db558d1f6dddfa3885f529571d354c0ff98dd27dbea56e73790f65ddece89e130bdc76611e374de8da5282e517980ffac98ef59037422e390
32+
SHA512 dab6871d532675cf63bf6935ba95fc9f8364eecbf3627ea28acf4a40b09cce466e40dd43095f4be89b7094a9c75311cac65bcfc56d30bde381308783644d6d5c
3633
)
3734
endif()
3835

@@ -74,8 +71,14 @@ file(INSTALL "${CEF_SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/
7471

7572
if(VCPKG_TARGET_IS_WINDOWS)
7673
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcef_dll_wrapper/libcef_dll_wrapper.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
74+
if(NOT VCPKG_BUILD_TYPE)
75+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcef_dll_wrapper/libcef_dll_wrapper.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
76+
endif()
7777
else()
7878
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcef_dll_wrapper/libcef_dll_wrapper.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
79+
if(NOT VCPKG_BUILD_TYPE)
80+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcef_dll_wrapper/libcef_dll_wrapper.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
81+
endif()
7982
endif()
8083

8184
if(VCPKG_TARGET_IS_WINDOWS)
@@ -89,10 +92,27 @@ if(VCPKG_TARGET_IS_WINDOWS)
8992
PATTERN "libcef.dll" EXCLUDE
9093
PATTERN "libcef.lib" EXCLUDE
9194
)
95+
if(NOT VCPKG_BUILD_TYPE)
96+
file(INSTALL "${CEF_SOURCE_PATH}/Debug/libcef.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
97+
file(INSTALL "${CEF_SOURCE_PATH}/Debug/libcef.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
98+
file(INSTALL
99+
DIRECTORY "${CEF_SOURCE_PATH}/Debug/"
100+
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/Debug"
101+
FILES_MATCHING
102+
PATTERN "*.*"
103+
PATTERN "libcef.dll" EXCLUDE
104+
PATTERN "libcef.lib" EXCLUDE
105+
)
106+
endif()
107+
92108
file(INSTALL "${CEF_SOURCE_PATH}/Resources" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
93109
elseif(VCPKG_TARGET_IS_OSX)
94110
set(CEF_RELEASE_FRAMEWORK_DIR "${CURRENT_PACKAGES_DIR}/lib/Chromium Embedded Framework.framework")
95111
file(RENAME "${CEF_SOURCE_PATH}/Release/Chromium Embedded Framework.framework" "${CEF_RELEASE_FRAMEWORK_DIR}")
112+
if(NOT VCPKG_BUILD_TYPE)
113+
set(CEF_RELEASE_FRAMEWORK_DIR "${CURRENT_PACKAGES_DIR}/debug/lib/Chromium Embedded Framework.framework")
114+
file(RENAME "${CEF_SOURCE_PATH}/Debug/Chromium Embedded Framework.framework" "${CEF_RELEASE_FRAMEWORK_DIR}")
115+
endif()
96116
elseif(VCPKG_TARGET_IS_LINUX)
97117
file(INSTALL "${CEF_SOURCE_PATH}/Release/libcef.so" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
98118
file(INSTALL
@@ -103,6 +123,18 @@ elseif(VCPKG_TARGET_IS_LINUX)
103123
PATTERN "chrome-sandbox"
104124
PATTERN "libcef.so" EXCLUDE
105125
)
126+
if(NOT VCPKG_BUILD_TYPE)
127+
file(INSTALL "${CEF_SOURCE_PATH}/Debug/libcef.so" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
128+
file(INSTALL
129+
DIRECTORY "${CEF_SOURCE_PATH}/Debug/"
130+
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/Debug"
131+
FILES_MATCHING
132+
PATTERN "*.*"
133+
PATTERN "chrome-sandbox"
134+
PATTERN "libcef.so" EXCLUDE
135+
)
136+
endif()
137+
106138
file(INSTALL "${CEF_SOURCE_PATH}/Resources" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
107139
endif()
108140

‎indra/vcpkg/ports/cef-bin/vcpkg.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "cef-bin",
3-
"version": "148.0.7778.180",
4-
"port-version": 1,
3+
"version": "149.0.7827.201",
54
"dependencies": [
65
{
76
"name": "vcpkg-cmake",

0 commit comments

Comments
 (0)