From: <en...@ke...> - 2006-07-21 13:11:46
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: ensonic Date: Fri Jul 21 2006 13:11:45 UTC Log message: * configure.ac: * gst/gstparse.c: (gst_parse_launch): Modified files: . : ChangeLog configure.ac gst : gstparse.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2687&r2=1.2688 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/configure.ac.diff?r1=1.477&r2=1.478 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstparse.c.diff?r1=1.72&r2=1.73 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2687 retrieving revision 1.2688 diff -u -d -r1.2687 -r1.2688 --- ChangeLog 21 Jul 2006 10:40:25 -0000 1.2687 +++ ChangeLog 21 Jul 2006 13:11:33 -0000 1.2688 @@ -1,3 +1,8 @@ +2006-07-21 Stefan Kost <en...@us...> + + * configure.ac: + * gst/gstparse.c: (gst_parse_launch): 2006-07-21 Wim Taymans <wi...@fl...> * gst/gstparse.c: (gst_parse_launch): Index: configure.ac RCS file: /cvs/gstreamer/gstreamer/configure.ac,v retrieving revision 1.477 retrieving revision 1.478 diff -u -d -r1.477 -r1.478 --- configure.ac 14 Jul 2006 15:52:55 -0000 1.477 +++ configure.ac 21 Jul 2006 13:11:33 -0000 1.478 @@ -236,41 +236,16 @@ dnl find an assembler AM_PROG_AS -dnl we use awk in the bison version check -AC_PROG_AWK - -dnl we require bison for building the parser -dnl FIXME: check if AC_PROG_YACC is suitable here -dnl FIXME: make precious -AC_PATH_PROG(BISON_PATH, bison, no) -if test x$BISON_PATH = xno; then - AC_MSG_ERROR(Could not find bison) -fi -dnl check bison version -AC_MSG_CHECKING([bison version]) -if $BISON_PATH --version | head -n 1 | $AWK '{ if ($4 < 1.35) exit 1; else exit 0;}'; -then - AC_MSG_RESULT([ok]) -else - AC_MSG_RESULT([too old.]) - AC_MSG_ERROR([Your bison version is too old, v1.35 or later is required.]) -dnl we require flex for building the parser -dnl FIXME: check if AC_PROG_LEX is suitable here -AC_PATH_PROG(FLEX_PATH, flex, no) -if test x$FLEX_PATH = xno; then - AC_MSG_ERROR(Could not find flex) -dnl Perl is used in building documentation +dnl Perl is used in building documentation and in the version checks AC_PATH_PROG(PERL_PATH, perl, no) if test x$PERL_PATH = xno; then AC_MSG_ERROR(Could not find perl) fi +dnl we require flex and bison for building the parser +GST_BISON_CHECK +GST_FLEX_CHECK AC_PATH_PROG(VALGRIND_PATH, valgrind, no) AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno") Index: gstparse.c RCS file: /cvs/gstreamer/gstreamer/gst/gstparse.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- gstparse.c 21 Jul 2006 10:40:25 -0000 1.72 +++ gstparse.c 21 Jul 2006 13:11:33 -0000 1.73 @@ -38,7 +38,10 @@ /* the need for the mutex will go away with flex 2.5.6 */ static gboolean flex_busy = FALSE; +#ifndef HAVE_MT_SAVE_FLEX static GStaticRecMutex flex_lock = G_STATIC_REC_MUTEX_INIT; +#endif extern GstElement *_gst_parse_launch (const gchar *, GError **); @@ -147,7 +150,9 @@ GST_CAT_INFO (GST_CAT_PIPELINE, "parsing pipeline description %s", pipeline_description); g_static_rec_mutex_lock (&flex_lock); if (flex_busy) goto recursive_call; flex_busy = TRUE; @@ -155,7 +160,9 @@ element = _gst_parse_launch (pipeline_description, error); flex_busy = FALSE; g_static_rec_mutex_unlock (&flex_lock); return element; @@ -163,7 +170,9 @@ recursive_call: { GST_WARNING ("calls to gst_parse_launch() cannot be nested"); g_static_rec_mutex_unlock (&flex_lock); g_warning ("calls to gst_parse_launch() cannot be nested"); return NULL; } |