Prepare WebCore.gyp for ffmpeg source transition.

https://bugs.webkit.org/show_bug.cgi?id=77254

We're migrating our ffmpeg repo from a set of patches living on top of
a tarball to an actual git fork of upstream.  The paths have changed
slightly.

In order to not break the current build, we'll keep both paths around
until the transition is complete.  Afterward the 'patched-ffmpeg' path
will be removed.

Patch by Dale Curtis <dalecurtis@chromium.org> on 2012-01-29
Reviewed by Tony Chang.

No new tests. GYP change, if it doesn't work, nothing will compile.

* WebCore.gyp/WebCore.gyp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106209 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ca128ff..32e3794 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2012-01-29  Dale Curtis  <dalecurtis@chromium.org>
+
+        Prepare WebCore.gyp for ffmpeg source transition.
+        https://bugs.webkit.org/show_bug.cgi?id=77254
+
+        We're migrating our ffmpeg repo from a set of patches living on top of
+        a tarball to an actual git fork of upstream.  The paths have changed
+        slightly.
+
+        In order to not break the current build, we'll keep both paths around
+        until the transition is complete.  Afterward the 'patched-ffmpeg' path
+        will be removed.
+
+        Reviewed by Tony Chang.
+
+        No new tests. GYP change, if it doesn't work, nothing will compile.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2012-01-29  Hayato Ito  <hayato@chromium.org>
 
         Add a ShadowRoot constructor as 'WebKitShadowRootConstructor', enabled by SHADOW_DOM flag.

diff --git a/Source/WebCore/WebCore.gyp/WebCore.gyp b/Source/WebCore/WebCore.gyp/WebCore.gyp
index 6884b41..0357207 100644 (file)
--- a/Source/WebCore/WebCore.gyp/WebCore.gyp
+++ b/Source/WebCore/WebCore.gyp/WebCore.gyp
@@ -1378,6 +1378,7 @@
           'direct_dependent_settings': {
             'include_dirs': [
               '<(chromium_src_dir)/third_party/ffmpeg/patched-ffmpeg',
+              '<(chromium_src_dir)/third_party/ffmpeg',
             ],
           },
           'dependencies': [