CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

gstd: Upgrade to 0.8.1

Browse Source 
Install /run and /var/run during runtime
Rewrite absolute symlinks to be relative
Drop upstreamed patch for gtk-doc fix

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Khem Raj 2020-01-13 19:43:02 -08:00
parent 9cce740df2
commit 449fe99205
3 changed files with 19 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-Look-for-gtk-doc.make-in-builddir.patch
View File

@ -1,32 +0,0 @@
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

15
meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch
View File

@ -7,19 +7,14 @@ Subject: [PATCH] gstd:yocto compatibility
gstd/Makefile.am | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/gstd/Makefile.am b/gstd/Makefile.am
index 13c551d..11fe202 100644
--- a/gstd/Makefile.am
+++ b/gstd/Makefile.am
@@ -49,7 +49,7 @@ bin_PROGRAMS = gstd
@@ -74,7 +74,7 @@ gstd_CFLAGS = $(GST_CFLAGS) \
-DGSTD_LOG_STATE_DIR=\"$(gstdlogstatedir)\" \
-DGSTD_RUN_STATE_DIR=\"$(gstdrunstatedir)\"
gstd_SOURCES = gstd.c
gstd_CFLAGS = $(GST_CFLAGS) $(GIO_CFLAGS) $(GJSON_CFLAGS)
-gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GJSON_LIBS) -Wl,-rpath -Wl,$(libdir)
+gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GJSON_LIBS)
-gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GIO_UNIX_LIBS) $(GJSON_LIBS) $(LIBD_LIBS) -Wl,-rpath -Wl,$(libdir)
+gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GIO_UNIX_LIBS) $(GJSON_LIBS) $(LIBD_LIBS)
gstd_LDADD = libgstd-core.la
gstdincludedir = $(includedir)/gstd
--
1.9.1

20
meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
View File

@ -5,21 +5,29 @@ SECTION = "multimedia"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon"
DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon jansson"
SRCBRANCH ?= "master"
SRCREV = "3526d0ffdbccc375db7d5fe33a72c68b134657c2"
SRCREV = "a6621a5778b234651aa2adbbe304d906a3fa64d1"
SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \
file://0001-gstd-yocto-compatibility.patch \
file://0001-Look-for-gtk-doc.make-in-builddir.patch \
"
S = "${WORKDIR}/git"
# Remove the +really when upstream version is > 1.0
PV = "1.0+really0.6.3"
PV = "1.0+really0.8.0"
inherit autotools pkgconfig gettext gtk-doc
do_configure_prepend() {
sed -i -e "s|include \$(top_builddir)/docs/gtk-doc.make||g" ${S}/docs/reference/gstd/Makefile.am
do_install_append() {
rm -fr ${D}${localstatedir}/run ${D}/run ${D}${bindir}/gst-client ${D}${bindir}/gstd-client
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/tmpfiles.d
echo "d /run/${BPN} - - - -" \
> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
echo "d /${localstatedir}/log/${BPN} 0755 root root -" \
>> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
fi
ln -sf gst-client-1.0 ${D}${bindir}/gst-client
ln -sf gst-client-1.0 ${D}${bindir}/gstd-client
}