git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 97d1814)
[WinCairo] Make it easier to enable/disable GStreamer.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 Sep 2014 09:45:01 +0000 (09:45 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 Sep 2014 09:45:01 +0000 (09:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=135766

Patch by peavo@outlook.com <peavo@outlook.com> on 2014-09-15
Reviewed by Brent Fulgham.

Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.

Source/WebCore:

* WebCore.vcxproj/WebCoreDebugWinCairo.props: Import GStreamer property file.
* WebCore.vcxproj/WebCoreReleaseWinCairo.props: Ditto.

Source/WebKit:

* WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props: Import GStreamer property file.
* WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props: Ditto.

Source/WTF:

* WTF.vcxproj/WTFDebugWinCairo.props: Import GStreamer property file.
* WTF.vcxproj/WTFReleaseWinCairo.props: Ditto.
* wtf/Platform.h: Enable GStreamer if ENABLE(GSTREAMER_WINCAIRO) is true, otherwise use Media Foundation.

Tools:

* WinLauncher/WinMain.cpp: Compile fix when GStreamer is enabled.

WebKitLibraries:

* win/tools/vsprops/GStreamerCommon.props: Add user macro ENABLE_GSTREAMER_WINCAIRO.

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

14 files changed:
Source/WTF/ChangeLog patch | blob | history
Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props patch | blob | history
Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props patch | blob | history
Source/WTF/wtf/Platform.h patch | blob | history
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props patch | blob | history
Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props patch | blob | history
Source/WebKit/ChangeLog patch | blob | history
Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props patch | blob | history
Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props patch | blob | history
Tools/ChangeLog patch | blob | history
Tools/WinLauncher/WinMain.cpp patch | blob | history
WebKitLibraries/ChangeLog patch | blob | history
WebKitLibraries/win/tools/vsprops/GStreamerCommon.props patch | blob | history

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index e9c675a384fbb2421277d943f4f46dd469f8320d..4ad0b5743158582c858d9a3f8bb8a0a9a22b2efd 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,16 @@
+2014-09-15  peavo@outlook.com  <peavo@outlook.com>
+
+        [WinCairo] Make it easier to enable/disable GStreamer.
+        https://bugs.webkit.org/show_bug.cgi?id=135766
+
+        Reviewed by Brent Fulgham.
+
+        Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+        * WTF.vcxproj/WTFDebugWinCairo.props: Import GStreamer property file.
+        * WTF.vcxproj/WTFReleaseWinCairo.props: Ditto.
+        * wtf/Platform.h: Enable GStreamer if ENABLE(GSTREAMER_WINCAIRO) is true, otherwise use Media Foundation.
+
 2014-09-10  Jon Honeycutt  <jhoneycutt@apple.com>
 
         Re-add the request autocomplete feature
diff --git a/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props b/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props
index 98196441ef0731364498aa0ec9514f19825870b7..406c6c611ddbef8c951d7ae5f85f13afdb80f57a 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props
+++ b/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props
@@ -7,6 +7,7 @@
     <Import Project="WTFCommon.props" />
     <Import Project="WTFCFLite.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <PropertyGroup />
   <PropertyGroup />
diff --git a/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props b/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props
index c5b996fe0d103708782a22f3b6ecfd73ff31e4c3..7c3793634500cce48e875234b5731daa2f25c202 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props
+++ b/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props
@@ -7,6 +7,7 @@
     <Import Project="WTFCommon.props" />
     <Import Project="WTFCFLite.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
   </ImportGroup>
   <PropertyGroup />
   <ItemDefinitionGroup>
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 24521fd4ad629627b7de35963a26874162825a47..0e0cede532d7a271f81d1368eff887bf693970bd 100644 (file)
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -872,8 +872,14 @@
 #endif
 
 #if ENABLE(VIDEO) && PLATFORM(WIN_CAIRO)
+#if ENABLE(GSTREAMER_WINCAIRO)
+#define WTF_USE_MEDIA_FOUNDATION 0
+#define WTF_USE_GLIB 1
+#define WTF_USE_GSTREAMER 1
+#else
 #define WTF_USE_MEDIA_FOUNDATION 1
 #endif
+#endif
 
 #if PLATFORM(WIN_CAIRO)
 #define WTF_USE_TEXTURE_MAPPER 1
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 30888f176229657e1067ce0aa9a63a63b80fb691..d59e52dbafea52b1e8dd22a53244bd93f9f9d0a4 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2014-09-15  peavo@outlook.com  <peavo@outlook.com>
+
+        [WinCairo] Make it easier to enable/disable GStreamer.
+        https://bugs.webkit.org/show_bug.cgi?id=135766
+
+        Reviewed by Brent Fulgham.
+
+        Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+        * WebCore.vcxproj/WebCoreDebugWinCairo.props: Import GStreamer property file.
+        * WebCore.vcxproj/WebCoreReleaseWinCairo.props: Ditto.
+
 2014-09-12  Sergio Villar Senin  <svillar@igalia.com>
 
         [CSS Grid Layout] Crash at CSSParser::parseGridTemplateRowsAndAreas
diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props b/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props
index fc08d3acefb6a8fbb65b55607c3031ceaa84b822..5f7ba75209cb4dd73e224ec8c55bcdacaad5cccf 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props
@@ -6,6 +6,7 @@
     <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\debug_wincairo.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
     <Import Project="WebCoreCommon.props" />
     <Import Project="WebCoreCairo.props" />
     <Import Project="WebCoreCURL.props" />
diff --git a/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props b/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props
index a977007c273c7f975a49de93c3c96431579fcaa0..96274577603fbc162b1995e71356aa1904569771 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props
+++ b/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props
@@ -5,6 +5,7 @@
     <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
     <Import Project="WebCoreCommon.props" />
     <Import Project="WebCoreCairo.props" />
     <Import Project="WebCoreCURL.props" />
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 8fefb050dc1e76d67d9555608678e7c561cd34f7..f14463fd6b5025cc6d312ecd7a4f16fa2d49888e 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2014-09-15  peavo@outlook.com  <peavo@outlook.com>
+
+        [WinCairo] Make it easier to enable/disable GStreamer.
+        https://bugs.webkit.org/show_bug.cgi?id=135766
+
+        Reviewed by Brent Fulgham.
+
+        Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+        * WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props: Import GStreamer property file.
+        * WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props: Ditto.
+
 2014-09-06  Darin Adler  <darin@apple.com>
 
         Make updates suggested by new version of Xcode
diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props
index 637c472ad515c1b9bf4b7b036adc7abff0eec13b..0fcb2a74cbdb1dca91e47cfde691a2325623b912 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props
@@ -6,6 +6,7 @@
     <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
     <Import Project="WebKitCommon.props" />
     <Import Project="WebKitDirectX.props" />
     <Import Project="WebKitCFLite.props" />
diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props
index 8434c4c218a9579246cda31475b004969775bb9d..2f1668c7f51d3b30cc24960379c285a3a4a0c39f 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props
+++ b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props
@@ -6,6 +6,7 @@
     <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
     <Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
     <Import Project="WebKitCFLite.props" />
     <Import Project="WebKitCommon.props" />
     <Import Project="WebKitDirectX.props" />
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 601b102368e8c5fda75fbf256409f1c2c65efab7..2ab944e97f603f58d94732b8e1bfd2c1a8f5bd57 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2014-09-15  peavo@outlook.com  <peavo@outlook.com>
+
+        [WinCairo] Make it easier to enable/disable GStreamer.
+        https://bugs.webkit.org/show_bug.cgi?id=135766
+
+        Reviewed by Brent Fulgham.
+
+        Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+        * WinLauncher/WinMain.cpp: Compile fix when GStreamer is enabled.
+
 2014-09-12  Brian J. Burg  <burg@cs.washington.edu>
 
         Web Inspector: remind about rebaselining generator test results
diff --git a/Tools/WinLauncher/WinMain.cpp b/Tools/WinLauncher/WinMain.cpp
index 10b0bc265df9903a5f457bc360a578d376ff7cf4..6c7922cd4df36c028c370eeecac66718f52a2273 100644 (file)
--- a/Tools/WinLauncher/WinMain.cpp
+++ b/Tools/WinLauncher/WinMain.cpp
@@ -31,6 +31,10 @@
 #include "WinLauncherWebHost.h"
 #include "Common.cpp"
 
+#if USE(GLIB)
+#include <glib.h>
+#endif
+
 int WINAPI wWinMain(HINSTANCE, HINSTANCE, PWSTR, int nCmdShow)
 {
 #ifdef _CRTDBG_MAP_ALLOC
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 5b4d438a0d627e0ef7de41763ca4427084b303b2..34c01691c6476bdd74ed952139363dc9c354ae7c 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2014-09-15  peavo@outlook.com  <peavo@outlook.com>
+
+        [WinCairo] Make it easier to enable/disable GStreamer.
+        https://bugs.webkit.org/show_bug.cgi?id=135766
+
+        Reviewed by Brent Fulgham.
+
+        Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+        * win/tools/vsprops/GStreamerCommon.props: Add user macro ENABLE_GSTREAMER_WINCAIRO.
+
 2014-09-08  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
 
         Remove FILTERS flag
diff --git a/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props b/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props
index 16e12fe0693ab09e27a7ef15d986cad7734119f1..198cb12fb4edea9692138c52dcf4c5daba285811 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props
+++ b/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props
@@ -1,8 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets">\r
+    <Import Project="GStreamer32.props" Condition="$(Platform)=='Win32'" />\r
+    <Import Project="GStreamer64.props" Condition="$(Platform)=='x64'" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros">\r
+    <ENABLE_GSTREAMER_WINCAIRO></ENABLE_GSTREAMER_WINCAIRO>\r
+  </PropertyGroup>\r
   <ItemDefinitionGroup>\r
-    <Link>\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>$(ENABLE_GSTREAMER_WINCAIRO);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ClCompile>\r
+    <Link Condition="$(ENABLE_GSTREAMER_WINCAIRO)=='ENABLE_GSTREAMER_WINCAIRO'">\r
       <AdditionalDependencies>gstpbutils-1.0.lib;gstaudio-1.0.lib;gstbase-1.0.lib;gstvideo-1.0.lib;gobject-2.0.lib;gstapp-1.0.lib;glib-2.0.lib;gstreamer-1.0.lib;gsttag-1.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <BuildMacro Include="ENABLE_GSTREAMER_WINCAIRO">\r
+      <Value>$(ENABLE_GSTREAMER_WINCAIRO)</Value>\r
+      <EnvironmentVariable>true</EnvironmentVariable>\r
+    </BuildMacro>\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file
Mirror of the WebKit open source project from svn.webkit.org.