Stop using single-include headers that are only available since GStreamer >= 1.2.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Mar 2015 19:31:36 +0000 (19:31 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Mar 2015 19:31:36 +0000 (19:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=142537

Patch by Sebastian Dröge <sebastian@centricular.com> on 2015-03-12
Reviewed by Philippe Normand.

* platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
* platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
* platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
* platform/graphics/gstreamer/GStreamerUtilities.cpp:
* platform/graphics/gstreamer/GStreamerUtilities.h:
* platform/graphics/gstreamer/ImageGStreamer.h:
Instead of using single-include headers for the GStreamer libraries,
directly include the headers we need. The single-include headers were
only added in 1.2, and this would be the only reason why we would
depend on 1.2.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181449 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp
Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp
Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp
Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h
Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h

index 7ce2b19..183b817 100644 (file)
@@ -1,3 +1,23 @@
+2015-03-12  Sebastian Dröge  <sebastian@centricular.com>
+
+        Stop using single-include headers that are only available since GStreamer >= 1.2.
+
+        https://bugs.webkit.org/show_bug.cgi?id=142537
+
+        Reviewed by Philippe Normand.
+
+        * platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
+        * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
+        * platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
+        * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
+        * platform/graphics/gstreamer/GStreamerUtilities.cpp:
+        * platform/graphics/gstreamer/GStreamerUtilities.h:
+        * platform/graphics/gstreamer/ImageGStreamer.h:
+        Instead of using single-include headers for the GStreamer libraries,
+        directly include the headers we need. The single-include headers were
+        only added in 1.2, and this would be the only reason why we would
+        depend on 1.2.
+
 2015-03-12  Eric Carlson  <eric.carlson@apple.com>
 
         [Mac] Update AirPlay handling
 2015-03-12  Eric Carlson  <eric.carlson@apple.com>
 
         [Mac] Update AirPlay handling
index f24a439..50c97ed 100644 (file)
@@ -29,7 +29,6 @@
 #include "Logging.h"
 #include "WebKitWebAudioSourceGStreamer.h"
 #include <gst/gst.h>
 #include "Logging.h"
 #include "WebKitWebAudioSourceGStreamer.h"
 #include <gst/gst.h>
-#include <gst/pbutils/pbutils.h>
 #include <wtf/gobject/GUniquePtr.h>
 
 namespace WebCore {
 #include <wtf/gobject/GUniquePtr.h>
 
 namespace WebCore {
index 94a9a95..4975e6f 100644 (file)
@@ -27,9 +27,8 @@
 
 #include <gio/gio.h>
 #include <gst/app/gstappsink.h>
 
 #include <gio/gio.h>
 #include <gst/app/gstappsink.h>
-#include <gst/audio/audio.h>
+#include <gst/audio/audio-info.h>
 #include <gst/gst.h>
 #include <gst/gst.h>
-#include <gst/pbutils/pbutils.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/gobject/GRefPtr.h>
 #include <wtf/gobject/GThreadSafeMainLoopSource.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/gobject/GRefPtr.h>
 #include <wtf/gobject/GThreadSafeMainLoopSource.h>
index 87adfb2..062fac2 100644 (file)
@@ -24,7 +24,7 @@
 #include "AudioBus.h"
 #include "AudioSourceProviderClient.h"
 #include <gst/app/gstappsink.h>
 #include "AudioBus.h"
 #include "AudioSourceProviderClient.h"
 #include <gst/app/gstappsink.h>
-#include <gst/audio/audio.h>
+#include <gst/audio/audio-info.h>
 #include <gst/base/gstadapter.h>
 #include <wtf/gobject/GMutexLocker.h>
 
 #include <gst/base/gstadapter.h>
 #include <wtf/gobject/GMutexLocker.h>
 
index 20414a9..83b574b 100644 (file)
@@ -27,9 +27,9 @@
 #include "AudioIOCallback.h"
 #include "GRefPtrGStreamer.h"
 #include "GStreamerUtilities.h"
 #include "AudioIOCallback.h"
 #include "GRefPtrGStreamer.h"
 #include "GStreamerUtilities.h"
-#include <gst/app/app.h>
-#include <gst/audio/audio.h>
-#include <gst/pbutils/pbutils.h>
+#include <gst/app/gstappsrc.h>
+#include <gst/audio/audio-info.h>
+#include <gst/pbutils/missing-plugins.h>
 #include <wtf/gobject/GUniquePtr.h>
 
 using namespace WebCore;
 #include <wtf/gobject/GUniquePtr.h>
 
 using namespace WebCore;
index 4d7735d..c2be1b7 100644 (file)
@@ -24,8 +24,9 @@
 
 #include "IntSize.h"
 
 
 #include "IntSize.h"
 
-#include <gst/audio/audio.h>
+#include <gst/audio/audio-info.h>
 #include <gst/gst.h>
 #include <gst/gst.h>
+#include <gst/video/video-info.h>
 #include <wtf/MathExtras.h>
 #include <wtf/gobject/GUniquePtr.h>
 
 #include <wtf/MathExtras.h>
 #include <wtf/gobject/GUniquePtr.h>
 
index 0ed3137..6a12de6 100644 (file)
@@ -19,7 +19,7 @@
 #include "Logging.h"
 
 #include <gst/gst.h>
 #include "Logging.h"
 
 #include <gst/gst.h>
-#include <gst/video/video.h>
+#include <gst/video/video-format.h>
 
 #define LOG_MEDIA_MESSAGE(...) do { \
     GST_DEBUG(__VA_ARGS__); \
 
 #define LOG_MEDIA_MESSAGE(...) do { \
     GST_DEBUG(__VA_ARGS__); \
index 3931a19..1ecd334 100644 (file)
@@ -27,7 +27,7 @@
 #include "GRefPtrGStreamer.h"
 
 #include <gst/gst.h>
 #include "GRefPtrGStreamer.h"
 
 #include <gst/gst.h>
-#include <gst/video/video.h>
+#include <gst/video/video-frame.h>
 
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>