diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | gst-plugins.spec.in | 2 | ||||
| -rw-r--r-- | gst/effectv/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/effectv/gsteffectv.c | 3 | ||||
| -rw-r--r-- | gst/videofilter/Makefile.am | 21 |
6 files changed, 24 insertions, 19 deletions
@@ -1,3 +1,13 @@ +2005-05-06 Christian Schaller <uraeus@gnome.org> + + * 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 <wim@fluendo.com> * 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 <uraeus@gnome.org> diff --git a/configure.ac b/configure.ac index 5b97c1f4..cac2e305 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/gst-plugins.spec.in b/gst-plugins.spec.in index 08fd82dc..606611cf 100644 --- a/gst-plugins.spec.in +++ b/gst-plugins.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 diff --git a/gst/effectv/Makefile.am b/gst/effectv/Makefile.am index 2c3af0da..26b61be7 100644 --- a/gst/effectv/Makefile.am +++ b/gst/effectv/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgsteffectv.la libgsteffectv_la_SOURCES = gsteffectv.c gstedge.c gstaging.c gstdice.c gstwarp.c gstshagadelic.c gstvertigo.c gstrev.c gstquark.c libgsteffectv_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/videofilter -libgsteffectv_la_LIBADD = +libgsteffectv_la_LIBADD = $(top_builddir)/gst/videofilter/libgstvideofilter.la libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gsteffectv.h diff --git a/gst/effectv/gsteffectv.c b/gst/effectv/gsteffectv.c index c05e151c..f7aa6246 100644 --- a/gst/effectv/gsteffectv.c +++ b/gst/effectv/gsteffectv.c @@ -68,9 +68,6 @@ plugin_init (GstPlugin * plugin) { gint i = 0; - if (!gst_library_load ("gstvideofilter")) - return FALSE; - while (_elements[i].name) { if (!gst_element_register (plugin, _elements[i].name, GST_RANK_NONE, (_elements[i].type) ())) diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am index 985ae2fa..9171d5b1 100644 --- a/gst/videofilter/Makefile.am +++ b/gst/videofilter/Makefile.am @@ -1,9 +1,8 @@ -plugin_LTLIBRARIES = libgstvideofilter.la libgstvideoflip.la \ - libgstgamma.la +plugin_LTLIBRARIES = libgstvideofilter.la noinst_LTLIBRARIES = libgstvideoexample.la -noinst_HEADERS = gstvideofilter.h gstvideoflip.h +noinst_HEADERS = gstvideofilter.h EXTRA_DIST = gstvideotemplate.c make_filter CLEANFILES = gstvideoexample.c @@ -18,20 +17,20 @@ libgstvideoexample_la_CFLAGS = $(GST_CFLAGS) libgstvideoexample_la_LIBADD = libgstvideoexample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstvideoflip_la_SOURCES = gstvideoflip.c -libgstvideoflip_la_CFLAGS = $(GST_CFLAGS) -libgstvideoflip_la_LIBADD = -libgstvideoflip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +# libgstvideoflip_la_SOURCES = gstvideoflip.c +# libgstvideoflip_la_CFLAGS = $(GST_CFLAGS) +# libgstvideoflip_la_LIBADD = +# libgstvideoflip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) # libgstvideobalance_la_SOURCES = gstvideobalance.c # libgstvideobalance_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS) # libgstvideobalance_la_LIBADD = $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la # libgstvideobalance_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBOIL_LIBS) -lm -libgstgamma_la_SOURCES = gstgamma.c -libgstgamma_la_CFLAGS = $(GST_CFLAGS) -libgstgamma_la_LIBADD = -libgstgamma_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lm +# libgstgamma_la_SOURCES = gstgamma.c +# libgstgamma_la_CFLAGS = $(GST_CFLAGS) +# libgstgamma_la_LIBADD = +# libgstgamma_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lm gstvideoexample.c: $(srcdir)/make_filter $(srcdir)/gstvideotemplate.c $(srcdir)/make_filter Videoexample $(srcdir)/gstvideotemplate.c |