From: <tp...@ke...> - 2008-04-16 10:31:27
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: tpm Date: Wed Apr 16 2008 10:31:31 UTC Log message: * configure.ac: * gst/goom/Makefile.am: * gst/goom/convolve_fx.c: * gst/goom/default_scripts.h: * gst/goom/goom.h: * gst/goom/goom_core.c: (choose_a_goom_line): * gst/goom/goom_plugin_info.h: * gst/goom/goomsl.c: * gst/goom/goomsl.h: * gst/goom/goomsl_hash.c: * gst/goom/goomsl_hash.h: * gst/goom/goomsl_heap.c: * gst/goom/goomsl_heap.h: * gst/goom/goomsl_private.h: * gst/goom/plugin_info.c: Strip out the config/script parsing stuff, we don't need it. Fixes #527999. Modified files: . : ChangeLog configure.ac gst/goom : Makefile.am convolve_fx.c goom.h goom_core.c goom_plugin_info.h plugin_info.c Removed files: gst/goom : default_scripts.h goomsl.c goomsl.h goomsl_hash.c goomsl_hash.h goomsl_heap.c goomsl_heap.h goomsl_private.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3404&r2=1.3405 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/configure.ac.diff?r1=1.740&r2=1.741 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/Makefile.am.diff?r1=1.23&r2=1.24 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/convolve_fx.c.diff?r1=1.4&r2=1.5 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/default_scripts.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/goom.h.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/goom_core.c.diff?r1=1.11&r2=1.12 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/goom_plugin_info.h.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/goomsl.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/goomsl.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/goomsl_hash.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/goomsl_hash.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/goomsl_heap.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/goomsl_heap.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/goomsl_private.h http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/goom/plugin_info.c.diff?r1=1.10&r2=1.11 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.3404 retrieving revision 1.3405 diff -u -d -r1.3404 -r1.3405 --- ChangeLog 15 Apr 2008 16:58:31 -0000 1.3404 +++ ChangeLog 16 Apr 2008 10:31:12 -0000 1.3405 @@ -1,3 +1,23 @@ +2008-04-16 Tim-Philipp Müller <tim at centricular dot net> + + * configure.ac: + * gst/goom/Makefile.am: + * gst/goom/convolve_fx.c: + * gst/goom/default_scripts.h: + * gst/goom/goom.h: + * gst/goom/goom_core.c: (choose_a_goom_line): + * gst/goom/goom_plugin_info.h: + * gst/goom/goomsl.c: + * gst/goom/goomsl.h: + * gst/goom/goomsl_hash.c: + * gst/goom/goomsl_hash.h: + * gst/goom/goomsl_heap.c: + * gst/goom/goomsl_heap.h: + * gst/goom/goomsl_private.h: + * gst/goom/plugin_info.c: + Strip out the config/script parsing stuff, we don't need it. + Fixes #527999. 2008-04-15 Tim-Philipp Müller <tim at centricular dot net> * gst/goom/plugin_info.c: (setOptimizedMethods): Index: configure.ac RCS file: /cvs/gstreamer/gst-plugins-good/configure.ac,v retrieving revision 1.740 retrieving revision 1.741 diff -u -d -r1.740 -r1.741 --- configure.ac 12 Apr 2008 23:47:23 -0000 1.740 +++ configure.ac 16 Apr 2008 10:31:13 -0000 1.741 @@ -116,10 +116,6 @@ dnl find an assembler AM_PROG_AS -dnl we require flex and bison for building the goom plugin -AG_GST_BISON_CHECK -AG_GST_FLEX_CHECK - AC_PATH_PROG(VALGRIND_PATH, valgrind, no) AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno") Index: Makefile.am RCS file: /cvs/gstreamer/gst-plugins-good/gst/goom/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Makefile.am 9 Apr 2008 16:11:38 -0000 1.23 +++ Makefile.am 16 Apr 2008 10:31:14 -0000 1.24 @@ -1,3 +1,4 @@ plugin_LTLIBRARIES = libgstgoom.la PPC_FILES=ppc_zoom_ultimate.s ppc_drawings.s ppc_drawings.h ppc_zoom_ultimate.h @@ -23,16 +24,13 @@ drawmethods.c drawmethods.h \ sound_tester.c sound_tester.h \ mathtools.c mathtools.h \ - goomsl_heap.c goomsl_heap.h \ - goomsl_hash.c goomsl_hash.h \ - goomsl.c goomsl_private.h \ lines.c lines.h ifs.c ifs.h surf3d.c surf3d.h \ tentacle3d.c tentacle3d.h v3d.c v3d.h \ convolve_fx.c flying_stars_fx.c \ goom_fx.h goom_visual_fx.h \ motif_goom1.h motif_goom2.h \ plugin_info.c goom_plugin_info.h \ - default_scripts.h goom_tools.c \ + goom_tools.c \ config_param.c filters.c goom_core.c graphic.c \ goom.h goom_typedefs.h goom_graphic.h \ goom_config_param.h goom_visual_fx.h goom_filters.h \ @@ -40,45 +38,10 @@ $(ARCH_FILES) libgstgoom_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) $(LIBOIL_CFLAGS) $(ARCH_CFLAGS) -libgstgoom_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) $(LIBOIL_LIBS) libgstgoomconfigparse.la +libgstgoom_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) $(LIBOIL_LIBS) libgstgoom_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) EXTRA_DIST = filters.c $(PPC_FILES) $(MMX_FILES) -goomsl_yacc.c goomsl_yacc.h: goomsl_yacc.y - $(BISON_PATH) -d $(srcdir)/goomsl_yacc.y -o goomsl_yacc.c && \ - mv goomsl_yacc.c goomsl_yacc_tmp.c && \ - echo '#ifdef HAVE_CONFIG_H' > goomsl_yacc_tmp2.c && \ - echo '#include <config.h>' >> goomsl_yacc_tmp2.c && \ - echo '#endif' >> goomsl_yacc_tmp2.c && \ - cat goomsl_yacc_tmp.c >> goomsl_yacc_tmp2.c && \ - rm goomsl_yacc_tmp.c && \ - mv goomsl_yacc_tmp2.c goomsl_yacc.c -goomsl_lex.c: goomsl_lex.l goomsl_yacc.h - $(FLEX_PATH) -ogoomsl_lex.c $(srcdir)/goomsl_lex.l && \ - mv goomsl_lex.c goomsl_lex_tmp.c && \ - echo '#ifdef HAVE_CONFIG_H' > goomsl_lex_tmp2.c && \ - echo '#include <config.h>' >> goomsl_lex_tmp2.c && \ - echo '#endif' >> goomsl_lex_tmp2.c && \ - cat goomsl_lex_tmp.c >> goomsl_lex_tmp2.c && \ - rm goomsl_lex_tmp.c && \ - mv goomsl_lex_tmp2.c goomsl_lex.c -# libgstgoomconfigparse.la is library linked into the goom plugin -noinst_LTLIBRARIES = libgstgoomconfigparse.la -# uncomment these lines to dist the generated sources -#BUILT_SOURCES = goomsl_yacc.h goomsl_yacc.c goomsl_lex.c -#libgstgoomconfigparse_la_SOURCES = goomsl_lex.c goomsl_yacc.c goomsl_yacc.h -#libgstgoomconfigparse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) $(LIBOIL_CFLAGS) $(ARCH_CFLAGS) -# uncomment these lines to _NOT_ dist the generated sources -nodist_libgstgoomconfigparse_la_SOURCES = goomsl_lex.c goomsl_yacc.c -libgstgoomconfigparse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GOOM_FILTER_CFLAGS) $(LIBOIL_CFLAGS) $(ARCH_CFLAGS) -CLEANFILES=goomsl_yacc.c goomsl_lex.c goomsl_yacc.h -EXTRA_DIST += goomsl_yacc.y goomsl_lex.l .NOTPARALLEL: Index: convolve_fx.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/goom/convolve_fx.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- convolve_fx.c 9 Apr 2008 13:31:22 -0000 1.4 +++ convolve_fx.c 16 Apr 2008 10:31:14 -0000 1.5 @@ -1,6 +1,5 @@ #include "goom_fx.h" #include "goom_plugin_info.h" -#include "goomsl.h" #include "goom_config.h" #include <math.h> #include <stdio.h> @@ -29,8 +28,6 @@ PluginParam factor_p; PluginParameters params; - GoomSL *script; /* rotozoom */ int theta; float ftheta; --- default_scripts.h DELETED --- Index: goom.h RCS file: /cvs/gstreamer/gst-plugins-good/gst/goom/goom.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- goom.h 9 Apr 2008 16:11:39 -0000 1.2 +++ goom.h 16 Apr 2008 10:31:14 -0000 1.3 @@ -3,7 +3,6 @@ #define NB_FX 10 Index: goom_core.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/goom/goom_core.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- goom_core.c 9 Apr 2008 16:11:39 -0000 1.11 +++ goom_core.c 16 Apr 2008 10:31:14 -0000 1.12 @@ -24,7 +24,6 @@ #include "sound_tester.h" /* #define VERBOSE */ Index: goom_plugin_info.h RCS file: /cvs/gstreamer/gst-plugins-good/gst/goom/goom_plugin_info.h,v --- goom_plugin_info.h 9 Apr 2008 16:11:39 -0000 1.2 +++ goom_plugin_info.h 16 Apr 2008 10:31:14 -0000 1.3 @@ -10,7 +10,6 @@ #include "goom_visual_fx.h" #include "goom_filters.h" #include "goom_tools.h" typedef struct { char drawIFS; @@ -153,10 +152,6 @@ } methods; GoomRandom *gRandom; - - GoomSL *scanner; - GoomSL *main_scanner; - const char *main_script_str; }; void plugin_info_init(PluginInfo *p, int nbVisual); --- goomsl.c DELETED --- --- goomsl.h DELETED --- --- goomsl_hash.c DELETED --- --- goomsl_hash.h DELETED --- --- goomsl_heap.c DELETED --- --- goomsl_heap.h DELETED --- --- goomsl_private.h DELETED --- Index: plugin_info.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/goom/plugin_info.c,v retrieving revision 1.10 diff -u -d -r1.10 -r1.11 --- plugin_info.c 15 Apr 2008 16:58:36 -0000 1.10 +++ plugin_info.c 16 Apr 2008 10:31:17 -0000 1.11 @@ -8,7 +8,6 @@ -#include "default_scripts.h" #include "drawmethods.h" @@ -196,10 +195,6 @@ setOptimizedMethods (pp); - pp->scanner = gsl_new (); - pp->main_scanner = gsl_new (); - pp->main_script_str = GOOM_MAIN_SCRIPT; for (i = 0; i < 0xffff; i++) { pp->sintable[i] = (int) (1024 * sin ((double) i * 360 / (sizeof (pp->sintable) / |