Changeset 75061 in webkit

Timestamp:

Jan 5, 2011 5:04:09 AM (13 years ago)

Author:

Philippe Normand

Message:

2011-01-05 Philippe Normand <​pnormand@igalia.com>

Rubber-stamped by Eric Seidel.

[GStreamer] build fails with gstreamer core 0.10.31 and -plugins-base 0.10.30
​https://bugs.webkit.org/show_bug.cgi?id=51810

Based on a patch by Mart Raudsepp.

No new tests, build fix only.

• platform/graphics/gstreamer/GStreamerGWorld.cpp: (WebCore::GStreamerGWorld::setWindowOverlay): Use the new xoverlay API if the GST_CHECK_PLUGINS_BASE_VERSION macro is defined. It was introduced in same version as the xoverlay API change.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/GStreamerGWorld.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2011-01-05  Philippe Normand  <pnormand@igalia.com>
+
+        Rubber-stamped by Eric Seidel.
+
+        [GStreamer] build fails with gstreamer core 0.10.31 and -plugins-base 0.10.30
+        https://bugs.webkit.org/show_bug.cgi?id=51810
+
+        Based on a patch by Mart Raudsepp.
+
+        No new tests, build fix only.
+
+        * platform/graphics/gstreamer/GStreamerGWorld.cpp:
+        (WebCore::GStreamerGWorld::setWindowOverlay): Use the new xoverlay
+        API if the GST_CHECK_PLUGINS_BASE_VERSION macro is defined. It was
+        introduced in same version as the xoverlay API change.
+
 2011-01-05  Leo Yang  <leo.yang@torchmobile.com.cn>
 

trunk/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp

@@ -25 +25 @@
 #include <gst/gst.h>
 #include <gst/interfaces/xoverlay.h>
+#include <gst/pbutils/pbutils.h>
 
 #if PLATFORM(GTK)
@@ -211 +212 @@
     if (m_videoWindow) {
         m_videoWindow->prepareForOverlay(message);
-#if GST_CHECK_VERSION(0, 10, 31) || GST_VERSION_NANO
+
+// gst_x_overlay_set_window_handle was introduced in -plugins-base
+// 0.10.31, just like the macro for checking the version.
+#ifdef GST_CHECK_PLUGINS_BASE_VERSION
         gst_x_overlay_set_window_handle(GST_X_OVERLAY(sink), m_videoWindow->videoWindowId());
 #else