Can you rebase it on top of master? On Thu, Apr 25, 2024 at 1:04 AM Perceval via lists.openembedded.org <[email protected]> wrote: > > From ab87595034d27dd836ee7bbb1200490fda1dce64 Mon Sep 17 00:00:00 2001 > From: Perceval Arenou <[email protected]> > Date: Wed, 17 Apr 2024 15:06:14 +0200 > Subject: [PATCH] aravis: build GUI only if gtk+3 distro feature is enabled > > --- > .../recipes-multimedia/aravis/aravis_0.8.31.bb | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb > b/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb > index b5d7772e7..38f10e6d1 100644 > --- a/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb > +++ b/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb > @@ -6,7 +6,7 @@ DESCRIPTION = "\ > " > AUTHOR = "Emmanuel Pacaud" > HOMEPAGE = "https://github.com/AravisProject/aravis" > -LICENSE = "LGPL-2.1" > +LICENSE = "LGPL-2.0-or-later" > LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" > DEPENDS += "\ > @@ -29,8 +29,12 @@ GIDOCGEN_MESON_DISABLE_FLAG = "disabled" > inherit meson pkgconfig gi-docgen gobject-introspection > -PACKAGECONFIG ?= "gstreamer usb viewer" > -PACKAGECONFIG[gstreamer] = "-Dgst-plugin=enabled, > -Dgst-plugin=disabled,gstreamer1.0 gstreamer1.0-plugins-base," > +PACKAGECONFIG ?= "\ > + gstreamer \ > + usb \ > + ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', > 'viewer', '', d)} \ > +" > +PACKAGECONFIG[gstreamer] = "-Dgst-plugin=enabled, -Dgst-plugin=disabled, > gstreamer1.0 gstreamer1.0-plugins-base," > PACKAGECONFIG[usb] = "-Dusb=enabled, -Dusb=disabled, libusb1," > PACKAGECONFIG[viewer] = "-Dviewer=enabled, -Dviewer=disabled, gtk+3 > gstreamer1.0-plugins-base," > -- > 2.39.2 > > > > On Thu, Apr 25, 2024 at 10:01 AM Perceval via lists.openembedded.org > <[email protected]> wrote: >> >> From ef4194a2f128439eaeba731080dd13e934e5ec01 Mon Sep 17 00:00:00 2001 >> From: Perceval Arenou <[email protected]> >> Date: Wed, 17 Apr 2024 15:06:14 +0200 >> Subject: [PATCH] aravis: new recipe aravis is a vision library for genicam >> based cameras. aravis project allows to stream from genicam and GigE cameras >> >> --- >> .../aravis/aravis_0.8.31.bb | 44 +++++++++++++++++++ >> 1 file changed, 44 insertions(+) >> create mode 100644 meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb >> >> diff --git a/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb >> b/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb >> new file mode 100644 >> index 000000000..38f10e6d1 >> --- /dev/null >> +++ b/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb >> @@ -0,0 +1,44 @@ >> +SUMMARY = "A vision library for genicam based cameras" >> +DESCRIPTION = "\ >> + Aravis is a glib/gobject based library for video acquisition using Genicam >> cameras.\ >> + It currently implements the gigabit ethernet and USB3 protocols used by >> industrial cameras.\ >> + It also provides a basic ethernet camera simulator and a simple video >> viewer.\ >> +" >> +AUTHOR = "Emmanuel Pacaud" >> +HOMEPAGE = "https://github.com/AravisProject/aravis" >> +LICENSE = "LGPL-2.0-or-later" >> +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" >> + >> +DEPENDS += "\ >> + glib-2.0 \ >> + glib-2.0-native \ >> + libxml2 \ >> + zlib \ >> +" >> + >> +SRC_URI = >> "https://github.com/AravisProject/aravis/releases/download/${PV}/${BPN}-${PV}.tar.xz" >> +SRC_URI[sha256sum] = >> "9c4ebe6273ed3abe466cb6ed8fa5c132bdd7e9a9298ca43fa0212c4311a084da" >> + >> +EXTRA_OEMESON += "-Dtests=false" >> + >> +GIR_MESON_ENABLE_FLAG = 'enabled' >> +GIR_MESON_DISABLE_FLAG = 'disabled' >> +GIDOCGEN_MESON_OPTION = "documentation" >> +GIDOCGEN_MESON_ENABLE_FLAG = "enabled" >> +GIDOCGEN_MESON_DISABLE_FLAG = "disabled" >> + >> +inherit meson pkgconfig gi-docgen gobject-introspection >> + >> +PACKAGECONFIG ?= "\ >> + gstreamer \ >> + usb \ >> + ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', >> 'viewer', '', d)} \ >> +" >> +PACKAGECONFIG[gstreamer] = "-Dgst-plugin=enabled, -Dgst-plugin=disabled, >> gstreamer1.0 gstreamer1.0-plugins-base," >> +PACKAGECONFIG[usb] = "-Dusb=enabled, -Dusb=disabled, libusb1," >> +PACKAGECONFIG[viewer] = "-Dviewer=enabled, -Dviewer=disabled, gtk+3 >> gstreamer1.0-plugins-base," >> + >> +FILES:${PN} += "\ >> + ${datadir} \ >> + ${libdir}/gstreamer-1.0/libgstaravis.0.8.so \ >> +" >> -- >> 2.39.2 >> >> >> >> On Mon, Apr 22, 2024 at 9:06 AM Martin Jansa <[email protected]> wrote: >>> >>> There is also: >>> >>> ERROR: Nothing PROVIDES 'gtk+3' (but >>> meta-oe/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb >>> DEPENDS on or otherwise requires it) >>> gtk+3 was skipped: one of 'wayland x11' needs to be in DISTRO_FEATURES >>> >>> so this recipe should have REQUIRED_DISTRO_FEATURES matching gtk+3 or >>> enable viewer PACKAGECONFIG only when wayland or x11 is in >>> DISTRO_FEATURES. >>> >>> On Mon, Apr 22, 2024 at 8:17 AM Martin Jansa via >>> lists.openembedded.org <[email protected]> >>> wrote: >>> > >>> > This is now triggering: >>> > ERROR: QA Issue: Recipe LICENSE includes obsolete licenses LGPL-2.1 >>> > [obsolete-license] >>> > >>> > Looks like it should be LGPL-2.1-only, please send follow-up fix. >>> > >>> > On Fri, Apr 19, 2024 at 7:21 PM Perceval via lists.openembedded.org >>> > <[email protected]> wrote: >>> > > >>> > > From: Perceval Arenou <[email protected]> >>> > > >>> > > >>> > > --- >>> > > .../aravis/aravis_0.8.31.bb | 40 +++++++++++++++++++ >>> > > 1 file changed, 40 insertions(+) >>> > > create mode 100644 >>> > > meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb >>> > > >>> > > diff --git a/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb >>> > > b/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb >>> > > new file mode 100644 >>> > > index 000000000..52e276c7b >>> > > --- /dev/null >>> > > +++ b/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb >>> > > @@ -0,0 +1,40 @@ >>> > > +SUMMARY = "A vision library for genicam based cameras" >>> > > +DESCRIPTION = "\ >>> > > + Aravis is a glib/gobject based library for video acquisition using >>> > > Genicam cameras.\ >>> > > + It currently implements the gigabit ethernet and USB3 protocols used >>> > > by industrial cameras.\ >>> > > + It also provides a basic ethernet camera simulator and a simple video >>> > > viewer.\ >>> > > +" >>> > > +AUTHOR = "Emmanuel Pacaud" >>> > > +HOMEPAGE = "https://github.com/AravisProject/aravis" >>> > > +LICENSE = "LGPL-2.1" >>> > > +LIC_FILES_CHKSUM = >>> > > "file://COPYING;md5=4fbd65380cdd255951079008b364516c" >>> > > + >>> > > +DEPENDS += "\ >>> > > + glib-2.0 \ >>> > > + glib-2.0-native \ >>> > > + libxml2 \ >>> > > + zlib \ >>> > > +" >>> > > + >>> > > +SRC_URI = >>> > > "https://github.com/AravisProject/aravis/releases/download/${PV}/${BPN}-${PV}.tar.xz" >>> > > +SRC_URI[sha256sum] = >>> > > "9c4ebe6273ed3abe466cb6ed8fa5c132bdd7e9a9298ca43fa0212c4311a084da" >>> > > + >>> > > +EXTRA_OEMESON += "-Dtests=false" >>> > > + >>> > > +GIR_MESON_ENABLE_FLAG = 'enabled' >>> > > +GIR_MESON_DISABLE_FLAG = 'disabled' >>> > > +GIDOCGEN_MESON_OPTION = "documentation" >>> > > +GIDOCGEN_MESON_ENABLE_FLAG = "enabled" >>> > > +GIDOCGEN_MESON_DISABLE_FLAG = "disabled" >>> > > + >>> > > +inherit meson pkgconfig gi-docgen gobject-introspection >>> > > + >>> > > +PACKAGECONFIG ?= "gstreamer usb viewer" >>> > > +PACKAGECONFIG[gstreamer] = "-Dgst-plugin=enabled, >>> > > -Dgst-plugin=disabled, gstreamer1.0 gstreamer1.0-plugins-base," >>> > > +PACKAGECONFIG[usb] = "-Dusb=enabled, -Dusb=disabled, libusb1," >>> > > +PACKAGECONFIG[viewer] = "-Dviewer=enabled, -Dviewer=disabled, gtk+3 >>> > > gstreamer1.0-plugins-base," >>> > > + >>> > > +FILES:${PN} += "\ >>> > > + ${datadir} \ >>> > > + ${libdir}/gstreamer-1.0/libgstaravis.0.8.so \ >>> > > +" >>> > > -- >>> > > 2.43.0 >>> > > >>> > > >>> > > On Fri, Apr 19, 2024 at 5:40 PM Ross Burton <[email protected]> wrote: >>> > >> >>> > >> On 19 Apr 2024, at 15:58, Perceval via lists.openembedded.org >>> > >> <[email protected]> wrote: >>> > >> > +# These options are found in AravisProject/aravis meson_options.txt >>> > >> >>> > >> No need to comment where they came from, this is the only place they >>> > >> can be defined. >>> > >> >>> > >> > +EXTRA_OEMESON += "\ >>> > >> > + -Ddocumentation=disabled \ >>> > >> >>> > >> If would be good to use the gi-docgen class and respect the >>> > >> api-documentation DISTRO_FEATURE instead of just turning this off. >>> > >> >>> > >> > + -Dfast-heartbeat=false \ >>> > >> >>> > >> Default value, remove. >>> > >> >>> > >> > + -Dpacket-socket=enabled \ >>> > >> >>> > >> Can’t you leave this as the default and let Meson detect? >>> > >> >>> > >> > +inherit_defer meson pkgconfig ${@bb.utils.contains('PACKAGECONFIG', >>> > >> > 'introspection', 'gobject-introspection', '', d)} >>> > >> >>> > >> Only defer gobject-introspection, not the others. >>> > >> >>> > >> > +PACKAGECONFIG[introspection] = "-Dintrospection=enabled, >>> > >> > -Dintrospection=disabled, gobject-introspection,” >>> > >> >>> > >> The gobject-introspection class will do this for you, remove this line. >>> > >> >>> > >> Ross >>> > > >>> > > >>> > > >>> > > -- >>> > > Perceval ARENOU >>> > > Embedded Operating System Engineer >>> > > PTxTrimble formerly Bilberry >>> > > >>> > > >>> > > >>> > > >>> > > >>> > > >>> > > >>> > >>> > >>> > >> >> >> >> -- >> Perceval ARENOU >> Embedded Operating System Engineer >> PTxTrimble formerly Bilberry >> >> >> >> >> >> >> > > > -- > Perceval ARENOU > Embedded Operating System Engineer > PTxTrimble formerly Bilberry > > > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110154): https://lists.openembedded.org/g/openembedded-devel/message/110154 Mute This Topic: https://lists.openembedded.org/mt/105577746/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
