From e44c8f032bc60b43cbefde760084952c956a1e30 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Wed, 8 Oct 2003 18:21:41 +0000 Subject: [PATCH] entitize the version Original commit message from CVS: entitize the version --- docs/Makefile.am | 4 +++- docs/faq/developing.xml | 8 ++++---- docs/faq/faq.xml | 2 ++ docs/gst/tmpl/gstcaps.sgml | 9 ++++++--- docs/gst/tmpl/gstelementfactory.sgml | 2 +- docs/gst/tmpl/gstevent.sgml | 1 + docs/gst/tmpl/gstpad.sgml | 1 + docs/gst/tmpl/gstregistry.sgml | 1 - docs/gst/tmpl/gsttypefactory.sgml | 4 +++- docs/gst/tmpl/gstxml.sgml | 10 +++++++--- docs/manual/basics-helloworld.xml | 2 +- docs/manual/helloworld.xml | 2 +- docs/manual/helloworld2.xml | 2 +- docs/manual/manual.xml | 2 ++ docs/manuals.mak | 1 + 15 files changed, 34 insertions(+), 17 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 8c6e4e63c7..395b7e89ed 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -14,7 +14,9 @@ endif SUBDIRS = $(SUBDIRS_DOCS) $(SUBDIRS_PLUGINS) DIST_SUBDIRS = faq manual pwg gst libs plugins xsl -EXTRA_DIST = slides manuals.mak htmlinstall.mak image-png image-pdf image-eps +EXTRA_DIST = \ + slides manuals.mak htmlinstall.mak \ + image-png image-pdf image-eps version.entities.in dist-hook: $(RM) -rf $(distdir)/random/CVS diff --git a/docs/faq/developing.xml b/docs/faq/developing.xml index a200dcfdd9..d290515809 100644 --- a/docs/faq/developing.xml +++ b/docs/faq/developing.xml @@ -20,12 +20,12 @@ If you're not familiar with pkg-config to compile and link a small one-file program, pass the --cflags and --libs arguments to pkg-config. For example: -$ gcc `pkg-config --cflags --libs gstreamer-0.7` -o myprog myprog.c +$ gcc `pkg-config --cflags --libs gstreamer-&GST_MAJORMINOR;` -o myprog myprog.c would be sufficient for a gstreamer-only program. If (for example) your app also used GTK+ 2.0, you could use -$ gcc `pkg-config --cflags --libs gstreamer-0.7 gtk+-2.0` -o myprog myprog.c +$ gcc `pkg-config --cflags --libs gstreamer-&GST_MAJORMINOR; gtk+-2.0` -o myprog myprog.c Those are back-ticks (on the same key with the tilde on US keyboards), not single quotes. @@ -107,13 +107,13 @@ to use the gstgconf library. It provides functions to parse the GConf key to a usable pipeline. -To link against gstgconf, use pkg-config to query the gstreamer-libs-0.7.pc file +To link against gstgconf, use pkg-config to query the gstreamer-libs-&GST_MAJORMINOR;.pc file for link flags, and add -lgstgconf to the link flags. This fragment of configure.ac shows how to use pkg-config to get the LIBS: dnl check for GStreamer helper libs -PKG_CHECK_MODULES(GST_HELPLIBS, gstreamer-libs-0.7 >= $GSTREAMER_REQ,,exit) +PKG_CHECK_MODULES(GST_HELPLIBS, gstreamer-libs-&GST_MAJORMINOR; >= $GSTREAMER_REQ,,exit) AC_SUBST(GST_HELPLIBS_LIBS) AC_SUBST(GST_HELPLIBS_CFLAGS) diff --git a/docs/faq/faq.xml b/docs/faq/faq.xml index 36dfa5e129..23bae58289 100644 --- a/docs/faq/faq.xml +++ b/docs/faq/faq.xml @@ -4,6 +4,8 @@ %image-entities; + +%version-entities; diff --git a/docs/gst/tmpl/gstcaps.sgml b/docs/gst/tmpl/gstcaps.sgml index 0b7c1e5385..65f1399c44 100644 --- a/docs/gst/tmpl/gstcaps.sgml +++ b/docs/gst/tmpl/gstcaps.sgml @@ -471,25 +471,27 @@ The name used for tracing @Returns: - + Check if the GstCaps has a property with the given name @caps: the caps to query @name: the name of the property +@Returns: - + Check if the GstCaps has a fixed property with the given name @caps: the caps to query @name: the name of the property +@Returns: - + Check if the GstCaps has a property with the given type @@ -497,6 +499,7 @@ Check if the GstCaps has a property with the given type @caps: the caps to query @name: the name of the property @type: +@Returns: diff --git a/docs/gst/tmpl/gstelementfactory.sgml b/docs/gst/tmpl/gstelementfactory.sgml index 4bca3a0150..eddebe8f0c 100644 --- a/docs/gst/tmpl/gstelementfactory.sgml +++ b/docs/gst/tmpl/gstelementfactory.sgml @@ -147,7 +147,7 @@ describes the element, mostly for the benefit of editors. @Returns: - + diff --git a/docs/gst/tmpl/gstevent.sgml b/docs/gst/tmpl/gstevent.sgml index 7e8fe534e9..a32604f5c2 100644 --- a/docs/gst/tmpl/gstevent.sgml +++ b/docs/gst/tmpl/gstevent.sgml @@ -47,6 +47,7 @@ The different major types of events. @GST_EVENT_TS_OFFSET: an event to set the time offset on buffers @GST_EVENT_INTERRUPT: mainly used by _get based elements when they were interrupted while waiting for a buffer. +@GST_EVENT_NAVIGATION: diff --git a/docs/gst/tmpl/gstpad.sgml b/docs/gst/tmpl/gstpad.sgml index 11acfd6a33..a557ac6c82 100644 --- a/docs/gst/tmpl/gstpad.sgml +++ b/docs/gst/tmpl/gstpad.sgml @@ -1068,6 +1068,7 @@ The realpad object @getcapsfunc: @direction: @linkfunc: +@unlinkfunc: @peer: @sched_private: @chainfunc: diff --git a/docs/gst/tmpl/gstregistry.sgml b/docs/gst/tmpl/gstregistry.sgml index df4ebe435f..4a600589eb 100644 --- a/docs/gst/tmpl/gstregistry.sgml +++ b/docs/gst/tmpl/gstregistry.sgml @@ -49,7 +49,6 @@ The registry object @loaded: @plugins: @paths: -@dummy: diff --git a/docs/gst/tmpl/gsttypefactory.sgml b/docs/gst/tmpl/gsttypefactory.sgml index 0824192eae..5b65c24c35 100644 --- a/docs/gst/tmpl/gsttypefactory.sgml +++ b/docs/gst/tmpl/gsttypefactory.sgml @@ -73,10 +73,12 @@ This is the function that will be called when a typefind has to be performed by a plugin. -@buf: the buffer with media on which to perform the typefind +@bs: @priv: private; don't touch @Returns: A #GstCaps structure describing the type or NULL if the type was not recognized by this function; + +@buf: the buffer with media on which to perform the typefind diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml index 32d00bc1f9..08450b21b9 100644 --- a/docs/gst/tmpl/gstxml.sgml +++ b/docs/gst/tmpl/gstxml.sgml @@ -110,6 +110,10 @@ All GstElements can be serialized to an XML presentation and subsequently loaded +@: +@: +@: + @gstxml: the object which received the signal. @arg1: @arg2: @@ -119,7 +123,7 @@ All GstElements can be serialized to an XML presentation and subsequently loaded -@: -@: -@: +@gstxml: the object which received the signal. +@arg1: +@arg2: diff --git a/docs/manual/basics-helloworld.xml b/docs/manual/basics-helloworld.xml index 011ae900f7..f949115b08 100644 --- a/docs/manual/basics-helloworld.xml +++ b/docs/manual/basics-helloworld.xml @@ -238,7 +238,7 @@ main (int argc, char *argv[]) To compile the helloworld example, use: - gcc -Wall `pkg-config gstreamer-0.7 --cflags --libs` helloworld.c \ + gcc -Wall `pkg-config gstreamer-&GST_MAJORMINOR; --cflags --libs` helloworld.c \ -o helloworld diff --git a/docs/manual/helloworld.xml b/docs/manual/helloworld.xml index 011ae900f7..f949115b08 100644 --- a/docs/manual/helloworld.xml +++ b/docs/manual/helloworld.xml @@ -238,7 +238,7 @@ main (int argc, char *argv[]) To compile the helloworld example, use: - gcc -Wall `pkg-config gstreamer-0.7 --cflags --libs` helloworld.c \ + gcc -Wall `pkg-config gstreamer-&GST_MAJORMINOR; --cflags --libs` helloworld.c \ -o helloworld diff --git a/docs/manual/helloworld2.xml b/docs/manual/helloworld2.xml index bb8db976cf..5a382c4b18 100644 --- a/docs/manual/helloworld2.xml +++ b/docs/manual/helloworld2.xml @@ -247,7 +247,7 @@ main (int argc, char *argv[]) To compile the helloworld2 example, use: - gcc -Wall `pkg-config gstreamer-0.7 --cflags --libs` helloworld2.c \ + gcc -Wall `pkg-config gstreamer-&GST_MAJORMINOR; --cflags --libs` helloworld2.c \ -o helloworld2 diff --git a/docs/manual/manual.xml b/docs/manual/manual.xml index 4f12d5abf5..a5503faafa 100644 --- a/docs/manual/manual.xml +++ b/docs/manual/manual.xml @@ -3,6 +3,8 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ %image-entities; + +%version-entities; diff --git a/docs/manuals.mak b/docs/manuals.mak index 7b5f9c24c1..21e61f2c7e 100644 --- a/docs/manuals.mak +++ b/docs/manuals.mak @@ -86,6 +86,7 @@ $(BUILDDIR)/$(MAIN): $(XML) $(CSS) @-mkdir -p $(BUILDDIR) @for a in $(XML); do cp $(srcdir)/$$a $(BUILDDIR); done @for a in $(CSS); do cp $(srcdir)/$$a $(BUILDDIR); done + @cp $(srcdir)/../version.entities $(BUILDDIR) html/index.html: $(BUILDDIR)/$(MAIN) $(PNG_BUILT) $(FIG_SRC) @echo "*** Generating HTML output ***"