gstd: Upgrade to latest and fix unrecognised options to configure

QA Issue: gstd: configure was passed unrecognised options: --disable-gtk-doc [unknown-configure-option]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2018-09-10 22:01:47 -07:00
parent 90467a8d61
commit f0b1f3d30b
3 changed files with 39 additions and 49 deletions

View File

@ -7,19 +7,15 @@ LICENSE = "GPLv2+"
DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon"
SRCBRANCH ?= "master"
SRCREV = "097a086a8606dcb368c7d38c7ec4fefc2497401b"
SRCREV = "3526d0ffdbccc375db7d5fe33a72c68b134657c2"
SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \
file://0001-gstd-yocto-compatibility.patch"
file://0001-gstd-yocto-compatibility.patch \
file://0001-Look-for-gtk-doc.make-in-builddir.patch \
"
S = "${WORKDIR}/git"
PACKAGECONFIG_CONFARGS = " \
--disable-gtk-doc \
"
inherit autotools pkgconfig gettext gtk-doc
inherit autotools pkgconfig gettext
do_configure() {
${S}/autogen.sh
oe_runconf
do_configure_prepend() {
sed -i -e "s|include \$(top_builddir)/docs/gtk-doc.make||g" ${S}/docs/reference/gstd/Makefile.am
}

View File

@ -0,0 +1,32 @@
From a84e9a6e1dca685eda072d58b58556b5b35cb4c8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 10 Sep 2018 21:16:50 -0700
Subject: [PATCH] Look for gtk-doc.make in builddir
this is evident when S != B because gtkdocize
generates this file and its actually built into
build area
Upstream-Status: Submitted [https://github.com/RidgeRun/gstd-1.x/pull/39]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
docs/reference/gstd/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/reference/gstd/Makefile.am b/docs/reference/gstd/Makefile.am
index f860fa1..62870da 100644
--- a/docs/reference/gstd/Makefile.am
+++ b/docs/reference/gstd/Makefile.am
@@ -66,7 +66,7 @@ GTKDOC_LIBS=$(top_builddir)/gstd/libgstd-core.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/docs/gtk-doc.make
+include $(top_builddir)/docs/gtk-doc.make
# Comment this out if you want 'make check' to test you doc status
# and run some sanity checks
--
2.18.0

View File

@ -4,47 +4,9 @@ Date: Fri, 15 Dec 2017 10:14:05 -0600
Subject: [PATCH] gstd:yocto compatibility
---
autogen.sh | 8 +++++++-
docs/reference/gstd/Makefile.am | 2 +-
gstd/Makefile.am | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 66dbd42..793ee2f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,7 +21,11 @@
# ACLOCAL, AUTOPOINT and/or LIBTOOLIZE to the right versions, or leave them
# unset and get the defaults
-gtkdocize || exit 1
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+cd "$srcdir"
autoreconf --verbose --force --install || {
echo 'autogen.sh failed';
@@ -31,3 +35,5 @@ autoreconf --verbose --force --install || {
echo
echo "Now run './configure' with your system settings followed by 'make' to compile this module."
echo
+
+cd "$olddir"
diff --git a/docs/reference/gstd/Makefile.am b/docs/reference/gstd/Makefile.am
index f860fa1..153a13b 100644
--- a/docs/reference/gstd/Makefile.am
+++ b/docs/reference/gstd/Makefile.am
@@ -66,7 +66,7 @@ GTKDOC_LIBS=$(top_builddir)/gstd/libgstd-core.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/docs/gtk-doc.make
+# include $(top_srcdir)/docs/gtk-doc.make
# Comment this out if you want 'make check' to test you doc status
# and run some sanity checks
diff --git a/gstd/Makefile.am b/gstd/Makefile.am
index 13c551d..11fe202 100644
--- a/gstd/Makefile.am