From 710491109d5e6aed9b9b0ea8607bb65fefe7158c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 29 Nov 2011 19:10:58 +0100
Subject: [PATCH] fix for moved interfaces

---
 gst/videofilter/Makefile.am       | 1 -
 gst/videofilter/gstvideobalance.c | 2 +-
 sys/v4l2/gstv4l2colorbalance.h    | 2 +-
 sys/v4l2/gstv4l2videooverlay.h    | 2 +-
 sys/v4l2/gstv4l2vidorient.h       | 2 +-
 tests/icles/Makefile.am           | 4 +++-
 tests/icles/v4l2src-test.c        | 4 ++--
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am
index f974338..6013f59 100644
--- 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 3019435..3c5a31e 100644
--- 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 4b872d0..4e6a75e 100644
--- 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 958ade5..7c044e7 100644
--- 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 07ab664..bf3736f 100644
--- 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 8181846..5678294 100644
--- 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 4fcf48b..02d005d 100644
--- 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;
-- 
2.7.4