From 0811c69eb68f47def0b926cd6bca9324e9fbbf23 Mon Sep 17 00:00:00 2001 From: "scottmg@chromium.org" Date: Mon, 3 Sep 2012 18:44:42 +0000 Subject: yasm: merge fixes from upstream and remove warning suppression on win https://github.com/yasm/yasm/pull/64 was merged, so we can remove VS warning suppressions now. TBR=thakis@chromium.org BUG=126483 Review URL: https://chromiumcodereview.appspot.com/10916080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154708 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 2 +- third_party/yasm/README.chromium | 1 + third_party/yasm/yasm.gyp | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index b7e3806..c13cd8d 100644 --- a/DEPS +++ b/DEPS @@ -253,7 +253,7 @@ deps = { "/trunk/deps/third_party/speex@149334", "src/third_party/yasm/source/patched-yasm": - "/trunk/deps/third_party/yasm/patched-yasm@134927", + "/trunk/deps/third_party/yasm/patched-yasm@154697", "src/third_party/libjpeg_turbo": "/trunk/deps/third_party/libjpeg_turbo@149334", diff --git a/third_party/yasm/README.chromium b/third_party/yasm/README.chromium index 9cea9b8..59a5e57 100644 --- a/third_party/yasm/README.chromium +++ b/third_party/yasm/README.chromium @@ -12,6 +12,7 @@ With these patches merged: * https://github.com/yasm/yasm/commit/82fafa7b5619e702c8681c959ade0746498e3cbc * https://github.com/yasm/yasm/commit/2bd66514b6b100887c19d8598da38347b3cff40e * https://github.com/yasm/yasm/commit/ab19547382660d81e0b4a0232dccb38f44c52a36 +* https://github.com/yasm/yasm/commit/9728322335cba96500861ef766b1546d096e5600 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 9093600..d981b50 100644 --- a/third_party/yasm/yasm.gyp +++ b/third_party/yasm/yasm.gyp @@ -71,9 +71,6 @@ 'genstring', 're2c', ], - # Patch to fix posted upstream, but not yet merged. - # https://github.com/yasm/yasm/pull/64 - 'msvs_disabled_warnings': [ 4018, 4090 ], 'sources': [ 'source/patched-yasm/frontends/yasm/yasm-options.c', 'source/patched-yasm/frontends/yasm/yasm.c', -- cgit v1.1