Final preparations for GStreamer on Windows.

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

Patch by Alex Christensen <achristensen@webkit.org> on 2013-12-19
Reviewed by Benjamin Poulain.

Source/WTF:

* WTF.vcxproj/WTFDebugWinCairo.props:
* WTF.vcxproj/WTFReleaseWinCairo.props:
Include WinCairo.props.
* wtf/Platform.h:
Use GLib and GStreamer on WinCairo with video.

WebKitLibraries:

* win/tools/vsprops/FeatureDefinesCairo.props:
Removed duplicate ENABLE_VIDEO_TRACK definition.

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

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index aeb62f365533583b6a5567c68349ef929a3c58b3..92e1122fa40ccb08e614dc7941e07ccd9481b6df 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,16 @@
+2013-12-19  Alex Christensen  <achristensen@webkit.org>
+
+        Final preparations for GStreamer on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=125958
+
+        Reviewed by Benjamin Poulain.
+
+        * WTF.vcxproj/WTFDebugWinCairo.props:
+        * WTF.vcxproj/WTFReleaseWinCairo.props:
+        Include WinCairo.props.
+        * wtf/Platform.h:
+        Use GLib and GStreamer on WinCairo with video.
+
 2013-12-18  Daniel Bates  <dabates@apple.com>
 
         WTF, JavaScriptCore fails to build with trunk clang: operators new, new[],

diff --git a/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props b/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props
index 41646b1d1793149e3b30c96492e75e90923e784b..98196441ef0731364498aa0ec9514f19825870b7 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props
+++ b/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props
@@ -6,10 +6,11 @@
     <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
     <Import Project="WTFCommon.props" />
     <Import Project="WTFCFLite.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
   </ImportGroup>
   <PropertyGroup />
   <PropertyGroup />
   <ItemDefinitionGroup>
     <Bscmake />
   </ItemDefinitionGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props b/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props
index df784a1595fe1ee62328acd984e6637f39d69893..c5b996fe0d103708782a22f3b6ecfd73ff31e4c3 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props
+++ b/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props
@@ -6,9 +6,10 @@
     <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
     <Import Project="WTFCommon.props" />
     <Import Project="WTFCFLite.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
   </ImportGroup>
   <PropertyGroup />
   <ItemDefinitionGroup>
     <Bscmake />
   </ItemDefinitionGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 548599e98de8e89d7c2a882b4e1b7e7e9644f649..d7e7b4669be08eef42e3843b4b58540885bc6b03 100644 (file)
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -904,6 +904,12 @@
 #define WTF_USE_EGL 1
 #endif
 
+#if ENABLE(VIDEO) && PLATFORM(WIN_CAIRO)
+#define WTF_USE_GLIB 1
+#define WTF_USE_GSTREAMER 1
+#define GST_API_VERSION_1 1
+#endif
+
 #if USE(TEXTURE_MAPPER) && USE(3D_GRAPHICS) && !defined(WTF_USE_TEXTURE_MAPPER_GL)
 #define WTF_USE_TEXTURE_MAPPER_GL 1
 #endif

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 5c7f671b511ee3ef18d089896a89abec84cde116..431a0a13572f73f307d0a76d88247b7381ae0ce1 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,13 @@
+2013-12-19  Alex Christensen  <achristensen@webkit.org>
+
+        Final preparations for GStreamer on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=125958
+
+        Reviewed by Benjamin Poulain.
+
+        * win/tools/vsprops/FeatureDefinesCairo.props:
+        Removed duplicate ENABLE_VIDEO_TRACK definition.
+
 2013-12-18  Alex Christensen  <achristensen@webkit.org>
 
         [WinCairo] Unreviewed build fix after r160798.

diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
index ce63e96beaffc58ed8fe3291cc40f85f6d3c77b2..c4b0c0b38577573061387dd819d4ad9a798a10c2 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
@@ -411,10 +411,6 @@
       <Value>$(ENABLE_VIEW_MODE_CSS_MEDIA)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>    
-    <BuildMacro Include="ENABLE_VIDEO_TRACK">
-      <Value>$(ENABLE_VIDEO_TRACK)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
     <BuildMacro Include="ENABLE_WEB_AUDIO">
       <Value>$(ENABLE_WEB_AUDIO)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>