Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Unified Diff: DEPS

Issue 340072: FFmpeg in-tree build for mac. (Closed)
Patch Set: work around link-settings bug. Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/all.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: DEPS
diff --git a/DEPS b/DEPS
index 54139402be142d9fce55c85fcf8551fe170b4d3a..54b0fdf4cf6d279d34199e1532f9707247b4c470 100644
--- a/DEPS
+++ b/DEPS
@@ -37,7 +37,7 @@ deps = {
"http://pywebsocket.googlecode.com/svn/trunk/src@86",
"src/tools/gyp":
- "http://gyp.googlecode.com/svn/trunk@740",
+ "http://gyp.googlecode.com/svn/trunk@741",
"src/v8":
"http://v8.googlecode.com/svn/trunk@3203",
@@ -130,6 +130,13 @@ deps_os = {
"src/third_party/WebKit/WebKitLibraries":
Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
+ # TODO(ajwong): Move this into the OS-independent block.
+ "src/third_party/yasm/source/patched-yasm":
+ "/trunk/deps/third_party/yasm/patched-yasm@29937",
+ "src/third_party/ffmpeg/source/patched-ffmpeg-mt":
+ "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" +
+ Var("ffmpeg_revision"),
+
"src/third_party/ffmpeg/binaries/chromium/mac/ia32":
"/trunk/deps/third_party/ffmpeg/binaries/mac@" + Var("ffmpeg_revision"),
"src/third_party/ffmpeg/binaries/chromium/mac/ia32_dbg":
@@ -141,9 +148,9 @@ deps_os = {
"src/third_party/xdg-utils":
"/trunk/deps/third_party/xdg-utils@29103",
+ # TODO(ajwong): Move this into the OS-independent block.
"src/third_party/yasm/source/patched-yasm":
"/trunk/deps/third_party/yasm/patched-yasm@29937",
-
"src/third_party/ffmpeg/source/patched-ffmpeg-mt":
"/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" +
Var("ffmpeg_revision"),
« no previous file with comments | « no previous file | build/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698