Commit 0f00506a authored by fbarchard@google.com's avatar fbarchard@google.com

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
parent 8c189322
...@@ -12,7 +12,7 @@ vars = { ...@@ -12,7 +12,7 @@ vars = {
# If you do not know, use the full path while defining your new deps entry. # If you do not know, use the full path while defining your new deps entry.
"googlecode_url": "http://%s.googlecode.com/svn", "googlecode_url": "http://%s.googlecode.com/svn",
"chromium_trunk" : "http://src.chromium.org/svn/trunk", "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 # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
...@@ -54,12 +54,11 @@ deps = { ...@@ -54,12 +54,11 @@ deps = {
From("chromium_deps", "src/third_party/libjpeg_turbo"), From("chromium_deps", "src/third_party/libjpeg_turbo"),
# Yasm assember required for libjpeg_turbo # Yasm assember required for libjpeg_turbo
# TODO(fbarchard): Switch back to chromium version.
"third_party/yasm": "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": "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 = { deps_os = {
...@@ -71,7 +70,7 @@ deps_os = { ...@@ -71,7 +70,7 @@ deps_os = {
# Used by libjpeg-turbo. # Used by libjpeg-turbo.
# TODO(fbarchard): Remove binaries and run yasm from build folder. # TODO(fbarchard): Remove binaries and run yasm from build folder.
"third_party/yasm/binaries": "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, "third_party/yasm": None,
}, },
"unix": { "unix": {
......
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 545 Version: 547
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 545 #define LIBYUV_VERSION 547
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment