From patchwork Tue Nov 14 03:08:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 34417 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1566BC07548 for ; Tue, 14 Nov 2023 03:08:28 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.5385.1699931305044066985 for ; Mon, 13 Nov 2023 19:08:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DutXBxjh; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1cc3bb32b5dso46061565ad.3 for ; Mon, 13 Nov 2023 19:08:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699931304; x=1700536104; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gpfZVGkaCX8IwC05LJzdUwf++UaxvoQNG2e0xO2gl4o=; b=DutXBxjhm0OGU8m4rCkdrgSn+mmLg+H6rwdCwLklys0Bg+hUlQkkVGtwK9VGRLSBGJ CdVbDw0Rb5tcYghz+1VItMojMbuUJS8T0v6V/j1wVx79bmMd4rEHszitZwIxCdQPAnhe TMe0S+IrOeo6mWU38K96igNBNwQkctgtGm1iNzjIS8FwBOsVisMgALwfxZ4butl0yuLA FBDyS2zzaRr+uSJp2LDZaZgdMit/J11ScW+s3hm06gFMboUa+5gVbSpTaM8i3eASUdYA HQ3YhDzP1DABDP2SPqXtQN57dsqm6IKBOlfzqoJSVkmVmtf6LgKu8fLMX3Q210cIPv3A RnNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699931304; x=1700536104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gpfZVGkaCX8IwC05LJzdUwf++UaxvoQNG2e0xO2gl4o=; b=R4l5wdW1aVTGfeSVWLPuKl8lWzawgmKwZAaD6Ul8mN4LlUoBOPgCg5ROobEtaHR1sh hQu6MsOD30o1HZeSIhBScbtvSAcXLUWGyrha2ZKRKTE69hRn0Jfs9+diZ9KGIdoJjzX0 rLjoXm2XPQ53+q/HaWbf7B/K2vYEHeVTmmiCcrmOsIWNafN0AQm0gmyGMXglTJ2UT6cP 31w9nF8R4Z6qjpuYI/Jv49lQcKf3XTpkfaGUS9pp8yJc2NVPP5AIcsfAzSUwvyb2ne2w hJi4Xt70uZt5wfHT/5+Y4JewFIHuCL0J/HzCx3GUu2Jgoq1rPJCcK0ZOMGiJXRmaVEPX JFUA== X-Gm-Message-State: AOJu0Yzwt1Fus7z2T6opNSAtaz3MlvRz92eZxsKJNi/82HAUQCvwGVUI /b5PSv8bwOfKCCwBNerFI5iTt5DKQXoTNw== X-Google-Smtp-Source: AGHT+IHRMutOV6nR06osijIrAJJfQfY/tL12tUc8PEICAgownaIAZc+OhJr9zS5dQK9jnrnLIaFqmA== X-Received: by 2002:a17:902:b7c8:b0:1c3:6d97:e89e with SMTP id v8-20020a170902b7c800b001c36d97e89emr1244299plz.58.1699931304269; Mon, 13 Nov 2023 19:08:24 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9100:2cb0::62f8]) by smtp.gmail.com with ESMTPSA id n2-20020a1709026a8200b001c44dbc92a2sm4687978plk.184.2023.11.13.19.08.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 19:08:23 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH 09/10] gstd: Upgrade to 0.15.0 Date: Mon, 13 Nov 2023 19:08:10 -0800 Message-ID: <20231113-gnomebaseclass-switch-to-meson-v1-9-111dd5d0fe68@gmail.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231113-gnomebaseclass-switch-to-meson-v1-0-111dd5d0fe68@gmail.com> References: <20231113-gnomebaseclass-switch-to-meson-v1-0-111dd5d0fe68@gmail.com> MIME-Version: 1.0 X-Mailer: b4 0.12.4 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 14 Nov 2023 03:08:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/106696 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 --- .../gstd/0001-gstd-yocto-compatibility.patch | 22 ---------------- .../recipes-multimedia/gstreamer-1.0/gstd_git.bb | 29 ++++++++++++++-------- 2 files changed, 18 insertions(+), 33 deletions(-) -- 2.42.1 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 64fd578a96..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch +++ /dev/null @@ -1,22 +0,0 @@ -From eaf51d6420c63713f62025583681007c3502d387 Mon Sep 17 00:00:00 2001 -From: Carlos -Date: Fri, 15 Dec 2017 10:14:05 -0600 -Subject: [PATCH] gstd:yocto compatibility - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - gstd/Makefile.am | 2 +- - 3 files changed, 9 insertions(+), 3 deletions(-) - ---- a/gstd/Makefile.am -+++ b/gstd/Makefile.am -@@ -74,7 +74,7 @@ gstd_CFLAGS = $(GST_CFLAGS) \ - -DGSTD_LOG_STATE_DIR=\"$(gstdlogstatedir)\" \ - -DGSTD_RUN_STATE_DIR=\"$(gstdrunstatedir)\" - --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 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 38fafe82e4..88acdb190e 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" 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 = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=c71b653a0f608a58cdc5693ae57126bc" -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon jansson" +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon libsoup-2.4 jansson" SRCBRANCH ?= "master" -SRCREV = "a6621a5778b234651aa2adbbe304d906a3fa64d1" -SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-gstd-yocto-compatibility.patch \ - " +SRCREV = "a011affa67f240cbc7aaff5b00fdfd6124bdaece" +SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH}" S = "${WORKDIR}/git" # Remove the +really when upstream version is > 1.0 -PV = "1.0+really0.8.0" +PV = "1.0+really0.15.0" -inherit autotools pkgconfig gettext gtk-doc +GTKDOC_MESON_OPTION = "enable-gtk-doc" + +inherit meson pkgconfig gettext gtk-doc systemd python3native python3-dir python3targetconfig do_install:append() { - rmdir ${D}${localstatedir}/run/${BPN} ${D}${localstatedir}/run \ - ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/log + rmdir ${D}${root_prefix}${localstatedir}/run/${BPN} ${D}${root_prefix}${localstatedir}/run \ + ${D}${root_prefix}${localstatedir}/log/${BPN} ${D}${root_prefix}${localstatedir}/log \ + ${D}${root_prefix}${localstatedir} rm -f ${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 @@ -33,3 +34,9 @@ do_install:append() { ln -sf gst-client-1.0 ${D}${bindir}/gst-client ln -sf gst-client-1.0 ${D}${bindir}/gstd-client } +PACKAGES =+ "${PN}-python" + +FILES:${PN} += "${systemd_user_unitdir}" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*" + +SYSTEMD_SERVICE:${PN} = "gstd.service"