diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0 | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0')
3 files changed, 91 insertions, 0 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc new file mode 100644 index 000000000..10ee5bcb2 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "Gstreamer Daemon 1.0" +SUMMARY = "GStreamer framework for controlling audio and video streaming using TCP connection messages" +HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=Gstd-1.0" +SECTION = "multimedia" +LICENSE = "GPLv2+" + +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon" + +SRCBRANCH ?= "master" +SRCREV = "097a086a8606dcb368c7d38c7ec4fefc2497401b" +SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \ + file://0001-gstd-yocto-compatibility.patch" + +S = "${WORKDIR}/git" + +PACKAGECONFIG_CONFARGS = " \ + --disable-gtk-doc \ +" + +inherit autotools pkgconfig gettext + +do_configure() { +${S}/autogen.sh +oe_runconf +} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch new file mode 100644 index 000000000..ddc183193 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch @@ -0,0 +1,63 @@ +From eaf51d6420c63713f62025583681007c3502d387 Mon Sep 17 00:00:00 2001 +From: Carlos <carlos.rodriguez@ridgerun.com> +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 ++++ b/gstd/Makefile.am +@@ -49,7 +49,7 @@ bin_PROGRAMS = gstd + + 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_LDADD = libgstd-core.la + + gstdincludedir = $(includedir)/gstd +-- +1.9.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb new file mode 100644 index 000000000..94f6b575b --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb @@ -0,0 +1,3 @@ +require gstd.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |