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

Side by Side Diff: DEPS

Issue 300013: Add yasm and ffmpeg into the build tree for linux. (Closed)
Patch Set: Fix mark's comments. 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/all.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 vars = { 1 vars = {
2 "webkit_trunk": 2 "webkit_trunk":
3 "http://svn.webkit.org/repository/webkit/trunk", 3 "http://svn.webkit.org/repository/webkit/trunk",
4 "webkit_revision": "50258", 4 "webkit_revision": "50258",
5 "ffmpeg_revision": "30374", 5 "ffmpeg_revision": "30374",
6 } 6 }
7 7
8 deps = { 8 deps = {
9 "src/breakpad/src": 9 "src/breakpad/src":
10 "http://google-breakpad.googlecode.com/svn/trunk/src@417", 10 "http://google-breakpad.googlecode.com/svn/trunk/src@417",
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 "/trunk/deps/third_party/ffmpeg/binaries/mac@" + Var("ffmpeg_revision"), 134 "/trunk/deps/third_party/ffmpeg/binaries/mac@" + Var("ffmpeg_revision"),
135 "src/third_party/ffmpeg/binaries/chromium/mac/ia32_dbg": 135 "src/third_party/ffmpeg/binaries/chromium/mac/ia32_dbg":
136 "/trunk/deps/third_party/ffmpeg/binaries/mac_dbg@" + 136 "/trunk/deps/third_party/ffmpeg/binaries/mac_dbg@" +
137 Var("ffmpeg_revision"), 137 Var("ffmpeg_revision"),
138 }, 138 },
139 "unix": { 139 "unix": {
140 # Linux, really. 140 # Linux, really.
141 "src/third_party/xdg-utils": 141 "src/third_party/xdg-utils":
142 "/trunk/deps/third_party/xdg-utils@29103", 142 "/trunk/deps/third_party/xdg-utils@29103",
143 143
144 "src/third_party/yasm/source/patched-yasm":
145 "/trunk/deps/third_party/yasm/patched-yasm@29937",
146
147 "src/third_party/ffmpeg/source/patched-ffmpeg-mt":
148 "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" +
149 Var("ffmpeg_revision"),
150
144 "src/third_party/ffmpeg/binaries/chromium/linux/ia32": 151 "src/third_party/ffmpeg/binaries/chromium/linux/ia32":
145 "/trunk/deps/third_party/ffmpeg/binaries/linux@" + 152 "/trunk/deps/third_party/ffmpeg/binaries/linux@" +
146 Var("ffmpeg_revision"), 153 Var("ffmpeg_revision"),
147 "src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg": 154 "src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg":
148 "/trunk/deps/third_party/ffmpeg/binaries/linux_dbg@" + 155 "/trunk/deps/third_party/ffmpeg/binaries/linux_dbg@" +
149 Var("ffmpeg_revision"), 156 Var("ffmpeg_revision"),
150 157
151 "src/third_party/ffmpeg/binaries/chromium/linux/x64": 158 "src/third_party/ffmpeg/binaries/chromium/linux/x64":
152 "/trunk/deps/third_party/ffmpeg/binaries/linux_64@" + 159 "/trunk/deps/third_party/ffmpeg/binaries/linux_64@" +
153 Var("ffmpeg_revision"), 160 Var("ffmpeg_revision"),
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 "$matching_files"], 211 "$matching_files"],
205 }, 212 },
206 { 213 {
207 # Workaround XCode dependecies problem. 214 # Workaround XCode dependecies problem.
208 # TODO(bradnelson): remove this when fixed. 215 # TODO(bradnelson): remove this when fixed.
209 "pattern": ".", 216 "pattern": ".",
210 "action": ["python", 217 "action": ["python",
211 "src/build/mac/clobber_generated_headers.py"], 218 "src/build/mac/clobber_generated_headers.py"],
212 }, 219 },
213 ] 220 ]
OLDNEW
« 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