summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--docs/plugins/gst-plugins-bad-plugins-decl-list.txt1
-rw-r--r--sys/v4l2/Makefile.am5
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ffc1633..b4b4a15e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-13 Julien MOUTTE <julien@moutte.net>
+
+ * docs/plugins/gst-plugins-bad-plugins-decl-list.txt:
+ * sys/v4l2/Makefile.am: Fix build of v4l2 (sigh)
+
2006-03-12 Tim-Philipp Müller <tim at centricular dot net>
* Makefile.am:
diff --git a/docs/plugins/gst-plugins-bad-plugins-decl-list.txt b/docs/plugins/gst-plugins-bad-plugins-decl-list.txt
index ad63ed4b..7dbb1348 100644
--- a/docs/plugins/gst-plugins-bad-plugins-decl-list.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-decl-list.txt
@@ -6,6 +6,7 @@ GST_DFBSURFACE
GstDfbSurface
GstDfbVMode
<TITLE>GstDfbVideoSink</TITLE>
+GstDfbVideoSink
gst_dfbsurface_get_type
<SUBSECTION Standard>
GST_DFBVIDEOSINK
diff --git a/sys/v4l2/Makefile.am b/sys/v4l2/Makefile.am
index 223e807b..165657a0 100644
--- a/sys/v4l2/Makefile.am
+++ b/sys/v4l2/Makefile.am
@@ -17,11 +17,12 @@ libgstvideo4linux2_la_SOURCES = \
v4l2_calls.c \
v4l2src_calls.c $(xv_source)
-libgstvideo4linux2_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_LIBS_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
+libgstvideo4linux2_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS)
libgstvideo4linux2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstvideo4linux2_la_LIBADD = \
-lgstinterfaces-$(GST_MAJORMINOR) \
- $(GST_BASE_LIBS) $(GST_LIBS) $(xv_libs)
+ $(GST_BASE_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(xv_libs)
noinst_HEADERS = gstv4l2element.h v4l2_calls.h \
gstv4l2src.h v4l2src_calls.h \