aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/Makefile.in1
-rw-r--r--common/gst-autogen.sh1
-rw-r--r--common/gst.supp41
-rwxr-xr-xcommon/gstdoc-scangobj18
-rw-r--r--common/m4/Makefile.am1
-rw-r--r--common/m4/Makefile.in2
-rw-r--r--common/m4/as-scrub-include.m436
-rw-r--r--common/m4/gst-error.m44
-rw-r--r--common/m4/gst-gettext.m47
-rw-r--r--common/m4/gst-glib2.m43
-rw-r--r--common/m4/gst-parser.m44
11 files changed, 36 insertions, 82 deletions
diff --git a/common/Makefile.in b/common/Makefile.in
index d39c116..cb5a200 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -86,7 +86,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-libtool.m4 \
- $(top_srcdir)/common/m4/as-scrub-include.m4 \
$(top_srcdir)/common/m4/as-version.m4 \
$(top_srcdir)/common/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/common/m4/gst-arch.m4 \
diff --git a/common/gst-autogen.sh b/common/gst-autogen.sh
index e54dbcf..78cab66 100644
--- a/common/gst-autogen.sh
+++ b/common/gst-autogen.sh
@@ -29,6 +29,7 @@ version_get ()
{
COMMAND=$1
VARPREFIX=`echo $2 | tr .,- _`
+ local ${VARPREFIX}_VERSION
# strip everything that's not a digit, then use cut to get the first field
pkg_version=`$COMMAND --version|head -n 1|sed 's/^.*)[^0-9]*//'|cut -d' ' -f1`
diff --git a/common/gst.supp b/common/gst.supp
index 8a3617f..2c60392 100644
--- a/common/gst.supp
+++ b/common/gst.supp
@@ -1298,6 +1298,15 @@
fun:snd_config_update
}
{
+ <alsa leak snd_config_searcha_hooks>
+ Memcheck:Leak
+ fun:*alloc
+ fun:_dl_close_worker
+ ...
+ fun:snd_config_searcha_hooks
+}
+
+{
<nss lookup within ALSA>
Memcheck:Leak
fun:malloc
@@ -2528,41 +2537,13 @@
}
-## Leak of property_list in gstffmpegcfg.c
-## This list is created in gst_ffmpegcsp_init(), called from
-## gst_ffmpegenc_register.
-{
- <insert a suppression name here>
- Memcheck:Leak
- fun:malloc
- fun:g_malloc
- fun:g_slice_alloc
- fun:g_datalist_id_set_data_full
- fun:gst_ffmpeg_cfg_init
- fun:gst_ffmpegenc_register
- fun:plugin_init
-}
-{
- <insert a suppression name here>
- Memcheck:Leak
- fun:malloc
- fun:g_malloc
- fun:g_slice_alloc
- fun:g_datalist_id_set_data_full
- fun:g_param_spec_set_qdata_full
- fun:gst_ffmpeg_cfg_init
- fun:gst_ffmpegenc_register
- fun:plugin_init
-}
-
-
+## Leak of everything allocated by gst-libav plugin init
{
<insert_a_suppression_name_here>
Memcheck:Leak
fun:*alloc
- fun:*
+ ...
fun:gst_ffmpeg_cfg_init
- fun:gst_ffmpegenc_register
}
## Leak of GIO module through gnomevfs
diff --git a/common/gstdoc-scangobj b/common/gstdoc-scangobj
index 09039a5..4ad9786 100755
--- a/common/gstdoc-scangobj
+++ b/common/gstdoc-scangobj
@@ -150,7 +150,18 @@ print OUTPUT <<EOT;
#include <stdio.h>
#include <errno.h>
-$includes
+#include <gst/gst.h>
+EOT
+
+if ($includes) {
+ print OUTPUT $includes;
+} else {
+ for (@types) {
+ print OUTPUT "extern GType $_ (void);\n";
+ }
+}
+
+print OUTPUT <<EOT;
#ifdef GTK_IS_WIDGET_CLASS
#include <gtk/gtkversion.h>
@@ -453,11 +464,8 @@ static void output_args (void);
static void output_object_args (FILE *fp, GType object_type);
int
-main (int argc, char *argv[])
+main (G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
- /* Silence the compiler: */
- if (argv != argv) argc = argc;
-
$TYPE_INIT_FUNC;
get_object_types ();
diff --git a/common/m4/Makefile.am b/common/m4/Makefile.am
index 856d6e3..3d387ee 100644
--- a/common/m4/Makefile.am
+++ b/common/m4/Makefile.am
@@ -9,7 +9,6 @@ EXTRA_DIST = \
as-libtool.m4 \
as-libtool-tags.m4 \
as-python.m4 \
- as-scrub-include.m4 \
as-version.m4 \
ax_create_stdint_h.m4 \
glib-gettext.m4 \
diff --git a/common/m4/Makefile.in b/common/m4/Makefile.in
index f298f81..ec66c73 100644
--- a/common/m4/Makefile.in
+++ b/common/m4/Makefile.in
@@ -85,7 +85,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/as-auto-alt.m4 \
$(top_srcdir)/common/m4/as-compiler-flag.m4 \
$(top_srcdir)/common/m4/as-libtool.m4 \
- $(top_srcdir)/common/m4/as-scrub-include.m4 \
$(top_srcdir)/common/m4/as-version.m4 \
$(top_srcdir)/common/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/common/m4/gst-arch.m4 \
@@ -413,7 +412,6 @@ EXTRA_DIST = \
as-libtool.m4 \
as-libtool-tags.m4 \
as-python.m4 \
- as-scrub-include.m4 \
as-version.m4 \
ax_create_stdint_h.m4 \
glib-gettext.m4 \
diff --git a/common/m4/as-scrub-include.m4 b/common/m4/as-scrub-include.m4
deleted file mode 100644
index 3ed49b0..0000000
--- a/common/m4/as-scrub-include.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-dnl as-scrub-include.m4 0.0.4
-
-dnl autostars m4 macro for scrubbing CFLAGS of system include dirs
-dnl because gcc 3.x complains about including system including dirs
-
-dnl Thomas Vander Stichele <thomas at apestaart dot org>
-
-dnl $Id: as-scrub-include.m4,v 1.7 2004/06/12 08:30:20 thomasvs Exp $
-
-dnl This macro uses output of cpp -v and expects it to contain text that
-dnl looks a little bit like this:
-dnl #include <...> search starts here:
-dnl /usr/local/include
-dnl /usr/lib/gcc-lib/i386-redhat-linux/3.2/include
-dnl /usr/include
-dnl End of search list.
-
-dnl AS_SCRUB_INCLUDE(VAR)
-dnl example
-dnl AS_SCRUB_INCLUDE(CFLAGS)
-dnl will remove all system include dirs from the given CFLAGS
-
-AC_DEFUN([AS_SCRUB_INCLUDE],
-[
- GIVEN_CFLAGS=$[$1]
- INCLUDE_DIRS=`echo | cpp -v 2>&1`
-
- dnl remove everything from this output between the "starts here" and "End of"
- dnl line
- INCLUDE_DIRS=`echo $INCLUDE_DIRS | sed -e 's/.*<...> search starts here://' | sed -e 's/End of search list.*//'`
- for dir in $INCLUDE_DIRS; do
- dnl use "" as the sed script so $dir gets expanded
- GIVEN_CFLAGS=`echo $GIVEN_CFLAGS | sed -e "s#-I$dir ##"`
- done
- [$1]=$GIVEN_CFLAGS
-])
diff --git a/common/m4/gst-error.m4 b/common/m4/gst-error.m4
index e12a04c..bce80d2 100644
--- a/common/m4/gst-error.m4
+++ b/common/m4/gst-error.m4
@@ -169,7 +169,7 @@ AC_DEFUN([AG_GST_SET_ERROR_CXXFLAGS],
'no%E_MACRO_REDEFINED' \
'no%E_LOOP_NOT_ENTERED_AT_TOP'
do
- AS_CXX_COMPILER_FLAG([-errwarn=%all,$f], ERROR_CXXFLAGS="$ERROR_CXXFLAGS,$f")
+ AS_CXX_COMPILER_FLAG([-errwarn=%all,$f], [ERROR_CXXFLAGS="$ERROR_CXXFLAGS,$f"])
done
fi
fi
@@ -254,7 +254,7 @@ AC_DEFUN([AG_GST_SET_ERROR_OBJCFLAGS],
'no%E_MACRO_REDEFINED' \
'no%E_LOOP_NOT_ENTERED_AT_TOP'
do
- AS_OBJC_COMPILER_FLAG([-errwarn=%all,$f], ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS,$f")
+ AS_OBJC_COMPILER_FLAG([-errwarn=%all,$f], [ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS,$f"])
done
fi
fi
diff --git a/common/m4/gst-gettext.m4 b/common/m4/gst-gettext.m4
index a63651b..df817eb 100644
--- a/common/m4/gst-gettext.m4
+++ b/common/m4/gst-gettext.m4
@@ -14,6 +14,13 @@ AC_DEFUN([AG_GST_GETTEXT],
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
[gettext package name])
+ dnl make sure po/Makevars is kept in sync with GETTEXT_PACKAGE
+ if test -e "${srcdir}/po/Makevars"; then
+ if ! grep -e "$1" "${srcdir}/po/Makevars"; then
+ AC_MSG_ERROR([DOMAIN in po/Makevars does not match GETTEXT_PACKAGE $1])
+ fi
+ fi
+
dnl define LOCALEDIR in config.h
AS_AC_EXPAND(LOCALEDIR, $datadir/locale)
AC_DEFINE_UNQUOTED([LOCALEDIR], "$LOCALEDIR",
diff --git a/common/m4/gst-glib2.m4 b/common/m4/gst-glib2.m4
index 3af5547..63f0f46 100644
--- a/common/m4/gst-glib2.m4
+++ b/common/m4/gst-glib2.m4
@@ -106,9 +106,6 @@ AC_DEFUN([AG_GST_GLIB_CHECK],
fi
AC_SUBST(GLIB_MKENUMS)
- dnl for the poor souls who for example have glib in /usr/local
- AS_SCRUB_INCLUDE(GLIB_CFLAGS)
-
AC_SUBST(GLIB_EXTRA_CFLAGS)
dnl Now check for GIO
diff --git a/common/m4/gst-parser.m4 b/common/m4/gst-parser.m4
index 710da89..b002047 100644
--- a/common/m4/gst-parser.m4
+++ b/common/m4/gst-parser.m4
@@ -8,10 +8,10 @@ AC_DEFUN([AG_GST_BISON_CHECK],
fi
dnl check bison version
- dnl we need version >= 1.875 for the reentrancy support
+ dnl we need version >= 2.4 for the '<>' support
dnl in the parser.
dnl First lines observed: 'bison (GNU Bison) 2.3' or 'GNU Bison version 1.28'
- bison_min_version=1.875
+ bison_min_version=2.4
bison_version=`$BISON_PATH --version | head -n 1 | sed 's/^[[^0-9]]*//' | sed 's/[[^0-9]]*$//' | cut -d' ' -f1`
AC_MSG_CHECKING([bison version $bison_version >= $bison_min_version])
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 06:54:09 +0000