summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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.1.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb)5
2 files changed, 2 insertions, 38 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
deleted file mode 100644
index a36fdc9a14..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/gtkdoc-no-tree.patch
+++ /dev/null
@@ -1,35 +0,0 @@
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.1.bb
index d2629b506d..d3918cfcb8 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.1.bb
@@ -18,10 +18,9 @@ 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 \
22 " 21 "
23SRC_URI[md5sum] = "e3a201a45985ddc1327cd496046ca818" 22SRC_URI[md5sum] = "58023f4c71bbd711061e350fcd76c09d"
24SRC_URI[sha256sum] = "dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a" 23SRC_URI[sha256sum] = "e8a5748ae9a4a7be9696512182ea9ffa6efe0be9b7976916548e9d4381ca61c4"
25 24
26S = "${WORKDIR}/gst-libav-${PV}" 25S = "${WORKDIR}/gst-libav-${PV}"
27 26