From 2aa40aa08727c376156d38383ab336c92c7e6c49 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Tue, 7 Feb 2012 04:14:58 +0000 Subject: [PATCH] Roll Chromium 114939->120526. Dependencies: gyp 1107->1187 libjpeg_turbo 95800->119959 jsoncpp 246->248 libyuv 121->164 Updates clang to version 3.1 (trunk 149419). BUG= TEST=build on Linux, Mac, Win. video_processing_unittest, libyuv_unittests, (jpeg_test doesn't work before this change), vie_auto_test. Review URL: https://webrtc-codereview.appspot.com/386002 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1618 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 086828d0c4..bd8a2b891f 100644 --- a/DEPS +++ b/DEPS @@ -3,7 +3,9 @@ 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": "114939", + "chromium_revision": "120526", + # TODO(andrew): libjingle should be rolled to 114 (or later) after fixing: + # http://code.google.com/p/webrtc/issues/detail?id=264 "libjingle_revision": "101", # External resources like video and audio files used for testing purposes. @@ -26,7 +28,7 @@ deps = { (Var("googlecode_url") % "googlemock") + "/trunk@386", "trunk/tools/gyp": - (Var("googlecode_url") % "gyp") + "/trunk@1107", + (Var("googlecode_url") % "gyp") + "/trunk@1187", # Needed by build/common.gypi. "trunk/tools/win/supalink": @@ -48,7 +50,7 @@ deps = { "http://git.chromium.org/webm/libvpx.git@e479379a", "trunk/third_party/libjpeg_turbo/": - Var("chromium_trunk") + "/deps/third_party/libjpeg_turbo@95800", + Var("chromium_trunk") + "/deps/third_party/libjpeg_turbo@119959", "trunk/third_party/libjpeg/": Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_revision"), @@ -79,10 +81,10 @@ deps = { Var("chromium_trunk") + "/deps/third_party/yasm/binaries@74228", "trunk/third_party/jsoncpp/": - "http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp@246", + "http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp@248", "trunk/third_party/libyuv": - (Var("googlecode_url") % "libyuv") + "/trunk@121", + (Var("googlecode_url") % "libyuv") + "/trunk@164", # Used by tools/quality_tracking/dashboard and tools/python_charts "trunk/third_party/google-visualization-python":