All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/gstreamer1/gstd: new package
@ 2021-09-18 22:46 James Hilliard
  2021-09-19  7:57 ` Yann E. MORIN
  0 siblings, 1 reply; 3+ messages in thread
From: James Hilliard @ 2021-09-18 22:46 UTC (permalink / raw)
  To: buildroot; +Cc: Eric Le Bihan, James Hilliard

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
Changes v2 -> v3:
  - use ln -s -relative for symlink
  - fix kconfig formatting

Changes v1 -> v2:
  - fix service startup
  - fix symlink paths
---
 package/gstreamer1/Config.in                  |  1 +
 .../0001-Fix-gstd_chmod.sh-DESTDIR-path.patch | 27 +++++++++++++
 ...treamer-check-1.0-unless-tests-are-e.patch | 33 ++++++++++++++++
 ...tive-symlink-for-gstd-gst-client-exe.patch | 38 +++++++++++++++++++
 ...td-check-user-xenv.sh-for-systemd-se.patch | 34 +++++++++++++++++
 package/gstreamer1/gstd/Config.in             | 17 +++++++++
 package/gstreamer1/gstd/gstd.hash             |  3 ++
 package/gstreamer1/gstd/gstd.mk               | 37 ++++++++++++++++++
 8 files changed, 190 insertions(+)
 create mode 100644 package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch
 create mode 100644 package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch
 create mode 100644 package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch
 create mode 100644 package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch
 create mode 100644 package/gstreamer1/gstd/Config.in
 create mode 100644 package/gstreamer1/gstd/gstd.hash
 create mode 100644 package/gstreamer1/gstd/gstd.mk

diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in
index 4a8111333e..a2a15397e9 100644
--- a/package/gstreamer1/Config.in
+++ b/package/gstreamer1/Config.in
@@ -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
diff --git a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch b/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch
new file mode 100644
index 0000000000..79a65ffbdc
--- /dev/null
+++ b/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch
@@ -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
+
diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch
new file mode 100644
index 0000000000..495fbfc3fa
--- /dev/null
+++ b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch
@@ -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
+
diff --git a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch b/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch
new file mode 100644
index 0000000000..265ea8d8c3
--- /dev/null
+++ b/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch
@@ -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
+
diff --git a/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch
new file mode 100644
index 0000000000..247b5ab32f
--- /dev/null
+++ b/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch
@@ -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
+
diff --git a/package/gstreamer1/gstd/Config.in b/package/gstreamer1/gstd/Config.in
new file mode 100644
index 0000000000..14cda7c45f
--- /dev/null
+++ b/package/gstreamer1/gstd/Config.in
@@ -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
diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash
new file mode 100644
index 0000000000..6ec84bd58d
--- /dev/null
+++ b/package/gstreamer1/gstd/gstd.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  94c10c798d3618b63cc68cbe053fabd19335a57f982a47b3d66c27c37d325da3  gstd-0.13.0.tar.gz
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk
new file mode 100644
index 0000000000..74783a3d11
--- /dev/null
+++ b/package/gstreamer1/gstd/gstd.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# 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 \
+	-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))
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/gstreamer1/gstd: new package
  2021-09-18 22:46 [Buildroot] [PATCH 1/1] package/gstreamer1/gstd: new package James Hilliard
@ 2021-09-19  7:57 ` Yann E. MORIN
  0 siblings, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2021-09-19  7:57 UTC (permalink / raw)
  To: James Hilliard; +Cc: Eric Le Bihan, buildroot

James, All,

On 2021-09-18 16:46 -0600, James Hilliard spake thusly:
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>

I also backported the p[ending PR 253, so that we can explicitly disable
python support until you've confirmed it works. ;-]

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> Changes v2 -> v3:
>   - use ln -s -relative for symlink
>   - fix kconfig formatting
> 
> Changes v1 -> v2:
>   - fix service startup
>   - fix symlink paths
> ---
>  package/gstreamer1/Config.in                  |  1 +
>  .../0001-Fix-gstd_chmod.sh-DESTDIR-path.patch | 27 +++++++++++++
>  ...treamer-check-1.0-unless-tests-are-e.patch | 33 ++++++++++++++++
>  ...tive-symlink-for-gstd-gst-client-exe.patch | 38 +++++++++++++++++++
>  ...td-check-user-xenv.sh-for-systemd-se.patch | 34 +++++++++++++++++
>  package/gstreamer1/gstd/Config.in             | 17 +++++++++
>  package/gstreamer1/gstd/gstd.hash             |  3 ++
>  package/gstreamer1/gstd/gstd.mk               | 37 ++++++++++++++++++
>  8 files changed, 190 insertions(+)
>  create mode 100644 package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch
>  create mode 100644 package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch
>  create mode 100644 package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch
>  create mode 100644 package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch
>  create mode 100644 package/gstreamer1/gstd/Config.in
>  create mode 100644 package/gstreamer1/gstd/gstd.hash
>  create mode 100644 package/gstreamer1/gstd/gstd.mk
> 
> diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in
> index 4a8111333e..a2a15397e9 100644
> --- a/package/gstreamer1/Config.in
> +++ b/package/gstreamer1/Config.in
> @@ -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
> diff --git a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch b/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch
> new file mode 100644
> index 0000000000..79a65ffbdc
> --- /dev/null
> +++ b/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch
> @@ -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
> +
> diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch
> new file mode 100644
> index 0000000000..495fbfc3fa
> --- /dev/null
> +++ b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch
> @@ -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
> +
> diff --git a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch b/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch
> new file mode 100644
> index 0000000000..265ea8d8c3
> --- /dev/null
> +++ b/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch
> @@ -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
> +
> diff --git a/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch
> new file mode 100644
> index 0000000000..247b5ab32f
> --- /dev/null
> +++ b/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch
> @@ -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
> +
> diff --git a/package/gstreamer1/gstd/Config.in b/package/gstreamer1/gstd/Config.in
> new file mode 100644
> index 0000000000..14cda7c45f
> --- /dev/null
> +++ b/package/gstreamer1/gstd/Config.in
> @@ -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
> diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash
> new file mode 100644
> index 0000000000..6ec84bd58d
> --- /dev/null
> +++ b/package/gstreamer1/gstd/gstd.hash
> @@ -0,0 +1,3 @@
> +# Locally calculated
> +sha256  94c10c798d3618b63cc68cbe053fabd19335a57f982a47b3d66c27c37d325da3  gstd-0.13.0.tar.gz
> +sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
> diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk
> new file mode 100644
> index 0000000000..74783a3d11
> --- /dev/null
> +++ b/package/gstreamer1/gstd/gstd.mk
> @@ -0,0 +1,37 @@
> +################################################################################
> +#
> +# 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 \
> +	-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))
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@lists.buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/gstreamer1/gstd: new package
@ 2021-09-14  8:02 James Hilliard
  0 siblings, 0 replies; 3+ messages in thread
From: James Hilliard @ 2021-09-14  8:02 UTC (permalink / raw)
  To: buildroot; +Cc: Eric Le Bihan, James Hilliard

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/gstreamer1/Config.in                  |  1 +
 .../0001-Fix-gstd_chmod.sh-DESTDIR-path.patch | 27 ++++++++++++++
 ...treamer-check-1.0-unless-tests-are-e.patch | 33 +++++++++++++++++
 package/gstreamer1/gstd/Config.in             | 17 +++++++++
 package/gstreamer1/gstd/gstd.hash             |  3 ++
 package/gstreamer1/gstd/gstd.mk               | 35 +++++++++++++++++++
 6 files changed, 116 insertions(+)
 create mode 100644 package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch
 create mode 100644 package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch
 create mode 100644 package/gstreamer1/gstd/Config.in
 create mode 100644 package/gstreamer1/gstd/gstd.hash
 create mode 100644 package/gstreamer1/gstd/gstd.mk

diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in
index 4a8111333e..a2a15397e9 100644
--- a/package/gstreamer1/Config.in
+++ b/package/gstreamer1/Config.in
@@ -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
diff --git a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch b/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch
new file mode 100644
index 0000000000..79a65ffbdc
--- /dev/null
+++ b/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch
@@ -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
+
diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch
new file mode 100644
index 0000000000..495fbfc3fa
--- /dev/null
+++ b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch
@@ -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
+
diff --git a/package/gstreamer1/gstd/Config.in b/package/gstreamer1/gstd/Config.in
new file mode 100644
index 0000000000..3f73dbd1c4
--- /dev/null
+++ b/package/gstreamer1/gstd/Config.in
@@ -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
diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash
new file mode 100644
index 0000000000..6ec84bd58d
--- /dev/null
+++ b/package/gstreamer1/gstd/gstd.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  94c10c798d3618b63cc68cbe053fabd19335a57f982a47b3d66c27c37d325da3  gstd-0.13.0.tar.gz
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk
new file mode 100644
index 0000000000..fccb774c2e
--- /dev/null
+++ b/package/gstreamer1/gstd/gstd.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# 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 = \
+	gstreamer1 \
+	jansson \
+	json-glib \
+	libdaemon \
+	libglib2 \
+	libsoup \
+	readline
+
+GSTD_CONF_OPTS += \
+	-Denable-tests=disabled \
+	-Denable-examples=disabled \
+	-Denable-gtk-doc=false \
+	-Dwith-gstd-runstatedir=/var/run/gstd \
+	-Dwith-gstd-logstatedir=/var/log/gstd
+
+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))
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-19  7:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-18 22:46 [Buildroot] [PATCH 1/1] package/gstreamer1/gstd: new package James Hilliard
2021-09-19  7:57 ` Yann E. MORIN
  -- strict thread matches above, loose matches on Subject: below --
2021-09-14  8:02 James Hilliard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.