summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-09-09 16:32:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-16 23:02:44 +0100
commit955381c286e314517e3791b0b807a83f820332b9 (patch)
tree1720b592d9c492ca0e0ae5376742f7b67541a0fd
parent4b0bf01c14a90313ab294ead2ca1e5536bafd632 (diff)
downloadpoky-955381c286e314517e3791b0b807a83f820332b9.tar.gz
gstreamer1.0-libav: enable gtk-doc again
Remove the broken piece of the API documentation template so the documentation can be generated again. (From OE-Core rev: 25a0d1b0b14a4fcd41ca08084a2f22db54dec58e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/gtkdoc-no-tree.patch35
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb6
2 files changed, 36 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/gtkdoc-no-tree.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/gtkdoc-no-tree.patch
new file mode 100644
index 0000000000..a36fdc9a14
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/gtkdoc-no-tree.patch
@@ -0,0 +1,35 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 6f720cebe632d7dc187c6907857d67ce1f7313d6 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Mon, 9 Sep 2019 22:48:49 +0100
7Subject: [PATCH] docs: don't include the type hierarchy
8
9gtk-doc can't generate a type hierarchy when scanning gst-libav, and gtk-doc
101.30 onwards doesn't write a file if there is no type hierarchy (unlike previous
11releases, which wrote an empty file). This results in the build failing with
12gtk-doc 1.30 onwards, so remove the type hierarchy section from the
13documentation as it doesn't serve any purpose.
14
15Fixes https://gitlab.freedesktop.org/gstreamer/gst-libav/issues/57
16---
17 docs/plugins/gst-libav-plugins-docs.sgml | 5 -----
18 1 file changed, 5 deletions(-)
19
20diff --git a/docs/plugins/gst-libav-plugins-docs.sgml b/docs/plugins/gst-libav-plugins-docs.sgml
21index 75c68f4..f68d554 100644
22--- a/docs/plugins/gst-libav-plugins-docs.sgml
23+++ b/docs/plugins/gst-libav-plugins-docs.sgml
24@@ -32,9 +32,4 @@
25 <title>gst-libav Plugins</title>
26 <xi:include href="xml/plugin-libav.xml" />
27 </chapter>
28-
29- <chapter>
30- <title>Object Hierarchy</title>
31- <xi:include href="xml/tree_index.sgml" />
32- </chapter>
33 </book>
34--
352.22.0
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb
index d94c3215dc..d2629b506d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb
@@ -18,6 +18,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz
18 file://mips64_cpu_detection.patch \ 18 file://mips64_cpu_detection.patch \
19 file://0001-configure-check-for-armv7ve-variant.patch \ 19 file://0001-configure-check-for-armv7ve-variant.patch \
20 file://0001-fix-host-contamination.patch \ 20 file://0001-fix-host-contamination.patch \
21 file://gtkdoc-no-tree.patch \
21 " 22 "
22SRC_URI[md5sum] = "e3a201a45985ddc1327cd496046ca818" 23SRC_URI[md5sum] = "e3a201a45985ddc1327cd496046ca818"
23SRC_URI[sha256sum] = "dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a" 24SRC_URI[sha256sum] = "dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a"
@@ -28,11 +29,6 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz"
28 29
29inherit autotools pkgconfig upstream-version-is-even gtk-doc 30inherit autotools pkgconfig upstream-version-is-even gtk-doc
30 31
31# Disable documentation for now as it is failing with gtk-doc 1.30:
32# gst-libav-plugins-docs.sgml:38: element include: XInclude error:
33# could not load xml/tree_index.sgml, and no fallback was found
34GTKDOC_ENABLED = "False"
35
36# CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time, 32# CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time,
37# compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the 33# compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the
38# libav copy included in the gst-libav package. 34# libav copy included in the gst-libav package.