package/gstreamer1/gstd: new package
We need to backport a few upstream still-pending PRs, to fix cross-compilation, out-of-tree installation, and to relax requirements on some tools. The python support PR is backported too, but because python support was not tested, it is forcibly disabled. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> [yann.morin.1998@free.fr: - expand commit log with explanations - backport upstream 253 (python) too ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
James Hilliard
Yann E. MORIN
parent
7ccb46b1fe
commit
02ea01ea22
@ -17,5 +17,6 @@ source "package/gstreamer1/gst1-rtsp-server/Config.in"
|
||||
source "package/gstreamer1/gst1-shark/Config.in"
|
||||
source "package/gstreamer1/gst1-vaapi/Config.in"
|
||||
source "package/gstreamer1/gst-omx/Config.in"
|
||||
source "package/gstreamer1/gstd/Config.in"
|
||||
source "package/gstreamer1/gstreamer1-editing-services/Config.in"
|
||||
endif
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
From f1c953b9077619a83ab21c24dc343c7e21cd220d Mon Sep 17 00:00:00 2001
|
||||
From: James Hilliard <james.hilliard1@gmail.com>
|
||||
Date: Tue, 14 Sep 2021 01:46:25 -0600
|
||||
Subject: [PATCH] Fix gstd_chmod.sh DESTDIR path.
|
||||
|
||||
This should fix the chmod path when cross compiling.
|
||||
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
[Upstream status:
|
||||
https://github.com/RidgeRun/gstd-1.x/pull/247]
|
||||
---
|
||||
gstd/gstd_chmod.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gstd/gstd_chmod.sh b/gstd/gstd_chmod.sh
|
||||
index 8e58bce..fa7fa80 100755
|
||||
--- a/gstd/gstd_chmod.sh
|
||||
+++ b/gstd/gstd_chmod.sh
|
||||
@@ -3,4 +3,4 @@
|
||||
# $1 mode
|
||||
# $2 file
|
||||
|
||||
-chmod $1 $2
|
||||
+chmod $1 ${DESTDIR}/$2
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
From 586bb97459e72da30bd9991c228b6b8e9251c68b Mon Sep 17 00:00:00 2001
|
||||
From: James Hilliard <james.hilliard1@gmail.com>
|
||||
Date: Tue, 14 Sep 2021 01:49:49 -0600
|
||||
Subject: [PATCH] Don't require gstreamer-check-1.0 unless tests are enabled.
|
||||
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
[Upstream status:
|
||||
https://github.com/RidgeRun/gstd-1.x/pull/248]
|
||||
---
|
||||
meson.build | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 1d9ce9d..76990a0 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -22,10 +22,12 @@ gio_unix_dep = dependency('gio-unix-2.0', version : '>=2.44.1')
|
||||
json_glib_dep = dependency('json-glib-1.0', version : '>=0.16.2')
|
||||
libd_dep = dependency('libdaemon', version : '>=0.14')
|
||||
jansson_dep = dependency('jansson', version : '>=2.7')
|
||||
-gst_check_dep = dependency('gstreamer-check-1.0',version : '>=1.0.5')
|
||||
thread_dep = dependency('threads')
|
||||
libsoup_dep = dependency('libsoup-2.4', version : '>=2.4')
|
||||
|
||||
+gst_check_required = get_option('enable-tests').enabled()
|
||||
+gst_check_dep = dependency('gstreamer-check-1.0', required : gst_check_required, version : '>=1.0.5')
|
||||
+
|
||||
systemd_required = get_option('enable-systemd').enabled()
|
||||
systemd_dep = dependency('systemd', required : systemd_required, version : '>=232')
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
From a670beca8dcc76171dcfe3f10970d76c6f0439be Mon Sep 17 00:00:00 2001
|
||||
From: James Hilliard <james.hilliard1@gmail.com>
|
||||
Date: Tue, 14 Sep 2021 02:49:10 -0600
|
||||
Subject: [PATCH] Use relative symlink for gstd/gst-client exe.
|
||||
|
||||
This should fix the symlink path when cross compiling.
|
||||
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
[Upstream status:
|
||||
https://github.com/RidgeRun/gstd-1.x/pull/249]
|
||||
---
|
||||
gst_client/gst_client_symbolic_link.sh | 2 +-
|
||||
gstd/gstd_symbolic_link.sh | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gst_client/gst_client_symbolic_link.sh b/gst_client/gst_client_symbolic_link.sh
|
||||
index d8d7617..b87dd12 100755
|
||||
--- a/gst_client/gst_client_symbolic_link.sh
|
||||
+++ b/gst_client/gst_client_symbolic_link.sh
|
||||
@@ -4,4 +4,4 @@
|
||||
# $1: target
|
||||
# $2: link name
|
||||
rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2
|
||||
-ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2
|
||||
+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2
|
||||
diff --git a/gstd/gstd_symbolic_link.sh b/gstd/gstd_symbolic_link.sh
|
||||
index d8d7617..b87dd12 100755
|
||||
--- a/gstd/gstd_symbolic_link.sh
|
||||
+++ b/gstd/gstd_symbolic_link.sh
|
||||
@@ -4,4 +4,4 @@
|
||||
# $1: target
|
||||
# $2: link name
|
||||
rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2
|
||||
-ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2
|
||||
+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
From 05ae5237b1bc23399898f9c06463cfe2b5bba499 Mon Sep 17 00:00:00 2001
|
||||
From: James Hilliard <james.hilliard1@gmail.com>
|
||||
Date: Tue, 14 Sep 2021 17:48:03 -0600
|
||||
Subject: [PATCH] Don't require gstd-check-user-xenv.sh for systemd service
|
||||
|
||||
The gstd-check-user-xenv.sh script does not appear to be required
|
||||
for running the gstd service so we shouldn't require it for the
|
||||
service to start.
|
||||
|
||||
Note that the non-systemd init script already does not require this.
|
||||
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
[Upstream status:
|
||||
https://github.com/RidgeRun/gstd-1.x/pull/251]
|
||||
---
|
||||
init/gstd.service.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/init/gstd.service.in b/init/gstd.service.in
|
||||
index 3d20ecd..9125983 100644
|
||||
--- a/init/gstd.service.in
|
||||
+++ b/init/gstd.service.in
|
||||
@@ -6,7 +6,7 @@ StartLimitIntervalSec=30
|
||||
[Service]
|
||||
Restart=on-failure
|
||||
RestartSec=5s
|
||||
-ExecStartPre=@GSTD_SYSTEMD_DIR@/gstd-check-user-xenv.sh
|
||||
+ExecStartPre=-@GSTD_SYSTEMD_DIR@/gstd-check-user-xenv.sh
|
||||
ExecStart=@prefix@/bin/gstd
|
||||
|
||||
[Install]
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -0,0 +1,78 @@
|
||||
From 1067f6138e947d18fd835e4a39f229ae2293f864 Mon Sep 17 00:00:00 2001
|
||||
From: James Hilliard <james.hilliard1@gmail.com>
|
||||
Date: Tue, 14 Sep 2021 23:37:03 -0600
|
||||
Subject: [PATCH] Use native meson python module for python install.
|
||||
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
[upstreeam: https://github.com/RidgeRun/gstd-1.x/pull/253]
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
libgstc/meson.build | 4 +++-
|
||||
libgstc/python/meson.build | 26 +++++++++++++++++++++++++-
|
||||
meson_options.txt | 2 ++
|
||||
3 files changed, 30 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libgstc/meson.build b/libgstc/meson.build
|
||||
index e94dcd1..582cbb8 100644
|
||||
--- a/libgstc/meson.build
|
||||
+++ b/libgstc/meson.build
|
||||
@@ -1,2 +1,4 @@
|
||||
subdir('c')
|
||||
-subdir('python')
|
||||
+if not get_option('enable-python').disabled()
|
||||
+ subdir('python')
|
||||
+endif
|
||||
diff --git a/libgstc/python/meson.build b/libgstc/python/meson.build
|
||||
index 057114b..24e3242 100644
|
||||
--- a/libgstc/python/meson.build
|
||||
+++ b/libgstc/python/meson.build
|
||||
@@ -1 +1,25 @@
|
||||
-run_command('pip3', 'install', '.')
|
||||
+pymod = import('python')
|
||||
+python = pymod.find_installation(
|
||||
+ get_option('with-python-version'),
|
||||
+ required : get_option('enable-python').enabled(),
|
||||
+ disabler : true
|
||||
+)
|
||||
+
|
||||
+pythonver = python.language_version()
|
||||
+if pythonver.version_compare('<3.7')
|
||||
+ error('Python @0@ is not supported anymore, please port your code to python3.7 or newer.'.format(python.language_version()))
|
||||
+endif
|
||||
+
|
||||
+pygstc_src_files = [
|
||||
+ 'pygstc/__init__.py',
|
||||
+ 'pygstc/gstc.py',
|
||||
+ 'pygstc/gstcerror.py',
|
||||
+ 'pygstc/logger.py',
|
||||
+ 'pygstc/tcp.py'
|
||||
+]
|
||||
+
|
||||
+python.install_sources(
|
||||
+ pygstc_src_files,
|
||||
+ subdir : 'pygstc',
|
||||
+ pure : true
|
||||
+)
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index f50e540..25292e6 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -4,6 +4,7 @@ option('enable-examples', type : 'feature', value : 'auto', yield : true, descri
|
||||
option('enable-gtk-doc', type : 'boolean', value : false, description : 'Use gtk-doc to build documentation')
|
||||
option('enable-systemd', type : 'feature', value : 'auto', description : 'Enable systemd gstd.service install')
|
||||
option('enable-initd', type : 'feature', value : 'disabled', description : 'Enable init script install')
|
||||
+option('enable-python', type : 'feature', value : 'auto', description : 'Install the pygstc library')
|
||||
|
||||
# String options
|
||||
option('with-gstd-runstatedir', type : 'string', value : '${prefix}/var/run/gstd', description : 'Specify the location of the gstd\'s PID file')
|
||||
@@ -11,6 +12,7 @@ option('with-gstd-logstatedir', type : 'string', value : '${prefix}/var/log/gstd
|
||||
option('with-gstd-systemddir', type : 'string', value : 'Systemd default systemduserunitdir', description : 'Specify the location of gstd.service file')
|
||||
option('with-gstd-initddir', type : 'string', value : '${sysconfdir}/init.d', description : 'Specify the location of gstd init script')
|
||||
option('with-statedir-owner', type : 'string', value : 'root', description : 'Specify the owner of gstd\'s run and log dirs created by the initd script')
|
||||
+option('with-python-version', type : 'string', value : 'python3', description : 'Specify the python version for pygstc installation')
|
||||
|
||||
# Common options
|
||||
option('package-name', type : 'string', yield : true,
|
||||
--
|
||||
2.25.1
|
||||
|
||||
17
package/gstreamer1/gstd/Config.in
Normal file
17
package/gstreamer1/gstd/Config.in
Normal file
@ -0,0 +1,17 @@
|
||||
config BR2_PACKAGE_GSTD
|
||||
bool "gstd"
|
||||
depends on BR2_USE_WCHAR # libglib2 -> gettext, libsoup
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libsoup
|
||||
depends on BR2_USE_MMU # libdaemon, libglib2
|
||||
select BR2_PACKAGE_JANSSON
|
||||
select BR2_PACKAGE_JSON_GLIB
|
||||
select BR2_PACKAGE_LIBDAEMON
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_LIBSOUP
|
||||
select BR2_PACKAGE_READLINE
|
||||
help
|
||||
GStreamer Daemon, also called gstd, is a GStreamer framework
|
||||
for controlling audio and video streaming using an
|
||||
InterProcess Communication protocol.
|
||||
|
||||
https://developer.ridgerun.com/wiki/index.php?title=GStreamer_Daemon
|
||||
3
package/gstreamer1/gstd/gstd.hash
Normal file
3
package/gstreamer1/gstd/gstd.hash
Normal file
@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 94c10c798d3618b63cc68cbe053fabd19335a57f982a47b3d66c27c37d325da3 gstd-0.13.0.tar.gz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
38
package/gstreamer1/gstd/gstd.mk
Normal file
38
package/gstreamer1/gstd/gstd.mk
Normal file
@ -0,0 +1,38 @@
|
||||
################################################################################
|
||||
#
|
||||
# gstd
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GSTD_VERSION = 0.13.0
|
||||
GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION))
|
||||
GSTD_LICENSE_FILES = COPYING
|
||||
GSTD_LICENSE = GPL-2.0+
|
||||
|
||||
GSTD_DEPENDENCIES = \
|
||||
$(BR2_COREUTILS_HOST_DEPENDENCY) \
|
||||
gstreamer1 \
|
||||
jansson \
|
||||
json-glib \
|
||||
libdaemon \
|
||||
libglib2 \
|
||||
libsoup \
|
||||
readline
|
||||
|
||||
GSTD_CONF_OPTS = \
|
||||
-Denable-tests=disabled \
|
||||
-Denable-examples=disabled \
|
||||
-Denable-gtk-doc=false \
|
||||
-Denable-python=disabled \
|
||||
-Dwith-gstd-runstatedir=/var/run/gstd \
|
||||
-Dwith-gstd-logstatedir=/var/log/gstd \
|
||||
-Dwith-gstd-systemddir=/usr/lib/systemd/system
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
GSTD_CONF_OPTS += -Denable-systemd=enabled -Denable-initd=disabled
|
||||
GSTD_DEPENDENCIES += systemd
|
||||
else
|
||||
GSTD_CONF_OPTS += -Denable-systemd=disabled -Denable-initd=enabled
|
||||
endif
|
||||
|
||||
$(eval $(meson-package))
|
||||
Loading…
Reference in New Issue
Block a user