| Message ID | 20240111040734.112703-1-festevam@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | v4l-utils: Update to 1.26.1 | expand |
fails with systemd https://errors.yoctoproject.org/Errors/Details/749633/ On Wed, Jan 10, 2024 at 8:07 PM Fabio Estevam <festevam@gmail.com> wrote: > > From: Fabio Estevam <festevam@denx.de> > > Update to 1.26.1. > > Also remove the Makefile.am patches as they no longer apply due to > the swith to Meson. > > Signed-off-by: Fabio Estevam <festevam@denx.de> > --- > ...-Don-t-install-libmediactl-and-libv4.patch | 46 ------------------- > ...02-original-patch-mediactl-pkgconfig.patch | 23 ---------- > ...iginal-patch-export-mediactl-headers.patch | 26 ----------- > ...4l-utils_1.24.1.bb => v4l-utils_1.26.1.bb} | 29 +++++------- > 4 files changed, 11 insertions(+), 113 deletions(-) > delete mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch > delete mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch > delete mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch > rename meta-oe/recipes-multimedia/v4l2apps/{v4l-utils_1.24.1.bb => v4l-utils_1.26.1.bb} (75%) > > diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch > deleted file mode 100644 > index 52f0cd3388a6..000000000000 > --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch > +++ /dev/null > @@ -1,46 +0,0 @@ > -From 0d5c0e9a75eca43667b0e29155b635e50622b66a Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.khem@gmail.com> > -Date: Fri, 27 Feb 2015 21:55:36 +0000 > -Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and > - > - libv4l2subdev" > - > -This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729. > - > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > - > -Conflicts: > - utils/media-ctl/Makefile.am > - > ---- > -Upstream-Status: Pending > - > - utils/media-ctl/Makefile.am | 10 +++------- > - 1 file changed, 3 insertions(+), 7 deletions(-) > - > -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am > -index c48c8d6..e255e16 100644 > ---- a/utils/media-ctl/Makefile.am > -+++ b/utils/media-ctl/Makefile.am > -@@ -1,8 +1,7 @@ > --noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la > -- > -+lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la > - libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h > --libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) > --libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) > -+libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS) > -+libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) > - > - media-bus-format-names.h: ../../include/linux/media-bus-format.h > - $(AM_V_GEN) sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ > -@@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES) > - nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) > - libv4l2subdev_la_SOURCES = libv4l2subdev.c > - libv4l2subdev_la_LIBADD = libmediactl.la > --libv4l2subdev_la_CFLAGS = -static > --libv4l2subdev_la_LDFLAGS = -static > -- > - mediactl_includedir=$(includedir)/mediactl > - noinst_HEADERS = mediactl.h v4l2subdev.h > - > diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch > deleted file mode 100644 > index d52475974f0a..000000000000 > --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -From 320b8378ee30eb5e0fe83a8b397f822f2f88a4c1 Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.khem@gmail.com> > -Date: Sun, 1 Mar 2015 22:25:07 +0000 > -Subject: [PATCH] %% original patch: mediactl-pkgconfig.patch > - > ---- > -Upstream-Status: Pending > - > - utils/media-ctl/Makefile.am | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am > -index e255e16..ff7b417 100644 > ---- a/utils/media-ctl/Makefile.am > -+++ b/utils/media-ctl/Makefile.am > -@@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la > - mediactl_includedir=$(includedir)/mediactl > - noinst_HEADERS = mediactl.h v4l2subdev.h > - > -+pkgconfig_DATA = libmediactl.pc > - bin_PROGRAMS = media-ctl > - media_ctl_SOURCES = media-ctl.c options.c options.h tools.h > - media_ctl_LDADD = libmediactl.la libv4l2subdev.la > diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch > deleted file mode 100644 > index f6fcee92eab1..000000000000 > --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From f7109d6b2fcb291824d795071c04a492d9fbc45b Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.khem@gmail.com> > -Date: Sun, 1 Mar 2015 22:25:07 +0000 > -Subject: [PATCH] %% original patch: export-mediactl-headers.patch > - > ---- > -Upstream-Status: Pending > - > - utils/media-ctl/Makefile.am | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am > -index ff7b417..6ce656f 100644 > ---- a/utils/media-ctl/Makefile.am > -+++ b/utils/media-ctl/Makefile.am > -@@ -17,8 +17,8 @@ CLEANFILES = $(BUILT_SOURCES) > - nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) > - libv4l2subdev_la_SOURCES = libv4l2subdev.c > - libv4l2subdev_la_LIBADD = libmediactl.la > --mediactl_includedir=$(includedir)/mediactl > --noinst_HEADERS = mediactl.h v4l2subdev.h > -+otherincludedir = $(includedir)/mediactl > -+otherinclude_HEADERS = mediactl.h v4l2subdev.h > - > - pkgconfig_DATA = libmediactl.pc > - bin_PROGRAMS = media-ctl > diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > similarity index 75% > rename from meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb > rename to meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > index f314d9b6aed5..a801368c1082 100644 > --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb > +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > @@ -18,34 +18,27 @@ LDFLAGS:append = " -pthread" > # Needs further investigation > GLIBC_64BIT_TIME_FLAGS = "" > > -inherit autotools gettext pkgconfig > +PACKAGECONFIG ??= "" > +PACKAGECONFIG[qv4l2] = ",-Dqv4l2=disabled" > +PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled" > +PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" > > -PACKAGECONFIG ??= "media-ctl" > -PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," > -PACKAGECONFIG[qv4l2] = ",--disable-qv4l2" > -PACKAGECONFIG[qvidcap] = ",--disable-qvidcap" > -PACKAGECONFIG[v4l2-tracer] = ",--disable-v4l2-tracer,json-c" > +inherit meson gettext pkgconfig > > SRC_URI = "\ > - git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.24 \ > - 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 \ > + git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ > file://0004-Do-not-use-getsubopt.patch \ > " > > -SRCREV = "8799081b143627c9c09dea0c60ad3d1cc17cc848" > +SRCREV = "5fa4eb45ee2fd447c102b35da61c0b8920398b20" > > PV .= "+git${SRCPV}" > > S = "${WORKDIR}/git" > > -do_configure:prepend() { > - cd ${S}; ./bootstrap.sh; cd - > -} > - > -EXTRA_OECONF = "--enable-shared --with-udevdir=${base_libdir}/udev \ > - --disable-v4l2-compliance-32 --disable-v4l2-ctl-32" > +# Disable the erroneous installation of gconv-modules that would break glib > +# like it is done in Debian and ArchLinux. > +EXTRA_OEMESON = "-Dgconv=disabled" > > VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" > > @@ -72,7 +65,7 @@ RDEPENDS:qv4l2 += "\ > RDEPENDS:qvidcap += "\ > ${@bb.utils.contains('PACKAGECONFIG', 'qvidcap', 'qtbase', '', d)}" > > -FILES:rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" > +FILES:rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc* ${systemd_unitdir}/system/*" > > FILES:${PN} = "${bindir} ${sbindir}" > > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#108221): https://lists.openembedded.org/g/openembedded-devel/message/108221 > Mute This Topic: https://lists.openembedded.org/mt/103656727/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
I meant to say without systemd ( using sysvinit ) On Thu, Jan 11, 2024 at 12:09 PM Khem Raj <raj.khem@gmail.com> wrote: > > fails with systemd > > https://errors.yoctoproject.org/Errors/Details/749633/ > > On Wed, Jan 10, 2024 at 8:07 PM Fabio Estevam <festevam@gmail.com> wrote: > > > > From: Fabio Estevam <festevam@denx.de> > > > > Update to 1.26.1. > > > > Also remove the Makefile.am patches as they no longer apply due to > > the swith to Meson. > > > > Signed-off-by: Fabio Estevam <festevam@denx.de> > > --- > > ...-Don-t-install-libmediactl-and-libv4.patch | 46 ------------------- > > ...02-original-patch-mediactl-pkgconfig.patch | 23 ---------- > > ...iginal-patch-export-mediactl-headers.patch | 26 ----------- > > ...4l-utils_1.24.1.bb => v4l-utils_1.26.1.bb} | 29 +++++------- > > 4 files changed, 11 insertions(+), 113 deletions(-) > > delete mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch > > delete mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch > > delete mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch > > rename meta-oe/recipes-multimedia/v4l2apps/{v4l-utils_1.24.1.bb => v4l-utils_1.26.1.bb} (75%) > > > > diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch > > deleted file mode 100644 > > index 52f0cd3388a6..000000000000 > > --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch > > +++ /dev/null > > @@ -1,46 +0,0 @@ > > -From 0d5c0e9a75eca43667b0e29155b635e50622b66a Mon Sep 17 00:00:00 2001 > > -From: Khem Raj <raj.khem@gmail.com> > > -Date: Fri, 27 Feb 2015 21:55:36 +0000 > > -Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and > > - > > - libv4l2subdev" > > - > > -This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729. > > - > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > - > > -Conflicts: > > - utils/media-ctl/Makefile.am > > - > > ---- > > -Upstream-Status: Pending > > - > > - utils/media-ctl/Makefile.am | 10 +++------- > > - 1 file changed, 3 insertions(+), 7 deletions(-) > > - > > -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am > > -index c48c8d6..e255e16 100644 > > ---- a/utils/media-ctl/Makefile.am > > -+++ b/utils/media-ctl/Makefile.am > > -@@ -1,8 +1,7 @@ > > --noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la > > -- > > -+lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la > > - libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h > > --libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) > > --libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) > > -+libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS) > > -+libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) > > - > > - media-bus-format-names.h: ../../include/linux/media-bus-format.h > > - $(AM_V_GEN) sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ > > -@@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES) > > - nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) > > - libv4l2subdev_la_SOURCES = libv4l2subdev.c > > - libv4l2subdev_la_LIBADD = libmediactl.la > > --libv4l2subdev_la_CFLAGS = -static > > --libv4l2subdev_la_LDFLAGS = -static > > -- > > - mediactl_includedir=$(includedir)/mediactl > > - noinst_HEADERS = mediactl.h v4l2subdev.h > > - > > diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch > > deleted file mode 100644 > > index d52475974f0a..000000000000 > > --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch > > +++ /dev/null > > @@ -1,23 +0,0 @@ > > -From 320b8378ee30eb5e0fe83a8b397f822f2f88a4c1 Mon Sep 17 00:00:00 2001 > > -From: Khem Raj <raj.khem@gmail.com> > > -Date: Sun, 1 Mar 2015 22:25:07 +0000 > > -Subject: [PATCH] %% original patch: mediactl-pkgconfig.patch > > - > > ---- > > -Upstream-Status: Pending > > - > > - utils/media-ctl/Makefile.am | 1 + > > - 1 file changed, 1 insertion(+) > > - > > -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am > > -index e255e16..ff7b417 100644 > > ---- a/utils/media-ctl/Makefile.am > > -+++ b/utils/media-ctl/Makefile.am > > -@@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la > > - mediactl_includedir=$(includedir)/mediactl > > - noinst_HEADERS = mediactl.h v4l2subdev.h > > - > > -+pkgconfig_DATA = libmediactl.pc > > - bin_PROGRAMS = media-ctl > > - media_ctl_SOURCES = media-ctl.c options.c options.h tools.h > > - media_ctl_LDADD = libmediactl.la libv4l2subdev.la > > diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch > > deleted file mode 100644 > > index f6fcee92eab1..000000000000 > > --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch > > +++ /dev/null > > @@ -1,26 +0,0 @@ > > -From f7109d6b2fcb291824d795071c04a492d9fbc45b Mon Sep 17 00:00:00 2001 > > -From: Khem Raj <raj.khem@gmail.com> > > -Date: Sun, 1 Mar 2015 22:25:07 +0000 > > -Subject: [PATCH] %% original patch: export-mediactl-headers.patch > > - > > ---- > > -Upstream-Status: Pending > > - > > - utils/media-ctl/Makefile.am | 4 ++-- > > - 1 file changed, 2 insertions(+), 2 deletions(-) > > - > > -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am > > -index ff7b417..6ce656f 100644 > > ---- a/utils/media-ctl/Makefile.am > > -+++ b/utils/media-ctl/Makefile.am > > -@@ -17,8 +17,8 @@ CLEANFILES = $(BUILT_SOURCES) > > - nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) > > - libv4l2subdev_la_SOURCES = libv4l2subdev.c > > - libv4l2subdev_la_LIBADD = libmediactl.la > > --mediactl_includedir=$(includedir)/mediactl > > --noinst_HEADERS = mediactl.h v4l2subdev.h > > -+otherincludedir = $(includedir)/mediactl > > -+otherinclude_HEADERS = mediactl.h v4l2subdev.h > > - > > - pkgconfig_DATA = libmediactl.pc > > - bin_PROGRAMS = media-ctl > > diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > > similarity index 75% > > rename from meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb > > rename to meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > > index f314d9b6aed5..a801368c1082 100644 > > --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb > > +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > > @@ -18,34 +18,27 @@ LDFLAGS:append = " -pthread" > > # Needs further investigation > > GLIBC_64BIT_TIME_FLAGS = "" > > > > -inherit autotools gettext pkgconfig > > +PACKAGECONFIG ??= "" > > +PACKAGECONFIG[qv4l2] = ",-Dqv4l2=disabled" > > +PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled" > > +PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" > > > > -PACKAGECONFIG ??= "media-ctl" > > -PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," > > -PACKAGECONFIG[qv4l2] = ",--disable-qv4l2" > > -PACKAGECONFIG[qvidcap] = ",--disable-qvidcap" > > -PACKAGECONFIG[v4l2-tracer] = ",--disable-v4l2-tracer,json-c" > > +inherit meson gettext pkgconfig > > > > SRC_URI = "\ > > - git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.24 \ > > - 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 \ > > + git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ > > file://0004-Do-not-use-getsubopt.patch \ > > " > > > > -SRCREV = "8799081b143627c9c09dea0c60ad3d1cc17cc848" > > +SRCREV = "5fa4eb45ee2fd447c102b35da61c0b8920398b20" > > > > PV .= "+git${SRCPV}" > > > > S = "${WORKDIR}/git" > > > > -do_configure:prepend() { > > - cd ${S}; ./bootstrap.sh; cd - > > -} > > - > > -EXTRA_OECONF = "--enable-shared --with-udevdir=${base_libdir}/udev \ > > - --disable-v4l2-compliance-32 --disable-v4l2-ctl-32" > > +# Disable the erroneous installation of gconv-modules that would break glib > > +# like it is done in Debian and ArchLinux. > > +EXTRA_OEMESON = "-Dgconv=disabled" > > > > VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" > > > > @@ -72,7 +65,7 @@ RDEPENDS:qv4l2 += "\ > > RDEPENDS:qvidcap += "\ > > ${@bb.utils.contains('PACKAGECONFIG', 'qvidcap', 'qtbase', '', d)}" > > > > -FILES:rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" > > +FILES:rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc* ${systemd_unitdir}/system/*" > > > > FILES:${PN} = "${bindir} ${sbindir}" > > > > -- > > 2.34.1 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#108221): https://lists.openembedded.org/g/openembedded-devel/message/108221 > > Mute This Topic: https://lists.openembedded.org/mt/103656727/1997914 > > Group Owner: openembedded-devel+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > >
Hi Khem, On Thu, Jan 11, 2024 at 5:10 PM Khem Raj <raj.khem@gmail.com> wrote: > > I meant to say without systemd ( using sysvinit ) Yes, I have sent a patch to v4l-utils to fix this bug. Thanks
On 1/11/24 7:18 PM, Fabio Estevam wrote: > Hi Khem, > > On Thu, Jan 11, 2024 at 5:10 PM Khem Raj <raj.khem@gmail.com> wrote: >> I meant to say without systemd ( using sysvinit ) > Yes, I have sent a patch to v4l-utils to fix this bug. Thanks, I am expecting a v2 of meta-openembedded patch as well which includes the fix > Thanks
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch deleted file mode 100644 index 52f0cd3388a6..000000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0d5c0e9a75eca43667b0e29155b635e50622b66a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 27 Feb 2015 21:55:36 +0000 -Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and - - libv4l2subdev" - -This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Conflicts: - utils/media-ctl/Makefile.am - ---- -Upstream-Status: Pending - - utils/media-ctl/Makefile.am | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index c48c8d6..e255e16 100644 ---- a/utils/media-ctl/Makefile.am -+++ b/utils/media-ctl/Makefile.am -@@ -1,8 +1,7 @@ --noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la -- -+lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la - libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h --libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) --libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) -+libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS) -+libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) - - media-bus-format-names.h: ../../include/linux/media-bus-format.h - $(AM_V_GEN) sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ -@@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES) - nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) - libv4l2subdev_la_SOURCES = libv4l2subdev.c - libv4l2subdev_la_LIBADD = libmediactl.la --libv4l2subdev_la_CFLAGS = -static --libv4l2subdev_la_LDFLAGS = -static -- - mediactl_includedir=$(includedir)/mediactl - noinst_HEADERS = mediactl.h v4l2subdev.h - diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch deleted file mode 100644 index d52475974f0a..000000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 320b8378ee30eb5e0fe83a8b397f822f2f88a4c1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 1 Mar 2015 22:25:07 +0000 -Subject: [PATCH] %% original patch: mediactl-pkgconfig.patch - ---- -Upstream-Status: Pending - - utils/media-ctl/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index e255e16..ff7b417 100644 ---- a/utils/media-ctl/Makefile.am -+++ b/utils/media-ctl/Makefile.am -@@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la - mediactl_includedir=$(includedir)/mediactl - noinst_HEADERS = mediactl.h v4l2subdev.h - -+pkgconfig_DATA = libmediactl.pc - bin_PROGRAMS = media-ctl - media_ctl_SOURCES = media-ctl.c options.c options.h tools.h - media_ctl_LDADD = libmediactl.la libv4l2subdev.la diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch deleted file mode 100644 index f6fcee92eab1..000000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f7109d6b2fcb291824d795071c04a492d9fbc45b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 1 Mar 2015 22:25:07 +0000 -Subject: [PATCH] %% original patch: export-mediactl-headers.patch - ---- -Upstream-Status: Pending - - utils/media-ctl/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index ff7b417..6ce656f 100644 ---- a/utils/media-ctl/Makefile.am -+++ b/utils/media-ctl/Makefile.am -@@ -17,8 +17,8 @@ CLEANFILES = $(BUILT_SOURCES) - nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) - libv4l2subdev_la_SOURCES = libv4l2subdev.c - libv4l2subdev_la_LIBADD = libmediactl.la --mediactl_includedir=$(includedir)/mediactl --noinst_HEADERS = mediactl.h v4l2subdev.h -+otherincludedir = $(includedir)/mediactl -+otherinclude_HEADERS = mediactl.h v4l2subdev.h - - pkgconfig_DATA = libmediactl.pc - bin_PROGRAMS = media-ctl diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb similarity index 75% rename from meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb rename to meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb index f314d9b6aed5..a801368c1082 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb @@ -18,34 +18,27 @@ LDFLAGS:append = " -pthread" # Needs further investigation GLIBC_64BIT_TIME_FLAGS = "" -inherit autotools gettext pkgconfig +PACKAGECONFIG ??= "" +PACKAGECONFIG[qv4l2] = ",-Dqv4l2=disabled" +PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled" +PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" -PACKAGECONFIG ??= "media-ctl" -PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," -PACKAGECONFIG[qv4l2] = ",--disable-qv4l2" -PACKAGECONFIG[qvidcap] = ",--disable-qvidcap" -PACKAGECONFIG[v4l2-tracer] = ",--disable-v4l2-tracer,json-c" +inherit meson gettext pkgconfig SRC_URI = "\ - git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.24 \ - 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 \ + git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ file://0004-Do-not-use-getsubopt.patch \ " -SRCREV = "8799081b143627c9c09dea0c60ad3d1cc17cc848" +SRCREV = "5fa4eb45ee2fd447c102b35da61c0b8920398b20" PV .= "+git${SRCPV}" S = "${WORKDIR}/git" -do_configure:prepend() { - cd ${S}; ./bootstrap.sh; cd - -} - -EXTRA_OECONF = "--enable-shared --with-udevdir=${base_libdir}/udev \ - --disable-v4l2-compliance-32 --disable-v4l2-ctl-32" +# Disable the erroneous installation of gconv-modules that would break glib +# like it is done in Debian and ArchLinux. +EXTRA_OEMESON = "-Dgconv=disabled" VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" @@ -72,7 +65,7 @@ RDEPENDS:qv4l2 += "\ RDEPENDS:qvidcap += "\ ${@bb.utils.contains('PACKAGECONFIG', 'qvidcap', 'qtbase', '', d)}" -FILES:rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" +FILES:rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc* ${systemd_unitdir}/system/*" FILES:${PN} = "${bindir} ${sbindir}"