From ff8530e228441123c57ffe4c68bd4b940904d0f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
Date: Sat, 29 Dec 2007 17:29:17 +0000
Subject: [PATCH] Update to latest API changes in GLib/GIO and require at least
 gio-2.0 2.15.0 for this.

Original commit message from CVS:
* configure.ac:
* ext/gio/gstgio.c:
* ext/gio/gstgio.h:
* ext/gio/gstgiobasesink.h:
* ext/gio/gstgiobasesrc.c: (gst_gio_base_src_get_size):
* ext/gio/gstgiobasesrc.h:
* ext/gio/gstgiosink.c: (gst_gio_sink_start):
* ext/gio/gstgiosink.h:
* ext/gio/gstgiosrc.h:
* ext/gio/gstgiostreamsink.h:
* ext/gio/gstgiostreamsrc.h:
* tests/check/pipelines/gio.c:
Update to latest API changes in GLib/GIO and require at least
gio-2.0 2.15.0 for this.
* ext/gio/Makefile.am:
Add GST_PLUGIN_LDFLAGS to LDFLAGS.
---
 ext/gio/Makefile.am         | 2 +-
 ext/gio/gstgio.c            | 2 --
 ext/gio/gstgio.h            | 3 +--
 ext/gio/gstgiobasesink.h    | 1 -
 ext/gio/gstgiobasesrc.c     | 2 +-
 ext/gio/gstgiobasesrc.h     | 3 ---
 ext/gio/gstgiosink.c        | 3 +--
 ext/gio/gstgiosink.h        | 1 -
 ext/gio/gstgiosrc.h         | 1 -
 ext/gio/gstgiostreamsink.h  | 1 -
 ext/gio/gstgiostreamsrc.h   | 1 -
 tests/check/pipelines/gio.c | 3 +--
 12 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/ext/gio/Makefile.am b/ext/gio/Makefile.am
index 4fd7f55bae..c12970958f 100644
--- a/ext/gio/Makefile.am
+++ b/ext/gio/Makefile.am
@@ -14,7 +14,7 @@ libgstgio_la_SOURCES = \
 
 libgstgio_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GIO_CFLAGS)
 libgstgio_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GIO_LIBS)
-libgstgio_la_LDFLAGS = $(GST_GIO_LDFLAGS)
+libgstgio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_GIO_LDFLAGS)
 
 # headers we need but don't want installed
 noinst_HEADERS = \
diff --git a/ext/gio/gstgio.c b/ext/gio/gstgio.c
index 1e8b423385..cfe41db880 100644
--- a/ext/gio/gstgio.c
+++ b/ext/gio/gstgio.c
@@ -29,8 +29,6 @@
 #include "gstgiostreamsink.h"
 #include "gstgiostreamsrc.h"
 
-#include <gio/gvfs.h>
-
 GST_DEBUG_CATEGORY_STATIC (gst_gio_debug);
 #define GST_CAT_DEFAULT gst_gio_debug
 
diff --git a/ext/gio/gstgio.h b/ext/gio/gstgio.h
index 0546a2664a..01183e13ae 100644
--- a/ext/gio/gstgio.h
+++ b/ext/gio/gstgio.h
@@ -22,8 +22,7 @@
 #ifndef __GST_GIO_H__
 #define __GST_GIO_H__
 
-#include <gio/gioerror.h>
-#include <gio/gseekable.h>
+#include <gio/gio.h>
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
diff --git a/ext/gio/gstgiobasesink.h b/ext/gio/gstgiobasesink.h
index 834b058f6e..7ea7647b55 100644
--- a/ext/gio/gstgiobasesink.h
+++ b/ext/gio/gstgiobasesink.h
@@ -24,7 +24,6 @@
 
 #include "gstgio.h"
 
-#include <gio/gfile.h>
 #include <gst/base/gstbasesink.h>
 
 G_BEGIN_DECLS
diff --git a/ext/gio/gstgiobasesrc.c b/ext/gio/gstgiobasesrc.c
index 857b2a9c8f..eaf6b954d0 100644
--- a/ext/gio/gstgiobasesrc.c
+++ b/ext/gio/gstgiobasesrc.c
@@ -166,7 +166,7 @@ gst_gio_base_src_get_size (GstBaseSrc * base_src, guint64 * size)
     GError *err = NULL;
 
     info = g_file_input_stream_query_info (G_FILE_INPUT_STREAM (src->stream),
-        G_FILE_ATTRIBUTE_STD_SIZE, src->cancel, &err);
+        G_FILE_ATTRIBUTE_STANDARD_SIZE, src->cancel, &err);
 
     if (info != NULL) {
       *size = g_file_info_get_size (info);
diff --git a/ext/gio/gstgiobasesrc.h b/ext/gio/gstgiobasesrc.h
index 0d0fdb6af6..5bb8d799c3 100644
--- a/ext/gio/gstgiobasesrc.h
+++ b/ext/gio/gstgiobasesrc.h
@@ -24,9 +24,6 @@
 
 #include "gstgio.h"
 
-#include <gio/gfile.h>
-#include <gio/gfileinputstream.h>
-#include <gio/gmemoryinputstream.h>
 #include <gst/base/gstbasesrc.h>
 
 G_BEGIN_DECLS
diff --git a/ext/gio/gstgiosink.c b/ext/gio/gstgiosink.c
index ad0433b2c2..a01e6fd0c4 100644
--- a/ext/gio/gstgiosink.c
+++ b/ext/gio/gstgiosink.c
@@ -182,8 +182,7 @@ gst_gio_sink_start (GstBaseSink * base_sink)
   }
 
   stream =
-      G_OUTPUT_STREAM (g_file_create (file, G_FILE_CREATE_FLAGS_NONE, cancel,
-          &err));
+      G_OUTPUT_STREAM (g_file_create (file, G_FILE_CREATE_NONE, cancel, &err));
   success = (stream != NULL);
 
   g_object_unref (file);
diff --git a/ext/gio/gstgiosink.h b/ext/gio/gstgiosink.h
index 88f220b299..cae0d5ff5e 100644
--- a/ext/gio/gstgiosink.h
+++ b/ext/gio/gstgiosink.h
@@ -25,7 +25,6 @@
 #include "gstgio.h"
 #include "gstgiobasesink.h"
 
-#include <gio/gfile.h>
 #include <gst/base/gstbasesink.h>
 
 G_BEGIN_DECLS
diff --git a/ext/gio/gstgiosrc.h b/ext/gio/gstgiosrc.h
index 967137a0d2..79918ae833 100644
--- a/ext/gio/gstgiosrc.h
+++ b/ext/gio/gstgiosrc.h
@@ -25,7 +25,6 @@
 #include "gstgio.h"
 #include "gstgiobasesrc.h"
 
-#include <gio/gfile.h>
 #include <gst/base/gstbasesrc.h>
 
 G_BEGIN_DECLS
diff --git a/ext/gio/gstgiostreamsink.h b/ext/gio/gstgiostreamsink.h
index 47b7809172..c5f4c59936 100644
--- a/ext/gio/gstgiostreamsink.h
+++ b/ext/gio/gstgiostreamsink.h
@@ -25,7 +25,6 @@
 #include "gstgio.h"
 #include "gstgiobasesink.h"
 
-#include <gio/gfile.h>
 #include <gst/base/gstbasesink.h>
 
 G_BEGIN_DECLS
diff --git a/ext/gio/gstgiostreamsrc.h b/ext/gio/gstgiostreamsrc.h
index 0321b6fa55..2608923bca 100644
--- a/ext/gio/gstgiostreamsrc.h
+++ b/ext/gio/gstgiostreamsrc.h
@@ -25,7 +25,6 @@
 #include "gstgio.h"
 #include "gstgiobasesrc.h"
 
-#include <gio/gfile.h>
 #include <gst/base/gstbasesrc.h>
 
 G_BEGIN_DECLS
diff --git a/tests/check/pipelines/gio.c b/tests/check/pipelines/gio.c
index 5c6564b9c5..8791b3328b 100644
--- a/tests/check/pipelines/gio.c
+++ b/tests/check/pipelines/gio.c
@@ -22,8 +22,7 @@
 
 #include <gst/check/gstcheck.h>
 #include <gst/check/gstbufferstraw.h>
-#include <gio/gmemoryinputstream.h>
-#include <gio/gmemoryoutputstream.h>
+#include <gio/gio.h>
 
 static gboolean got_eos = FALSE;