fix for moved interfaces

diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am
index f974338900560ab25a92e4a487a5efb307185341..6013f59f0a3fd4aa08471406e2901a5f381d9657 100644 (file)
--- a/gst/videofilter/Makefile.am
+++ b/gst/videofilter/Makefile.am
@@ -14,7 +14,6 @@ libgstvideofilter_la_CFLAGS = $(GST_CFLAGS) \
                        $(GST_PLUGINS_BASE_CFLAGS)
 libgstvideofilter_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
                        -lgstvideo-@GST_MAJORMINOR@ \
-                       -lgstinterfaces-@GST_MAJORMINOR@ \
                        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstvideofilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM)
 libgstvideofilter_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/videofilter/gstvideobalance.c b/gst/videofilter/gstvideobalance.c
index 30194353537eb3e8e1f71b4a18fb69e26e660654..3c5a31e83ff6f8b1113d10ec50a41d60dc7431a3 100644 (file)
--- a/gst/videofilter/gstvideobalance.c
+++ b/gst/videofilter/gstvideobalance.c
@@ -49,7 +49,7 @@
 #include "gstvideobalance.h"
 #include <string.h>
 
-#include <gst/interfaces/colorbalance.h>
+#include <gst/video/colorbalance.h>
 
 GST_DEBUG_CATEGORY_STATIC (videobalance_debug);
 #define GST_CAT_DEFAULT videobalance_debug

diff --git a/sys/v4l2/gstv4l2colorbalance.h b/sys/v4l2/gstv4l2colorbalance.h
index 4b872d0af7aeaf27cd69116c80aed1d098b6ed43..4e6a75e369d854ea69eab699ec04380fd0ca2e70 100644 (file)
--- a/sys/v4l2/gstv4l2colorbalance.h
+++ b/sys/v4l2/gstv4l2colorbalance.h
@@ -25,7 +25,7 @@
 #define __GST_V4L2_COLOR_BALANCE_H__
 
 #include <gst/gst.h>
-#include <gst/interfaces/colorbalance.h>
+#include <gst/video/colorbalance.h>
 #include "v4l2_calls.h"
 
 G_BEGIN_DECLS

diff --git a/sys/v4l2/gstv4l2videooverlay.h b/sys/v4l2/gstv4l2videooverlay.h
index 958ade53d2bb38ee6f77af218d60f17f1f5afc35..7c044e71d8a88baa23a5a7f57dbc3df553750218 100644 (file)
--- a/sys/v4l2/gstv4l2videooverlay.h
+++ b/sys/v4l2/gstv4l2videooverlay.h
@@ -26,9 +26,9 @@
 #include <X11/X.h>
 
 #include <gst/gst.h>
-#include <gst/interfaces/videooverlay.h>
 #include <gst/interfaces/navigation.h>
 #include <gst/video/gstvideosink.h>  /* for GstVideoRectange */
+#include <gst/video/videooverlay.h>
 
 #include "gstv4l2object.h"
 

diff --git a/sys/v4l2/gstv4l2vidorient.h b/sys/v4l2/gstv4l2vidorient.h
index 07ab664f51a989f06fc560f719377a8e92444f1d..bf3736f9ba5d7534866383bd7b95fcb1cf6ce7c9 100644 (file)
--- a/sys/v4l2/gstv4l2vidorient.h
+++ b/sys/v4l2/gstv4l2vidorient.h
@@ -24,7 +24,7 @@
 #define __GST_V4L2_VIDORIENT_H__
 
 #include <gst/gst.h>
-#include <gst/interfaces/videoorientation.h>
+#include <gst/video/videoorientation.h>
 
 #include "gstv4l2object.h"
 

diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index 8181846e2db2a6e79f0eae395e8c0a8ead387ae1..5678294fdcb9f8f5620e6801dd990a415d127f4c 100644 (file)
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -12,7 +12,9 @@ V4L2_TESTS = v4l2src-test
 
 v4l2src_test_SOURCES = v4l2src-test.c
 v4l2src_test_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-v4l2src_test_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) $(GST_LIBS)
+v4l2src_test_LDADD = $(GST_PLUGINS_BASE_LIBS) \
+                    -lgstvideo-$(GST_MAJORMINOR) \
+                    -lgstinterfaces-$(GST_MAJORMINOR) $(GST_LIBS)
 
 else
 V4L2_TESTS =

diff --git a/tests/icles/v4l2src-test.c b/tests/icles/v4l2src-test.c
index 4fcf48b726dde2b58686cba5d342be9ced815eda..02d005dca48511c4d08d3036e1df0305c9c93a46 100644 (file)
--- a/tests/icles/v4l2src-test.c
+++ b/tests/icles/v4l2src-test.c
@@ -25,8 +25,8 @@
 
 #include <gst/gst.h>
 #include <gst/interfaces/tuner.h>
-#include <gst/interfaces/colorbalance.h>
-#include <gst/interfaces/videoorientation.h>
+#include <gst/video/colorbalance.h>
+#include <gst/video/videoorientation.h>
 
 GstElement *pipeline, *source, *sink;
 GMainLoop *loop;