From 317894d314845bb650ce64e765ac0112bde3d0a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 18 Jan 2012 16:19:12 +0100 Subject: [PATCH] gio: Move to gst subdirectory It's a plugin without external dependencies now because we unconditionally depend on GIO anyway. --- configure.ac | 4 ++-- docs/plugins/Makefile.am | 8 ++++---- ext/Makefile.am | 8 -------- {ext => gst}/gio/Makefile.am | 0 {ext => gst}/gio/gstgio.c | 0 {ext => gst}/gio/gstgio.h | 0 {ext => gst}/gio/gstgiobasesink.c | 0 {ext => gst}/gio/gstgiobasesink.h | 0 {ext => gst}/gio/gstgiobasesrc.c | 0 {ext => gst}/gio/gstgiobasesrc.h | 0 {ext => gst}/gio/gstgiosink.c | 0 {ext => gst}/gio/gstgiosink.h | 0 {ext => gst}/gio/gstgiosrc.c | 0 {ext => gst}/gio/gstgiosrc.h | 0 {ext => gst}/gio/gstgiostreamsink.c | 0 {ext => gst}/gio/gstgiostreamsink.h | 0 {ext => gst}/gio/gstgiostreamsrc.c | 0 {ext => gst}/gio/gstgiostreamsrc.h | 0 tests/check/Makefile.am | 8 +------- tests/examples/Makefile.am | 6 +----- tests/examples/gio/Makefile.am | 2 -- 21 files changed, 8 insertions(+), 28 deletions(-) rename {ext => gst}/gio/Makefile.am (100%) rename {ext => gst}/gio/gstgio.c (100%) rename {ext => gst}/gio/gstgio.h (100%) rename {ext => gst}/gio/gstgiobasesink.c (100%) rename {ext => gst}/gio/gstgiobasesink.h (100%) rename {ext => gst}/gio/gstgiobasesrc.c (100%) rename {ext => gst}/gio/gstgiobasesrc.h (100%) rename {ext => gst}/gio/gstgiosink.c (100%) rename {ext => gst}/gio/gstgiosink.h (100%) rename {ext => gst}/gio/gstgiosrc.c (100%) rename {ext => gst}/gio/gstgiosrc.h (100%) rename {ext => gst}/gio/gstgiostreamsink.c (100%) rename {ext => gst}/gio/gstgiostreamsink.h (100%) rename {ext => gst}/gio/gstgiostreamsrc.c (100%) rename {ext => gst}/gio/gstgiostreamsrc.h (100%) diff --git a/configure.ac b/configure.ac index 88c08d8bd2..7a1c2b6c2e 100644 --- a/configure.ac +++ b/configure.ac @@ -399,6 +399,7 @@ AG_GST_CHECK_PLUGIN(audiotestsrc) AG_GST_CHECK_PLUGIN(encoding) AG_GST_CHECK_PLUGIN(videoconvert) AG_GST_CHECK_PLUGIN(gdp) +AG_GST_CHECK_PLUGIN(gio) AG_GST_CHECK_PLUGIN(playback) AG_GST_CHECK_PLUGIN(audioresample) AG_GST_CHECK_PLUGIN(subparse) @@ -721,7 +722,6 @@ dnl not building plugins with external dependencies, dnl but we still need to set the conditionals AM_CONDITIONAL(USE_ALSA, false) AM_CONDITIONAL(USE_CDPARANOIA, false) -AM_CONDITIONAL(USE_GIO, false) AM_CONDITIONAL(USE_IVORBIS, false) AM_CONDITIONAL(USE_LIBVISUAL, false) AM_CONDITIONAL(USE_OGG, false) @@ -827,6 +827,7 @@ gst/audiotestsrc/Makefile gst/encoding/Makefile gst/videoconvert/Makefile gst/gdp/Makefile +gst/gio/Makefile gst/playback/Makefile gst/audioresample/Makefile gst/subparse/Makefile @@ -842,7 +843,6 @@ sys/xvimage/Makefile ext/Makefile ext/alsa/Makefile ext/cdparanoia/Makefile -ext/gio/Makefile ext/libvisual/Makefile ext/ogg/Makefile ext/pango/Makefile diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 1d4355d3db..9946922f51 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -54,10 +54,6 @@ EXTRA_HFILES = \ $(top_srcdir)/ext/alsa/gstalsasink.h \ $(top_srcdir)/ext/alsa/gstalsasrc.h \ $(top_srcdir)/ext/cdparanoia/gstcdparanoiasrc.h \ - $(top_srcdir)/ext/gio/gstgiosink.h \ - $(top_srcdir)/ext/gio/gstgiosrc.h \ - $(top_srcdir)/ext/gio/gstgiostreamsink.h \ - $(top_srcdir)/ext/gio/gstgiostreamsrc.h \ $(top_srcdir)/ext/ogg/gstoggdemux.h \ $(top_srcdir)/ext/ogg/gstoggmux.h \ $(top_srcdir)/ext/pango/gstclockoverlay.h \ @@ -78,6 +74,10 @@ EXTRA_HFILES = \ $(top_srcdir)/gst/encoding/gstencodebin.h \ $(top_srcdir)/gst/gdp/gstgdpdepay.h \ $(top_srcdir)/gst/gdp/gstgdppay.h \ + $(top_srcdir)/gst/gio/gstgiosink.h \ + $(top_srcdir)/gst/gio/gstgiosrc.h \ + $(top_srcdir)/gst/gio/gstgiostreamsink.h \ + $(top_srcdir)/gst/gio/gstgiostreamsrc.h \ $(top_srcdir)/gst/playback/gstplay-enum.h \ $(top_srcdir)/gst/playback/gstsubtitleoverlay.h \ $(top_srcdir)/gst/audiorate/gstaudiorate.h \ diff --git a/ext/Makefile.am b/ext/Makefile.am index f793d4bce0..dc8af0e3ba 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -10,12 +10,6 @@ else CDPARANOIA_DIR= endif -if USE_GIO -GIO_DIR=gio -else -GIO_DIR= -endif - if USE_LIBVISUAL LIBVISUAL_DIR=libvisual else @@ -57,7 +51,6 @@ endif SUBDIRS = \ $(ALSA_DIR) \ $(CDPARANOIA_DIR) \ - $(GIO_DIR) \ $(LIBVISUAL_DIR) \ $(OGG_DIR) \ $(PANGO_DIR) \ @@ -67,7 +60,6 @@ SUBDIRS = \ DIST_SUBDIRS = \ alsa \ cdparanoia \ - gio \ libvisual \ ogg \ pango \ diff --git a/ext/gio/Makefile.am b/gst/gio/Makefile.am similarity index 100% rename from ext/gio/Makefile.am rename to gst/gio/Makefile.am diff --git a/ext/gio/gstgio.c b/gst/gio/gstgio.c similarity index 100% rename from ext/gio/gstgio.c rename to gst/gio/gstgio.c diff --git a/ext/gio/gstgio.h b/gst/gio/gstgio.h similarity index 100% rename from ext/gio/gstgio.h rename to gst/gio/gstgio.h diff --git a/ext/gio/gstgiobasesink.c b/gst/gio/gstgiobasesink.c similarity index 100% rename from ext/gio/gstgiobasesink.c rename to gst/gio/gstgiobasesink.c diff --git a/ext/gio/gstgiobasesink.h b/gst/gio/gstgiobasesink.h similarity index 100% rename from ext/gio/gstgiobasesink.h rename to gst/gio/gstgiobasesink.h diff --git a/ext/gio/gstgiobasesrc.c b/gst/gio/gstgiobasesrc.c similarity index 100% rename from ext/gio/gstgiobasesrc.c rename to gst/gio/gstgiobasesrc.c diff --git a/ext/gio/gstgiobasesrc.h b/gst/gio/gstgiobasesrc.h similarity index 100% rename from ext/gio/gstgiobasesrc.h rename to gst/gio/gstgiobasesrc.h diff --git a/ext/gio/gstgiosink.c b/gst/gio/gstgiosink.c similarity index 100% rename from ext/gio/gstgiosink.c rename to gst/gio/gstgiosink.c diff --git a/ext/gio/gstgiosink.h b/gst/gio/gstgiosink.h similarity index 100% rename from ext/gio/gstgiosink.h rename to gst/gio/gstgiosink.h diff --git a/ext/gio/gstgiosrc.c b/gst/gio/gstgiosrc.c similarity index 100% rename from ext/gio/gstgiosrc.c rename to gst/gio/gstgiosrc.c diff --git a/ext/gio/gstgiosrc.h b/gst/gio/gstgiosrc.h similarity index 100% rename from ext/gio/gstgiosrc.h rename to gst/gio/gstgiosrc.h diff --git a/ext/gio/gstgiostreamsink.c b/gst/gio/gstgiostreamsink.c similarity index 100% rename from ext/gio/gstgiostreamsink.c rename to gst/gio/gstgiostreamsink.c diff --git a/ext/gio/gstgiostreamsink.h b/gst/gio/gstgiostreamsink.h similarity index 100% rename from ext/gio/gstgiostreamsink.h rename to gst/gio/gstgiostreamsink.h diff --git a/ext/gio/gstgiostreamsrc.c b/gst/gio/gstgiostreamsrc.c similarity index 100% rename from ext/gio/gstgiostreamsrc.c rename to gst/gio/gstgiostreamsrc.c diff --git a/ext/gio/gstgiostreamsrc.h b/gst/gio/gstgiostreamsrc.h similarity index 100% rename from ext/gio/gstgiostreamsrc.h rename to gst/gio/gstgiostreamsrc.h diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 2470f17d10..5014c867dd 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -35,12 +35,6 @@ else check_alsa = endif -if USE_GIO -check_gio = pipelines/gio -else -check_gio = -endif - if USE_LIBVISUAL check_libvisual = elements/libvisual else @@ -102,7 +96,6 @@ endif check_PROGRAMS = \ $(check_alsa) \ - $(check_gio) \ $(check_ogg) \ $(check_vorbis) \ elements/audioconvert \ @@ -132,6 +125,7 @@ check_PROGRAMS = \ pipelines/streamheader \ pipelines/basetime \ pipelines/capsfilter-renegotiation \ + pipelines/gio \ elements/appsink \ elements/appsrc \ elements/audiorate \ diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am index a994b384e4..506ba56365 100644 --- a/tests/examples/Makefile.am +++ b/tests/examples/Makefile.am @@ -4,11 +4,7 @@ else FT2_SUBDIRS = endif -if USE_GIO -GIO_SUBDIRS = gio -endif - -SUBDIRS = app audio dynamic fft $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay playrec encoding +SUBDIRS = app audio dynamic fft $(FT2_SUBDIRS) gio overlay playrec encoding DIST_SUBDIRS = app audio dynamic fft gio overlay seek snapshot playrec encoding include $(top_srcdir)/common/parallel-subdirs.mak diff --git a/tests/examples/gio/Makefile.am b/tests/examples/gio/Makefile.am index c4306f8447..457cf4fb9b 100644 --- a/tests/examples/gio/Makefile.am +++ b/tests/examples/gio/Makefile.am @@ -1,8 +1,6 @@ if HAVE_GTK -if USE_GIO noinst_PROGRAMS = giosrc-mounting giosrc_mounting_SOURCES = giosrc-mounting.c giosrc_mounting_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) $(GIO_CFLAGS) giosrc_mounting_LDADD = $(GST_LIBS) $(GTK_LIBS) $(GIO_LIBS) endif -endif