Diff
Modified: trunk/ChangeLog (161350 => 161351)
--- trunk/ChangeLog 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/ChangeLog 2014-01-06 18:33:15 UTC (rev 161351)
@@ -1,3 +1,16 @@
+2014-01-06 Martin Robinson <[email protected]>
+
+ [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration
+ https://bugs.webkit.org/show_bug.cgi?id=126505
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Source/cmake/FindGLIB.cmake: Add support for finding the gio-unix include directory location.
+ * Source/cmake/FindGUdev.cmake: Added.
+ * Source/cmake/FindGeoClue.cmake: Added.
+ * Source/cmake/OptionsGTK.cmake: When gamepad is enabled look for gio-unix and GUdev. When
+ geolocation is enabled look for GeoClue.
+
2014-01-06 Zan Dobersek <[email protected]>
[GTK] Use libc++ for C++11 on darwin
Modified: trunk/Source/WebCore/CMakeLists.txt (161350 => 161351)
--- trunk/Source/WebCore/CMakeLists.txt 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-01-06 18:33:15 UTC (rev 161351)
@@ -549,9 +549,11 @@
page/History.idl
page/Location.idl
page/Navigator.idl
- page/Performance.idl
page/PerformanceEntry.idl
page/PerformanceEntryList.idl
+ page/Performance.idl
+ page/PerformanceMark.idl
+ page/PerformanceMeasure.idl
page/PerformanceNavigation.idl
page/PerformanceResourceTiming.idl
page/PerformanceTiming.idl
@@ -830,8 +832,10 @@
Modules/indexeddb/leveldb/IDBLevelDBCoding.cpp
Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp
+ Modules/mediasource/DOMURLMediaSource.cpp
Modules/mediasource/MediaSource.cpp
Modules/mediasource/MediaSourceRegistry.cpp
+ Modules/mediasource/SampleMap.cpp
Modules/mediasource/SourceBuffer.cpp
Modules/mediasource/SourceBufferList.cpp
Modules/mediasource/VideoPlaybackQuality.cpp
@@ -1411,6 +1415,7 @@
html/HTMLMapElement.cpp
html/HTMLMarqueeElement.cpp
html/HTMLMediaElement.cpp
+ html/HTMLMediaSource.cpp
html/HTMLMenuElement.cpp
html/HTMLMetaElement.cpp
html/HTMLMeterElement.cpp
@@ -1765,6 +1770,7 @@
page/PerformanceNavigation.cpp
page/PerformanceResourceTiming.cpp
page/PerformanceTiming.cpp
+ page/PerformanceUserTiming.cpp
page/PrintContext.cpp
page/Screen.cpp
page/SecurityOrigin.cpp
@@ -2998,6 +3004,12 @@
set(WebCoreTestSupport_SOURCES
platform/mock/PlatformSpeechSynthesizerMock.cpp
+ platform/mock/mediasource/MockBox.cpp
+ platform/mock/mediasource/MockMediaPlayerMediaSource.cpp
+ platform/mock/mediasource/MockMediaSourcePrivate.cpp
+ platform/mock/mediasource/MockSourceBufferPrivate.cpp
+ platform/mock/mediasource/MockTracks.cpp
+
testing/InternalSettings.cpp
testing/Internals.cpp
)
Modified: trunk/Source/WebCore/ChangeLog (161350 => 161351)
--- trunk/Source/WebCore/ChangeLog 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/WebCore/ChangeLog 2014-01-06 18:33:15 UTC (rev 161351)
@@ -1,3 +1,16 @@
+2014-01-06 Martin Robinson <[email protected]>
+
+ [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration
+ https://bugs.webkit.org/show_bug.cgi?id=126505
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt: Add missing IDLS and source files to the lists.
+ * PlatformGTK.cmake: Add missing include directories and source files to the lists.
+ Use the GeoClue, GUdev, and gio-unix include paths and libraries and sort the list
+ of WebCore include directories.
+ * UseJSC.cmake: Align the sourced list with the contents of the bindings/js directory.
+
2014-01-06 Gavin Barraclough <[email protected]>
Refactor NSActivity handling code from ChildProcess to UserActivity
Modified: trunk/Source/WebCore/PlatformGTK.cmake (161350 => 161351)
--- trunk/Source/WebCore/PlatformGTK.cmake 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-01-06 18:33:15 UTC (rev 161351)
@@ -3,6 +3,7 @@
"${WEBCORE_DIR}/editing/atk"
"${WEBCORE_DIR}/page/gtk"
"${WEBCORE_DIR}/platform/cairo"
+ "${WEBCORE_DIR}/platform/geoclue"
"${WEBCORE_DIR}/platform/gtk"
"${WEBCORE_DIR}/platform/graphics/cairo"
"${WEBCORE_DIR}/platform/graphics/egl"
@@ -15,6 +16,7 @@
"${WEBCORE_DIR}/platform/graphics/opentype"
"${WEBCORE_DIR}/platform/linux"
"${WEBCORE_DIR}/platform/mediastream/gstreamer"
+ "${WEBCORE_DIR}/platform/mock/mediasource"
"${WEBCORE_DIR}/platform/network/gtk"
"${WEBCORE_DIR}/platform/network/soup"
"${WEBCORE_DIR}/platform/text/gtk"
@@ -37,6 +39,8 @@
platform/audio/gstreamer/FFTFrameGStreamer.cpp
platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
+ platform/geoclue/GeolocationProviderGeoclue.cpp
+
platform/graphics/GraphicsContext3DPrivate.cpp
platform/graphics/OpenGLShims.cpp
platform/graphics/WOFFFileFormat.cpp
@@ -96,6 +100,8 @@
platform/graphics/opentype/OpenTypeVerticalData.cpp
+ platform/gtk/GamepadsGtk.cpp
+
platform/image-decoders/cairo/ImageDecoderCairo.cpp
platform/linux/GamepadDeviceLinux.cpp
@@ -187,7 +193,6 @@
platform/gtk/FileSystemGtk.cpp
platform/gtk/GOwnPtrGtk.cpp
platform/gtk/GRefPtrGtk.cpp
- platform/gtk/GamepadsGtk.cpp
platform/gtk/GtkClickCounter.cpp
platform/gtk/GtkDragAndDropHelper.cpp
platform/gtk/GtkInputMethodFilter.cpp
@@ -290,10 +295,12 @@
${ENCHANT_LIBRARIES}
${FONTCONFIG_LIBRARIES}
${FREETYPE_LIBRARIES}
+ ${GEOCLUE_LIBRARIES}
${GLIB_GIO_LIBRARIES}
${GLIB_GMODULE_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
${GLIB_LIBRARIES}
+ ${GUDEV_LIBRARIES}
${HARFBUZZ_LIBRARIES}
${ICU_LIBRARIES}
${JPEG_LIBRARIES}
@@ -313,19 +320,22 @@
list(APPEND WebCore_INCLUDE_DIRECTORIES
${ATK_INCLUDE_DIRS}
+ ${CAIRO_INCLUDE_DIRS}
${ENCHANT_INCLUDE_DIRS}
- ${CAIRO_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS}
+ ${GEOCLUE_INCLUDE_DIRS}
+ ${GIO_UNIX_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
+ ${GUDEV_INCLUDE_DIRS}
+ ${HARFBUZZ_INCLUDE_DIRS}
${ICU_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
- ${GLIB_INCLUDE_DIRS}
- ${LIBSOUP_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIRS}
- ${HARFBUZZ_INCLUDE_DIRS}
${WEBP_INCLUDE_DIRS}
${XT_INCLUDE_DIRS}
+ ${ZLIB_INCLUDE_DIRS}
)
if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
Modified: trunk/Source/WebCore/UseJSC.cmake (161350 => 161351)
--- trunk/Source/WebCore/UseJSC.cmake 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/WebCore/UseJSC.cmake 2014-01-06 18:33:15 UTC (rev 161351)
@@ -28,7 +28,13 @@
bindings/js/DOMWrapperWorld.cpp
bindings/js/Dictionary.cpp
bindings/js/GCController.cpp
+ bindings/js/IDBBindingUtilities.cpp
bindings/js/JSAttrCustom.cpp
+ bindings/js/JSAudioBufferSourceNodeCustom.cpp
+ bindings/js/JSAudioContextCustom.cpp
+ bindings/js/JSAudioTrackCustom.cpp
+ bindings/js/JSAudioTrackListCustom.cpp
+ bindings/js/JSBiquadFilterNodeCustom.cpp
bindings/js/JSBlobCustom.cpp
bindings/js/JSCDATASectionCustom.cpp
bindings/js/JSCSSRuleCustom.cpp
@@ -40,9 +46,15 @@
bindings/js/JSCanvasRenderingContextCustom.cpp
bindings/js/JSClipboardCustom.cpp
bindings/js/JSCommandLineAPIHostCustom.cpp
+ bindings/js/JSCryptoAlgorithmBuilder.cpp
+ bindings/js/JSCryptoAlgorithmDictionary.cpp
bindings/js/JSCryptoCustom.cpp
+ bindings/js/JSCryptoKeyCustom.cpp
+ bindings/js/JSCryptoKeyPairCustom.cpp
+ bindings/js/JSCryptoKeySerializationJWK.cpp
+ bindings/js/JSCryptoOperationData.cpp
+ bindings/js/JSCustomSQLStatementErrorCallback.cpp
bindings/js/JSCustomXPathNSResolver.cpp
- bindings/js/JSDictionary.cpp
bindings/js/JSDOMBinding.cpp
bindings/js/JSDOMFormDataCustom.cpp
bindings/js/JSDOMGlobalObject.cpp
@@ -50,14 +62,17 @@
bindings/js/JSDOMMimeTypeArrayCustom.cpp
bindings/js/JSDOMPluginArrayCustom.cpp
bindings/js/JSDOMPluginCustom.cpp
+ bindings/js/JSDOMPromise.cpp
bindings/js/JSDOMStringListCustom.cpp
bindings/js/JSDOMStringMapCustom.cpp
bindings/js/JSDOMWindowBase.cpp
bindings/js/JSDOMWindowCustom.cpp
bindings/js/JSDOMWindowShell.cpp
bindings/js/JSDOMWrapper.cpp
+ bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp
bindings/js/JSDeviceMotionEventCustom.cpp
bindings/js/JSDeviceOrientationEventCustom.cpp
+ bindings/js/JSDictionary.cpp
bindings/js/JSDocumentCustom.cpp
bindings/js/JSElementCustom.cpp
bindings/js/JSErrorHandler.cpp
@@ -65,6 +80,7 @@
bindings/js/JSEventListener.cpp
bindings/js/JSEventTargetCustom.cpp
bindings/js/JSExceptionBase.cpp
+ bindings/js/JSFileReaderCustom.cpp
bindings/js/JSGeolocationCustom.cpp
bindings/js/JSHTMLAllCollectionCustom.cpp
bindings/js/JSHTMLAppletElementCustom.cpp
@@ -85,6 +101,9 @@
bindings/js/JSHTMLSelectElementCustom.cpp
bindings/js/JSHTMLTemplateElementCustom.cpp
bindings/js/JSHistoryCustom.cpp
+ bindings/js/JSIDBAnyCustom.cpp
+ bindings/js/JSIDBDatabaseCustom.cpp
+ bindings/js/JSIDBObjectStoreCustom.cpp
bindings/js/JSImageConstructor.cpp
bindings/js/JSImageDataCustom.cpp
bindings/js/JSInjectedScriptHostCustom.cpp
@@ -94,6 +113,8 @@
bindings/js/JSLazyEventListener.cpp
bindings/js/JSLocationCustom.cpp
bindings/js/JSMainThreadExecState.cpp
+ bindings/js/JSMediaSourceStatesCustom.cpp
+ bindings/js/JSMediaStreamCapabilitiesCustom.cpp
bindings/js/JSMessageChannelCustom.cpp
bindings/js/JSMessageEventCustom.cpp
bindings/js/JSMessagePortCustom.cpp
@@ -105,16 +126,43 @@
bindings/js/JSNodeFilterCustom.cpp
bindings/js/JSNodeIteratorCustom.cpp
bindings/js/JSNodeListCustom.cpp
+ bindings/js/JSOscillatorNodeCustom.cpp
+ bindings/js/JSPannerNodeCustom.cpp
+ bindings/js/JSPerformanceEntryCustom.cpp
bindings/js/JSPluginElementFunctions.cpp
bindings/js/JSPopStateEventCustom.cpp
+ bindings/js/JSRTCIceCandidateCustom.cpp
+ bindings/js/JSRTCPeerConnectionCustom.cpp
+ bindings/js/JSRTCSessionDescriptionCustom.cpp
+ bindings/js/JSRTCStatsResponseCustom.cpp
+ bindings/js/JSRequestAnimationFrameCallbackCustom.cpp
+ bindings/js/JSSQLResultSetRowListCustom.cpp
+ bindings/js/JSSQLTransactionCustom.cpp
+ bindings/js/JSSQLTransactionSyncCustom.cpp
+ bindings/js/JSSVGElementInstanceCustom.cpp
+ bindings/js/JSSVGLengthCustom.cpp
+ bindings/js/JSSVGPathSegCustom.cpp
+ bindings/js/JSSharedWorkerCustom.cpp
bindings/js/JSStorageCustom.cpp
bindings/js/JSStyleSheetCustom.cpp
bindings/js/JSStyleSheetListCustom.cpp
+ bindings/js/JSSubtleCryptoCustom.cpp
bindings/js/JSTextCustom.cpp
+ bindings/js/JSTextTrackCueCustom.cpp
+ bindings/js/JSTextTrackCustom.cpp
+ bindings/js/JSTextTrackListCustom.cpp
bindings/js/JSTouchCustom.cpp
bindings/js/JSTouchListCustom.cpp
+ bindings/js/JSTrackCustom.cpp
+ bindings/js/JSTrackEventCustom.cpp
bindings/js/JSTreeWalkerCustom.cpp
+ bindings/js/JSVideoTrackCustom.cpp
+ bindings/js/JSVideoTrackListCustom.cpp
+ bindings/js/JSWebGLRenderingContextCustom.cpp
bindings/js/JSWebKitPointCustom.cpp
+ bindings/js/JSWorkerCustom.cpp
+ bindings/js/JSWorkerGlobalScopeBase.cpp
+ bindings/js/JSWorkerGlobalScopeCustom.cpp
bindings/js/JSXMLHttpRequestCustom.cpp
bindings/js/JSXPathResultCustom.cpp
bindings/js/JSXSLTProcessorCustom.cpp
@@ -131,6 +179,8 @@
bindings/js/ScriptState.cpp
bindings/js/SerializedScriptValue.cpp
bindings/js/WebCoreTypedArrayController.cpp
+ bindings/js/WorkerScriptController.cpp
+ bindings/js/WorkerScriptDebugServer.cpp
bridge/IdentifierRep.cpp
bridge/NP_jsobject.cpp
Modified: trunk/Source/WebKit/ChangeLog (161350 => 161351)
--- trunk/Source/WebKit/ChangeLog 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/WebKit/ChangeLog 2014-01-06 18:33:15 UTC (rev 161351)
@@ -1,3 +1,12 @@
+2014-01-06 Martin Robinson <[email protected]>
+
+ [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration
+ https://bugs.webkit.org/show_bug.cgi?id=126505
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * PlatformGTK.cmake: Add the geoclue platform directory to the include directory list.
+
2014-01-06 Mark Rowe <[email protected]>
<https://webkit.org/b/126499> Move WebKit off the legacy WebKit availability macros
Modified: trunk/Source/WebKit/PlatformGTK.cmake (161350 => 161351)
--- trunk/Source/WebKit/PlatformGTK.cmake 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2014-01-06 18:33:15 UTC (rev 161351)
@@ -18,6 +18,7 @@
${WEBCORE_DIR}/ForwardingHeaders
${WEBCORE_DIR}/accessibility/atk
${WEBCORE_DIR}/platform/cairo
+ ${WEBCORE_DIR}/platform/geoclue
${WEBCORE_DIR}/platform/graphics/cairo
${WEBCORE_DIR}/platform/graphics/gtk
${WEBCORE_DIR}/platform/graphics/opentype
Modified: trunk/Source/cmake/FindGLIB.cmake (161350 => 161351)
--- trunk/Source/cmake/FindGLIB.cmake 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/cmake/FindGLIB.cmake 2014-01-06 18:33:15 UTC (rev 161351)
@@ -94,6 +94,11 @@
elseif (${_component} STREQUAL "gthread")
find_library(GLIB_GTHREAD_LIBRARIES NAMES gthread-2.0 HINTS ${_GLIB_LIBRARY_DIR})
set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GTHREAD_LIBRARIES)
+ elseif (${_component} STREQUAL "gio-unix")
+ # gio-unix is compiled as part of the gio library, but the include paths
+ # are separate from the shared glib ones. Since this is currently only used
+ # by WebKitGTK+ we don't go to extraordinary measures beyond pkg-config.
+ pkg_check_modules(GIO_UNIX QUIET gio-unix-2.0)
endif ()
endforeach ()
Added: trunk/Source/cmake/FindGUdev.cmake (0 => 161351)
--- trunk/Source/cmake/FindGUdev.cmake (rev 0)
+++ trunk/Source/cmake/FindGUdev.cmake 2014-01-06 18:33:15 UTC (rev 161351)
@@ -0,0 +1,49 @@
+# - Try to find GUdev
+# Once done, this will define
+#
+# GUDEV_FOUND - system has GUdev
+# GUDEV_INCLUDE_DIRS - the GUdev include directories
+# GUDEV_LIBRARIES - link these to use GUdev
+#
+# Copyright (C) 2012 Raphael Kubo da Costa <[email protected]>
+# Copyright (C) 2013, 2014 Igalia S.L.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_package(PkgConfig)
+pkg_check_modules(GUDEV gudev-1.0)
+
+set(VERSION_OK TRUE)
+if (GUDEV_VERSION)
+ if (GUDEV_FIND_VERSION_EXACT)
+ if (NOT("${GUDEV_FIND_VERSION}" VERSION_EQUAL "${GUDEV_VERSION}"))
+ set(VERSION_OK FALSE)
+ endif ()
+ else ()
+ if ("${GUDEV_VERSION}" VERSION_LESS "${GUDEV_FIND_VERSION}")
+ set(VERSION_OK FALSE)
+ endif ()
+ endif ()
+endif ()
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GUDEV DEFAULT_MSG GUDEV_INCLUDE_DIRS GUDEV_LIBRARIES VERSION_OK)
Added: trunk/Source/cmake/FindGeoClue.cmake (0 => 161351)
--- trunk/Source/cmake/FindGeoClue.cmake (rev 0)
+++ trunk/Source/cmake/FindGeoClue.cmake 2014-01-06 18:33:15 UTC (rev 161351)
@@ -0,0 +1,49 @@
+# - Try to find GeoClue
+# Once done, this will define
+#
+# GEOCLUE_FOUND - system has GeoClue
+# GEOCLUE_INCLUDE_DIRS - the GeoClue include directories
+# GEOCLUE_LIBRARIES - link these to use GeoClue
+#
+# Copyright (C) 2012 Raphael Kubo da Costa <[email protected]>
+# Copyright (C) 2013, 2014 Igalia S.L.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_package(PkgConfig)
+pkg_check_modules(GEOCLUE geoclue)
+
+set(VERSION_OK TRUE)
+if (GEOCLUE_VERSION)
+ if (GEOCLUE_FIND_VERSION_EXACT)
+ if (NOT("${GEOCLUE_FIND_VERSION}" VERSION_EQUAL "${GEOCLUE_VERSION}"))
+ set(VERSION_OK FALSE)
+ endif ()
+ else ()
+ if ("${GEOCLUE_VERSION}" VERSION_LESS "${GEOCLUE_FIND_VERSION}")
+ set(VERSION_OK FALSE)
+ endif ()
+ endif ()
+endif ()
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GEOCLUE DEFAULT_MSG GEOCLUE_INCLUDE_DIRS GEOCLUE_LIBRARIES VERSION_OK)
Modified: trunk/Source/cmake/OptionsGTK.cmake (161350 => 161351)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-01-06 18:33:15 UTC (rev 161351)
@@ -152,7 +152,6 @@
find_package(Cairo 1.10.2 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
find_package(Freetype 2.4.2 REQUIRED)
-find_package(GLIB 2.33.2 REQUIRED COMPONENTS gio gobject gthread gmodule)
find_package(GTK3 3.6.0 REQUIRED)
find_package(GDK3 3.6.0 REQUIRED)
find_package(GTK2 2.24.10 REQUIRED)
@@ -174,6 +173,16 @@
find_package(ATSPI 2.5.3)
find_package(GObjectIntrospection)
+set(glib_components gio gobject gthread gmodule)
+if (ENABLE_GAMEPAD)
+ list(APPEND glib_components gio-unix)
+endif ()
+find_package(GLIB 2.33.2 REQUIRED COMPONENTS ${glib_components})
+
+if (ENABLE_GEOLOCATION)
+ find_package(GeoClue)
+endif ()
+
# We don't use find_package for GLX because it is part of -lGL, unlike EGL.
find_package(OpenGL)
check_include_files("GL/glx.h" GLX_FOUND)
@@ -217,6 +226,10 @@
add_definitions(-DWTF_USE_LEVELDB=1)
endif ()
+if (ENABLE_GAMEPAD)
+ find_package(GUdev)
+endif ()
+
set(CPACK_SOURCE_GENERATOR TBZ2)
set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
