Date: Saturday, March 15, 2014 @ 20:46:15 Author: heftig Revision: 207961
Fix doc build Added: gstreamer0.10-good/trunk/0001-docs-fix-mismatched-para-tags.patch gstreamer0.10-good/trunk/0002-docs-use-docbook-markup-for-xi-include.patch Modified: gstreamer0.10-good/trunk/PKGBUILD ---------------------------------------------------+ 0001-docs-fix-mismatched-para-tags.patch | 43 +++++++++++ 0002-docs-use-docbook-markup-for-xi-include.patch | 75 ++++++++++++++++++++ PKGBUILD | 18 +++- 3 files changed, 132 insertions(+), 4 deletions(-) Added: 0001-docs-fix-mismatched-para-tags.patch =================================================================== --- 0001-docs-fix-mismatched-para-tags.patch (rev 0) +++ 0001-docs-fix-mismatched-para-tags.patch 2014-03-15 19:46:15 UTC (rev 207961) @@ -0,0 +1,43 @@ +From 908d728c8a8b12acd9f9659ebd8970882b7daa33 Mon Sep 17 00:00:00 2001 +From: William Jon McCann <[email protected]> +Date: Fri, 14 Feb 2014 20:27:20 +0000 +Subject: docs: fix mismatched para tags + +newer gtkdoc is more sensitive to mismatched docbook tags. +This fixes the build in master. +--- +diff --git a/gst/audiofx/audiocheblimit.c b/gst/audiofx/audiocheblimit.c +index 549a9d2..e278886 100644 +--- a/gst/audiofx/audiocheblimit.c ++++ b/gst/audiofx/audiocheblimit.c +@@ -46,12 +46,12 @@ + * be at most this value. A lower ripple value will allow a faster rolloff. + * + * As a special case, a Chebyshev type 1 filter with no ripple is a Butterworth filter. +- * </para> ++ * + * <note><para> + * Be warned that a too large number of poles can produce noise. The most poles are possible with + * a cutoff frequency at a quarter of the sampling rate. + * </para></note> +- * <para> ++ * + * <refsect2> + * <title>Example launch line</title> + * |[ +diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c +index 922e381..ea49af9 100644 +--- a/gst/udp/gstudpsrc.c ++++ b/gst/udp/gstudpsrc.c +@@ -78,8 +78,7 @@ + * </itemizedlist> + * The message is typically used to detect that no UDP arrives in the receiver + * because it is blocked by a firewall. +- * </para> +- * <para> ++ * + * A custom file descriptor can be configured with the + * #GstUDPSrc:sockfd property. The socket will be closed when setting the + * element to READY by default. This behaviour can be +-- +cgit v0.9.0.2-2-gbebe Added: 0002-docs-use-docbook-markup-for-xi-include.patch =================================================================== --- 0002-docs-use-docbook-markup-for-xi-include.patch (rev 0) +++ 0002-docs-use-docbook-markup-for-xi-include.patch 2014-03-15 19:46:15 UTC (rev 207961) @@ -0,0 +1,75 @@ +From 79fc4ec80b68eac193095ee40d5da584eb270f1c Mon Sep 17 00:00:00 2001 +From: Stefan Sauer <[email protected]> +Date: Tue, 18 Feb 2014 21:54:45 +0000 +Subject: docs: use docbook markup for xi:include + +It turns out that the change in gtk-doc-1.20 which wraps the |[]| content in +CDATA break xi:inlcude examples. As in a whole jhbuild checkout these where +the only 4, we're fixing them instead. +--- +diff --git a/gst/audiofx/audiofirfilter.c b/gst/audiofx/audiofirfilter.c +index e0887ad..0ab32f3 100644 +--- a/gst/audiofx/audiofirfilter.c ++++ b/gst/audiofx/audiofirfilter.c +@@ -39,9 +39,9 @@ + * + * <refsect2> + * <title>Example application</title> +- * |[ ++ * <informalexample><programlisting language="C"> + * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; parse="text" href="../../../../tests/examples/audiofx/firfilter-example.c" /> +- * ]| ++ * </programlisting></informalexample> + * </refsect2> + */ + +diff --git a/gst/audiofx/audioiirfilter.c b/gst/audiofx/audioiirfilter.c +index c107594..eb4f20c 100644 +--- a/gst/audiofx/audioiirfilter.c ++++ b/gst/audiofx/audioiirfilter.c +@@ -35,9 +35,9 @@ + * + * <refsect2> + * <title>Example application</title> +- * |[ ++ * <informalexample><programlisting language="C"> + * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; parse="text" href="../../../../tests/examples/audiofx/iirfilter-example.c" /> +- * ]| ++ * </programlisting></informalexample> + * </refsect2> + */ + +diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c +index 59943d4..5cd83c8 100644 +--- a/gst/level/gstlevel.c ++++ b/gst/level/gstlevel.c +@@ -95,9 +95,9 @@ + * + * <refsect2> + * <title>Example application</title> +- * |[ ++ * <informalexample><programlisting language="C"> + * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; parse="text" href="../../../../tests/examples/level/level-example.c" /> +- * ]| ++ * </programlisting></informalexample> + * </refsect2> + */ + +diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c +index 75a9152..5e192c1 100644 +--- a/gst/spectrum/gstspectrum.c ++++ b/gst/spectrum/gstspectrum.c +@@ -90,9 +90,9 @@ + * + * <refsect2> + * <title>Example application</title> +- * |[ ++ * <informalexample><programlisting language="C"> + * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; parse="text" href="../../../../tests/examples/spectrum/spectrum-example.c" /> +- * ]| ++ * </programlisting></informalexample> + * </refsect2> + * + * Last reviewed on 2011-03-10 (0.10.29) +-- +cgit v0.9.0.2-2-gbebe Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-03-15 19:37:38 UTC (rev 207960) +++ PKGBUILD 2014-03-15 19:46:15 UTC (rev 207961) @@ -4,7 +4,7 @@ pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') pkgver=0.10.31 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('LGPL') makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'gtk-doc' 'git' 'cairo') @@ -11,15 +11,25 @@ url="http://gstreamer.freedesktop.org/"; options=(!emptydirs) source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-good#commit=e28fd8886f05bb51c147f871f3a1db2fc2b735a9" - test-rtp-payloading.patch) + test-rtp-payloading.patch + 0001-docs-fix-mismatched-para-tags.patch + 0002-docs-use-docbook-markup-for-xi-include.patch) sha256sums=('SKIP' - 'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29') + 'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29' + 'ff9411fc67f825144fff8496f6ae303ff14bb3d14f629e76c2b26616255bba64' + '9e71a6bbd83be88ff6793b503af7ccde295cc90b3e3692ae46b874abe9ee32f7') prepare() { cd gst-plugins-good + sed -i '/AC_PATH_XTRA/d' configure.ac sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac - patch -Np1 -i ../test-rtp-payloading.patch + + patch -p1 -i ../test-rtp-payloading.patch + + # Fix build with gtk-doc 1.20 FS#39454 + patch -p1 -i ../0001-docs-fix-mismatched-para-tags.patch + patch -p1 -i ../0002-docs-use-docbook-markup-for-xi-include.patch } build() {
