diff --git a/DEPS b/DEPS index 42036fd50..2073e8c7c 100644 --- a/DEPS +++ b/DEPS @@ -1,6 +1,6 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'c793ec77b26b49928278bb852a7691d36c8f7544', + 'chromium_revision': '7950721f084767700b62bb6e1c90ea155efae980', 'swarming_revision': '11e31afa5d330756ff87aa12064bb5d032896cb5', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lss @@ -9,22 +9,22 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '3c626eaf72a7b8acde9fe17ec63b0b6d851a1a00', + 'catapult_revision': '353ee60a4567ec80252bb4047e54b2df3151717e', } deps = { 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '8a0a5a27d407a7bfa3c2360d9ea1e9c78838c892', + Var('chromium_git') + '/chromium/src/build' + '@' + 'bf8911f59bebb1cdd075e612c78e985cb14eca29', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'b3771b1935ea74c388b6fb1750e83f5d83b39dec', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '9cacf531de5de75d6078e34ef30e8fbde4b00b3a', + Var('chromium_git') + '/chromium/src/testing' + '@' + 'c2c74bc1d165ccc01ed03e424f72aa313eeb9120', 'src/testing/gtest': Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87', 'src/testing/gmock': Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '0ea751c2fe9da74806d3daa1900b620506ca8acc', + Var('chromium_git') + '/chromium/src/third_party' + '@' + '4c0908d22e7c4cd423da28f69c64c6fd293b0e99', 'src/third_party/catapult': Var('chromium_git') + '/external/github.com/catapult-project/catapult.git' + '@' + Var('catapult_revision'), 'src/third_party/colorama/src': @@ -34,7 +34,7 @@ deps = { 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '7da28c6c7c6a1387217352ce02b31754deb54d2a', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + '41a0ccf0e106c1000624a29a95d75df4f307bec8', + Var('chromium_git') + '/chromium/src/tools' + '@' + '14318cc69b7116d7b4aa23ee58cdf3d7c71d4038', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'e7079f0e0e14108ab0dba58728ff219637458563', 'src/tools/swarming_client': @@ -52,7 +52,7 @@ deps = { deps_os = { 'android': { 'src/base': - Var('chromium_git') + '/chromium/src/base' + '@' + '8fe126945cb9fe557d679362b4e228324efa8a2b', + Var('chromium_git') + '/chromium/src/base' + '@' + 'd75864a2c554db298f34b188c07a11133c8bd88b', 'src/third_party/android_tools': Var('chromium_git') + '/android_tools.git' + '@' + 'b43a6a289a7588b1769814f04dd6c7d7176974cc', 'src/third_party/ced/src': @@ -74,7 +74,7 @@ deps_os = { }, 'ios': { 'src/ios': - Var('chromium_git') + '/chromium/src/ios' + '@' + '2c58c1ed6bf9210470f6ce9b485793a33903a878', + Var('chromium_git') + '/chromium/src/ios' + '@' + '8b8111f841dfdc04bb5591dfd1315120f95709a4', }, 'unix': { 'src/third_party/lss': diff --git a/README.chromium b/README.chromium index a3c27bf88..4462ba0e7 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1647 +Version: 1648 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 58e53ac60..42a1a3fcf 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1647 +#define LIBYUV_VERSION 1648 #endif // INCLUDE_LIBYUV_VERSION_H_