From b822dc85a0320bcf8a1030b46539c5ddca77245e Mon Sep 17 00:00:00 2001
From: Vektor <whiteman.chr@hotmail.com>
Date: Tue, 5 Nov 2024 19:18:45 +0100
Subject: [PATCH] update to cef v130

---
 build/automate-git.py | 38 +++++++++++++++++++++++++++++---------
 build/build.ps1       |  2 +-
 chromium_git/cef      |  2 +-
 depot_tools           |  2 +-
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/build/automate-git.py b/build/automate-git.py
index 6ec4334..c3d8efa 100644
--- a/build/automate-git.py
+++ b/build/automate-git.py
@@ -44,6 +44,7 @@
 # Helper functions.
 ##
 
+
 def msg(message):
   """ Output a message. """
   sys.stdout.write('--> ' + message + "\n")
@@ -460,6 +461,7 @@ def check_pattern_matches(output_file=None):
       # Don't continue when we know the build will be wrong.
       sys.exit(1)
 
+
 def invalid_options_combination(a, b):
   print("Invalid combination of options: '%s' and '%s'" % (a, b))
   parser.print_help(sys.stderr)
@@ -766,6 +768,18 @@ def invalid_options_combination(a, b):
     dest='sandboxdistribonly',
     default=False,
     help='Create a cef_sandbox static library distribution only.')
+parser.add_option(
+    '--tools-distrib',
+    action='store_true',
+    dest='toolsdistrib',
+    default=False,
+    help='Create a tools distribution.')
+parser.add_option(
+    '--tools-distrib-only',
+    action='store_true',
+    dest='toolsdistribonly',
+    default=False,
+    help='Create a tools distribution only.')
 parser.add_option(
     '--no-distrib-docs',
     action='store_true',
@@ -813,22 +827,22 @@ def invalid_options_combination(a, b):
   options.buildtests = True
 
 if (options.nochromiumupdate and options.forceupdate):
-    invalid_options_combination('--no-chromium-update', '--force-update')
+  invalid_options_combination('--no-chromium-update', '--force-update')
 if (options.nocefupdate and options.forceupdate):
-    invalid_options_combination('--no-cef-update', '--force-update')
+  invalid_options_combination('--no-cef-update', '--force-update')
 if (options.nobuild and options.forcebuild):
-    invalid_options_combination('--no-build', '--force-build')
+  invalid_options_combination('--no-build', '--force-build')
 if (options.nodistrib and options.forcedistrib):
-    invalid_options_combination('--no-distrib', '--force-distrib')
+  invalid_options_combination('--no-distrib', '--force-distrib')
 if (options.forceclean and options.fastupdate):
-    invalid_options_combination('--force-clean', '--fast-update')
+  invalid_options_combination('--force-clean', '--fast-update')
 if (options.forcecleandeps and options.fastupdate):
-    invalid_options_combination('--force-clean-deps', '--fast-update')
+  invalid_options_combination('--force-clean-deps', '--fast-update')
 
 if (options.noreleasebuild and \
      (options.minimaldistrib or options.minimaldistribonly or \
       options.clientdistrib or options.clientdistribonly)) or \
-   (options.minimaldistribonly + options.clientdistribonly + options.sandboxdistribonly > 1):
+   (options.minimaldistribonly + options.clientdistribonly + options.sandboxdistribonly + options.toolsdistribonly > 1):
   print('Invalid combination of options.')
   parser.print_help(sys.stderr)
   sys.exit(1)
@@ -1334,8 +1348,8 @@ def invalid_options_combination(a, b):
   tool = os.path.join(cef_src_dir, 'tools', 'gclient_hook.py')
   run('%s %s' % (python_exe, tool), cef_src_dir, depot_tools_dir)
 
-  # Build using Ninja.
-  command = 'ninja '
+  # Build using autoninja for automatic `-j (#cores)` configuration.
+  command = 'autoninja '
   if options.verbosebuild:
     command += '-v '
   if options.buildfailurelimit != 1:
@@ -1449,6 +1463,8 @@ def invalid_options_combination(a, b):
     distrib_types.append('client')
   elif options.sandboxdistribonly:
     distrib_types.append('sandbox')
+  elif options.toolsdistribonly:
+    distrib_types.append('tools')
   else:
     distrib_types.append('standard')
     if options.minimaldistrib:
@@ -1457,6 +1473,8 @@ def invalid_options_combination(a, b):
       distrib_types.append('client')
     if options.sandboxdistrib:
       distrib_types.append('sandbox')
+    if options.toolsdistrib:
+      distrib_types.append('tools')
 
   cef_tools_dir = os.path.join(cef_src_dir, 'tools')
 
@@ -1481,6 +1499,8 @@ def invalid_options_combination(a, b):
       path += ' --client'
     elif type == 'sandbox':
       path += ' --sandbox'
+    elif type == 'tools':
+      path += ' --tools'
 
     if first_type:
       if options.nodistribdocs:
diff --git a/build/build.ps1 b/build/build.ps1
index c51f94e..65fc30f 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -20,7 +20,7 @@ $DEPOT_TOOLS_DIR = "X:\depot_tools"
 # Execute the build using dynamic paths
 & python "X:\build\automate-git.py" `
     --url="https://github.com/citizenfx/cef.git" `
-    --checkout="cfx-m124" `
+    --checkout="cfx-m130" `
     --download-dir="$DOWNLOAD_DIR" `
     --depot-tools-dir="$DEPOT_TOOLS_DIR" `
     --x64-build `
diff --git a/chromium_git/cef b/chromium_git/cef
index 49a2c3e..571e5ef 160000
--- a/chromium_git/cef
+++ b/chromium_git/cef
@@ -1 +1 @@
-Subproject commit 49a2c3e6427f6ee683ce8789b37eec7272c28ba7
+Subproject commit 571e5ef72acb457c29fe59ac2d2b9e197d059804
diff --git a/depot_tools b/depot_tools
index 1f4f982..37c0cf9 160000
--- a/depot_tools
+++ b/depot_tools
@@ -1 +1 @@
-Subproject commit 1f4f982beb6c427808779bc28093a5474832f2c2
+Subproject commit 37c0cf910022b2d75816b0f9f77c53d69a0b2d9f