Message ID | 20230219201053.86040-1-marex@denx.de |
---|---|
State | New |
Headers | show |
Series | [meta-oe] v4l-utils: Update 1.23.0+fd544473 -> 1.23.0+9431e4b2 | expand |
Shouldn't +git${SRCPV} be included in PV to distinguish these 2 versions? Now both will claim 1.23.0 version which is incorrect, right? It should be included in https://git.openembedded.org/meta-openembedded/commit/?id=ff7666cae8b3e6cca45e5d0652b16d6caa6be7a5 already as the summary says 1.23.0+fd544473, so probably wasn't exactly 1.23.0 as well. On Sun, Feb 19, 2023 at 9:11 PM Marek Vasut <marex@denx.de> wrote: > Update V4L2 utils to latest git HEAD and drop patches now upstream: > 575e0a9f ("media-info: Include missing <cstdint> for uintptr_t") > 96022d88 ("configure.ac, Makefile.am: Support building without NLS") > > Signed-off-by: Marek Vasut <marex@denx.de> > --- > Cc: Daniel Gomez <daniel@qtec.com> > Cc: Khem Raj <raj.khem@gmail.com> > Cc: Peter Kjellerstedt <pkj@axis.com> > --- > ...nclude-missing-cstdint-for-uintptr_t.patch | 31 ------------- > ...efile.am-Support-building-without-NL.patch | 45 ------------------- > .../v4l2apps/v4l-utils_1.23.0.bb | 4 +- > 3 files changed, 1 insertion(+), 79 deletions(-) > delete mode 100644 > meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch > delete mode 100644 > meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch > > diff --git > a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch > b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch > deleted file mode 100644 > index 032bf00c7..000000000 > --- > a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From 1d9ce7cd799770981043f656373cbd1bf7558b9a Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.khem@gmail.com> > -Date: Thu, 26 Jan 2023 17:00:00 -0800 > -Subject: [PATCH] media-info: Include missing <cstdint> for uintptr_t > - > -gcc 13 moved some includes around and as a result <cstdint> is no longer > -transitively included [1]. Explicitly include it. > - > -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes > - > -Upstream-Status: Submitted [ > https://lore.kernel.org/linux-media/20230127010741.3883339-1-raj.khem@gmail.com/ > ] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - utils/common/media-info.cpp | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/utils/common/media-info.cpp b/utils/common/media-info.cpp > -index 53e132f5..1a25a4b6 100644 > ---- a/utils/common/media-info.cpp > -+++ b/utils/common/media-info.cpp > -@@ -3,6 +3,7 @@ > - * Copyright 2018 Cisco Systems, Inc. and/or its affiliates. All rights > reserved. > - */ > - > -+#include <cstdint> > - #include <cstring> > - #include <fstream> > - #include <iostream> > --- > -2.39.1 > - > diff --git > a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch > b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch > deleted file mode 100644 > index 0548e4fba..000000000 > --- > a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch > +++ /dev/null > @@ -1,45 +0,0 @@ > -From 4fe9f6071cd24bcab157a9398adcca474f619f8d Mon Sep 17 00:00:00 2001 > -From: Peter Kjellerstedt <pkj@axis.com> > -Date: Sat, 15 Oct 2022 02:45:26 +0200 > -Subject: [PATCH] configure.ac, Makefile.am: Support building without NLS > - > -Avoid entering the v4l-utils-po and libdvbv5-po directories if NLS > -support is disabled, as the generated Makefiles in those directories are > -empty then. > - > -Upstream-Status: Submitted [ > https://patchwork.linuxtv.org/project/linux-media/patch/20221015010541.688322-1-pkj@axis.com/ > ] > -Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > ---- > - Makefile.am | 6 +++++- > - configure.ac | 1 + > - 2 files changed, 6 insertions(+), 1 deletion(-) > - > -diff --git a/Makefile.am b/Makefile.am > -index 7fb443ab..8e924af8 100644 > ---- a/Makefile.am > -+++ b/Makefile.am > -@@ -2,7 +2,11 @@ AUTOMAKE_OPTIONS = foreign > - ACLOCAL_AMFLAGS = -I m4 > - AM_MAKEFLAGS = $(word 1, $(subst 1, -w, $(filter 1, $(V))) > --no-print-directory) > - > --SUBDIRS = v4l-utils-po libdvbv5-po lib > -+SUBDIRS = lib > -+ > -+if USE_NLS > -+SUBDIRS += v4l-utils-po libdvbv5-po > -+endif > - > - if WITH_V4LUTILS > - SUBDIRS += utils contrib > -diff --git a/configure.ac b/configure.ac > -index 05298981..7c78467f 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -99,6 +99,7 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen_libdvbv5.cfg) > - ALL_LINGUAS="" > - > m4_ifdef(AM_GNU_GETTEXT_REQUIRE_VERSION,[AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])],[AM_GNU_GETTEXT_VERSION([0.19.8])]) > - AM_GNU_GETTEXT([external]) > -+AM_CONDITIONAL([USE_NLS], [test "$USE_NLS" = "yes"]) > - > - LIBDVBV5_DOMAIN="libdvbv5" > - AC_DEFINE([LIBDVBV5_DOMAIN], "libdvbv5", [libdvbv5 domain]) > diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb > b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb > index b42300f09..ad9ef2bab 100644 > --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb > +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb > @@ -31,11 +31,9 @@ SRC_URI = "\ > file://0002-original-patch-mediactl-pkgconfig.patch \ > file://0003-original-patch-export-mediactl-headers.patch \ > file://0004-Do-not-use-getsubopt.patch \ > - > file://0005-configure.ac-Makefile.am-Support-building-without-NL.patch \ > - file://0001-media-info-Include-missing-cstdint-for-uintptr_t.patch \ > " > > -SRCREV = "fd544473800d02e90bc289434cc44e5aa8fadd0f" > +SRCREV = "9431e4b26b4842d1401e80ada9f14593dca3a94c" > > S = "${WORKDIR}/git" > B = "${S}" > -- > 2.39.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#101153): > https://lists.openembedded.org/g/openembedded-devel/message/101153 > Mute This Topic: https://lists.openembedded.org/mt/97072896/3617156 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ > Martin.Jansa@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch deleted file mode 100644 index 032bf00c7..000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1d9ce7cd799770981043f656373cbd1bf7558b9a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 26 Jan 2023 17:00:00 -0800 -Subject: [PATCH] media-info: Include missing <cstdint> for uintptr_t - -gcc 13 moved some includes around and as a result <cstdint> is no longer -transitively included [1]. Explicitly include it. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Submitted [https://lore.kernel.org/linux-media/20230127010741.3883339-1-raj.khem@gmail.com/] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/common/media-info.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/common/media-info.cpp b/utils/common/media-info.cpp -index 53e132f5..1a25a4b6 100644 ---- a/utils/common/media-info.cpp -+++ b/utils/common/media-info.cpp -@@ -3,6 +3,7 @@ - * Copyright 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved. - */ - -+#include <cstdint> - #include <cstring> - #include <fstream> - #include <iostream> --- -2.39.1 - diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch deleted file mode 100644 index 0548e4fba..000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4fe9f6071cd24bcab157a9398adcca474f619f8d Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt <pkj@axis.com> -Date: Sat, 15 Oct 2022 02:45:26 +0200 -Subject: [PATCH] configure.ac, Makefile.am: Support building without NLS - -Avoid entering the v4l-utils-po and libdvbv5-po directories if NLS -support is disabled, as the generated Makefiles in those directories are -empty then. - -Upstream-Status: Submitted [https://patchwork.linuxtv.org/project/linux-media/patch/20221015010541.688322-1-pkj@axis.com/] -Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> ---- - Makefile.am | 6 +++++- - configure.ac | 1 + - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 7fb443ab..8e924af8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,11 @@ AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 - AM_MAKEFLAGS = $(word 1, $(subst 1, -w, $(filter 1, $(V))) --no-print-directory) - --SUBDIRS = v4l-utils-po libdvbv5-po lib -+SUBDIRS = lib -+ -+if USE_NLS -+SUBDIRS += v4l-utils-po libdvbv5-po -+endif - - if WITH_V4LUTILS - SUBDIRS += utils contrib -diff --git a/configure.ac b/configure.ac -index 05298981..7c78467f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -99,6 +99,7 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, doxygen_libdvbv5.cfg) - ALL_LINGUAS="" - m4_ifdef(AM_GNU_GETTEXT_REQUIRE_VERSION,[AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])],[AM_GNU_GETTEXT_VERSION([0.19.8])]) - AM_GNU_GETTEXT([external]) -+AM_CONDITIONAL([USE_NLS], [test "$USE_NLS" = "yes"]) - - LIBDVBV5_DOMAIN="libdvbv5" - AC_DEFINE([LIBDVBV5_DOMAIN], "libdvbv5", [libdvbv5 domain]) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb index b42300f09..ad9ef2bab 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb @@ -31,11 +31,9 @@ SRC_URI = "\ file://0002-original-patch-mediactl-pkgconfig.patch \ file://0003-original-patch-export-mediactl-headers.patch \ file://0004-Do-not-use-getsubopt.patch \ - file://0005-configure.ac-Makefile.am-Support-building-without-NL.patch \ - file://0001-media-info-Include-missing-cstdint-for-uintptr_t.patch \ " -SRCREV = "fd544473800d02e90bc289434cc44e5aa8fadd0f" +SRCREV = "9431e4b26b4842d1401e80ada9f14593dca3a94c" S = "${WORKDIR}/git" B = "${S}"
Update V4L2 utils to latest git HEAD and drop patches now upstream: 575e0a9f ("media-info: Include missing <cstdint> for uintptr_t") 96022d88 ("configure.ac, Makefile.am: Support building without NLS") Signed-off-by: Marek Vasut <marex@denx.de> --- Cc: Daniel Gomez <daniel@qtec.com> Cc: Khem Raj <raj.khem@gmail.com> Cc: Peter Kjellerstedt <pkj@axis.com> --- ...nclude-missing-cstdint-for-uintptr_t.patch | 31 ------------- ...efile.am-Support-building-without-NL.patch | 45 ------------------- .../v4l2apps/v4l-utils_1.23.0.bb | 4 +- 3 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch delete mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-configure.ac-Makefile.am-Support-building-without-NL.patch