diff --git a/common b/common index c5d7301d64..5cca5ddc23 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit c5d7301d645fbee2881c30e86152cb3d2152e33b +Subproject commit 5cca5ddc23e23658e8287f7c2fbc4aebddaf3e12 diff --git a/configure.ac b/configure.ac index ad9397b531..aa1aecf240 100644 --- a/configure.ac +++ b/configure.ac @@ -537,7 +537,6 @@ examples/typefind/Makefile examples/xml/Makefile tools/Makefile docs/Makefile -docs/devhelp/Makefile docs/faq/Makefile docs/gst/Makefile docs/gst/gstreamer.types diff --git a/docs/Makefile.am b/docs/Makefile.am index b6a736179f..57f3bb80bc 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -5,8 +5,8 @@ else SUBDIRS_PLUGINS = endif -SUBDIRS = faq manual pwg gst libs $(SUBDIRS_PLUGINS) devhelp -DIST_SUBDIRS = faq manual pwg gst libs plugins xsl devhelp +SUBDIRS = faq manual pwg gst libs $(SUBDIRS_PLUGINS) +DIST_SUBDIRS = faq manual pwg gst libs plugins xsl EXTRA_DIST = slides manuals.mak diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am index 639836972b..bc53b5222d 100644 --- a/docs/gst/Makefile.am +++ b/docs/gst/Makefile.am @@ -1,8 +1,29 @@ ## Process this file with automake to produce Makefile.in # The name of the module, e.g. 'glib'. +# DOC_MODULE=gstreamer-@GST_MAJORMINOR@ DOC_MODULE=gstreamer +# generated basefiles +#basefiles = \ +# gstreamer-@GST_MAJORMINOR@.types \ +# gstreamer-@GST_MAJORMINOR@-sections.txt \ +# gstreamer-@GST_MAJORMINOR@-docs.sgml + +# ugly hack to make -unused.sgml work +#unused-build.stamp: +# BUILDDIR=`pwd` && \ +# cd $(srcdir)/tmpl && \ +# ln -sf gstreamer-unused.sgml \ +# $$BUILDDIR/tmpl/gstreamer-@GST_MAJORMINOR@-unused.sgml +# touch unused-build.stamp + +# these rules are added to create parallel docs using GST_MAJORMINOR +#$(basefiles): gstreamer-@GST_MAJORMINOR@%: gstreamer% +# cp $< $@ + +#CLEANFILES = $(basefiles) + # The top-level SGML file. Change it if you want. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml @@ -20,21 +41,21 @@ SCAN_OPTIONS= #EXTRA_DIST = gstreamer.types.in gstreamer.hierarchy $(DOC_MODULE)-sections.txt gstreamer-sections.txt $(DOC_MAIN_SGML_FILE) # Extra options to supply to gtkdoc-mkdb. -MKDB_OPTIONS= +MKDB_OPTIONS=--sgml-mode --output-format=xml --ignore-files=trio # Extra options to supply to gtkdoc-fixref. FIXXREF_OPTIONS= # Used for dependencies. -# FIXME deal with the subdirs too... HFILE_GLOB=$(DOC_SOURCE_DIR)/*.h CFILE_GLOB=$(DOC_SOURCE_DIR)/*.c # this is a wingo addition # thomasvs: another nice wingo addition would be an explanation on why # this is useful ;) -SCANOBJ_DEPS = $(top_builddir)/gst/elements/libgstelements.la \ - $(top_builddir)/gst/schedulers/libgstbasicomegascheduler.la + +#SCANOBJ_DEPS = $(top_builddir)/gst/elements/libgstelements.la \ +# $(top_builddir)/gst/schedulers/libgstbasicomegascheduler.la # Header files to ignore when scanning. IGNORE_HFILES= @@ -65,8 +86,17 @@ GTKDOC_LD=$(LIBTOOL) --mode=link $(CC) ########################################################################### # Everything below here is generic and you shouldn't need to change it. ########################################################################### +# thomas: except of course that we did -# added majorminor here because we want parallel installs +# thomas: copied from glib-2 +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +# thomas: make docs parallel installable TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@ EXTRA_DIST = \ @@ -90,8 +120,9 @@ all-local: html-build.stamp #### scan #### + # wingo addition -scan-build.stamp: $(HFILE_GLOB) $(SCANOBJ_DEPS) +scan-build.stamp: $(HFILE_GLOB) $(SCANOBJ_DEPS) $(basefiles) @echo '*** Scanning header files ***' if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" $(GTK_DOC_SCANOBJ) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ @@ -131,34 +162,39 @@ sgml.stamp: sgml-build.stamp #### html #### +# FIXME: setting LANG=C is a hack to work with gtk-doc < 1.1, because +# that forces a non-utf8 locale. gtk-doc >= 1.1 solves this by calling +# use bytes; in gtkdoc-fixxref html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo '*** Building HTML ***' test -d $(srcdir)/html || mkdir $(srcdir)/html cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) @echo '-- Fixing Crossreferences' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + cd $(srcdir) && LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp endif clean-local: rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS) + rm -rf xml html maintainer-clean-local: clean - cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt # FIXME : thomas added all sgml files and some other things to make # make distcheck work distclean-local: clean rm -rf $(DOC_MODULE)-decl-list.txt - rm -rf gstreamer-*.txt + rm -rf $(DOC_MODULE)-*.txt rm -rf tmpl/*.sgml - rm -f gstreamer.hierarchy + rm -f $(DOC_MODULE).hierarchy rm -f *.stamp || true +# thomas: make docs parallel installable; devhelp requires majorminor too install-data-local: $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) - (installfiles=`echo $(srcdir)/html/*.html`; \ + (installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \ if test "$$installfiles" = '$(srcdir)/html/*.html'; \ then echo '-- Nothing to install' ; \ else \ @@ -166,6 +202,9 @@ install-data-local: echo '-- Installing '$$i ; \ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ done; \ + echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \ + $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \ + $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \ echo '-- Installing $(srcdir)/html/index.sgml' ; \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ fi) @@ -183,12 +222,14 @@ endif dist-hook: dist-check-gtkdoc dist-hook-local mkdir $(distdir)/tmpl - mkdir $(distdir)/sgml + mkdir $(distdir)/xml mkdir $(distdir)/html -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml + -cp $(srcdir)/xml/*.xml $(distdir)/xml -cp $(srcdir)/html/index.sgml $(distdir)/html -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html + -cp $(srcdir)/html/*.png $(distdir)/html + -cp $(srcdir)/html/*.devhelp $(distdir)/html images=$(HTML_IMAGES) ; \ for i in $$images ; do \ diff --git a/docs/gst/gstreamer-docs.sgml b/docs/gst/gstreamer-docs.sgml index 6693281518..4d29d5873f 100644 --- a/docs/gst/gstreamer-docs.sgml +++ b/docs/gst/gstreamer-docs.sgml @@ -1,65 +1,69 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + ]> @@ -112,7 +116,8 @@ with some more specialized elements. &GstProbe; &GstProps; &GstQuery; - &GstQueue; + &GstRegistry; &GstScheduler; &GstSchedulerFactory; @@ -120,7 +125,8 @@ with some more specialized elements. &GstThread; &GstType; &GstTypeFactory; - &GstTypeFind; + &GstUtils; &GstXML; @@ -148,7 +154,7 @@ with some more specialized elements. &GstFdSink; &GstPipefilter; - &GstIdentity; + &GstIdENTITY; &GstStatistics; &GstMD5Sink; @@ -157,6 +163,7 @@ with some more specialized elements. --> + + diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 5ee591cffe..0d8d57c8d1 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -2,10 +2,9 @@
cothreads -CURRENT_STACK_FRAME cothread_state -cothread_context cothread_func +cothread_context COTHREAD_STARTED COTHREAD_DESTROYED cothread_context_init @@ -127,7 +126,6 @@ GST_SCHEDULER_PARENT GST_SCHEDULER_STATE GstSchedulerState GstSchedulerFlags -gst_scheduler_destroy gst_scheduler_setup gst_scheduler_reset gst_scheduler_add_element @@ -212,7 +210,6 @@ GstBinFlags GstBin GstBinPrePostIterateFunction gst_bin_new -gst_bin_destroy gst_bin_add gst_bin_add_many gst_bin_remove @@ -276,7 +273,6 @@ GstData GstDataFreeFunction GstDataCopyFunction GstDataFlags -GST_DATA_IS_READONLY GST_DATA_REFCOUNT GST_DATA_REFCOUNT_VALUE GST_DATA_COPY_FUNC @@ -285,7 +281,6 @@ gst_data_init gst_data_dispose gst_data_copy_into gst_data_copy -gst_data_needs_copy_on_write gst_data_copy_on_write gst_data_free gst_data_ref @@ -332,7 +327,6 @@ gst_buffer_ref gst_buffer_ref_by_count gst_buffer_unref gst_buffer_copy -gst_buffer_needs_copy_on_write gst_buffer_copy_on_write gst_buffer_free gst_buffer_create_sub @@ -368,7 +362,6 @@ gst_buffer_pool_set_user_data gst_buffer_pool_get_user_data gst_buffer_pool_get_default gst_buffer_pool_default_free -gst_buffer_pool_needs_copy_on_write GST_TYPE_BUFFER_POOL
@@ -435,7 +428,6 @@ gst_seek_type_get_type gstelement GstElement GstElement -gst_element_destroy gst_element_get_name gst_element_set_name gst_element_get_factory @@ -787,7 +779,6 @@ gst_object_unparent gst_object_ref gst_object_unref gst_object_sink -gst_object_destroy gst_object_save_thyself gst_object_restore_thyself gst_object_get_path_string @@ -866,7 +857,6 @@ GstPadFlags gst_pad_new gst_pad_custom_new gst_pad_custom_new_from_template -gst_pad_destroy gst_pad_new_from_template gst_pad_get_direction gst_pad_set_chain_function @@ -1064,7 +1054,6 @@ gst_pad_template_get_type GstPipeline GstPipeline gst_pipeline_new -gst_pipeline_destroy GstPipelineClass gst_pipeline_get_type @@ -1281,7 +1270,6 @@ gst_props_normalize gst_props_set gst_props_get gst_props_get_safe -gst_props_has_property gst_props_has_fixed_property gst_props_has_property_typed gst_props_intersect @@ -1293,6 +1281,7 @@ gst_props_get_entry gst_props_add_entry gst_props_entry_new gst_props_entry_get +gst_props_entry_get_type gst_props_entry_get_boolean gst_props_entry_get_float gst_props_entry_get_float_range diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index da6ee0b024..0076c3caef 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -1,51 +1,198 @@ ## Process this file with automake to produce Makefile.in -# The name of the module. +# The name of the module, e.g. 'glib'. +#DOC_MODULE=gstreamer-libs-@GST_MAJORMINOR@ DOC_MODULE=gstreamer-libs -# The top-level SGML file. +# generated basefiles +#basefiles = \ +## $(DOC_MODULE).types \ +# $(DOC_MODULE)-sections.txt \ +# $(DOC_MODULE)-docs.sgml + +# ugly hack to make -unused.sgml work +#unused-build.stamp: +# BUILDDIR=`pwd` && \ +# cd $(srcdir)/tmpl && \ +# ln -sf gstreamer-libs-unused.sgml \ +# $$BUILDDIR/tmpl/gstreamer-libs-@GST_MAJORMINOR@-unused.sgml +# touch unused-build.stamp + +# these rules are added to create parallel docs using GST_MAJORMINOR +#$(basefiles): gstreamer-libs-@GST_MAJORMINOR@%: gstreamer-libs% +# cp $< $@ + +#CLEANFILES = $(basefiles) + +# The top-level SGML file. Change it if you want. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml -# The directory containing the source code (if it contains documentation). -DOC_SOURCE_DIR=$(top_srcdir)/libs +# The directory containing the source code. Relative to $(top_srcdir). +# gtk-doc will search all .c & .h files beneath here for inline comments +# documenting functions and macros. +DOC_SOURCE_DIR=$(top_srcdir)/libs/gst -EXTRA_DIST = $(DOC_MODULE)-docs.sgml $(DOC_MODULE)-sections.txt +# Extra options to supply to gtkdoc-scan. +SCAN_OPTIONS= + +# FIXME : +# there's something wrong with gstreamer-sections.txt not being in the dist +# maybe it doesn't resolve; we're adding it below for now +#EXTRA_DIST = gstreamer.types.in gstreamer.hierarchy $(DOC_MODULE)-sections.txt gstreamer-sections.txt $(DOC_MAIN_SGML_FILE) + +# Extra options to supply to gtkdoc-mkdb. +MKDB_OPTIONS=--sgml-mode --output-format=xml --ignore-files=trio + +# Extra options to supply to gtkdoc-fixref. +FIXXREF_OPTIONS=--extra-dir=../gst/html + +# Used for dependencies. +HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.h +CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.c + +# this is a wingo addition +# thomasvs: another nice wingo addition would be an explanation on why +# this is useful ;) + +#SCANOBJ_DEPS = $(top_builddir)/gst/elements/libgstelements.la \ +# $(top_builddir)/gst/schedulers/libgstbasicomegascheduler.la + +# Header files to ignore when scanning. +IGNORE_HFILES= + +# Images to copy into HTML directory. +HTML_IMAGES = + +# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). +content_files = + +# Other files to distribute. +extra_files = + +# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib +# contains GtkObjects/GObjects and you want to document signals and properties. +GTKDOC_CFLAGS = $(GST_CFLAGS) +GTKDOC_LIBS = $(GST_LIBS) $(SCANOBJ_DEPS) + +GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) +GTKDOC_LD=$(LIBTOOL) --mode=link $(CC) + +# If you need to override some of the declarations, place them in this file +# and uncomment this line. +#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt + + + +########################################################################### +# Everything below here is generic and you shouldn't need to change it. +########################################################################### +# thomas: except of course that we did + +# thomas: copied from glib-2 +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) -HTML_DIR=@HTML_DIR@ -# add major minor here for parallel installs TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@ +EXTRA_DIST = \ + $(content_files) \ + $(extra_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ +# $(DOC_MODULE).types \ + $(DOC_MODULE)-sections.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).signals + if HAVE_GTK_DOC -html: html/book1.html -else -html: +all-local: html-build.stamp + +#### scan #### + + +# wingo addition +scan-build.stamp: $(HFILE_GLOB) $(SCANOBJ_DEPS) $(basefiles) + @echo '*** Scanning header files ***' + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" $(GTK_DOC_SCANOBJ) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_OVERRIDES) + @echo '*** Rebuilding template files ***' + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +#### sgml #### + +sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) + @echo '*** Building SGML ***' + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +# FIXME: setting LANG=C is a hack to work with gtk-doc < 1.1, because +# that forces a non-utf8 locale. gtk-doc >= 1.1 solves this by calling +# use bytes; in gtkdoc-fixxref +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo '*** Building HTML ***' + test -d $(srcdir)/html || mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo '-- Fixing Crossreferences' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp endif -# rule to make the html -html/book1.html: sgml/$(DOC_MODULE)-doc.bottom $(DOC_MAIN_SGML_FILE) - if ! test -d html ; then mkdir html ; fi - -cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - -# rule to cause scanning to be done -$(DOC_MODULE)-decl.txt: - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="" - -# rule to cause tmpls to be made -tmpl/$(DOC_MODULE)-unused.sgml: $(DOC_MODULE)-decl.txt $(DOC_MODULE)-sections.txt - gtkdoc-mktmpl --module=$(DOC_MODULE) - -# rule to make sgml -sgml/$(DOC_MODULE)-doc.bottom: tmpl/$(DOC_MODULE)-unused.sgml - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) - -all-local: html - clean-local: - $(RM) -rf *~ *.bak *.signals *-unused.txt *.args html sgml tmpl/*.bak $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS) + rm -rf xml html -install-data-local: html - @$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) - @(installfiles=`echo $(srcdir)/html/*.html`; \ +maintainer-clean-local: clean + cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +# FIXME : thomas added all sgml files and some other things to make +# make distcheck work +distclean-local: clean + rm -rf $(DOC_MODULE)-decl-list.txt + rm -rf $(DOC_MODULE)-*.txt + rm -rf tmpl/*.sgml + rm -f $(DOC_MODULE).hierarchy + rm -f *.stamp || true + +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) + (installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \ if test "$$installfiles" = '$(srcdir)/html/*.html'; \ then echo '-- Nothing to install' ; \ else \ @@ -53,14 +200,38 @@ install-data-local: html echo '-- Installing '$$i ; \ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ done; \ + echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \ + $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \ + $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \ echo '-- Installing $(srcdir)/html/index.sgml' ; \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ - echo '-- Fixing Crossreferences' ; \ - gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \ fi) -uninstall-local: - @echo '-- Uninstalling '$(DESTDIR)$(TARGET_DIR) ; \ - $(RM) -rf $(DESTDIR)$(TARGET_DIR) +# +# Require gtk-doc when making dist +# +if HAVE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif -.PHONY : html +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + -cp $(srcdir)/html/index.sgml $(distdir)/html + -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html + -cp $(srcdir)/html/*.png $(distdir)/html + -cp $(srcdir)/html/*.devhelp $(distdir)/html + + images=$(HTML_IMAGES) ; \ + for i in $$images ; do \ + cp $(srcdir)/$$i $(distdir)/html ; \ + done + +.PHONY : dist-hook-local diff --git a/docs/libs/gstreamer-libs-docs.sgml b/docs/libs/gstreamer-libs-docs.sgml index 49bf5e0be8..0cbe33979d 100644 --- a/docs/libs/gstreamer-libs-docs.sgml +++ b/docs/libs/gstreamer-libs-docs.sgml @@ -1,11 +1,10 @@ - - - - - - + + + + + ]> @@ -24,12 +23,10 @@ GStreamer provides some standard libraries you can use to create plugins. - &GstColorSpace; &GstGetbits; &GstIDCT; &GstPutbits; - &GstVideoScale; - &GstRiff; + &GstControl; diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt index 0a9e91d4b2..bb34c2e99d 100644 --- a/docs/libs/gstreamer-libs-sections.txt +++ b/docs/libs/gstreamer-libs-sections.txt @@ -1,274 +1,3 @@ -
-gstcolorspace -libs/colorspace/gstcolorspace.h -GstColorSpaceType -GstColorSpaceConverter -GstColorSpaceConvertFunction -GST_COLORSPACE_RGB_FIRST -GST_COLORSPACE_YUV_FIRST -GST_COLORSPACE_YUV_LAST -GST_COLORSPACE_RGB_LAST -GST_COLORSPACE_IS_YUV_TYPE -GST_COLORSPACE_IS_RGB_TYPE -gst_colorspace_converter_new -gst_colorspace_convert -gst_colorspace_destroy - -
- - -
-gstriff -libs/riff/gstriff.h -GstRiffReturn -GstRiffParserState -GST_RIFF_OK -GST_RIFF_ENOTRIFF -GST_RIFF_EINVAL -GST_RIFF_ENOMEM -GST_RIFF_STATE_INITIAL -GST_RIFF_STATE_HASAVIH -GST_RIFF_STATE_HASSTRH -GST_RIFF_STATE_HASSTRF -GST_RIFF_STATE_MOVI -MAKE_FOUR_CC -GST_RIFF_RIFF_WAVE -GST_RIFF_RIFF_AVI -GST_RIFF_TAG_RIFF -GST_RIFF_TAG_RIFX -GST_RIFF_TAG_LIST -GST_RIFF_TAG_avih -GST_RIFF_TAG_strd -GST_RIFF_TAG_strh -GST_RIFF_TAG_strf -GST_RIFF_TAG_vedt -GST_RIFF_TAG_JUNK -GST_RIFF_TAG_idx1 -GST_RIFF_TAG_fmt -GST_RIFF_TAG_data -GST_RIFF_LIST_movi -GST_RIFF_LIST_hdrl -GST_RIFF_LIST_strl -GST_RIFF_FCC_vids -GST_RIFF_FCC_auds -GST_RIFF_FCC_pads -GST_RIFF_FCC_txts -GST_RIFF_FCC_vidc -GST_RIFF_FCCH_RLE -GST_RIFF_FCCH_msvc -GST_RIFF_FCCH_MSVC -GST_RIFF_FF00 -GST_RIFF_00 -GST_RIFF_01 -GST_RIFF_02 -GST_RIFF_03 -GST_RIFF_04 -GST_RIFF_05 -GST_RIFF_06 -GST_RIFF_07 -GST_RIFF_00pc -GST_RIFF_01pc -GST_RIFF_00dc -GST_RIFF_00dx -GST_RIFF_00db -GST_RIFF_00xx -GST_RIFF_00id -GST_RIFF_00rt -GST_RIFF_0021 -GST_RIFF_00iv -GST_RIFF_0031 -GST_RIFF_0032 -GST_RIFF_00vc -GST_RIFF_00xm -GST_RIFF_01wb -GST_RIFF_01dc -GST_RIFF_cram -GST_RIFF_CRAM -GST_RIFF_wham -GST_RIFF_WHAM -GST_RIFF_rgb -GST_RIFF_RGB -GST_RIFF_rle8 -GST_RIFF_RLE8 -GST_RIFF_rle4 -GST_RIFF_RLE4 -GST_RIFF_none -GST_RIFF_NONE -GST_RIFF_pack -GST_RIFF_PACK -GST_RIFF_tran -GST_RIFF_TRAN -GST_RIFF_ccc -GST_RIFF_CCC -GST_RIFF_cyuv -GST_RIFF_CYUV -GST_RIFF_jpeg -GST_RIFF_JPEG -GST_RIFF_MJPG -GST_RIFF_mJPG -GST_RIFF_IJPG -GST_RIFF_rt21 -GST_RIFF_RT21 -GST_RIFF_iv31 -GST_RIFF_IV31 -GST_RIFF_iv32 -GST_RIFF_IV32 -GST_RIFF_iv41 -GST_RIFF_IV41 -GST_RIFF_iv50 -GST_RIFF_IV50 -GST_RIFF_cvid -GST_RIFF_CVID -GST_RIFF_ULTI -GST_RIFF_ulti -GST_RIFF_YUV9 -GST_RIFF_YVU9 -GST_RIFF_XMPG -GST_RIFF_xmpg -GST_RIFF_VDOW -GST_RIFF_MVI1 -GST_RIFF_v422 -GST_RIFF_V422 -GST_RIFF_mvi1 -GST_RIFF_MPIX -GST_RIFF_AURA -GST_RIFF_DMB1 -GST_RIFF_dmb1 -GST_RIFF_BW10 -GST_RIFF_bw10 -GST_RIFF_yuy2 -GST_RIFF_YUY2 -GST_RIFF_YUV8 -GST_RIFF_WINX -GST_RIFF_WPY2 -GST_RIFF_m263 -GST_RIFF_M263 -GST_RIFF_Q1_0 -GST_RIFF_SFMC -GST_RIFF_y41p -GST_RIFF_Y41P -GST_RIFF_yv12 -GST_RIFF_YV12 -GST_RIFF_vixl -GST_RIFF_VIXL -GST_RIFF_iyuv -GST_RIFF_IYUV -GST_RIFF_i420 -GST_RIFF_I420 -GST_RIFF_vyuy -GST_RIFF_VYUY -GST_RIFF_DIV3 -GST_RIFF_rpza -GST_RIFF_azpr -GST_RIFF_ISFT -GST_RIFF_IDIT -GST_RIFF_00AM -GST_RIFF_DISP -GST_RIFF_ISBJ -GST_RIFF_rec -gst_riff_avih -gst_riff_strh -gst_riff_strf_vids -gst_riff_strf_auds -gst_riff_riff -gst_riff_list -gst_riff_chunk -gst_riff_index_entry -GstRiff -GstRiffChunk -GstRiffCallback -gst_riff_parser_new -gst_riff_parser_next_buffer -gst_riff_parser_resync -gst_riff_encoder_new -gst_riff_encoder_avih -gst_riff_encoder_strh -gst_riff_encoder_strf -gst_riff_encoder_chunk -gst_riff_encoder_get_buffer -gst_riff_encoder_get_and_reset_buffer -gst_riff_fourcc_to_id -gst_riff_id_to_fourcc -
- -
-gstgetbits_inl -debug2 -debug -checklength2 -checklength -swab32 -gst_getbits_init -gst_getbits_newbuf -gst_getbits_bitoffset -gst_getbits_bufferpos -gst_getbits_bytesleft -gst_getbits_bitsleft -gst_getbits1 -gst_getbits2 -gst_getbitsX -gst_getbits3 -gst_getbits4 -gst_getbits5 -gst_getbits6 -gst_getbits7 -gst_getbits8 -gst_getbits9 -gst_getbits10 -gst_getbits11 -gst_getbits12 -gst_getbits13 -gst_getbits14 -gst_getbits15 -gst_getbits16 -gst_getbits17 -gst_getbits18 -gst_getbits19 -gst_getbits20 -gst_getbits21 -gst_getbits22 -gst_getbits32 -gst_getbitsn -gst_showbits32 -gst_showbitsX -gst_showbits1 -gst_showbits2 -gst_showbits3 -gst_showbits4 -gst_showbits5 -gst_showbits6 -gst_showbits7 -gst_showbits8 -gst_showbits9 -gst_showbits10 -gst_showbits11 -gst_showbits12 -gst_showbits13 -gst_showbits14 -gst_showbits15 -gst_showbits16 -gst_showbits17 -gst_showbits18 -gst_showbits19 -gst_showbits20 -gst_showbits21 -gst_showbits22 -gst_showbits23 -gst_showbits24 -gst_showbits25 -gst_showbits26 -gst_showbits27 -gst_showbits28 -gst_showbits29 -gst_showbits30 -gst_showbits31 -gst_showbitsn -gst_flushbits32 -gst_flushbitsn -gst_backbits24 -gst_backbitsn -
-
gstgetbits libs/getbits/gstgetbits.h @@ -349,17 +78,6 @@ swab32 DEBUG
-
-gstvideoscale -libs/videoscale/gstvideoscale.h -GstVideoScaleMethod -GstVideoScale -GstVideoScaleScaler -gst_videoscale_new -gst_videoscale_scale -gst_videoscale_destroy -
-
gstputbits libs/putbits/gstputbits.h @@ -397,25 +115,6 @@ gst_putbitsn gst_putbits
-
-externals -ext_unknown -
- -
-wineacm -MSACM_hHeap -MSACM_pFirstACMDriverID -MSACM_pLastACMDriverID -MSACM_RegisterDriver -MSACM_RegisterAllDrivers -MSACM_UnregisterDriver -MSACM_UnregisterAllDrivers -MSACM_GetDriverID -MSACM_GetDriver -MSACM_GetObj -
-
dct DCTSIZE @@ -447,3 +146,8 @@ gst_idct_convert_sparse gst_idct_destroy
+
+gstcontrol +libs/control/control.h +gst_control_init +
diff --git a/gst/autoplug/gstsearchfuncs.c b/gst/autoplug/gstsearchfuncs.c index 2308eae037..d47404d289 100644 --- a/gst/autoplug/gstsearchfuncs.c +++ b/gst/autoplug/gstsearchfuncs.c @@ -45,7 +45,7 @@ g_list_free_list_and_elements (GList *list) * * Checks if the given caps have a non-null intersection. * - * Return: TRUE, if both caps intersect. + * Returns: TRUE, if both caps intersect. */ gboolean gst_autoplug_caps_intersect (GstCaps *src, GstCaps *sink) @@ -75,7 +75,7 @@ gst_autoplug_caps_intersect (GstCaps *src, GstCaps *sink) * * Checks if a factory's sink can connect to the given caps * - * Return: TRUE, if a connection can be established. + * Returns: #GstPadTemplate that can connect to the given caps */ GstPadTemplate * gst_autoplug_can_connect_src (GstElementFactory *fac, GstCaps *src) @@ -100,11 +100,11 @@ gst_autoplug_can_connect_src (GstElementFactory *fac, GstCaps *src) /** * gst_autoplug_can_connect_sink: * @fac: factory to connect to - * @src: caps to check + * @sink: caps to check * * Checks if a factory's src can connect to the given caps * - * Return: TRUE, if a connection can be established. + * Returns: #GstPadTemplate that can connect to the given caps */ GstPadTemplate * gst_autoplug_can_connect_sink (GstElementFactory *fac, GstCaps *sink) diff --git a/gst/autoplug/gstsearchfuncs.h b/gst/autoplug/gstsearchfuncs.h index 187275fc24..7c73b9fe1d 100644 --- a/gst/autoplug/gstsearchfuncs.h +++ b/gst/autoplug/gstsearchfuncs.h @@ -59,6 +59,6 @@ GList * gst_autoplug_factories_filters_with_sink_caps(GList *factories); GList * gst_autoplug_factories_at_most_templates(GList *factories, GstPadDirection dir, guint maxtemplates); /* shortest path algorithm */ -GList * gst_autoplug_sp (GstCaps *src_caps, GstCaps *sink_caps, GList *factories); +GList * gst_autoplug_sp (GstCaps *srccaps, GstCaps *sinkcaps, GList *factories); #endif /* __GST_SEARCHFUNCS_H__ */ diff --git a/gst/elements/gstaggregator.h b/gst/elements/gstaggregator.h index 4dff593f7b..cd73803b37 100644 --- a/gst/elements/gstaggregator.h +++ b/gst/elements/gstaggregator.h @@ -33,7 +33,7 @@ extern GstElementDetails gst_aggregator_details; typedef enum { AGGREGATOR_LOOP = 1, AGGREGATOR_LOOP_SELECT, - AGGREGATOR_CHAIN, + AGGREGATOR_CHAIN } GstAggregatorSchedType; #define GST_TYPE_AGGREGATOR \ diff --git a/gst/elements/gstfilesink.h b/gst/elements/gstfilesink.h index 76ffb815ea..b9da6888c1 100644 --- a/gst/elements/gstfilesink.h +++ b/gst/elements/gstfilesink.h @@ -50,7 +50,7 @@ typedef struct _GstFileSinkClass GstFileSinkClass; typedef enum { GST_FILESINK_OPEN = GST_ELEMENT_FLAG_LAST, - GST_FILESINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, + GST_FILESINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2 } GstFileSinkFlags; struct _GstFileSink { diff --git a/gst/elements/gstfilesrc.h b/gst/elements/gstfilesrc.h index f40a1e05b8..25d27b0145 100644 --- a/gst/elements/gstfilesrc.h +++ b/gst/elements/gstfilesrc.h @@ -44,7 +44,7 @@ G_BEGIN_DECLS typedef enum { GST_FILESRC_OPEN = GST_ELEMENT_FLAG_LAST, - GST_FILESRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, + GST_FILESRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2 } GstFileSrcFlags; typedef struct _GstFileSrc GstFileSrc; diff --git a/gst/elements/gstmultidisksrc.h b/gst/elements/gstmultidisksrc.h index 3b1a9f49c1..eca04e155b 100644 --- a/gst/elements/gstmultidisksrc.h +++ b/gst/elements/gstmultidisksrc.h @@ -44,7 +44,7 @@ GstElementDetails gst_multidisksrc_details; typedef enum { GST_MULTIDISKSRC_OPEN = GST_ELEMENT_FLAG_LAST, - GST_MULTIDISKSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, + GST_MULTIDISKSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2 } GstMultiDiskSrcFlags; typedef struct _GstMultiDiskSrc GstMultiDiskSrc; diff --git a/gst/elements/gstmultifilesrc.h b/gst/elements/gstmultifilesrc.h index 3b1a9f49c1..eca04e155b 100644 --- a/gst/elements/gstmultifilesrc.h +++ b/gst/elements/gstmultifilesrc.h @@ -44,7 +44,7 @@ GstElementDetails gst_multidisksrc_details; typedef enum { GST_MULTIDISKSRC_OPEN = GST_ELEMENT_FLAG_LAST, - GST_MULTIDISKSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, + GST_MULTIDISKSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2 } GstMultiDiskSrcFlags; typedef struct _GstMultiDiskSrc GstMultiDiskSrc; diff --git a/gst/elements/gstpipefilter.h b/gst/elements/gstpipefilter.h index 6d5ea4cc2e..7699f4e28d 100644 --- a/gst/elements/gstpipefilter.h +++ b/gst/elements/gstpipefilter.h @@ -47,7 +47,7 @@ GstElementDetails gst_pipefilter_details; typedef enum { GST_PIPEFILTER_OPEN = GST_ELEMENT_FLAG_LAST, - GST_PIPEFILTER_FLAG_LAST = GST_ELEMENT_FLAG_LAST, + GST_PIPEFILTER_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2 } GstPipeFilterFlags; typedef struct _GstPipefilter GstPipefilter; diff --git a/gst/elements/gstshaper.h b/gst/elements/gstshaper.h index 8e8e6fe99d..40540b1767 100644 --- a/gst/elements/gstshaper.h +++ b/gst/elements/gstshaper.h @@ -46,7 +46,7 @@ GstElementDetails gst_shaper_details; typedef enum { SHAPER_POLICY_TIMESTAMPS = 1, - SHAPER_POLICY_BUFFERSIZE, + SHAPER_POLICY_BUFFERSIZE } GstShaperPolicyType; typedef struct _GstShaper GstShaper; diff --git a/gst/gstatomic.h b/gst/gstatomic.h index 03bf3b1141..c8355eafde 100644 --- a/gst/gstatomic.h +++ b/gst/gstatomic.h @@ -24,10 +24,12 @@ G_BEGIN_DECLS +typedef volatile gint gst_vgint; /* gtk-doc volatile workaround */ + typedef struct _GstAtomicInt GstAtomicInt; struct _GstAtomicInt { - volatile gint counter; + gst_vgint counter; GMutex *lock; /* for C fallback */ }; diff --git a/gst/gstclock.h b/gst/gstclock.h index f5f9d60cc6..d226bbd4e5 100644 --- a/gst/gstclock.h +++ b/gst/gstclock.h @@ -66,13 +66,13 @@ typedef enum { /* --- protected --- */ GST_CLOCK_ENTRY_OK, GST_CLOCK_ENTRY_EARLY, - GST_CLOCK_ENTRY_RESTART, + GST_CLOCK_ENTRY_RESTART } GstClockEntryStatus; typedef enum { /* --- protected --- */ GST_CLOCK_ENTRY_SINGLE, - GST_CLOCK_ENTRY_PERIODIC, + GST_CLOCK_ENTRY_PERIODIC } GstClockEntryType; #define GST_CLOCK_ENTRY(entry) ((GstClockEntry *)(entry)) @@ -109,7 +109,7 @@ typedef enum GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC = (1 << 3), GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC = (1 << 4), GST_CLOCK_FLAG_CAN_SET_RESOLUTION = (1 << 5), - GST_CLOCK_FLAG_CAN_SET_SPEED = (1 << 6), + GST_CLOCK_FLAG_CAN_SET_SPEED = (1 << 6) } GstClockFlags; #define GST_CLOCK_FLAGS(clock) (GST_CLOCK(clock)->flags) diff --git a/gst/gstindex.h b/gst/gstindex.h index 7d444da08c..8f423cc9d3 100644 --- a/gst/gstindex.h +++ b/gst/gstindex.h @@ -52,13 +52,13 @@ typedef enum { GST_INDEX_ENTRY_ID, GST_INDEX_ENTRY_ASSOCIATION, GST_INDEX_ENTRY_OBJECT, - GST_INDEX_ENTRY_FORMAT, + GST_INDEX_ENTRY_FORMAT } GstIndexEntryType; typedef enum { GST_INDEX_LOOKUP_EXACT, GST_INDEX_LOOKUP_BEFORE, - GST_INDEX_LOOKUP_AFTER, + GST_INDEX_LOOKUP_AFTER } GstIndexLookupMethod; #define GST_INDEX_NASSOCS(entry) ((entry)->data.assoc.nassocs) @@ -78,7 +78,7 @@ typedef enum { GST_ASSOCIATION_FLAG_KEY_UNIT = (1 << 0), /* new flags should start here */ - GST_ASSOCIATION_FLAG_LAST = (1 << 8), + GST_ASSOCIATION_FLAG_LAST = (1 << 8) } GstAssocFlags; #define GST_INDEX_FORMAT_FORMAT(entry) ((entry)->data.format.format) diff --git a/gst/gstpad.c b/gst/gstpad.c index 5f03c1f402..8b7dcc6146 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -2649,7 +2649,7 @@ gst_ghost_pad_init (GstGhostPad *pad) * * Creates a new ghost pad associated with the given pad, and names it with * the given name. If name is NULL, a guaranteed unique name (across all - * ghost pads) will be assigned (most likely of the form ghostpad&perc;d). + * ghost pads) will be assigned (most likely of the form ghostpad%d). * * Returns: a new ghost #GstPad, or NULL in case of an error. */ diff --git a/gst/gsttrashstack.h b/gst/gsttrashstack.h index b814dfcca2..b2914753bc 100644 --- a/gst/gsttrashstack.h +++ b/gst/gsttrashstack.h @@ -32,10 +32,13 @@ struct _GstTrashStackElement { GstTrashStackElement *next; }; +typedef volatile gpointer gst_vgpointer;/* gtk-doc volatile workaround */ +typedef volatile gulong gst_vgulong; /* gtk-doc volatile workaround */ + struct _GstTrashStack { - volatile gpointer head; - volatile gulong count; /* for the ABA problem */ - GMutex *lock; /* lock for C fallback */ + gst_vgpointer head; + gst_vgulong count; /* for the ABA problem */ + GMutex *lock; /* lock for C fallback */ }; GST_INLINE_FUNC GstTrashStack* gst_trash_stack_new (void); diff --git a/gst/registries/gstxmlregistry.h b/gst/registries/gstxmlregistry.h index d15e82dfb1..f54d95e6a8 100644 --- a/gst/registries/gstxmlregistry.h +++ b/gst/registries/gstxmlregistry.h @@ -53,12 +53,12 @@ typedef enum { GST_XML_REGISTRY_PADTEMPLATE, GST_XML_REGISTRY_CAPS, GST_XML_REGISTRY_CAPSCOMP, - GST_XML_REGISTRY_PROPERTIES, + GST_XML_REGISTRY_PROPERTIES } GstXMLRegistryState; typedef enum { GST_XML_REGISTRY_READ, - GST_XML_REGISTRY_WRITE, + GST_XML_REGISTRY_WRITE } GstXMLRegistryMode; typedef void (*GstXMLRegistryGetPerms) (GstXMLRegistry *registry); diff --git a/gst/schedulers/gthread-cothreads.h b/gst/schedulers/gthread-cothreads.h index e808ae4b98..19db21712e 100644 --- a/gst/schedulers/gthread-cothreads.h +++ b/gst/schedulers/gthread-cothreads.h @@ -26,7 +26,7 @@ #define COTHREADS_NAME "gthread" #define COTHREADS_NAME_CAPITAL "GThread" -/** +/* * Theory of operation: * Instead of using cothreads, GThreads and 1 mutex are used. * Every thread may only run if it holds the mutex. Otherwise it holds its own diff --git a/gstreamer.spec.in b/gstreamer.spec.in index 678dd385b6..fb12840a40 100644 --- a/gstreamer.spec.in +++ b/gstreamer.spec.in @@ -23,6 +23,8 @@ BuildRequires: libxml2-devel >= %_libxml2 BuildRequires: bison BuildRequires: flex BuildRequires: gtk-doc >= 0.7 +BuildRequires: libxslt +BuildRequires: ghostscript BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: popt > 1.6 @@ -113,10 +115,6 @@ fi %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -# adding devhelp stuff here for now, need to integrate better -# when devhelp allows it -mkdir -p $RPM_BUILD_ROOT/usr/share/devhelp/specs -cp $RPM_BUILD_DIR/%{name}-%{version}/docs/devhelp/*.devhelp $RPM_BUILD_ROOT/usr/share/devhelp/specs %makeinstall # Clean out files that should not be part of the rpm. @@ -134,12 +132,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la /sbin/ldconfig %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null -%post devel -# adding devhelp links to work around different base not working -mkdir -p %{_datadir}/devhelp/books -ln -sf %{_datadir}/gtk-doc/html/gstreamer %{_datadir}/devhelp/books -ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books - %postun /sbin/ldconfig @@ -212,56 +204,72 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books # then we catch the rest with *, you can safely ignore the errors from this ## gstreamer API %dir %{_datadir}/gtk-doc/html/%{name}-%{majorminor} -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/autopluggers.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/book1.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/element-types.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstautoplugfactory.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstautoplug.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstbin.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstclock.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstelement.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gst-index.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstobject.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstpad.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstpipeline.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstpluginfeature.html -# %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-cothreads.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstbuffer.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstbufferpool.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstcaps.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstcpu.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstdata.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstevent.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gst.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstinfo.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstparse.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstplugin.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstprops.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gststaticautoplug.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gststaticautoplugrender.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gsttype.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstutils.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/%{name}-%{majorminor}.devhelp +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-cothreads.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstatomic.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstmemchunk.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-support.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-Gst.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstAutoplug.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstAutoplugFactory.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstBin.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstBuffer.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstBufferPool.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstCaps.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstClock.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstCpu.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstData.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstElement.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstElementFactory.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstEvent.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstFormat.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstIndex.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstIndexFactory.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstInfo.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstObject.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstPad.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstPadTemplate.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstParse.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstPipeline.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstPlugin.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstPluginFeature.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstProbe.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstProps.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstquery.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstRegistry.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstScheduler.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstSchedulerFactory.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstSystemClock.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstThread.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstType.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstTypeFactory.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-GstUtils.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/GstXML.html %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstschedulerfactory.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstscheduler.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstthread.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gsttypefactory.html -%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstxml.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/element-types.html +%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/index.html %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/index.sgml ## gstreamer-libs API %dir %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor} -%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/book1.html -%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs-gstcolorspace.html +%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs-%{majorminor}.devhelp %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs-gstgetbits.html +%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs-gstputbits.html +%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs-gstidct.html +%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs-gstcontrol.html %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs.html +%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/index.html %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/index.sgml ## this catches all of the rest of the docs we might have forgotten %{_datadir}/gtk-doc/html/* -%{_datadir}/devhelp/specs/%{name}-%{majorminor}.devhelp -%{_datadir}/devhelp/specs/%{name}-libs-%{majorminor}.devhelp %changelog +* Sun May 18 2003 Thomas Vander Stichele +- adding ghostscript and libxlst BuildRequires: for xsltproc and fig2dev/gs + +* Sun May 18 2003 Thomas Vander Stichele +- reworked devhelp generation and changed spec to match + * Tue Jan 28 2003 Thomas Vander Stichele - added gstreamer-control.pc file diff --git a/plugins/elements/gstaggregator.h b/plugins/elements/gstaggregator.h index 4dff593f7b..cd73803b37 100644 --- a/plugins/elements/gstaggregator.h +++ b/plugins/elements/gstaggregator.h @@ -33,7 +33,7 @@ extern GstElementDetails gst_aggregator_details; typedef enum { AGGREGATOR_LOOP = 1, AGGREGATOR_LOOP_SELECT, - AGGREGATOR_CHAIN, + AGGREGATOR_CHAIN } GstAggregatorSchedType; #define GST_TYPE_AGGREGATOR \ diff --git a/plugins/elements/gstfilesink.h b/plugins/elements/gstfilesink.h index 76ffb815ea..b9da6888c1 100644 --- a/plugins/elements/gstfilesink.h +++ b/plugins/elements/gstfilesink.h @@ -50,7 +50,7 @@ typedef struct _GstFileSinkClass GstFileSinkClass; typedef enum { GST_FILESINK_OPEN = GST_ELEMENT_FLAG_LAST, - GST_FILESINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, + GST_FILESINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2 } GstFileSinkFlags; struct _GstFileSink { diff --git a/plugins/elements/gstfilesrc.h b/plugins/elements/gstfilesrc.h index f40a1e05b8..25d27b0145 100644 --- a/plugins/elements/gstfilesrc.h +++ b/plugins/elements/gstfilesrc.h @@ -44,7 +44,7 @@ G_BEGIN_DECLS typedef enum { GST_FILESRC_OPEN = GST_ELEMENT_FLAG_LAST, - GST_FILESRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, + GST_FILESRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2 } GstFileSrcFlags; typedef struct _GstFileSrc GstFileSrc; diff --git a/plugins/elements/gstmultidisksrc.h b/plugins/elements/gstmultidisksrc.h index 3b1a9f49c1..eca04e155b 100644 --- a/plugins/elements/gstmultidisksrc.h +++ b/plugins/elements/gstmultidisksrc.h @@ -44,7 +44,7 @@ GstElementDetails gst_multidisksrc_details; typedef enum { GST_MULTIDISKSRC_OPEN = GST_ELEMENT_FLAG_LAST, - GST_MULTIDISKSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, + GST_MULTIDISKSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2 } GstMultiDiskSrcFlags; typedef struct _GstMultiDiskSrc GstMultiDiskSrc; diff --git a/plugins/elements/gstmultifilesrc.h b/plugins/elements/gstmultifilesrc.h index 3b1a9f49c1..eca04e155b 100644 --- a/plugins/elements/gstmultifilesrc.h +++ b/plugins/elements/gstmultifilesrc.h @@ -44,7 +44,7 @@ GstElementDetails gst_multidisksrc_details; typedef enum { GST_MULTIDISKSRC_OPEN = GST_ELEMENT_FLAG_LAST, - GST_MULTIDISKSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, + GST_MULTIDISKSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2 } GstMultiDiskSrcFlags; typedef struct _GstMultiDiskSrc GstMultiDiskSrc; diff --git a/plugins/elements/gstpipefilter.h b/plugins/elements/gstpipefilter.h index 6d5ea4cc2e..7699f4e28d 100644 --- a/plugins/elements/gstpipefilter.h +++ b/plugins/elements/gstpipefilter.h @@ -47,7 +47,7 @@ GstElementDetails gst_pipefilter_details; typedef enum { GST_PIPEFILTER_OPEN = GST_ELEMENT_FLAG_LAST, - GST_PIPEFILTER_FLAG_LAST = GST_ELEMENT_FLAG_LAST, + GST_PIPEFILTER_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2 } GstPipeFilterFlags; typedef struct _GstPipefilter GstPipefilter; diff --git a/plugins/elements/gstshaper.h b/plugins/elements/gstshaper.h index 8e8e6fe99d..40540b1767 100644 --- a/plugins/elements/gstshaper.h +++ b/plugins/elements/gstshaper.h @@ -46,7 +46,7 @@ GstElementDetails gst_shaper_details; typedef enum { SHAPER_POLICY_TIMESTAMPS = 1, - SHAPER_POLICY_BUFFERSIZE, + SHAPER_POLICY_BUFFERSIZE } GstShaperPolicyType; typedef struct _GstShaper GstShaper;