From 8493bcee4ff1fd7a80ef7a3338d95b8b68e1a9ae Mon Sep 17 00:00:00 2001 From: Christian Schaller Date: Fri, 6 May 2005 14:54:23 +0000 Subject: [PATCH] make mad and effectv work with gst-register Original commit message from CVS: make mad and effectv work with gst-register --- ChangeLog | 11 +++++++++++ configure.ac | 4 ++-- ext/mad/Makefile.am | 2 +- ext/mad/gstid3tag.c | 2 -- gst-plugins-ugly.spec.in | 2 -- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29f28f4a5d..e24c0e11c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-05-06 Christian Schaller + + * configure.ac: + * ext/mad/Makefile.am: add linking of gstinterfaces + * ext/mad/gstid3tag.c: (plugin_init): remove library_load + * gst-plugins.spec.in: + * gst/effectv/Makefile.am: link to libgstvideofilter + * gst/effectv/gsteffectv.c: (plugin_init): same as for mad + * gst/videofilter/Makefile.am: make sure videoflip is not built + 2005-05-06 Wim Taymans * gst/law/alaw-decode.c: (alawdec_getcaps), (alawdec_setcaps), @@ -21,6 +31,7 @@ * gst/audioconvert: * gst/ffmpegcolorspace: * gst/typefind: + * gst/videofilter: comment out videoflip and gamma plugins 2005-05-06 Christian Schaller diff --git a/configure.ac b/configure.ac index 5b97c1f428..cac2e30501 100644 --- a/configure.ac +++ b/configure.ac @@ -293,9 +293,9 @@ AC_SUBST(GST_PLUGIN_LDFLAGS) dnl these are all the gst plug-ins, compilable without additional libs GST_PLUGINS_ALL="\ + videofilter \ effectv \ - law \ - videofilter" + law" dnl see if we can build C++ plug-ins if test "x$HAVE_CXX" = "xyes"; then diff --git a/ext/mad/Makefile.am b/ext/mad/Makefile.am index 1452e256a5..dfbee755c7 100644 --- a/ext/mad/Makefile.am +++ b/ext/mad/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstmad.la libgstmad_la_SOURCES = gstmad.c gstid3tag.c libgstmad_la_CFLAGS = $(GST_CFLAGS) $(MAD_CFLAGS) $(ID3_CFLAGS) -libgstmad_la_LIBADD = $(MAD_LIBS) $(ID3_LIBS) +libgstmad_la_LIBADD = $(MAD_LIBS) $(ID3_LIBS) $(GST_INTERFACES_LIBS) libgstmad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstmad.h diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c index f2c02eb462..fdf764c68e 100644 --- a/ext/mad/gstid3tag.c +++ b/ext/mad/gstid3tag.c @@ -1317,8 +1317,6 @@ gst_id3_tag_change_state (GstElement * element) static gboolean plugin_init (GstPlugin * plugin) { - if (!gst_library_load ("gsttags")) - return FALSE; if (!gst_element_register (plugin, "mad", GST_RANK_PRIMARY, gst_mad_get_type ()) diff --git a/gst-plugins-ugly.spec.in b/gst-plugins-ugly.spec.in index 08fd82dc73..606611cf7b 100644 --- a/gst-plugins-ugly.spec.in +++ b/gst-plugins-ugly.spec.in @@ -126,8 +126,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gstreamer-%{majorminor}/libgsteffectv.so %{_libdir}/gstreamer-%{majorminor}/libgstmulaw.so %{_libdir}/gstreamer-%{majorminor}/libgstvideofilter.so -%{_libdir}/gstreamer-%{majorminor}/libgstgamma.so -%{_libdir}/gstreamer-%{majorminor}/libgstvideoflip.so # gstreamer-plugins with external dependencies but in the main package # @USE_ARTS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstarts.so