make mad and effectv work with gst-register

Original commit message from CVS:
make mad and effectv work with gst-register
This commit is contained in:
Christian Schaller 2005-05-06 14:54:23 +00:00
parent d7ccf497a9
commit 67802e8048
6 changed files with 24 additions and 19 deletions

View file

@ -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> 2005-05-06 Wim Taymans <wim@fluendo.com>
* gst/law/alaw-decode.c: (alawdec_getcaps), (alawdec_setcaps), * gst/law/alaw-decode.c: (alawdec_getcaps), (alawdec_setcaps),
@ -21,6 +31,7 @@
* gst/audioconvert: * gst/audioconvert:
* gst/ffmpegcolorspace: * gst/ffmpegcolorspace:
* gst/typefind: * gst/typefind:
* gst/videofilter: comment out videoflip and gamma plugins
2005-05-06 Christian Schaller <uraeus@gnome.org> 2005-05-06 Christian Schaller <uraeus@gnome.org>

View file

@ -293,9 +293,9 @@ AC_SUBST(GST_PLUGIN_LDFLAGS)
dnl these are all the gst plug-ins, compilable without additional libs dnl these are all the gst plug-ins, compilable without additional libs
GST_PLUGINS_ALL="\ GST_PLUGINS_ALL="\
videofilter \
effectv \ effectv \
law \ law"
videofilter"
dnl see if we can build C++ plug-ins dnl see if we can build C++ plug-ins
if test "x$HAVE_CXX" = "xyes"; then if test "x$HAVE_CXX" = "xyes"; then

View file

@ -126,8 +126,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgsteffectv.so %{_libdir}/gstreamer-%{majorminor}/libgsteffectv.so
%{_libdir}/gstreamer-%{majorminor}/libgstmulaw.so %{_libdir}/gstreamer-%{majorminor}/libgstmulaw.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideofilter.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 # gstreamer-plugins with external dependencies but in the main package
# @USE_ARTS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstarts.so # @USE_ARTS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstarts.so

View file

@ -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_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_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) libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gsteffectv.h noinst_HEADERS = gsteffectv.h

View file

@ -68,9 +68,6 @@ plugin_init (GstPlugin * plugin)
{ {
gint i = 0; gint i = 0;
if (!gst_library_load ("gstvideofilter"))
return FALSE;
while (_elements[i].name) { while (_elements[i].name) {
if (!gst_element_register (plugin, _elements[i].name, if (!gst_element_register (plugin, _elements[i].name,
GST_RANK_NONE, (_elements[i].type) ())) GST_RANK_NONE, (_elements[i].type) ()))

View file

@ -1,9 +1,8 @@
plugin_LTLIBRARIES = libgstvideofilter.la libgstvideoflip.la \ plugin_LTLIBRARIES = libgstvideofilter.la
libgstgamma.la
noinst_LTLIBRARIES = libgstvideoexample.la noinst_LTLIBRARIES = libgstvideoexample.la
noinst_HEADERS = gstvideofilter.h gstvideoflip.h noinst_HEADERS = gstvideofilter.h
EXTRA_DIST = gstvideotemplate.c make_filter EXTRA_DIST = gstvideotemplate.c make_filter
CLEANFILES = gstvideoexample.c CLEANFILES = gstvideoexample.c
@ -18,20 +17,20 @@ libgstvideoexample_la_CFLAGS = $(GST_CFLAGS)
libgstvideoexample_la_LIBADD = libgstvideoexample_la_LIBADD =
libgstvideoexample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideoexample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstvideoflip_la_SOURCES = gstvideoflip.c # libgstvideoflip_la_SOURCES = gstvideoflip.c
libgstvideoflip_la_CFLAGS = $(GST_CFLAGS) # libgstvideoflip_la_CFLAGS = $(GST_CFLAGS)
libgstvideoflip_la_LIBADD = # libgstvideoflip_la_LIBADD =
libgstvideoflip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) # libgstvideoflip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
# libgstvideobalance_la_SOURCES = gstvideobalance.c # libgstvideobalance_la_SOURCES = gstvideobalance.c
# libgstvideobalance_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS) # libgstvideobalance_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS)
# libgstvideobalance_la_LIBADD = $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la # libgstvideobalance_la_LIBADD = $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
# libgstvideobalance_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBOIL_LIBS) -lm # libgstvideobalance_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBOIL_LIBS) -lm
libgstgamma_la_SOURCES = gstgamma.c # libgstgamma_la_SOURCES = gstgamma.c
libgstgamma_la_CFLAGS = $(GST_CFLAGS) # libgstgamma_la_CFLAGS = $(GST_CFLAGS)
libgstgamma_la_LIBADD = # libgstgamma_la_LIBADD =
libgstgamma_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lm # libgstgamma_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lm
gstvideoexample.c: $(srcdir)/make_filter $(srcdir)/gstvideotemplate.c gstvideoexample.c: $(srcdir)/make_filter $(srcdir)/gstvideotemplate.c
$(srcdir)/make_filter Videoexample $(srcdir)/gstvideotemplate.c $(srcdir)/make_filter Videoexample $(srcdir)/gstvideotemplate.c