summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2006-10-04 10:29:11 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2006-10-04 10:29:11 +0000
commitc85684e2d83ffabe661bdd8aaea1309fa9915a16 (patch)
treecaa138dd87add2e10bd7e5d99a1d844e4596eebf
parent424c5cb6f7eddcd79898c916f083f7020a314a4a (diff)
docs/plugins/: added v4l2 stubs
Original commit message from CVS: * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-good-plugins-docs.sgml: * docs/plugins/gst-plugins-good-plugins-sections.txt: added v4l2 stubs * gst-plugins-good.spec.in: add v4l2
-rw-r--r--ChangeLog9
-rw-r--r--docs/plugins/Makefile.am1
-rw-r--r--docs/plugins/gst-plugins-good-plugins-docs.sgml2
-rw-r--r--docs/plugins/gst-plugins-good-plugins-sections.txt19
-rw-r--r--gst-plugins-good.spec.in3
5 files changed, 34 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ba6e0933..1064b5f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-04 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * docs/plugins/Makefile.am:
+ * docs/plugins/gst-plugins-good-plugins-docs.sgml:
+ * docs/plugins/gst-plugins-good-plugins-sections.txt:
+ added v4l2 stubs
+ * gst-plugins-good.spec.in:
+ add v4l2
+
2006-10-04 Tim-Philipp Müller <tim at centricular dot net>
* gst/apetag/gstapedemux.c: (ape_demux_parse_tags):
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 30907b96..86200d0d 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -113,6 +113,7 @@ EXTRA_HFILES = \
$(top_srcdir)/sys/oss/gstossmixerelement.h \
$(top_srcdir)/sys/oss/gstosssrc.h \
$(top_srcdir)/sys/oss/gstosssink.h \
+ $(top_srcdir)/sys/v4l2/gstv4l2src.h \
$(top_srcdir)/sys/ximage/gstximagesrc.h
# example code that needs to be converted to xml and placed in xml/
diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index 26126246..189fd11f 100644
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -51,6 +51,7 @@
<xi:include href="xml/element-videoflip.xml" />
<xi:include href="xml/element-videomixer.xml" />
<xi:include href="xml/element-wavparse.xml" />
+ <xi:include href="xml/element-v4l2src.xml" />
<xi:include href="xml/element-ximagesrc.xml" />
</chapter>
@@ -105,6 +106,7 @@
<xi:include href="xml/plugin-videomixer.xml" />
<xi:include href="xml/plugin-wavenc.xml" />
<xi:include href="xml/plugin-wavparse.xml" />
+ <xi:include href="xml/plugin-video4linux2.xml" />
<xi:include href="xml/plugin-ximagesrc.xml" />
</chapter>
</book>
diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index c0e33e1c..e29b25df 100644
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -605,6 +605,25 @@ GST_IS_WAVPARSE_CLASS
</SECTION>
<SECTION>
+<FILE>element-v4l2src</FILE>
+GstV4l2Src
+<TITLE>v4l2src</TITLE>
+<SUBSECTION Standard>
+GST_V4L2_MAX_BUFFERS
+GST_V4L2_MIN_BUFFERS
+GstV4l2BufferPool
+GstV4l2Buffer
+GstV4l2Src
+GstV4l2SrcClass
+GST_V4L2SRC
+GST_IS_V4L2SRC
+GST_TYPE_V4L2SRC
+gst_v4l2src_get_type
+GST_V4L2SRC_CLASS
+GST_IS_V4L2SRC_CLASS
+</SECTION>
+
+<SECTION>
<FILE>element-ximagesrc</FILE>
GstXImageSrc
<TITLE>ximagesrc</TITLE>
diff --git a/gst-plugins-good.spec.in b/gst-plugins-good.spec.in
index 2bfa126d..eae72603 100644
--- a/gst-plugins-good.spec.in
+++ b/gst-plugins-good.spec.in
@@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstximagesrc.so
%{_libdir}/gstreamer-%{majorminor}/libgstaudiofx.so
+# sys plugins
+@USE_GST_V4L2_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux2.so
+
# gstreamer-plugins with external dependencies but in the main package
@USE_LIBCACA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstcacasink.so
@USE_ESD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstesd.so