From 0f00506af7721ac6247a85d5bbc0673b1e97c542 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Tue, 22 Jan 2013 00:53:46 +0000 Subject: [PATCH] DEPS rolls chromium dependencies to r177738 which is LKGR. BUG=178 TEST=ninja builds still work on x32 bit. Review URL: https://webrtc-codereview.appspot.com/1066004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@547 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- DEPS | 9 ++++----- README.chromium | 2 +- include/libyuv/version.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/DEPS b/DEPS index 9e29b7f39..234b6db45 100644 --- a/DEPS +++ b/DEPS @@ -12,7 +12,7 @@ vars = { # If you do not know, use the full path while defining your new deps entry. "googlecode_url": "http://%s.googlecode.com/svn", "chromium_trunk" : "http://src.chromium.org/svn/trunk", - "chromium_revision": "176094", + "chromium_revision": "177738", } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than @@ -54,12 +54,11 @@ deps = { From("chromium_deps", "src/third_party/libjpeg_turbo"), # Yasm assember required for libjpeg_turbo - # TODO(fbarchard): Switch back to chromium version. "third_party/yasm": - Var("chromium_trunk") + "/src/third_party/yasm@154708", + Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"), "third_party/yasm/source/patched-yasm": - Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@154708", + Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@" + Var("chromium_revision"), } deps_os = { @@ -71,7 +70,7 @@ deps_os = { # Used by libjpeg-turbo. # TODO(fbarchard): Remove binaries and run yasm from build folder. "third_party/yasm/binaries": - Var("chromium_trunk") + "/deps/third_party/yasm/binaries@154708", + Var("chromium_trunk") + "/deps/third_party/yasm/binaries@" + Var("chromium_revision"), "third_party/yasm": None, }, "unix": { diff --git a/README.chromium b/README.chromium index 260b4f79f..067d36abc 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 545 +Version: 547 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 393f4ddeb..7c22a4b6f 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 545 +#define LIBYUV_VERSION 547 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT