 Chromium Code Reviews
 Chromium Code Reviews Issue 191553002:
  Switch FFmpeg from svn/git-svn translation to using git directly.  (Closed) 
  Base URL: svn://svn.chromium.org/chrome/trunk/src
    
  
    Issue 191553002:
  Switch FFmpeg from svn/git-svn translation to using git directly.  (Closed) 
  Base URL: svn://svn.chromium.org/chrome/trunk/src| OLD | NEW | 
|---|---|
| 1 # This file is automatically processed to create .DEPS.git which is the file | 1 # This file is automatically processed to create .DEPS.git which is the file | 
| 2 # that gclient uses under git. | 2 # that gclient uses under git. | 
| 3 # | 3 # | 
| 4 # See http://code.google.com/p/chromium/wiki/UsingGit | 4 # See http://code.google.com/p/chromium/wiki/UsingGit | 
| 5 # | 5 # | 
| 6 # To test manually, run: | 6 # To test manually, run: | 
| 7 # python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir> | 7 # python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir> | 
| 8 # where <gcliendir> is the absolute path to the directory containing the | 8 # where <gcliendir> is the absolute path to the directory containing the | 
| 9 # .gclient file (the parent of "src"). | 9 # .gclient file (the parent of "src"). | 
| 10 # | 10 # | 
| (...skipping 24 matching lines...) Expand all Loading... | |
| 35 "swig_revision": "230490", | 35 "swig_revision": "230490", | 
| 36 "nacl_revision": "13167", | 36 "nacl_revision": "13167", | 
| 37 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS | 37 # After changing nacl_revision, run 'glient sync' and check native_client/DEPS | 
| 38 # to update other nacl_*_revision's. | 38 # to update other nacl_*_revision's. | 
| 39 "nacl_tools_revision": "13077", # native_client/DEPS: tools_rev | 39 "nacl_tools_revision": "13077", # native_client/DEPS: tools_rev | 
| 40 "google_toolbox_for_mac_revision": "662", | 40 "google_toolbox_for_mac_revision": "662", | 
| 41 "libaddressinput_revision": "176", | 41 "libaddressinput_revision": "176", | 
| 42 "libphonenumber_revision": "621", | 42 "libphonenumber_revision": "621", | 
| 43 "libvpx_revision": "269083", | 43 "libvpx_revision": "269083", | 
| 44 "lss_revision": "26", | 44 "lss_revision": "26", | 
| 45 | |
| 46 # These two FFmpeg variables must be updated together. One is used for SVN | |
| 47 # checkouts and the other for Git checkouts. | |
| 48 "ffmpeg_revision": "270146", | |
| 49 "ffmpeg_hash": "d3a060bd1d6a4f43e9bc7d07f193b0513df4f244", | |
| 50 | |
| 51 "sfntly_revision": "228", | 45 "sfntly_revision": "228", | 
| 52 "lighttpd_revision": "33737", | 46 "lighttpd_revision": "33737", | 
| 53 "skia_revision": "14744", | 47 "skia_revision": "14744", | 
| 54 "skia_hash": "24f6e29fc133f1082c73e2a96f30bee92e3123aa", | 48 "skia_hash": "24f6e29fc133f1082c73e2a96f30bee92e3123aa", | 
| 55 # Three lines of non-changing comments so that | 49 # Three lines of non-changing comments so that | 
| 56 # the commit queue can handle CLs rolling Skia | 50 # the commit queue can handle CLs rolling Skia | 
| 57 # and V8 without interference from each other. | 51 # and V8 without interference from each other. | 
| 58 "v8_branch": "trunk", | 52 "v8_branch": "trunk", | 
| 59 "v8_revision": "21152", | 53 "v8_revision": "21152", | 
| 60 # Three lines of non-changing comments so that | 54 # Three lines of non-changing comments so that | 
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 211 | 205 | 
| 212 # Make sure you update the two functional.DEPS and webdriver.DEPS too. | 206 # Make sure you update the two functional.DEPS and webdriver.DEPS too. | 
| 213 "src/third_party/webdriver/pylib": | 207 "src/third_party/webdriver/pylib": | 
| 214 (Var("googlecode_url") % "selenium") + "/trunk/py@18337", | 208 (Var("googlecode_url") % "selenium") + "/trunk/py@18337", | 
| 215 | 209 | 
| 216 "src/third_party/libvpx": | 210 "src/third_party/libvpx": | 
| 217 "/trunk/deps/third_party/libvpx@" + | 211 "/trunk/deps/third_party/libvpx@" + | 
| 218 Var("libvpx_revision"), | 212 Var("libvpx_revision"), | 
| 219 | 213 | 
| 220 "src/third_party/ffmpeg": | 214 "src/third_party/ffmpeg": | 
| 221 "/trunk/deps/third_party/ffmpeg@" + | 215 Var("chromium_git") + | 
| 222 Var("ffmpeg_revision"), | 216 "/chromium/third_party/ffmpeg.git@d3a060bd1d6a4f43e9bc7d07f193b0513df4f244", | 
| 
borenet
2014/05/15 20:14:58
You might consider leaving the "ffmpeg_revision" v
 | |
| 223 | 217 | 
| 224 "src/third_party/libjingle/source/talk": | 218 "src/third_party/libjingle/source/talk": | 
| 225 (Var("googlecode_url") % "webrtc") + "/trunk/talk@" + | 219 (Var("googlecode_url") % "webrtc") + "/trunk/talk@" + | 
| 226 Var("webrtc_revision"), | 220 Var("webrtc_revision"), | 
| 227 | 221 | 
| 228 "src/third_party/usrsctp/usrsctplib": | 222 "src/third_party/usrsctp/usrsctplib": | 
| 229 (Var("googlecode_url") % "sctp-refimpl") + | 223 (Var("googlecode_url") % "sctp-refimpl") + | 
| 230 "/trunk/KERN/usrsctp/usrsctplib@8838", | 224 "/trunk/KERN/usrsctp/usrsctplib@8838", | 
| 231 | 225 | 
| 232 "src/third_party/libsrtp": | 226 "src/third_party/libsrtp": | 
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 282 (Var("googlecode_url") % "libphonenumber") + | 276 (Var("googlecode_url") % "libphonenumber") + | 
| 283 "/trunk/cpp/src/phonenumbers@" + Var("libphonenumber_revision"), | 277 "/trunk/cpp/src/phonenumbers@" + Var("libphonenumber_revision"), | 
| 284 "src/third_party/libphonenumber/src/test": | 278 "src/third_party/libphonenumber/src/test": | 
| 285 (Var("googlecode_url") % "libphonenumber") + "/trunk/cpp/test@" + | 279 (Var("googlecode_url") % "libphonenumber") + "/trunk/cpp/test@" + | 
| 286 Var("libphonenumber_revision"), | 280 Var("libphonenumber_revision"), | 
| 287 "src/third_party/libphonenumber/src/resources": | 281 "src/third_party/libphonenumber/src/resources": | 
| 288 (Var("googlecode_url") % "libphonenumber") + "/trunk/resources@" + | 282 (Var("googlecode_url") % "libphonenumber") + "/trunk/resources@" + | 
| 289 Var("libphonenumber_revision"), | 283 Var("libphonenumber_revision"), | 
| 290 | 284 | 
| 291 "src/tools/deps2git": | 285 "src/tools/deps2git": | 
| 292 "/trunk/tools/deps2git@262731", | 286 "/trunk/tools/deps2git@270777", | 
| 293 | 287 | 
| 294 "src/third_party/clang_format/script": | 288 "src/third_party/clang_format/script": | 
| 295 Var("llvm_url") + "/cfe/trunk/tools/clang-format@206068", | 289 Var("llvm_url") + "/cfe/trunk/tools/clang-format@206068", | 
| 296 | 290 | 
| 297 "src/third_party/webpagereplay": | 291 "src/third_party/webpagereplay": | 
| 298 (Var("googlecode_url") % "web-page-replay") + "/trunk@544", | 292 (Var("googlecode_url") % "web-page-replay") + "/trunk@544", | 
| 299 | 293 | 
| 300 "src/third_party/pywebsocket/src": | 294 "src/third_party/pywebsocket/src": | 
| 301 (Var("googlecode_url") % "pywebsocket") + "/trunk/src@790", | 295 (Var("googlecode_url") % "pywebsocket") + "/trunk/src@790", | 
| 302 | 296 | 
| (...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 768 "-s", "src/build/linux/bin/eu-strip.sha1", | 762 "-s", "src/build/linux/bin/eu-strip.sha1", | 
| 769 ], | 763 ], | 
| 770 }, | 764 }, | 
| 771 { | 765 { | 
| 772 # A change to a .gyp, .gypi, or to GYP itself should run the generator. | 766 # A change to a .gyp, .gypi, or to GYP itself should run the generator. | 
| 773 "name": "gyp", | 767 "name": "gyp", | 
| 774 "pattern": ".", | 768 "pattern": ".", | 
| 775 "action": ["python", "src/build/gyp_chromium"], | 769 "action": ["python", "src/build/gyp_chromium"], | 
| 776 }, | 770 }, | 
| 777 ] | 771 ] | 
| OLD | NEW |