diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-03-08 13:00:27 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-03-09 13:41:09 +0100 |
| commit | 0c8950e5ed594aa537efe3f4b046bfd644f24a73 (patch) | |
| tree | 77b7d7b874cfd9896b460dd6244c7b1c7dedc6bb | |
| parent | b8168c23283bfcc08d64de20e0d9ec3948745b4b (diff) | |
gst: Add better support for static plugins
341 files changed, 735 insertions, 401 deletions
diff --git a/configure.ac b/configure.ac index d56cd57aa..7aa2fa1ce 100644 --- a/configure.ac +++ b/configure.ac @@ -279,6 +279,24 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO], ["${srcdir}/gst-plugins-bad.doap"], [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO]) +dnl build static plugins or not +AC_MSG_CHECKING([whether to build static plugins or not]) +AC_ARG_ENABLE( + static-plugins, + AC_HELP_STRING( + [--enable-static-plugins], + [build static plugins @<:@default=no@:>@]), + [AS_CASE( + [$enableval], [no], [], [yes], [], + [AC_MSG_ERROR([bad value "$enableval" for --enable-static-plugins])])], + [enable_static_plugins=no]) +AC_MSG_RESULT([$enable_static_plugins]) +if test "x$enable_static_plugins" = xyes; then + AC_DEFINE(GST_PLUGIN_BUILD_STATIC, 1, + [Define if static plugins should be built]) +fi +AM_CONDITIONAL(GST_PLUGIN_BUILD_STATIC, test "x$enable_static_plugins" = "xyes") + dnl define an ERROR_CFLAGS Makefile variable dnl -Waggregate-return - libexif returns aggregates dnl -Wundef - Windows headers check _MSC_VER unconditionally @@ -1902,7 +1920,7 @@ AC_SUBST(GST_LIB_LDFLAGS) dnl this really should only contain flags, not libs - they get added before dnl whatevertarget_LIBS and -L flags here affect the rest of the linking -GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc.*' $GST_ALL_LDFLAGS" +GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_.*' $GST_ALL_LDFLAGS" AC_SUBST(GST_PLUGIN_LDFLAGS) dnl *** output files *** diff --git a/ext/apexsink/Makefile.am b/ext/apexsink/Makefile.am index 0bd41ca32..8ab0ef723 100644 --- a/ext/apexsink/Makefile.am +++ b/ext/apexsink/Makefile.am @@ -7,6 +7,8 @@ libgstapexsink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) $(GST_LIBS) $(APEXSINK_LIBS) libgstapexsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstapexsink_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstapexraop.h gstapexsink.h diff --git a/ext/apexsink/gstapexplugin.c b/ext/apexsink/gstapexplugin.c index edcc39337..1b80e303b 100644 --- a/ext/apexsink/gstapexplugin.c +++ b/ext/apexsink/gstapexplugin.c @@ -36,9 +36,9 @@ plugin_init (GstPlugin * plugin) } /* plugin export resolution */ -GST_PLUGIN_DEFINE +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "apexsink", + apexsink, "Apple AirPort Express Plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/arts/Makefile.am b/ext/arts/Makefile.am index b59d734d3..a816a2b8c 100644 --- a/ext/arts/Makefile.am +++ b/ext/arts/Makefile.am @@ -20,7 +20,9 @@ libgstarts_la_CFLAGS = $(GST_CFLAGS) libgstarts_la_CXXFLAGS = $(ARTS_CXXFLAGS) $(GST_CFLAGS) libgstarts_la_LIBADD = $(ARTS_LIBS) -lartsflow -lartsflow_idl libgstarts_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstarts_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gst_arts.h gst_artsio_impl.h diff --git a/ext/arts/gst_arts.c b/ext/arts/gst_arts.c index 24a0aa348..973ef4d2c 100644 --- a/ext/arts/gst_arts.c +++ b/ext/arts/gst_arts.c @@ -169,8 +169,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "arts", + arts, "arTs filter wrapper", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/artsd/Makefile.am b/ext/artsd/Makefile.am index e0b3f9444..27178950d 100644 --- a/ext/artsd/Makefile.am +++ b/ext/artsd/Makefile.am @@ -5,6 +5,8 @@ libgstartsdsink_la_SOURCES = gstartsdsink.c libgstartsdsink_la_CFLAGS = $(GST_CFLAGS) $(ARTSC_CFLAGS) libgstartsdsink_la_LIBADD = $(ARTSC_LIBS) libgstartsdsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstartsdsink_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstartsdsink.h diff --git a/ext/artsd/gstartsdsink.c b/ext/artsd/gstartsdsink.c index a27b3ebb6..6df220e65 100644 --- a/ext/artsd/gstartsdsink.c +++ b/ext/artsd/gstartsdsink.c @@ -274,9 +274,9 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "artsdsink", + artsdsink, "Plays audio to an aRts server", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/assrender/Makefile.am b/ext/assrender/Makefile.am index 44e63094d..a3a195104 100644 --- a/ext/assrender/Makefile.am +++ b/ext/assrender/Makefile.am @@ -4,6 +4,8 @@ libgstassrender_la_SOURCES = gstassrender.c libgstassrender_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ASSRENDER_CFLAGS) libgstassrender_la_LIBADD = $(ASSRENDER_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_MAJORMINOR@ libgstassrender_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstassrender_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstassrender.h diff --git a/ext/assrender/gstassrender.c b/ext/assrender/gstassrender.c index b71e8e4d1..d619a404a 100644 --- a/ext/assrender/gstassrender.c +++ b/ext/assrender/gstassrender.c @@ -120,8 +120,7 @@ gst_ass_render_base_init (gpointer gclass) gst_element_class_add_static_pad_template (element_class, &src_factory); gst_element_class_add_static_pad_template (element_class, &video_sink_factory); - gst_element_class_add_static_pad_template (element_class, - &text_sink_factory); + gst_element_class_add_static_pad_template (element_class, &text_sink_factory); gst_element_class_set_details_simple (element_class, "ASS/SSA Render", "Mixer/Video/Overlay/Subtitle", @@ -1421,8 +1420,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_PRIMARY, GST_TYPE_ASS_RENDER); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "assrender", + assrender, "ASS/SSA subtitle renderer", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/audiofile/Makefile.am b/ext/audiofile/Makefile.am index 260b4cecf..19041e4b1 100644 --- a/ext/audiofile/Makefile.am +++ b/ext/audiofile/Makefile.am @@ -5,6 +5,8 @@ libgstaudiofile_la_SOURCES = gstaf.c gstafsink.c gstafsrc.c gstafparse.c libgstaudiofile_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) $(AUDIOFILE_CFLAGS) libgstaudiofile_la_LIBADD = $(AUDIOFILE_LIBS) libgstaudiofile_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstaudiofile_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstafsink.h gstafsrc.h gstafparse.h diff --git a/ext/audiofile/gstaf.c b/ext/audiofile/gstaf.c index 8861672f7..c4bda2ab2 100644 --- a/ext/audiofile/gstaf.c +++ b/ext/audiofile/gstaf.c @@ -40,8 +40,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "audiofile", + audiofile, "Audiofile plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/audioresample/Makefile.am b/ext/audioresample/Makefile.am index 804d3c794..1188d9c17 100644 --- a/ext/audioresample/Makefile.am +++ b/ext/audioresample/Makefile.am @@ -5,7 +5,9 @@ libgstaudioresample_la_SOURCES = gstaudioresample.c libgstaudioresample_la_CFLAGS = $(GST_CFLAGS) $(AUDIORESAMPLE_CFLAGS) libgstaudioresample_la_LIBADD = $(AUDIORESAMPLE_LIBS) libgstaudioresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstaudioresample_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstaudioresample.h diff --git a/ext/audioresample/gstaudioresample.c b/ext/audioresample/gstaudioresample.c index 7b81b93cc..e64b22daf 100644 --- a/ext/audioresample/gstaudioresample.c +++ b/ext/audioresample/gstaudioresample.c @@ -424,8 +424,8 @@ static gboolean plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "audioresample", + audioresample, "Resamples audio", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/bz2/Makefile.am b/ext/bz2/Makefile.am index 4cc2c856b..23868da3c 100644 --- a/ext/bz2/Makefile.am +++ b/ext/bz2/Makefile.am @@ -6,7 +6,9 @@ libgstbz2_la_SOURCES = \ libgstbz2_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstbz2_la_LIBADD = $(GST_BASE_LIBS) $(BZ2_LIBS) libgstbz2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstbz2_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstbz2dec.h gstbz2enc.h diff --git a/ext/bz2/gstbz2.c b/ext/bz2/gstbz2.c index 130ca1b4d..b67bc38b5 100644 --- a/ext/bz2/gstbz2.c +++ b/ext/bz2/gstbz2.c @@ -37,6 +37,6 @@ plugin_init (GstPlugin * p) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "bz2", +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, bz2, "Compress or decompress streams", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/cdaudio/Makefile.am b/ext/cdaudio/Makefile.am index 999b5de90..11dc7e545 100644 --- a/ext/cdaudio/Makefile.am +++ b/ext/cdaudio/Makefile.am @@ -4,5 +4,7 @@ libgstcdaudio_la_SOURCES = gstcdaudio.c libgstcdaudio_la_CFLAGS = $(GST_CFLAGS) libgstcdaudio_la_LIBADD = $(GST_LIBS) libgstcdaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lcdaudio +if !GST_PLUGIN_BUILD_STATIC libgstcdaudio_la_LIBTOOLFLAGS = --tag=disable-static +endif diff --git a/ext/cdaudio/gstcdaudio.c b/ext/cdaudio/gstcdaudio.c index f1f0fb40b..b5cd06bd9 100644 --- a/ext/cdaudio/gstcdaudio.c +++ b/ext/cdaudio/gstcdaudio.c @@ -648,8 +648,8 @@ cdaudio_uri_handler_init (gpointer g_iface, gpointer iface_data) iface->set_uri = cdaudio_uri_set_uri; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "cdaudio", + cdaudio, "Play CD audio through the CD Drive", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/celt/Makefile.am b/ext/celt/Makefile.am index 01153b135..032efb4d5 100644 --- a/ext/celt/Makefile.am +++ b/ext/celt/Makefile.am @@ -12,6 +12,8 @@ libgstcelt_la_LIBADD = \ $(GST_LIBS) \ $(CELT_LIBS) libgstcelt_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM) +if !GST_PLUGIN_BUILD_STATIC libgstcelt_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstceltenc.h gstceltdec.h diff --git a/ext/celt/gstcelt.c b/ext/celt/gstcelt.c index 24b7d3ef2..765282d9f 100644 --- a/ext/celt/gstcelt.c +++ b/ext/celt/gstcelt.c @@ -43,8 +43,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "celt", + celt, "CELT plugin library", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/cog/Makefile.am b/ext/cog/Makefile.am index 81e0f15e1..953d42474 100644 --- a/ext/cog/Makefile.am +++ b/ext/cog/Makefile.am @@ -17,7 +17,9 @@ libgstcog_la_LIBADD = \ $(ORC_LIBS) \ $(COG_LIBS) libgstcog_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM) +if !GST_PLUGIN_BUILD_STATIC libgstcog_la_LIBTOOLFLAGS = --tag=disable-static +endif libgstcog_la_SOURCES = \ cog.h \ diff --git a/ext/cog/gstcog.c b/ext/cog/gstcog.c index beb147a9e..e8d1a9837 100644 --- a/ext/cog/gstcog.c +++ b/ext/cog/gstcog.c @@ -61,8 +61,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "cog", + cog, "Cog plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/curl/Makefile.am b/ext/curl/Makefile.am index 77b237385..bb0a4f3dd 100644 --- a/ext/curl/Makefile.am +++ b/ext/curl/Makefile.am @@ -10,6 +10,8 @@ libgstcurl_la_LIBADD = \ $(GST_LIBS) \ $(CURL_LIBS) libgstcurl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstcurl_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstcurlsink.h diff --git a/ext/curl/gstcurl.c b/ext/curl/gstcurl.c index 39c214d75..76922e6fc 100644 --- a/ext/curl/gstcurl.c +++ b/ext/curl/gstcurl.c @@ -33,8 +33,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "curl", + curl, "libcurl-based elements", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/dc1394/Makefile.am b/ext/dc1394/Makefile.am index 6b0953277..9d09355b7 100644 --- a/ext/dc1394/Makefile.am +++ b/ext/dc1394/Makefile.am @@ -8,7 +8,9 @@ libgstdc1394_la_CFLAGS = $(GST_CFLAGS) \ $(LIBDC1394_CFLAGS) libgstdc1394_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdc1394_la_LIBTOOLFLAGS = --tag=disable-static +endif libgstdc1394_la_LIBADD = $(GST_BASE_LIBS) \ $(LIBDC1394_LIBS) diff --git a/ext/dc1394/gstdc1394.c b/ext/dc1394/gstdc1394.c index dfb4cadee..4a4741a59 100644 --- a/ext/dc1394/gstdc1394.c +++ b/ext/dc1394/gstdc1394.c @@ -1330,8 +1330,8 @@ plugin_init (GstPlugin * plugin) } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dc1394", + dc1394, "1394 IIDC Video Source", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/dirac/Makefile.am b/ext/dirac/Makefile.am index c93a3d477..00671de4e 100644 --- a/ext/dirac/Makefile.am +++ b/ext/dirac/Makefile.am @@ -16,7 +16,9 @@ libgstdirac_la_LIBADD = \ $(GST_BASE_LIBS) $(GST_LIBS) \ $(DIRAC_LIBS) -lz $(LIBM) libgstdirac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdirac_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstdiracdec.h diff --git a/ext/dirac/gstdirac.cc b/ext/dirac/gstdirac.cc index d23a78e1b..75f5aa5d2 100644 --- a/ext/dirac/gstdirac.cc +++ b/ext/dirac/gstdirac.cc @@ -48,8 +48,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dirac", + dirac, "Dirac plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/directfb/Makefile.am b/ext/directfb/Makefile.am index 05e79ac15..5f999dcb4 100644 --- a/ext/directfb/Makefile.am +++ b/ext/directfb/Makefile.am @@ -9,7 +9,9 @@ libgstdfbvideosink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstinterfaces-$(GST_MAJORMINOR) \ $(DIRECTFB_LIBS) $(LIBOIL_LIBS) libgstdfbvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdfbvideosink_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = dfbvideosink.h diff --git a/ext/directfb/dfbvideosink.c b/ext/directfb/dfbvideosink.c index c3417a5e1..c5d7fb3b4 100644 --- a/ext/directfb/dfbvideosink.c +++ b/ext/directfb/dfbvideosink.c @@ -2413,8 +2413,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dfbvideosink", + dfbvideosink, "DirectFB video output plugin", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/divx/Makefile.am b/ext/divx/Makefile.am index 1cf0a713f..24933e009 100644 --- a/ext/divx/Makefile.am +++ b/ext/divx/Makefile.am @@ -5,11 +5,15 @@ AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(DIVX_CFLAGS) libgstdivxenc_la_SOURCES = gstdivxenc.c libgstdivxenc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(DIVXENC_LIBS) libgstdivxenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdivxenc_la_LIBTOOLFLAGS = --tag=disable-static +endif libgstdivxdec_la_SOURCES = gstdivxdec.c libgstdivxdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(DIVXDEC_LIBS) libgstdivxdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdivxdec_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstdivxenc.h gstdivxdec.h diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c index 9f2feecfd..0f1f1e400 100644 --- a/ext/divx/gstdivxdec.c +++ b/ext/divx/gstdivxdec.c @@ -130,8 +130,7 @@ gst_divxdec_base_init (GstDivxDecClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); gst_element_class_add_static_pad_template (element_class, &src_template); gst_element_class_set_details_simple (element_class, @@ -568,9 +567,9 @@ plugin_init (GstPlugin * plugin) } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "divxdec", + divxdec, "DivX decoder", plugin_init, "5.03", GST_LICENSE_UNKNOWN, "divx4linux", "http://www.divx.com/"); diff --git a/ext/divx/gstdivxenc.c b/ext/divx/gstdivxenc.c index 144d23b12..7afb277dd 100644 --- a/ext/divx/gstdivxenc.c +++ b/ext/divx/gstdivxenc.c @@ -141,8 +141,7 @@ gst_divxenc_base_init (GstDivxEncClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); gst_element_class_add_static_pad_template (element_class, &src_template); gst_element_class_set_details_simple (element_class, @@ -535,9 +534,9 @@ plugin_init (GstPlugin * plugin) } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "divxenc", + divxenc, "DivX encoder", plugin_init, "5.03", GST_LICENSE_UNKNOWN, "divx4linux", "http://www.divx.com/"); diff --git a/ext/dts/Makefile.am b/ext/dts/Makefile.am index 97a838531..3fe52a7dd 100644 --- a/ext/dts/Makefile.am +++ b/ext/dts/Makefile.am @@ -7,6 +7,8 @@ libgstdtsdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \ -lgstaudio-@GST_MAJORMINOR@ \ $(DTS_LIBS) $(ORC_LIBS) libgstdtsdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdtsdec_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstdtsdec.h diff --git a/ext/dts/gstdtsdec.c b/ext/dts/gstdtsdec.c index 4a304f8e8..5d64538e2 100644 --- a/ext/dts/gstdtsdec.c +++ b/ext/dts/gstdtsdec.c @@ -807,8 +807,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dtsdec", + dtsdec, "Decodes DTS audio streams", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/ext/faac/Makefile.am b/ext/faac/Makefile.am index 2aafa0229..62b9af91a 100644 --- a/ext/faac/Makefile.am +++ b/ext/faac/Makefile.am @@ -8,6 +8,8 @@ libgstfaac_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstaudio-@GST_MAJORMINOR@ -lgstpbutils-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(FAAC_LIBS) libgstfaac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstfaac_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstfaac.h diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c index f811cd1ac..cb3d522e9 100644 --- a/ext/faac/gstfaac.c +++ b/ext/faac/gstfaac.c @@ -152,8 +152,7 @@ gst_faac_base_init (gpointer klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_static_pad_template (element_class, &src_template); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); gst_element_class_set_details_simple (element_class, "AAC audio encoder", "Codec/Encoder/Audio", @@ -760,8 +759,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_FAAC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "faac", + faac, "Free AAC Encoder (FAAC)", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/faad/Makefile.am b/ext/faad/Makefile.am index cc7636dca..058b082a7 100644 --- a/ext/faad/Makefile.am +++ b/ext/faad/Makefile.am @@ -7,7 +7,9 @@ libgstfaad_la_CFLAGS = -DGST_USE_UNSTABLE_API \ libgstfaad_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(FAAD_LIBS) libgstfaad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstfaad_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstfaad.h diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c index 4dd73eba8..33f9e40ea 100644 --- a/ext/faad/gstfaad.c +++ b/ext/faad/gstfaad.c @@ -163,8 +163,7 @@ gst_faad_base_init (gpointer klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_static_pad_template (element_class, &src_template); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); gst_element_class_set_details_simple (element_class, "AAC audio decoder", "Codec/Decoder/Audio", @@ -870,8 +869,8 @@ plugin_init (GstPlugin * plugin) return gst_element_register (plugin, "faad", GST_RANK_PRIMARY, GST_TYPE_FAAD); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "faad", + faad, "Free AAC Decoder (FAAD)", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/flite/Makefile.am b/ext/flite/Makefile.am index 84d87dec0..5c951cd41 100644 --- a/ext/flite/Makefile.am +++ b/ext/flite/Makefile.am @@ -12,6 +12,7 @@ libgstflite_la_LIBADD = \ $(GST_LIBS) \ $(FLITE_LIBS) libgstflite_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM) +if !GST_PLUGIN_BUILD_STATIC libgstflite_la_LIBTOOLFLAGS = --tag=disable-static - +endif diff --git a/ext/flite/gstflite.c b/ext/flite/gstflite.c index 2995d9f3e..742059c09 100644 --- a/ext/flite/gstflite.c +++ b/ext/flite/gstflite.c @@ -41,8 +41,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "flite", + flite, "Flite speech synthesizer plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/gme/Makefile.am b/ext/gme/Makefile.am index f9a7b139b..ac89db323 100644 --- a/ext/gme/Makefile.am +++ b/ext/gme/Makefile.am @@ -5,6 +5,8 @@ libgstgme_la_SOURCES = gstgme.c libgstgme_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GME_CFLAGS) libgstgme_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GME_LIBS) libgstgme_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstgme_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstgme.h diff --git a/ext/gme/gstgme.c b/ext/gme/gstgme.c index f8a387d43..5419205ad 100644 --- a/ext/gme/gstgme.c +++ b/ext/gme/gstgme.c @@ -549,8 +549,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_GME_DEC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gmedec", + gmedec, "GME Audio Decoder", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/ext/gsettings/Makefile.am b/ext/gsettings/Makefile.am index 64801df9b..426b66f2a 100644 --- a/ext/gsettings/Makefile.am +++ b/ext/gsettings/Makefile.am @@ -25,7 +25,9 @@ libgstgsettingselements_la_CFLAGS = $(GST_CFLAGS) $(GSETTINGS_CFLAGS) $(DIR_CFLA -DGstSwitchSinkClass=GstGSettingsSwitchSinkClass libgstgsettingselements_la_LIBADD = $(GST_LIBS) $(GSETTINGS_LIBS) libgstgsettingselements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstgsettingselements_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstgsettingsaudiosink.h \ diff --git a/ext/gsettings/plugin.c b/ext/gsettings/plugin.c index 6d562e8d5..01593037d 100644 --- a/ext/gsettings/plugin.c +++ b/ext/gsettings/plugin.c @@ -43,8 +43,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gsettings", + gsettings, "GSettings plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/gsm/Makefile.am b/ext/gsm/Makefile.am index cd2f0dfad..b492308a0 100644 --- a/ext/gsm/Makefile.am +++ b/ext/gsm/Makefile.am @@ -10,6 +10,8 @@ libgstgsm_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) libgstgsm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstgsm_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstgsmenc.h gstgsmdec.h diff --git a/ext/gsm/gstgsm.c b/ext/gsm/gstgsm.c index 9b32abedc..bf7c72a98 100644 --- a/ext/gsm/gstgsm.c +++ b/ext/gsm/gstgsm.c @@ -39,8 +39,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gsm", + gsm, "GSM encoder/decoder", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/hermes/Makefile.am b/ext/hermes/Makefile.am index 7bfc56b52..880c031c7 100644 --- a/ext/hermes/Makefile.am +++ b/ext/hermes/Makefile.am @@ -7,5 +7,7 @@ libgsthermescolorspace_la_SOURCES = gsthermescolorspace.c libgsthermescolorspace_la_CFLAGS = $(GST_CFLAGS) libgsthermescolorspace_la_LIBADD = $(PLUGIN_EXTRA_LIBS) libgsthermescolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgsthermescolorspace_la_LIBTOOLFLAGS = --tag=disable-static +endif diff --git a/ext/hermes/gsthermescolorspace.c b/ext/hermes/gsthermescolorspace.c index 477a43f36..e2305524f 100644 --- a/ext/hermes/gsthermescolorspace.c +++ b/ext/hermes/gsthermescolorspace.c @@ -657,8 +657,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "hermescolorspace", + hermescolorspace, "Hermes colorspace converter", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/jp2k/Makefile.am b/ext/jp2k/Makefile.am index 79aef3ad7..0f2cc5ed5 100644 --- a/ext/jp2k/Makefile.am +++ b/ext/jp2k/Makefile.am @@ -7,8 +7,10 @@ libgstjp2k_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ $(GST_LIBS) $(JP2K_LIBS) libgstjp2k_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstjp2k_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstjasperdec.h \ - gstjasperenc.h
\ No newline at end of file + gstjasperenc.h diff --git a/ext/jp2k/gstjp2k.c b/ext/jp2k/gstjp2k.c index a032b31a6..1c85150cd 100644 --- a/ext/jp2k/gstjp2k.c +++ b/ext/jp2k/gstjp2k.c @@ -47,8 +47,8 @@ plugin_init (GstPlugin * plugin) /* this is the structure that gst-register looks for * so keep the name plugin_desc, or you cannot get your plug-in registered */ -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "jp2k", + jp2k, "Jasper-based JPEG2000 image decoder/encoder", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/kate/Makefile.am b/ext/kate/Makefile.am index fd7d6ced4..df2c27491 100644 --- a/ext/kate/Makefile.am +++ b/ext/kate/Makefile.am @@ -12,7 +12,9 @@ endif libgstkate_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(TIGER_CFLAGS) $(KATE_CFLAGS) libgstkate_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR) $(GST_LIBS) $(TIGER_LIBS) $(KATE_LIBS) libgstkate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstkate_la_LIBTOOLFLAGS = --tag=disable-static +endif # headers we need but don't want installed noinst_HEADERS = gstkate.h gstkatedec.h gstkateenc.h gstkateparse.h gstkatetag.h gstkateutil.h gstkatespu.h gstkatetiger.h diff --git a/ext/kate/gstkate.c b/ext/kate/gstkate.c index c7858e495..0235838a1 100644 --- a/ext/kate/gstkate.c +++ b/ext/kate/gstkate.c @@ -110,8 +110,8 @@ plugin_init (GstPlugin * plugin) /* this is the structure that gstreamer looks for to register plugins */ -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "kate", + kate, "Kate plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am index 353ec5ebb..6d27a0506 100644 --- a/ext/ladspa/Makefile.am +++ b/ext/ladspa/Makefile.am @@ -10,6 +10,8 @@ libgstladspa_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ $(GST_CONTROLLER_LIBS) $(LIBM) $(LRDF_LIBS) libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstladspa_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstladspa.h diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index 52a8d5b2d..e6e2b9845 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -888,8 +888,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "ladspa", + ladspa, "All LADSPA plugins", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/lcs/Makefile.am b/ext/lcs/Makefile.am index 9ceaa85cf..dfa1574ff 100644 --- a/ext/lcs/Makefile.am +++ b/ext/lcs/Makefile.am @@ -4,5 +4,7 @@ libgstlcscolorspace_la_SOURCES = gstcolorspace.c libgstlcscolorspace_la_CFLAGS = $(GST_CFLAGS) $(LCS_CFLAGS) libgstlcscolorspace_la_LIBADD = $(LCS_LIBS) libgstlcscolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstlcscolorspace_la_LIBTOOLFLAGS = --tag=disable-static +endif diff --git a/ext/lcs/gstcolorspace.c b/ext/lcs/gstcolorspace.c index f56d844da..734a81b8f 100644 --- a/ext/lcs/gstcolorspace.c +++ b/ext/lcs/gstcolorspace.c @@ -477,8 +477,8 @@ plugin_init (GstPlugin * plugin) } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "lcscolorspace", + lcscolorspace, "LCS colorspace convertor", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/libfame/Makefile.am b/ext/libfame/Makefile.am index 1db79ddf3..9fdf816f4 100644 --- a/ext/libfame/Makefile.am +++ b/ext/libfame/Makefile.am @@ -5,6 +5,8 @@ libgstlibfame_la_SOURCES = gstlibfame.c libgstlibfame_la_CFLAGS = $(GST_CFLAGS) $(LIBFAME_CFLAGS) libgstlibfame_la_LIBADD = $(LIBFAME_LIBS) libgstlibfame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstlibfame_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS=gstlibfame.h diff --git a/ext/libfame/gstlibfame.c b/ext/libfame/gstlibfame.c index 4765796d2..e16253d1a 100644 --- a/ext/libfame/gstlibfame.c +++ b/ext/libfame/gstlibfame.c @@ -172,8 +172,7 @@ gst_fameenc_base_init (GstFameEncClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); gst_element_class_add_static_pad_template (element_class, &src_template); gst_element_class_set_details_simple (element_class, @@ -586,9 +585,9 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_FAMEENC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "fameenc", + fameenc, "Fast Assembly MPEG Encoder", plugin_init, LIBFAME_VERSION, "LGPL", "libfame", "http://fame.sourceforge.net/") diff --git a/ext/libmms/Makefile.am b/ext/libmms/Makefile.am index 3a9fa6cbe..09927686a 100644 --- a/ext/libmms/Makefile.am +++ b/ext/libmms/Makefile.am @@ -5,6 +5,8 @@ libgstmms_la_SOURCES = gstmms.c libgstmms_la_CFLAGS = $(GST_CFLAGS) $(LIBMMS_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) libgstmms_la_LIBADD = $(GST_LIBS) $(LIBMMS_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) libgstmms_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmms_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstmms.h diff --git a/ext/libmms/gstmms.c b/ext/libmms/gstmms.c index 28a82da3c..e4cd3932b 100644 --- a/ext/libmms/gstmms.c +++ b/ext/libmms/gstmms.c @@ -645,8 +645,8 @@ gst_mms_uri_handler_init (gpointer g_iface, gpointer iface_data) /* this is the structure that gst-register looks for * so keep the name plugin_desc, or you cannot get your plug-in registered */ -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mms", + mms, "Microsoft Multi Media Server streaming protocol support", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/lv2/Makefile.am b/ext/lv2/Makefile.am index 7b6ac4e52..55d40f533 100644 --- a/ext/lv2/Makefile.am +++ b/ext/lv2/Makefile.am @@ -10,6 +10,8 @@ libgstlv2_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ $(GST_CONTROLLER_LIBS) $(LIBM) $(SLV2_LIBS) libgstlv2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstlv2_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstlv2.h diff --git a/ext/lv2/gstlv2.c b/ext/lv2/gstlv2.c index f31050fc6..b4c71f9dc 100644 --- a/ext/lv2/gstlv2.c +++ b/ext/lv2/gstlv2.c @@ -949,8 +949,8 @@ __attribute__ ((destructor)) slv2_world_free (world); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "lv2", + lv2, "All LV2 plugins", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/mimic/Makefile.am b/ext/mimic/Makefile.am index b16741449..20156a646 100644 --- a/ext/mimic/Makefile.am +++ b/ext/mimic/Makefile.am @@ -5,6 +5,8 @@ libgstmimic_la_SOURCES = gstmimic.c gstmimdec.c gstmimenc.c libgstmimic_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(MIMIC_CFLAGS) libgstmimic_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(MIMIC_LIBS) libgstmimic_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmimic_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstmimdec.h gstmimenc.h diff --git a/ext/mimic/gstmimic.c b/ext/mimic/gstmimic.c index c23cc39db..089f7c2b6 100644 --- a/ext/mimic/gstmimic.c +++ b/ext/mimic/gstmimic.c @@ -39,8 +39,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mimic", + mimic, "Mimic codec", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/modplug/Makefile.am b/ext/modplug/Makefile.am index e95256274..c4f815c0f 100644 --- a/ext/modplug/Makefile.am +++ b/ext/modplug/Makefile.am @@ -4,6 +4,8 @@ libgstmodplug_la_SOURCES = gstmodplug.cc libgstmodplug_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MODPLUG_CFLAGS) libgstmodplug_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lstdc++ $(LIBM) $(MODPLUG_LIBS) libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmodplug_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstmodplug.h diff --git a/ext/modplug/gstmodplug.cc b/ext/modplug/gstmodplug.cc index 09836a910..621284216 100644 --- a/ext/modplug/gstmodplug.cc +++ b/ext/modplug/gstmodplug.cc @@ -873,8 +873,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_PRIMARY, GST_TYPE_MODPLUG); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "modplug", + modplug, ".MOD audio decoding", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/mpeg2enc/Makefile.am b/ext/mpeg2enc/Makefile.am index 1e3d94403..68d8d0371 100644 --- a/ext/mpeg2enc/Makefile.am +++ b/ext/mpeg2enc/Makefile.am @@ -12,7 +12,9 @@ libgstmpeg2enc_la_CXXFLAGS = \ libgstmpeg2enc_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(MPEG2ENC_LIBS) libgstmpeg2enc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmpeg2enc_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstmpeg2enc.hh \ diff --git a/ext/mpeg2enc/gstmpeg2enc.cc b/ext/mpeg2enc/gstmpeg2enc.cc index 1987103e2..7e926fc52 100644 --- a/ext/mpeg2enc/gstmpeg2enc.cc +++ b/ext/mpeg2enc/gstmpeg2enc.cc @@ -719,8 +719,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_MARGINAL, GST_TYPE_MPEG2ENC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mpeg2enc", + mpeg2enc, "High-quality MPEG-1/2 video encoder", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/mplex/Makefile.am b/ext/mplex/Makefile.am index 86ff2f215..e5089cdac 100644 --- a/ext/mplex/Makefile.am +++ b/ext/mplex/Makefile.am @@ -11,7 +11,9 @@ libgstmplex_la_CXXFLAGS = \ libgstmplex_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(MPLEX_LIBS) libgstmplex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(MPLEX_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmplex_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstmplex.hh \ diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc index ac94e7c29..030842b95 100644 --- a/ext/mplex/gstmplex.cc +++ b/ext/mplex/gstmplex.cc @@ -802,8 +802,8 @@ plugin_init (GstPlugin * plugin) return gst_element_register (plugin, "mplex", GST_RANK_NONE, GST_TYPE_MPLEX); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mplex", + mplex, "High-quality MPEG/DVD/SVCD/VCD video/audio multiplexer", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/musepack/Makefile.am b/ext/musepack/Makefile.am index ff2532c0d..060f0ebc9 100644 --- a/ext/musepack/Makefile.am +++ b/ext/musepack/Makefile.am @@ -6,7 +6,9 @@ libgstmusepack_la_SOURCES = \ libgstmusepack_la_CFLAGS = $(MUSEPACK_CFLAGS) $(GST_CFLAGS) libgstmusepack_la_LIBADD = $(MUSEPACK_LIBS) $(GST_LIBS) libgstmusepack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmusepack_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstmusepackdec.h \ diff --git a/ext/musepack/gstmusepackdec.c b/ext/musepack/gstmusepackdec.c index 1d6380c75..21487faf4 100644 --- a/ext/musepack/gstmusepackdec.c +++ b/ext/musepack/gstmusepackdec.c @@ -80,8 +80,7 @@ gst_musepackdec_base_init (gpointer klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_static_pad_template (element_class, &src_template); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); gst_element_class_set_details_simple (element_class, "Musepack decoder", "Codec/Decoder/Audio", @@ -659,8 +658,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_PRIMARY, GST_TYPE_MUSEPACK_DEC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "musepack", + musepack, "Musepack decoder", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/musicbrainz/Makefile.am b/ext/musicbrainz/Makefile.am index ab536c6ca..5a3208b66 100644 --- a/ext/musicbrainz/Makefile.am +++ b/ext/musicbrainz/Makefile.am @@ -7,5 +7,7 @@ libgsttrm_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(MUSICBRAINZ_CFL libgsttrm_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(MUSICBRAINZ_LIBS) \ -lgsttag-@GST_MAJORMINOR@ libgsttrm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgsttrm_la_LIBTOOLFLAGS = --tag=disable-static +endif diff --git a/ext/musicbrainz/gsttrm.c b/ext/musicbrainz/gsttrm.c index 173c1f1a4..19db2aca1 100644 --- a/ext/musicbrainz/gsttrm.c +++ b/ext/musicbrainz/gsttrm.c @@ -113,8 +113,7 @@ gst_trm_base_init (gpointer klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_static_pad_template (element_class, &src_template); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); gst_element_class_set_details_simple (element_class, "MusicBrainz TRM generator", "Filter/Analyzer/Audio", @@ -385,8 +384,8 @@ plugin_init (GstPlugin * plugin) } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "musicbrainz", + musicbrainz, "A TRM signature producer based on libmusicbrainz", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/mythtv/Makefile.am b/ext/mythtv/Makefile.am index 6bec4ce06..520da40de 100644 --- a/ext/mythtv/Makefile.am +++ b/ext/mythtv/Makefile.am @@ -10,7 +10,9 @@ libgstmythtvsrc_la_CFLAGS = \ libgstmythtvsrc_la_LDFLAGS = \ $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmythtvsrc_la_LIBTOOLFLAGS = --tag=disable-static +endif libgstmythtvsrc_la_LIBADD = \ $(GST_BASE_LIBS) \ diff --git a/ext/mythtv/gstmythtvsrc.c b/ext/mythtv/gstmythtvsrc.c index 71c909287..585ae6dce 100644 --- a/ext/mythtv/gstmythtvsrc.c +++ b/ext/mythtv/gstmythtvsrc.c @@ -956,9 +956,9 @@ plugin_init (GstPlugin * plugin) GST_TYPE_MYTHTV_SRC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mythtv", + mythtv, "lib MythTV src", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/ext/nas/Makefile.am b/ext/nas/Makefile.am index ef1dbbad2..5214ed1d5 100644 --- a/ext/nas/Makefile.am +++ b/ext/nas/Makefile.am @@ -6,6 +6,8 @@ libgstnassink_la_CFLAGS = \ libgstnassink_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(NAS_LIBS) libgstnassink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstnassink_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = nassink.h diff --git a/ext/nas/nassink.c b/ext/nas/nassink.c index dac158d2a..e48abd751 100644 --- a/ext/nas/nassink.c +++ b/ext/nas/nassink.c @@ -629,8 +629,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "nas", + nas, "NAS (Network Audio System) support for GStreamer", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/ext/neon/Makefile.am b/ext/neon/Makefile.am index 93bf0cca9..32cd369a2 100644 --- a/ext/neon/Makefile.am +++ b/ext/neon/Makefile.am @@ -5,6 +5,8 @@ libgstneonhttpsrc_la_SOURCES = gstneonhttpsrc.c libgstneonhttpsrc_la_CFLAGS = $(GST_CFLAGS) $(NEON_CFLAGS) libgstneonhttpsrc_la_LIBADD = $(GST_BASE_LIBS) $(NEON_LIBS) libgstneonhttpsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstneonhttpsrc_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstneonhttpsrc.h diff --git a/ext/neon/gstneonhttpsrc.c b/ext/neon/gstneonhttpsrc.c index 20adf057c..3d66e762e 100644 --- a/ext/neon/gstneonhttpsrc.c +++ b/ext/neon/gstneonhttpsrc.c @@ -1183,8 +1183,8 @@ plugin_init (GstPlugin * plugin) /* this is the structure that gst-register looks for * so keep the name plugin_desc, or you cannot get your plug-in registered */ -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "neon", + neon, "lib neon http client src", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/ofa/Makefile.am b/ext/ofa/Makefile.am index 9a674e08b..6a87f7218 100644 --- a/ext/ofa/Makefile.am +++ b/ext/ofa/Makefile.am @@ -14,6 +14,8 @@ libgstofa_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ $(OFA_LIBS) libgstofa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstofa_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstofa.h diff --git a/ext/ofa/gstofa.c b/ext/ofa/gstofa.c index 6081fdb28..13750c444 100644 --- a/ext/ofa/gstofa.c +++ b/ext/ofa/gstofa.c @@ -273,8 +273,8 @@ plugin_init (GstPlugin * plugin) return ret; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "ofa", + ofa, "Calculate MusicIP fingerprint from audio files", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/openal/Makefile.am b/ext/openal/Makefile.am index b5e4e5b90..d6c59a471 100644 --- a/ext/openal/Makefile.am +++ b/ext/openal/Makefile.am @@ -9,7 +9,9 @@ libgstopenal_la_SOURCES = gstopenal.c gstopenalsink.c gstopenalsrc.c libgstopenal_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(OPENAL_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) libgstopenal_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(OPENAL_LIBS) libgstopenal_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstopenal_la_LIBTOOLFLAGS = --tag=disable-static +endif # headers we need but don't want installed noinst_HEADERS = gstopenalsink.h gstopenalsrc.h diff --git a/ext/openal/gstopenal.c b/ext/openal/gstopenal.c index 7022441b5..9ca8a7751 100644 --- a/ext/openal/gstopenal.c +++ b/ext/openal/gstopenal.c @@ -49,7 +49,7 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "openal", +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, + openal, "OpenAL support for GStreamer", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/opencv/Makefile.am b/ext/opencv/Makefile.am index d466bbb0b..d3110ce4e 100644 --- a/ext/opencv/Makefile.am +++ b/ext/opencv/Makefile.am @@ -36,7 +36,9 @@ libgstopencv_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(OPENCV_LIBS) \ $(GSTPB_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) libgstopencv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstopencv_la_LIBTOOLFLAGS = --tag=disable-static +endif # headers we need but don't want installed noinst_HEADERS = gstopencvvideofilter.h gstopencvutils.h \ diff --git a/ext/opencv/gstopencv.c b/ext/opencv/gstopencv.c index 270c7885e..f01746da1 100644 --- a/ext/opencv/gstopencv.c +++ b/ext/opencv/gstopencv.c @@ -82,8 +82,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "opencv", + opencv, "GStreamer OpenCV Plugins", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/opus/Makefile.am b/ext/opus/Makefile.am index cdf3c30ac..d0e078ae4 100644 --- a/ext/opus/Makefile.am +++ b/ext/opus/Makefile.am @@ -14,6 +14,8 @@ libgstopus_la_LIBADD = \ $(GST_LIBS) \ $(OPUS_LIBS) libgstopus_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM) +if !GST_PLUGIN_BUILD_STATIC libgstopus_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstopusenc.h gstopusdec.h gstopusparse.h gstopusheader.h gstopuscommon.h gstrtpopuspay.h gstrtpopusdepay.h diff --git a/ext/opus/gstopus.c b/ext/opus/gstopus.c index 8db6e197f..ce6f71b86 100644 --- a/ext/opus/gstopus.c +++ b/ext/opus/gstopus.c @@ -59,8 +59,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "opus", + opus, "OPUS plugin library", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/resindvd/Makefile.am b/ext/resindvd/Makefile.am index e9ef5abb0..4d7f4ffdc 100644 --- a/ext/resindvd/Makefile.am +++ b/ext/resindvd/Makefile.am @@ -23,7 +23,9 @@ libresindvd_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstpbutils-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) $(GST_LIBS) $(DVDNAV_LIBS) libresindvd_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libresindvd_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = resindvdbin.h \ rsnaudiomunge.h \ diff --git a/ext/resindvd/plugin.c b/ext/resindvd/plugin.c index 33b95003b..8bc8d0bd0 100644 --- a/ext/resindvd/plugin.c +++ b/ext/resindvd/plugin.c @@ -53,8 +53,8 @@ plugin_init (GstPlugin * plugin) return result; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "resindvd", + resindvd, "Resin DVD playback elements", plugin_init, VERSION, "GPL", "GStreamer", "http://gstreamer.net/") diff --git a/ext/rsvg/Makefile.am b/ext/rsvg/Makefile.am index d1b04b943..7416a554a 100644 --- a/ext/rsvg/Makefile.am +++ b/ext/rsvg/Makefile.am @@ -11,6 +11,8 @@ libgstrsvg_la_LIBADD = \ $(GST_LIBS) \ $(RSVG_LIBS) libgstrsvg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM) +if !GST_PLUGIN_BUILD_STATIC libgstrsvg_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstrsvgdec.h gstrsvgoverlay.h diff --git a/ext/rsvg/gstrsvg.c b/ext/rsvg/gstrsvg.c index 1318e7098..3ef82a395 100644 --- a/ext/rsvg/gstrsvg.c +++ b/ext/rsvg/gstrsvg.c @@ -38,8 +38,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_RSVG_DEC)); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "rsvg", + rsvg, "RSVG plugin library", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/rtmp/Makefile.am b/ext/rtmp/Makefile.am index bd2398cab..f3070aef1 100644 --- a/ext/rtmp/Makefile.am +++ b/ext/rtmp/Makefile.am @@ -6,5 +6,7 @@ noinst_HEADERS = gstrtmpsrc.h gstrtmpsink.h libgstrtmp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(RTMP_CFLAGS) libgstrtmp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(RTMP_LIBS) libgstrtmp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstrtmp_la_LIBTOOLFLAGS = --tag=disable-static +endif diff --git a/ext/rtmp/gstrtmp.c b/ext/rtmp/gstrtmp.c index 7acbea4a9..be8d63de1 100644 --- a/ext/rtmp/gstrtmp.c +++ b/ext/rtmp/gstrtmp.c @@ -47,8 +47,8 @@ plugin_init (GstPlugin * plugin) return ret; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "rtmp", + rtmp, "RTMP source and sink", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/ext/schroedinger/Makefile.am b/ext/schroedinger/Makefile.am index 66b2e1e2f..131b01af1 100644 --- a/ext/schroedinger/Makefile.am +++ b/ext/schroedinger/Makefile.am @@ -22,6 +22,7 @@ libgstschro_la_LIBADD = \ $(GST_BASE_LIBS) $(GST_LIBS) \ $(SCHRO_LIBS) libgstschro_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstschro_la_LIBTOOLFLAGS = --tag=disable-static - +endif diff --git a/ext/schroedinger/gstschro.c b/ext/schroedinger/gstschro.c index c486473f9..77eef4516 100644 --- a/ext/schroedinger/gstschro.c +++ b/ext/schroedinger/gstschro.c @@ -44,8 +44,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "schro", + schro, "Schroedinger plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/sdl/Makefile.am b/ext/sdl/Makefile.am index 7f2998106..ac9dd3acb 100644 --- a/ext/sdl/Makefile.am +++ b/ext/sdl/Makefile.am @@ -12,7 +12,9 @@ libgstsdl_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstinterfaces-$(GST_MAJORMINOR) \ $(SDL_LIBS) libgstsdl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstsdl_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ sdlvideosink.h \ diff --git a/ext/sdl/gstsdl.c b/ext/sdl/gstsdl.c index 9910d1093..5016ba452 100644 --- a/ext/sdl/gstsdl.c +++ b/ext/sdl/gstsdl.c @@ -38,8 +38,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "sdl", + sdl, "SDL (Simple DirectMedia Layer) support for GStreamer", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/shout/Makefile.am b/ext/shout/Makefile.am index 71fcc49b4..62f767642 100644 --- a/ext/shout/Makefile.am +++ b/ext/shout/Makefile.am @@ -5,6 +5,8 @@ libgstshout_la_SOURCES = gstshout.c libgstshout_la_CFLAGS = $(GST_CFLAGS) libgstshout_la_LIBADD = $(SHOUT_LIBS) libgstshout_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstshout_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstshout.h diff --git a/ext/shout/gstshout.c b/ext/shout/gstshout.c index 59cfc1409..d7e9a1d29 100644 --- a/ext/shout/gstshout.c +++ b/ext/shout/gstshout.c @@ -459,8 +459,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_ICECASTSEND); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "icecastsend", + icecastsend, "Sends data to an icecast server using libshout", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/snapshot/Makefile.am b/ext/snapshot/Makefile.am index 763d2fe93..db776b627 100644 --- a/ext/snapshot/Makefile.am +++ b/ext/snapshot/Makefile.am @@ -6,6 +6,8 @@ libgstsnapshot_la_SOURCES = \ libgstsnapshot_la_CFLAGS = $(GST_CFLAGS) libgstsnapshot_la_LIBADD = $(GST_LIBS) $(LIBPNG_LIBS) libgstsnapshot_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +if !GST_PLUGIN_BUILD_STATIC libgstsnapshot_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstsnapshot.h diff --git a/ext/snapshot/gstsnapshot.c b/ext/snapshot/gstsnapshot.c index 6b7858161..1435fa8b5 100644 --- a/ext/snapshot/gstsnapshot.c +++ b/ext/snapshot/gstsnapshot.c @@ -332,8 +332,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "snapshot", + snapshot, "Dump a frame to a png file", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/sndfile/Makefile.am b/ext/sndfile/Makefile.am index 4c0767041..1ef788759 100644 --- a/ext/sndfile/Makefile.am +++ b/ext/sndfile/Makefile.am @@ -5,6 +5,8 @@ libgstsndfile_la_SOURCES = gstsf.c gstsfsrc.c gstsfsink.c libgstsndfile_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SNDFILE_CFLAGS) libgstsndfile_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SNDFILE_LIBS) libgstsndfile_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstsndfile_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstsf.h gstsfsrc.h gstsfsink.h diff --git a/ext/sndfile/gstsf.c b/ext/sndfile/gstsf.c index 6148e8529..4ae217627 100644 --- a/ext/sndfile/gstsf.c +++ b/ext/sndfile/gstsf.c @@ -123,8 +123,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "sndfile", + sndfile, "use libsndfile to read and write audio from and to files", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/soundtouch/Makefile.am b/ext/soundtouch/Makefile.am index 74a5516d4..f90b22cee 100644 --- a/ext/soundtouch/Makefile.am +++ b/ext/soundtouch/Makefile.am @@ -9,6 +9,8 @@ libgstsoundtouch_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST libgstsoundtouch_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(SOUNDTOUCH_CFLAGS) libgstsoundtouch_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(SOUNDTOUCH_LIBS) $(LIBM) libgstsoundtouch_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstsoundtouch_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstpitch.hh gstbpmdetect.hh diff --git a/ext/soundtouch/plugin.c b/ext/soundtouch/plugin.c index 5e8cb1563..2dc6d06e0 100644 --- a/ext/soundtouch/plugin.c +++ b/ext/soundtouch/plugin.c @@ -36,8 +36,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_BPM_DETECT); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "soundtouch", + soundtouch, "Audio Pitch Controller & BPM Detection", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/spandsp/Makefile.am b/ext/spandsp/Makefile.am index 46585958a..d48690693 100644 --- a/ext/spandsp/Makefile.am +++ b/ext/spandsp/Makefile.am @@ -4,6 +4,8 @@ libgstspandsp_la_SOURCES = gstspandsp.c gstspanplc.c libgstspandsp_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(SPANDSP_CFLAGS) libgstspandsp_la_LIBADD = $(SPANDSP_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) libgstspandsp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstspandsp_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstspanplc.h diff --git a/ext/spandsp/gstspandsp.c b/ext/spandsp/gstspandsp.c index ad1c3a817..3efccca1e 100644 --- a/ext/spandsp/gstspandsp.c +++ b/ext/spandsp/gstspandsp.c @@ -33,8 +33,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_PRIMARY, GST_TYPE_SPAN_PLC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "spandsp", + spandsp, "libspandsp plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/spc/Makefile.am b/ext/spc/Makefile.am index 067ea6692..4d5c067bb 100644 --- a/ext/spc/Makefile.am +++ b/ext/spc/Makefile.am @@ -5,7 +5,9 @@ libgstspc_la_SOURCES = gstspc.c tag.c libgstspc_la_CFLAGS = $(GST_CFLAGS) $(SPC_CFLAGS) libgstspc_la_LIBADD = $(GST_LIBS) $(SPC_LIBS) libgstspc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstspc_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstspc.h tag.h diff --git a/ext/spc/gstspc.c b/ext/spc/gstspc.c index fb85ca3ef..826783655 100644 --- a/ext/spc/gstspc.c +++ b/ext/spc/gstspc.c @@ -586,8 +586,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_SPC_DEC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "spcdec", + spcdec, "OpenSPC Audio Decoder", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/ext/swfdec/Makefile.am b/ext/swfdec/Makefile.am index cd52d2ae6..3e5f48a79 100644 --- a/ext/swfdec/Makefile.am +++ b/ext/swfdec/Makefile.am @@ -4,6 +4,8 @@ libgstswfdec_la_SOURCES = gstswfdec.c libgstswfdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(SWFDEC_CFLAGS) libgstswfdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BLIBS) $(SWFDEC_LIBS) libgstswfdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstswfdec_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstswfdec.h diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c index 43e06de72..e1f8eb454 100644 --- a/ext/swfdec/gstswfdec.c +++ b/ext/swfdec/gstswfdec.c @@ -901,8 +901,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_SWFDEC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "swfdec", + swfdec, "Uses libswfdec to decode Flash video streams", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/teletextdec/Makefile.am b/ext/teletextdec/Makefile.am index c153c563b..a0abf025f 100644 --- a/ext/teletextdec/Makefile.am +++ b/ext/teletextdec/Makefile.am @@ -5,6 +5,8 @@ libgstteletextdec_la_SOURCES = gstteletextdec.c teletext.c libgstteletextdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TELETEXTDEC_CFLAGS) libgstteletextdec_la_LIBADD = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_LIBS) $(TELETEXTDEC_LIBS) libgstteletextdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstteletextdec_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstteletextdec.h diff --git a/ext/teletextdec/teletext.c b/ext/teletextdec/teletext.c index df4e635a0..38d16c87e 100644 --- a/ext/teletextdec/teletext.c +++ b/ext/teletextdec/teletext.c @@ -36,8 +36,8 @@ teletext_init (GstPlugin * teletext) GST_TYPE_TELETEXTDEC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "teletext", + teletext, "Teletext plugin", teletext_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/ext/timidity/Makefile.am b/ext/timidity/Makefile.am index de170b18f..4ca5a2829 100644 --- a/ext/timidity/Makefile.am +++ b/ext/timidity/Makefile.am @@ -12,8 +12,10 @@ libgsttimidity_la_SOURCES = gsttimidity.c libgsttimidity_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(TIMIDITY_CFLAGS) libgsttimidity_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(TIMIDITY_LIBS) libgsttimidity_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgsttimidity_la_LIBTOOLFLAGS = --tag=disable-static endif +endif if USE_WILDMIDI plugin_LTLIBRARIES += libgstwildmidi.la @@ -26,8 +28,10 @@ libgstwildmidi_la_SOURCES = gstwildmidi.c libgstwildmidi_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(WILDMIDI_CFLAGS) libgstwildmidi_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(WILDMIDI_LIBS) libgstwildmidi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstwildmidi_la_LIBTOOLFLAGS = --tag=disable-static endif +endif noinst_HEADERS = gsttimidity.h gstwildmidi.h diff --git a/ext/timidity/gsttimidity.c b/ext/timidity/gsttimidity.c index 91e47ced4..10c3f5158 100644 --- a/ext/timidity/gsttimidity.c +++ b/ext/timidity/gsttimidity.c @@ -798,8 +798,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_PRIMARY, GST_TYPE_TIMIDITY); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "timidity", + timidity, "Timidity Plugin", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c index e78ecc11c..d1afe775f 100644 --- a/ext/timidity/gstwildmidi.c +++ b/ext/timidity/gstwildmidi.c @@ -994,8 +994,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_SECONDARY, GST_TYPE_WILDMIDI); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "wildmidi", + wildmidi, "Wildmidi Plugin", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/voaacenc/Makefile.am b/ext/voaacenc/Makefile.am index 8f58c2092..22baaa5fc 100644 --- a/ext/voaacenc/Makefile.am +++ b/ext/voaacenc/Makefile.am @@ -17,7 +17,9 @@ libgstvoaacenc_la_LIBADD = \ $(GST_LIBS) \ $(VOAACENC_LIBS) libgstvoaacenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvoaacenc_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstvoaacenc.h diff --git a/ext/voaacenc/gstvoaac.c b/ext/voaacenc/gstvoaac.c index 30b5df952..22e48f418 100644 --- a/ext/voaacenc/gstvoaac.c +++ b/ext/voaacenc/gstvoaac.c @@ -31,8 +31,8 @@ plugin_init (GstPlugin * plugin) } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "voaacenc", + voaacenc, "AAC audio encoder", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/ext/voamrwbenc/Makefile.am b/ext/voamrwbenc/Makefile.am index b96239033..4239aa7fb 100644 --- a/ext/voamrwbenc/Makefile.am +++ b/ext/voamrwbenc/Makefile.am @@ -9,7 +9,9 @@ libgstvoamrwbenc_la_CFLAGS = -DGST_USE_UNSTABLE_API \ libgstvoamrwbenc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(VOAMRWBENC_LIBS) libgstvoamrwbenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvoamrwbenc_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstvoamrwbenc.h diff --git a/ext/voamrwbenc/gstvoamrwb.c b/ext/voamrwbenc/gstvoamrwb.c index c6c0d3a77..440af0a72 100644 --- a/ext/voamrwbenc/gstvoamrwb.c +++ b/ext/voamrwbenc/gstvoamrwb.c @@ -31,9 +31,9 @@ plugin_init (GstPlugin * plugin) } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "voamrwbenc", + voamrwbenc, "Adaptive Multi-Rate Wide-Band Encoder", plugin_init, VERSION, GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/ext/vp8/Makefile.am b/ext/vp8/Makefile.am index d839666fd..f4b668395 100644 --- a/ext/vp8/Makefile.am +++ b/ext/vp8/Makefile.am @@ -18,7 +18,9 @@ libgstvp8_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ -lgstvideo-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(VPX_LIBS) libgstvp8_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvp8_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstvp8dec.h \ diff --git a/ext/vp8/plugin.c b/ext/vp8/plugin.c index cdecdc309..0372a9550 100644 --- a/ext/vp8/plugin.c +++ b/ext/vp8/plugin.c @@ -44,8 +44,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "vp8", + vp8, "VP8 plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/xvid/Makefile.am b/ext/xvid/Makefile.am index 0d3c1dda2..3f9eb6cca 100644 --- a/ext/xvid/Makefile.am +++ b/ext/xvid/Makefile.am @@ -4,6 +4,8 @@ libgstxvid_la_SOURCES = gstxvidenc.c gstxviddec.c gstxvid.c libgstxvid_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(XVID_CFLAGS) libgstxvid_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(XVID_LIBS) libgstxvid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstxvid_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstxvidenc.h gstxviddec.h gstxvid.h diff --git a/ext/xvid/gstxvid.c b/ext/xvid/gstxvid.c index e4b48093c..db64b64d4 100644 --- a/ext/xvid/gstxvid.c +++ b/ext/xvid/gstxvid.c @@ -364,8 +364,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_XVIDDEC)); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "xvid", + xvid, "XviD plugin library", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/zbar/Makefile.am b/ext/zbar/Makefile.am index 2b1f37007..07fa52b57 100644 --- a/ext/zbar/Makefile.am +++ b/ext/zbar/Makefile.am @@ -5,7 +5,9 @@ libgstzbar_la_SOURCES = gstzbar.c libgstzbar_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ZBAR_CFLAGS) libgstzbar_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZBAR_LIBS) libgstzbar_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstzbar_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstzbar.h diff --git a/ext/zbar/gstzbar.c b/ext/zbar/gstzbar.c index c0310349d..230b670cc 100644 --- a/ext/zbar/gstzbar.c +++ b/ext/zbar/gstzbar.c @@ -373,8 +373,8 @@ plugin_init (GstPlugin * plugin) return gst_element_register (plugin, "zbar", GST_RANK_NONE, GST_TYPE_ZBAR); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "zbar", + zbar, "zbar barcode scanner", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/adpcmdec/Makefile.am b/gst/adpcmdec/Makefile.am index 2521fe6f1..ef27eaec6 100644 --- a/gst/adpcmdec/Makefile.am +++ b/gst/adpcmdec/Makefile.am @@ -8,7 +8,9 @@ libgstadpcmdec_la_SOURCES = adpcmdec.c libgstadpcmdec_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgstadpcmdec_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) libgstadpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstadpcmdec_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ diff --git a/gst/adpcmdec/adpcmdec.c b/gst/adpcmdec/adpcmdec.c index b97584cb9..7ed984da8 100644 --- a/gst/adpcmdec/adpcmdec.c +++ b/gst/adpcmdec/adpcmdec.c @@ -583,6 +583,6 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "adpcmdec", +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, adpcmdec, "ADPCM decoder", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/adpcmenc/Makefile.am b/gst/adpcmenc/Makefile.am index 17b3ecd28..dcadeb8e3 100644 --- a/gst/adpcmenc/Makefile.am +++ b/gst/adpcmenc/Makefile.am @@ -8,7 +8,9 @@ libgstadpcmenc_la_SOURCES = adpcmenc.c libgstadpcmenc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgstadpcmenc_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) libgstadpcmenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstadpcmenc_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ diff --git a/gst/adpcmenc/adpcmenc.c b/gst/adpcmenc/adpcmenc.c index d8ce1db49..930930b0b 100644 --- a/gst/adpcmenc/adpcmenc.c +++ b/gst/adpcmenc/adpcmenc.c @@ -565,6 +565,6 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "adpcmenc", +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, adpcmenc, "ADPCM encoder", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/aiff/Makefile.am b/gst/aiff/Makefile.am index 2eb8392b8..a7ada6224 100644 --- a/gst/aiff/Makefile.am +++ b/gst/aiff/Makefile.am @@ -11,7 +11,9 @@ libgstaiff_la_LIBADD = \ $(GST_BASE_LIBS) \ $(LIBM) libgstaiff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstaiff_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = aiffmux.h aiffparse.h diff --git a/gst/aiff/aiff.c b/gst/aiff/aiff.c index ba89e1a4a..0571efb44 100644 --- a/gst/aiff/aiff.c +++ b/gst/aiff/aiff.c @@ -61,8 +61,8 @@ plugin_init (GstPlugin * plugin) return ret; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "aiff", + aiff, "Create and parse Audio Interchange File Format (AIFF) files", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/asfmux/Makefile.am b/gst/asfmux/Makefile.am index 8678fee5d..5fcb55a2f 100644 --- a/gst/asfmux/Makefile.am +++ b/gst/asfmux/Makefile.am @@ -15,7 +15,9 @@ libgstasfmux_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $( libgstasfmux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ -lgstrtp-@GST_MAJORMINOR@ libgstasfmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstasfmux_la_LIBTOOLFLAGS = --tag=disable-static +endif # headers we need but don't want installed noinst_HEADERS = gstasfmux.h \ diff --git a/gst/asfmux/gstasf.c b/gst/asfmux/gstasf.c index 0cf3b32e5..3a74ba6b9 100644 --- a/gst/asfmux/gstasf.c +++ b/gst/asfmux/gstasf.c @@ -44,8 +44,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "asfmux", + asfmux, "ASF Muxer Plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/audiobuffer/Makefile.am b/gst/audiobuffer/Makefile.am index ff63c8cdb..9ca4daae4 100644 --- a/gst/audiobuffer/Makefile.am +++ b/gst/audiobuffer/Makefile.am @@ -7,7 +7,9 @@ libgstaudiobuffer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ -lgstaudio-$(GST_MAJORMINOR) libgstaudiobuffer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstaudiobuffer_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ diff --git a/gst/audiobuffer/gstaudioringbuffer.c b/gst/audiobuffer/gstaudioringbuffer.c index 6d87df2a4..a310d34e0 100644 --- a/gst/audiobuffer/gstaudioringbuffer.c +++ b/gst/audiobuffer/gstaudioringbuffer.c @@ -320,10 +320,8 @@ gst_audio_ringbuffer_class_init (GstAudioRingbufferClass * klass) G_MAXINT64, DEFAULT_SEGMENT_TIME, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - gst_element_class_add_static_pad_template (gstelement_class, - &srctemplate); - gst_element_class_add_static_pad_template (gstelement_class, - &sinktemplate); + gst_element_class_add_static_pad_template (gstelement_class, &srctemplate); + gst_element_class_add_static_pad_template (gstelement_class, &sinktemplate); gst_element_class_set_details_simple (gstelement_class, "AudioRingbuffer", "Generic", @@ -1174,8 +1172,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_AUDIO_RINGBUFFER); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "audioringbuffer", + audioringbuffer, "An audio ringbuffer", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/audiovisualizers/Makefile.am b/gst/audiovisualizers/Makefile.am index f6ee5299d..3c80c4be7 100644 --- a/gst/audiovisualizers/Makefile.am +++ b/gst/audiovisualizers/Makefile.am @@ -15,7 +15,9 @@ libgstaudiovisualizers_la_LIBADD = \ -lgstvideo-$(GST_MAJORMINOR) -lgstfft-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(LIBM) libgstaudiovisualizers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstaudiovisualizers_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstbaseaudiovisualizer.h gstdrawhelpers.h \ gstspacescope.h gstspectrascope.h gstsynaescope.h gstwavescope.h diff --git a/gst/audiovisualizers/plugin.c b/gst/audiovisualizers/plugin.c index 4130f9725..cd6a7dd41 100644 --- a/gst/audiovisualizers/plugin.c +++ b/gst/audiovisualizers/plugin.c @@ -44,8 +44,8 @@ plugin_init (GstPlugin * plugin) return res; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "audiovisualizers", + audiovisualizers, "Creates video visualizations of audio input", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/autoconvert/Makefile.am b/gst/autoconvert/Makefile.am index faa0d9cd0..de5cba29a 100644 --- a/gst/autoconvert/Makefile.am +++ b/gst/autoconvert/Makefile.am @@ -5,7 +5,9 @@ libgstautoconvert_la_SOURCES = gstautoconvert.c gstautovideoconvert.c plugin.c libgstautoconvert_la_CFLAGS = $(GST_CFLAGS) libgstautoconvert_la_LIBADD = $(GST_LIBS) libgstautoconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstautoconvert_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstautoconvert.h gstautovideoconvert.h diff --git a/gst/autoconvert/gstautoconvert.c b/gst/autoconvert/gstautoconvert.c index 43a7cc9fb..22cda1f45 100644 --- a/gst/autoconvert/gstautoconvert.c +++ b/gst/autoconvert/gstautoconvert.c @@ -1535,9 +1535,9 @@ gst_auto_convert_plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_AUTO_CONVERT); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "autoconvert", + autoconvert, "Selects convertor element based on caps", gst_auto_convert_plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/autoconvert/plugin.c b/gst/autoconvert/plugin.c index 0de71d3bb..e8ba9a711 100644 --- a/gst/autoconvert/plugin.c +++ b/gst/autoconvert/plugin.c @@ -39,8 +39,8 @@ plugin_init (GstPlugin * plugin) return ret; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "autoconvert", + autoconvert, "Selects convertor element based on caps", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/bayer/Makefile.am b/gst/bayer/Makefile.am index d67899ecc..1c1e49e65 100644 --- a/gst/bayer/Makefile.am +++ b/gst/bayer/Makefile.am @@ -18,7 +18,9 @@ libgstbayer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ $(ORC_LIBS) \ $(GST_BASE_LIBS) libgstbayer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstbayer_la_LIBTOOLFLAGS = --tag=disable-static +endif nodist_libgstbayer_la_SOURCES = $(ORC_NODIST_SOURCES) diff --git a/gst/bayer/gstbayer.c b/gst/bayer/gstbayer.c index a1ae9a734..90ac1197f 100644 --- a/gst/bayer/gstbayer.c +++ b/gst/bayer/gstbayer.c @@ -38,8 +38,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "bayer", + bayer, "Elements to convert Bayer images", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/camerabin/Makefile.am b/gst/camerabin/Makefile.am index b29a54d0c..3ce6b501e 100644 --- a/gst/camerabin/Makefile.am +++ b/gst/camerabin/Makefile.am @@ -34,7 +34,9 @@ libgstcamerabin_la_LIBADD = \ -lgstinterfaces-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR) libgstcamerabin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstcamerabin_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstcamerabin.h \ gstcamerabincolorbalance.h \ diff --git a/gst/camerabin/gstcamerabin.c b/gst/camerabin/gstcamerabin.c index a17e02cc6..423d1be1b 100644 --- a/gst/camerabin/gstcamerabin.c +++ b/gst/camerabin/gstcamerabin.c @@ -4338,8 +4338,8 @@ plugin_init (GstPlugin * plugin) /* this is the structure that gstreamer looks for to register plugins */ -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "camerabin", + camerabin, "High level api for DC (Digital Camera) application", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/camerabin2/Makefile.am b/gst/camerabin2/Makefile.am index 3433263ad..8222eb3be 100644 --- a/gst/camerabin2/Makefile.am +++ b/gst/camerabin2/Makefile.am @@ -19,7 +19,9 @@ libgstcamerabin2_la_LIBADD = \ $(GST_BASE_LIBS) $(GST_LIBS) libgstcamerabin2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstcamerabin2_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstviewfinderbin.h \ camerabingeneral.h \ diff --git a/gst/camerabin2/gstplugin.c b/gst/camerabin2/gstplugin.c index c4eaf2fd4..bdb188d41 100644 --- a/gst/camerabin2/gstplugin.c +++ b/gst/camerabin2/gstplugin.c @@ -40,7 +40,7 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "camerabin2", "camerabin2", + camerabin2, "camerabin2", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/cdxaparse/Makefile.am b/gst/cdxaparse/Makefile.am index f7a11db3b..47bd192a8 100644 --- a/gst/cdxaparse/Makefile.am +++ b/gst/cdxaparse/Makefile.am @@ -21,7 +21,9 @@ libgstcdxaparse_la_LIBADD = \ -lgstriff-@GST_MAJORMINOR@ libgstcdxaparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstcdxaparse_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -35,4 +37,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/cdxaparse/gstcdxaparse.c b/gst/cdxaparse/gstcdxaparse.c index 1f997b7bb..b643f36c3 100644 --- a/gst/cdxaparse/gstcdxaparse.c +++ b/gst/cdxaparse/gstcdxaparse.c @@ -571,8 +571,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "cdxaparse", + cdxaparse, "Parse a .dat file (VCD) into raw mpeg1", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/chart/Makefile.am b/gst/chart/Makefile.am index 438f6d961..e07808fea 100644 --- a/gst/chart/Makefile.am +++ b/gst/chart/Makefile.am @@ -5,5 +5,7 @@ libgstchart_la_SOURCES = gstchart.c libgstchart_la_CFLAGS = $(GST_CFLAGS) libgstchart_la_LIBADD = libgstchart_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstchart_la_LIBTOOLFLAGS = --tag=disable-static +endif diff --git a/gst/chart/gstchart.c b/gst/chart/gstchart.c index da0a622ff..e1b33e772 100644 --- a/gst/chart/gstchart.c +++ b/gst/chart/gstchart.c @@ -385,8 +385,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "chart", + chart, "Takes frames of data and outputs video frames of a chart of data", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/coloreffects/Makefile.am b/gst/coloreffects/Makefile.am index 2dcbdd8e1..206136adb 100644 --- a/gst/coloreffects/Makefile.am +++ b/gst/coloreffects/Makefile.am @@ -15,7 +15,9 @@ libgstcoloreffects_la_LIBADD = \ $(GST_BASE_LIBS) \ $(GST_LIBS) libgstcoloreffects_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstcoloreffects_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstcoloreffects.h gstchromahold.h diff --git a/gst/coloreffects/gstplugin.c b/gst/coloreffects/gstplugin.c index 3e5344454..e3e8f882e 100644 --- a/gst/coloreffects/gstplugin.c +++ b/gst/coloreffects/gstplugin.c @@ -53,8 +53,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "coloreffects", + coloreffects, "Color Look-up Table filters", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/colorspace/Makefile.am b/gst/colorspace/Makefile.am index c5f5bd4cb..546745de0 100644 --- a/gst/colorspace/Makefile.am +++ b/gst/colorspace/Makefile.am @@ -15,7 +15,9 @@ libgstcolorspace_la_LIBADD = \ $(GST_LIBS) \ $(ORC_LIBS) libgstcolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstcolorspace_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstcolorspace.h colorspace.h diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c index c1d68e72d..9421ccc00 100644 --- a/gst/colorspace/gstcolorspace.c +++ b/gst/colorspace/gstcolorspace.c @@ -592,6 +592,6 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_CSP); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "colorspace", "Colorspace conversion", plugin_init, VERSION, "LGPL", "", "") + colorspace, "Colorspace conversion", plugin_init, VERSION, "LGPL", "", "") diff --git a/gst/dataurisrc/Makefile.am b/gst/dataurisrc/Makefile.am index 810ae0cfe..4de3e0fe3 100644 --- a/gst/dataurisrc/Makefile.am +++ b/gst/dataurisrc/Makefile.am @@ -5,7 +5,9 @@ libgstdataurisrc_la_SOURCES = gstdataurisrc.c gstdataurisrc.h libgstdataurisrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgstdataurisrc_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) libgstdataurisrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdataurisrc_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -19,4 +21,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/dataurisrc/gstdataurisrc.c b/gst/dataurisrc/gstdataurisrc.c index 4589bccf5..d0fa52535 100644 --- a/gst/dataurisrc/gstdataurisrc.c +++ b/gst/dataurisrc/gstdataurisrc.c @@ -475,8 +475,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_PRIMARY, GST_TYPE_DATA_URI_SRC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dataurisrc", + dataurisrc, "data: URI source", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/dccp/Makefile.am b/gst/dccp/Makefile.am index 41e6ca174..166e6150f 100644 --- a/gst/dccp/Makefile.am +++ b/gst/dccp/Makefile.am @@ -14,7 +14,9 @@ libgstdccp_la_SOURCES = gstdccpplugin.c \ libgstdccp_la_CFLAGS = $(GST_CFLAGS) libgstdccp_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(DCCP_LIBS) libgstdccp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdccp_la_LIBTOOLFLAGS = --tag=disable-static +endif # headers we need but don't want installed noinst_HEADERS = gstdccp.h \ diff --git a/gst/dccp/gstdccpplugin.c b/gst/dccp/gstdccpplugin.c index 05c48cd57..27ce8aa4d 100644 --- a/gst/dccp/gstdccpplugin.c +++ b/gst/dccp/gstdccpplugin.c @@ -52,9 +52,9 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dccp", + dccp, "transfer data over the network via DCCP.", plugin_init, VERSION, GST_LICENSE, "DCCP", "http://garage.maemo.org/projects/ephone") diff --git a/gst/debugutils/Makefile.am b/gst/debugutils/Makefile.am index eadb82e9b..fbdee92fd 100644 --- a/gst/debugutils/Makefile.am +++ b/gst/debugutils/Makefile.am @@ -32,7 +32,9 @@ libgstdebugutilsbad_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ -lgstvideo-$(GST_MAJORMINOR) \ -lgstinterfaces-$(GST_MAJORMINOR) $(GST_LIBS) libgstdebugutilsbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdebugutilsbad_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = fpsdisplaysink.h diff --git a/gst/debugutils/debugutilsbad.c b/gst/debugutils/debugutilsbad.c index 2ee7f93c0..dfe823fda 100644 --- a/gst/debugutils/debugutilsbad.c +++ b/gst/debugutils/debugutilsbad.c @@ -46,8 +46,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "debugutilsbad", + debugutilsbad, "Collection of elements that may or may not be useful for debugging", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/dtmf/Makefile.am b/gst/dtmf/Makefile.am index d57432363..bd02e7354 100644 --- a/gst/dtmf/Makefile.am +++ b/gst/dtmf/Makefile.am @@ -19,7 +19,9 @@ libgstdtmf_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ libgstdtmf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstdtmf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdtmf_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -33,4 +35,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/dtmf/gstdtmf.c b/gst/dtmf/gstdtmf.c index 9d5854fc1..2dc14ddf7 100644 --- a/gst/dtmf/gstdtmf.c +++ b/gst/dtmf/gstdtmf.c @@ -27,7 +27,7 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dtmf", "DTMF plugins", + dtmf, "DTMF plugins", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/dvbsuboverlay/Makefile.am b/gst/dvbsuboverlay/Makefile.am index 859861278..29c2e34aa 100644 --- a/gst/dvbsuboverlay/Makefile.am +++ b/gst/dvbsuboverlay/Makefile.am @@ -5,7 +5,9 @@ libgstdvbsuboverlay_la_SOURCES = dvb-sub.c gstdvbsuboverlay.c libgstdvbsuboverlay_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstdvbsuboverlay_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_LIBS) libgstdvbsuboverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdvbsuboverlay_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstdvbsuboverlay.h dvb-sub.h diff --git a/gst/dvbsuboverlay/gstdvbsuboverlay.c b/gst/dvbsuboverlay/gstdvbsuboverlay.c index 3c2cab3e4..67d731333 100644 --- a/gst/dvbsuboverlay/gstdvbsuboverlay.c +++ b/gst/dvbsuboverlay/gstdvbsuboverlay.c @@ -1078,8 +1078,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_PRIMARY, GST_TYPE_DVBSUB_OVERLAY); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dvbsuboverlay", + dvbsuboverlay, "DVB subtitle renderer", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/dvdspu/Makefile.am b/gst/dvdspu/Makefile.am index 0acbcb9ad..22ccbdf5d 100644 --- a/gst/dvdspu/Makefile.am +++ b/gst/dvdspu/Makefile.am @@ -7,7 +7,9 @@ libgstdvdspu_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $( libgstdvdspu_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ $(GST_LIBS) libgstdvdspu_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdvdspu_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstdvdspu.h gstspu-pgs.h gstspu-vobsub.h gstspu-common.h diff --git a/gst/dvdspu/gstdvdspu.c b/gst/dvdspu/gstdvdspu.c index f57d3c20b..35d948bbb 100644 --- a/gst/dvdspu/gstdvdspu.c +++ b/gst/dvdspu/gstdvdspu.c @@ -1176,9 +1176,9 @@ gst_dvd_spu_plugin_init (GstPlugin * plugin) GST_RANK_PRIMARY, GST_TYPE_DVD_SPU); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dvdspu", + dvdspu, "DVD Sub-picture Overlay element", gst_dvd_spu_plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/faceoverlay/Makefile.am b/gst/faceoverlay/Makefile.am index 30b780c20..50cef7333 100644 --- a/gst/faceoverlay/Makefile.am +++ b/gst/faceoverlay/Makefile.am @@ -7,7 +7,9 @@ libgstfaceoverlay_la_SOURCES = gstfaceoverlay.c libgstfaceoverlay_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstfaceoverlay_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_LIBS) libgstfaceoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstfaceoverlay_la_LIBTOOLFLAGS = --tag=disable-static +endif # headers we need but don't want installed noinst_HEADERS = gstfaceoverlay.h diff --git a/gst/faceoverlay/gstfaceoverlay.c b/gst/faceoverlay/gstfaceoverlay.c index 209f656b4..2baf13807 100644 --- a/gst/faceoverlay/gstfaceoverlay.c +++ b/gst/faceoverlay/gstfaceoverlay.c @@ -491,8 +491,8 @@ faceoverlay_init (GstPlugin * faceoverlay) #endif /* gstreamer looks for this structure to register plugins */ -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "faceoverlay", + faceoverlay, "SVG Face Overlay", faceoverlay_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/gst/festival/Makefile.am b/gst/festival/Makefile.am index e1a62ac27..57168c96e 100644 --- a/gst/festival/Makefile.am +++ b/gst/festival/Makefile.am @@ -14,7 +14,9 @@ libgstfestival_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) libgstfestival_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) \ -lgstaudio-0.10 $(WINSOCK2_LIBS) libgstfestival_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstfestival_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstfestival.h diff --git a/gst/festival/gstfestival.c b/gst/festival/gstfestival.c index 47b371b43..fee762e0a 100644 --- a/gst/festival/gstfestival.c +++ b/gst/festival/gstfestival.c @@ -543,8 +543,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "festival", + festival, "Synthesizes plain text into audio", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/fieldanalysis/Makefile.am b/gst/fieldanalysis/Makefile.am index e6c02ad2f..17fd913f0 100644 --- a/gst/fieldanalysis/Makefile.am +++ b/gst/fieldanalysis/Makefile.am @@ -21,6 +21,8 @@ libgstfieldanalysis_la_LIBADD = \ $(ORC_LIBS) libgstfieldanalysis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstfieldanalysis_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstfieldanalysis.h diff --git a/gst/fieldanalysis/gstfieldanalysis.c b/gst/fieldanalysis/gstfieldanalysis.c index 404fcfad5..cdf3b20e1 100644 --- a/gst/fieldanalysis/gstfieldanalysis.c +++ b/gst/fieldanalysis/gstfieldanalysis.c @@ -1805,8 +1805,8 @@ fieldanalysis_init (GstPlugin * fieldanalysis) GST_TYPE_FIELDANALYSIS); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "fieldanalysis", + fieldanalysis, "Video field analysis", fieldanalysis_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/gst/freeverb/Makefile.am b/gst/freeverb/Makefile.am index 73706a23d..0381fb143 100644 --- a/gst/freeverb/Makefile.am +++ b/gst/freeverb/Makefile.am @@ -8,7 +8,9 @@ libgstfreeverb_la_SOURCES = gstfreeverb.c libgstfreeverb_la_CFLAGS = $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS) libgstfreeverb_la_LIBADD = $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) libgstfreeverb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstfreeverb_la_LIBTOOLFLAGS = --tag=disable-static +endif # headers we need but don't want installed noinst_HEADERS = gstfreeverb.h diff --git a/gst/freeverb/gstfreeverb.c b/gst/freeverb/gstfreeverb.c index 1255eb898..b2dca04f7 100644 --- a/gst/freeverb/gstfreeverb.c +++ b/gst/freeverb/gstfreeverb.c @@ -965,8 +965,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_FREEVERB); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "freeverb", + freeverb, "Reverberation/room effect", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/freeze/Makefile.am b/gst/freeze/Makefile.am index 5f40e1c0f..9a4fdbcd3 100644 --- a/gst/freeze/Makefile.am +++ b/gst/freeze/Makefile.am @@ -4,7 +4,9 @@ libgstfreeze_la_SOURCES = gstfreeze.c libgstfreeze_la_CFLAGS = $(GST_CFLAGS) libgstfreeze_la_LIBADD = ${GST_LIBS} libgstfreeze_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstfreeze_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstfreeze.h @@ -20,4 +22,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/freeze/gstfreeze.c b/gst/freeze/gstfreeze.c index c7884f8f8..fe3db096c 100644 --- a/gst/freeze/gstfreeze.c +++ b/gst/freeze/gstfreeze.c @@ -377,9 +377,9 @@ plugin_init (GstPlugin * plugin) GST_TYPE_FREEZE); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "freeze", + freeze, "Stream freezer", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/frei0r/Makefile.am b/gst/frei0r/Makefile.am index 5c876e5e9..dcdbc3f73 100644 --- a/gst/frei0r/Makefile.am +++ b/gst/frei0r/Makefile.am @@ -10,7 +10,9 @@ libgstfrei0r_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(G libgstfrei0r_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \ -lgstvideo-@GST_MAJORMINOR@ libgstfrei0r_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstfrei0r_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstfrei0r.h gstfrei0rfilter.h gstfrei0rsrc.h gstfrei0rmixer.h frei0r.h diff --git a/gst/frei0r/gstfrei0r.c b/gst/frei0r/gstfrei0r.c index a6763cd01..dfa0c0ee7 100644 --- a/gst/frei0r/gstfrei0r.c +++ b/gst/frei0r/gstfrei0r.c @@ -711,8 +711,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "frei0r", + frei0r, "frei0r plugin library", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/games/Makefile.am b/gst/games/Makefile.am index d1f8aa480..1bc0bd224 100644 --- a/gst/games/Makefile.am +++ b/gst/games/Makefile.am @@ -8,6 +8,8 @@ libgstpuzzle_la_SOURCES = \ libgstpuzzle_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS) -I$(top_srcdir)/gst/videofilter libgstpuzzle_la_LIBADD = libgstpuzzle_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBOIL_LIBS) +if !GST_PLUGIN_BUILD_STATIC libgstpuzzle_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstvideoimage.h diff --git a/gst/games/gstpuzzle.c b/gst/games/gstpuzzle.c index 8d06d3612..d1704cc16 100644 --- a/gst/games/gstpuzzle.c +++ b/gst/games/gstpuzzle.c @@ -569,8 +569,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_PUZZLE); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "games", + games, "a collection of games to showcase features", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/gaudieffects/Makefile.am b/gst/gaudieffects/Makefile.am index 54e747722..d08f43e86 100644 --- a/gst/gaudieffects/Makefile.am +++ b/gst/gaudieffects/Makefile.am @@ -5,7 +5,9 @@ libgstgaudieffects_la_SOURCES = gstburn.c gstchromium.c gstdilate.c \ libgstgaudieffects_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) libgstgaudieffects_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(LIBM) libgstgaudieffects_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstgaudieffects_la_LIBTOOLFLAGS = --tag=disable-static +endif # headers we need but don't want installed noinst_HEADERS = \ diff --git a/gst/gaudieffects/gstplugin.c b/gst/gaudieffects/gstplugin.c index 143efb310..e5d901b91 100644 --- a/gst/gaudieffects/gstplugin.c +++ b/gst/gaudieffects/gstplugin.c @@ -79,8 +79,8 @@ plugin_init (GstPlugin * plugin) return ret; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gaudieffects", + gaudieffects, "Gaudi video effects.", plugin_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/gst/geometrictransform/Makefile.am b/gst/geometrictransform/Makefile.am index e304ed0b0..64a4f94d5 100644 --- a/gst/geometrictransform/Makefile.am +++ b/gst/geometrictransform/Makefile.am @@ -30,7 +30,9 @@ libgstgeometrictransform_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) \ $(GST_LIBS) $(LIBM) libgstgeometrictransform_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstgeometrictransform_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstgeometrictransform.h \ gstcirclegeometrictransform.h \ diff --git a/gst/geometrictransform/plugin.c b/gst/geometrictransform/plugin.c index 0173a718c..bb30ad1a9 100644 --- a/gst/geometrictransform/plugin.c +++ b/gst/geometrictransform/plugin.c @@ -88,8 +88,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "geometrictransform", + geometrictransform, "Various geometric image transform elements", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/h264parse/Makefile.am b/gst/h264parse/Makefile.am index 746e1a86e..e08a693c5 100644 --- a/gst/h264parse/Makefile.am +++ b/gst/h264parse/Makefile.am @@ -9,7 +9,9 @@ noinst_HEADERS = \ libgsth264parse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgsth264parse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) libgsth264parse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgsth264parse_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ diff --git a/gst/h264parse/gsth264parse.c b/gst/h264parse/gsth264parse.c index 8ae60755e..b23b5ff4a 100644 --- a/gst/h264parse/gsth264parse.c +++ b/gst/h264parse/gsth264parse.c @@ -895,10 +895,8 @@ gst_h264_parse_base_init (gpointer g_class) { GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_add_static_pad_template (gstelement_class, - &srctemplate); - gst_element_class_add_static_pad_template (gstelement_class, - &sinktemplate); + gst_element_class_add_static_pad_template (gstelement_class, &srctemplate); + gst_element_class_add_static_pad_template (gstelement_class, &sinktemplate); gst_element_class_set_details_simple (gstelement_class, "H264Parse", "Codec/Parser/Video", "Parses raw h264 stream", @@ -2736,8 +2734,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_H264PARSE); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "h264parse", + h264parse, "Element parsing raw h264 streams", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/hdvparse/Makefile.am b/gst/hdvparse/Makefile.am index 20b09228d..a1c5fe779 100644 --- a/gst/hdvparse/Makefile.am +++ b/gst/hdvparse/Makefile.am @@ -9,7 +9,9 @@ noinst_HEADERS = \ libgsthdvparse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgsthdvparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(LIBM) libgsthdvparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgsthdvparse_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -23,4 +25,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/hdvparse/gsthdvparse.c b/gst/hdvparse/gsthdvparse.c index 28e62092e..28b13b67c 100644 --- a/gst/hdvparse/gsthdvparse.c +++ b/gst/hdvparse/gsthdvparse.c @@ -117,8 +117,7 @@ gst_hdvparse_base_init (gpointer klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_static_pad_template (element_class, &src_template); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); gst_element_class_set_details_simple (element_class, "HDVParser", "Data/Parser", "HDV private stream Parser", "Edward Hervey <bilboed@bilboed.com>"); @@ -882,8 +881,8 @@ HDVParse_init (GstPlugin * HDVParse) * * exchange the string 'Template HDVParse' with you HDVParse description */ -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "hdvparse", + hdvparse, "HDV private stream parser", HDVParse_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/gst/hls/Makefile.am b/gst/hls/Makefile.am index 687b568e0..d2060f1db 100644 --- a/gst/hls/Makefile.am +++ b/gst/hls/Makefile.am @@ -9,7 +9,9 @@ libgstfragmented_la_SOURCES = \ libgstfragmented_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(SOUP_CFLAGS) libgstfragmented_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(SOUP_LIBS) libgstfragmented_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined +if !GST_PLUGIN_BUILD_STATIC libgstfragmented_la_LIBTOOLFLAGS = --tag=disable-static +endif # headers we need but don't want installed noinst_HEADERS = \ diff --git a/gst/hls/gstfragmentedplugin.c b/gst/hls/gstfragmentedplugin.c index 84e3a4c5e..4b61292f5 100644 --- a/gst/hls/gstfragmentedplugin.c +++ b/gst/hls/gstfragmentedplugin.c @@ -20,8 +20,8 @@ fragmented_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "fragmented", + fragmented, "Fragmented streaming plugins", fragmented_init, VERSION, "LGPL", PACKAGE_NAME, "http://www.gstreamer.org/") diff --git a/gst/id3tag/Makefile.am b/gst/id3tag/Makefile.am index f2ed73df7..233695ced 100644 --- a/gst/id3tag/Makefile.am +++ b/gst/id3tag/Makefile.am @@ -13,7 +13,9 @@ libgstid3tag_la_LIBADD = \ $(GST_LIBS) libgstid3tag_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstid3tag_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstid3mux.h id3tag.h diff --git a/gst/id3tag/gstid3mux.c b/gst/id3tag/gstid3mux.c index 1ed7e5c9c..5f7fc71cc 100644 --- a/gst/id3tag/gstid3mux.c +++ b/gst/id3tag/gstid3mux.c @@ -98,8 +98,7 @@ gst_id3_mux_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); gst_element_class_add_static_pad_template (element_class, &src_template); @@ -230,8 +229,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "id3tag", + id3tag, "ID3 v1 and v2 muxing plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/inter/Makefile.am b/gst/inter/Makefile.am index 4a7e78aea..fe0b5d67b 100644 --- a/gst/inter/Makefile.am +++ b/gst/inter/Makefile.am @@ -29,7 +29,9 @@ libgstinter_la_LIBADD = \ $(LIBM) libgstinter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstinter_la_LIBTOOLFLAGS = --tag=disable-static +endif gstintertest_SOURCES = \ gstintertest.c diff --git a/gst/inter/gstinter.c b/gst/inter/gstinter.c index 60c5bd6a7..39f31af79 100644 --- a/gst/inter/gstinter.c +++ b/gst/inter/gstinter.c @@ -44,8 +44,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "inter", + inter, "plugin for inter-pipeline communication", plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/interlace/Makefile.am b/gst/interlace/Makefile.am index 5e29e8b17..966dd1733 100644 --- a/gst/interlace/Makefile.am +++ b/gst/interlace/Makefile.am @@ -13,7 +13,9 @@ libgstinterlace_la_LIBADD = \ $(LIBM) libgstinterlace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstinterlace_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -27,4 +29,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/interlace/gstinterlace.c b/gst/interlace/gstinterlace.c index 96455f1a2..9b1700217 100644 --- a/gst/interlace/gstinterlace.c +++ b/gst/interlace/gstinterlace.c @@ -869,8 +869,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_INTERLACE); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "interlace", + interlace, "Create an interlaced video stream", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/ivfparse/Makefile.am b/gst/ivfparse/Makefile.am index 684c4527f..378d6b0c2 100644 --- a/gst/ivfparse/Makefile.am +++ b/gst/ivfparse/Makefile.am @@ -8,7 +8,9 @@ libgstivfparse_la_LIBADD = \ $(GST_BASE_LIBS) \ $(GST_LIBS) libgstivfparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstivfparse_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstivfparse.h @@ -24,4 +26,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/ivfparse/gstivfparse.c b/gst/ivfparse/gstivfparse.c index 0ebbe0717..2e8619ac8 100644 --- a/gst/ivfparse/gstivfparse.c +++ b/gst/ivfparse/gstivfparse.c @@ -291,8 +291,8 @@ ivfparse_init (GstPlugin * ivfparse) } /* gstreamer looks for this structure to register plugins */ -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "ivfparse", + ivfparse, "IVF parser", ivfparse_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/jp2kdecimator/Makefile.am b/gst/jp2kdecimator/Makefile.am index ad971b819..7dcc8cd03 100644 --- a/gst/jp2kdecimator/Makefile.am +++ b/gst/jp2kdecimator/Makefile.am @@ -9,7 +9,9 @@ libgstjp2kdecimator_la_CFLAGS = \ libgstjp2kdecimator_la_LIBADD = \ $(GST_LIBS) $(GST_BASE_LIBS) libgstjp2kdecimator_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstjp2kdecimator_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstjp2kdecimator.h jp2kcodestream.h diff --git a/gst/jp2kdecimator/gstjp2kdecimator.c b/gst/jp2kdecimator/gstjp2kdecimator.c index f72b6a22f..96bec4468 100644 --- a/gst/jp2kdecimator/gstjp2kdecimator.c +++ b/gst/jp2kdecimator/gstjp2kdecimator.c @@ -380,8 +380,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "jp2kdecimator", + jp2kdecimator, "JPEG2000 decimator", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/jpegformat/Makefile.am b/gst/jpegformat/Makefile.am index 80355d5df..4a513cee8 100644 --- a/gst/jpegformat/Makefile.am +++ b/gst/jpegformat/Makefile.am @@ -8,7 +8,9 @@ libgstjpegformat_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ \ -lgsttag-@GST_MAJORMINOR@ $(GST_LIBS) $(GST_BASE_LIBS) libgstjpegformat_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstjpegformat_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstjpegformat.h gstjpegparse.h gstjifmux.h diff --git a/gst/jpegformat/gstjpegformat.c b/gst/jpegformat/gstjpegformat.c index 50573db0c..424f326f9 100644 --- a/gst/jpegformat/gstjpegformat.c +++ b/gst/jpegformat/gstjpegformat.c @@ -40,8 +40,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "jpegformat", + jpegformat, "JPEG interchange format plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/legacyresample/Makefile.am b/gst/legacyresample/Makefile.am index 13985affe..90bc15ea7 100644 --- a/gst/legacyresample/Makefile.am +++ b/gst/legacyresample/Makefile.am @@ -18,7 +18,9 @@ libgstlegacyresample_la_SOURCES = gstlegacyresample.c $(resample_SOURCES) libgstlegacyresample_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstlegacyresample_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstlegacyresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstlegacyresample_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -32,4 +34,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/legacyresample/gstlegacyresample.c b/gst/legacyresample/gstlegacyresample.c index 46bb0bf59..20b8aa006 100644 --- a/gst/legacyresample/gstlegacyresample.c +++ b/gst/legacyresample/gstlegacyresample.c @@ -871,8 +871,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "legacyresample", + legacyresample, "Resamples audio", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/librfb/Makefile.am b/gst/librfb/Makefile.am index ad4dd4fb6..2b00588cc 100644 --- a/gst/librfb/Makefile.am +++ b/gst/librfb/Makefile.am @@ -7,7 +7,9 @@ libgstrfbsrc_la_SOURCES = gstrfbsrc.c libgstrfbsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X11_CFLAGS) -I$(srcdir)/.. libgstrfbsrc_la_LIBADD = $(GST_BASE_LIBS) $(X11_LIBS) librfb.la libgstrfbsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstrfbsrc_la_LIBTOOLFLAGS = --tag=disable-static +endif librfb_la_SOURCES = \ rfbbuffer.c \ diff --git a/gst/librfb/gstrfbsrc.c b/gst/librfb/gstrfbsrc.c index 879892b01..e79c78be5 100644 --- a/gst/librfb/gstrfbsrc.c +++ b/gst/librfb/gstrfbsrc.c @@ -544,8 +544,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_RFB_SRC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "rfbsrc", + rfbsrc, "Connects to a VNC server and decodes RFB stream", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/liveadder/Makefile.am b/gst/liveadder/Makefile.am index 4fe8e2959..06f8806d0 100644 --- a/gst/liveadder/Makefile.am +++ b/gst/liveadder/Makefile.am @@ -6,7 +6,9 @@ libgstliveadder_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(GST_LIBS) libgstliveadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstliveadder_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = liveadder.h diff --git a/gst/liveadder/liveadder.c b/gst/liveadder/liveadder.c index 205bd020d..fbd97014f 100644 --- a/gst/liveadder/liveadder.c +++ b/gst/liveadder/liveadder.c @@ -1532,8 +1532,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "liveadder", + liveadder, "Adds multiple live discontinuous streams", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/mixmatrix/Makefile.am b/gst/mixmatrix/Makefile.am index e4f37ef9e..9d3873bd4 100644 --- a/gst/mixmatrix/Makefile.am +++ b/gst/mixmatrix/Makefile.am @@ -5,5 +5,7 @@ libgstmixmatrix_la_SOURCES = mixmatrix.c libgstmixmatrix_la_CFLAGS = $(GST_CFLAGS) libgstmixmatrix_la_LIBADD = libgstmixmatrix_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmixmatrix_la_LIBTOOLFLAGS = --tag=disable-static +endif diff --git a/gst/mixmatrix/mixmatrix.c b/gst/mixmatrix/mixmatrix.c index fd3ad29e3..f9eaf4f3d 100644 --- a/gst/mixmatrix/mixmatrix.c +++ b/gst/mixmatrix/mixmatrix.c @@ -526,8 +526,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_MIXMATRIX); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mixmatrix", + mixmatrix, "An audio mixer matrix", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/mpeg1sys/Makefile.am b/gst/mpeg1sys/Makefile.am index aa723476c..912aab332 100644 --- a/gst/mpeg1sys/Makefile.am +++ b/gst/mpeg1sys/Makefile.am @@ -7,7 +7,9 @@ libgstmpeg1systemencode_la_SOURCES = gstmpeg1systemencode.c \ libgstmpeg1systemencode_la_CFLAGS = $(GST_CFLAGS) libgstmpeg1systemencode_la_LIBADD = libgstmpeg1systemencode_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmpeg1systemencode_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstmpeg1systemencode.h \ main.h \ diff --git a/gst/mpeg1sys/gstmpeg1systemencode.c b/gst/mpeg1sys/gstmpeg1systemencode.c index cc7dc7fd5..0695e8783 100644 --- a/gst/mpeg1sys/gstmpeg1systemencode.c +++ b/gst/mpeg1sys/gstmpeg1systemencode.c @@ -589,8 +589,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_SYSTEM_ENCODE); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mpeg1sysenc", + mpeg1sysenc, "MPEG-1 system stream encoder", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/mpegdemux/Makefile.am b/gst/mpegdemux/Makefile.am index 3c9cf844b..5f819a059 100644 --- a/gst/mpegdemux/Makefile.am +++ b/gst/mpegdemux/Makefile.am @@ -20,7 +20,9 @@ libgstmpegdemux_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) $(GST_LIBS) libgstmpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmpegdemux_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstmpegdefs.h \ diff --git a/gst/mpegdemux/flumpegdemux.c b/gst/mpegdemux/flumpegdemux.c index 3aa92ed3f..9c6677e5a 100644 --- a/gst/mpegdemux/flumpegdemux.c +++ b/gst/mpegdemux/flumpegdemux.c @@ -69,9 +69,9 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mpegdemux2", + mpegdemux2, "MPEG demuxers", plugin_init, VERSION, GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/mpegpsmux/Makefile.am b/gst/mpegpsmux/Makefile.am index 26ac56cc9..be90a985b 100644 --- a/gst/mpegpsmux/Makefile.am +++ b/gst/mpegpsmux/Makefile.am @@ -10,7 +10,9 @@ libgstmpegpsmux_la_SOURCES = \ libgstmpegpsmux_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstmpegpsmux_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) libgstmpegpsmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmpegpsmux_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ mpegpsmux.h \ diff --git a/gst/mpegpsmux/mpegpsmux.c b/gst/mpegpsmux/mpegpsmux.c index e7b094698..c23c47860 100644 --- a/gst/mpegpsmux/mpegpsmux.c +++ b/gst/mpegpsmux/mpegpsmux.c @@ -799,6 +799,6 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mpegpsmux", "MPEG-PS muxer", +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, + mpegpsmux, "MPEG-PS muxer", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/mpegtsdemux/Makefile.am b/gst/mpegtsdemux/Makefile.am index 55b57d960..16e1da46f 100644 --- a/gst/mpegtsdemux/Makefile.am +++ b/gst/mpegtsdemux/Makefile.am @@ -17,7 +17,9 @@ libgstmpegtsdemux_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) $(GST_LIBS) libgstmpegtsdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmpegtsdemux_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstmpegdefs.h \ diff --git a/gst/mpegtsdemux/gsttsdemux.c b/gst/mpegtsdemux/gsttsdemux.c index fc9aa8ddd..c3e664dc5 100644 --- a/gst/mpegtsdemux/gsttsdemux.c +++ b/gst/mpegtsdemux/gsttsdemux.c @@ -39,9 +39,9 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mpegtsdemux", + mpegtsdemux, "MPEG TS demuxer", plugin_init, VERSION, GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/mpegtsmux/Makefile.am b/gst/mpegtsmux/Makefile.am index 99adf803f..84c918611 100644 --- a/gst/mpegtsmux/Makefile.am +++ b/gst/mpegtsmux/Makefile.am @@ -11,7 +11,9 @@ libgstmpegtsmux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_ libgstmpegtsmux_la_LIBADD = $(top_builddir)/gst/mpegtsmux/tsmux/libtsmux.la \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) libgstmpegtsmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmpegtsmux_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ mpegtsmux.h \ diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c index a243e40db..73cb25f78 100644 --- a/gst/mpegtsmux/mpegtsmux.c +++ b/gst/mpegtsmux/mpegtsmux.c @@ -1347,6 +1347,6 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mpegtsmux", "MPEG-TS muxer", +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, + mpegtsmux, "MPEG-TS muxer", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/mpegvideoparse/Makefile.am b/gst/mpegvideoparse/Makefile.am index 4a52e27b5..bc98bcd3e 100644 --- a/gst/mpegvideoparse/Makefile.am +++ b/gst/mpegvideoparse/Makefile.am @@ -5,7 +5,9 @@ libgstmpegvideoparse_la_SOURCES = mpegvideoparse.c mpegpacketiser.c libgstmpegvideoparse_la_CFLAGS = $(GST_CFLAGS) libgstmpegvideoparse_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) libgstmpegvideoparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmpegvideoparse_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = mpegvideoparse.h mpegpacketiser.h diff --git a/gst/mpegvideoparse/mpegvideoparse.c b/gst/mpegvideoparse/mpegvideoparse.c index cc3639cef..dece4cf42 100644 --- a/gst/mpegvideoparse/mpegvideoparse.c +++ b/gst/mpegvideoparse/mpegvideoparse.c @@ -128,8 +128,7 @@ gst_mpegvideoparse_base_init (MpegVideoParseClass * klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_static_pad_template (element_class, &src_template); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); gst_element_class_set_details_simple (element_class, "MPEG video elementary stream parser", @@ -1033,8 +1032,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_MPEGVIDEOPARSE); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mpegvideoparse", + mpegvideoparse, "MPEG-1 and MPEG-2 video parser", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/mve/Makefile.am b/gst/mve/Makefile.am index 272b91857..60003256d 100644 --- a/gst/mve/Makefile.am +++ b/gst/mve/Makefile.am @@ -3,7 +3,9 @@ plugin_LTLIBRARIES = libgstmve.la libgstmve_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstmve_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstmve_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmve_la_LIBTOOLFLAGS = --tag=disable-static +endif libgstmve_la_SOURCES = \ gstmve.c \ diff --git a/gst/mve/gstmve.c b/gst/mve/gstmve.c index faac7f45a..73a99f5f8 100644 --- a/gst/mve/gstmve.c +++ b/gst/mve/gstmve.c @@ -38,9 +38,9 @@ mve_plugin_init (GstPlugin * plugin) GST_TYPE_MVE_MUX); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mve", + mve, "Interplay MVE movie format manipulation", mve_plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/mxf/Makefile.am b/gst/mxf/Makefile.am index ac6478e5c..893ec26f3 100644 --- a/gst/mxf/Makefile.am +++ b/gst/mxf/Makefile.am @@ -23,7 +23,9 @@ libgstmxf_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS libgstmxf_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ -lgstvideo-@GST_MAJORMINOR@ libgstmxf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstmxf_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ mxful.h \ diff --git a/gst/mxf/mxf.c b/gst/mxf/mxf.c index 7469317c5..8435dcd07 100644 --- a/gst/mxf/mxf.c +++ b/gst/mxf/mxf.c @@ -78,8 +78,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "mxf", + mxf, "MXF plugin library", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/nsf/Makefile.am b/gst/nsf/Makefile.am index 97038ab67..732b51865 100644 --- a/gst/nsf/Makefile.am +++ b/gst/nsf/Makefile.am @@ -29,7 +29,9 @@ libgstnsf_la_SOURCES = gstnsf.c $(NOSEFART_SOURCES) libgstnsf_la_CFLAGS = $(GST_CFLAGS) -DNSF_PLAYER libgstnsf_la_LIBADD = $(GST_LIBS) $(LIBM) libgstnsf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstnsf_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstnsf.h $(NOSEFART_INCLUDES) diff --git a/gst/nsf/gstnsf.c b/gst/nsf/gstnsf.c index d92897167..7b459b7a1 100644 --- a/gst/nsf/gstnsf.c +++ b/gst/nsf/gstnsf.c @@ -636,7 +636,7 @@ plugin_init (GstPlugin * plugin) GST_TYPE_NSFDEC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "nsf", +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, + nsf, "Uses nosefart to decode .nsf files", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/nuvdemux/Makefile.am b/gst/nuvdemux/Makefile.am index 35df358a2..18fae9c0a 100644 --- a/gst/nuvdemux/Makefile.am +++ b/gst/nuvdemux/Makefile.am @@ -5,7 +5,9 @@ libgstnuvdemux_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) libgstnuvdemux_la_LIBADD = $(GST_BASE_LIBS) libgstnuvdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstnuvdemux_la_SOURCES = gstnuvdemux.c +if !GST_PLUGIN_BUILD_STATIC libgstnuvdemux_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstnuvdemux.h diff --git a/gst/nuvdemux/gstnuvdemux.c b/gst/nuvdemux/gstnuvdemux.c index bdbaae015..e964500cb 100644 --- a/gst/nuvdemux/gstnuvdemux.c +++ b/gst/nuvdemux/gstnuvdemux.c @@ -130,8 +130,7 @@ gst_nuv_demux_base_init (gpointer klass) gst_element_class_add_static_pad_template (element_class, &video_src_template); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); gst_element_class_set_details_simple (element_class, "Nuv demuxer", "Codec/Demuxer", "Demultiplex a MythTV NuppleVideo .nuv file into audio and video", @@ -937,8 +936,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "nuvdemux", + nuvdemux, "Demuxes MythTV NuppelVideo files", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/overlay/Makefile.am b/gst/overlay/Makefile.am index 5542494bf..8288c628b 100644 --- a/gst/overlay/Makefile.am +++ b/gst/overlay/Makefile.am @@ -8,7 +8,9 @@ noinst_HEADERS = gstoverlay.h libgstoverlay_la_CFLAGS = $(GST_CFLAGS) libgstoverlay_la_LIBADD = libgstoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstoverlay_la_LIBTOOLFLAGS = --tag=disable-static +endif EXTRA_DIST = diff --git a/gst/overlay/gstoverlay.c b/gst/overlay/gstoverlay.c index d802491c9..d37603abb 100644 --- a/gst/overlay/gstoverlay.c +++ b/gst/overlay/gstoverlay.c @@ -350,8 +350,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_OVERLAY); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "overlay", + overlay, "Overlay multiple video streams", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/patchdetect/Makefile.am b/gst/patchdetect/Makefile.am index 7c0e564d3..fb440af34 100644 --- a/gst/patchdetect/Makefile.am +++ b/gst/patchdetect/Makefile.am @@ -14,7 +14,9 @@ libgstpatchdetect_la_LIBADD = \ $(GST_LIBS) \ $(LIBM) libgstpatchdetect_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstpatchdetect_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstpatchdetect.h diff --git a/gst/patchdetect/gstpatchdetect.c b/gst/patchdetect/gstpatchdetect.c index 71308dbce..2f604a1ae 100644 --- a/gst/patchdetect/gstpatchdetect.c +++ b/gst/patchdetect/gstpatchdetect.c @@ -1228,8 +1228,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "patchdetect", + patchdetect, "patchdetect element", plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/pcapparse/Makefile.am b/gst/pcapparse/Makefile.am index 6c357f209..3234b0746 100644 --- a/gst/pcapparse/Makefile.am +++ b/gst/pcapparse/Makefile.am @@ -16,7 +16,9 @@ noinst_HEADERS = \ libgstpcapparse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgstpcapparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(WINSOCK2_LIBS) libgstpcapparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstpcapparse_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -30,4 +32,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/pcapparse/plugin.c b/gst/pcapparse/plugin.c index d034e3d03..2303681ca 100644 --- a/gst/pcapparse/plugin.c +++ b/gst/pcapparse/plugin.c @@ -37,8 +37,8 @@ plugin_init (GstPlugin * plugin) return ret; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "pcapparse", + pcapparse, "Element parsing raw pcap streams", plugin_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/gst/pnm/Makefile.am b/gst/pnm/Makefile.am index e702131c0..e1303c92b 100644 --- a/gst/pnm/Makefile.am +++ b/gst/pnm/Makefile.am @@ -4,7 +4,9 @@ libgstpnm_la_SOURCES = gstpnmutils.c gstpnm.c gstpnmdec.c gstpnmenc.c libgstpnm_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstpnm_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_MAJORMINOR@ libgstpnm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstpnm_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstpnmdec.h gstpnmutils.h gstpnmenc.h diff --git a/gst/pnm/gstpnm.c b/gst/pnm/gstpnm.c index 9b0551054..b14c9aada 100644 --- a/gst/pnm/gstpnm.c +++ b/gst/pnm/gstpnm.c @@ -40,6 +40,6 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "pnm", +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, pnm, "PNM plugin", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/rawparse/Makefile.am b/gst/rawparse/Makefile.am index ac0aadc7d..a69f8bd80 100644 --- a/gst/rawparse/Makefile.am +++ b/gst/rawparse/Makefile.am @@ -16,7 +16,9 @@ libgstrawparse_la_LIBADD = \ $(GST_BASE_LIBS) \ $(GST_LIBS) libgstrawparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstrawparse_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstaudioparse.h \ diff --git a/gst/rawparse/plugin.c b/gst/rawparse/plugin.c index 250be6de7..7620c27b9 100644 --- a/gst/rawparse/plugin.c +++ b/gst/rawparse/plugin.c @@ -19,8 +19,8 @@ plugin_init (GstPlugin * plugin) return ret; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "rawparse", + rawparse, "Parses byte streams into raw frames", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/real/Makefile.am b/gst/real/Makefile.am index 6681e4a56..adb1806df 100644 --- a/gst/real/Makefile.am +++ b/gst/real/Makefile.am @@ -13,7 +13,9 @@ libgstreal_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) libgstreal_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstreal_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstreal.h \ diff --git a/gst/real/gstreal.c b/gst/real/gstreal.c index 33ea4c5f2..46e67ff96 100644 --- a/gst/real/gstreal.c +++ b/gst/real/gstreal.c @@ -42,6 +42,6 @@ plugin_init (GstPlugin * p) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "real", +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, real, "Decode REAL streams", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/removesilence/Makefile.am b/gst/removesilence/Makefile.am index c022ac133..01976807b 100644 --- a/gst/removesilence/Makefile.am +++ b/gst/removesilence/Makefile.am @@ -5,7 +5,9 @@ libgstremovesilence_la_SOURCES = gstremovesilence.c vad_private.c libgstremovesilence_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstremovesilence_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) libgstremovesilence_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstremovesilence_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstremovesilence.h \ diff --git a/gst/removesilence/gstremovesilence.c b/gst/removesilence/gstremovesilence.c index 9f5f69902..759a73f88 100644 --- a/gst/removesilence/gstremovesilence.c +++ b/gst/removesilence/gstremovesilence.c @@ -110,8 +110,7 @@ gst_remove_silence_base_init (gpointer gclass) Paulo Pizarro <paulo.pizarro@gmail.com>"); gst_element_class_add_static_pad_template (element_class, &src_template); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); } /* initialize the removesilence's class */ @@ -254,8 +253,8 @@ plugin_init (GstPlugin * plugin) gst_remove_silence_get_type ()); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "removesilence", + removesilence, "Removes silence from an audio stream", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/rtjpeg/Makefile.am b/gst/rtjpeg/Makefile.am index 76a90ba6f..a79c17054 100644 --- a/gst/rtjpeg/Makefile.am +++ b/gst/rtjpeg/Makefile.am @@ -5,6 +5,8 @@ libgstrtjpeg_la_SOURCES = gstrtjpeg.c gstrtjpegenc.c gstrtjpegdec.c RTjpeg.c libgstrtjpeg_la_CFLAGS = $(GST_CFLAGS) libgstrtjpeg_la_LIBADD = libgstrtjpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstrtjpeg_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstrtjpegenc.h gstrtjpegdec.h RTjpeg.h diff --git a/gst/rtjpeg/gstrtjpeg.c b/gst/rtjpeg/gstrtjpeg.c index 414fa1199..d4fd64aaa 100644 --- a/gst/rtjpeg/gstrtjpeg.c +++ b/gst/rtjpeg/gstrtjpeg.c @@ -36,8 +36,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "rtjpeg", + rtjpeg, "Justin Schoeman's RTjpeg codec", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/rtpmux/Makefile.am b/gst/rtpmux/Makefile.am index d28d44d77..a0850972a 100644 --- a/gst/rtpmux/Makefile.am +++ b/gst/rtpmux/Makefile.am @@ -7,7 +7,9 @@ libgstrtpmux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ libgstrtpmux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(GST_LIBS) libgstrtpmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstrtpmux_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstrtpmux.h gstrtpdtmfmux.h @@ -23,4 +25,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/rtpmux/gstrtpmuxer.c b/gst/rtpmux/gstrtpmuxer.c index 619418bdc..307910f3c 100644 --- a/gst/rtpmux/gstrtpmuxer.c +++ b/gst/rtpmux/gstrtpmuxer.c @@ -41,8 +41,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "rtpmux", + rtpmux, "RTP Muxer plugins", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/rtpvp8/Makefile.am b/gst/rtpvp8/Makefile.am index e1725bbb3..5cff1698c 100644 --- a/gst/rtpvp8/Makefile.am +++ b/gst/rtpvp8/Makefile.am @@ -14,7 +14,9 @@ libgstrtpvp8_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ libgstrtpvp8_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(GST_LIBS) libgstrtpvp8_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstrtpvp8_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ diff --git a/gst/rtpvp8/gstrtpvp8.c b/gst/rtpvp8/gstrtpvp8.c index baafd1fd3..7465dc1d4 100644 --- a/gst/rtpvp8/gstrtpvp8.c +++ b/gst/rtpvp8/gstrtpvp8.c @@ -6,7 +6,7 @@ #include "gstrtpvp8depay.h" static gboolean -plugin_init (GstPlugin *plugin) +plugin_init (GstPlugin * plugin) { gst_rtp_vp8_depay_plugin_init (plugin); gst_rtp_vp8_pay_plugin_init (plugin); @@ -14,8 +14,8 @@ plugin_init (GstPlugin *plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "rtpvp8", + rtpvp8, "rtpvp8", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/scaletempo/Makefile.am b/gst/scaletempo/Makefile.am index 092a7eb05..47935cd34 100644 --- a/gst/scaletempo/Makefile.am +++ b/gst/scaletempo/Makefile.am @@ -8,7 +8,9 @@ libgstscaletempoplugin_la_SOURCES = gstscaletempoplugin.c gstscaletempo.c libgstscaletempoplugin_la_CFLAGS = $(GST_CFLAGS) libgstscaletempoplugin_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) libgstscaletempoplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstscaletempoplugin_la_LIBTOOLFLAGS = --tag=disable-static +endif # headers we need but don't want installed noinst_HEADERS = gstscaletempo.h diff --git a/gst/scaletempo/gstscaletempoplugin.c b/gst/scaletempo/gstscaletempoplugin.c index 24e16e8f6..c58e61f72 100644 --- a/gst/scaletempo/gstscaletempoplugin.c +++ b/gst/scaletempo/gstscaletempoplugin.c @@ -68,7 +68,7 @@ plugin_init (GstPlugin * plugin) * exchange the strings 'plugin' and 'Template plugin' with you plugin name and * description */ -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "scaletempo", "Scale audio tempo in sync with playback rate", +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, + scaletempo, "Scale audio tempo in sync with playback rate", plugin_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.freedesktop.org/") diff --git a/gst/sdi/Makefile.am b/gst/sdi/Makefile.am index eb30f17de..ba6b12d3f 100644 --- a/gst/sdi/Makefile.am +++ b/gst/sdi/Makefile.am @@ -8,7 +8,9 @@ libgstsdi_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstsdi_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ $(GST_LIBS) libgstsdi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstsdi_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstsdidemux.h gstsdimux.h @@ -24,4 +26,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/sdi/gstsdi.c b/gst/sdi/gstsdi.c index 30101ebaf..738aa0b9c 100644 --- a/gst/sdi/gstsdi.c +++ b/gst/sdi/gstsdi.c @@ -37,8 +37,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "sdi", + sdi, "SDI elements", plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/sdp/Makefile.am b/gst/sdp/Makefile.am index 77a1a9725..ff79af22a 100644 --- a/gst/sdp/Makefile.am +++ b/gst/sdp/Makefile.am @@ -8,7 +8,9 @@ libgstsdpelem_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ -lgstrtp-@GST_MAJORMINOR@ -lgstsdp-@GST_MAJORMINOR@ \ $(GST_LIBS) $(WIN32_LIBS) libgstsdpelem_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstsdpelem_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstsdpdemux.h diff --git a/gst/sdp/gstsdpelem.c b/gst/sdp/gstsdpelem.c index 8a0c8d9f2..5aa1cc339 100644 --- a/gst/sdp/gstsdpelem.c +++ b/gst/sdp/gstsdpelem.c @@ -33,8 +33,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "sdp", + sdp, "configure streaming sessions using SDP", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/segmentclip/Makefile.am b/gst/segmentclip/Makefile.am index 82540cbc0..a378a21fc 100644 --- a/gst/segmentclip/Makefile.am +++ b/gst/segmentclip/Makefile.am @@ -5,7 +5,9 @@ libgstsegmentclip_la_SOURCES = gstsegmentclip.c gstaudiosegmentclip.c gstvideose libgstsegmentclip_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstsegmentclip_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-@GST_MAJORMINOR@ libgstsegmentclip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstsegmentclip_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstsegmentclip.h gstaudiosegmentclip.h gstvideosegmentclip.h @@ -21,4 +23,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/segmentclip/plugin.c b/gst/segmentclip/plugin.c index c64f5c645..1610d3910 100644 --- a/gst/segmentclip/plugin.c +++ b/gst/segmentclip/plugin.c @@ -36,8 +36,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "segmentclip", + segmentclip, "Segment clip elements", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/siren/Makefile.am b/gst/siren/Makefile.am index 2be9ede49..e05549b7a 100644 --- a/gst/siren/Makefile.am +++ b/gst/siren/Makefile.am @@ -13,7 +13,9 @@ libgstsiren_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ libgstsiren_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstsiren_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstsiren_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -27,4 +29,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/siren/gstsiren.c b/gst/siren/gstsiren.c index ceca375fa..d221d76b8 100644 --- a/gst/siren/gstsiren.c +++ b/gst/siren/gstsiren.c @@ -40,8 +40,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gstsiren", + gstsiren, "Siren encoder/decoder/payloader/depayloader plugins", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/smooth/Makefile.am b/gst/smooth/Makefile.am index 36de16113..f8a7486e6 100644 --- a/gst/smooth/Makefile.am +++ b/gst/smooth/Makefile.am @@ -11,7 +11,9 @@ libgstsmooth_la_LIBADD = \ $(GST_BASE_LIBS) \ $(GST_LIBS) libgstsmooth_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstsmooth_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstsmooth.h diff --git a/gst/smooth/gstsmooth.c b/gst/smooth/gstsmooth.c index 5a254adc2..7457f76b0 100644 --- a/gst/smooth/gstsmooth.c +++ b/gst/smooth/gstsmooth.c @@ -286,8 +286,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_SMOOTH); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "smooth", + smooth, "Apply a smooth filter to an image", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/speed/Makefile.am b/gst/speed/Makefile.am index 903fa011f..315d93c67 100644 --- a/gst/speed/Makefile.am +++ b/gst/speed/Makefile.am @@ -5,7 +5,9 @@ libgstspeed_la_SOURCES = gstspeed.c libgstspeed_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) libgstspeed_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(LIBM) libgstspeed_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstspeed_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstspeed.h diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c index 5a029fb76..3a8944128 100644 --- a/gst/speed/gstspeed.c +++ b/gst/speed/gstspeed.c @@ -765,8 +765,8 @@ plugin_init (GstPlugin * plugin) return gst_element_register (plugin, "speed", GST_RANK_NONE, GST_TYPE_SPEED); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "speed", + speed, "Set speed/pitch on audio/raw streams (resampler)", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/stereo/Makefile.am b/gst/stereo/Makefile.am index ee5b5dca4..3a06af12d 100644 --- a/gst/stereo/Makefile.am +++ b/gst/stereo/Makefile.am @@ -5,7 +5,9 @@ libgststereo_la_SOURCES = gststereo.c libgststereo_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) libgststereo_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) libgststereo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgststereo_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gststereo.h diff --git a/gst/stereo/gststereo.c b/gst/stereo/gststereo.c index db054c4f3..38ad4d834 100644 --- a/gst/stereo/gststereo.c +++ b/gst/stereo/gststereo.c @@ -223,8 +223,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_STEREO); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "stereo", + stereo, "Muck with the stereo signal, enhance it's 'stereo-ness'", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/subenc/Makefile.am b/gst/subenc/Makefile.am index f5095c238..2f0160214 100644 --- a/gst/subenc/Makefile.am +++ b/gst/subenc/Makefile.am @@ -7,7 +7,9 @@ libgstsubenc_la_SOURCES = \ libgstsubenc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS) libgstsubenc_la_LIBADD = $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) libgstsubenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstsubenc_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstsrtenc.h \ diff --git a/gst/subenc/gstsubenc.c b/gst/subenc/gstsubenc.c index dc0aab55f..9085a996b 100644 --- a/gst/subenc/gstsubenc.c +++ b/gst/subenc/gstsubenc.c @@ -34,8 +34,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "subenc", + subenc, "subtitle encoders", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/tta/Makefile.am b/gst/tta/Makefile.am index fdc9feb99..eb2bc1040 100644 --- a/gst/tta/Makefile.am +++ b/gst/tta/Makefile.am @@ -10,7 +10,9 @@ noinst_HEADERS = gstttaparse.h gstttadec.h \ libgsttta_la_CFLAGS = $(GST_CFLAGS) libgsttta_la_LIBADD = $(GST_LIBS) $(LIBM) libgsttta_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgsttta_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -24,4 +26,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/tta/gsttta.c b/gst/tta/gsttta.c index adc1729e1..119cbc1d1 100644 --- a/gst/tta/gsttta.c +++ b/gst/tta/gsttta.c @@ -33,8 +33,8 @@ plugin_init (GstPlugin * plugin) gst_tta_dec_plugin_init (plugin)); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "tta", + tta, "TTA lossless audio format handling", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/vbidec/Makefile.am b/gst/vbidec/Makefile.am index 08f08c933..5d3da2d3f 100644 --- a/gst/vbidec/Makefile.am +++ b/gst/vbidec/Makefile.am @@ -6,5 +6,7 @@ libgstvbidec_la_SOURCES = gstvbidec.h gstvbidec.c \ vbiscreen.h vbiscreen.c libgstvbidec_la_CFLAGS = $(GST_CFLAGS) libgstvbidec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvbidec_la_LIBTOOLFLAGS = --tag=disable-static +endif diff --git a/gst/vbidec/gstvbidec.c b/gst/vbidec/gstvbidec.c index 30991fe75..8264d3508 100644 --- a/gst/vbidec/gstvbidec.c +++ b/gst/vbidec/gstvbidec.c @@ -374,8 +374,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_VBIDEC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "vbidec", + vbidec, "Decodes closed captions and XDS data from VBI data", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/videodrop/Makefile.am b/gst/videodrop/Makefile.am index d5bb860ce..631f2a25a 100644 --- a/gst/videodrop/Makefile.am +++ b/gst/videodrop/Makefile.am @@ -6,6 +6,8 @@ libgstvideodrop_la_SOURCES = \ libgstvideodrop_la_CFLAGS = $(GST_CFLAGS) libgstvideodrop_la_LIBADD = libgstvideodrop_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvideodrop_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstvideodrop.h diff --git a/gst/videodrop/gstvideodrop.c b/gst/videodrop/gstvideodrop.c index 75a3145bd..beb404352 100644 --- a/gst/videodrop/gstvideodrop.c +++ b/gst/videodrop/gstvideodrop.c @@ -372,8 +372,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_VIDEODROP); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "videodrop", + videodrop, "Re-FPS'es video", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/videofilters/Makefile.am b/gst/videofilters/Makefile.am index 0627ef4c7..53058bd40 100644 --- a/gst/videofilters/Makefile.am +++ b/gst/videofilters/Makefile.am @@ -21,7 +21,9 @@ libgstvideofiltersbad_la_LIBADD = \ $(ORC_LIBS) \ $(LIBM) libgstvideofiltersbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvideofiltersbad_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstzebrastripe.h \ diff --git a/gst/videofilters/gstvideofiltersbad.c b/gst/videofilters/gstvideofiltersbad.c index 9f15cea80..0f8fac7eb 100644 --- a/gst/videofilters/gstvideofiltersbad.c +++ b/gst/videofilters/gstvideofiltersbad.c @@ -39,8 +39,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "videofiltersbad", + videofiltersbad, "Video filters in gst-plugins-bad", plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/videomaxrate/Makefile.am b/gst/videomaxrate/Makefile.am index cf21139c8..f7f60ddaf 100644 --- a/gst/videomaxrate/Makefile.am +++ b/gst/videomaxrate/Makefile.am @@ -7,7 +7,9 @@ libgstvideomaxrate_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstvideomaxrate_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ $(GST_LIBS) libgstvideomaxrate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvideomaxrate_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -21,4 +23,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/videomaxrate/videomaxrate.c b/gst/videomaxrate/videomaxrate.c index 396a200ed..c2a463ee4 100644 --- a/gst/videomaxrate/videomaxrate.c +++ b/gst/videomaxrate/videomaxrate.c @@ -323,8 +323,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_VIDEO_MAX_RATE); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "videomaxrate", + videomaxrate, "Drop extra frames", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/videomeasure/Makefile.am b/gst/videomeasure/Makefile.am index f8829d338..6079028dd 100644 --- a/gst/videomeasure/Makefile.am +++ b/gst/videomeasure/Makefile.am @@ -15,7 +15,9 @@ libgstvideomeasure_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \ libgstvideomeasure_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstvideomeasure_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvideomeasure_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -29,4 +31,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/videomeasure/gstvideomeasure.c b/gst/videomeasure/gstvideomeasure.c index c0bd86cc0..f5d3d5e09 100644 --- a/gst/videomeasure/gstvideomeasure.c +++ b/gst/videomeasure/gstvideomeasure.c @@ -64,8 +64,8 @@ plugin_init (GstPlugin * plugin) return res; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "videomeasure", + videomeasure, "Various video measurers", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/videoparsers/Makefile.am b/gst/videoparsers/Makefile.am index 49baeacd1..75f93a89b 100644 --- a/gst/videoparsers/Makefile.am +++ b/gst/videoparsers/Makefile.am @@ -15,7 +15,9 @@ libgstvideoparsersbad_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) $(GST_LIBS) libgstvideoparsersbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvideoparsersbad_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gsth263parse.h h263parse.h \ gstdiracparse.h dirac_parse.h \ diff --git a/gst/videoparsers/plugin.c b/gst/videoparsers/plugin.c index 111bb1a87..c7ba522d2 100644 --- a/gst/videoparsers/plugin.c +++ b/gst/videoparsers/plugin.c @@ -48,8 +48,8 @@ plugin_init (GstPlugin * plugin) } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "videoparsersbad", + videoparsersbad, "videoparsers", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/videosignal/Makefile.am b/gst/videosignal/Makefile.am index a10ab8ead..9dc513bdc 100644 --- a/gst/videosignal/Makefile.am +++ b/gst/videosignal/Makefile.am @@ -11,7 +11,9 @@ libgstvideosignal_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) libgstvideosignal_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) libgstvideosignal_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvideosignal_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -25,4 +27,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/videosignal/gstvideosignal.c b/gst/videosignal/gstvideosignal.c index e34bda0b2..b4bd5692b 100644 --- a/gst/videosignal/gstvideosignal.c +++ b/gst/videosignal/gstvideosignal.c @@ -42,8 +42,8 @@ plugin_init (GstPlugin * plugin) return res; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "videosignal", + videosignal, "Various video signal analysers", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/vmnc/Makefile.am b/gst/vmnc/Makefile.am index fd3f2116f..908e7057c 100644 --- a/gst/vmnc/Makefile.am +++ b/gst/vmnc/Makefile.am @@ -4,7 +4,9 @@ libgstvmnc_la_SOURCES = vmncdec.c libgstvmnc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstvmnc_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) libgstvmnc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvmnc_la_LIBTOOLFLAGS = --tag=disable-static +endif Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ @@ -18,4 +20,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/vmnc/vmncdec.c b/gst/vmnc/vmncdec.c index 08085b54e..35a6dd076 100644 --- a/gst/vmnc/vmncdec.c +++ b/gst/vmnc/vmncdec.c @@ -1137,8 +1137,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "vmnc", + vmnc, "VmWare Video Codec plugins", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/y4m/Makefile.am b/gst/y4m/Makefile.am index ce35c1832..f1b77fa48 100644 --- a/gst/y4m/Makefile.am +++ b/gst/y4m/Makefile.am @@ -8,7 +8,9 @@ libgsty4mdec_la_LIBADD = \ $(GST_BASE_LIBS) -lgstbase-@GST_MAJORMINOR@ \ $(GST_LIBS) libgsty4mdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgsty4mdec_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gsty4mdec.h diff --git a/gst/y4m/gsty4mdec.c b/gst/y4m/gsty4mdec.c index 2163d02ff..8fbff53af 100644 --- a/gst/y4m/gsty4mdec.c +++ b/gst/y4m/gsty4mdec.c @@ -733,8 +733,8 @@ plugin_init (GstPlugin * plugin) } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "y4mdec", + y4mdec, "Demuxes/decodes YUV4MPEG streams", plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/acmenc/Makefile.am b/sys/acmenc/Makefile.am index eb1b603a6..8f2641ad1 100644 --- a/sys/acmenc/Makefile.am +++ b/sys/acmenc/Makefile.am @@ -12,5 +12,7 @@ libgstacmenc_la_LIBADD = \ -lmsacm32 libgstacmenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstacmenc_la_LIBTOOLFLAGS = --tag=disable-static +endif diff --git a/sys/acmenc/acmenc.c b/sys/acmenc/acmenc.c index 2b637a54c..ba5ccc955 100644 --- a/sys/acmenc/acmenc.c +++ b/sys/acmenc/acmenc.c @@ -624,6 +624,6 @@ plugin_init (GstPlugin * plugin) return res; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "acmenc", +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, acmenc, "ACM Encoder wrapper", plugin_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/sys/acmmp3dec/Makefile.am b/sys/acmmp3dec/Makefile.am index f927c7233..6661afa40 100644 --- a/sys/acmmp3dec/Makefile.am +++ b/sys/acmmp3dec/Makefile.am @@ -11,4 +11,6 @@ libgstacmmp3dec_la_LIBADD = \ -lgsttag-$(GST_MAJORMINOR) \ -lmsacm32 libgstacmmp3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstacmmp3dec_la_LIBTOOLFLAGS = --tag=disable-static +endif diff --git a/sys/acmmp3dec/acmmp3dec.c b/sys/acmmp3dec/acmmp3dec.c index 870a9bff3..0b5fb347c 100644 --- a/sys/acmmp3dec/acmmp3dec.c +++ b/sys/acmmp3dec/acmmp3dec.c @@ -429,8 +429,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "acmmp3dec", + acmmp3dec, "ACM MP3 Decoder", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/applemedia/Makefile.am b/sys/applemedia/Makefile.am index 844cd72b6..9a0a9788c 100644 --- a/sys/applemedia/Makefile.am +++ b/sys/applemedia/Makefile.am @@ -32,7 +32,9 @@ libgstapplemedia_la_LIBADD = \ -lgstinterfaces-$(GST_MAJORMINOR) \ -lgstvideo-$(GST_MAJORMINOR) +if !GST_PLUGIN_BUILD_STATIC libgstapplemedia_la_LIBTOOLFLAGS = --tag=disable-static +endif libgstapplemedia_la_LDFLAGS = \ $(GST_PLUGIN_LDFLAGS) \ diff --git a/sys/applemedia/plugin.m b/sys/applemedia/plugin.m index 02f7ca0cb..e576d6a66 100644 --- a/sys/applemedia/plugin.m +++ b/sys/applemedia/plugin.m @@ -75,8 +75,8 @@ plugin_init (GstPlugin * plugin) return res; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "applemedia", + applemedia, "Elements for capture and codec access on Apple OS X and iOS", plugin_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/sys/avc/Makefile.am b/sys/avc/Makefile.am index 963f51494..661c80de6 100644 --- a/sys/avc/Makefile.am +++ b/sys/avc/Makefile.am @@ -14,7 +14,9 @@ libgstavc_la_LIBADD = \ $(GST_BASE_LIBS) \ $(GST_LIBS) +if !GST_PLUGIN_BUILD_STATIC libgstavc_la_LIBTOOLFLAGS = --tag=disable-static +endif libgstavc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \ -Wl,-framework -Wl,AVCVideoServices \ diff --git a/sys/avc/gstavcplugin.cpp b/sys/avc/gstavcplugin.cpp index 076321080..8214ad64b 100644 --- a/sys/avc/gstavcplugin.cpp +++ b/sys/avc/gstavcplugin.cpp @@ -34,8 +34,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "avcsrc", + avcsrc, "AVC Video Services plugin", plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/cdrom/Makefile.am b/sys/cdrom/Makefile.am index 78aa461e8..d112ffc0f 100644 --- a/sys/cdrom/Makefile.am +++ b/sys/cdrom/Makefile.am @@ -5,6 +5,8 @@ libgstcdplayer_la_SOURCES = gstcdplayer.c gstcdplayer_ioctl.c libgstcdplayer_la_CFLAGS = $(GST_CFLAGS) libgstcdplayer_la_LIBADD = libgstcdplayer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstcdplayer_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstcdplayer.h gstcdplayer_ioctl.h gstcdplayer_ioctl_solaris.h gstcdplayer_ioctl_bsd.h diff --git a/sys/cdrom/gstcdplayer.c b/sys/cdrom/gstcdplayer.c index 123517d07..41728660b 100644 --- a/sys/cdrom/gstcdplayer.c +++ b/sys/cdrom/gstcdplayer.c @@ -358,5 +358,5 @@ plugin_init (GstPlugin * plugin) GST_TYPE_CDPLAYER); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "cdplayer", "CD Player", plugin_init, VERSION, GST_LICENSE, /* ? */ +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, cdplayer, "CD Player", plugin_init, VERSION, GST_LICENSE, /* ? */ GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/sys/d3dvideosink/Makefile.am b/sys/d3dvideosink/Makefile.am index 76b79209d..b9b5713cf 100644 --- a/sys/d3dvideosink/Makefile.am +++ b/sys/d3dvideosink/Makefile.am @@ -9,7 +9,9 @@ libgstd3dvideosink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \ $(DIRECT3D_LIBS) libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFAGS) +if !GST_PLUGIN_BUILD_STATIC libgstd3dvideosink_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = d3dvideosink.h directx/d3d.h directx/dx.h directx/directx.h \ directx/directx9/dx9.h directx/directx9/dx9_d3d.h \ diff --git a/sys/d3dvideosink/d3dvideosink.c b/sys/d3dvideosink/d3dvideosink.c index ed4d249b6..9c51e051e 100644 --- a/sys/d3dvideosink/d3dvideosink.c +++ b/sys/d3dvideosink/d3dvideosink.c @@ -2621,8 +2621,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE3 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "d3dsinkwrapper", + d3dsinkwrapper, "Direct3D sink wrapper plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/decklink/Makefile.am b/sys/decklink/Makefile.am index 63fe3970e..d121f6ed5 100644 --- a/sys/decklink/Makefile.am +++ b/sys/decklink/Makefile.am @@ -13,7 +13,9 @@ libgstdecklink_la_LIBADD = \ $(DECKLINK_LIBS) \ $(LIBM) libgstdecklink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdecklink_la_LIBTOOLFLAGS = --tag=disable-static +endif libgstdecklink_la_SOURCES = \ gstdecklinksrc.cpp \ diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp index 0920cca2f..9647dcb75 100644 --- a/sys/decklink/gstdecklink.cpp +++ b/sys/decklink/gstdecklink.cpp @@ -198,8 +198,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "decklink", + decklink, "Blackmagic Decklink plugin", plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/directdraw/Makefile.am b/sys/directdraw/Makefile.am index 559db9b36..2b48f087f 100644 --- a/sys/directdraw/Makefile.am +++ b/sys/directdraw/Makefile.am @@ -7,6 +7,8 @@ libgstdirectdrawsink_la_LIBADD = $(DIRECTDRAW_LIBS) \ $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ -lgstinterfaces-$(GST_MAJORMINOR) libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdirectdrawsink_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS= gstdirectdrawsink.h diff --git a/sys/directdraw/gstdirectdrawplugin.c b/sys/directdraw/gstdirectdrawplugin.c index 787203736..734669453 100644 --- a/sys/directdraw/gstdirectdrawplugin.c +++ b/sys/directdraw/gstdirectdrawplugin.c @@ -40,8 +40,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "directdraw", + directdraw, "Direct Draw plugin library", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am index cd1e05944..ef92757b7 100644 --- a/sys/directsound/Makefile.am +++ b/sys/directsound/Makefile.am @@ -7,6 +7,8 @@ libgstdirectsoundsrc_la_LIBADD = $(DIRECTDRAW_LIBS) \ $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ -lgstinterfaces-$(GST_MAJORMINOR) -ldsound libgstdirectsoundsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdirectsoundsrc_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS= gstdirectsoundsrc.h diff --git a/sys/directsound/gstdirectsoundplugin.c b/sys/directsound/gstdirectsoundplugin.c index e3816967c..64443dd9a 100644 --- a/sys/directsound/gstdirectsoundplugin.c +++ b/sys/directsound/gstdirectsoundplugin.c @@ -42,8 +42,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "directsoundsrc", + directsoundsrc, "Direct Sound Source plugin library", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/dshowdecwrapper/Makefile.am b/sys/dshowdecwrapper/Makefile.am index c62d46f73..c0fe42097 100644 --- a/sys/dshowdecwrapper/Makefile.am +++ b/sys/dshowdecwrapper/Makefile.am @@ -8,7 +8,9 @@ libgstdshowdecwrapper_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst-libs/gst -DL libgstdshowdecwrapper_la_LIBADD = $(top_builddir)/gst-libs/gst/dshow/libgstdshow-@GST_MAJORMINOR@.la \ $(GST_BASE_LIBS) $(GST_LIBS) libgstdshowdecwrapper_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdshowdecwrapper_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstdshowaudiodec.h gstdshowvideodec.h gstdshowfakesrc.h \ gstdshowutil.h diff --git a/sys/dshowdecwrapper/gstdshowdecwrapper.cpp b/sys/dshowdecwrapper/gstdshowdecwrapper.cpp index c64257c8e..6bfe3487e 100644 --- a/sys/dshowdecwrapper/gstdshowdecwrapper.cpp +++ b/sys/dshowdecwrapper/gstdshowdecwrapper.cpp @@ -64,9 +64,9 @@ plugin_init (GstPlugin * plugin) extern "C" { -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dshowdecwrapper", + dshowdecwrapper, "DirectShow decoder wrapper plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/dshowsrcwrapper/gstdshowsrcwrapper.cpp b/sys/dshowsrcwrapper/gstdshowsrcwrapper.cpp index 2f40abe84..0c1632245 100644 --- a/sys/dshowsrcwrapper/gstdshowsrcwrapper.cpp +++ b/sys/dshowsrcwrapper/gstdshowsrcwrapper.cpp @@ -41,9 +41,9 @@ plugin_init (GstPlugin * plugin) extern "C" { - GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dshowsrcwrapper", + dshowsrcwrapper, "DirectShow sources wrapper plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/dshowvideosink/dshowvideosink.cpp b/sys/dshowvideosink/dshowvideosink.cpp index 5ac2a5f3b..402c5f785 100644 --- a/sys/dshowvideosink/dshowvideosink.cpp +++ b/sys/dshowvideosink/dshowvideosink.cpp @@ -1935,8 +1935,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -extern "C" GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +extern "C" GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dshowsinkwrapper", + dshowsinkwrapper, "DirectShow sink wrapper plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/dvb/Makefile.am b/sys/dvb/Makefile.am index bceca2919..db317301f 100644 --- a/sys/dvb/Makefile.am +++ b/sys/dvb/Makefile.am @@ -20,7 +20,9 @@ libgstdvb_la_SOURCES = \ libgstdvb_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) libgstdvb_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) libgstdvb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdvb_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstdvbsrc.h \ diff --git a/sys/dvb/gstdvb.c b/sys/dvb/gstdvb.c index 1087173ef..2a0e9edd6 100644 --- a/sys/dvb/gstdvb.c +++ b/sys/dvb/gstdvb.c @@ -39,8 +39,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dvb", + dvb, "DVB elements", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/dxr3/Makefile.am b/sys/dxr3/Makefile.am index 44d217ad2..ec0719fd3 100644 --- a/sys/dxr3/Makefile.am +++ b/sys/dxr3/Makefile.am @@ -7,7 +7,9 @@ nodist_libgstdxr3_la_SOURCES = dxr3marshal.c libgstdxr3_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) libgstdxr3_la_LIBADD = libgstdxr3_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstdxr3_la_LIBTOOLFLAGS = --tag=disable-static +endif BUILT_SOURCES = dxr3marshal.c dxr3marshal.h built_headers = dxr3marshal.h diff --git a/sys/dxr3/dxr3init.c b/sys/dxr3/dxr3init.c index 2cbb74be1..e9bef92d6 100644 --- a/sys/dxr3/dxr3init.c +++ b/sys/dxr3/dxr3init.c @@ -49,8 +49,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "dxr3", + dxr3, "dxr3 mpeg video board elements", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/fbdev/Makefile.am b/sys/fbdev/Makefile.am index 6d5b85f16..3f9fa73ba 100644 --- a/sys/fbdev/Makefile.am +++ b/sys/fbdev/Makefile.am @@ -10,6 +10,8 @@ libgstfbdevsink_la_LIBADD = \ $(GST_BASE_LIBS) \ $(LIBFBDEV_LIBS) libgstfbdevsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstfbdevsink_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstfbdevsink.h diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c index 7878fbfbc..2fc8a9e84 100644 --- a/sys/fbdev/gstfbdevsink.c +++ b/sys/fbdev/gstfbdevsink.c @@ -93,8 +93,7 @@ gst_fbdevsink_base_init (gpointer g_class) gst_element_class_set_details_simple (element_class, "fbdev video sink", "Sink/Video", "A linux framebuffer videosink", "Sean D'Epagnier <sean@depagnier.com>"); - gst_element_class_add_static_pad_template (element_class, - &sink_template); + gst_element_class_add_static_pad_template (element_class, &sink_template); } @@ -443,8 +442,8 @@ gst_fbdevsink_get_type (void) return fbdevsink_type; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "fbdevsink", + fbdevsink, "linux framebuffer video sink", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/linsys/Makefile.am b/sys/linsys/Makefile.am index ac7eed003..3edd95365 100644 --- a/sys/linsys/Makefile.am +++ b/sys/linsys/Makefile.am @@ -23,4 +23,7 @@ libgstlinsys_la_CFLAGS = \ libgstlinsys_la_LDFLAGS = \ $(GST_PLUGIN_LDFLAGS) libgstlinsys_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) +if !GST_PLUGIN_BUILD_STATIC libgstlinsys_la_LIBTOOLFLAGS = --tag=disable-static +endif + diff --git a/sys/linsys/gstlinsys.c b/sys/linsys/gstlinsys.c index 208c573b3..99de80d03 100644 --- a/sys/linsys/gstlinsys.c +++ b/sys/linsys/gstlinsys.c @@ -42,7 +42,6 @@ plugin_init (GstPlugin * plugin) #define PACKAGE_ORIGIN "http://FIXME.org/" -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "linsys", - "FIXME", plugin_init, VERSION, "LGPL", PACKAGE_NAME, PACKAGE_ORIGIN) + linsys, "FIXME", plugin_init, VERSION, "LGPL", PACKAGE_NAME, PACKAGE_ORIGIN) diff --git a/sys/osxvideo/Makefile.am b/sys/osxvideo/Makefile.am index 53391f7ed..f3a06be5d 100644 --- a/sys/osxvideo/Makefile.am +++ b/sys/osxvideo/Makefile.am @@ -8,7 +8,9 @@ libgstosxvideosrc_la_LIBADD = \ $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ -lgstinterfaces-$(GST_MAJORMINOR) +if !GST_PLUGIN_BUILD_STATIC libgstosxvideosrc_la_LIBTOOLFLAGS = --tag=disable-static +endif libgstosxvideosrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \ -Wl,-framework -Wl,Cocoa -Wl,-framework -Wl,QuickTime diff --git a/sys/osxvideo/osxvideoplugin.c b/sys/osxvideo/osxvideoplugin.c index 89530cd5c..91653afce 100644 --- a/sys/osxvideo/osxvideoplugin.c +++ b/sys/osxvideo/osxvideoplugin.c @@ -43,8 +43,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "osxvideosrc", + osxvideosrc, "OSX native video input plugin", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/pvr2d/Makefile.am b/sys/pvr2d/Makefile.am index b45071063..1cf8e8e63 100644 --- a/sys/pvr2d/Makefile.am +++ b/sys/pvr2d/Makefile.am @@ -14,7 +14,9 @@ libgstpvr_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \ $(LIBM) libgstpvr_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstpvr_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstpvr.h \ diff --git a/sys/pvr2d/gstpvr.c b/sys/pvr2d/gstpvr.c index 0112d1ee7..36a8cb86e 100644 --- a/sys/pvr2d/gstpvr.c +++ b/sys/pvr2d/gstpvr.c @@ -78,8 +78,8 @@ gst_ducati_alloc_2d (gint width, gint height, guint * sz) # define PACKAGE "ducati" #endif -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "pvr", + pvr, "Pvr2d based plugin", plugin_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/sys/qcam/Makefile.am b/sys/qcam/Makefile.am index e3e5642c8..a186869c7 100644 --- a/sys/qcam/Makefile.am +++ b/sys/qcam/Makefile.am @@ -7,6 +7,8 @@ libgstqcam_la_SOURCES = gstqcamsrc.c qcam-lib.c exposure.c libgstqcam_la_CFLAGS = -O2 $(GST_CFLAGS) libgstqcam_la_LIBADD = libgstqcam_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstqcam_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstqcamsrc.h qcam-os.h qcam.h qcamip.h qcam-Linux.h diff --git a/sys/qcam/gstqcamsrc.c b/sys/qcam/gstqcamsrc.c index 2bd3a5855..fb2560b5c 100644 --- a/sys/qcam/gstqcamsrc.c +++ b/sys/qcam/gstqcamsrc.c @@ -438,8 +438,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "qcamsrc", + qcamsrc, "Read from a QuickCam device", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/qtwrapper/Makefile.am b/sys/qtwrapper/Makefile.am index 35a833742..6540f9a0e 100644 --- a/sys/qtwrapper/Makefile.am +++ b/sys/qtwrapper/Makefile.am @@ -14,7 +14,9 @@ libgstqtwrapper_la_SOURCES = \ libgstqtwrapper_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) libgstqtwrapper_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) libgstqtwrapper_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -Wl,-framework,CoreAudio,-framework,AudioToolbox,-framework,Carbon,-framework,QuickTime,-framework,QuartzCore +if !GST_PLUGIN_BUILD_STATIC libgstqtwrapper_la_LIBTOOLFLAGS = --tag=disable-static +endif # headers we need but don't want installed noinst_HEADERS = \ diff --git a/sys/qtwrapper/qtwrapper.c b/sys/qtwrapper/qtwrapper.c index 27e5c163b..220180a77 100644 --- a/sys/qtwrapper/qtwrapper.c +++ b/sys/qtwrapper/qtwrapper.c @@ -80,8 +80,8 @@ plugin_init (GstPlugin * plugin) return res; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "qtwrapper", + qtwrapper, "QuickTime codecs wrapper", plugin_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/sys/shm/Makefile.am b/sys/shm/Makefile.am index bfe7b49fe..51041eb92 100644 --- a/sys/shm/Makefile.am +++ b/sys/shm/Makefile.am @@ -8,6 +8,8 @@ libgstshm_la_SOURCES = shmpipe.c shmalloc.c gstshm.c gstshmsrc.c gstshmsink.c libgstshm_la_CFLAGS = $(GST_CFLAGS) -DSHM_PIPE_USE_GLIB libgstshm_la_LIBADD = -lrt libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) +if !GST_PLUGIN_BUILD_STATIC libgstshm_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstshmsrc.h gstshmsink.h shmpipe.h shmalloc.h diff --git a/sys/shm/gstshm.c b/sys/shm/gstshm.c index d57db6755..104e432e6 100644 --- a/sys/shm/gstshm.c +++ b/sys/shm/gstshm.c @@ -35,8 +35,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_SHM_SINK); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "shm", + shm, "shared memory sink source", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/vcd/Makefile.am b/sys/vcd/Makefile.am index 0e8bf4767..bcba6968d 100644 --- a/sys/vcd/Makefile.am +++ b/sys/vcd/Makefile.am @@ -5,6 +5,8 @@ libgstvcdsrc_la_SOURCES = vcdsrc.c libgstvcdsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstvcdsrc_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) libgstvcdsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvcdsrc_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = vcdsrc.h diff --git a/sys/vcd/vcdsrc.c b/sys/vcd/vcdsrc.c index 553e264cc..d2ae3822a 100644 --- a/sys/vcd/vcdsrc.c +++ b/sys/vcd/vcdsrc.c @@ -581,8 +581,8 @@ plugin_init (GstPlugin * plugin) GST_TYPE_VCDSRC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "vcdsrc", + vcdsrc, "Asynchronous read from VCD disk", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/vdpau/Makefile.am b/sys/vdpau/Makefile.am index dabba0896..1b7153203 100644 --- a/sys/vdpau/Makefile.am +++ b/sys/vdpau/Makefile.am @@ -27,7 +27,9 @@ libgstvdpau_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \ $(LIBM) libgstvdpau_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvdpau_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = \ gstvdpvideopostprocess.h \ diff --git a/sys/vdpau/gstvdp/Makefile.am b/sys/vdpau/gstvdp/Makefile.am index 375969087..ab3efe960 100644 --- a/sys/vdpau/gstvdp/Makefile.am +++ b/sys/vdpau/gstvdp/Makefile.am @@ -37,4 +37,6 @@ libgstvdp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(X11_LIBS) $(VDPAU_LIBS) \ ../basevideodecoder/libgstbasevideodecoder.la libgstvdp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_LT_LDFLAGS) $(GST_ALL_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstvdp_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=disable-static +endif diff --git a/sys/vdpau/gstvdpau.c b/sys/vdpau/gstvdpau.c index 63c721551..f3a4e7ea6 100644 --- a/sys/vdpau/gstvdpau.c +++ b/sys/vdpau/gstvdpau.c @@ -34,8 +34,8 @@ vdpau_init (GstPlugin * vdpau_plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "vdpau", + vdpau, "Various elements utilizing VDPAU", vdpau_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/sys/wasapi/gstwasapi.c b/sys/wasapi/gstwasapi.c index 9fef21fe0..6c69e3226 100644 --- a/sys/wasapi/gstwasapi.c +++ b/sys/wasapi/gstwasapi.c @@ -38,8 +38,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_WASAPI_SINK); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "wasapi", + wasapi, "Windows audio session API plugin", plugin_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/sys/wininet/Makefile.am b/sys/wininet/Makefile.am index 72e73ec49..1eb570a28 100644 --- a/sys/wininet/Makefile.am +++ b/sys/wininet/Makefile.am @@ -5,7 +5,9 @@ libgstwininet_la_SOURCES = gstwininetsrc.c libgstwininet_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstwininet_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) -lwininet libgstwininet_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +if !GST_PLUGIN_BUILD_STATIC libgstwininet_la_LIBTOOLFLAGS = --tag=disable-static +endif noinst_HEADERS = gstwininetsrc.h diff --git a/sys/wininet/gstwininetsrc.c b/sys/wininet/gstwininetsrc.c index b21e3d0be..e5f382ec9 100644 --- a/sys/wininet/gstwininetsrc.c +++ b/sys/wininet/gstwininetsrc.c @@ -443,8 +443,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_WIN_INET_SRC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "wininet", + wininet, "Windows network plugins", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/winks/gstksvideosrc.c b/sys/winks/gstksvideosrc.c index 3f2b66914..cdb0ed9be 100644 --- a/sys/winks/gstksvideosrc.c +++ b/sys/winks/gstksvideosrc.c @@ -1141,8 +1141,8 @@ plugin_init (GstPlugin * plugin) GST_RANK_NONE, GST_TYPE_KS_VIDEO_SRC); } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "winks", + winks, "Windows kernel streaming plugin", plugin_init, VERSION, "LGPL", "GStreamer", "http://gstreamer.net/") diff --git a/sys/winscreencap/gstwinscreencap.c b/sys/winscreencap/gstwinscreencap.c index bc6c1e0e4..b4d8014bc 100644 --- a/sys/winscreencap/gstwinscreencap.c +++ b/sys/winscreencap/gstwinscreencap.c @@ -70,8 +70,8 @@ plugin_init (GstPlugin * plugin) return TRUE; } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "winscreencap", + winscreencap, "Screen capture plugin for Windows", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/tools/gst-element-maker b/tools/gst-element-maker index bd4cc9870..f99f396a6 100755 --- a/tools/gst-element-maker +++ b/tools/gst-element-maker @@ -256,9 +256,9 @@ plugin_init (GstPlugin * plugin) #define GST_PACKAGE_ORIGIN "http://FIXME.org/" #endif -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, +GST_PLUGIN_DEFINE2 (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "replace", + replace, "FIXME plugin description", plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) |