Message ID | 20230308105719.1360985-1-zboszor@gmail.com |
---|---|
State | New |
Headers | show |
Series | [meta-oe] opencv: 4.7.0 | expand |
I have a version already staged in master-next On Wed, Mar 8, 2023 at 2:57 AM Zoltan Boszormenyi <zboszor@gmail.com> wrote: > > Removed an upstream patch. > > Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> > --- > ...ng-header-for-LIBAVCODEC_VERSION_INT.patch | 26 ------------------- > .../{opencv_4.6.0.bb => opencv_4.7.0.bb} | 5 ++-- > 2 files changed, 2 insertions(+), 29 deletions(-) > delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch > rename meta-oe/recipes-support/opencv/{opencv_4.6.0.bb => opencv_4.7.0.bb} (98%) > > diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch b/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch > deleted file mode 100644 > index 59da6ab32..000000000 > --- a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From d6bdd0a91eb0ed57688c0af5ba5088cf0afdc0a0 Mon Sep 17 00:00:00 2001 > -From: Jochen Sprickerhof <jspricke@debian.org> > -Date: Mon, 8 Aug 2022 21:10:13 +0200 > -Subject: [PATCH] Add missing header for LIBAVCODEC_VERSION_INT > - > -Upstream-Status: Backport [https://github.com/opencv/opencv/pull/22357] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - modules/videoio/src/ffmpeg_codecs.hpp | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/modules/videoio/src/ffmpeg_codecs.hpp b/modules/videoio/src/ffmpeg_codecs.hpp > -index 61788e0345..faad2596ed 100644 > ---- a/modules/videoio/src/ffmpeg_codecs.hpp > -+++ b/modules/videoio/src/ffmpeg_codecs.hpp > -@@ -60,6 +60,7 @@ extern "C" { > - #include <errno.h> > - #endif > - > -+#include <libavcodec/version.h> > - #include <libavformat/avformat.h> > - > - #ifdef __cplusplus > --- > -2.38.1 > - > diff --git a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb b/meta-oe/recipes-support/opencv/opencv_4.7.0.bb > similarity index 98% > rename from meta-oe/recipes-support/opencv/opencv_4.6.0.bb > rename to meta-oe/recipes-support/opencv/opencv_4.7.0.bb > index 1e4c3545b..eef2e66ca 100644 > --- a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb > +++ b/meta-oe/recipes-support/opencv/opencv_4.7.0.bb > @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET:armv5 = "arm" > > DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" > > -SRCREV_opencv = "b0dc474160e389b9c9045da5db49d03ae17c6a6b" > -SRCREV_contrib = "7b77c355a8fdc97667b3fa1e7a0d37e4973fc868" > +SRCREV_opencv = "725e440d278aca07d35a5e8963ef990572b07316" > +SRCREV_contrib = "e247b680a6bd396f110274b6c214406a93171350" > SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" > SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" > SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" > @@ -30,7 +30,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol > file://0001-Dont-use-isystem.patch \ > file://download.patch \ > file://0001-Make-ts-module-external.patch \ > - file://0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch \ > file://0008-Do-not-embed-build-directory-in-binaries.patch \ > " > SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" > -- > 2.39.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#101410): https://lists.openembedded.org/g/openembedded-devel/message/101410 > Mute This Topic: https://lists.openembedded.org/mt/97469941/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
I have seen the previously sent patch only after I sent mine. Both are identical changes, so just ignore my patch. Thanks. 2023. 03. 08. 22:58 keltezéssel, Khem Raj írta: > I have a version already staged in master-next > > On Wed, Mar 8, 2023 at 2:57 AM Zoltan Boszormenyi <zboszor@gmail.com> wrote: >> Removed an upstream patch. >> >> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> >> --- >> ...ng-header-for-LIBAVCODEC_VERSION_INT.patch | 26 ------------------- >> .../{opencv_4.6.0.bb => opencv_4.7.0.bb} | 5 ++-- >> 2 files changed, 2 insertions(+), 29 deletions(-) >> delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch >> rename meta-oe/recipes-support/opencv/{opencv_4.6.0.bb => opencv_4.7.0.bb} (98%) >> >> diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch b/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch >> deleted file mode 100644 >> index 59da6ab32..000000000 >> --- a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch >> +++ /dev/null >> @@ -1,26 +0,0 @@ >> -From d6bdd0a91eb0ed57688c0af5ba5088cf0afdc0a0 Mon Sep 17 00:00:00 2001 >> -From: Jochen Sprickerhof <jspricke@debian.org> >> -Date: Mon, 8 Aug 2022 21:10:13 +0200 >> -Subject: [PATCH] Add missing header for LIBAVCODEC_VERSION_INT >> - >> -Upstream-Status: Backport [https://github.com/opencv/opencv/pull/22357] >> -Signed-off-by: Khem Raj <raj.khem@gmail.com> >> ---- >> - modules/videoio/src/ffmpeg_codecs.hpp | 1 + >> - 1 file changed, 1 insertion(+) >> - >> -diff --git a/modules/videoio/src/ffmpeg_codecs.hpp b/modules/videoio/src/ffmpeg_codecs.hpp >> -index 61788e0345..faad2596ed 100644 >> ---- a/modules/videoio/src/ffmpeg_codecs.hpp >> -+++ b/modules/videoio/src/ffmpeg_codecs.hpp >> -@@ -60,6 +60,7 @@ extern "C" { >> - #include <errno.h> >> - #endif >> - >> -+#include <libavcodec/version.h> >> - #include <libavformat/avformat.h> >> - >> - #ifdef __cplusplus >> --- >> -2.38.1 >> - >> diff --git a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb b/meta-oe/recipes-support/opencv/opencv_4.7.0.bb >> similarity index 98% >> rename from meta-oe/recipes-support/opencv/opencv_4.6.0.bb >> rename to meta-oe/recipes-support/opencv/opencv_4.7.0.bb >> index 1e4c3545b..eef2e66ca 100644 >> --- a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb >> +++ b/meta-oe/recipes-support/opencv/opencv_4.7.0.bb >> @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET:armv5 = "arm" >> >> DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" >> >> -SRCREV_opencv = "b0dc474160e389b9c9045da5db49d03ae17c6a6b" >> -SRCREV_contrib = "7b77c355a8fdc97667b3fa1e7a0d37e4973fc868" >> +SRCREV_opencv = "725e440d278aca07d35a5e8963ef990572b07316" >> +SRCREV_contrib = "e247b680a6bd396f110274b6c214406a93171350" >> SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" >> SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" >> SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" >> @@ -30,7 +30,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol >> file://0001-Dont-use-isystem.patch \ >> file://download.patch \ >> file://0001-Make-ts-module-external.patch \ >> - file://0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch \ >> file://0008-Do-not-embed-build-directory-in-binaries.patch \ >> " >> SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" >> -- >> 2.39.2 >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#101410): https://lists.openembedded.org/g/openembedded-devel/message/101410 >> Mute This Topic: https://lists.openembedded.org/mt/97469941/1997914 >> Group Owner: openembedded-devel+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch b/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch deleted file mode 100644 index 59da6ab32..000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d6bdd0a91eb0ed57688c0af5ba5088cf0afdc0a0 Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof <jspricke@debian.org> -Date: Mon, 8 Aug 2022 21:10:13 +0200 -Subject: [PATCH] Add missing header for LIBAVCODEC_VERSION_INT - -Upstream-Status: Backport [https://github.com/opencv/opencv/pull/22357] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - modules/videoio/src/ffmpeg_codecs.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/videoio/src/ffmpeg_codecs.hpp b/modules/videoio/src/ffmpeg_codecs.hpp -index 61788e0345..faad2596ed 100644 ---- a/modules/videoio/src/ffmpeg_codecs.hpp -+++ b/modules/videoio/src/ffmpeg_codecs.hpp -@@ -60,6 +60,7 @@ extern "C" { - #include <errno.h> - #endif - -+#include <libavcodec/version.h> - #include <libavformat/avformat.h> - - #ifdef __cplusplus --- -2.38.1 - diff --git a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb b/meta-oe/recipes-support/opencv/opencv_4.7.0.bb similarity index 98% rename from meta-oe/recipes-support/opencv/opencv_4.6.0.bb rename to meta-oe/recipes-support/opencv/opencv_4.7.0.bb index 1e4c3545b..eef2e66ca 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.7.0.bb @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET:armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "b0dc474160e389b9c9045da5db49d03ae17c6a6b" -SRCREV_contrib = "7b77c355a8fdc97667b3fa1e7a0d37e4973fc868" +SRCREV_opencv = "725e440d278aca07d35a5e8963ef990572b07316" +SRCREV_contrib = "e247b680a6bd396f110274b6c214406a93171350" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" @@ -30,7 +30,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol file://0001-Dont-use-isystem.patch \ file://download.patch \ file://0001-Make-ts-module-external.patch \ - file://0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch \ file://0008-Do-not-embed-build-directory-in-binaries.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"
Removed an upstream patch. Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> --- ...ng-header-for-LIBAVCODEC_VERSION_INT.patch | 26 ------------------- .../{opencv_4.6.0.bb => opencv_4.7.0.bb} | 5 ++-- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch rename meta-oe/recipes-support/opencv/{opencv_4.6.0.bb => opencv_4.7.0.bb} (98%)