[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1b5b337d5efc6f52b12d44b2746b11a9741659d0
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 5 13:04:09 2011 +0000

    2011-01-05  Philippe Normand  <pnormand at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75061 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 18edbbf..73a7e71 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-05  Philippe Normand  <pnormand at 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 at torchmobile.com.cn>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp b/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
index e8c87ac..d179601 100644
--- a/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
+++ b/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
@@ -24,6 +24,7 @@
 #include "GOwnPtrGStreamer.h"
 #include <gst/gst.h>
 #include <gst/interfaces/xoverlay.h>
+#include <gst/pbutils/pbutils.h>
 
 #if PLATFORM(GTK)
 #include <gtk/gtk.h>
@@ -210,7 +211,10 @@ void GStreamerGWorld::setWindowOverlay(GstMessage* message)
 
     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
         gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(sink), m_videoWindow->videoWindowId());

-- 
WebKit Debian packaging