[gst-devel] Re: [gst-cvs] yippi gstreamer: gstreamer/docs/gst/ gstreamer/docs/libs/ gstreamer/gst/ gstreamer/gst/parse/

Thomas Vander Stichele thomas at apestaart.org
Sat Dec 20 05:42:01 CET 2003


Hi Brian,

as announced on the ML and on IRC, we're moving to freedesktop.org
All commits after the MOVE-TO-FDO tag was applied will be lost, so this
one probably will get lost too.

Make sure you get this applied to the new cvs branch on fdo.

BTW, You haven't sent me your login details as asked for in a previous
mail; please send them to me ASAP so I can get you an account.

Thomas

El vie, 19-12-2003 a las 21:27, Brian Cameron escribió:
> CVS Root:       /cvsroot/gstreamer
> Module:         gstreamer
> Changes by:     yippi
> Date:           Fri Dec 19 2003  12:27:15 PST
> 
> Log message:
> Fixed shell in docs/gst/Makefile.am and docs/libs/Makefile.am so that
> it works with Solaris /bin/sh.  Fixed gst/gstplugin.c so it compiles
> properly when the configure --disable-gst_debug option is used.
> Fixed gst/parse/Makefile.am so that it doesn't append grammar.tab.h to
> the end of lex._gst_parse_yy.c since lex._gst_parse_yy.c already
> includes grammar.tab.h via a <#include ...> line.
> 
> Modified files:
>     docs/gst        : Makefile.am
>     docs/libs       : Makefile.am
>     gst             : gstplugin.c
>     gst/parse       : Makefile.am
> 
> Links:
> http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/gst/Makefile.am.diff?r1=1.60&r2=1.61
> http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/libs/Makefile.am.diff?r1=1.23&r2=1.24
> http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstplugin.c.diff?r1=1.111&r2=1.112
> http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/parse/Makefile.am.diff?r1=1.26&r2=1.27
> 
> ====Begin Diffs====
> Index: Makefile.am
> ===================================================================
> RCS file: /cvsroot/gstreamer/gstreamer/docs/gst/Makefile.am,v
> retrieving revision 1.60
> retrieving revision 1.61
> diff -u -d -r1.60 -r1.61
> --- Makefile.am	14 Dec 2003 22:27:25 -0000	1.60
> +++ Makefile.am	19 Dec 2003 20:27:02 -0000	1.61
> @@ -175,8 +175,8 @@
>  	@echo '*** Building HTML ***'
>  	test -d html || mkdir html
>  	cd html && gtkdoc-mkhtml $(DOC_MODULE) $(srcdir)/../$(DOC_MAIN_SGML_FILE)
> -	test "x$(HTML_IMAGES)" = "x" || for i in $(HTML_IMAGES) ; do \
> -	    cp $(srcdir)/$$i html ; done
> +	test "x$(HTML_IMAGES)" = "x" || for i in "" $(HTML_IMAGES) ; do \
> +	    if test "$$i" != ""; then cp $(srcdir)/$$i html ; fi; done
>  	@echo '-- Fixing Crossreferences' 
>  	LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
>  	touch html-build.stamp
> @@ -285,8 +285,8 @@
>  	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
>  
>  	images=$(HTML_IMAGES) ;    	      \
> -	for i in $$images ; do		      \
> -	  cp $(srcdir)/$$i $(distdir)/html ;  \
> +	for i in "" $$images ; do		      \
> +	  if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \
>  	done
>  
>  .PHONY : dist-hook-local
> Index: Makefile.am
> ===================================================================
> RCS file: /cvsroot/gstreamer/gstreamer/docs/libs/Makefile.am,v
> retrieving revision 1.23
> retrieving revision 1.24
> diff -u -d -r1.23 -r1.24
> --- Makefile.am	14 Dec 2003 22:27:25 -0000	1.23
> +++ Makefile.am	19 Dec 2003 20:27:02 -0000	1.24
> @@ -175,8 +175,8 @@
>  	@echo '*** Building HTML ***'
>  	test -d html || mkdir html
>  	cd html && gtkdoc-mkhtml $(DOC_MODULE) $(srcdir)/../$(DOC_MAIN_SGML_FILE)
> -	test "x$(HTML_IMAGES)" = "x" || for i in $(HTML_IMAGES) ; do \
> -	    cp $(srcdir)/$$i html ; done
> +	test "x$(HTML_IMAGES)" = "x" || for i in "" $(HTML_IMAGES) ; do \
> +	    if test "$$i" != ""; then cp $(srcdir)/$$i html ; fi; done
>  	@echo '-- Fixing Crossreferences' 
>  	LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
>  	touch html-build.stamp
> @@ -284,8 +284,8 @@
>  	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
>  
>  	images=$(HTML_IMAGES) ;    	      \
> -	for i in $$images ; do		      \
> -	  cp $(srcdir)/$$i $(distdir)/html ;  \
> +	for i in "" $$images ; do		      \
> +	  if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \
>  	done
>  
>  .PHONY : dist-hook-local
> Index: gstplugin.c
> ===================================================================
> RCS file: /cvsroot/gstreamer/gstreamer/gst/gstplugin.c,v
> retrieving revision 1.111
> retrieving revision 1.112
> diff -u -d -r1.111 -r1.112
> --- gstplugin.c	16 Dec 2003 12:20:54 -0000	1.111
> +++ gstplugin.c	19 Dec 2003 20:27:03 -0000	1.112
> @@ -35,7 +35,12 @@
>  #include "config.h"
>  #include "gstfilter.h"
>  
> +
> +#ifndef GST_DISABLE_GST_DEBUG
>  #define GST_CAT_DEFAULT GST_CAT_PLUGIN_LOADING
> +#else
> +#define GST_CAT_DEFAULT 0
> +#endif
>  
>  static GModule *main_module = NULL;
>  static GList *_gst_plugin_static = NULL;
> Index: Makefile.am
> ===================================================================
> RCS file: /cvsroot/gstreamer/gstreamer/gst/parse/Makefile.am,v
> retrieving revision 1.26
> retrieving revision 1.27
> diff -u -d -r1.26 -r1.27
> --- Makefile.am	15 Dec 2003 22:13:03 -0000	1.26
> +++ Makefile.am	19 Dec 2003 20:27:03 -0000	1.27
> @@ -21,7 +21,9 @@
>  grammar.tab.c grammar.tab.h: grammar.y ../gstmarshal.h
>  	$(BISON_PATH) -d -v -p_gst_parse__yy $(srcdir)/grammar.y -o grammar.tab.c
>   
> -lex._gst_parse_yy.c: parse.l grammar.tab.h
> +parse.l : grammar.tab.h
> +
> +lex._gst_parse_yy.c: parse.l 
>  	$(FLEX_PATH) -P_gst_parse_yy $^
>  
>  ## this is so make install without a previous make can work, because
> 
> 
> -------------------------------------------------------
> This SF.net email is sponsored by: IBM Linux Tutorials.
> Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
> Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
> Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
> _______________________________________________
> gstreamer-cvs-verbose mailing list
> gstreamer-cvs-verbose at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose

Dave/Dina : future TV today ! - http://davedina.apestaart.org/
<-*- thomas (dot) apestaart (dot) org -*->
her warm white belly
in the life I'd lived
had seen nothing finer
<-*- thomas (at) apestaart (dot) org -*->
URGent, best radio on the net - 24/7 ! - http://urgent.fm/






More information about the gstreamer-devel mailing list