From: Jan Schmidt Date: Thu, 25 Oct 2007 14:50:48 +0000 (+0000) Subject: Use a custom export symbol regex for libgstcheck, as it needs to export symbols that... X-Git-Tag: RELEASE-0_10_15~37 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7cbd5de3329485d06f966c89753797af5d60318;p=platform%2Fupstream%2Fgstreamer.git Use a custom export symbol regex for libgstcheck, as it needs to export symbols that don't match the standard GStream... Original commit message from CVS: * configure.ac: * libs/gst/check/Makefile.am: Use a custom export symbol regex for libgstcheck, as it needs to export symbols that don't match the standard GStreamer gst_* pattern, and --export-dynamic is not portable (only works on GNU ld) * libs/gst/check/gstcheck.c: (gst_check_setup_src_pad), (gst_check_setup_sink_pad): Make sure to pass a message parameter to the fail_* macros. * tests/check/gst/gstinfo.c: (GST_START_TEST): Fix some compiler warnings. --- diff --git a/ChangeLog b/ChangeLog index 6489cb7..fa4fdef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2007-10-25 Jan Schmidt + + * configure.ac: + * libs/gst/check/Makefile.am: + Use a custom export symbol regex for libgstcheck, as it needs + to export symbols that don't match the standard GStreamer gst_* + pattern, and --export-dynamic is not portable (only works on + GNU ld) + + * libs/gst/check/gstcheck.c: (gst_check_setup_src_pad), + (gst_check_setup_sink_pad): + Make sure to pass a message parameter to the fail_* macros. + + * tests/check/gst/gstinfo.c: (GST_START_TEST): + Fix some compiler warnings. + 2007-10-25 Tim-Philipp Müller * tests/check/gst/gststructure.c: (test_to_string): diff --git a/configure.ac b/configure.ac index ce4dac5..caafbc3 100644 --- a/configure.ac +++ b/configure.ac @@ -524,6 +524,9 @@ dnl linker flags shared by all libraries dnl LDFLAGS modifier defining exported symbols from built libraries GST_LIB_LDFLAGS="-export-symbols-regex \^[_]*\(gst_\|Gst\|GST_\).*" AC_SUBST(GST_LIB_LDFLAGS) +dnl Version of the linker flags specifically for libgstcheck to support the boonky extra symbols it exports. +GST_CHECK_LIB_LDFLAGS="-export-symbols-regex \^\([_]*\(gst_\|Gst\|GST_\).*\|check_\(debug\|mutex\|cond\)\|buffers\|mutex\|start_cond\|sync_cond\|thread_list\)$" +AC_SUBST(GST_CHECK_LIB_LDFLAGS) dnl GST_OBJ_* dnl default vars for all internal objects built on libgstreamer diff --git a/libs/gst/check/Makefile.am b/libs/gst/check/Makefile.am index eb1dce2..bc342a6 100644 --- a/libs/gst/check/Makefile.am +++ b/libs/gst/check/Makefile.am @@ -9,8 +9,8 @@ libgstcheck_@GST_MAJORMINOR@_la_SOURCES = \ libgstcheck_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) libgstcheck_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) $(CHECK_LIBS) \ $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la $(LIBM) -libgstcheck_@GST_MAJORMINOR@_la_LDFLAGS = -Wl,--export-dynamic \ -libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstcheck_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_CHECK_LIB_LDFLAGS) \ + $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstcheck_@GST_MAJORMINOR@includedir = \ $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/check diff --git a/libs/gst/check/gstcheck.c b/libs/gst/check/gstcheck.c index 2e3da5e..f4ae3fb 100644 --- a/libs/gst/check/gstcheck.c +++ b/libs/gst/check/gstcheck.c @@ -179,7 +179,7 @@ gst_check_setup_src_pad (GstElement * element, GST_ELEMENT_NAME (element)); ASSERT_OBJECT_REFCOUNT (sinkpad, "sinkpad", 2); if (caps) - fail_unless (gst_pad_set_caps (srcpad, caps)); + fail_unless (gst_pad_set_caps (srcpad, caps), "could not set caps on pad"); fail_unless (gst_pad_link (srcpad, sinkpad) == GST_PAD_LINK_OK, "Could not link source and %s sink pads", GST_ELEMENT_NAME (element)); gst_object_unref (sinkpad); /* because we got it higher up */ @@ -231,7 +231,7 @@ gst_check_setup_sink_pad (GstElement * element, GstStaticPadTemplate * template, fail_if (srcpad == NULL, "Could not get source pad from %s", GST_ELEMENT_NAME (element)); if (caps) - fail_unless (gst_pad_set_caps (sinkpad, caps)); + fail_unless (gst_pad_set_caps (sinkpad, caps), "Could not set pad caps"); gst_pad_set_chain_function (sinkpad, gst_check_chain_func); GST_DEBUG_OBJECT (element, "Linking element src pad and receiving sink pad"); diff --git a/tests/check/gst/gstinfo.c b/tests/check/gst/gstinfo.c index 8064d82..a4c32d9 100644 --- a/tests/check/gst/gstinfo.c +++ b/tests/check/gst/gstinfo.c @@ -54,7 +54,7 @@ GST_START_TEST (info_ptr_format_printf_extension) gst_debug_set_default_threshold (GST_LEVEL_LOG); /* NULL object */ - GST_LOG ("NULL: %" GST_PTR_FORMAT, NULL); + GST_LOG ("NULL: %" GST_PTR_FORMAT, (gpointer) NULL); /* structure */ { @@ -170,7 +170,7 @@ GST_START_TEST (info_segment_format_printf_extension) } /* NULL segment */ - GST_LOG ("NULL: %" GST_SEGMENT_FORMAT, NULL); + GST_LOG ("NULL: %" GST_SEGMENT_FORMAT, (GstSegment *) NULL); /* clean up */ gst_debug_set_default_threshold (GST_LEVEL_NONE);