Merge commit 'a1819faebac5475b516c4e936eb11b41fe73b19f' into cobalt

b/211367690
youtube · Sep 6, 2023 · c363429 · c363429
2 parents 605e0c3 + a1819fa
commit c363429
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/third_party/libjpeg-turbo/BUILD.gn b/third_party/libjpeg-turbo/BUILD.gn
@@ -33,7 +33,7 @@ if (nasm_exists && (current_cpu == "x86" || current_cpu == "x64")) {
   if (is_starboard) {
     import("//starboard/build/nasm_assemble.gni")
   } else {
-    import("//third_party/nasm/nasm_assemble.gni")
+  import("//third_party/nasm/nasm_assemble.gni")
   }
 
   nasm_assemble("simd_asm") {
@@ -157,7 +157,7 @@ static_library("simd") {
   include_dirs = [ "." ]
   deps = [ ":libjpeg_headers" ]
   if (!is_starboard) {
-    defines = [ "MANGLE_JPEG_NAMES" ]
+  defines = [ "MANGLE_JPEG_NAMES" ]
   } else {
     defines = []
   }
@@ -201,7 +201,7 @@ static_library("simd") {
     defines += [ "NEON_INTRINSICS" ]
 
     if (!is_starboard) {
-      configs -= [ "//build/config/compiler:default_optimization" ]
+    configs -= [ "//build/config/compiler:default_optimization" ]
     }
     configs += [ "//build/config/compiler:optimize_speed" ]
 
@@ -220,7 +220,7 @@ static_library("simd") {
 config("libjpeg_config") {
   include_dirs = [ "." ]
   if (!is_starboard) {
-    defines = [ "MANGLE_JPEG_NAMES" ]
+  defines = [ "MANGLE_JPEG_NAMES" ]
   }
 }
 

diff --git a/third_party/libjpeg-turbo/METADATA b/third_party/libjpeg-turbo/METADATA
@@ -8,8 +8,8 @@ third_party {
     type: GIT
     value: "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo/"
   }
-  # Version 2.1.0
-  version: "b201838d8b5f2f80c9f86ec8405a62a002232b2c"
+  version: "ed683925e4897a84b3bffc5c1414c85b97a129a3"
+  # from https://chromium.googlesource.com/chromium/src/+/108.0.5359.240/DEPS#1507
   last_upgrade_date {
     year: 2021
     month: 7

diff --git a/third_party/libjpeg-turbo/codereview.settings b/third_party/libjpeg-turbo/codereview.settings
@@ -0,0 +1,7 @@
+# This file is used by git-cl to get repository specific information.
+CC_LIST: [email protected]
+CODE_REVIEW_SERVER: codereview.chromium.org
+GERRIT_HOST: True
+PROJECT: libjpeg_turbo
+STATUS: http://chromium-status.appspot.com/status
+VIEW_VC: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo/+/
diff --git a/third_party/libjpeg-turbo/turbojpeg.c b/third_party/libjpeg-turbo/turbojpeg.c
@@ -32,11 +32,10 @@
 
 #include <ctype.h>
 #include <jinclude.h>
-
-#include <setjmp.h>
 #define JPEG_INTERNALS
 #include <jpeglib.h>
 #include <jerror.h>
+#include <setjmp.h>
 #include <errno.h>
 #include "./turbojpeg.h"
 #include "./tjutil.h"