From 12538969e1f84e05e487494b6c2db10cb5ce3b14 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Thu, 19 Dec 2013 21:38:12 +0000 Subject: [PATCH] Final preparations for GStreamer on Windows. https://bugs.webkit.org/show_bug.cgi?id=125958 Patch by Alex Christensen 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 | 13 +++++++++++++ Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props | 3 ++- Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props | 3 ++- Source/WTF/wtf/Platform.h | 6 ++++++ WebKitLibraries/ChangeLog | 10 ++++++++++ .../win/tools/vsprops/FeatureDefinesCairo.props | 4 ---- 6 files changed, 33 insertions(+), 6 deletions(-) diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog index aeb62f365533..92e1122fa40c 100644 --- a/Source/WTF/ChangeLog +++ b/Source/WTF/ChangeLog @@ -1,3 +1,16 @@ +2013-12-19 Alex Christensen + + 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 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 41646b1d1793..98196441ef07 100644 --- a/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props +++ b/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props @@ -6,10 +6,11 @@ + - + \ No newline at end of file diff --git a/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props b/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props index df784a1595fe..c5b996fe0d10 100644 --- a/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props +++ b/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props @@ -6,9 +6,10 @@ + - + \ No newline at end of file diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h index 548599e98de8..d7e7b4669be0 100644 --- 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 5c7f671b511e..431a0a13572f 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,13 @@ +2013-12-19 Alex Christensen + + 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 [WinCairo] Unreviewed build fix after r160798. diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props index ce63e96beaff..c4b0c0b38577 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props @@ -411,10 +411,6 @@ $(ENABLE_VIEW_MODE_CSS_MEDIA) true - - $(ENABLE_VIDEO_TRACK) - true - $(ENABLE_WEB_AUDIO) true -- 2.36.0