Skip to content

Instantly share code, notes, and snippets.

@nickdiego
Last active December 21, 2015 08:59
Show Gist options
  • Select an option

  • Save nickdiego/6282255 to your computer and use it in GitHub Desktop.

Select an option

Save nickdiego/6282255 to your computer and use it in GitHub Desktop.
diff --git a/Source/WebCore/PlatformNix.cmake b/Source/WebCore/PlatformNix.cmake
index 883f373..2186451 100644
--- a/Source/WebCore/PlatformNix.cmake
+++ b/Source/WebCore/PlatformNix.cmake
@@ -256,6 +256,9 @@ if (ENABLE_VIDEO)
list(APPEND WebCore_LIBRARIES
${GSTREAMER_VIDEO_LIBRARIES}
)
+
+ # Avoiding a GLib deprecation warning due to GStreamer API using deprecated classes.
+ set_source_files_properties(platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp PROPERTIES COMPILE_DEFINITIONS "GLIB_DISABLE_DEPRECATION_WARNINGS=1")
endif ()
add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}")
diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
index 0cc575e..6af17ae 100644
--- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
@@ -20,7 +20,7 @@
#include "config.h"
#include "WebKitWebSourceGStreamer.h"
-#if ENABLE(VIDEO) && USE(GSTREAMER)
+#if ENABLE(VIDEO) && (USE(GSTREAMER) || PLATFORM(NIX))
#include "CachedRawResource.h"
#include "CachedRawResourceClient.h"
diff --git a/Source/cmake/OptionsNix.cmake b/Source/cmake/OptionsNix.cmake
index adb26ab..95056b0 100644
--- a/Source/cmake/OptionsNix.cmake
+++ b/Source/cmake/OptionsNix.cmake
@@ -41,6 +41,7 @@ WEBKIT_OPTION_DEFINE(WTF_USE_OPENGL_ES_2 "Use EGL + OpenGLES2" OFF)
WEBKIT_OPTION_DEFINE(WTF_USE_CURL "Use libCurl as network backend" OFF)
if (ENABLE_VIDEO)
+ set(GSTREAMER_COMPONENTS app base audio video pbutils)
find_package(GStreamer 1.0.5 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
add_definitions(-DGST_API_VERSION_1=1)
endif ()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment