summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog20
-rw-r--r--configure.ac2
-rw-r--r--ext/gio/Makefile.am2
-rw-r--r--ext/gio/gstgio.c2
-rw-r--r--ext/gio/gstgio.h3
-rw-r--r--ext/gio/gstgiobasesink.h1
-rw-r--r--ext/gio/gstgiobasesrc.c2
-rw-r--r--ext/gio/gstgiobasesrc.h3
-rw-r--r--ext/gio/gstgiosink.c3
-rw-r--r--ext/gio/gstgiosink.h1
-rw-r--r--ext/gio/gstgiosrc.h1
-rw-r--r--ext/gio/gstgiostreamsink.h1
-rw-r--r--ext/gio/gstgiostreamsrc.h1
-rw-r--r--tests/check/pipelines/gio.c3
14 files changed, 26 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 233b391a..528cd112 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2007-12-29 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * 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.
+
2007-12-28 David Schleef <ds@schleef.org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index dd21249d..ec60e610 100644
--- a/configure.ac
+++ b/configure.ac
@@ -585,7 +585,7 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
dnl *** libgio ***
translit(dnm, m, l) AM_CONDITIONAL(USE_GIO, true)
AG_GST_CHECK_FEATURE(GIO, [GIO library], gio, [
- PKG_CHECK_MODULES(GIO, gio-2.0 >= 0.1.2, HAVE_GIO="yes", [
+ PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.15.0, HAVE_GIO="yes", [
HAVE_GIO="no"
AC_MSG_RESULT(no)
])
diff --git a/ext/gio/Makefile.am b/ext/gio/Makefile.am
index 4fd7f55b..c1297095 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 1e8b4233..cfe41db8 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 0546a266..01183e13 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 834b058f..7ea7647b 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 857b2a9c..eaf6b954 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 0d0fdb6a..5bb8d799 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 ad0433b2..a01e6fd0 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 88f220b2..cae0d5ff 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 967137a0..79918ae8 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 47b78091..c5f4c599 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 0321b6fa..2608923b 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 5c6564b9..8791b332 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;
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-01 14:13:06 +0000