libs: Fix last commit by using correct include paths and only include existing headers

diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
index 1a23eae..f65f5b3 100644 (file)
--- a/gst-libs/gst/fft/Makefile.am
+++ b/gst-libs/gst/fft/Makefile.am
@@ -39,7 +39,7 @@ libgstfft_@GST_API_VERSION@_la_SOURCES = \
        kiss_fftr_f64.c
 
 libgstfft_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) $(LIBM)
-libgstfft_@GST_API_VERSION@_la_CFLAGS = $(GST_CFLAGS)
+libgstfft_@GST_API_VERSION@_la_CFLAGS =  $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstfft_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 EXTRA_DIST = kiss_version
@@ -58,6 +58,8 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO
                --strip-prefix=Gst \
                --warn-all \
                --c-include "gst/fft/gstfft.h" \
+               -I$(top_srcdir)/gst-libs \
+               -I$(top_builddir)/gst-libs \
                --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
                --library=libgstfft-@GST_API_VERSION@.la \
                --include=Gst-@GST_API_VERSION@ \

diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
index aca5f68..8e20649 100644 (file)
--- a/gst-libs/gst/tag/Makefile.am
+++ b/gst-libs/gst/tag/Makefile.am
@@ -37,6 +37,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
                --strip-prefix=Gst \
                --warn-all \
                --c-include "gst/tag/gsttag.h" \
+               -I$(top_srcdir)/gst-libs \
+               -I$(top_builddir)/gst-libs \
                --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
                --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
                --library=libgsttag-@GST_API_VERSION@.la \

diff --git a/gst-libs/gst/video/gstvideo.h b/gst-libs/gst/video/gstvideo.h
index 60dc87f..32b08bf 100644 (file)
--- a/gst-libs/gst/video/gstvideo.h
+++ b/gst-libs/gst/video/gstvideo.h
@@ -24,8 +24,6 @@
 
 #include <gst/video/colorbalancechannel.h>
 #include <gst/video/colorbalance.h>
-#include <gst/video/gstsurfaceconverter.h>
-#include <gst/video/gstsurfacemeta.h>
 #include <gst/video/gstvideodecoder.h>
 #include <gst/video/gstvideoencoder.h>
 #include <gst/video/gstvideofilter.h>
@@ -36,7 +34,6 @@
 #include <gst/video/navigation.h>
 #include <gst/video/video-blend.h>
 #include <gst/video/video-color.h>
-#include <gst/video/videocontext.h>
 #include <gst/video/video-enumtypes.h>
 #include <gst/video/video-event.h>
 #include <gst/video/video-format.h>