diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-02-12 14:12:26 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-02-12 14:12:26 +0000 |
| commit | 4741f334d52124b9b95d3283fd8facba3266f0ba (patch) | |
| tree | 6f4a56ec0063287f19f346fd93a40455c27a5a19 | |
| parent | 8caba19f457506319839938c6c89332ff1a3dc5c (diff) | |
releasing 0.6.5RELEASE-0_6_5BRANCH-GSTREAMER-0_6
Original commit message from CVS:
releasing 0.6.5
33 files changed, 516 insertions, 562 deletions
diff --git a/ABOUT-NLS b/ABOUT-NLS deleted file mode 100644 index e69de29bb2..0000000000 --- a/ABOUT-NLS +++ /dev/null @@ -1,3 +1,27 @@ +=== gstreamer 0.6.5 === + +2004-02-12 Thomas Vander Stichele <thomas at apestaart dot org> + + * NEWS: GStreamer 0.6.5 "EOS" released + * Makefile.am: + * common/m4/gst-arch.m4: + integrate RH patch + * common/m4/gst-doc.m4: + * configure.ac: + * docs/Makefile.am: + * docs/faq/Makefile.am: + * docs/gst/Makefile.am: + * docs/libs/Makefile.am: + * docs/manual/Makefile.am: + * docs/manuals.mak: + * docs/pwg/Makefile.am: + update docs build + * docs/pwg/pwg.xml: + * gstreamer.spec.in: + update spec file + * tools/Makefile.am: + update tools installation + 2004-02-11 Thomas Vander Stichele <thomas at apestaart dot org> * tools/Makefile.am: diff --git a/Makefile.am b/Makefile.am index 7726cc15c7..38f7bc6f78 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ DIST_SUBDIRS = include libs gst tools tests testsuite examples docs pkgconfig EXTRA_DIST = gstreamer.spec.in gst-element-check.m4 \ configure.ac autogen.sh depcomp \ - REQUIREMENTS ABOUT-NLS RELEASE DOCBUILDING DEVEL \ + REQUIREMENTS DOCBUILDING DEVEL \ idiottest.mak common dist-hook: @@ -1,2 +1,41 @@ -2001-12-12 - * GStreamer 0.3.0 released, "Most Eventful Ever" + The GStreamer team is proud to announce a new release in the + ABI-stable 0.6.x series. + + This release is a service release, fixing some small outstanding + issues and using the same code for the unversioned binaries so that + parallel installability of the 0.6.x with future series is fixed. + +Features of this release + + * Provides versioned and unversioned binaries + * Documentation fixes + +Download + + You find source releases of gstreamer in the [13]gstreamer download + directory. + +GStreamer Homepage + + More details can be found on the project's website, + [14]http://gstreamer.net.local. + +Support and Bugs + + We use Gnome's bugzilla for [15]bug reports and feature requests. + +Developers + + CVS is hosted on cvs.freedesktop.org. You can [16]browse the gstreamer + repository. All code is in CVS and can be checked out from there. + Interested developers of the core library, plug-ins, and applications + should subscribe to the gstreamer-devel list. If there is sufficient + interest we will create more lists as necessary. + +References + + Visible links + 14. http://gstreamer.net/ + 15. http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer + 16. http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer//gstreamer/ + diff --git a/RELEASE b/RELEASE deleted file mode 100644 index ea1e93a18d..0000000000 --- a/RELEASE +++ /dev/null @@ -1,195 +0,0 @@ - - GStreamer "Moo" 0.6.4 released - - The GStreamer team is proud to announce a new version in the - ABI-stable 0.6.x series. - - At this point in time GStreamer is fully functional for creating - audio-based applications, as shown by applications such as - gnome-sound-recorder, [1]rhythmbox, [2]sound-juicer and - nautilus-media. - - The video part is known to be somewhat less functional than the audio - part, but applications such as [3]gst-player work very well. - - We will also be releasing a development 0.7 release series, in which - we will work on the remaining issues, such as the interactivity - support which is needed for DVD menus and SWF (Flash). This means - developers working on apps needing these services can use the 0.7 - series for development and then enable 0.6 support as these additions - optionally get backported to 0.6 once they are stable and work well. - - The GStreamer applications we ship all check for both gstreamer-0.6, - gstreamer-libs-0.6 and gstreamer-play-0.6; if those aren't found the - 0.7 version of those files are checked for. We suggest anyone making - GStreamer-based apps do the same. - - We are starting to have a really nice collection of applications under - development using GStreamer. If you are looking for something specific - check out our [4]applications status page. - -Features - - * Pipeline based media architecture - * Over 130 plugins - * All parts interchangeable - * Few dependencies, only glib, popt and libxml for core (libxml - optional) - * Python Language bindings - * Good documentation - * Widely deployed through bundling with GNOME 2.2/2.4 - * Design catering also for applications needing low-latency - * Highly portable, already running on most mainstream CPU's - * Modular design and use of 3rd party best of breed libraries means - no bloat - * LGPL licensing lays no restrictions on application developers - licensing. - * Easy for applications to ship their own plugins to the core as - needed - * Compiles with both GCC and Forte compilers - * Tested to run on Linux, FreeBSD and Solaris - -Updates since 0.6.4 - - * gstreamer (core) - + #119456: [5][PATCH] assertion `GST_IS_SCHEDULER (sched)' - failed - + #90471: [6][0.6.x/patch] Autoplug functions only available - with varargs - + #114252: [7][PATCH] opt scheduler: implement unlinking pads - in different - + #115005: [8][PATCH] Fails to compile on OpenBSD - + #119155: [9]rhythmbox head fails to play a second song in the - playlist. - + #119770: [10]FreeBSD names libtool 1.4 libtool14 - + #120345: [11][PATCH] backport of --gst-disable-cpu-opt - + #120785: [12][PATCH] bison and yacc generated files aren't - disted - + #120960: [13]Failed to compile gstreamer 0.6.3 with gcc 3.3.1 - + #121311: [14][PATCH] Compilation Error - + #122272: [15][PATCH] [0.6.4] GST_CAPS_IS_FIXED is broken, as - well as prop - + #123137: [16][PATCH] Compilation fails when size_t is not an - unsigned int - + #123518: [17][PATCH] opt shouldn't add groups to run queue if - they're alr - + #123542: [18]inactive pads should be able to push a buffer if - their peer - + #124124: [19]docbook docs don't build properly - + #122059: [20]gst-md5sink needs a way to handle threads - + #123417: [21][PATCH] fix popt default scheduler description - + #123517: [22]more opt scheduler debug info - * gst-plugins - + #116077: [23][PATCH] sinesrc has problems in waveform - + #121165: [24]Compilation errors due to invalid -Wall option - + #121174: [25]Compiler error in gst-libs/gst/riff/riffutil.c - #define and v - + #121175: [26]Compiler error in - gst-libs/gst/media-info/media-info.c with - + #121184: [27][PATCH] ffmpeg requires gcc on x86 (at least) - + #121872: [28]gst-plugins fails to compile against - libmpeg2-0.3.2_pre20030 - + #122458: [29]Adding a visualisation video size signal to - libgstplay - + #122481: [30][PATCH] wavenc is somehow broken - + #123306: [31]Add error messages to cdparanoia plugin - + #123896: [32]xvideosink does too little parameter checking - and uses wrong - + #123939: [33]libgstplay : small fixes - + #123946: [34][PATCH] mpeg2dec-0.3.2-cvs run failure - + #121143: [35][PATCH] FLAC files with id3 tags fail to play - (can't find me - + #122031: [36]mpeg2dec plugin breaks against 0.3.2 cvs - + #123516: [37]adder unrefs the bufferpool wrongly - -GStreamer Homepage - - More details on these features can be found on the project's website, - [38]http://gstreamer.net/. - -Support and Bugs - - We use [39]Gnome's Bugzilla for bug reports and feature requests. The - "product name" is GStreamer (capital G). Please do the following - before writing a bug report : -gst-feedback &> feedback 2>&1 - - and attach the file "feedback" to your bug report, so that we have - some information useful in the debugging process. - -Developers - - GStreamer is [40]hosted on SourceForge. All code is in CVS and can be - checked out from there. Interested developers of the core library, - plug-ins, and applications should subscribe to the gstreamer-devel - list. If there is sufficient interest we will create more lists as - necessary. - - We are still looking for people with access to FreeBSD, Solaris, - HP-UX, Irix and True64 that would be willing to try building and - testing GStreamer. Patches fixing such problems are also more than - welcome. - -Contributors to this release - - Patches to the core of GStreamer - - * Brett Kosinski - * David Schleef - * Thomas Vander Stichele - * Jerry Talkington - - Plugins and Sample Applications - - * Damien Carbery - * Ronald Bultje - * Julien Moutte - * Jérémy Simon - * Ross Burton - - Misc - - * Christian Fredrik Kalager Schaller - -References - - 1. http://www.rhythmbox.org/ - 2. http://mail.gnome.org/archives/gnome-announce-list/2003-April/msg00046.html - 3. http://gstreamer.net/releases/gst-player/0.5.0/ - 4. http://www.gstreamer.net/status/?category=2 - 5. http://bugzilla.gnome.org/show_bug.cgi?id=119456 - 6. http://bugzilla.gnome.org/show_bug.cgi?id=90471 - 7. http://bugzilla.gnome.org/show_bug.cgi?id=114252 - 8. http://bugzilla.gnome.org/show_bug.cgi?id=115005 - 9. http://bugzilla.gnome.org/show_bug.cgi?id=119155 - 10. http://bugzilla.gnome.org/show_bug.cgi?id=119770 - 11. http://bugzilla.gnome.org/show_bug.cgi?id=120345 - 12. http://bugzilla.gnome.org/show_bug.cgi?id=120785 - 13. http://bugzilla.gnome.org/show_bug.cgi?id=120960 - 14. http://bugzilla.gnome.org/show_bug.cgi?id=121311 - 15. http://bugzilla.gnome.org/show_bug.cgi?id=122272 - 16. http://bugzilla.gnome.org/show_bug.cgi?id=123137 - 17. http://bugzilla.gnome.org/show_bug.cgi?id=123518 - 18. http://bugzilla.gnome.org/show_bug.cgi?id=123542 - 19. http://bugzilla.gnome.org/show_bug.cgi?id=124124 - 20. http://bugzilla.gnome.org/show_bug.cgi?id=122059 - 21. http://bugzilla.gnome.org/show_bug.cgi?id=123417 - 22. http://bugzilla.gnome.org/show_bug.cgi?id=123517 - 23. http://bugzilla.gnome.org/show_bug.cgi?id=116077 - 24. http://bugzilla.gnome.org/show_bug.cgi?id=121165 - 25. http://bugzilla.gnome.org/show_bug.cgi?id=121174 - 26. http://bugzilla.gnome.org/show_bug.cgi?id=121175 - 27. http://bugzilla.gnome.org/show_bug.cgi?id=121184 - 28. http://bugzilla.gnome.org/show_bug.cgi?id=121872 - 29. http://bugzilla.gnome.org/show_bug.cgi?id=122458 - 30. http://bugzilla.gnome.org/show_bug.cgi?id=122481 - 31. http://bugzilla.gnome.org/show_bug.cgi?id=123306 - 32. http://bugzilla.gnome.org/show_bug.cgi?id=123896 - 33. http://bugzilla.gnome.org/show_bug.cgi?id=123939 - 34. http://bugzilla.gnome.org/show_bug.cgi?id=123946 - 35. http://bugzilla.gnome.org/show_bug.cgi?id=121143 - 36. http://bugzilla.gnome.org/show_bug.cgi?id=122031 - 37. http://bugzilla.gnome.org/show_bug.cgi?id=123516 - 38. http://gstreamer.net/ - 39. http://bugzilla.gnome.org/ - 40. http://gstreamer.sf.net/ diff --git a/common b/common -Subproject b5c08bab6ea94411e1a6fa124546f374d15582a +Subproject 59d3c4334b32261908261a163b4633532293492 diff --git a/configure.ac b/configure.ac index cf5169488a..9a781de74d 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_CANONICAL_TARGET([]) dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AS_VERSION(gstreamer, GST_VERSION, 0, 6, 4, 1, GST_CVS="no", GST_CVS="yes") +AS_VERSION(gstreamer, GST_VERSION, 0, 6, 5, 0, GST_CVS="no", GST_CVS="yes") dnl AM_MAINTAINER_MODE only provides the option to configure to enable it AM_MAINTAINER_MODE @@ -548,6 +548,7 @@ docs/manual/Makefile docs/pwg/Makefile docs/plugins/Makefile docs/plugins/gstreamer-plugins.types +docs/version.entities docs/xsl/Makefile pkgconfig/Makefile pkgconfig/gstreamer.pc diff --git a/docs/Makefile.am b/docs/Makefile.am index 2ae9666542..cf9cfc4aa0 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -5,10 +5,23 @@ else SUBDIRS_PLUGINS = endif -SUBDIRS = faq manual pwg gst libs $(SUBDIRS_PLUGINS) -DIST_SUBDIRS = faq manual pwg gst libs plugins xsl +# FIXME: separate this out into docbook and gtk-doc so it doesn't descend +# for docs it can't build +if BUILD_DOCS +SUBDIRS_DOCS = faq manual pwg gst libs +else +SUBDIRS_DOCS = +endif + +SUBDIRS = $(SUBDIRS_DOCS) $(SUBDIRS_PLUGINS) +DIST_SUBDIRS = gst faq manual pwg libs plugins xsl + +EXTRA_DIST = \ + slides manuals.mak htmlinstall.mak upload.mak \ + image-png image-pdf image-eps version.entities.in -EXTRA_DIST = slides manuals.mak htmlinstall.mak image-png image-pdf image-eps +upload: + @if test "x$(SUBDIRS_DOCS)" != x; then for a in $(SUBDIRS_DOCS); do cd $$a; make upload; cd ..; done; fi dist-hook: $(RM) -rf $(distdir)/random/CVS diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am index bb22e1991f..57e085c731 100644 --- a/docs/faq/Makefile.am +++ b/docs/faq/Makefile.am @@ -2,6 +2,8 @@ # base name of doc DOC = faq +# formats defined for upload.mak +FORMATS=html ps pdf # main xml file MAIN = $(DOC).xml @@ -18,6 +20,8 @@ FIG_SRC = $(notdir $(wildcard $(srcdir)/*.fig)) # get the generic docbuilding Makefile stuff include $(srcdir)/../manuals.mak +# get the generic upload target +include $(srcdir)/../upload.mak ### this is standard automake stuff diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am index bc53b5222d..6fed99b421 100644 --- a/docs/gst/Makefile.am +++ b/docs/gst/Makefile.am @@ -4,6 +4,12 @@ # DOC_MODULE=gstreamer-@GST_MAJORMINOR@ DOC_MODULE=gstreamer +# for upload.mak +DOC=gstreamer +FORMATS=html +html: html-build.stamp +sinclude $(srcdir)/../upload.mak + # generated basefiles #basefiles = \ # gstreamer-@GST_MAJORMINOR@.types \ @@ -71,7 +77,7 @@ 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_CFLAGS = $(GST_CFLAGS) -I$(top_builddir) GTKDOC_LIBS = $(GST_LIBS) $(SCANOBJ_DEPS) GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) @@ -113,6 +119,7 @@ DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ + $(DOC_MODULE)-scan.o \ $(DOC_MODULE).signals if HAVE_GTK_DOC @@ -125,15 +132,17 @@ all-local: html-build.stamp 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) ; \ + if test x"$(srcdir)" != x. ; then \ + cp $(srcdir)/$(DOC_MODULE).types . ; \ + fi ; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" $(GTK_DOC_SCANOBJ) --module=$(DOC_MODULE) ; \ 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) + 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 @@ -143,7 +152,11 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp 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) + if test x"$(srcdir)" != x. ; then \ + cp $(srcdir)/$(DOC_MODULE)-decl.txt . ; \ + cp $(srcdir)/$(DOC_MODULE)-sections.txt . ; \ + fi + gtkdoc-mktmpl --module=$(DOC_MODULE) touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @@ -153,7 +166,6 @@ tmpl.stamp: tmpl-build.stamp 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 @@ -167,11 +179,12 @@ sgml.stamp: sgml-build.stamp # 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 ) + test -d html || mkdir html + cd html && gtkdoc-mkhtml $(DOC_MODULE) $(srcdir)/../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || for i in "" $(HTML_IMAGES) ; do \ + if test "$$i" != ""; then cp $(srcdir)/$$i html ; fi; done @echo '-- Fixing Crossreferences' - cd $(srcdir) && LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp endif @@ -180,34 +193,82 @@ clean-local: rm -rf xml html maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt +# company: don't delete .sgml and -sections.txt as they're in CVS # 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 -rf $(DOC_MODULE)-decl.txt + rm -rf $(DOC_MODULE)-undocumented.txt + rm -rf $(DOC_MODULE)-unused.txt + rm -rf tmpl/*.sgml.bak rm -f $(DOC_MODULE).hierarchy rm -f *.stamp || true + if test x"$(srcdir)" != x. ; then \ + rm -f $(DOC_MODULE)-docs.sgml ; \ + rm -f $(DOC_MODULE).types ; \ + rm -f $(DOC_MODULE).interfaces ; \ + rm -f $(DOC_MODULE).prerequisites ; \ + rm -f $(DOC_MODULE)-sections.txt ; \ + rm -rf tmpl/*.sgml ; \ + fi + rm -rf *.o # thomas: make docs parallel installable; devhelp requires majorminor too +if DOC_HTML install-data-local: - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) - (installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \ - if test "$$installfiles" = '$(srcdir)/html/*.html'; \ + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) + (installfiles=`echo ./html/*.html`; \ + if test "$$installfiles" = './html/*.html'; \ then echo '-- Nothing to install' ; \ else \ for i in $$installfiles; do \ echo '-- Installing '$$i ; \ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ done; \ + pngfiles=`echo ./html/*.png`; \ + if test "$$pngfiles" != './html/*.png'; then \ + for i in $$pngfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + fi; \ 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) + fi) +uninstall-local: + (installfiles=`echo ./html/*.html`; \ + if test "$$installfiles" = './html/*.html'; \ + then echo '-- Nothing to uninstall' ; \ + else \ + for i in $$installfiles; do \ + rmfile=`basename $$i` ; \ + echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \ + rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \ + done; \ + pngfiles=`echo ./html/*.png`; \ + if test "$$pngfiles" != './html/*.png'; then \ + for i in $$pngfiles; do \ + rmfile=`basename $$i` ; \ + echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \ + rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \ + done; \ + fi; \ + echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \ + rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \ + echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \ + rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \ + fi) + if test -d $(DESTDIR)$(TARGET_DIR); then rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR); fi +else +install-data-local: +uninstall-local: +endif # # Require gtk-doc when making dist @@ -225,15 +286,13 @@ dist-hook: dist-check-gtkdoc dist-hook-local mkdir $(distdir)/xml mkdir $(distdir)/html -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml + -cp $(srcdir)/sgml/*.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 ; \ + for i in "" $$images ; do \ + if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \ done .PHONY : dist-hook-local diff --git a/docs/gst/tmpl/cothreads.sgml b/docs/gst/tmpl/cothreads.sgml index c69db192ee..0729d8031f 100644 --- a/docs/gst/tmpl/cothreads.sgml +++ b/docs/gst/tmpl/cothreads.sgml @@ -38,12 +38,6 @@ The cothread state structure @stack_size: @magic_number: -<!-- ##### STRUCT cothread_context ##### --> -<para> -The cothread context structure -</para> - - <!-- ##### USER_FUNCTION cothread_func ##### --> <para> the function that will be called when the cothread starts. The function @@ -56,6 +50,16 @@ it. @Returns: a return code +<!-- ##### STRUCT cothread_context ##### --> +<para> +The cothread context structure +</para> + +@cothreads: +@main: +@current: +@mutex: + <!-- ##### MACRO COTHREAD_STARTED ##### --> <para> Indicates the cothread is started. diff --git a/docs/gst/tmpl/gstatomic.sgml b/docs/gst/tmpl/gstatomic.sgml index 79380e6a99..502e939ae7 100644 --- a/docs/gst/tmpl/gstatomic.sgml +++ b/docs/gst/tmpl/gstatomic.sgml @@ -25,6 +25,7 @@ A structure that contains an integer that can be modified atomically. </para> +@counter: @lock: <!-- ##### FUNCTION gst_atomic_int_init ##### --> diff --git a/docs/gst/tmpl/gstbin.sgml b/docs/gst/tmpl/gstbin.sgml index b6eda534c4..de4b945884 100644 --- a/docs/gst/tmpl/gstbin.sgml +++ b/docs/gst/tmpl/gstbin.sgml @@ -91,14 +91,6 @@ gst_bin_set_pre_iterate_function() and gst_bin_set_post_iterate_function(). @Returns: -<!-- ##### MACRO gst_bin_destroy ##### --> -<para> -Free the memory allocated by this bin -</para> - -@bin: the bin to free - - <!-- ##### FUNCTION gst_bin_add ##### --> <para> diff --git a/docs/gst/tmpl/gstbuffer.sgml b/docs/gst/tmpl/gstbuffer.sgml index 1fa1bb74b3..7e4d8d1d03 100644 --- a/docs/gst/tmpl/gstbuffer.sgml +++ b/docs/gst/tmpl/gstbuffer.sgml @@ -347,15 +347,6 @@ Copies the given buffer using the copy function of the parent GstData structure. @Returns: a new #GstBuffer copy of the buffer. -<!-- ##### MACRO gst_buffer_needs_copy_on_write ##### --> -<para> -Queries if a copy needs to be ade of the buffer in order to safely write -to its data. -</para> - -@buf: The buffer to query. - - <!-- ##### MACRO gst_buffer_copy_on_write ##### --> <para> This function returns a buffer that is safe to write to. diff --git a/docs/gst/tmpl/gstbufferpool.sgml b/docs/gst/tmpl/gstbufferpool.sgml index f3c37801d7..e6a830d291 100644 --- a/docs/gst/tmpl/gstbufferpool.sgml +++ b/docs/gst/tmpl/gstbufferpool.sgml @@ -238,12 +238,3 @@ Free the given pool. This is dangerous, use gst_buffer_pool_unref() instead. @pool: -<!-- ##### MACRO gst_buffer_pool_needs_copy_on_write ##### --> -<para> -Checks if a copy needs to be made of the bufferpool before it can -safely be modified. -</para> - -@pool: The pool to query - - diff --git a/docs/gst/tmpl/gstcaps.sgml b/docs/gst/tmpl/gstcaps.sgml index 407b6adeac..4c9c471e39 100644 --- a/docs/gst/tmpl/gstcaps.sgml +++ b/docs/gst/tmpl/gstcaps.sgml @@ -169,8 +169,8 @@ The gstcaps structure @name: the name of the capability, for the application @id: the typeid of the capability +@flags: @refcount: a refcounter for this caps structure -@fixed: a boolean indicating that this caps structure is fixed @properties: the properties of the capability @next: a pointer to the next caps. diff --git a/docs/gst/tmpl/gstdata.sgml b/docs/gst/tmpl/gstdata.sgml index a2570a2626..16aced475e 100644 --- a/docs/gst/tmpl/gstdata.sgml +++ b/docs/gst/tmpl/gstdata.sgml @@ -113,14 +113,6 @@ Various flags that can be set on a GstData @GST_DATA_READONLY: The data is readonly @GST_DATA_FLAG_LAST: Subclasses can add additional flags starting from this offset -<!-- ##### MACRO GST_DATA_IS_READONLY ##### --> -<para> -Query if the GstData is READONLY -</para> - -@data: The data to query - - <!-- ##### MACRO GST_DATA_REFCOUNT ##### --> <para> Get access to the refcount field of the GstData @@ -191,15 +183,6 @@ Get access to the free function of the data @Returns: -<!-- ##### FUNCTION gst_data_needs_copy_on_write ##### --> -<para> - -</para> - -@data: -@Returns: - - <!-- ##### FUNCTION gst_data_copy_on_write ##### --> <para> diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml index c4b90ee71b..9ac83195c4 100644 --- a/docs/gst/tmpl/gstelement.sgml +++ b/docs/gst/tmpl/gstelement.sgml @@ -71,16 +71,6 @@ The element object </para> -<!-- ##### MACRO gst_element_destroy ##### --> -<para> -Destroys the element (without taking the refcount into account). -An application programmer should use #gst_object_unref instead to dispose -of an element he doesn't need anymore. -</para> - -@element: a #GstElement to destroy - - <!-- ##### MACRO gst_element_get_name ##### --> <para> Gets the name of the element. diff --git a/docs/gst/tmpl/gstobject.sgml b/docs/gst/tmpl/gstobject.sgml index a701b6fdc2..2f24ca4882 100644 --- a/docs/gst/tmpl/gstobject.sgml +++ b/docs/gst/tmpl/gstobject.sgml @@ -220,14 +220,6 @@ Check if the object has been destroyed. @object: the object -<!-- ##### FUNCTION gst_object_destroy ##### --> -<para> - -</para> - -@object: the object - - <!-- ##### FUNCTION gst_object_save_thyself ##### --> <para> diff --git a/docs/gst/tmpl/gstpad.sgml b/docs/gst/tmpl/gstpad.sgml index a376fbe751..a557ac6c82 100644 --- a/docs/gst/tmpl/gstpad.sgml +++ b/docs/gst/tmpl/gstpad.sgml @@ -409,14 +409,6 @@ Flags for the pad. @Returns: -<!-- ##### MACRO gst_pad_destroy ##### --> -<para> -Destroy the pad. -</para> - -@pad: the pad to destroy - - <!-- ##### FUNCTION gst_pad_new_from_template ##### --> <para> @@ -1076,6 +1068,7 @@ The realpad object @getcapsfunc: @direction: @linkfunc: +@unlinkfunc: @peer: @sched_private: @chainfunc: diff --git a/docs/gst/tmpl/gstpadtemplate.sgml b/docs/gst/tmpl/gstpadtemplate.sgml index ad690b3316..f49076538b 100644 --- a/docs/gst/tmpl/gstpadtemplate.sgml +++ b/docs/gst/tmpl/gstpadtemplate.sgml @@ -151,14 +151,6 @@ Get the padtemplate of the factory created with GST_PAD_TEMPLATE_FACTORY() @fact: the factory name to get the padtemplate from. -<!-- ##### MACRO GST_PAD_TEMPLATE_FIXED ##### --> -<para> -Get the flag indicating the properties are fixed from the template. -</para> - -@templ: the template to query - - <!-- ##### MACRO GST_PAD_TEMPLATE_IS_FIXED ##### --> <para> Check if the properties of the padtemplate are fixed diff --git a/docs/gst/tmpl/gstpipeline.sgml b/docs/gst/tmpl/gstpipeline.sgml index a07b2dafe2..ce9c33cc36 100644 --- a/docs/gst/tmpl/gstpipeline.sgml +++ b/docs/gst/tmpl/gstpipeline.sgml @@ -36,11 +36,3 @@ The pipeline object @Returns: -<!-- ##### MACRO gst_pipeline_destroy ##### --> -<para> -Destroys the pipeline. -</para> - -@pipeline: #GstPipeline to destroy - - diff --git a/docs/gst/tmpl/gstprops.sgml b/docs/gst/tmpl/gstprops.sgml index 4358f3aa6e..1d6eab6b77 100644 --- a/docs/gst/tmpl/gstprops.sgml +++ b/docs/gst/tmpl/gstprops.sgml @@ -21,7 +21,7 @@ The props structure </para> @refcount: a refcount for this struct -@fixed: indicates that this props has no lists or ranges +@flags: @properties: the properties <!-- ##### ENUM GstPropsType ##### --> @@ -251,6 +251,7 @@ An entry hols one key/value pair. </para> @props: +@Returns: <!-- ##### FUNCTION gst_props_unref ##### --> @@ -259,6 +260,7 @@ An entry hols one key/value pair. </para> @props: +@Returns: <!-- ##### FUNCTION gst_props_check_compatibility ##### --> @@ -323,16 +325,6 @@ An entry hols one key/value pair. @Returns: -<!-- ##### FUNCTION gst_props_has_property ##### --> -<para> - -</para> - -@props: -@name: -@Returns: - - <!-- ##### FUNCTION gst_props_has_fixed_property ##### --> <para> @@ -430,6 +422,15 @@ An entry hols one key/value pair. @Returns: +<!-- ##### FUNCTION gst_props_entry_get_type ##### --> +<para> + +</para> + +@entry: +@Returns: + + <!-- ##### FUNCTION gst_props_entry_get_boolean ##### --> <para> diff --git a/docs/gst/tmpl/gstreamer-unused.sgml b/docs/gst/tmpl/gstreamer-unused.sgml index e58938bbb1..46626c8fd7 100644 --- a/docs/gst/tmpl/gstreamer-unused.sgml +++ b/docs/gst/tmpl/gstreamer-unused.sgml @@ -1783,6 +1783,13 @@ A flag indicating that SSE instructions are supported. </para> +<!-- ##### MACRO GST_DATA_IS_READONLY ##### --> +<para> +Query if the GstData is READONLY +</para> + +@data: The data to query + <!-- ##### MACRO GST_DATA_REFCOUNT_READ ##### --> <para> Read the current refcount value into the specified value @@ -2729,6 +2736,13 @@ Is this pad linked. @klass: +<!-- ##### MACRO GST_PAD_TEMPLATE_FIXED ##### --> +<para> +Get the flag indicating the properties are fixed from the template. +</para> + +@templ: the template to query + <!-- ##### MACRO GST_PIPELINE ##### --> <para> @@ -7214,6 +7228,13 @@ must be defined to activate the tracing functionality. @bin: +<!-- ##### MACRO gst_bin_destroy ##### --> +<para> +Free the memory allocated by this bin +</para> + +@bin: the bin to free + <!-- ##### VARIABLE gst_bin_details ##### --> <para> @@ -7323,6 +7344,14 @@ must be defined to activate the tracing functionality. @buffer: @Returns: +<!-- ##### MACRO gst_buffer_needs_copy_on_write ##### --> +<para> +Queries if a copy needs to be ade of the buffer in order to safely write +to its data. +</para> + +@buf: The buffer to query. + <!-- ##### FUNCTION gst_buffer_pool_destroy ##### --> <para> @@ -7338,6 +7367,14 @@ must be defined to activate the tracing functionality. @pool: @buffer: +<!-- ##### MACRO gst_buffer_pool_needs_copy_on_write ##### --> +<para> +Checks if a copy needs to be made of the bufferpool before it can +safely be modified. +</para> + +@pool: The pool to query + <!-- ##### FUNCTION gst_buffer_pool_new_buffer ##### --> <para> @@ -7840,6 +7877,14 @@ must be defined to activate the tracing functionality. @Returns: +<!-- ##### FUNCTION gst_data_needs_copy_on_write ##### --> +<para> + +</para> + +@data: +@Returns: + <!-- ##### FUNCTION gst_debug_print_stack_trace ##### --> <para> @@ -7871,6 +7916,15 @@ must be defined to activate the tracing functionality. @first_name: @Varargs: +<!-- ##### MACRO gst_element_destroy ##### --> +<para> +Destroys the element (without taking the refcount into account). +An application programmer should use #gst_object_unref instead to dispose +of an element he doesn't need anymore. +</para> + +@element: a #GstElement to destroy + <!-- ##### FUNCTION gst_element_factory_add_sink ##### --> <para> @@ -8578,6 +8632,13 @@ Create new meta data. @meta: +<!-- ##### FUNCTION gst_object_destroy ##### --> +<para> + +</para> + +@object: the object + <!-- ##### FUNCTION gst_object_flags_get_type ##### --> <para> @@ -8607,6 +8668,13 @@ Create new meta data. @pad: @parent: +<!-- ##### MACRO gst_pad_destroy ##### --> +<para> +Destroy the pad. +</para> + +@pad: the pad to destroy + <!-- ##### FUNCTION gst_pad_direction_get_type ##### --> <para> @@ -8959,6 +9027,13 @@ Call the EOS function of the pad @Returns: +<!-- ##### MACRO gst_pipeline_destroy ##### --> +<para> +Destroys the pipeline. +</para> + +@pipeline: #GstPipeline to destroy + <!-- ##### VARIABLE gst_pipeline_details ##### --> <para> @@ -9363,6 +9438,13 @@ Call the EOS function of the pad @sched: +<!-- ##### MACRO gst_scheduler_destroy ##### --> +<para> +Destroy the scheduler +</para> + +@sched: The scheduler to destroy. + <!-- ##### FUNCTION gst_scheduler_disable_element ##### --> <para> diff --git a/docs/gst/tmpl/gstscheduler.sgml b/docs/gst/tmpl/gstscheduler.sgml index dad4afb33d..bbcc721065 100644 --- a/docs/gst/tmpl/gstscheduler.sgml +++ b/docs/gst/tmpl/gstscheduler.sgml @@ -49,14 +49,6 @@ Flags for the scheduler @GST_SCHEDULER_FLAG_LAST: subclasses can start numbering their flags starting from here. -<!-- ##### MACRO gst_scheduler_destroy ##### --> -<para> -Destroy the scheduler -</para> - -@sched: The scheduler to destroy. - - <!-- ##### FUNCTION gst_scheduler_setup ##### --> <para> diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml index 08450b21b9..32d00bc1f9 100644 --- a/docs/gst/tmpl/gstxml.sgml +++ b/docs/gst/tmpl/gstxml.sgml @@ -110,10 +110,6 @@ All GstElements can be serialized to an XML presentation and subsequently loaded </para> -@: -@: -@: - @gstxml: the object which received the signal. @arg1: @arg2: @@ -123,7 +119,7 @@ All GstElements can be serialized to an XML presentation and subsequently loaded </para> -@gstxml: the object which received the signal. -@arg1: -@arg2: +@: +@: +@: diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 059c00d2c4..62e570087e 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -4,6 +4,12 @@ #DOC_MODULE=gstreamer-libs-@GST_MAJORMINOR@ DOC_MODULE=gstreamer-libs +# for upload.mak +DOC=gstreamer-libs +FORMATS=html +html: html-build.stamp +sinclude $(srcdir)/../upload.mak + # generated basefiles #basefiles = \ ## $(DOC_MODULE).types \ @@ -72,7 +78,7 @@ 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_CFLAGS = $(GST_CFLAGS) -I$(top_builddir) GTKDOC_LIBS = $(GST_LIBS) $(SCANOBJ_DEPS) GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) @@ -126,14 +132,17 @@ 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) ; \ + if test x"$(srcdir)" != x. ; then \ + cp $(srcdir)/$(DOC_MODULE).types . ; \ + fi ; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" $(GTK_DOC_SCANOBJ) --module=$(DOC_MODULE) ; \ 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) + 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 @@ -143,7 +152,11 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp 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) + if test x"$(srcdir)" != x. ; then \ + cp $(srcdir)/$(DOC_MODULE)-decl.txt . ; \ + cp $(srcdir)/$(DOC_MODULE)-sections.txt . ; \ + fi + gtkdoc-mktmpl --module=$(DOC_MODULE) touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @@ -153,7 +166,6 @@ tmpl.stamp: tmpl-build.stamp 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 @@ -167,11 +179,12 @@ sgml.stamp: sgml-build.stamp # 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 ) + test -d html || mkdir html + cd html && gtkdoc-mkhtml $(DOC_MODULE) $(srcdir)/../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || for i in "" $(HTML_IMAGES) ; do \ + if test "$$i" != ""; then cp $(srcdir)/$$i html ; fi; done @echo '-- Fixing Crossreferences' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp endif @@ -186,27 +199,75 @@ maintainer-clean-local: clean # make distcheck work distclean-local: clean rm -rf $(DOC_MODULE)-decl-list.txt - rm -rf $(DOC_MODULE)-*.txt - rm -rf tmpl/*.sgml + rm -rf $(DOC_MODULE)-decl.txt + rm -rf $(DOC_MODULE)-undocumented.txt + rm -rf $(DOC_MODULE)-unused.txt + rm -rf tmpl/*.sgml.bak rm -f $(DOC_MODULE).hierarchy rm -f *.stamp || true + if test x"$(srcdir)" != x. ; then \ + rm -f $(DOC_MODULE)-docs.sgml ; \ + rm -f $(DOC_MODULE).types ; \ + rm -f $(DOC_MODULE).interfaces ; \ + rm -f $(DOC_MODULE).prerequisites ; \ + rm -f $(DOC_MODULE)-sections.txt ; \ + rm -rf tmpl/*.sgml ; \ + fi + rm -f *.o + +if DOC_HTML install-data-local: - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) - (installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \ - if test "$$installfiles" = '$(srcdir)/html/*.html'; \ + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) + (installfiles=`echo ./html/*.html`; \ + if test "$$installfiles" = './html/*.html'; \ then echo '-- Nothing to install' ; \ else \ for i in $$installfiles; do \ 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; \ + pngfiles=`echo ./html/*.png`; \ + if test "$$pngfiles" != './html/*.png'; then \ + for i in $$pngfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + fi; \ + 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) + fi) +uninstall-local: + (installfiles=`echo ./html/*.html`; \ + if test "$$installfiles" = './html/*.html'; \ + then echo '-- Nothing to uninstall' ; \ + else \ + for i in $$installfiles; do \ + rmfile=`basename $$i` ; \ + echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \ + rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \ + done; \ + pngfiles=`echo ./html/*.png`; \ + if test "$$pngfiles" != './html/*.png'; then \ + for i in $$pngfiles; do \ + rmfile=`basename $$i` ; \ + echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \ + rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \ + done; \ + fi; \ + echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \ + rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \ + echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \ + rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \ + fi) + if test -d $(DESTDIR)$(TARGET_DIR); then rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR); fi +else +install-data-local: +uninstall-local: +endif # # Require gtk-doc when making dist @@ -224,15 +285,13 @@ dist-hook: dist-check-gtkdoc dist-hook-local mkdir $(distdir)/xml mkdir $(distdir)/html -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml + -cp $(srcdir)/sgml/*.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 ; \ + for i in "" $$images ; do \ + if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \ done .PHONY : dist-hook-local diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am index 7fdbb567ff..a578d8c2e4 100644 --- a/docs/manual/Makefile.am +++ b/docs/manual/Makefile.am @@ -2,6 +2,8 @@ # base name of doc DOC = manual +# formats defined for upload.mak +FORMATS=html ps pdf # main xml file MAIN = $(DOC).xml @@ -18,6 +20,8 @@ FIG_SRC = $(notdir $(wildcard $(srcdir)/*.fig)) # get the generic docbuilding Makefile stuff include $(srcdir)/../manuals.mak +# get the generic upload target +include $(srcdir)/../upload.mak ### this is standard automake stuff diff --git a/docs/manuals.mak b/docs/manuals.mak index 5e7c95847b..71fd741b78 100644 --- a/docs/manuals.mak +++ b/docs/manuals.mak @@ -1,5 +1,8 @@ # rewritten by Thomas to be more simple and working +# SF username +USERNAME ?= thomasvs + ### These are all generic; we set all the variables we need # intermediary build path @@ -82,16 +85,18 @@ debug: @echo "PDF_DAT: '$(PDF_DAT)'" # a rule to copy all of the source for docs into $(builddir)/build -$(BUILDDIR)/$(DOC).xml: $(XML) $(CSS) +$(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 ../version.entities $(BUILDDIR) -html/index.html: $(BUILDDIR)/$(DOC).xml $(PNG_BUILT) $(FIG_SRC) +html/index.html: $(BUILDDIR)/$(MAIN) $(PNG_BUILT) $(FIG_SRC) + @make check-local @echo "*** Generating HTML output ***" @-mkdir -p html - @cp $(srcdir)/../image-png $(BUILDDIR)/image.entities - @cd $(BUILDDIR) && xmlto html -o ../html $(DOC).xml + @cp -f $(srcdir)/../image-png $(BUILDDIR)/image.entities + @cd $(BUILDDIR) && docbook2html -o ../html -V '%use-id-as-filename%' $(MAIN) @test "x$(CSS)" != "x" && \ echo "Copying .css files: $(CSS)" && \ cp $(srcdir)/$(CSS) html @@ -100,22 +105,25 @@ html/index.html: $(BUILDDIR)/$(DOC).xml $(PNG_BUILT) $(FIG_SRC) mkdir -p html/images && \ cp $(PNG_BUILT) html/images || true -$(DOC).ps: $(BUILDDIR)/$(DOC).xml $(EPS_BUILT) $(PNG_SRC) $(FIG_SRC) +$(DOC).ps: $(BUILDDIR)/$(MAIN) $(EPS_BUILT) $(PNG_SRC) $(FIG_SRC) + @make check-local @echo "*** Generating PS output ***" - @cp $(srcdir)/../image-eps $(BUILDDIR)/image.entities - @export LC_PAPER=$(PAPER_LOCALE) && cd $(BUILDDIR) && xmlto ps -o .. $(DOC).xml + @cp -f $(srcdir)/../image-eps $(BUILDDIR)/image.entities + cd $(BUILDDIR) && docbook2ps -o .. $(MAIN) +# export LC_PAPER=$(PAPER_LOCALE) && cd $(BUILDDIR) && xmlto ps -o .. $(MAIN) $(DOC).pdf: $(DOC).ps + @make check-local @echo "*** Generating PDF output ***" @ps2pdf $(DOC).ps -#$(DOC).pdf: $(DOC).xml $(PDF) $(FIG_SRC) +#$(DOC).pdf: $(MAIN) $(PDF) $(FIG_SRC) # @echo "*** Generating PDF output ***" -# @cp $(srcdir)/../image-pdf image.entities -# @LC_PAPER=$(PAPER_LOCALE) && xmlto pdf $(DOC).xml +# @cp -f $(srcdir)/../image-pdf image.entities +# @export LC_PAPER=$(PAPER_LOCALE) && xmlto pdf $(MAIN) # @rm image.entities -clean: +clean-local: -$(RM) -r $(BUILDDIR) -$(RM) -r html -$(RM) $(DOC).ps @@ -160,11 +168,6 @@ $(BUILDIMAGESDIR)/%.ps: %.png @cat $< | pngtopnm | pnmtops -noturn > $@ 2> /dev/null # make sure xml validates properly -check-local: - xmllint -noout -valid $(MAIN) - -### this is a website upload target -upload: html ps pdf - export RSYNC_RSH=ssh - rsync -arv $(DOC).ps $(DOC).pdf html thomasvs@shell.sf.net:/home/groups/g/gs/gstreamer/htdocs/docs/$(VERSION)/$(DOC) - +check-local: $(BUILDDIR)/$(MAIN) + @cp -f $(srcdir)/../image-png $(BUILDDIR)/image.entities + cd $(BUILDDIR) && xmllint -noout -valid $(MAIN) diff --git a/docs/pwg/Makefile.am b/docs/pwg/Makefile.am index 00d2a52a92..7343a221b2 100644 --- a/docs/pwg/Makefile.am +++ b/docs/pwg/Makefile.am @@ -2,6 +2,8 @@ # base name of doc DOC = pwg +# formats defined for upload.mak +FORMATS=html ps pdf # main xml file MAIN = $(DOC).xml @@ -18,6 +20,8 @@ FIG_SRC = $(notdir $(wildcard $(srcdir)/*.fig)) # get the generic docbuilding Makefile stuff include $(srcdir)/../manuals.mak +# get the generic upload target +include $(srcdir)/../upload.mak ### this is standard automake stuff diff --git a/docs/pwg/pwg.xml b/docs/pwg/pwg.xml index f9b9f3da8f..5e0e7b7817 100644 --- a/docs/pwg/pwg.xml +++ b/docs/pwg/pwg.xml @@ -3,36 +3,37 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ <!ENTITY % image-entities SYSTEM "image.entities"> %image-entities; +<!ENTITY % version-entities SYSTEM "version.entities"> +%version-entities; <!ENTITY TITLEPAGE SYSTEM "titlepage.xml"> -<!ENTITY INTRO_PREFACE SYSTEM "intro_preface.xml"> -<!ENTITY INTRO_BASICS SYSTEM "intro_basics.xml"> +<!ENTITY INTRO_PREFACE SYSTEM "intro-preface.xml"> +<!ENTITY INTRO_BASICS SYSTEM "intro-basics.xml"> -<!ENTITY BUILDING_BOILER SYSTEM "building_boiler.xml"> -<!ENTITY BUILDING_PADS SYSTEM "building_pads.xml"> -<!ENTITY BUILDING_CHAINFN SYSTEM "building_chainfn.xml"> -<!ENTITY BUILDING_STATE SYSTEM "building_state.xml"> -<!ENTITY BUILDING_PROPS SYSTEM "building_props.xml"> -<!ENTITY BUILDING_SIGNALS SYSTEM "building_signals.xml"> -<!ENTITY BUILDING_TESTAPP SYSTEM "building_testapp.xml"> +<!ENTITY BUILDING_BOILER SYSTEM "building-boiler.xml"> +<!ENTITY BUILDING_PADS SYSTEM "building-pads.xml"> +<!ENTITY BUILDING_CHAINFN SYSTEM "building-chainfn.xml"> +<!ENTITY BUILDING_STATE SYSTEM "building-state.xml"> +<!ENTITY BUILDING_PROPS SYSTEM "building-props.xml"> +<!ENTITY BUILDING_SIGNALS SYSTEM "building-signals.xml"> +<!ENTITY BUILDING_TESTAPP SYSTEM "building-testapp.xml"> -<!ENTITY ADVANCED_SCHEDULING SYSTEM "advanced_scheduling.xml"> -<!ENTITY ADVANCED_TYPES SYSTEM "advanced_types.xml"> -<!ENTITY ADVANCED_REQUEST SYSTEM "advanced_request.xml"> -<!ENTITY ADVANCED_CLOCK SYSTEM "advanced_clock.xml"> -<!ENTITY ADVANCED_DPARAMS SYSTEM "advanced_dparams.xml"> -<!ENTITY ADVANCED_MIDI SYSTEM "advanced_midi.xml"> +<!ENTITY ADVANCED_SCHEDULING SYSTEM "advanced-scheduling.xml"> +<!ENTITY ADVANCED_TYPES SYSTEM "advanced-types.xml"> +<!ENTITY ADVANCED_REQUEST SYSTEM "advanced-request.xml"> +<!ENTITY ADVANCED_CLOCK SYSTEM "advanced-clock.xml"> +<!ENTITY ADVANCED_DPARAMS SYSTEM "advanced-dparams.xml"> +<!ENTITY ADVANCED_MIDI SYSTEM "advanced-midi.xml"> -<!ENTITY OTHER_SOURCE SYSTEM "other_source.xml"> -<!ENTITY OTHER_SINK SYSTEM "other_sink.xml"> -<!ENTITY OTHER_AUTOPLUGGER SYSTEM "other_autoplugger.xml"> +<!ENTITY OTHER_SOURCE SYSTEM "other-source.xml"> +<!ENTITY OTHER_SINK SYSTEM "other-sink.xml"> +<!ENTITY OTHER_AUTOPLUGGER SYSTEM "other-autoplugger.xml"> -<!ENTITY APPENDIX_CHECKLIST SYSTEM "appendix_checklist.xml"> -<!ENTITY APPENDIX_PYTHON SYSTEM "appendix_python.xml"> +<!ENTITY APPENDIX_CHECKLIST SYSTEM "appendix-checklist.xml"> +<!ENTITY APPENDIX_PYTHON SYSTEM "appendix-python.xml"> <!ENTITY GStreamer "<application>GStreamer</application>"> -<!ENTITY GstVersion "0.4.2.2"> <!ENTITY GstAppDevMan "<emphasis>GStreamer Application Development Manual</emphasis>"> <!ENTITY GstLibRef "<emphasis>GStreamer Library Reference</emphasis>"> ]> @@ -56,7 +57,7 @@ </para> <para> This guide is intended to help you understand the &GStreamer; framework - (version &GstVersion;) so you can develop new plugins to extend the + (version &GST_VERSION;) so you can develop new plugins to extend the existing functionality. The guide addresses most issues by following the development of an example plugin - an audio filter plugin - written in C. However, the later parts of the guide also present some diff --git a/gstreamer.spec.in b/gstreamer.spec.in index 72d65f08de..5f1bc17db1 100644 --- a/gstreamer.spec.in +++ b/gstreamer.spec.in @@ -7,7 +7,7 @@ Group: System Environment/Libraries License: LGPL URL: http://gstreamer.net/ Vendor: GStreamer Backpackers Team <package@gstreamer.net> -Source: http://gstreamer.net/releases/%{version}/src/%{name}-%{version}.tar.gz +Source: http://gstreamer.net/src/gstreamer/gstreamer-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define majorminor @GST_MAJORMINOR@ @@ -17,14 +17,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: glib2 >= %_glib2 Requires: libxml2 >= %_libxml2 Requires: popt > 1.6 -Prereq: %{name}-tools >= %{version} + BuildRequires: glib2-devel >= %_glib2 BuildRequires: libxml2-devel >= %_libxml2 BuildRequires: bison BuildRequires: flex -BuildRequires: gtk-doc >= 0.7 -BuildRequires: libxslt -BuildRequires: ghostscript +BuildRequires: m4 +BuildRequires: gtk-doc >= 1.1 BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: popt > 1.6 @@ -32,14 +31,16 @@ Prereq: /sbin/ldconfig ### documentation requirements BuildRequires: python2 -BuildRequires: docbook-style-dsssl docbook-dtd31-sgml -BuildRequires: transfig xfig -BuildRequires: ghostscript -BuildRequires: xmlto -# we want xmltex.fmt generated -BuildRequires: jadetex -BuildRequires: tetex-dvips +BuildRequires: openjade +BuildRequires: jadetex +BuildRequires: libxslt +BuildRequires: docbook-style-dsssl +BuildRequires: docbook-style-xsl +BuildRequires: docbook-utils +BuildRequires: transfig +BuildRequires: xfig BuildRequires: netpbm-progs +BuildRequires: ghostscript %description GStreamer is a streaming-media framework, based on graphs of filters which @@ -68,12 +69,11 @@ plugins. This package contains the libraries and includes files necessary to develop applications and plugins for GStreamer. -%package tools +%package -n gstreamer-tools Summary: tools for GStreamer streaming media framework. Group: Applications/Multimedia -Requires: %{name} -%description tools +%description -n gstreamer-tools GStreamer is a streaming-media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything @@ -86,159 +86,88 @@ gst-register and gst-launch. It is split off to allow parallel-installability in the future. %prep -%setup -q +%setup -n gstreamer-%{version} %build %configure \ --enable-debug \ --with-cachedir=%{_localstatedir}/cache/gstreamer-%{majorminor} \ - --disable-tests --disable-examples \ - --enable-docs-build --with-html-dir=$RPM_BUILD_ROOT%{_datadir}/gtk-doc/html - + --disable-tests --disable-examples + make %{?_smp_mflags} - -%install + +%install rm -rf $RPM_BUILD_ROOT -%makeinstall -# Clean out files that should not be part of the rpm. +# build documentation to a different location so it doesn't end up in +# a gstreamer-devel-(version) dir and doesn't get deleted by %doc scripts +%makeinstall docdir=$RPM_BUILD_ROOT%{_datadir}/gstreamer-%{majorminor}/doc + +# Clean out files that should not be part of the rpm. mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majorminor} -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{majorminor}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{majorminor}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la - -# Copy built docbook docs to gstreamer-devel docs dir -for a in faq manual pwg; do - mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}/$a - cp -p docs/$a/$a.ps $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}/$a - cp -p docs/$a/$a.pdf $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}/$a - cp -pr docs/$a/html $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}/$a -done +# Create empty cache directory +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{major} %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -env DISPLAY= %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null - +%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null + %postun /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README TODO COPYING.LIB ABOUT-NLS REQUIREMENTS DOCBUILDING RELEASE +%defattr(-, root, root, -) +%doc AUTHORS COPYING README TODO COPYING.LIB REQUIREMENTS DOCBUILDING %{_libdir}/libgstreamer-%{majorminor}.so.* %{_libdir}/libgstcontrol-%{majorminor}.so.* %dir %{_libdir}/gstreamer-%{majorminor} +%{_libdir}/gstreamer-%{majorminor}/libgstautoplugcache.so +%{_libdir}/gstreamer-%{majorminor}/libgstautoplugger.so +%{_libdir}/gstreamer-%{majorminor}/libgstbasicomega*.so +%{_libdir}/gstreamer-%{majorminor}/libgstbasicwingo*.so +%{_libdir}/gstreamer-%{majorminor}/libgstoptscheduler.so +%{_libdir}/gstreamer-%{majorminor}/libgstoptomega*.so +%{_libdir}/gstreamer-%{majorminor}/libgstoptwingo*.so +%{_libdir}/gstreamer-%{majorminor}/libgstbasicgthreadscheduler*.so +%{_libdir}/gstreamer-%{majorminor}/libgstoptgthreadscheduler*.so +%{_libdir}/gstreamer-%{majorminor}/libgstelements*.so +%{_libdir}/gstreamer-%{majorminor}/libgstgetbits*.so +%{_libdir}/gstreamer-%{majorminor}/libgstputbits*.so +%{_libdir}/gstreamer-%{majorminor}/libgstspider*.so +%{_libdir}/gstreamer-%{majorminor}/libgststaticautoplug*.so +%{_libdir}/gstreamer-%{majorminor}/libgsttypes.so +%{_libdir}/gstreamer-%{majorminor}/libgstindexers.so +%{_libdir}/gstreamer-%{majorminor}/libgstbytestream.so +%{_bindir}/gst-xmlinspect-%{majorminor} +%{_bindir}/gst-complete-%{majorminor} +%{_bindir}/gst-compprep-%{majorminor} +%{_bindir}/gst-feedback-%{majorminor} +%{_bindir}/gst-inspect-%{majorminor} +%{_bindir}/gst-launch-%{majorminor} +%{_bindir}/gst-md5sum-%{majorminor} +%{_bindir}/gst-register-%{majorminor} +%{_bindir}/gst-xmllaunch-%{majorminor} +%{_bindir}/gst-typefind-%{majorminor} +%{_mandir}/man1/gst-xmllaunch-%{majorminor}.* +%{_mandir}/man1/gst-complete-%{majorminor}.* +%{_mandir}/man1/gst-compprep-%{majorminor}.* +%{_mandir}/man1/gst-feedback-%{majorminor}.* +%{_mandir}/man1/gst-inspect-%{majorminor}.* +%{_mandir}/man1/gst-launch-%{majorminor}.* +%{_mandir}/man1/gst-md5sum-%{majorminor}.* +%{_mandir}/man1/gst-register-%{majorminor}.* +%{_mandir}/man1/gst-typefind-%{majorminor}.* %dir %{_localstatedir}/cache/gstreamer-%{majorminor} -%{_libdir}/gstreamer-%{majorminor}/libgstautoplugcache*.so* -%{_libdir}/gstreamer-%{majorminor}/libgstautoplugger*.so* -%{_libdir}/gstreamer-%{majorminor}/libgstbasicomega*.so* -%{_libdir}/gstreamer-%{majorminor}/libgstoptscheduler.so* -%{_libdir}/gstreamer-%{majorminor}/libgstoptomega*.so* -%{_libdir}/gstreamer-%{majorminor}/libgstbasicwingo*.so* -%{_libdir}/gstreamer-%{majorminor}/libgstoptwingoscheduler*.so -%{_libdir}/gstreamer-%{majorminor}/libgstbasicgthreadscheduler.so -%{_libdir}/gstreamer-%{majorminor}/libgstoptgthreadscheduler.so -%{_libdir}/gstreamer-%{majorminor}/libgstelements*.so* -%{_libdir}/gstreamer-%{majorminor}/libgsttypes*.so* -%{_libdir}/gstreamer-%{majorminor}/libgststaticautoplug*.so* -%{_libdir}/gstreamer-%{majorminor}/libgstbytestream*.so* -%{_libdir}/gstreamer-%{majorminor}/libgstgetbits*.so* -%{_libdir}/gstreamer-%{majorminor}/libgstputbits*.so* -%{_libdir}/gstreamer-%{majorminor}/libgstspider*.so* -%{_libdir}/gstreamer-%{majorminor}/libgstindexers.so* -%files devel -%defattr(-,root,root,-) -%{_docdir}/%{name}-devel-%{version}/faq -%{_docdir}/%{name}-devel-%{version}/manual -%{_docdir}/%{name}-devel-%{version}/pwg -%dir %{_includedir}/%{name}-%{majorminor} -%dir %{_includedir}/%{name}-%{majorminor}/gst -%{_includedir}/%{name}-%{majorminor}/gst/*.h -%dir %{_includedir}/%{name}-%{majorminor}/gst/control -%{_includedir}/%{name}-%{majorminor}/gst/control/*.h -%dir %{_includedir}/%{name}-%{majorminor}/gst/bytestream -%{_includedir}/%{name}-%{majorminor}/gst/bytestream/bytestream.h -%dir %{_includedir}/%{name}-%{majorminor}/gst/getbits -%{_includedir}/%{name}-%{majorminor}/gst/getbits/getbits.h -%dir %{_includedir}/%{name}-%{majorminor}/gst/putbits -%{_includedir}/%{name}-%{majorminor}/gst/putbits/putbits.h -%{_libdir}/libgstreamer-%{majorminor}.so -%{_libdir}/libgstcontrol-%{majorminor}.so -%{_libdir}/libgstreamer-%{majorminor}.a -%{_libdir}/libgstcontrol-%{majorminor}.a -%{_datadir}/aclocal/gst-element-check-%{majorminor}.m4 -%{_libdir}/pkgconfig/gstreamer-%{majorminor}.pc -%{_libdir}/pkgconfig/gstreamer-control-%{majorminor}.pc -## we specify the API docs as regular files since %docs doesn't fail when -# files aren't found anymore for RPM >= 4 -# we list all of the files we really need to trap incomplete doc builds -# 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}/%{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}/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}/%{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/* - -%files tools -%defattr(-,root,root,-) +%files -n gstreamer-tools +%defattr(-, root, root, -) %{_bindir}/gst-complete %{_bindir}/gst-compprep %{_bindir}/gst-feedback @@ -247,19 +176,36 @@ env DISPLAY= %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null %{_bindir}/gst-md5sum %{_bindir}/gst-register %{_bindir}/gst-typefind +%{_bindir}/gst-xmlinspect %{_bindir}/gst-xmllaunch -%{_mandir}/man1/gst-complete.* -%{_mandir}/man1/gst-compprep.* -%{_mandir}/man1/gst-feedback.* -%{_mandir}/man1/gst-inspect.* -%{_mandir}/man1/gst-launch.* -%{_mandir}/man1/gst-md5sum.* -%{_mandir}/man1/gst-register.* -%{_mandir}/man1/gst-typefind.* -%{_mandir}/man1/gst-xmllaunch.* + +%files devel +%defattr(-, root, root, -) +%dir %{_includedir}/gstreamer-%{majorminor} +%dir %{_includedir}/gstreamer-%{majorminor}/gst +%{_includedir}/gstreamer-%{majorminor}/gst/*.h +%dir %{_includedir}/gstreamer-%{majorminor}/gst/control +%{_includedir}/gstreamer-%{majorminor}/gst/control/*.h +%dir %{_includedir}/gstreamer-%{majorminor}/gst/getbits +%{_includedir}/gstreamer-%{majorminor}/gst/getbits/getbits.h +%dir %{_includedir}/gstreamer-%{majorminor}/gst/putbits +%{_includedir}/gstreamer-%{majorminor}/gst/putbits/putbits.h +%{_includedir}/gstreamer-%{majorminor}/gst/bytestream/bytestream.h +%{_libdir}/libgstreamer-%{majorminor}.so +%{_libdir}/libgstcontrol-%{majorminor}.so +%{_datadir}/aclocal/gst-element-check-%{majorminor}.m4 +%{_libdir}/pkgconfig/gstreamer-%{majorminor}.pc +%{_libdir}/pkgconfig/gstreamer-control-%{majorminor}.pc + +%{_datadir}/gstreamer-%{majorminor}/doc +%{_datadir}/gtk-doc/html/gstreamer-%{majorminor}/* +%{_datadir}/gtk-doc/html/gstreamer-libs-%{majorminor}/* %changelog +* Thu Feb 12 2004 Thomas Vander Stichele <thomas at apestaart dot org> +- updated spec file for 0.6.5 release + * Fri Oct 10 2003 Thomas Vander Stichele <thomas at apestaart dot org> - added dependencies for docs build diff --git a/tools/Makefile.am b/tools/Makefile.am index ea6e542f77..7d294fd021 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -80,18 +80,18 @@ gst_xmlinspect_@GST_MAJORMINOR@_LDADD = ../libs/gst/control/libgstcontrol-@GST_M ### man pages we want to install if GST_DISABLE_REGISTRY -GST_REGISTRY_MAN = gst-register-@GST_MAJORMINOR@.1 -else GST_REGISTRY_MAN= +else +GST_REGISTRY_MAN = gst-register-@GST_MAJORMINOR@.1 endif if GST_DISABLE_LOADSAVE +GST_LOADSAVE_MAN= +else GST_LOADSAVE_MAN = \ gst-complete-@GST_MAJORMINOR@.1 \ gst-compprep-@GST_MAJORMINOR@.1 \ gst-xmllaunch-@GST_MAJORMINOR@.1 -else -GST_LOADSAVE_MAN= endif GST_OTHER_MAN = \ |