Skip to content

Commit e518674

Browse files
committed
chromium-stable: bump to 127.0.6533.119
1 parent d57c402 commit e518674

8 files changed

+86
-111
lines changed

tur-chromium/chromium-stable/1703-swiftshader-no-android.patch

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
193193
# include <unistd.h>
194194

195195
# include "commit.h"
196-
@@ -104,7 +104,7 @@
196+
@@ -105,7 +105,7 @@
197197
namespace {
198198

199199
// Enable commit_id.py and #include commit.h for other platforms.
@@ -202,7 +202,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
202202
void logBuildVersionInformation()
203203
{
204204
// TODO(b/144093703): Don't call __android_log_print() directly
205-
@@ -139,7 +139,7 @@
205+
@@ -140,7 +140,7 @@
206206
void initializeLibrary()
207207
{
208208
static bool doOnce = [] {
@@ -211,7 +211,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
211211
logBuildVersionInformation();
212212
#endif // __ANDROID__ && ENABLE_BUILD_VERSION_OUTPUT
213213
return true;
214-
@@ -286,7 +286,7 @@
214+
@@ -322,7 +322,7 @@
215215
{ { VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION } },
216216
{ { VK_EXT_DEBUG_UTILS_EXTENSION_NAME, VK_EXT_DEBUG_UTILS_SPEC_VERSION } },
217217
{ { VK_EXT_HEADLESS_SURFACE_EXTENSION_NAME, VK_EXT_HEADLESS_SURFACE_SPEC_VERSION } },
@@ -220,7 +220,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
220220
{ { VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_SURFACE_SPEC_VERSION } },
221221
{ { VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME, VK_EXT_SURFACE_MAINTENANCE_1_SPEC_VERSION } },
222222
{ { VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME, VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION } },
223-
@@ -340,7 +340,7 @@
223+
@@ -376,7 +376,7 @@
224224
// Only 1.1 core version of this is supported. The extension has additional requirements
225225
//{{ VK_KHR_VARIABLE_POINTERS_EXTENSION_NAME, VK_KHR_VARIABLE_POINTERS_SPEC_VERSION }},
226226
{ { VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME, VK_EXT_QUEUE_FAMILY_FOREIGN_SPEC_VERSION } },
@@ -229,16 +229,16 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
229229
// We fully support the KHR_swapchain v70 additions, so just track the spec version.
230230
{ { VK_KHR_SWAPCHAIN_EXTENSION_NAME, VK_KHR_SWAPCHAIN_SPEC_VERSION } },
231231
#else
232-
@@ -416,7 +416,7 @@
232+
@@ -449,7 +449,7 @@
233+
{ { VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME, VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION } },
233234
{ { VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION } },
234-
{ { VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME, VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_SPEC_VERSION } },
235235
{ { VK_KHR_PIPELINE_LIBRARY_EXTENSION_NAME, VK_KHR_PIPELINE_LIBRARY_SPEC_VERSION } },
236236
-#ifndef __ANDROID__
237237
+#if !(defined(__ANDROID__) && !defined(__TERMUX__))
238+
{ { VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME, VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_SPEC_VERSION } },
238239
{ { VK_EXT_SWAPCHAIN_MAINTENANCE_1_EXTENSION_NAME, VK_EXT_SWAPCHAIN_MAINTENANCE_1_SPEC_VERSION } },
239240
#endif
240-
{ { VK_EXT_GRAPHICS_PIPELINE_LIBRARY_EXTENSION_NAME, VK_EXT_GRAPHICS_PIPELINE_LIBRARY_SPEC_VERSION } },
241-
@@ -1952,7 +1952,7 @@
241+
@@ -2038,7 +2038,7 @@
242242

243243
const VkBaseInStructure *extensionCreateInfo = reinterpret_cast<const VkBaseInStructure *>(pCreateInfo->pNext);
244244

@@ -247,7 +247,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
247247
vk::BackingMemory backmem;
248248
bool swapchainImage = false;
249249
#endif
250-
@@ -1963,7 +1963,7 @@
250+
@@ -2049,7 +2049,7 @@
251251
// VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID, are not enumerated in the official Vulkan headers.
252252
switch((int)(extensionCreateInfo->sType))
253253
{
@@ -256,7 +256,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
256256
case VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_ANDROID:
257257
{
258258
const VkSwapchainImageCreateInfoANDROID *swapImageCreateInfo = reinterpret_cast<const VkSwapchainImageCreateInfoANDROID *>(extensionCreateInfo);
259-
@@ -2023,7 +2023,7 @@
259+
@@ -2109,7 +2109,7 @@
260260

261261
VkResult result = vk::Image::Create(pAllocator, pCreateInfo, pImage, vk::Cast(device));
262262

@@ -265,7 +265,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
265265
if(swapchainImage)
266266
{
267267
if(result != VK_SUCCESS)
268-
@@ -2061,7 +2061,7 @@
268+
@@ -2147,7 +2147,7 @@
269269
TRACE("(VkDevice device = %p, VkImage image = %p, const VkAllocationCallbacks* pAllocator = %p)",
270270
device, static_cast<void *>(image), pAllocator);
271271

@@ -274,7 +274,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
274274
vk::Image *img = vk::Cast(image);
275275
if(img && img->hasExternalMemory())
276276
{
277-
@@ -3473,7 +3473,7 @@
277+
@@ -3573,7 +3573,7 @@
278278
/* Do nothing */
279279
break;
280280

@@ -283,7 +283,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
283283
case VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR:
284284
{
285285
const auto *swapchainInfo = reinterpret_cast<const VkBindImageMemorySwapchainInfoKHR *>(extInfo);
286-
@@ -3683,7 +3683,7 @@
286+
@@ -3783,7 +3783,7 @@
287287
vk::Cast(physicalDevice)->getProperties(properties);
288288
}
289289
break;
@@ -292,7 +292,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
292292
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_ANDROID:
293293
{
294294
auto *properties = reinterpret_cast<VkPhysicalDevicePresentationPropertiesANDROID *>(extensionProperties);
295-
@@ -3902,7 +3902,7 @@
295+
@@ -4002,7 +4002,7 @@
296296

297297
VkBaseOutStructure *extensionProperties = reinterpret_cast<VkBaseOutStructure *>(pImageFormatProperties->pNext);
298298

@@ -301,7 +301,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
301301
bool hasAHBUsage = false;
302302
#endif
303303

304-
@@ -3936,7 +3936,7 @@
304+
@@ -4036,7 +4036,7 @@
305305
properties->identicalMemoryLayout = VK_TRUE;
306306
}
307307
break;
@@ -310,7 +310,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
310310
case VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_USAGE_ANDROID:
311311
{
312312
auto *properties = reinterpret_cast<VkAndroidHardwareBufferUsageANDROID *>(extensionProperties);
313-
@@ -3966,7 +3966,7 @@
313+
@@ -4066,7 +4066,7 @@
314314

315315
vk::Cast(physicalDevice)->getImageFormatProperties(format, type, tiling, usage, flags, &pImageFormatProperties->imageFormatProperties);
316316

@@ -319,7 +319,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
319319
if(hasAHBUsage)
320320
{
321321
// AHardwareBuffer_lock may only be called with a single layer.
322-
@@ -4089,7 +4089,7 @@
322+
@@ -4189,7 +4189,7 @@
323323
{
324324
switch(extInfo->sType)
325325
{
@@ -328,7 +328,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
328328
case VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID:
329329
break;
330330
#endif
331-
@@ -4603,7 +4603,7 @@
331+
@@ -4703,7 +4703,7 @@
332332
return vk::HeadlessSurfaceKHR::Create(pAllocator, pCreateInfo, pSurface);
333333
}
334334

@@ -337,7 +337,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift
337337
VKAPI_ATTR void VKAPI_CALL vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *pAllocator)
338338
{
339339
TRACE("(VkInstance instance = %p, VkSurfaceKHR surface = %p, const VkAllocationCallbacks* pAllocator = %p)",
340-
@@ -4821,7 +4821,7 @@
340+
@@ -4921,7 +4921,7 @@
341341

342342
#endif // ! __ANDROID__
343343

tur-chromium/chromium-stable/2017-vk-layers-no-android-log.patch

Lines changed: 0 additions & 64 deletions
This file was deleted.
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# --- a/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/logging.h
2+
# +++ b/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/logging.h
3+
# @@ -33,7 +33,7 @@
4+
# #include "generated/vk_layer_dispatch_table.h"
5+
# #include "generated/vk_object_types.h"
6+
7+
# -#if defined __ANDROID__
8+
# +#if defined(__ANDROID__) && !defined(__TERMUX__)
9+
# #include <android/log.h>
10+
# #define LOGCONSOLE(...) ((void)__android_log_print(ANDROID_LOG_INFO, "VALIDATION", __VA_ARGS__))
11+
# [[maybe_unused]] static const char *kForceDefaultCallbackKey = "debug.vvl.forcelayerlog";
12+
# --- a/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_layer_config.cpp
13+
# +++ b/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_layer_config.cpp
14+
# @@ -74,7 +74,7 @@
15+
# #endif
16+
17+
# std::string GetEnvironment(const char *variable) {
18+
# -#if !defined(__ANDROID__) && !defined(_WIN32)
19+
# +#if !(defined(__ANDROID__) && !defined(__TERMUX__)) && !defined(_WIN32)
20+
# const char *output = getenv(variable);
21+
# return output == NULL ? "" : output;
22+
# #elif defined(_WIN32)
23+
# --- a/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/android_ndk_types.h
24+
# +++ b/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/android_ndk_types.h
25+
# @@ -29,7 +29,9 @@
26+
27+
# #pragma once
28+
29+
# -#if defined(__ANDROID__) && !defined(VK_USE_PLATFORM_ANDROID_KHR)
30+
# +#include <sys/cdefs.h>
31+
# +
32+
# +#if (defined(__ANDROID__) && !defined(__TERMUX__)) && !defined(VK_USE_PLATFORM_ANDROID_KHR)
33+
# #error "VK_USE_PLATFORM_ANDROID_KHR not defined for Android build!"
34+
# #endif
35+
36+
# --- a/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/layer_settings_manager.cpp
37+
# +++ b/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/layer_settings_manager.cpp
38+
# @@ -32,7 +32,7 @@
39+
# #include <array>
40+
# #include <algorithm>
41+
42+
# -#if defined(__ANDROID__)
43+
# +#if defined(__ANDROID__) && !defined(__TERMUX__)
44+
# static std::string GetAndroidProperty(const char *name) {
45+
# std::string output;
46+
# const prop_info *pi = __system_property_find(name);
47+
# @@ -51,7 +51,7 @@
48+
# #endif
49+
50+
# static std::string GetEnvironment(const char *variable) {
51+
# -#if defined(__ANDROID__)
52+
# +#if defined(__ANDROID__) && !defined(__TERMUX__)
53+
# std::string result = GetAndroidProperty(variable);
54+
# // Workaround for screenshot layer backward compatibility
55+
# if (result.empty() && std::string(variable) == "debug.vulkan.screenshot.frames") {
56+
# @@ -199,7 +199,7 @@
57+
# }
58+
# #endif
59+
60+
# -#ifdef __ANDROID__
61+
# +#if defined(__ANDROID__) && !defined(__TERMUX__)
62+
# std::string env_path = GetEnvironment("debug.vulkan.khronos_profiles.settings_path");
63+
# #else
64+
# // Look for an environment variable override for the settings file location

tur-chromium/chromium-stable/8002-display_color_management-include-string.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

tur-chromium/chromium-stable/8005-preview_cancel_reason-include-string.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

tur-chromium/chromium-stable/build.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.chromium.org/Home
22
TERMUX_PKG_DESCRIPTION="Chromium web browser"
33
TERMUX_PKG_LICENSE="BSD 3-Clause"
44
TERMUX_PKG_MAINTAINER="Chongyun Lee <[email protected]>"
5-
TERMUX_PKG_VERSION=126.0.6478.182
5+
TERMUX_PKG_VERSION=127.0.6533.119
66
TERMUX_PKG_SRCURL=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$TERMUX_PKG_VERSION.tar.xz
7-
TERMUX_PKG_SHA256=3939f5b3116ebd3cb15ff8c7059888f6b00f4cfa8a77bde983ee4ce5d0eea427
7+
TERMUX_PKG_SHA256=acc9e3f9fd2d180b8831865a1ac4f5cdd9ffe6211f47f467296d9ee1be2a577e
88
TERMUX_PKG_DEPENDS="atk, cups, dbus, fontconfig, gtk3, krb5, libc++, libdrm, libevdev, libxkbcommon, libminizip, libnss, libwayland, libx11, mesa, openssl, pango, pulseaudio, zlib"
99
TERMUX_PKG_SUGGESTS="qt5-qtbase"
1010
TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase, qt5-qtbase-cross-tools"
@@ -229,7 +229,6 @@ exclude_unwind_tables = false
229229
s|@HOST_AR@|$(command -v llvm-ar)|g
230230
s|@HOST_NM@|$(command -v llvm-nm)|g
231231
s|@HOST_IS_CLANG@|true|g
232-
s|@HOST_USE_GOLD@|false|g
233232
s|@HOST_SYSROOT@|$_amd64_sysroot_path|g
234233
" $TERMUX_PKG_CACHEDIR/custom-toolchain/BUILD.gn
235234
sed -i "s|@V8_CC@|$_host_cc|g
@@ -241,7 +240,6 @@ exclude_unwind_tables = false
241240
s|@V8_CURRENT_CPU@|$_v8_current_cpu|g
242241
s|@V8_V8_CURRENT_CPU@|$_target_cpu|g
243242
s|@V8_IS_CLANG@|true|g
244-
s|@V8_USE_GOLD@|false|g
245243
s|@V8_SYSROOT@|$_v8_sysroot_path|g
246244
" $TERMUX_PKG_CACHEDIR/custom-toolchain/BUILD.gn
247245

@@ -253,7 +251,7 @@ exclude_unwind_tables = false
253251

254252
termux_step_make() {
255253
cd $TERMUX_PKG_BUILDDIR
256-
ninja -C out/Release chromedriver chrome chrome_crashpad_handler headless_shell
254+
ninja -C out/Release chromedriver chrome chrome_crashpad_handler headless_shell -k 0
257255
rm -rf "$TERMUX_PKG_CACHEDIR/sysroot-$TERMUX_ARCH"
258256
}
259257

tur-chromium/chromium-stable/toolchain.gn.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ gcc_toolchain("host") {
1111
current_os = "linux"
1212
current_cpu = "x64"
1313
is_clang = @HOST_IS_CLANG@
14-
use_gold = @HOST_USE_GOLD@
1514
sysroot = "@HOST_SYSROOT@"
1615
}
1716
}
@@ -26,7 +25,6 @@ gcc_toolchain("@V8_TOOLCHAIN_NAME@") {
2625
current_cpu = "@V8_CURRENT_CPU@"
2726
v8_current_cpu = "@V8_V8_CURRENT_CPU@"
2827
is_clang = @V8_IS_CLANG@
29-
use_gold = @V8_USE_GOLD@
3028
sysroot = "@V8_SYSROOT@"
3129
}
3230
}

0 commit comments

Comments
 (0)