From mboxrd@z Thu Jan 1 00:00:00 1970 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 6CD60C433F5 for ; Thu, 29 Sep 2022 23:14:39 +0000 (UTC) Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) by mx.groups.io with SMTP id smtpd.web08.17427.1664493271578394315 for ; Thu, 29 Sep 2022 16:14:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=N/M+YW6r; spf=pass (domain: gmail.com, ip: 209.85.167.177, mailfrom: raj.khem@gmail.com) Received: by mail-oi1-f177.google.com with SMTP id m130so3126220oif.6 for ; Thu, 29 Sep 2022 16:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=7d24jHOm9cbBCRJ8f53uR7vCPFuy7dQgmdqNnd2jJsY=; b=N/M+YW6rXw6+f3frYtnj9knXTOs/7n669kRkoh1E0G8yqgL7BXLvBSb1ES06rqL1co 13Qd3DAuYa9zyMtfu/EnAR0EpDNEpamMKDBpSs6/b+xzx8p2JlLqijUjUpoJNCzM/Wu0 xlcysX2ANV1j4f/BT/dmGsg6YbHgxo2zyzl5iQMuYAVSAhKsYAu02SVcLqhuMBj9cqRp QP/cdwJBE3UISVAcEPRFuNkttykSaC1Lpdf7npAmSu9TmE7c5Wm5I1YOVYRcm3QV5JSM 9OV/Ov1tWvoqSSXkkXtK7m1ZXXXSCkufuHLcOUO+7I3EUglAyq8EJrEqPclQPMZt4Rzg KLiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=7d24jHOm9cbBCRJ8f53uR7vCPFuy7dQgmdqNnd2jJsY=; b=OMbgfUx0rxc7whZ+umJfnwzB+oT6Y7g4Vc2ZFsrR7tMqEeoTULXNeEfHSv5LdcB5DP u1/hAXE87/1ZC7FsdvSfVwCh++SNacLavb6l8En/TuyxNv3+qQ48ItEPUnNHOhGujOz2 KC+ST+tJrwx4pgWhjwF18j1fqMrCTU09d1dNMItU8z2ZZuVmGty66Bh0V0k1BVaD/6Rh MvgiVOfUsgduoB76tmr8NEtHy7U3WXlGu8qYQgbblrOq0AzadCXNeKogqjAUfHuljLi4 5Vx1R6yBUNLRIR8nNhf8KNt6ikIQ5zT2Kgyxtp6DQm2Rfy9tppcIhvA66e6OgIaX85vK uMRg== X-Gm-Message-State: ACrzQf3S3MqavwePpb/Oznhost9gmWbxJuRAjnK2djIiWnNVYt0Rtx6v SASegS+A+N0P8YQzdcmqvXAjvt0bMzLIdM8q/fU= X-Google-Smtp-Source: AMsMyM55Xldxerl/6W+Vd0bfAqZ3YdjrWIc50jLEhlGYM/zNYdaZfPgnPXOssehNPF5NcgV+IYPKdbU+2xIDXtc/1HU= X-Received: by 2002:a05:6808:1988:b0:34f:de19:411c with SMTP id bj8-20020a056808198800b0034fde19411cmr8001343oib.262.1664493270719; Thu, 29 Sep 2022 16:14:30 -0700 (PDT) MIME-Version: 1.0 References: <20220929161436.64661-1-daniel@qtec.com> <20220929161436.64661-2-daniel@qtec.com> In-Reply-To: From: Khem Raj Date: Thu, 29 Sep 2022 16:14:04 -0700 Message-ID: Subject: Re: [oe] [meta-oe][PATCH 2/3] v4l-utils: Update 1.22.1 -> 1.23.0+fd544473 To: Daniel Gomez Cc: openembedded-devel@lists.openembedded.org, dagmcr@gmail.com Content-Type: text/plain; charset="UTF-8" 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 ; Thu, 29 Sep 2022 23:14:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/99015 On Thu, Sep 29, 2022 at 2:25 PM Daniel Gomez wrote: > > Hi, > > On Thu, 29 Sept 2022 at 18:14, Daniel Gomez wrote: > > > > Use git instead of release tarball to close the gap between the latest > > 1.22.1 and master. > > > > Add 'bootstrap.sh' call to fix configuration issues: > > > > Error: > > config.status: error: cannot find input file: > > `v4l-utils-po/Makefile.in.in > > > > Adapt patch '0007-Do-not-use-getsubopt.patch': Upstream has replaced > > the use of getsubopt with v4l_subopt which detects if getsubopt is > > provided via glibc or not. Otherwise it uses a static > > v4l_getsubopt copied from glibc. > > > > (From v4l-utils: 6e19bb895a16a9a247524ac526ab47f576cc36f6) > > > > Also rename patch number to '0004-Do-not-use-getsubopt.patch'. > > > > Add qv4l2 and qvidcap packages support but keep them disabled as > > they require meta-qt5. > > > > Enable alsa support if alsa is part of the DISTRO_FEATURES. > > > > Signed-off-by: Daniel Gomez > > --- > > ....patch => 0004-Do-not-use-getsubopt.patch} | 19 +++++-- > > ...4l-utils_1.22.1.bb => v4l-utils_1.23.0.bb} | 50 +++++++++++++++---- > > 2 files changed, 56 insertions(+), 13 deletions(-) > > rename meta-oe/recipes-multimedia/v4l2apps/v4l-utils/{0007-Do-not-use-getsubopt.patch => 0004-Do-not-use-getsubopt.patch} (73%) > > rename meta-oe/recipes-multimedia/v4l2apps/{v4l-utils_1.22.1.bb => v4l-utils_1.23.0.bb} (57%) > > > > diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0004-Do-not-use-getsubopt.patch > > similarity index 73% > > rename from meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch > > rename to meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0004-Do-not-use-getsubopt.patch > > index d8d1b8d18..fb844acbe 100644 > > --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch > > +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0004-Do-not-use-getsubopt.patch > > @@ -1,4 +1,4 @@ > > -From e4582c11f76b9390a3e172dcf0741dca90a9dc8d Mon Sep 17 00:00:00 2001 > > +From 6e7e52de7afe29597016952a7317faf9c3ea3268 Mon Sep 17 00:00:00 2001 > > From: Khem Raj > > Date: Sat, 30 Nov 2019 18:50:34 -0800 > > Subject: [PATCH] Do not use getsubopt > > @@ -11,24 +11,32 @@ Simply avoid getsubopt, since we cannot rely on it. > > Imported from Alpine Linux > > > > Upstream-Status: Pending > > + > > Signed-off-by: Khem Raj > > > > +Adapt patch to 1.23.0. > > + > > +(v4l-utils rev fd544473800d02e90bc289434cc44e5aa8fadd0f). > > + > > +%% original patch: 0007-Do-not-use-getsubopt.patch > > + > > +Signed-off-by: Daniel Gomez > > --- > > utils/v4l2-ctl/v4l2-ctl-common.cpp | 18 ++++++++++-------- > > 1 file changed, 10 insertions(+), 8 deletions(-) > > > > diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp > > -index c940171..49c0f39 100644 > > +index d77f7104..838c297d 100644 > > --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp > > +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp > > -@@ -956,15 +956,17 @@ static bool parse_subset(char *optarg) > > +@@ -994,15 +994,17 @@ static bool parse_subset(char *optarg) > > > > static bool parse_next_subopt(char **subs, char **value) > > { > > - static char *const subopts[] = { > > - nullptr > > - }; > > -- int opt = getsubopt(subs, subopts, value); > > +- int opt = v4l_getsubopt(subs, subopts, value); > > + char *p = *subs; > > + *value = *subs; > > > > @@ -47,3 +55,6 @@ index c940171..49c0f39 100644 > > } > > > > void common_cmd(const std::string &media_bus_info, int ch, char *optarg) > > +-- > > +2.35.1 > > + > > diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.22.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb > > similarity index 57% > > rename from meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.22.1.bb > > rename to meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb > > index 741e1030c..fcc491b78 100644 > > --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.22.1.bb > > +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb > > @@ -6,39 +6,71 @@ PROVIDES = "libv4l media-ctl" > > > > DEPENDS = "jpeg \ > > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)} \ > > - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" > > + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ > > + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)}" > > + > > DEPENDS:append:libc-musl = " argp-standalone" > > DEPENDS:append:class-target = " udev" > > +DEPENDS:append:qv4l2 = " qtbase qtbase-native" > > +DEPENDS:append:qvidcap = " qtbase qtbase-native" > DEPENDS is wrong. Should use conditional and not the package name as > the RDEPENDS. > > LDFLAGS:append = " -pthread" > > > > inherit autotools gettext pkgconfig > > > > PACKAGECONFIG ??= "media-ctl" > > PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," > > +PACKAGECONFIG[qv4l2] = ",--disable-qv4l2" > > +PACKAGECONFIG[qvidcap] = ",--disable-qvidcap" > > + > > +PACKAGECONFIG += " qv4l2" > > +PACKAGECONFIG += " qvidcap" > > +PACKAGECONFIG += " media-ctl" > I forgot to remove this. > > > + > > +SRC_URI = "\ > > + git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=master \ > > + file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ > > + file://0002-original-patch-mediactl-pkgconfig.patch \ > > + file://0003-original-patch-export-mediactl-headers.patch \ > > + file://0004-Do-not-use-getsubopt.patch \ > > +" > > + > > +SRCREV = "fd544473800d02e90bc289434cc44e5aa8fadd0f" > > + > > +S = "${WORKDIR}/git" > > +B = "${S}" > > > > -SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ > > - file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ > > - file://0002-original-patch-mediactl-pkgconfig.patch \ > > - file://0003-original-patch-export-mediactl-headers.patch \ > > - file://0007-Do-not-use-getsubopt.patch \ > > - " > > +do_configure:prepend() { > > + ${S}/bootstrap.sh > > +} > > > > SRC_URI[md5sum] = "8aa73287320a49e9170a8255d7b2c7e6" > > SRC_URI[sha256sum] = "65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31" > > > > -EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev \ > > +EXTRA_OECONF = "--enable-shared --with-udevdir=${base_libdir}/udev \ > > --disable-v4l2-compliance-32 --disable-v4l2-ctl-32" > > > > VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" > > > > -PACKAGES =+ "media-ctl ir-keytable rc-keymaps libv4l libv4l-dev" > > +PACKAGES =+ "media-ctl ir-keytable rc-keymaps libv4l libv4l-dev qv4l2 qvidcap" > > > > RPROVIDES:${PN}-dbg += "libv4l-dbg" > > > > FILES:media-ctl = "${bindir}/media-ctl ${libdir}/libmediactl.so.*" > > +FILES:qv4l2 = "\ > > + ${bindir}/qv4l2 \ > > + ${datadir}/applications/qv4l2.desktop \ > > + ${datadir}/icons/hicolor/*/apps/qv4l2.* \ > > +" > > +FILES:qvidcap = "\ > > + ${bindir}/qvidcap \ > > + ${datadir}/applications/qvidcap.desktop \ > > + ${datadir}/icons/hicolor/*/apps/qvidcap.* \ > > +" > > > > FILES:ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules" > > RDEPENDS:ir-keytable += "${VIRTUAL-RUNTIME_ir-keytable-keymaps}" > > +RDEPENDS:qv4l2 += "qtbase" > > +RDEPENDS:qvidcap += "qtbase" > > > > FILES:rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" > > > > -- > > 2.35.1 > > > Do I still have time to send a v2 or should I send a fix instead? oh you do :). see https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/2063/steps/12/logs/errors it creates a dependency on meta-qt5 or meta-qt6 which I think is not a good thing. So either make that optional or perhaps use dynamic layers. > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#99014): https://lists.openembedded.org/g/openembedded-devel/message/99014 > Mute This Topic: https://lists.openembedded.org/mt/93997899/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >