diff options
author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2015-04-03 17:01:45 +0300 |
---|---|---|
committer | Sreerenj Balachandran <sreerenj.balachandran@intel.com> | 2015-04-03 17:01:45 +0300 |
commit | f5d3c2d85dfd857e2692c1aaa4c24e0588880000 (patch) | |
tree | c8638117914714ddf3d5de8254de3dd6556e3b7a | |
parent | 43d8366ec6d9679d9fb66ecf803f6117f4411c40 (diff) |
Remove libgstvaapi-videoutils.so
This library was intended to add the base classes for video decoders which
where not included in gstreamer-0.10.
Since the support of gstreamer-0.10 is deprecated those classes are not
required, thus the whole library is removed.
https://bugzilla.gnome.org/show_bug.cgi?id=745728
https://bugzilla.gnome.org/show_bug.cgi?id=732666
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | gst-libs/gst/Makefile.am | 4 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/Makefile.am | 2 | ||||
-rw-r--r-- | gst-libs/gst/video/Makefile.am | 60 | ||||
-rw-r--r-- | gst/vaapi/Makefile.am | 3 | ||||
-rw-r--r-- | tests/Makefile.am | 9 |
6 files changed, 6 insertions, 73 deletions
diff --git a/configure.ac b/configure.ac index 1a19c5bd..1f81958b 100644 --- a/configure.ac +++ b/configure.ac @@ -974,7 +974,6 @@ debian.upstream/libgstvaapi-x11.install.in gst-libs/gst/base/Makefile gst-libs/gst/codecparsers/Makefile gst-libs/gst/vaapi/Makefile - gst-libs/gst/video/Makefile gst/Makefile gst/vaapi/Makefile patches/Makefile diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am index 823fca43..8acd19b0 100644 --- a/gst-libs/gst/Makefile.am +++ b/gst-libs/gst/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = base codecparsers video vaapi +SUBDIRS = base codecparsers vaapi # Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in $(gen_headers) +MAINTAINERCLEANFILES = Makefile.in diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am index 9e5fe88d..d457b3cc 100644 --- a/gst-libs/gst/vaapi/Makefile.am +++ b/gst-libs/gst/vaapi/Makefile.am @@ -45,7 +45,6 @@ libgstvaapi_libs = \ $(GST_CODEC_PARSERS_LIBS) \ $(LIBVA_LIBS) \ $(top_builddir)/gst-libs/gst/base/libgstvaapi-baseutils.la \ - $(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la \ $(top_builddir)/gst-libs/gst/codecparsers/libgstvaapi-codecparsers.la libgstvaapi_source_c = \ @@ -527,7 +526,6 @@ libgstvaapi_wayland_@GST_API_VERSION@_la_LIBADD = \ $(WAYLAND_LIBS) \ $(LIBVA_WAYLAND_LIBS) \ libgstvaapi-$(GST_API_VERSION).la \ - $(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la \ $(NULL) libgstvaapi_wayland_@GST_API_VERSION@_la_LDFLAGS = \ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am deleted file mode 100644 index 33fea307..00000000 --- a/gst-libs/gst/video/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -noinst_LTLIBRARIES = \ - libgstvaapi-videoutils.la \ - $(NULL) - -local_videoutils_srcdir = \ - $(top_srcdir)/ext/videoutils/gst-libs/gst/video - -libgstvaapi_videoutils_cflags = \ - -DGST_USE_UNSTABLE_API \ - -I$(top_srcdir)/gst-libs \ - -I$(top_builddir)/gst-libs \ - $(GST_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - $(NULL) - -libgstvaapi_videoutils_libs = \ - $(GST_BASE_LIBS) \ - $(GST_LIBS) \ - $(NULL) - -gen_source_c = -gen_source_h = - -GENFILES = \ - $(gen_source_c) \ - $(gen_source_h) \ - $(NULL) - -nodist_EXTRA_libgstvaapi_videoutils_la_SOURCES = dummy.c - -nodist_libgstvaapi_videoutils_la_SOURCES = \ - $(gen_source_c) \ - $(NULL) - -libgstvaapi_videoutils_la_CFLAGS = \ - $(libgstvaapi_videoutils_cflags) \ - $(NULL) - -libgstvaapi_videoutils_la_LIBADD = \ - $(libgstvaapi_videoutils_libs) \ - $(NULL) - -libgstvaapi_videoutils_la_LDFLAGS = \ - $(GST_ALL_LDFLAGS) \ - $(NULL) - -all-local: .timestamp.symlinks - -.timestamp.symlinks: $(GENFILES) - touch $@ - -$(gen_source_c): %.c: $(local_videoutils_srcdir)/%.c $(gen_source_h) - $(LN_S) -f $< $@ -$(gen_source_h): %.h: $(local_videoutils_srcdir)/%.h - $(LN_S) -f $< $@ - -DISTCLEANFILES = $(GENFILES) .timestamp.symlinks - -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am index 30d61558..8db30be2 100644 --- a/gst/vaapi/Makefile.am +++ b/gst/vaapi/Makefile.am @@ -180,8 +180,7 @@ libgstvaapi_la_LIBADD = \ $(GST_INTERFACES_LIBS) \ $(GST_BASEVIDEO_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \ - $(GST_ALLOCATORS_LIBS) \ - $(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la + $(GST_ALLOCATORS_LIBS) libgstvaapi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvaapi_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/tests/Makefile.am b/tests/Makefile.am index 80826d1a..9b016813 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -97,13 +97,11 @@ test_display_LDADD = libutils.la $(TEST_LIBS) test_filter_SOURCES = test-filter.c test_filter_CFLAGS = $(TEST_CFLAGS) -test_filter_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \ - $(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la +test_filter_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) test_surfaces_SOURCES = test-surfaces.c test_surfaces_CFLAGS = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS) -test_surfaces_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \ - $(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la +test_surfaces_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) test_subpicture_SOURCES = test-subpicture.c test-subpicture-data.c test_subpicture_CFLAGS = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS) @@ -122,8 +120,7 @@ simple_decoder_source_c = simple-decoder.c simple_decoder_source_h = simple_decoder_SOURCES = $(simple_decoder_source_c) simple_decoder_CFLAGS = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS) -simple_decoder_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \ - $(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la +simple_decoder_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) EXTRA_DIST = \ test-subpicture-data.h \ |