diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-11-13 18:17:05 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-11-13 22:49:13 -0800 |
commit | 14447c653c6f4c7da0e882faaff6667770498b32 (patch) | |
tree | 46dfcdb9e4ee74fd2845b10b1deb210bdf06d04b /meta-multimedia | |
parent | dc0799d0f1d3e92427724e38968b016b73c4f056 (diff) | |
download | meta-openembedded-14447c653c6f4c7da0e882faaff6667770498b32.tar.gz |
gstd: Upgrade to 0.15.0
License-Update: Switch to LGPL-2.1 [1]
Drop rpath patch its not needed anymore with meson build system
Switch to using meson build system
Fix packaging for python pieces and systemd
[1] https://github.com/RidgeRun/gstd-1.x/commit/76d9fb61a05973b30220fcae5ff87de9d618ea49
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r-- | meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch | 22 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb | 29 |
2 files changed, 18 insertions, 33 deletions
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch deleted file mode 100644 index 64fd578a9..000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | From eaf51d6420c63713f62025583681007c3502d387 Mon Sep 17 00:00:00 2001 | ||
2 | From: Carlos <carlos.rodriguez@ridgerun.com> | ||
3 | Date: Fri, 15 Dec 2017 10:14:05 -0600 | ||
4 | Subject: [PATCH] gstd:yocto compatibility | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | gstd/Makefile.am | 2 +- | ||
10 | 3 files changed, 9 insertions(+), 3 deletions(-) | ||
11 | |||
12 | --- a/gstd/Makefile.am | ||
13 | +++ b/gstd/Makefile.am | ||
14 | @@ -74,7 +74,7 @@ gstd_CFLAGS = $(GST_CFLAGS) \ | ||
15 | -DGSTD_LOG_STATE_DIR=\"$(gstdlogstatedir)\" \ | ||
16 | -DGSTD_RUN_STATE_DIR=\"$(gstdrunstatedir)\" | ||
17 | |||
18 | -gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GIO_UNIX_LIBS) $(GJSON_LIBS) $(LIBD_LIBS) -Wl,-rpath -Wl,$(libdir) | ||
19 | +gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GIO_UNIX_LIBS) $(GJSON_LIBS) $(LIBD_LIBS) | ||
20 | gstd_LDADD = libgstd-core.la | ||
21 | |||
22 | gstdincludedir = $(includedir)/gstd | ||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb index 38fafe82e..88acdb190 100644 --- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb +++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb | |||
@@ -2,26 +2,27 @@ DESCRIPTION = "Gstreamer Daemon" | |||
2 | SUMMARY = "GStreamer framework for controlling audio and video streaming using TCP connection messages" | 2 | SUMMARY = "GStreamer framework for controlling audio and video streaming using TCP connection messages" |
3 | HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=Gstd-1.0" | 3 | HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=Gstd-1.0" |
4 | SECTION = "multimedia" | 4 | SECTION = "multimedia" |
5 | LICENSE = "GPL-2.0-or-later" | 5 | LICENSE = "LGPL-2.1-or-later" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=c71b653a0f608a58cdc5693ae57126bc" |
7 | 7 | ||
8 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon jansson" | 8 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon libsoup-2.4 jansson" |
9 | 9 | ||
10 | SRCBRANCH ?= "master" | 10 | SRCBRANCH ?= "master" |
11 | SRCREV = "a6621a5778b234651aa2adbbe304d906a3fa64d1" | 11 | SRCREV = "a011affa67f240cbc7aaff5b00fdfd6124bdaece" |
12 | SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \ | 12 | SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH}" |
13 | file://0001-gstd-yocto-compatibility.patch \ | ||
14 | " | ||
15 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
16 | 14 | ||
17 | # Remove the +really when upstream version is > 1.0 | 15 | # Remove the +really when upstream version is > 1.0 |
18 | PV = "1.0+really0.8.0" | 16 | PV = "1.0+really0.15.0" |
19 | 17 | ||
20 | inherit autotools pkgconfig gettext gtk-doc | 18 | GTKDOC_MESON_OPTION = "enable-gtk-doc" |
19 | |||
20 | inherit meson pkgconfig gettext gtk-doc systemd python3native python3-dir python3targetconfig | ||
21 | 21 | ||
22 | do_install:append() { | 22 | do_install:append() { |
23 | rmdir ${D}${localstatedir}/run/${BPN} ${D}${localstatedir}/run \ | 23 | rmdir ${D}${root_prefix}${localstatedir}/run/${BPN} ${D}${root_prefix}${localstatedir}/run \ |
24 | ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/log | 24 | ${D}${root_prefix}${localstatedir}/log/${BPN} ${D}${root_prefix}${localstatedir}/log \ |
25 | ${D}${root_prefix}${localstatedir} | ||
25 | rm -f ${D}${bindir}/gst-client ${D}${bindir}/gstd-client | 26 | rm -f ${D}${bindir}/gst-client ${D}${bindir}/gstd-client |
26 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 27 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
27 | install -d ${D}${sysconfdir}/tmpfiles.d | 28 | install -d ${D}${sysconfdir}/tmpfiles.d |
@@ -33,3 +34,9 @@ do_install:append() { | |||
33 | ln -sf gst-client-1.0 ${D}${bindir}/gst-client | 34 | ln -sf gst-client-1.0 ${D}${bindir}/gst-client |
34 | ln -sf gst-client-1.0 ${D}${bindir}/gstd-client | 35 | ln -sf gst-client-1.0 ${D}${bindir}/gstd-client |
35 | } | 36 | } |
37 | PACKAGES =+ "${PN}-python" | ||
38 | |||
39 | FILES:${PN} += "${systemd_user_unitdir}" | ||
40 | FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*" | ||
41 | |||
42 | SYSTEMD_SERVICE:${PN} = "gstd.service" | ||