changed libgst -> libgstreamer to comply with namespace issues with gnu smalltalk...

Original commit message from CVS:
* changed libgst -> libgstreamer to comply with namespace issues with gnu smalltalk
* various other fixes

diff --git a/common b/common
index 8a9436f..2c01982 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 8a9436f47d6e851edbf25d4cceaf071bdc6d11a2
+Subproject commit 2c019822f7097285eba6c1898ef9f3e996fadc8f

diff --git a/components/bonobo-gstmediaplay/Makefile.am b/components/bonobo-gstmediaplay/Makefile.am
index c026f43..2611513 100644 (file)
--- a/components/bonobo-gstmediaplay/Makefile.am
+++ b/components/bonobo-gstmediaplay/Makefile.am
@@ -21,7 +21,7 @@ bonobo_gstmediaplay_CFLAGS = -Wall -O2                \
 
 bonobo_gstmediaplay_LDADD =            \
        $(top_srcdir)/gstplay/libgstmediaplay.la \
-       $(top_srcdir)/gst/libgst.la
+       $(top_srcdir)/gst/libgstreamer.la
 
 bonobo_gstmediaplay_LDFLAGS =          \
        $(shell gnome-config --libs gnome gnomeui bonobo bonobox)  $(shell libglade-config --libs gnome) \

diff --git a/configure.ac b/configure.ac
index da8ff11..e9b3475 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -376,7 +376,7 @@ AC_SUBST(LIBGST_LIBS)
 AC_SUBST(LIBGST_CFLAGS)
 
 dnl Vars for everyone else
-GST_INT_LIBS="\$(top_builddir)/gst/libgst.la"
+GST_INT_LIBS="\$(top_builddir)/gst/libgstreamer.la"
 GST_INT_CFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir)/include -I\$(top_srcdir) -Wall"
 
 AC_SUBST(GST_CFLAGS, "$GST_EXT_CFLAGS $GST_INT_CFLAGS")

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 42c5694..6467e32 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -1,5 +1,5 @@
 
-lib_LTLIBRARIES = libgst.la
+lib_LTLIBRARIES = libgstreamer.la
 noinst_LTLIBRARIES = libcothreads.la
 
 if HAVE_CPU_I386
@@ -42,14 +42,14 @@ else
 GST_TRACE_SRC = gsttrace.c
 endif
 
-EXTRA_libgst_la_SOURCES = gstcpuid_i386.s gstmarshal.list gstxml.c gsttypefind.c gstparse.c gstautoplug.c gsttrace.c
+EXTRA_libgstreamer_la_SOURCES = gstcpuid_i386.s gstmarshal.list gstxml.c gsttypefind.c gstparse.c gstautoplug.c gsttrace.c
 
 # cheap trick to build . first...
 SUBDIRS = . types elements $(GST_AUTOPLUG_DIRS) schedulers
 DIST_SUBDIRS = types elements autoplug schedulers
 
 libcothreads_la_SOURCES = cothreads.c
-libgst_la_SOURCES =            \
+libgstreamer_la_SOURCES =              \
        gst.c                   \
        gstmarshal.c            \
        gstobject.c             \
@@ -105,8 +105,8 @@ dist-hook:
 distclean-local:
        rm -f $(top_builddir)/gst/gstmarshal.c $(top_builddir)/gst/gstmarshal.h
 
-libgstincludedir = $(includedir)/gst
-libgstinclude_HEADERS =                \
+libgstreamerincludedir = $(includedir)/gstreamer
+libgstreamerinclude_HEADERS =          \
        cothreads.h             \
        gst.h                   \
        gstconfig.h             \
@@ -149,16 +149,16 @@ noinst_HEADERS =  \
        gstarch.h       \
        gstpropsprivate.h
 
-libgst_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
+libgstreamer_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
        $(LIBGST_CFLAGS) \
        -D_GNU_SOURCE \
        -DG_LOG_DOMAIN=g_log_domain_gstreamer \
        -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\"
 
 # the compiler shoots cothreads.c in the head at -O6
-libcothreads_la_CFLAGS = $(libgst_la_CFLAGS) -O2
+libcothreads_la_CFLAGS = $(libgstreamer_la_CFLAGS) -O2
 
-libgst_la_LIBADD = $(LIBGST_LIBS) libcothreads.la
-libgst_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@
+libgstreamer_la_LIBADD = $(LIBGST_LIBS) libcothreads.la
+libgstreamer_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@
 
 EXTRA_DIST = ROADMAP

diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am
index 48ec960..440c655 100644 (file)
--- a/gst/elements/Makefile.am
+++ b/gst/elements/Makefile.am
@@ -2,7 +2,7 @@ plugindir = $(libdir)/gst
 
 plugin_LTLIBRARIES = libgstelements.la
 
-libgstelements_la_DEPENDENCIES = ../libgst.la
+libgstelements_la_DEPENDENCIES = ../libgstreamer.la
 libgstelements_la_SOURCES =    \
        gstelements.c           \
        gstfakesrc.c            \

diff --git a/gst/elements/gstfakesrc.c b/gst/elements/gstfakesrc.c
index 61613cd..e4d496e 100644 (file)
--- a/gst/elements/gstfakesrc.c
+++ b/gst/elements/gstfakesrc.c
@@ -267,6 +267,7 @@ gst_fakesrc_init (GstFakeSrc *fakesrc)
   fakesrc->loop_based = FALSE;
   gst_fakesrc_update_functions (fakesrc);
 
+  fakesrc->output = FAKESRC_FIRST_LAST_LOOP;
   fakesrc->num_buffers = -1;
   fakesrc->rt_num_buffers = -1;
   fakesrc->buffer_count = 0;
@@ -390,6 +391,7 @@ gst_fakesrc_set_property (GObject *object, guint prop_id, const GValue *value, G
       gst_fakesrc_update_functions (src);
       break;
     case ARG_OUTPUT:
+      g_warning ("not yet implemented");
       break;
     case ARG_DATA:
       src->data = g_value_get_enum (value);

diff --git a/gstreamer-uninstalled.pc.in b/gstreamer-uninstalled.pc.in
index f289fd8..0f62bd7 100644 (file)
--- a/gstreamer-uninstalled.pc.in
+++ b/gstreamer-uninstalled.pc.in
@@ -7,6 +7,6 @@ Name: GStreamer Uninstalled
 Description: Streaming-media framework, Not Installed
 Version: @VERSION@
 Requires: @GST_PKG_DEPS@@LIBXML_PKG@
-Libs: ${pcfiledir}/gst/libgst.la -L${pcfiledir}/libs/gst/control/
+Libs: ${pcfiledir}/gst/libgstreamer.la -L${pcfiledir}/libs/gst/control/
 Cflags: -I${pcfiledir} -I${pcfiledir}/libs -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}/@srcdir@/libs @GST_PKG_CFLAGS@
 

diff --git a/gstreamer.pc.in b/gstreamer.pc.in
index c2b66d6..b31d9c5 100644 (file)
--- a/gstreamer.pc.in
+++ b/gstreamer.pc.in
@@ -7,5 +7,5 @@ Name: GStreamer
 Description: Streaming-media framework
 Requires: @GST_PKG_DEPS@@LIBXML_PKG@
 Version: @VERSION@
-Libs: -L${libdir} -L${libdir}/gst -lgst
+Libs: -L${libdir} -L${libdir}/gst -lgstreamer
 Cflags: -I${includedir} @GST_PKG_CFLAGS@

diff --git a/libs/Makefile.am b/libs/Makefile.am
index a285d33..4a2c7b6 100644 (file)
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = gst ## ext
+SUBDIRS = gst ext
 
-DIST_SUBDIRS = gst ## ext
+DIST_SUBDIRS = gst ext

diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index 48ec960..440c655 100644 (file)
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -2,7 +2,7 @@ plugindir = $(libdir)/gst
 
 plugin_LTLIBRARIES = libgstelements.la
 
-libgstelements_la_DEPENDENCIES = ../libgst.la
+libgstelements_la_DEPENDENCIES = ../libgstreamer.la
 libgstelements_la_SOURCES =    \
        gstelements.c           \
        gstfakesrc.c            \

diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c
index 61613cd..e4d496e 100644 (file)
--- a/plugins/elements/gstfakesrc.c
+++ b/plugins/elements/gstfakesrc.c
@@ -267,6 +267,7 @@ gst_fakesrc_init (GstFakeSrc *fakesrc)
   fakesrc->loop_based = FALSE;
   gst_fakesrc_update_functions (fakesrc);
 
+  fakesrc->output = FAKESRC_FIRST_LAST_LOOP;
   fakesrc->num_buffers = -1;
   fakesrc->rt_num_buffers = -1;
   fakesrc->buffer_count = 0;
@@ -390,6 +391,7 @@ gst_fakesrc_set_property (GObject *object, guint prop_id, const GValue *value, G
       gst_fakesrc_update_functions (src);
       break;
     case ARG_OUTPUT:
+      g_warning ("not yet implemented");
       break;
     case ARG_DATA:
       src->data = g_value_get_enum (value);