diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | third_party/yasm/README.chromium | 4 | ||||
| -rw-r--r-- | third_party/yasm/yasm.gyp | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -266,7 +266,7 @@ deps = { "/trunk/deps/third_party/speex@111570", "src/third_party/yasm/source/patched-yasm": - "/trunk/deps/third_party/yasm/patched-yasm@73761", + "/trunk/deps/third_party/yasm/patched-yasm@124103", "src/third_party/libjpeg_turbo": "/trunk/deps/third_party/libjpeg_turbo@119959", diff --git a/third_party/yasm/README.chromium b/third_party/yasm/README.chromium index ca73b58..64ba7ac 100644 --- a/third_party/yasm/README.chromium +++ b/third_party/yasm/README.chromium @@ -1,7 +1,11 @@ Name: yasm URL: http://www.tortall.net/projects/yasm/ Version: 1.1.0 +With these patches merged: +* https://github.com/yasm/yasm/commit/a2cbb10ee1b90b73647667ac849c74d65761d412 + License File: source/patched-yasm/COPYING +Security Critical: no See also the yasm.gyp file for a description of the yasm build process. diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp index 0fe28db..d981b50 100644 --- a/third_party/yasm/yasm.gyp +++ b/third_party/yasm/yasm.gyp @@ -27,7 +27,7 @@ # be a rule. The problem is that the correct invocation cannot be inferred # purely from the file name, or extension. Nor is it obvious whether the # output should be processed as a source or not. Thus, we are left with a -# large amount of repetative code. +# large amount of repetitive code. { 'variables': { |