From 0e5d892fe86d7c2527d8f7b7ac2c5aa8fc77a7be Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 6 Apr 2017 21:43:50 -0700 Subject: Use libjpeg-turbo instead of our own copy of libjpeg. Check out libjpeg-turbo via DEPS. Also checkout yasm via DEPS and copy some yasm build files from Chromium. BUG=chromium:541704,pdfium:389 Change-Id: Ic7af415f002a3ca2acd9223ed3474dedf3930b32 Reviewed-on: https://pdfium-review.googlesource.com/3470 Commit-Queue: Lei Zhang Reviewed-by: dsinclair --- DEPS | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'DEPS') diff --git a/DEPS b/DEPS index c9f087ecbc..487f14aa72 100644 --- a/DEPS +++ b/DEPS @@ -17,12 +17,15 @@ vars = { 'icu_revision': '73e24736676b4b438270fda44e5b2c83b49fdd80', 'instrumented_lib_revision': '45f5814b1543e41ea0be54c771e3840ea52cca4a', 'jinja2_revision': 'd34383206fa42d52faa10bb9931d6d538f3a57e0', + 'jpeg_turbo_revision': '7260e4d8b8e1e40b17f03fafdf1cd83296900f76', 'markupsafe_revision': '8f45f5cfa0009d2a70589bcda0349b8cb2b72783', 'pdfium_tests_revision': 'bf5149ba7be4c0ffa9efe340f77e2e12e8b1cac2', 'skia_revision': '90e3cd78991ef337dbd0023efb30ece864694308', 'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d', 'trace_event_revision': '06294c8a4a6f744ef284cd63cfe54dbf61eea290', 'v8_revision': '07b2253a044bffa43697c6a43aaccb68c7e82af4', + 'yasm_binary_revision': '52f9b3f4b0aa06da24ef8b123058bb61ee468881', + 'yasm_source_revision': '7da28c6c7c6a1387217352ce02b31754deb54d2a', 'zlib_revision': 'eed2732a73838fd581cb25819ab1c4f478d6b38f', } @@ -67,6 +70,10 @@ deps = { Var('chromium_git') + "/chromium/src/third_party/markupsafe.git@" + Var('markupsafe_revision'), + "third_party/libjpeg_turbo": + Var('chromium_git') + "/chromium/deps/libjpeg_turbo.git@" + + Var('jpeg_turbo_revision'), + "third_party/skia": Var('chromium_git') + '/skia.git@' + Var('skia_revision'), @@ -74,6 +81,10 @@ deps = { Var('chromium_git') + "/chromium/src/third_party/zlib.git@" + Var('zlib_revision'), + 'third_party/yasm/source/patched-yasm': + Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git@' + + Var('yasm_source_revision'), + "tools/clang": Var('chromium_git') + "/chromium/src/tools/clang@" + Var('clang_revision'), @@ -99,6 +110,10 @@ deps_os = { Var('catapult_revision'), }, "win": { + 'third_party/yasm/binaries': + Var('chromium_git') + '/chromium/deps/yasm/binaries.git' + '@' + + Var('yasm_binary_revision'), + # TODO(GYP): Remove this when no tools rely on GYP anymore. "tools/gyp": Var('chromium_git') + '/external/gyp.git@' + -- cgit v1.2.3