From: <tho...@fr...> - 2005-11-29 19:12:53
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: thomasvs Date: Tue Nov 29 2005 11:12:42 PST Log message: CVS surgery + support to move base, check, and net out of gst and into libs/gst Modified files: . : ChangeLog configure.ac check : Makefile.am docs/gst : Makefile.am gst : Makefile.am libs/gst : Makefile.am libs/gst/base : Makefile.am gstbasetransform.c libs/gst/check : Makefile.am plugins/elements: Makefile.am po : POTFILES.in Removed files: gst/base : .cvsignore Makefile.am README gstadapter.c gstadapter.h gstbasesink.c gstbasesink.h gstbasesrc.c gstbasesrc.h gstbasetransform.c gstbasetransform.h gstcollectpads.c gstcollectpads.h gstpushsrc.c gstpushsrc.h gsttypefindhelper.c gsttypefindhelper.h gst/check : Makefile.am gstcheck.c gstcheck.h gst/net : Makefile.am gstnet.h gstnetclientclock.c gstnetclientclock.h gstnettimepacket.c gstnettimepacket.h gstnettimeprovider.c gstnettimeprovider.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2052&r2=1.2053 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/configure.ac.diff?r1=1.418&r2=1.419 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/check/Makefile.am.diff?r1=1.81&r2=1.82 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/gst/Makefile.am.diff?r1=1.104&r2=1.105 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/Makefile.am.diff?r1=1.207&r2=1.208 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/.cvsignore http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/Makefile.am http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/README http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstadapter.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstadapter.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstbasesink.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstbasesink.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstbasesrc.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstbasesrc.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstbasetransform.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstbasetransform.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstcollectpads.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstcollectpads.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstpushsrc.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstpushsrc.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gsttypefindhelper.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gsttypefindhelper.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/check/Makefile.am http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/check/gstcheck.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/check/gstcheck.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/net/Makefile.am http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/net/gstnet.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/net/gstnetclientclock.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/net/gstnetclientclock.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/net/gstnettimepacket.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/net/gstnettimepacket.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/net/gstnettimeprovider.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/net/gstnettimeprovider.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/libs/gst/Makefile.am.diff?r1=1.11&r2=1.12 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/libs/gst/base/Makefile.am.diff?r1=1.15&r2=1.16 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/libs/gst/base/gstbasetransform.c.diff?r1=1.60&r2=1.61 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/libs/gst/check/Makefile.am.diff?r1=1.3&r2=1.4 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/Makefile.am.diff?r1=1.77&r2=1.78 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/po/POTFILES.in.diff?r1=1.18&r2=1.19 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2052 retrieving revision 1.2053 diff -u -d -r1.2052 -r1.2053 --- ChangeLog 29 Nov 2005 18:57:58 -0000 1.2052 +++ ChangeLog 29 Nov 2005 19:12:28 -0000 1.2053 @@ -1,3 +1,46 @@ +2005-11-29 Thomas Vander Stichele <thomas (at) apestaart (dot) org> + + * check/Makefile.am: + * configure.ac: + * docs/gst/Makefile.am: + * gst/Makefile.am: + * gst/base/.cvsignore: + * gst/base/Makefile.am: + * gst/base/README: + * gst/base/gstadapter.c: + * gst/base/gstadapter.h: + * gst/base/gstbasesink.c: + * gst/base/gstbasesink.h: + * gst/base/gstbasesrc.c: + * gst/base/gstbasesrc.h: + * gst/base/gstbasetransform.c: + * gst/base/gstbasetransform.h: + * gst/base/gstcollectpads.c: + * gst/base/gstcollectpads.h: + * gst/base/gstpushsrc.c: + * gst/base/gstpushsrc.h: + * gst/base/gsttypefindhelper.c: + * gst/base/gsttypefindhelper.h: + * gst/check/Makefile.am: + * gst/check/gstcheck.c: + * gst/check/gstcheck.h: + * gst/net/Makefile.am: + * gst/net/gstnet.h: + * gst/net/gstnetclientclock.c: + * gst/net/gstnetclientclock.h: + * gst/net/gstnettimepacket.c: + * gst/net/gstnettimepacket.h: + * gst/net/gstnettimeprovider.c: + * gst/net/gstnettimeprovider.h: + * libs/gst/Makefile.am: + * libs/gst/base/Makefile.am: + * libs/gst/base/gstbasetransform.c: + * libs/gst/check/Makefile.am: + * plugins/elements/Makefile.am: + * po/POTFILES.in: + CVS surgery + support to move base, check, and net out of gst + and into libs/gst 2005-11-29 Andy Wingo <wi...@po...> * gst/gstevent.h (struct _GstEvent): Only one pointer of padding. Index: configure.ac RCS file: /cvs/gstreamer/gstreamer/configure.ac,v retrieving revision 1.418 retrieving revision 1.419 diff -u -d -r1.418 -r1.419 --- configure.ac 29 Nov 2005 18:00:14 -0000 1.418 +++ configure.ac 29 Nov 2005 19:12:28 -0000 1.419 @@ -473,14 +473,14 @@ gst/Makefile gst/gstconfig.h gst/gstversion.h -gst/base/Makefile -gst/check/Makefile -gst/net/Makefile gst/parse/Makefile libs/Makefile libs/gst/Makefile +libs/gst/base/Makefile +libs/gst/check/Makefile libs/gst/controller/Makefile libs/gst/dataprotocol/Makefile +libs/gst/net/Makefile plugins/Makefile plugins/indexers/Makefile plugins/elements/Makefile Index: Makefile.am RCS file: /cvs/gstreamer/gstreamer/check/Makefile.am,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- Makefile.am 29 Nov 2005 18:14:35 -0000 1.81 +++ Makefile.am 29 Nov 2005 19:12:28 -0000 1.82 @@ -70,7 +70,7 @@ noinst_HEADERS = gst/capslist.h AM_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) -LDADD = $(top_builddir)/gst/check/libgstcheck-@GST_MAJORMINOR@.la \ +LDADD = $(top_builddir)/libs/gst/check/libgstcheck-@GST_MAJORMINOR@.la \ $(GST_OBJ_LIBS) \ $(CHECK_LIBS) @@ -86,10 +86,10 @@ $(LDADD) net_gstnetclientclock_LDADD = \ - $(top_builddir)/gst/net/libgstnet-@GST_MAJORMINOR@.la \ + $(top_builddir)/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la \ net_gstnettimeprovider_LDADD = \ # valgrind testing RCS file: /cvs/gstreamer/gstreamer/docs/gst/Makefile.am,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 --- Makefile.am 29 Nov 2005 18:04:28 -0000 1.104 +++ Makefile.am 29 Nov 2005 19:12:28 -0000 1.105 @@ -33,12 +33,6 @@ # The top-level SGML file. Change it if you want. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml -# The directory containing the source code. Relative to $(top_srcdir). -# gtk-doc will search all .c & .h files beneath here for inline comments -# documenting functions and macros. -DOC_SOURCE_DIR=$(top_srcdir)/gst -DOC_BUILD_DIR=$(top_builddir)/gst - # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS=--deprecated-guards="GST_DISABLE_DEPRECATED" @@ -48,17 +42,22 @@ # Extra options to supply to gtkdoc-fixref. FIXXREF_OPTIONS= -# Used for dependencies. -HFILE_GLOB=$(DOC_SOURCE_DIR)/*.h -CFILE_GLOB=$(DOC_SOURCE_DIR)/*.c +# The files containing the source code. Relative to $(top_srcdir). +# gtk-doc will search all .c & .h files beneath here for inline comments +# documenting functions and macros. +DOC_SOURCE_DIR = $(top_srcdir)/gst +DOC_BUILD_DIR = $(top_builddir)/gst +HFILE_GLOB=$(top_srcdir)/gst/*.h $(top_srcdir)/libs/gst/*/*.h +CFILE_GLOB=$(top_srcdir)/gst/*.c $(top_srcdir)/libs/gst/*/*.c # Dependencies for the intermediate scanobj tool #SCANOBJ_DEPS = $(top_builddir)/gst/elements/libgstelements.la \ # $(top_builddir)/gst/schedulers/libgstbasicomegascheduler.la SCANOBJ_DEPS = \ $(top_builddir)/plugins/elements/libgstelements.la \ - $(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst/net/libgstnet-@GST_MAJORMINOR@.la + $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \ + $(top_builddir)/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la # Header files to ignore when scanning. Use base file name, no paths IGNORE_HFILES= \ RCS file: /cvs/gstreamer/gstreamer/gst/Makefile.am,v retrieving revision 1.207 retrieving revision 1.208 diff -u -d -r1.207 -r1.208 --- Makefile.am 29 Nov 2005 18:14:35 -0000 1.207 +++ Makefile.am 29 Nov 2005 19:12:28 -0000 1.208 @@ -1,11 +1,5 @@ lib_LTLIBRARIES = libgstreamer-@GST_MAJORMINOR@.la -if HAVE_CHECK -SUBDIRS_CHECK = check -else -SUBDIRS_CHECK = -endif if GST_DISABLE_LOADSAVE GST_LOADSAVE_SRC = else @@ -52,24 +46,9 @@ GST_URI_SRC = gsturi.c endif -if GST_DISABLE_NET -SUBDIRS_NET = -if HAVE_SYS_SOCKET_H -SUBDIRS_NET = net -SUBDIRS = \ - $(SUBDIRS_PARSE) \ - . \ - base \ - $(SUBDIRS_NET) \ - $(SUBDIRS_CHECK) +SUBDIRS = $(SUBDIRS_PARSE) -DIST_SUBDIRS = base parse net check +DIST_SUBDIRS = parse # make variables for all generated source and header files to make the # distinction clear --- .cvsignore DELETED --- --- Makefile.am DELETED --- --- README DELETED --- --- gstadapter.c DELETED --- --- gstadapter.h DELETED --- --- gstbasesink.c DELETED --- --- gstbasesink.h DELETED --- --- gstbasesrc.c DELETED --- --- gstbasesrc.h DELETED --- --- gstbasetransform.c DELETED --- --- gstbasetransform.h DELETED --- --- gstcollectpads.c DELETED --- --- gstcollectpads.h DELETED --- --- gstpushsrc.c DELETED --- --- gstpushsrc.h DELETED --- --- gsttypefindhelper.c DELETED --- --- gsttypefindhelper.h DELETED --- --- gstcheck.c DELETED --- --- gstcheck.h DELETED --- --- gstnet.h DELETED --- --- gstnetclientclock.c DELETED --- --- gstnetclientclock.h DELETED --- --- gstnettimepacket.c DELETED --- --- gstnettimepacket.h DELETED --- --- gstnettimeprovider.c DELETED --- --- gstnettimeprovider.h DELETED --- RCS file: /cvs/gstreamer/gstreamer/libs/gst/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 15 Sep 2005 05:48:30 -0000 1.11 +++ Makefile.am 29 Nov 2005 19:12:29 -0000 1.12 @@ -1 +1,20 @@ -SUBDIRS = controller dataprotocol +if HAVE_CHECK +SUBDIRS_CHECK = check +else +SUBDIRS_CHECK = +endif +if GST_DISABLE_NET +SUBDIRS_NET = +if HAVE_SYS_SOCKET_H +SUBDIRS_NET = net +SUBDIRS_ALWAYS = base controller dataprotocol +SUBDIRS = $(SUBDIRS_ALWAYS) $(SUBDIRS_CHECK) $(SUBDIRS_NET) +DIST_SUBDIRS = $(SUBDIRS_ALWAYS) check net RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile.am 27 Nov 2005 15:15:34 -0000 1.15 +++ Makefile.am 29 Nov 2005 19:12:30 -0000 1.16 @@ -1,7 +1,7 @@ lib_LTLIBRARIES = libgstbase-@GST_MAJORMINOR@.la libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = \ - ../libgstreamer-@GST_MAJORMINOR@.la + $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la libgstbase_@GST_MAJORMINOR@_la_SOURCES = \ gstadapter.c \ gstbasesink.c \ Index: gstbasetransform.c RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstbasetransform.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- gstbasetransform.c 29 Nov 2005 15:12:22 -0000 1.60 +++ gstbasetransform.c 29 Nov 2005 19:12:30 -0000 1.61 @@ -188,7 +188,7 @@ #include <stdlib.h> #include <string.h> -#include "../gst-i18n-lib.h" +#include "../../../gst/gst-i18n-lib.h" #include "gstbasetransform.h" #include <gst/gstmarshal.h> RCS file: /cvs/gstreamer/gstreamer/libs/gst/check/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 27 Nov 2005 15:15:35 -0000 1.3 +++ Makefile.am 29 Nov 2005 19:12:30 -0000 1.4 @@ -1,13 +1,13 @@ lib_LTLIBRARIES = libgstcheck-@GST_MAJORMINOR@.la libgstcheck_@GST_MAJORMINOR@_la_DEPENDENCIES = \ libgstcheck_@GST_MAJORMINOR@_la_SOURCES = \ gstcheck.c libgstcheck_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) libgstcheck_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) $(CHECK_LIBS) \ libgstcheck_@GST_MAJORMINOR@_la_LDFLAGS = \ libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) RCS file: /cvs/gstreamer/gstreamer/plugins/elements/Makefile.am,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- Makefile.am 29 Nov 2005 18:00:15 -0000 1.77 +++ Makefile.am 29 Nov 2005 19:12:30 -0000 1.78 @@ -28,7 +28,7 @@ libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS) libgstelements_la_LIBADD = \ $(GST_OBJ_LIBS) libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) Index: POTFILES.in RCS file: /cvs/gstreamer/gstreamer/po/POTFILES.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- POTFILES.in 29 Nov 2005 18:38:46 -0000 1.18 +++ POTFILES.in 29 Nov 2005 19:12:30 -0000 1.19 @@ -6,8 +6,8 @@ gst/gstqueue.c gst/gsttaglist.c gst/parse/grammar.y -gst/base/gstbasesrc.c -gst/base/gstbasesink.c +libs/gst/base/gstbasesrc.c +libs/gst/base/gstbasesink.c plugins/elements/gstfakesink.c plugins/elements/gstfilesink.c plugins/elements/gstfilesrc.c |