Final preparations for GStreamer on Windows.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Dec 2013 21:38:12 +0000 (21:38 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Dec 2013 21:38:12 +0000 (21:38 +0000)
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

Source/WTF/ChangeLog
Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props
Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props
Source/WTF/wtf/Platform.h
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props

index aeb62f3..92e1122 100644 (file)
@@ -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[],
index 41646b1..9819644 100644 (file)
@@ -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
index df784a1..c5b996f 100644 (file)
@@ -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
index 548599e..d7e7b46 100644 (file)
 #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
index 5c7f671..431a0a1 100644 (file)
@@ -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.
index ce63e96..c4b0c0b 100644 (file)
       <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>