* [dunfel 01/32] zchunk: upgrade 1.1.5 -> 1.1.6
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 0:06 ` [dunfel 02/32] uriparser: upgrade 0.9.3 -> 0.9.4 akuster
` (30 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Pierre-Jean Texier <pjtexier@koncepto.io>
- Remove patches already in version
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit d3e33a705a0bf36fe2876ae59e1bfed0f52e27e1)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../zchunk/0001-zck.h-fix-build-on-musl.patch | 39 ------------
.../0002-unzck-fix-build-with-musl-libc.patch | 61 -------------------
.../{zchunk_1.1.5.bb => zchunk_1.1.6.bb} | 8 +--
3 files changed, 2 insertions(+), 106 deletions(-)
delete mode 100644 meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
delete mode 100644 meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
rename meta-oe/recipes-support/zchunk/{zchunk_1.1.5.bb => zchunk_1.1.6.bb} (66%)
diff --git a/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch b/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
deleted file mode 100644
index 64e0e8ed61..0000000000
--- a/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 78247d478cec254bad27f4ed97b532f4f54bf1b0 Mon Sep 17 00:00:00 2001
-From: Pierre-Jean Texier <pjtexier@koncepto.io>
-Date: Thu, 23 Jan 2020 19:14:40 +0100
-Subject: [PATCH 1/2] zck.h: fix build on musl
-
-The ssize_t type requires the <sys/types.h> header. This fixes build with musl
-libc:
-
-include/zck.h:68:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
- 68 | ssize_t zck_read(zckCtx *zck, char *dst, size_t dst_size)
- | ^~~~~~~
- | size_t
-include/zck.h:81:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
- 81 | ssize_t zck_write(zckCtx *zck, const char *src, const size_t src_size)
- | ^~~~~~~
- | size_t
-
-Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/23]
-
-Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
----
- include/zck.h.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/zck.h.in b/include/zck.h.in
-index 91d2557..b847576 100644
---- a/include/zck.h.in
-+++ b/include/zck.h.in
-@@ -5,6 +5,7 @@
-
- #include <stdlib.h>
- #include <stdbool.h>
-+#include <sys/types.h>
-
- typedef enum zck_hash {
- ZCK_HASH_SHA1,
---
-2.7.4
-
diff --git a/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch b/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
deleted file mode 100644
index a1c95bf362..0000000000
--- a/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 72c55e3da59eccdfea3778d11f83862b58af723d Mon Sep 17 00:00:00 2001
-From: Pierre-Jean Texier <pjtexier@koncepto.io>
-Date: Thu, 23 Jan 2020 22:42:40 +0100
-Subject: [PATCH 2/2] unzck: fix build with musl libc
-
-On musl libc "stdout" is a preprocessor macro whose expansion leads to
-compilation errors.
-
-Fixes:
-
-| In file included from ../git/src/unzck.c:31:
-| ../git/src/unzck.c: In function 'parse_opt':
-| ../git/src/unzck.c:78:24: error: expected identifier before '(' token
-| 78 | arguments->stdout = true;
-| | ^~~~~~
-| ../git/src/unzck.c: In function 'main':
-| ../git/src/unzck.c:141:20: error: expected identifier before '(' token
-| 141 | if(!(arguments.stdout)) {
-| | ^~~~~~
-
-Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/23]
-
-Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
----
- src/unzck.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/unzck.c b/src/unzck.c
-index 8d6c62a..002492c 100644
---- a/src/unzck.c
-+++ b/src/unzck.c
-@@ -58,7 +58,7 @@ struct arguments {
- char *args[1];
- zck_log_type log_level;
- bool dict;
-- bool stdout;
-+ bool stdOut;
- bool exit;
- };
-
-@@ -75,7 +75,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) {
- arguments->log_level = ZCK_LOG_DDEBUG;
- break;
- case 'c':
-- arguments->stdout = true;
-+ arguments->stdOut = true;
- break;
- case 'V':
- version();
-@@ -138,7 +138,7 @@ int main (int argc, char *argv[]) {
- snprintf(out_name + strlen(base_name) - 4, 7, ".zdict");
-
- int dst_fd = STDOUT_FILENO;
-- if(!arguments.stdout) {
-+ if(!arguments.stdOut) {
- dst_fd = open(out_name, O_TRUNC | O_WRONLY | O_CREAT, 0666);
- if(dst_fd < 0) {
- dprintf(STDERR_FILENO, "Unable to open %s", out_name);
---
-2.7.4
-
diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb b/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb
similarity index 66%
rename from meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb
rename to meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb
index f75412f49e..e041132b1c 100644
--- a/meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb
+++ b/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb
@@ -4,13 +4,9 @@ AUTHOR = "Jonathan Dieter"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f"
-SRC_URI = " \
- git://github.com/zchunk/zchunk.git;protocol=https \
- file://0001-zck.h-fix-build-on-musl.patch \
- file://0002-unzck-fix-build-with-musl-libc.patch \
- "
+SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https"
-SRCREV = "c01bf12feede792982f165f52f4a6c573e3a8c17"
+SRCREV = "f5593aa11584faa691c81b4898f0aaded47f8bf7"
S = "${WORKDIR}/git"
DEPENDS = "\
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 02/32] uriparser: upgrade 0.9.3 -> 0.9.4
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
2020-07-01 0:06 ` [dunfel 01/32] zchunk: upgrade 1.1.5 -> 1.1.6 akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 0:06 ` [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3 akuster
` (29 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Pierre-Jean Texier <pjtexier@koncepto.io>
License-Update: copyright years updated
Changelog:
2020-05-31 -- 0.9.4
* Fixed: testrunner: No longer crashes when compiled with NDEBUG (GitHub #67)
* Fixed: CMake: Support GTest 1.8.0 (GitHub #68)
Thanks to Ryan Schmidt for the related report!
* Fixed: CMake: Use variable GTEST_INCLUDE_DIRS (with plural "S") rather than
GTEST_INCLUDE_DIR (GitHub #79, #81)
Thanks to Wouter Beek for the related report!
* Improved: CMake: Send config summary to stdout, not stderr (GitHub #72)
Thanks to Scott Donelan for the patch!
* Improved: Make -DURIPARSER_BUILD_TESTS=OFF unlock compilation without
a C++ compiler; thanks to Fabrice Fontaine for the patch! (GitHub #69)
* Added: Functions to make UriUri[AW] instances independent of the original
URI string (GitHub #77 and #78)
New functions:
uriMakeOwner[AW]
uriMakeOwnerMm[AW]
* Added: CMake option URIPARSER_ENABLE_INSTALL to toggle installation of
files, defaults to "ON" (GitHub #74, #75)
Thanks to Scott Donelan for the patch!
* Soname: 1:26:0
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 27adb9336cda4eea9fcd2e881807756f6d53eae0)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../uriparser/{uriparser_0.9.3.bb => uriparser_0.9.4.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/uriparser/{uriparser_0.9.3.bb => uriparser_0.9.4.bb} (64%)
diff --git a/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb b/meta-oe/recipes-support/uriparser/uriparser_0.9.4.bb
similarity index 64%
rename from meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb
rename to meta-oe/recipes-support/uriparser/uriparser_0.9.4.bb
index da52bb5a36..d02cf5de8e 100644
--- a/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb
+++ b/meta-oe/recipes-support/uriparser/uriparser_0.9.4.bb
@@ -2,11 +2,10 @@ SUMMARY = "RFC 3986 compliant URI parsing library"
HOMEPAGE = "https://uriparser.github.io"
LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fc3bbde670fc6e95392a0e23bf57bda0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168"
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz"
-SRC_URI[md5sum] = "9874b64f6f4ff656f3f69598e38f12b7"
-SRC_URI[sha256sum] = "6cef39d6eaf1a48504ee0264ce85f078758057dafb1edd0a898183b55ff76014"
+SRC_URI[sha256sum] = "095e8a358a9ccbbef9d1f10d40495ca0fcb3d4490a948ba6449b213a66e08ef0"
UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
2020-07-01 0:06 ` [dunfel 01/32] zchunk: upgrade 1.1.5 -> 1.1.6 akuster
2020-07-01 0:06 ` [dunfel 02/32] uriparser: upgrade 0.9.3 -> 0.9.4 akuster
@ 2020-07-01 0:06 ` akuster
2020-07-09 15:21 ` [oe] " Martin Jansa
2020-07-01 0:06 ` [dunfel 04/32] proj: upgrade 7.0.0 -> 7.0.1 akuster
` (28 subsequent siblings)
31 siblings, 1 reply; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Pierre-Jean Texier <pjtexier@koncepto.io>
See full changelog https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 65e124eef373680726ac045677cbec7d9080a289)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../jsoncpp/{jsoncpp_1.9.2.bb => jsoncpp_1.9.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-devtools/jsoncpp/{jsoncpp_1.9.2.bb => jsoncpp_1.9.3.bb} (93%)
diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
similarity index 93%
rename from meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
rename to meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
index a88410f2ff..97c6361ad8 100644
--- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
+++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
@@ -11,7 +11,7 @@ SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b"
-SRCREV = "d2e6a971f4544c55b8e3b25cf96db266971b778f"
+SRCREV = "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2"
SRC_URI = "git://github.com/open-source-parsers/jsoncpp"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3
2020-07-01 0:06 ` [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3 akuster
@ 2020-07-09 15:21 ` Martin Jansa
2020-07-09 16:06 ` akuster
0 siblings, 1 reply; 48+ messages in thread
From: Martin Jansa @ 2020-07-09 15:21 UTC (permalink / raw)
To: akuster; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1650 bytes --]
FYI this "small" upgrade changes ABI version from libjsoncpp22
to libjsoncpp24 which might cause some issues to people who expect
relatively stable ABIs in LTS dunfell.
On Wed, Jul 1, 2020 at 2:07 AM akuster <akuster808@gmail.com> wrote:
> From: Pierre-Jean Texier <pjtexier@koncepto.io>
>
> See full changelog
> https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3
>
> Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> (cherry picked from commit 65e124eef373680726ac045677cbec7d9080a289)
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
> .../jsoncpp/{jsoncpp_1.9.2.bb => jsoncpp_1.9.3.bb} | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> rename meta-oe/recipes-devtools/jsoncpp/{jsoncpp_1.9.2.bb =>
> jsoncpp_1.9.3.bb} (93%)
>
> diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
> b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
> similarity index 93%
> rename from meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
> rename to meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
> index a88410f2ff..97c6361ad8 100644
> --- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
> +++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
> @@ -11,7 +11,7 @@ SECTION = "libs"
> LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b"
>
> -SRCREV = "d2e6a971f4544c55b8e3b25cf96db266971b778f"
> +SRCREV = "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2"
> SRC_URI = "git://github.com/open-source-parsers/jsoncpp"
>
> S = "${WORKDIR}/git"
> --
> 2.17.1
>
>
>
[-- Attachment #2: Type: text/html, Size: 3257 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3
2020-07-09 15:21 ` [oe] " Martin Jansa
@ 2020-07-09 16:06 ` akuster
2020-07-09 16:48 ` Martin Jansa
0 siblings, 1 reply; 48+ messages in thread
From: akuster @ 2020-07-09 16:06 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2559 bytes --]
On 7/9/20 8:21 AM, Martin Jansa wrote:
> FYI this "small" upgrade changes ABI version from libjsoncpp22
> to libjsoncpp24 which might cause some issues to people who expect
> relatively stable ABIs in LTS dunfell.
Well that is not good. I did look at the details but apparently I failed
to catch the "soversion" change.
Would you recommend reverting this?
-armin
>
> On Wed, Jul 1, 2020 at 2:07 AM akuster <akuster808@gmail.com
> <mailto:akuster808@gmail.com>> wrote:
>
> From: Pierre-Jean Texier <pjtexier@koncepto.io
> <mailto:pjtexier@koncepto.io>>
>
> See full changelog
> https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3
>
> Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io
> <mailto:pjtexier@koncepto.io>>
> Signed-off-by: Khem Raj <raj.khem@gmail.com
> <mailto:raj.khem@gmail.com>>
> (cherry picked from commit 65e124eef373680726ac045677cbec7d9080a289)
> Signed-off-by: Armin Kuster <akuster808@gmail.com
> <mailto:akuster808@gmail.com>>
> ---
> .../jsoncpp/{jsoncpp_1.9.2.bb <http://jsoncpp_1.9.2.bb> =>
> jsoncpp_1.9.3.bb <http://jsoncpp_1.9.3.bb>} | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> rename meta-oe/recipes-devtools/jsoncpp/{jsoncpp_1.9.2.bb
> <http://jsoncpp_1.9.2.bb> => jsoncpp_1.9.3.bb
> <http://jsoncpp_1.9.3.bb>} (93%)
>
> diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
> <http://jsoncpp_1.9.2.bb>
> b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
> <http://jsoncpp_1.9.3.bb>
> similarity index 93%
> rename from meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
> <http://jsoncpp_1.9.2.bb>
> rename to meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
> <http://jsoncpp_1.9.3.bb>
> index a88410f2ff..97c6361ad8 100644
> --- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
> <http://jsoncpp_1.9.2.bb>
> +++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
> <http://jsoncpp_1.9.3.bb>
> @@ -11,7 +11,7 @@ SECTION = "libs"
> LICENSE = "MIT"
> LIC_FILES_CHKSUM =
> "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b"
>
> -SRCREV = "d2e6a971f4544c55b8e3b25cf96db266971b778f"
> +SRCREV = "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2"
> SRC_URI = "git://github.com/open-source-parsers/jsoncpp
> <http://github.com/open-source-parsers/jsoncpp>"
>
> S = "${WORKDIR}/git"
> --
> 2.17.1
>
>
>
[-- Attachment #2: Type: text/html, Size: 5342 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3
2020-07-09 16:06 ` akuster
@ 2020-07-09 16:48 ` Martin Jansa
2020-07-10 1:08 ` Khem Raj
0 siblings, 1 reply; 48+ messages in thread
From: Martin Jansa @ 2020-07-09 16:48 UTC (permalink / raw)
To: akuster808; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2489 bytes --]
I don't have a strong opinion about this one.
It's easy enough to undo by downstream layers if they care about ABI.
At LGE we do have some prebuilt binaries which use jsoncpp, so we do care,
but haven't updated to dunfell yet and when we do get those prebuilt
binaries to be rebuilt, we might as well use newer jsoncpp (and in that
case might backport this upgrade anyway even if it gets reverted in
dunfell).
Maybe someone else will share an opinion on this as well.
On Thu, Jul 9, 2020 at 6:06 PM akuster808 <akuster808@gmail.com> wrote:
>
>
> On 7/9/20 8:21 AM, Martin Jansa wrote:
>
> FYI this "small" upgrade changes ABI version from libjsoncpp22
> to libjsoncpp24 which might cause some issues to people who expect
> relatively stable ABIs in LTS dunfell.
>
>
> Well that is not good. I did look at the details but apparently I failed
> to catch the "soversion" change.
>
> Would you recommend reverting this?
>
> -armin
>
>
> On Wed, Jul 1, 2020 at 2:07 AM akuster <akuster808@gmail.com> wrote:
>
>> From: Pierre-Jean Texier <pjtexier@koncepto.io>
>>
>> See full changelog
>> https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3
>>
>> Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> (cherry picked from commit 65e124eef373680726ac045677cbec7d9080a289)
>> Signed-off-by: Armin Kuster <akuster808@gmail.com>
>> ---
>> .../jsoncpp/{jsoncpp_1.9.2.bb => jsoncpp_1.9.3.bb} | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> rename meta-oe/recipes-devtools/jsoncpp/{jsoncpp_1.9.2.bb =>
>> jsoncpp_1.9.3.bb} (93%)
>>
>> diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
>> b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
>> similarity index 93%
>> rename from meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
>> rename to meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
>> index a88410f2ff..97c6361ad8 100644
>> --- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
>> +++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
>> @@ -11,7 +11,7 @@ SECTION = "libs"
>> LICENSE = "MIT"
>> LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b"
>>
>> -SRCREV = "d2e6a971f4544c55b8e3b25cf96db266971b778f"
>> +SRCREV = "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2"
>> SRC_URI = "git://github.com/open-source-parsers/jsoncpp"
>>
>> S = "${WORKDIR}/git"
>> --
>> 2.17.1
>>
>>
>>
>
>
[-- Attachment #2: Type: text/html, Size: 5132 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3
2020-07-09 16:48 ` Martin Jansa
@ 2020-07-10 1:08 ` Khem Raj
2020-07-10 7:37 ` Mikko Rapeli
2020-07-10 15:55 ` akuster
0 siblings, 2 replies; 48+ messages in thread
From: Khem Raj @ 2020-07-10 1:08 UTC (permalink / raw)
To: Martin Jansa, akuster808; +Cc: openembedded-devel
On 7/9/20 9:48 AM, Martin Jansa wrote:
> I don't have a strong opinion about this one.
>
> It's easy enough to undo by downstream layers if they care about ABI.
>
> At LGE we do have some prebuilt binaries which use jsoncpp, so we do
> care, but haven't updated to dunfell yet and when we do get those
> prebuilt binaries to be rebuilt, we might as well use newer jsoncpp (and
> in that case might backport this upgrade anyway even if it gets reverted
> in dunfell).
>
> Maybe someone else will share an opinion on this as well.
I checked https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3
and it does not mention ABI change there from 1.9.2 to 1.9.3
but then I see
https://github.com/open-source-parsers/jsoncpp/commit/8b7ea09b8055df01866a5ce4142b12ed8f9f13eb
I dont know if there are API changes which means it will need porting
effors for users or is it just a relinking that is needed.
>
> On Thu, Jul 9, 2020 at 6:06 PM akuster808 <akuster808@gmail.com
> <mailto:akuster808@gmail.com>> wrote:
>
>
>
> On 7/9/20 8:21 AM, Martin Jansa wrote:
>> FYI this "small" upgrade changes ABI version from libjsoncpp22
>> to libjsoncpp24 which might cause some issues to people who expect
>> relatively stable ABIs in LTS dunfell.
>
> Well that is not good. I did look at the details but apparently I
> failed to catch the "soversion" change.
>
> Would you recommend reverting this?
>
> -armin
>>
>> On Wed, Jul 1, 2020 at 2:07 AM akuster <akuster808@gmail.com
>> <mailto:akuster808@gmail.com>> wrote:
>>
>> From: Pierre-Jean Texier <pjtexier@koncepto.io
>> <mailto:pjtexier@koncepto.io>>
>>
>> See full changelog
>> https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3
>>
>> Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io
>> <mailto:pjtexier@koncepto.io>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com
>> <mailto:raj.khem@gmail.com>>
>> (cherry picked from commit
>> 65e124eef373680726ac045677cbec7d9080a289)
>> Signed-off-by: Armin Kuster <akuster808@gmail.com
>> <mailto:akuster808@gmail.com>>
>> ---
>> .../jsoncpp/{jsoncpp_1.9.2.bb <http://jsoncpp_1.9.2.bb> =>
>> jsoncpp_1.9.3.bb <http://jsoncpp_1.9.3.bb>} | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> rename meta-oe/recipes-devtools/jsoncpp/{jsoncpp_1.9.2.bb
>> <http://jsoncpp_1.9.2.bb> => jsoncpp_1.9.3.bb
>> <http://jsoncpp_1.9.3.bb>} (93%)
>>
>> diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
>> <http://jsoncpp_1.9.2.bb>
>> b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
>> <http://jsoncpp_1.9.3.bb>
>> similarity index 93%
>> rename from meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
>> <http://jsoncpp_1.9.2.bb>
>> rename to meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
>> <http://jsoncpp_1.9.3.bb>
>> index a88410f2ff..97c6361ad8 100644
>> --- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
>> <http://jsoncpp_1.9.2.bb>
>> +++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
>> <http://jsoncpp_1.9.3.bb>
>> @@ -11,7 +11,7 @@ SECTION = "libs"
>> LICENSE = "MIT"
>> LIC_FILES_CHKSUM =
>> "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b"
>>
>> -SRCREV = "d2e6a971f4544c55b8e3b25cf96db266971b778f"
>> +SRCREV = "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2"
>> SRC_URI = "git://github.com/open-source-parsers/jsoncpp
>> <http://github.com/open-source-parsers/jsoncpp>"
>>
>> S = "${WORKDIR}/git"
>> --
>> 2.17.1
>>
>>
>
>
>
>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3
2020-07-10 1:08 ` Khem Raj
@ 2020-07-10 7:37 ` Mikko Rapeli
2020-07-12 18:41 ` akuster
2020-07-10 15:55 ` akuster
1 sibling, 1 reply; 48+ messages in thread
From: Mikko Rapeli @ 2020-07-10 7:37 UTC (permalink / raw)
To: raj.khem; +Cc: Martin.Jansa, akuster808, openembedded-devel
Hi,
jsoncpp seems to have messy ABI history so I would not update even minor versions
in stable branch:
https://abi-laboratory.pro/index.php?view=timeline&l=jsoncpp
Cheers,
-Mikko
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3
2020-07-10 7:37 ` Mikko Rapeli
@ 2020-07-12 18:41 ` akuster
2020-07-13 8:25 ` Mikko Rapeli
0 siblings, 1 reply; 48+ messages in thread
From: akuster @ 2020-07-12 18:41 UTC (permalink / raw)
To: Mikko.Rapeli, raj.khem; +Cc: Martin.Jansa, openembedded-devel
On 7/10/20 12:37 AM, Mikko.Rapeli@bmw.de wrote:
> Hi,
>
> jsoncpp seems to have messy ABI history so I would not update even minor versions
> in stable branch:
so are you for a revert?
-armin
> https://abi-laboratory.pro/index.php?view=timeline&l=jsoncpp
>
> Cheers,
>
> -Mikko
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3
2020-07-12 18:41 ` akuster
@ 2020-07-13 8:25 ` Mikko Rapeli
2020-07-13 15:46 ` Khem Raj
0 siblings, 1 reply; 48+ messages in thread
From: Mikko Rapeli @ 2020-07-13 8:25 UTC (permalink / raw)
To: akuster808; +Cc: raj.khem, Martin.Jansa, openembedded-devel
Hi,
On Sun, Jul 12, 2020 at 11:41:58AM -0700, akuster wrote:
>
>
> On 7/10/20 12:37 AM, Mikko.Rapeli@bmw.de wrote:
> > Hi,
> >
> > jsoncpp seems to have messy ABI history so I would not update even minor versions
> > in stable branch:
> so are you for a revert?
Yes, I would prefer a revert.
-Mikko
> -armin
> > https://abi-laboratory.pro/index.php?view=timeline&l=jsoncpp
> >
> > Cheers,
> >
> > -Mikko
>
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3
2020-07-13 8:25 ` Mikko Rapeli
@ 2020-07-13 15:46 ` Khem Raj
2020-07-15 3:52 ` akuster
0 siblings, 1 reply; 48+ messages in thread
From: Khem Raj @ 2020-07-13 15:46 UTC (permalink / raw)
To: Mikko Rapeli; +Cc: Armin Kuster, Martin Jansa, openembeded-devel
On Mon, Jul 13, 2020 at 1:25 AM <Mikko.Rapeli@bmw.de> wrote:
>
> Hi,
>
> On Sun, Jul 12, 2020 at 11:41:58AM -0700, akuster wrote:
> >
> >
> > On 7/10/20 12:37 AM, Mikko.Rapeli@bmw.de wrote:
> > > Hi,
> > >
> > > jsoncpp seems to have messy ABI history so I would not update even minor versions
> > > in stable branch:
> > so are you for a revert?
>
> Yes, I would prefer a revert.
I think that's fine. Armin can you include this in your latest pull
review bundle, please?
>
> -Mikko
>
> > -armin
> > > https://abi-laboratory.pro/index.php?view=timeline&l=jsoncpp
> > >
> > > Cheers,
> > >
> > > -Mikko
> >
>
> >
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3
2020-07-13 15:46 ` Khem Raj
@ 2020-07-15 3:52 ` akuster
0 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-15 3:52 UTC (permalink / raw)
To: Khem Raj, Mikko Rapeli; +Cc: Martin Jansa, openembeded-devel
On 7/13/20 8:46 AM, Khem Raj wrote:
> On Mon, Jul 13, 2020 at 1:25 AM <Mikko.Rapeli@bmw.de> wrote:
>> Hi,
>>
>> On Sun, Jul 12, 2020 at 11:41:58AM -0700, akuster wrote:
>>>
>>> On 7/10/20 12:37 AM, Mikko.Rapeli@bmw.de wrote:
>>>> Hi,
>>>>
>>>> jsoncpp seems to have messy ABI history so I would not update even minor versions
>>>> in stable branch:
>>> so are you for a revert?
>> Yes, I would prefer a revert.
> I think that's fine. Armin can you include this in your latest pull
> review bundle, please?
Sure. I have a few more things to capture too.
-armin
>
>> -Mikko
>>
>>> -armin
>>>> https://abi-laboratory.pro/index.php?view=timeline&l=jsoncpp
>>>>
>>>> Cheers,
>>>>
>>>> -Mikko
>>>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3
2020-07-10 1:08 ` Khem Raj
2020-07-10 7:37 ` Mikko Rapeli
@ 2020-07-10 15:55 ` akuster
2020-07-10 16:18 ` Khem Raj
1 sibling, 1 reply; 48+ messages in thread
From: akuster @ 2020-07-10 15:55 UTC (permalink / raw)
To: Khem Raj, Martin Jansa; +Cc: openembedded-devel
On 7/9/20 6:08 PM, Khem Raj wrote:
>
> On 7/9/20 9:48 AM, Martin Jansa wrote:
>> I don't have a strong opinion about this one.
>>
>> It's easy enough to undo by downstream layers if they care about ABI.
>>
>> At LGE we do have some prebuilt binaries which use jsoncpp, so we do
>> care, but haven't updated to dunfell yet and when we do get those
>> prebuilt binaries to be rebuilt, we might as well use newer jsoncpp (and
>> in that case might backport this upgrade anyway even if it gets reverted
>> in dunfell).
>>
>> Maybe someone else will share an opinion on this as well.
> I checked https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3
>
> and it does not mention ABI change there from 1.9.2 to 1.9.3
that what lead me to believe it was worthy of backport.
>
> but then I see
>
> https://github.com/open-source-parsers/jsoncpp/commit/8b7ea09b8055df01866a5ce4142b12ed8f9f13eb
>
> I dont know if there are API changes which means it will need porting
> effors for users or is it just a relinking that is needed.
Same conclusion I came to. Still the question is open. Should this be
reverted?
-armin
>> On Thu, Jul 9, 2020 at 6:06 PM akuster808 <akuster808@gmail.com
>> <mailto:akuster808@gmail.com>> wrote:
>>
>>
>>
>> On 7/9/20 8:21 AM, Martin Jansa wrote:
>>> FYI this "small" upgrade changes ABI version from libjsoncpp22
>>> to libjsoncpp24 which might cause some issues to people who expect
>>> relatively stable ABIs in LTS dunfell.
>> Well that is not good. I did look at the details but apparently I
>> failed to catch the "soversion" change.
>>
>> Would you recommend reverting this?
>>
>> -armin
>>> On Wed, Jul 1, 2020 at 2:07 AM akuster <akuster808@gmail.com
>>> <mailto:akuster808@gmail.com>> wrote:
>>>
>>> From: Pierre-Jean Texier <pjtexier@koncepto.io
>>> <mailto:pjtexier@koncepto.io>>
>>>
>>> See full changelog
>>> https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3
>>>
>>> Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io
>>> <mailto:pjtexier@koncepto.io>>
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com
>>> <mailto:raj.khem@gmail.com>>
>>> (cherry picked from commit
>>> 65e124eef373680726ac045677cbec7d9080a289)
>>> Signed-off-by: Armin Kuster <akuster808@gmail.com
>>> <mailto:akuster808@gmail.com>>
>>> ---
>>> .../jsoncpp/{jsoncpp_1.9.2.bb <http://jsoncpp_1.9.2.bb> =>
>>> jsoncpp_1.9.3.bb <http://jsoncpp_1.9.3.bb>} | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>> rename meta-oe/recipes-devtools/jsoncpp/{jsoncpp_1.9.2.bb
>>> <http://jsoncpp_1.9.2.bb> => jsoncpp_1.9.3.bb
>>> <http://jsoncpp_1.9.3.bb>} (93%)
>>>
>>> diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
>>> <http://jsoncpp_1.9.2.bb>
>>> b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
>>> <http://jsoncpp_1.9.3.bb>
>>> similarity index 93%
>>> rename from meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
>>> <http://jsoncpp_1.9.2.bb>
>>> rename to meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
>>> <http://jsoncpp_1.9.3.bb>
>>> index a88410f2ff..97c6361ad8 100644
>>> --- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
>>> <http://jsoncpp_1.9.2.bb>
>>> +++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
>>> <http://jsoncpp_1.9.3.bb>
>>> @@ -11,7 +11,7 @@ SECTION = "libs"
>>> LICENSE = "MIT"
>>> LIC_FILES_CHKSUM =
>>> "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b"
>>>
>>> -SRCREV = "d2e6a971f4544c55b8e3b25cf96db266971b778f"
>>> +SRCREV = "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2"
>>> SRC_URI = "git://github.com/open-source-parsers/jsoncpp
>>> <http://github.com/open-source-parsers/jsoncpp>"
>>>
>>> S = "${WORKDIR}/git"
>>> --
>>> 2.17.1
>>>
>>>
>>
>>
>>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3
2020-07-10 15:55 ` akuster
@ 2020-07-10 16:18 ` Khem Raj
0 siblings, 0 replies; 48+ messages in thread
From: Khem Raj @ 2020-07-10 16:18 UTC (permalink / raw)
To: akuster808, Martin Jansa; +Cc: openembedded-devel
On 7/10/20 8:55 AM, akuster808 wrote:
>
>
> On 7/9/20 6:08 PM, Khem Raj wrote:
>>
>> On 7/9/20 9:48 AM, Martin Jansa wrote:
>>> I don't have a strong opinion about this one.
>>>
>>> It's easy enough to undo by downstream layers if they care about ABI.
>>>
>>> At LGE we do have some prebuilt binaries which use jsoncpp, so we do
>>> care, but haven't updated to dunfell yet and when we do get those
>>> prebuilt binaries to be rebuilt, we might as well use newer jsoncpp (and
>>> in that case might backport this upgrade anyway even if it gets reverted
>>> in dunfell).
>>>
>>> Maybe someone else will share an opinion on this as well.
>> I checked https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3
>>
>> and it does not mention ABI change there from 1.9.2 to 1.9.3
> that what lead me to believe it was worthy of backport.
>>
>> but then I see
>>
>> https://github.com/open-source-parsers/jsoncpp/commit/8b7ea09b8055df01866a5ce4142b12ed8f9f13eb
>>
>> I dont know if there are API changes which means it will need porting
>> effors for users or is it just a relinking that is needed.
>
> Same conclusion I came to. Still the question is open. Should this be
> reverted?
from my own usecase it does not matter since dunfell is still under
porting effort and any version can be used, but others might have
different view.
>
> -armin
>>> On Thu, Jul 9, 2020 at 6:06 PM akuster808 <akuster808@gmail.com
>>> <mailto:akuster808@gmail.com>> wrote:
>>>
>>>
>>>
>>> On 7/9/20 8:21 AM, Martin Jansa wrote:
>>>> FYI this "small" upgrade changes ABI version from libjsoncpp22
>>>> to libjsoncpp24 which might cause some issues to people who expect
>>>> relatively stable ABIs in LTS dunfell.
>>> Well that is not good. I did look at the details but apparently I
>>> failed to catch the "soversion" change.
>>>
>>> Would you recommend reverting this?
>>>
>>> -armin
>>>> On Wed, Jul 1, 2020 at 2:07 AM akuster <akuster808@gmail.com
>>>> <mailto:akuster808@gmail.com>> wrote:
>>>>
>>>> From: Pierre-Jean Texier <pjtexier@koncepto.io
>>>> <mailto:pjtexier@koncepto.io>>
>>>>
>>>> See full changelog
>>>> https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3
>>>>
>>>> Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io
>>>> <mailto:pjtexier@koncepto.io>>
>>>> Signed-off-by: Khem Raj <raj.khem@gmail.com
>>>> <mailto:raj.khem@gmail.com>>
>>>> (cherry picked from commit
>>>> 65e124eef373680726ac045677cbec7d9080a289)
>>>> Signed-off-by: Armin Kuster <akuster808@gmail.com
>>>> <mailto:akuster808@gmail.com>>
>>>> ---
>>>> .../jsoncpp/{jsoncpp_1.9.2.bb <http://jsoncpp_1.9.2.bb> =>
>>>> jsoncpp_1.9.3.bb <http://jsoncpp_1.9.3.bb>} | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>> rename meta-oe/recipes-devtools/jsoncpp/{jsoncpp_1.9.2.bb
>>>> <http://jsoncpp_1.9.2.bb> => jsoncpp_1.9.3.bb
>>>> <http://jsoncpp_1.9.3.bb>} (93%)
>>>>
>>>> diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
>>>> <http://jsoncpp_1.9.2.bb>
>>>> b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
>>>> <http://jsoncpp_1.9.3.bb>
>>>> similarity index 93%
>>>> rename from meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
>>>> <http://jsoncpp_1.9.2.bb>
>>>> rename to meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
>>>> <http://jsoncpp_1.9.3.bb>
>>>> index a88410f2ff..97c6361ad8 100644
>>>> --- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb
>>>> <http://jsoncpp_1.9.2.bb>
>>>> +++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb
>>>> <http://jsoncpp_1.9.3.bb>
>>>> @@ -11,7 +11,7 @@ SECTION = "libs"
>>>> LICENSE = "MIT"
>>>> LIC_FILES_CHKSUM =
>>>> "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b"
>>>>
>>>> -SRCREV = "d2e6a971f4544c55b8e3b25cf96db266971b778f"
>>>> +SRCREV = "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2"
>>>> SRC_URI = "git://github.com/open-source-parsers/jsoncpp
>>>> <http://github.com/open-source-parsers/jsoncpp>"
>>>>
>>>> S = "${WORKDIR}/git"
>>>> --
>>>> 2.17.1
>>>>
>>>>
>>>
>>>
>>>
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [dunfel 04/32] proj: upgrade 7.0.0 -> 7.0.1
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (2 preceding siblings ...)
2020-07-01 0:06 ` [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3 akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 0:06 ` [dunfel 05/32] netkit-rsh: properly append PACKAGECONFIG akuster
` (27 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
-Added md5 verification.
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit adedd567be1b10f725b5fcd55cb61af856fb3316)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-navigation/proj/{proj_7.0.0.bb => proj_7.0.1.bb} | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
rename meta-oe/recipes-navigation/proj/{proj_7.0.0.bb => proj_7.0.1.bb} (75%)
diff --git a/meta-oe/recipes-navigation/proj/proj_7.0.0.bb b/meta-oe/recipes-navigation/proj/proj_7.0.1.bb
similarity index 75%
rename from meta-oe/recipes-navigation/proj/proj_7.0.0.bb
rename to meta-oe/recipes-navigation/proj/proj_7.0.1.bb
index 44674244ef..2cfaa7121b 100644
--- a/meta-oe/recipes-navigation/proj/proj_7.0.0.bb
+++ b/meta-oe/recipes-navigation/proj/proj_7.0.1.bb
@@ -6,7 +6,9 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=74d9aaec5fa0cd734341e8c4dc91b608"
SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.gz"
-SRC_URI[sha256sum] = "ee0e14c1bd2f9429b1a28999240304c0342ed739ebaea3d4ff44c585b1097be8"
+
+SRC_URI[md5sum] = "5ba7536b579a6c9e0ad822dbdd455985"
+SRC_URI[sha256sum] = "a7026d39c9c80d51565cfc4b33d22631c11e491004e19020b3ff5a0791e1779f"
DEPENDS = "sqlite3 sqlite3-native tiff"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 05/32] netkit-rsh: properly append PACKAGECONFIG
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (3 preceding siblings ...)
2020-07-01 0:06 ` [dunfel 04/32] proj: upgrade 7.0.0 -> 7.0.1 akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 0:06 ` [dunfel 06/32] zile: " akuster
` (26 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Konrad Weihmann <kweihmann@outlook.com>
As ??= assignment will be overwritten by += in any case,
one can't define a default of PACKAGECONFIG in this recipe.
Using _append instead mitigates chances of accidental overwriting
the default
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 4cca3eff387dc6630915ba4238b97712589308b8)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
index a6716d06ce..f6c05daa18 100644
--- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
+++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
@@ -37,7 +37,7 @@ CFLAGS += " -D_GNU_SOURCE -Wno-deprecated-declarations"
LDFLAGS += " -L${STAGING_LIBDIR} -lutil -lcrypt"
PACKAGECONFIG ??= ""
-PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
+PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
PACKAGECONFIG[pam] = " , --without-pam, libpam, libpam"
COMPATIBLE_HOST_libc-musl = 'null'
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 06/32] zile: properly append PACKAGECONFIG
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (4 preceding siblings ...)
2020-07-01 0:06 ` [dunfel 05/32] netkit-rsh: properly append PACKAGECONFIG akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 0:06 ` [dunfel 07/32] postgresql: 12.2 -> 12.3 akuster
` (25 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Konrad Weihmann <kweihmann@outlook.com>
As ??= assignment will be overwritten by += in any case,
one can't define a default of PACKAGECONFIG in this recipe.
Using _append instead mitigates chances of accidental overwriting
the default
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1a1194a92bca9276676679588a4cda9ff31713ee)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-support/zile/zile_2.4.14.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/zile/zile_2.4.14.bb b/meta-oe/recipes-support/zile/zile_2.4.14.bb
index 3b846c1511..acd491498e 100644
--- a/meta-oe/recipes-support/zile/zile_2.4.14.bb
+++ b/meta-oe/recipes-support/zile/zile_2.4.14.bb
@@ -20,6 +20,6 @@ do_install_append() {
}
PACKAGECONFIG ??= ""
-PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}"
+PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}"
PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 07/32] postgresql: 12.2 -> 12.3
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (5 preceding siblings ...)
2020-07-01 0:06 ` [dunfel 06/32] zile: " akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 0:06 ` [dunfel 08/32] multipath-tools: Fix build with json-c 0.14 and newer akuster
` (24 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Wang Mingyu <wangmy@cn.fujitsu.com>
0001-Use-pkg-config-for-libxml2-detection.patch
removed since it is not available in 12.3
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 04dc1ffc16eaa2eca6299341b2a86e56b9e98367)
[Bug fix only update]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...Use-pkg-config-for-libxml2-detection.patch | 50 -------------------
meta-oe/recipes-dbs/postgresql/postgresql.inc | 1 -
...{postgresql_12.2.bb => postgresql_12.3.bb} | 4 +-
3 files changed, 2 insertions(+), 53 deletions(-)
delete mode 100644 meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch
rename meta-oe/recipes-dbs/postgresql/{postgresql_12.2.bb => postgresql_12.3.bb} (63%)
diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch
deleted file mode 100644
index 84cd5c1579..0000000000
--- a/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d3ee8c8df5808b63e86f40831f2ba62cbb33d291 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 8 Aug 2018 09:18:27 +0800
-Subject: [PATCH] postgresql: Use pkg-config for libxml2 detection.
-
-Upstream-Status: Inappropriate [configuration]
-
-xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS.
-
-Signed-off-by: Philip Balister <philip@balister.org>
-
-update to version 10.4
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
-Update for version 12.0
-Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
----
- configure.in | 16 ++--------------
- 1 file changed, 2 insertions(+), 14 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 6942f81..7fd3e78 100644
---- a/configure.in
-+++ b/configure.in
-@@ -923,20 +923,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support],
- [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])])
-
- if test "$with_libxml" = yes ; then
-- PGAC_PATH_PROGS(XML2_CONFIG, xml2-config)
-- AC_ARG_VAR(XML2_CONFIG, [path to xml2-config utility])dnl
-- if test -n "$XML2_CONFIG"; then
-- for pgac_option in `$XML2_CONFIG --cflags`; do
-- case $pgac_option in
-- -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
-- esac
-- done
-- for pgac_option in `$XML2_CONFIG --libs`; do
-- case $pgac_option in
-- -L*) LDFLAGS="$LDFLAGS $pgac_option";;
-- esac
-- done
-- fi
-+ CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "libxml-2.0" 2>&1`"
-+ LIBS="`pkg-config --short-errors --print-errors --libs "libxml-2.0" 2>&1` $LIBS"
- fi
-
- AC_SUBST(with_libxml)
---
-2.7.4
-
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc
index d35711c1e5..5b20098a72 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql.inc
+++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc
@@ -29,7 +29,6 @@ SRC_URI = "http://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \
file://postgresql.pam \
file://postgresql-setup \
file://postgresql.service \
- file://0001-Use-pkg-config-for-libxml2-detection.patch \
"
LEAD_SONAME = "libpq.so"
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb b/meta-oe/recipes-dbs/postgresql/postgresql_12.3.bb
similarity index 63%
rename from meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb
rename to meta-oe/recipes-dbs/postgresql/postgresql_12.3.bb
index 0613e50c72..cc7e3ff52b 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb
+++ b/meta-oe/recipes-dbs/postgresql/postgresql_12.3.bb
@@ -8,5 +8,5 @@ SRC_URI += "\
file://0001-Improve-reproducibility.patch \
"
-SRC_URI[md5sum] = "a88ceea8ecf2741307f663e4539b58b7"
-SRC_URI[sha256sum] = "ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de"
+SRC_URI[md5sum] = "a30c023dd7088e44d73be71af2ef404a"
+SRC_URI[sha256sum] = "94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 08/32] multipath-tools: Fix build with json-c 0.14 and newer
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (6 preceding siblings ...)
2020-07-01 0:06 ` [dunfel 07/32] postgresql: 12.2 -> 12.3 akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 8:48 ` [oe] " Adrian Bunk
2020-07-01 0:06 ` [dunfel 09/32] libblockdev: upgrade 2.23 -> 2.24 akuster
` (23 subsequent siblings)
31 siblings, 1 reply; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1b0ce2ce1d388d223ff337e5683d9b026b7082ba)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...1-fix-boolean-value-with-json-c-0.14.patch | 42 +++++++++++++++++++
.../multipath-tools/multipath-tools_0.8.4.bb | 1 +
2 files changed, 43 insertions(+)
create mode 100644 meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch b/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch
new file mode 100644
index 0000000000..cf97b491e1
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch
@@ -0,0 +1,42 @@
+From 5ae81386a8cfea4180738c261cd3f7944a631199 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 3 Jun 2020 16:03:56 -0700
+Subject: [PATCH] fix boolean value with json-c 0.14
+
+Patch from Christian Hesse posted here
+https://www.spinics.net/lists/dm-devel/msg40646.html
+
+Upstream json-c 0.14+ removed the TRUE and FALSE defines in commit
+0992aac61f8b087efd7094e9ac2b84fa9c040fcd.
+
+Upstream-Status: Submitted [https://www.spinics.net/lists/dm-devel/msg40646.html]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libdmmp/libdmmp_private.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
+index ac85b63f..29400826 100644
+--- a/libdmmp/libdmmp_private.h
++++ b/libdmmp/libdmmp_private.h
+@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \
+ do { \
+ json_type j_type = json_type_null; \
+ json_object *j_obj_tmp = NULL; \
+- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \
++ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \
+ _error(ctx, "Invalid JSON output from multipathd IPC: " \
+ "key '%s' not found", key); \
+ rc = DMMP_ERR_IPC_ERROR; \
+@@ -90,7 +90,7 @@ do { \
+ } \
+ if (j_obj_tmp == NULL) { \
+ _error(ctx, "BUG: Got NULL j_obj_tmp from " \
+- "json_object_object_get_ex() while it return TRUE"); \
++ "json_object_object_get_ex() while it return 1"); \
+ rc = DMMP_ERR_BUG; \
+ goto out; \
+ } \
+--
+2.27.0
+
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
index af34a4b392..0d03191373 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
@@ -45,6 +45,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \
file://0031-Always-use-devmapper-for-kpartx.patch \
file://0001-fix-bug-of-do_compile-and-do_install.patch \
file://0001-add-explicit-dependency-on-libraries.patch \
+ file://0001-fix-boolean-value-with-json-c-0.14.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 09/32] libblockdev: upgrade 2.23 -> 2.24
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (7 preceding siblings ...)
2020-07-01 0:06 ` [dunfel 08/32] multipath-tools: Fix build with json-c 0.14 and newer akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 0:06 ` [dunfel 10/32] libvpx: upgrade 1.8.1 -> 1.8.2 akuster
` (22 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Andreas Müller <schnitzeltony@gmail.com>
Change SRC_URI: all udisks related sources moved to
https://github.com/storaged-project
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit dc25abfed8ce775ceb23dd483fe85924dc550bfe)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../{libblockdev_2.23.bb => libblockdev_2.24.bb} | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
rename meta-oe/recipes-extended/libblockdev/{libblockdev_2.23.bb => libblockdev_2.24.bb} (94%)
diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_2.24.bb
similarity index 94%
rename from meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb
rename to meta-oe/recipes-extended/libblockdev/libblockdev_2.24.bb
index 3f4eec274f..99cdee5bba 100644
--- a/meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb
+++ b/meta-oe/recipes-extended/libblockdev/libblockdev_2.24.bb
@@ -10,11 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"
inherit autotools gobject-introspection
-SRCREV = "f5d2458e9e52d8c55b609ae8cf46ef0673b4a02a"
-SRC_URI = " \
- git://github.com/rhinstaller/libblockdev;branch=master \
-"
-
+SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch"
+SRCREV = "f5a4ba8bb298f8cbc435707d0b19b4b2ff836a8e"
S = "${WORKDIR}/git"
FILES_${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 10/32] libvpx: upgrade 1.8.1 -> 1.8.2
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (8 preceding siblings ...)
2020-07-01 0:06 ` [dunfel 09/32] libblockdev: upgrade 2.23 -> 2.24 akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 0:06 ` [dunfel 11/32] vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches akuster
` (21 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 91b30560e4a4e5a40744d01dfa1339ad8ba96a7e)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../webm/{libvpx_1.8.1.bb => libvpx_1.8.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-multimedia/webm/{libvpx_1.8.1.bb => libvpx_1.8.2.bb} (96%)
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb
similarity index 96%
rename from meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb
rename to meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb
index 006e73af46..4a98ec17dd 100644
--- a/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb
+++ b/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb
@@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4"
-SRCREV = "8ae686757b708cd8df1d10c71586aff5355cfe1e"
+SRCREV = "7ec7a33a081aeeb53fed1a8d87e4cbd189152527"
SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https \
file://libvpx-configure-support-blank-prefix.patch \
"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 11/32] vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (9 preceding siblings ...)
2020-07-01 0:06 ` [dunfel 10/32] libvpx: upgrade 1.8.1 -> 1.8.2 akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 0:28 ` [oe] " Martin Jansa
2020-07-01 0:06 ` [dunfel 12/32] jpnevulator: upgrade 2.3.4 -> 2.3.5 akuster
` (20 subsequent siblings)
31 siblings, 1 reply; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit aadbc77f8e132301403c1187e8d0488d526f8817)
[AK: meta-QT5 dufell has 5.15 so this is seems reasonable.]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...ch => 0001-make-opencv-configurable.patch} | 0
...isidec.patch => 0002-use-vorbisidec.patch} | 0
...int.patch => 0003-fix-luaL-checkint.patch} | 0
...ackageconfig-to-detect-mmal-support.patch} | 0
.../vlc/vlc/0005-Fix-build-with-Qt-5.15.patch | 56 +++++++++++++++++++
.../recipes-multimedia/vlc/vlc_3.0.9.2.bb | 9 +--
6 files changed, 61 insertions(+), 4 deletions(-)
rename meta-multimedia/recipes-multimedia/vlc/vlc/{0006-make-opencv-configurable.patch => 0001-make-opencv-configurable.patch} (100%)
rename meta-multimedia/recipes-multimedia/vlc/vlc/{0007-use-vorbisidec.patch => 0002-use-vorbisidec.patch} (100%)
rename meta-multimedia/recipes-multimedia/vlc/vlc/{0008-fix-luaL-checkint.patch => 0003-fix-luaL-checkint.patch} (100%)
rename meta-multimedia/recipes-multimedia/vlc/vlc/{0001-Use-packageconfig-to-detect-mmal-support.patch => 0004-Use-packageconfig-to-detect-mmal-support.patch} (100%)
create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch
similarity index 100%
rename from meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch
rename to meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch
similarity index 100%
rename from meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch
rename to meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch
similarity index 100%
rename from meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch
rename to meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch
similarity index 100%
rename from meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch
rename to meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
new file mode 100644
index 0000000000..c4465b6af3
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
@@ -0,0 +1,56 @@
+From c805c6f64da6d8b03355b4796865b75e2f3b500d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 8 Jun 2020 00:50:08 +0200
+Subject: [PATCH] Fix build with Qt >= 5.15
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ modules/gui/qt/components/playlist/views.cpp | 1 +
+ modules/gui/qt/dialogs/plugins.cpp | 1 +
+ modules/gui/qt/util/timetooltip.hpp | 1 +
+ 3 files changed, 3 insertion(+)
+
+diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp
+index 24db9d9..71d8514 100644
+--- a/modules/gui/qt/components/playlist/views.cpp
++++ b/modules/gui/qt/components/playlist/views.cpp
+@@ -35,6 +35,7 @@
+ #include <QMetaType>
+ #include <QHeaderView>
+ #include <QSvgRenderer>
++#include <QPainterPath>
+
+ #include <assert.h>
+
+diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp
+index d233382..9ae9a63 100644
+--- a/modules/gui/qt/dialogs/plugins.cpp
++++ b/modules/gui/qt/dialogs/plugins.cpp
+@@ -66,6 +66,7 @@
+ #include <QSplitter>
+ #include <QToolButton>
+ #include <QStackedWidget>
++#include <QPainterPath>
+
+ //match the image source (width/height)
+ #define SCORE_ICON_WIDTH_SCALE 4
+diff --git a/modules/gui/qt/util/timetooltip.hpp b/modules/gui/qt/util/timetooltip.hpp
+index 6a1329e..9f50b18 100644
+--- a/modules/gui/qt/util/timetooltip.hpp
++++ b/modules/gui/qt/util/timetooltip.hpp
+@@ -25,6 +25,7 @@
+ #include "qt.hpp"
+
+ #include <QWidget>
++#include <QPainterPath>
+
+ class TimeTooltip : public QWidget
+ {
+--
+2.26.2
+
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
index f6c7a606d5..24898a5a7f 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
@@ -19,10 +19,11 @@ LDFLAGS_append_riscv64 = " -latomic"
LICENSE_FLAGS = "commercial"
SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \
- file://0006-make-opencv-configurable.patch \
- file://0007-use-vorbisidec.patch \
- file://0008-fix-luaL-checkint.patch \
- file://0001-Use-packageconfig-to-detect-mmal-support.patch \
+ file://0001-make-opencv-configurable.patch \
+ file://0002-use-vorbisidec.patch \
+ file://0003-fix-luaL-checkint.patch \
+ file://0004-Use-packageconfig-to-detect-mmal-support.patch \
+ file://0005-Fix-build-with-Qt-5.15.patch \
"
SRC_URI[sha256sum] = "a9bdad293d81cd48516abad8d490d8ab4012964ae541ff19e00021e071e47601"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [oe] [dunfel 11/32] vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches
2020-07-01 0:06 ` [dunfel 11/32] vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches akuster
@ 2020-07-01 0:28 ` Martin Jansa
2020-07-01 2:07 ` akuster
0 siblings, 1 reply; 48+ messages in thread
From: Martin Jansa @ 2020-07-01 0:28 UTC (permalink / raw)
To: akuster; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 7037 bytes --]
> [AK: meta-QT5 dufell has 5.15 so this is seems reasonable.]
I don't know which meta-QT5 had 'dufell' :) but 'dunfell' branch in
https://github.com/meta-qt5/meta-qt5 has 5.15 only in master branch and
dunfell will stay on 5.14.*, but the 0005-Fix-build-with-Qt-5.15.patch
seems to be backwards compatible, I guess it does no harm backporting this
and might be useful for someone (as people are often mixing different
meta-qt5 branches when they needs specific Qt release for whatever reason)
On Tue, Jun 30, 2020 at 5:07 PM akuster <akuster808@gmail.com> wrote:
> From: Andreas Müller <schnitzeltony@gmail.com>
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> (cherry picked from commit aadbc77f8e132301403c1187e8d0488d526f8817)
> [AK: meta-QT5 dufell has 5.15 so this is seems reasonable.]
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
> ...ch => 0001-make-opencv-configurable.patch} | 0
> ...isidec.patch => 0002-use-vorbisidec.patch} | 0
> ...int.patch => 0003-fix-luaL-checkint.patch} | 0
> ...ackageconfig-to-detect-mmal-support.patch} | 0
> .../vlc/vlc/0005-Fix-build-with-Qt-5.15.patch | 56 +++++++++++++++++++
> .../recipes-multimedia/vlc/vlc_3.0.9.2.bb | 9 +--
> 6 files changed, 61 insertions(+), 4 deletions(-)
> rename
> meta-multimedia/recipes-multimedia/vlc/vlc/{0006-make-opencv-configurable.patch
> => 0001-make-opencv-configurable.patch} (100%)
> rename
> meta-multimedia/recipes-multimedia/vlc/vlc/{0007-use-vorbisidec.patch =>
> 0002-use-vorbisidec.patch} (100%)
> rename
> meta-multimedia/recipes-multimedia/vlc/vlc/{0008-fix-luaL-checkint.patch =>
> 0003-fix-luaL-checkint.patch} (100%)
> rename
> meta-multimedia/recipes-multimedia/vlc/vlc/{0001-Use-packageconfig-to-detect-mmal-support.patch
> => 0004-Use-packageconfig-to-detect-mmal-support.patch} (100%)
> create mode 100644
> meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
>
> diff --git
> a/meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch
> b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch
> similarity index 100%
> rename from
> meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch
> rename to
> meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch
> diff --git
> a/meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch
> b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch
> similarity index 100%
> rename from
> meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch
> rename to
> meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch
> diff --git
> a/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch
> b/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch
> similarity index 100%
> rename from
> meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch
> rename to
> meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch
> diff --git
> a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch
> b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch
> similarity index 100%
> rename from
> meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch
> rename to
> meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch
> diff --git
> a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
> b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
> new file mode 100644
> index 0000000000..c4465b6af3
> --- /dev/null
> +++
> b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
> @@ -0,0 +1,56 @@
> +From c805c6f64da6d8b03355b4796865b75e2f3b500d Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Mon, 8 Jun 2020 00:50:08 +0200
> +Subject: [PATCH] Fix build with Qt >= 5.15
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + modules/gui/qt/components/playlist/views.cpp | 1 +
> + modules/gui/qt/dialogs/plugins.cpp | 1 +
> + modules/gui/qt/util/timetooltip.hpp | 1 +
> + 3 files changed, 3 insertion(+)
> +
> +diff --git a/modules/gui/qt/components/playlist/views.cpp
> b/modules/gui/qt/components/playlist/views.cpp
> +index 24db9d9..71d8514 100644
> +--- a/modules/gui/qt/components/playlist/views.cpp
> ++++ b/modules/gui/qt/components/playlist/views.cpp
> +@@ -35,6 +35,7 @@
> + #include <QMetaType>
> + #include <QHeaderView>
> + #include <QSvgRenderer>
> ++#include <QPainterPath>
> +
> + #include <assert.h>
> +
> +diff --git a/modules/gui/qt/dialogs/plugins.cpp
> b/modules/gui/qt/dialogs/plugins.cpp
> +index d233382..9ae9a63 100644
> +--- a/modules/gui/qt/dialogs/plugins.cpp
> ++++ b/modules/gui/qt/dialogs/plugins.cpp
> +@@ -66,6 +66,7 @@
> + #include <QSplitter>
> + #include <QToolButton>
> + #include <QStackedWidget>
> ++#include <QPainterPath>
> +
> + //match the image source (width/height)
> + #define SCORE_ICON_WIDTH_SCALE 4
> +diff --git a/modules/gui/qt/util/timetooltip.hpp
> b/modules/gui/qt/util/timetooltip.hpp
> +index 6a1329e..9f50b18 100644
> +--- a/modules/gui/qt/util/timetooltip.hpp
> ++++ b/modules/gui/qt/util/timetooltip.hpp
> +@@ -25,6 +25,7 @@
> + #include "qt.hpp"
> +
> + #include <QWidget>
> ++#include <QPainterPath>
> +
> + class TimeTooltip : public QWidget
> + {
> +--
> +2.26.2
> +
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
> b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
> index f6c7a606d5..24898a5a7f 100644
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
> @@ -19,10 +19,11 @@ LDFLAGS_append_riscv64 = " -latomic"
> LICENSE_FLAGS = "commercial"
>
> SRC_URI = "
> http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \
> - file://0006-make-opencv-configurable.patch \
> - file://0007-use-vorbisidec.patch \
> - file://0008-fix-luaL-checkint.patch \
> - file://0001-Use-packageconfig-to-detect-mmal-support.patch \
> + file://0001-make-opencv-configurable.patch \
> + file://0002-use-vorbisidec.patch \
> + file://0003-fix-luaL-checkint.patch \
> + file://0004-Use-packageconfig-to-detect-mmal-support.patch \
> + file://0005-Fix-build-with-Qt-5.15.patch \
> "
> SRC_URI[sha256sum] =
> "a9bdad293d81cd48516abad8d490d8ab4012964ae541ff19e00021e071e47601"
>
> --
> 2.17.1
>
>
>
[-- Attachment #2: Type: text/html, Size: 8658 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [oe] [dunfel 11/32] vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches
2020-07-01 0:28 ` [oe] " Martin Jansa
@ 2020-07-01 2:07 ` akuster
0 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 2:07 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 8513 bytes --]
On 6/30/20 5:28 PM, Martin Jansa wrote:
> > [AK: meta-QT5 dufell has 5.15 so this is seems reasonable.]
>
> I don't know which meta-QT5 had 'dufell' :) but 'dunfell' branch
> in https://github.com/meta-qt5/meta-qt5 has 5.15
Hmm, I did try double checking... looks something went wrong in my
checking not to mention my spelling.
I will drop this.
thanks for reviewing.
-armin
> only in master branch and dunfell will stay on 5.14.*, but the
> 0005-Fix-build-with-Qt-5.15.patch seems to be backwards compatible, I
> guess it does no harm backporting this and might be useful for someone
> (as people are often mixing different meta-qt5 branches when they
> needs specific Qt release for whatever reason)
>
> On Tue, Jun 30, 2020 at 5:07 PM akuster <akuster808@gmail.com
> <mailto:akuster808@gmail.com>> wrote:
>
> From: Andreas Müller <schnitzeltony@gmail.com
> <mailto:schnitzeltony@gmail.com>>
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com
> <mailto:schnitzeltony@gmail.com>>
> Signed-off-by: Khem Raj <raj.khem@gmail.com
> <mailto:raj.khem@gmail.com>>
> (cherry picked from commit aadbc77f8e132301403c1187e8d0488d526f8817)
> [AK: meta-QT5 dufell has 5.15 so this is seems reasonable.]
> Signed-off-by: Armin Kuster <akuster808@gmail.com
> <mailto:akuster808@gmail.com>>
> ---
> ...ch => 0001-make-opencv-configurable.patch} | 0
> ...isidec.patch => 0002-use-vorbisidec.patch} | 0
> ...int.patch => 0003-fix-luaL-checkint.patch} | 0
> ...ackageconfig-to-detect-mmal-support.patch} | 0
> .../vlc/vlc/0005-Fix-build-with-Qt-5.15.patch | 56
> +++++++++++++++++++
> .../recipes-multimedia/vlc/vlc_3.0.9.2.bb
> <http://vlc_3.0.9.2.bb> | 9 +--
> 6 files changed, 61 insertions(+), 4 deletions(-)
> rename
> meta-multimedia/recipes-multimedia/vlc/vlc/{0006-make-opencv-configurable.patch
> => 0001-make-opencv-configurable.patch} (100%)
> rename
> meta-multimedia/recipes-multimedia/vlc/vlc/{0007-use-vorbisidec.patch
> => 0002-use-vorbisidec.patch} (100%)
> rename
> meta-multimedia/recipes-multimedia/vlc/vlc/{0008-fix-luaL-checkint.patch
> => 0003-fix-luaL-checkint.patch} (100%)
> rename
> meta-multimedia/recipes-multimedia/vlc/vlc/{0001-Use-packageconfig-to-detect-mmal-support.patch
> => 0004-Use-packageconfig-to-detect-mmal-support.patch} (100%)
> create mode 100644
> meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
>
> diff --git
> a/meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch
> b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch
> similarity index 100%
> rename from
> meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch
> rename to
> meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch
> diff --git
> a/meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch
> b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch
> similarity index 100%
> rename from
> meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch
> rename to
> meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch
> diff --git
> a/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch
> b/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch
> similarity index 100%
> rename from
> meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch
> rename to
> meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch
> diff --git
> a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch
> b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch
> similarity index 100%
> rename from
> meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch
> rename to
> meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch
> diff --git
> a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
> b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
> new file mode 100644
> index 0000000000..c4465b6af3
> --- /dev/null
> +++
> b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch
> @@ -0,0 +1,56 @@
> +From c805c6f64da6d8b03355b4796865b75e2f3b500d Mon Sep 17 00:00:00
> 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com
> <mailto:schnitzeltony@gmail.com>>
> +Date: Mon, 8 Jun 2020 00:50:08 +0200
> +Subject: [PATCH] Fix build with Qt >= 5.15
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com
> <mailto:schnitzeltony@gmail.com>>
> +---
> + modules/gui/qt/components/playlist/views.cpp | 1 +
> + modules/gui/qt/dialogs/plugins.cpp | 1 +
> + modules/gui/qt/util/timetooltip.hpp | 1 +
> + 3 files changed, 3 insertion(+)
> +
> +diff --git a/modules/gui/qt/components/playlist/views.cpp
> b/modules/gui/qt/components/playlist/views.cpp
> +index 24db9d9..71d8514 100644
> +--- a/modules/gui/qt/components/playlist/views.cpp
> ++++ b/modules/gui/qt/components/playlist/views.cpp
> +@@ -35,6 +35,7 @@
> + #include <QMetaType>
> + #include <QHeaderView>
> + #include <QSvgRenderer>
> ++#include <QPainterPath>
> +
> + #include <assert.h>
> +
> +diff --git a/modules/gui/qt/dialogs/plugins.cpp
> b/modules/gui/qt/dialogs/plugins.cpp
> +index d233382..9ae9a63 100644
> +--- a/modules/gui/qt/dialogs/plugins.cpp
> ++++ b/modules/gui/qt/dialogs/plugins.cpp
> +@@ -66,6 +66,7 @@
> + #include <QSplitter>
> + #include <QToolButton>
> + #include <QStackedWidget>
> ++#include <QPainterPath>
> +
> + //match the image source (width/height)
> + #define SCORE_ICON_WIDTH_SCALE 4
> +diff --git a/modules/gui/qt/util/timetooltip.hpp
> b/modules/gui/qt/util/timetooltip.hpp
> +index 6a1329e..9f50b18 100644
> +--- a/modules/gui/qt/util/timetooltip.hpp
> ++++ b/modules/gui/qt/util/timetooltip.hpp
> +@@ -25,6 +25,7 @@
> + #include "qt.hpp"
> +
> + #include <QWidget>
> ++#include <QPainterPath>
> +
> + class TimeTooltip : public QWidget
> + {
> +--
> +2.26.2
> +
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
> <http://vlc_3.0.9.2.bb>
> b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
> <http://vlc_3.0.9.2.bb>
> index f6c7a606d5..24898a5a7f 100644
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
> <http://vlc_3.0.9.2.bb>
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
> <http://vlc_3.0.9.2.bb>
> @@ -19,10 +19,11 @@ LDFLAGS_append_riscv64 = " -latomic"
> LICENSE_FLAGS = "commercial"
>
> SRC_URI =
> "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz
> <http://download.videolan.org/pub/videolan/$%7BBPN%7D/$%7BPV%7D/$%7BBP%7D.tar.xz>
> \
> - file://0006-make-opencv-configurable.patch \
> - file://0007-use-vorbisidec.patch \
> - file://0008-fix-luaL-checkint.patch \
> -
> file://0001-Use-packageconfig-to-detect-mmal-support.patch \
> + file://0001-make-opencv-configurable.patch \
> + file://0002-use-vorbisidec.patch \
> + file://0003-fix-luaL-checkint.patch \
> +
> file://0004-Use-packageconfig-to-detect-mmal-support.patch \
> + file://0005-Fix-build-with-Qt-5.15.patch \
> "
> SRC_URI[sha256sum] =
> "a9bdad293d81cd48516abad8d490d8ab4012964ae541ff19e00021e071e47601"
>
> --
> 2.17.1
>
>
>
[-- Attachment #2: Type: text/html, Size: 12575 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread
* [dunfel 12/32] jpnevulator: upgrade 2.3.4 -> 2.3.5
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (10 preceding siblings ...)
2020-07-01 0:06 ` [dunfel 11/32] vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 0:06 ` [dunfel 13/32] libnftnl: upgrade 1.1.6 -> 1.1.7 akuster
` (19 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Pierre-Jean Texier <pjtexier@koncepto.io>
See changelog https://github.com/snarlistic/jpnevulator/blob/master/Changelog
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 28bf55bafc57c905755f32d685452492db9eae41)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
index d2819f76c5..50dd74b685 100644
--- a/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
+++ b/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
@@ -2,10 +2,10 @@ SUMMARY = "A handy serial sniffer"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
-PV = "2.3.4+git${SRCPV}"
+PV = "2.3.5+git${SRCPV}"
SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http"
-SRCREV = "97438ecbd52fbc01540221bc590f8388a43c74e0"
+SRCREV = "c2d857091c0dfed05139ac07ea9b0f36ad259638"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 13/32] libnftnl: upgrade 1.1.6 -> 1.1.7
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (11 preceding siblings ...)
2020-07-01 0:06 ` [dunfel 12/32] jpnevulator: upgrade 2.3.4 -> 2.3.5 akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 0:06 ` [dunfel 14/32] nftables: upgrade 0.9.4 -> 0.9.5 akuster
` (18 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Pierre-Jean Texier <pjtexier@koncepto.io>
See https://lwn.net/Articles/822353/
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 9e7912b8fd841001a2ffb78dc32edc86fd70b8cd)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../libnftnl/{libnftnl_1.1.6.bb => libnftnl_1.1.7.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-filter/libnftnl/{libnftnl_1.1.6.bb => libnftnl_1.1.7.bb} (88%)
diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.6.bb b/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.7.bb
similarity index 88%
rename from meta-networking/recipes-filter/libnftnl/libnftnl_1.1.6.bb
rename to meta-networking/recipes-filter/libnftnl/libnftnl_1.1.7.bb
index db42954542..4ff00bf873 100644
--- a/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.6.bb
+++ b/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.7.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26"
SECTION = "libs"
DEPENDS = "libmnl"
-SRCREV = "ac0778e403eb51986ce19bcf1a6e8ae3cd83dcfa"
+SRCREV = "eedafeb6db330b8adff1b7cdd3dac325f9144195"
SRC_URI = "git://git.netfilter.org/libnftnl \
file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \
"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 14/32] nftables: upgrade 0.9.4 -> 0.9.5
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (12 preceding siblings ...)
2020-07-01 0:06 ` [dunfel 13/32] libnftnl: upgrade 1.1.6 -> 1.1.7 akuster
@ 2020-07-01 0:06 ` akuster
2020-07-01 0:07 ` [dunfel 15/32] haveged: upgrade 1.9.8 -> 1.9.9 akuster
` (17 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:06 UTC (permalink / raw)
To: openembedded-devel
From: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit bf1ac503e8a54387a6b46623235dadff0d14596e)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../nftables/{nftables_0.9.4.bb => nftables_0.9.5.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta-networking/recipes-filter/nftables/{nftables_0.9.4.bb => nftables_0.9.5.bb} (90%)
diff --git a/meta-networking/recipes-filter/nftables/nftables_0.9.4.bb b/meta-networking/recipes-filter/nftables/nftables_0.9.5.bb
similarity index 90%
rename from meta-networking/recipes-filter/nftables/nftables_0.9.4.bb
rename to meta-networking/recipes-filter/nftables/nftables_0.9.5.bb
index 5b57abb87a..0fd187f1b8 100644
--- a/meta-networking/recipes-filter/nftables/nftables_0.9.4.bb
+++ b/meta-networking/recipes-filter/nftables/nftables_0.9.5.bb
@@ -10,8 +10,7 @@ DEPENDS = "libmnl libnftnl bison-native \
UPSTREAM_CHECK_REGEX = "nftables-(?P<pver>\d+(\.\d+){2,}).tar.bz2"
SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2"
-SRC_URI[md5sum] = "fdfd51a1083fb054a487b5159b1ed5cd"
-SRC_URI[sha256sum] = "08b8683a9db5fba980bc092b75288af98d218bbe8ab446daf2338570d0730f9a"
+SRC_URI[sha256sum] = "f2c1957eabc370057c4576b8f33a71d91a6ad019b8b335abafe61c9c42cc7e16"
inherit autotools manpages pkgconfig
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 15/32] haveged: upgrade 1.9.8 -> 1.9.9
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (13 preceding siblings ...)
2020-07-01 0:06 ` [dunfel 14/32] nftables: upgrade 0.9.4 -> 0.9.5 akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 16/32] mm-common: upgrade 1.0..0 -> 1.0.1 akuster
` (16 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 339b7c6c34b33be852f8f5a5ee57660495b54cc6)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../haveged/{haveged_1.9.8.bb => haveged_1.9.9.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-extended/haveged/{haveged_1.9.8.bb => haveged_1.9.9.bb} (96%)
diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.8.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.9.bb
similarity index 96%
rename from meta-oe/recipes-extended/haveged/haveged_1.9.8.bb
rename to meta-oe/recipes-extended/haveged/haveged_1.9.9.bb
index 403956efa1..c1839b37a8 100644
--- a/meta-oe/recipes-extended/haveged/haveged_1.9.8.bb
+++ b/meta-oe/recipes-extended/haveged/haveged_1.9.9.bb
@@ -5,8 +5,8 @@ HOMEPAGE = "http://www.issihosts.com/haveged/index.html"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-# v1.9.8
-SRCREV = "8cd0266472aff59821718c4410e80f28978310f9"
+# v1.9.9
+SRCREV = "6da706c8026b629d9bb7ebebc32239305a03da8e"
SRC_URI = "git://github.com/jirka-h/haveged.git \
"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 16/32] mm-common: upgrade 1.0..0 -> 1.0.1
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (14 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 15/32] haveged: upgrade 1.9.8 -> 1.9.9 akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 17/32] python-django: add RDEPENDS akuster
` (15 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 15e57216d05e31935855b38fb41b5732aee257ef)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../mm-common/{mm-common_1.0.0.bb => mm-common_1.0.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-core/mm-common/{mm-common_1.0.0.bb => mm-common_1.0.1.bb} (66%)
diff --git a/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb b/meta-oe/recipes-core/mm-common/mm-common_1.0.1.bb
similarity index 66%
rename from meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb
rename to meta-oe/recipes-core/mm-common/mm-common_1.0.1.bb
index c7d1f2b73c..64b58db548 100644
--- a/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb
+++ b/meta-oe/recipes-core/mm-common/mm-common_1.0.1.bb
@@ -6,8 +6,8 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase
-SRC_URI[archive.md5sum] = "9087b8612d75cbc1fad0c99e15c2a718"
-SRC_URI[archive.sha256sum] = "b97d9b041e5952486cab620b44ab09f6013a478f43b6699ae899b8a4da189cd4"
+SRC_URI[archive.md5sum] = "5b5a589f648bd83bfa6291081ebf5864"
+SRC_URI[archive.sha256sum] = "28a2d775afbf05c5c957b24b220ed6e9b2023179b98ecde471d89e9754ea5ac9"
SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch"
BBCLASSEXTEND = "native"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 17/32] python-django: add RDEPENDS
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (15 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 16/32] mm-common: upgrade 1.0..0 -> 1.0.1 akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 18/32] python-m2crypto: Add RDEPENDS akuster
` (14 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Changqing Li <changqing.li@windriver.com>
fix error:
ModuleNotFoundError: No module named 'distutils'
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1407d43bc4b2b8b7c2de35a4173556c08dca36a9)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-python/recipes-devtools/python/python-django.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-python/recipes-devtools/python/python-django.inc b/meta-python/recipes-devtools/python/python-django.inc
index 54c77c8276..73b7ac99f9 100644
--- a/meta-python/recipes-devtools/python/python-django.inc
+++ b/meta-python/recipes-devtools/python/python-django.inc
@@ -28,4 +28,5 @@ RDEPENDS_${PN} += "\
${PYTHON_PN}-threading \
${PYTHON_PN}-unixadmin \
${PYTHON_PN}-xml \
+ ${PYTHON_PN}-distutils \
"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 18/32] python-m2crypto: Add RDEPENDS
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (16 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 17/32] python-django: add RDEPENDS akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 19/32] python-django: set CVE_PRODUCT to be django akuster
` (13 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Changqing Li <changqing.li@windriver.com>
fix errors:
ModuleNotFoundError: No module named 'distutils'
ModuleNotFoundError: No module named 'asyncore'
ModuleNotFoundError: No module named 'xmlrpc'
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1d6071e97157851dbfbdf26f302fc5ec8f6ee4db)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-python/recipes-devtools/python/python-m2crypto.inc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta-python/recipes-devtools/python/python-m2crypto.inc b/meta-python/recipes-devtools/python/python-m2crypto.inc
index 76dd58ce04..881fdf1cc2 100644
--- a/meta-python/recipes-devtools/python/python-m2crypto.inc
+++ b/meta-python/recipes-devtools/python/python-m2crypto.inc
@@ -17,7 +17,11 @@ PYPI_PACKAGE = "M2Crypto"
inherit pypi siteinfo
DEPENDS += "openssl swig-native"
-RDEPENDS_${PN} += "${PYTHON_PN}-typing"
+RDEPENDS_${PN} += "${PYTHON_PN}-typing \
+ ${PYTHON_PN}-distutils \
+ ${PYTHON_PN}-smtpd \
+ ${PYTHON_PN}-xmlrpc \
+"
DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR} -I${STAGING_INCDIR}"
DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR}"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 19/32] python-django: set CVE_PRODUCT to be django
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (17 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 18/32] python-m2crypto: Add RDEPENDS akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 20/32] python3-m2crypto: add the missing rdepends akuster
` (12 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: "Qi.Chen@windriver.com" <Qi.Chen@windriver.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 639eae8901467c0bf79a05b6b6e6cda94a937ae9)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-python/recipes-devtools/python/python-django.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-python/recipes-devtools/python/python-django.inc b/meta-python/recipes-devtools/python/python-django.inc
index 73b7ac99f9..c02b3fa522 100644
--- a/meta-python/recipes-devtools/python/python-django.inc
+++ b/meta-python/recipes-devtools/python/python-django.inc
@@ -30,3 +30,5 @@ RDEPENDS_${PN} += "\
${PYTHON_PN}-xml \
${PYTHON_PN}-distutils \
"
+
+CVE_PRODUCT = "django"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 20/32] python3-m2crypto: add the missing rdepends
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (18 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 19/32] python-django: set CVE_PRODUCT to be django akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 21/32] zstd: Upgrade 1.4.4 -> 1.4.5 akuster
` (11 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Mingli Yu <mingli.yu@windriver.com>
Add the missing rdepends to fix the error such as below:
# python3
[snip]
>>> import M2Crypto
ModuleNotFoundError: No module named 'decimal'
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit fe77eaab8f0c3be9e1fbfeef69400f4f06748613)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-devtools/python/python-m2crypto.inc | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/meta-python/recipes-devtools/python/python-m2crypto.inc b/meta-python/recipes-devtools/python/python-m2crypto.inc
index 881fdf1cc2..81c81645af 100644
--- a/meta-python/recipes-devtools/python/python-m2crypto.inc
+++ b/meta-python/recipes-devtools/python/python-m2crypto.inc
@@ -17,10 +17,16 @@ PYPI_PACKAGE = "M2Crypto"
inherit pypi siteinfo
DEPENDS += "openssl swig-native"
-RDEPENDS_${PN} += "${PYTHON_PN}-typing \
- ${PYTHON_PN}-distutils \
- ${PYTHON_PN}-smtpd \
- ${PYTHON_PN}-xmlrpc \
+RDEPENDS_${PN} += "\
+ ${PYTHON_PN}-datetime \
+ ${PYTHON_PN}-distutils \
+ ${PYTHON_PN}-logging \
+ ${PYTHON_PN}-netclient \
+ ${PYTHON_PN}-netserver \
+ ${PYTHON_PN}-numbers \
+ ${PYTHON_PN}-smtpd \
+ ${PYTHON_PN}-typing \
+ ${PYTHON_PN}-xmlrpc \
"
DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR} -I${STAGING_INCDIR}"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 21/32] zstd: Upgrade 1.4.4 -> 1.4.5
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (19 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 20/32] python3-m2crypto: add the missing rdepends akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 22/32] rsnapshot: upgrade 1.4.2 -> 1.4.3 akuster
` (10 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit f6aa84fcf197bb74ed2a4dc1e3bb898fc884e27b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../0001-Fix-legacy-build-after-2103.patch | 27 +++++++++++++++++++
.../zstd/{zstd_1.4.4.bb => zstd_1.4.5.bb} | 6 +++--
2 files changed, 31 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch
rename meta-oe/recipes-extended/zstd/{zstd_1.4.4.bb => zstd_1.4.5.bb} (85%)
diff --git a/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch b/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch
new file mode 100644
index 0000000000..c701554b8b
--- /dev/null
+++ b/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch
@@ -0,0 +1,27 @@
+From 93cec0c1d6d0be8dd3a9d01d3e7f2099f1728df7 Mon Sep 17 00:00:00 2001
+From: Orivej Desh <orivej@gmx.fr>
+Date: Fri, 22 May 2020 12:48:02 +0000
+Subject: [PATCH] Fix legacy build after #2103
+
+Upstream-Status: Backport
+Signed-of-by: Alex Kiernan <alex.kiernan@gmail.com>
+---
+ lib/legacy/zstd_v04.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/legacy/zstd_v04.c b/lib/legacy/zstd_v04.c
+index 56bf45222498..19fda8980abf 100644
+--- a/lib/legacy/zstd_v04.c
++++ b/lib/legacy/zstd_v04.c
+@@ -74,7 +74,7 @@ extern "C" {
+ /*-*************************************
+ * Debug
+ ***************************************/
+-#include "debug.h"
++#include "../common/debug.h"
+ #ifndef assert
+ # define assert(condition) ((void)0)
+ #endif
+--
+2.17.1
+
diff --git a/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb b/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb
similarity index 85%
rename from meta-oe/recipes-extended/zstd/zstd_1.4.4.bb
rename to meta-oe/recipes-extended/zstd/zstd_1.4.5.bb
index eb201f4139..cd0b471e17 100644
--- a/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb
+++ b/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb
@@ -9,9 +9,11 @@ LICENSE = "BSD-3-Clause & GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \
file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
-SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1"
+SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1 \
+ file://0001-Fix-legacy-build-after-2103.patch \
+ "
-SRCREV = "10f0e6993f9d2f682da6d04aa2385b7d53cbb4ee"
+SRCREV = "b706286adbba780006a47ef92df0ad7a785666b6"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 22/32] rsnapshot: upgrade 1.4.2 -> 1.4.3
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (20 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 21/32] zstd: Upgrade 1.4.4 -> 1.4.5 akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 23/32] fuse3: upgrade 3.9.1 -> 3.9.2 akuster
` (9 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Pierre-Jean Texier <pjtexier@koncepto.io>
VERSION 1.4.3
------------------------------------------------------------------------------
- Fixes and minor updates to Pod / man page.
- Adds more tests.
- Restore rsync error code 23 as an important warning.
- Fixes shortargs appending.
- Non-LVM backup source breaks after LVM backup source.
- Update rsnapreport.pl utility script to work with rsync >= 3.1.0 stats and bytes changes.
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 4ea3135e945aadba7d1cb6424a861378c484b570)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
index efe95b1019..dcadede0ed 100644
--- a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
+++ b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
@@ -20,8 +20,8 @@ RDEPENDS_${PN} = "rsync \
perl-module-overloading \
"
-SRCREV = "27209563f924a22f510698ea225f53ea52f07cb4"
-PV = "1.4.2+git${SRCPV}"
+SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9"
+PV = "1.4.3+git${SRCPV}"
SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \
file://configure-fix-cmd_rsync.patch \
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 23/32] fuse3: upgrade 3.9.1 -> 3.9.2
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (21 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 22/32] rsnapshot: upgrade 1.4.2 -> 1.4.3 akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 24/32] protobuf-c: disable parallelism to avoid race condition akuster
` (8 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Pierre-Jean Texier <pjtexier@koncepto.io>
See changelog https://github.com/libfuse/libfuse/releases/tag/fuse-3.9.2
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit b6979461fdf6709d196efc7485c1e6e0ceace0e0)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-support/fuse/{fuse3_3.9.1.bb => fuse3_3.9.2.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta-filesystems/recipes-support/fuse/{fuse3_3.9.1.bb => fuse3_3.9.2.bb} (91%)
diff --git a/meta-filesystems/recipes-support/fuse/fuse3_3.9.1.bb b/meta-filesystems/recipes-support/fuse/fuse3_3.9.2.bb
similarity index 91%
rename from meta-filesystems/recipes-support/fuse/fuse3_3.9.1.bb
rename to meta-filesystems/recipes-support/fuse/fuse3_3.9.2.bb
index 1830fa1668..24b17fc93b 100644
--- a/meta-filesystems/recipes-support/fuse/fuse3_3.9.1.bb
+++ b/meta-filesystems/recipes-support/fuse/fuse3_3.9.2.bb
@@ -13,8 +13,7 @@ LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \
"
-SRC_URI[md5sum] = "26d6b450276fb04e20bf91d83b9423f0"
-SRC_URI[sha256sum] = "1bafcfd6c66ba35b7b0beb822532a9106eb8409ad6cde988888fde85f89be645"
+SRC_URI[sha256sum] = "6999b6d48e7c0a79628fa901f6e66def3513cab4ffdd8097821e7dc3cdeae08a"
S = "${WORKDIR}/fuse-${PV}"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 24/32] protobuf-c: disable parallelism to avoid race condition
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (22 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 23/32] fuse3: upgrade 3.9.1 -> 3.9.2 akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 25/32] openipmi: upgrade 2.0.28 -> 2.0.29 akuster
` (7 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Paul Eggleton <paul.eggleton@linux.microsoft.com>
Unfortunately 489d3b4b932ee8016d792341f8ea5836a9522cd4 did not completely
fix the problem - if you try cleaning and rebuilding protobuf-c-native it
doesn't take long to reproduce the issue on a 32-core machine. I spent
some time trying to debug this but failed, there is still a race between
generating t.test-full.pb.h and compiling cxx_generate_packed_data.c
despite BUILT_SOURCES and explicit dependencies. I even tried converting
the multiple target rules to use grouped targets (&:), that didn't fix it
either. Disabling parallelism as a workaround only costs ~20s and it
turns out that upstream is switching to Meson soon anyway:
https://github.com/protobuf-c/protobuf-c/pull/340
Signed-off-by: Paul Eggleton <paul.eggleton@linux.microsoft.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 3251fe210a91d13ab2a6c5b7ecb283aa8e019020)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
index 94c3893574..ed8773443e 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb
@@ -26,6 +26,11 @@ BUILD_CXXFLAGS += "-std=c++11"
inherit autotools pkgconfig
+# After several fix attempts there is still a race between generating
+# t.test-full.pb.h and compiling cxx_generate_packed_data.c despite
+# BUILT_SOURCES and explicit dependencies.
+PARALLEL_MAKE = ""
+
PACKAGE_BEFORE_PN = "${PN}-compiler"
FILES_${PN}-compiler = "${bindir}"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 25/32] openipmi: upgrade 2.0.28 -> 2.0.29
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (23 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 24/32] protobuf-c: disable parallelism to avoid race condition akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 26/32] twm: upgrade 1.0.10 -> 1.0.11 akuster
` (6 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Wang Mingyu <wangmy@cn.fujitsu.com>
???Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 0b0c102d8c6daae12894f47f9523fe27fca5b15f)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../openipmi/{openipmi_2.0.28.bb => openipmi_2.0.29.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-support/openipmi/{openipmi_2.0.28.bb => openipmi_2.0.29.bb} (96%)
diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb
similarity index 96%
rename from meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb
rename to meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb
index f196eb9927..85634a70eb 100644
--- a/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb
+++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb
@@ -35,8 +35,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \
S = "${WORKDIR}/OpenIPMI-${PV}"
-SRC_URI[md5sum] = "ba37f08e306062ec73c7ed2a2bd4d5f4"
-SRC_URI[sha256sum] = "8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996"
+SRC_URI[md5sum] = "46b452e95d69c92e4172b3673ed88d52"
+SRC_URI[sha256sum] = "2244124579afb14e569f34393e9ac61e658a28b6ffa8e5c0d2c1c12a8ce695cd"
inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 26/32] twm: upgrade 1.0.10 -> 1.0.11
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (24 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 25/32] openipmi: upgrade 2.0.28 -> 2.0.29 akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 27/32] libtalloc: fix upstream url akuster
` (5 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Wang Mingyu <wangmy@cn.fujitsu.com>
??Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 8f6facb77e13c9dc53056f30283d0dd33a9c8679)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../xorg-app/{twm_1.0.10.bb => twm_1.0.11.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta-oe/recipes-graphics/xorg-app/{twm_1.0.10.bb => twm_1.0.11.bb} (67%)
diff --git a/meta-oe/recipes-graphics/xorg-app/twm_1.0.10.bb b/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb
similarity index 67%
rename from meta-oe/recipes-graphics/xorg-app/twm_1.0.10.bb
rename to meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb
index 3a2267ae92..45caaacf2f 100644
--- a/meta-oe/recipes-graphics/xorg-app/twm_1.0.10.bb
+++ b/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb
@@ -5,8 +5,9 @@ DEPENDS += " libxext libxt libxmu bison-native"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=4c6d42ef60e8166aa26606524c0b9586"
-SRC_URI[md5sum] = "e322c08eeb635f924ede5b8eba3db54e"
-SRC_URI[sha256sum] = "6449eadca16ce0f0d900605b0cc020b95f40619261b7beccfb46bcc1836445d7"
+SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "48e83210b39a7bfb492604ba0bcfb19e"
+SRC_URI[sha256sum] = "410ecabac54e6db7afd5c20a78d89c0134f3c74b149bee71b1fec775e6e060cc"
FILES_${PN} += "${datadir}/X11/twm/system.twmrc"
ALTERNATIVE_NAME = "x-window-manager"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 27/32] libtalloc: fix upstream url
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (25 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 26/32] twm: upgrade 1.0.10 -> 1.0.11 akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 28/32] linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit time_t akuster
` (4 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Konrad Weihmann <kweihmann@outlook.com>
https://samba.org seems to be gone, switch to https://www.samba.org
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 9a85b925c51308f93475d7cc8e2ddda90dff30fd)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb
index 9f8ebcc410..59deb15b63 100644
--- a/meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb
+++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6
file://pytalloc.h;beginline=1;endline=18;md5=2c498cc6f2263672483237b20f46b43d"
-SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \
+SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \
file://options-2.2.0.patch \
file://0001-waf-add-support-of-cross_compile.patch \
"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 28/32] linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit time_t
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (26 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 27/32] libtalloc: fix upstream url akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 29/32] openh264: upgrade 2.1.0 -> 2.1.1 akuster
` (3 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Christian Eggers <ceggers@arri.de>
Back ported upstream patch:
https://github.com/richardcochran/linuxptp/commit/7de73fefc378cc42b9ed1115b3afa409d0250a48
Signed-off-by: Christian Eggers <ceggers@arri.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 924bd4dd084cb86704c52fecee5bd147186a6efb)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../linuxptp/time_t_maybe_long_long.patch | 135 ++++++++++++++++++
.../linuxptp/linuxptp_2.0.bb | 1 +
2 files changed, 136 insertions(+)
create mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch
new file mode 100644
index 0000000000..af99d2b7f9
--- /dev/null
+++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch
@@ -0,0 +1,135 @@
+Fix printf if time_t is long long
+
+On some platforms, time_t has recently switched from "long" to "long
+long" [1]. For these platforms it is necessary to use "%lld" as printf
+format specifier because the ABI differs between "long" and "long long".
+
+I found no way for creating something similar to PRId64 for time_t. No
+idea how to determine whether it's "long" or "long long". So I cast
+everything to "long long" instead.
+
+[1] https://git.musl-libc.org/cgit/musl/commit/?id=38143339646a4ccce8afe298c34467767c899f51
+
+Upstream-Status: Accepted [next version is after 2.0]
+Upstream-Patch: https://github.com/richardcochran/linuxptp/commit/7de73fefc378cc42b9ed1115b3afa409d0250a48
+
+Signed-off-by: Christian Eggers <ceggers@arri.de>
+---
+diff -Naur linuxptp-2.0.org/phc_ctl.c linuxptp-2.0/phc_ctl.c
+--- linuxptp-2.0.org/phc_ctl.c 2018-08-12 23:08:43.000000000 +0200
++++ linuxptp-2.0/phc_ctl.c 2020-05-29 21:34:26.166519963 +0200
+@@ -230,8 +230,8 @@
+ strerror(errno));
+ return -1;
+ } else {
+- pr_notice("set clock time to %ld.%09ld or %s",
+- ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec));
++ pr_notice("set clock time to %lld.%09ld or %s",
++ (long long)ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec));
+ }
+
+ return args_to_eat;
+@@ -248,8 +248,8 @@
+
+ return -1;
+ } else {
+- pr_notice("clock time is %ld.%09lu or %s",
+- ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec));
++ pr_notice("clock time is %lld.%09lu or %s",
++ (long long)ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec));
+ }
+
+ /* get operation does not require any arguments */
+diff -Naur linuxptp-2.0.org/print.c linuxptp-2.0/print.c
+--- linuxptp-2.0.org/print.c 2018-08-12 23:08:43.000000000 +0200
++++ linuxptp-2.0/print.c 2020-05-29 21:34:26.166519963 +0200
+@@ -73,16 +73,16 @@
+
+ if (verbose) {
+ f = level >= LOG_NOTICE ? stdout : stderr;
+- fprintf(f, "%s[%ld.%03ld]: %s%s%s\n",
++ fprintf(f, "%s[%lld.%03ld]: %s%s%s\n",
+ progname ? progname : "",
+- ts.tv_sec, ts.tv_nsec / 1000000,
++ (long long)ts.tv_sec, ts.tv_nsec / 1000000,
+ message_tag ? message_tag : "", message_tag ? " " : "",
+ buf);
+ fflush(f);
+ }
+ if (use_syslog) {
+- syslog(level, "[%ld.%03ld] %s%s%s",
+- ts.tv_sec, ts.tv_nsec / 1000000,
++ syslog(level, "[%lld.%03ld] %s%s%s",
++ (long long)ts.tv_sec, ts.tv_nsec / 1000000,
+ message_tag ? message_tag : "", message_tag ? " " : "",
+ buf);
+ }
+diff -Naur linuxptp-2.0.org/unicast_service.c linuxptp-2.0/unicast_service.c
+--- linuxptp-2.0.org/unicast_service.c 2018-08-12 23:08:43.000000000 +0200
++++ linuxptp-2.0/unicast_service.c 2020-05-29 21:36:23.170497415 +0200
+@@ -209,9 +209,9 @@
+ tmo = now.tv_sec + req->durationField;
+ if (tmo > client->grant_tmo) {
+ client->grant_tmo = tmo;
+- pr_debug("%s grant of 0x%x extended to %ld",
++ pr_debug("%s grant of 0x%x extended to %lld",
+ pid2str(&client->portIdentity),
+- client->message_types, tmo);
++ client->message_types, (long long)tmo);
+ }
+ }
+
+@@ -226,8 +226,8 @@
+ interval = pqueue_peek(p->unicast_service->queue);
+ if (interval) {
+ tmo.it_value = interval->tmo;
+- pr_debug("arming timer tmo={%ld,%ld}",
+- interval->tmo.tv_sec, interval->tmo.tv_nsec);
++ pr_debug("arming timer tmo={%lld,%ld}",
++ (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec);
+ } else {
+ pr_debug("stopping unicast service timer");
+ }
+@@ -499,8 +499,8 @@
+
+ while ((interval = pqueue_peek(p->unicast_service->queue)) != NULL) {
+
+- pr_debug("peek i={2^%d} tmo={%ld,%ld}", interval->log_period,
+- interval->tmo.tv_sec, interval->tmo.tv_nsec);
++ pr_debug("peek i={2^%d} tmo={%lld,%ld}", interval->log_period,
++ (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec);
+
+ if (timespec_compare(&now, &interval->tmo) >= 0) {
+ break;
+@@ -519,8 +519,8 @@
+ }
+
+ interval_increment(interval);
+- pr_debug("next i={2^%d} tmo={%ld,%ld}", interval->log_period,
+- interval->tmo.tv_sec, interval->tmo.tv_nsec);
++ pr_debug("next i={2^%d} tmo={%lld,%ld}", interval->log_period,
++ (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec);
+ pqueue_insert(p->unicast_service->queue, interval);
+ }
+
+diff -Naur linuxptp-2.0.org/unicast_client.c linuxptp-2.0/unicast_client.c
+--- linuxptp-2.0.org/unicast_client.c 2018-08-12 23:08:43.000000000 +0200
++++ linuxptp-2.0/unicast_client.c 2020-06-02 11:13:06.922997844 +0200
+@@ -216,7 +216,7 @@
+ long duration)
+ {
+ struct timespec now;
+- long tmo;
++ time_t tmo;
+
+ if (clock_gettime(CLOCK_MONOTONIC, &now)) {
+ pr_err("clock_gettime failed: %m");
+@@ -226,7 +226,7 @@
+ tmo = now.tv_sec + duration;
+ if (!master->renewal_tmo || tmo < master->renewal_tmo) {
+ master->renewal_tmo = tmo;
+- pr_debug("port %d: renewal timeout at %ld", portnum(p), tmo);
++ pr_debug("port %d: renewal timeout at %lld", portnum(p), (long long)tmo);
+ }
+ }
+
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
index eb262d36b2..930c6673dc 100644
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
+++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \
file://build-Allow-CC-and-prefix-to-be-overriden.patch \
file://no-incdefs-using-host-headers.patch \
+ file://time_t_maybe_long_long.patch \
"
SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 29/32] openh264: upgrade 2.1.0 -> 2.1.1
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (27 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 28/32] linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit time_t akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 30/32] tcpreplay: upgrade 4.3.2 -> 4.3.3 akuster
` (2 subsequent siblings)
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Andreas Müller <schnitzeltony@gmail.com>
>>From [1]
* release x86 and x64 libraries for android platform
* Bug fixes
[1] https://github.com/cisco/openh264/releases
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 69716e959bddb3b56dffb07bc308cfb6e1e80bb6)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../openh264/{openh264_2.1.0.bb => openh264_2.1.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-multimedia/recipes-multimedia/openh264/{openh264_2.1.0.bb => openh264_2.1.1.bb} (94%)
diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.1.bb
similarity index 94%
rename from meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb
rename to meta-multimedia/recipes-multimedia/openh264/openh264_2.1.1.bb
index 3c65ef2479..3988cfff86 100644
--- a/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb
+++ b/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.1.bb
@@ -11,8 +11,8 @@ LICENSE_FLAGS = "commercial"
LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf"
S = "${WORKDIR}/git"
-SRCREV = "a60e28efe227ea8ea760b1e29a8943e371ebe4b3"
-BRANCH = "openh264v2.1.0"
+SRCREV = "50a1fcf70fafe962c526749991cb4646406933ba"
+BRANCH = "openh264v2.1.1"
SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \
file://0001-Makefile-Use-cp-options-to-preserve-file-mode.patch \
"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 30/32] tcpreplay: upgrade 4.3.2 -> 4.3.3
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (28 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 29/32] openh264: upgrade 2.1.0 -> 2.1.1 akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 31/32] python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17 akuster
2020-07-01 0:07 ` [dunfel 32/32] ntp: update 4.2.8p15 akuster
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Andreas Müller <schnitzeltony@gmail.com>
>>From [1]
* Increase cache buffers size to accomodate VLAN edits (#594)
* Correct L2 header length to correct IP header offset (#583)
* Fix warnings from gcc version 10 (#580)
* Heap Buffer Overflow in randomize_iparp (#579)
* Use after free in get_ipv6_next (#578)
* Heap Buffer Overflow in git_ipv6_next (#576)
* Call pcap_freecode() on pcap_compile() (#572)
* Increase max snaplen to 262144 (#571)
* Fix divide by zero in fuzzing (#570)
* Unique IP repeats at very high iteration counts (#566)
* Fails to compile on FreeBSD amd64 13.0 (#558)
* Heap Buffer Overflow in do_checksum (#556) (#577)
* Attempt to correct corrupt pcap files, if possible (#557)
* Fix GCC v10 warnings (#555)
* Remove some duplicated SOURCES entries (#551)
* Expand /dev/bpfX hard limit to fix macOS Mojave (#550)
* Implement --loopdelay-ms when using --loop=0 (#546)
* Heap overflow packet2tree and get_l2len (#530)
[1] https://github.com/appneta/tcpreplay/releases
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 822963c6cba8edde6d91fc56e2f0ae9e7a730551)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../tcpreplay/{tcpreplay_4.3.2.bb => tcpreplay_4.3.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-support/tcpreplay/{tcpreplay_4.3.2.bb => tcpreplay_4.3.3.bb} (75%)
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.2.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.3.bb
similarity index 75%
rename from meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.2.bb
rename to meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.3.bb
index a808c2728f..39be950ad4 100644
--- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.2.bb
+++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.3.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=890b830b22fd632e9ffd996df20338f8"
SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz"
-SRC_URI[md5sum] = "dfa0d1b3dfd2cd316291a7a20563b649"
-SRC_URI[sha256sum] = "4f479bd9196cafde70c58ab072ca4959ecc5278555cf1aa7cf42f7f210daa951"
+SRC_URI[md5sum] = "53b52bf64f0b6b9443428e657b37bc6b"
+SRC_URI[sha256sum] = "ed2402caa9434ff5c74b2e7b31178c73e7c7c5c4ea1e1d0e2e39a7dc46958fde"
DEPENDS = "libpcap"
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 31/32] python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (29 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 30/32] tcpreplay: upgrade 4.3.2 -> 4.3.3 akuster
@ 2020-07-01 0:07 ` akuster
2020-07-01 0:07 ` [dunfel 32/32] ntp: update 4.2.8p15 akuster
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 1.3.17:
- orm Bug fixes
- orm Added an accessor ColumnProperty.Comparator.expressions
which provides access to the group of columns mapped under a
multi-column ColumnProperty attribute.
- orm Introduce _orm.relationship.sync_backref flag in a
relationship to control if the synchronization events that
mutate the in-Python attributes are added. This supersedes the
previous change #5149, which warned that viewonly=True
relationship target of a back_populates or backref configuration
would be disallowed.
- engine Bug fixes
- schema Bug fixes
- schema Add comment attribute to _schema.Column __repr__ method.
The year in LICENSE has been updated so LIC_FILES_CHKSUM was
changed.
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 5fef53b9989767dae9288274df871639e7c1c4a1)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...n3-sqlalchemy_1.3.12.bb => python3-sqlalchemy_1.3.17.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-python/recipes-devtools/python/{python3-sqlalchemy_1.3.12.bb => python3-sqlalchemy_1.3.17.bb} (67%)
diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.12.bb b/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.17.bb
similarity index 67%
rename from meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.12.bb
rename to meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.17.bb
index e29b572cbc..b9c58e5b6a 100644
--- a/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.12.bb
+++ b/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.17.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \
application developers the full power and flexibility of SQL"
HOMEPAGE = "http://www.sqlalchemy.org/"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2f5eb030c48975d5294baf0f5d01af1c"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c19467890539ff718c00a019c9c7a7b2"
-SRC_URI[md5sum] = "02a46be841903b60c52a83342d3ced8e"
-SRC_URI[sha256sum] = "bfb8f464a5000b567ac1d350b9090cf081180ec1ab4aa87e7bca12dab25320ec"
+SRC_URI[md5sum] = "478214152b9293bf5652815d7312c890"
+SRC_URI[sha256sum] = "156a27548ba4e1fed944ff9fcdc150633e61d350d673ae7baaf6c25c04ac1f71"
PYPI_PACKAGE = "SQLAlchemy"
inherit pypi setuptools3
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [dunfel 32/32] ntp: update 4.2.8p15
2020-07-01 0:06 [dunfel 00/32] Patch review akuster
` (30 preceding siblings ...)
2020-07-01 0:07 ` [dunfel 31/32] python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17 akuster
@ 2020-07-01 0:07 ` akuster
31 siblings, 0 replies; 48+ messages in thread
From: akuster @ 2020-07-01 0:07 UTC (permalink / raw)
To: openembedded-devel
From: Armin Kuster <akuster@mvista.com>
Source: ntp.org
MR: 104487
Type: Security Fix
Disposition: Backport from http://archive.ntp.org/ntp4/ntp-4.2/
ChangeID: 65b220646dc29168c45b051a6ea2a651b9e669d1
Description:
Bugfix only update including a security fix: CVE-2020-15025
changelog: https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ChangeLog-stable
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit c9384d7fc40acdf8b5ed668ac3f5fa0e2ad4dbd1)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-support/ntp/{ntp_4.2.8p14.bb => ntp_4.2.8p15.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta-networking/recipes-support/ntp/{ntp_4.2.8p14.bb => ntp_4.2.8p15.bb} (98%)
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p14.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb
similarity index 98%
rename from meta-networking/recipes-support/ntp/ntp_4.2.8p14.bb
rename to meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb
index cdf66082f2..7e168825e0 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.8p14.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb
@@ -24,8 +24,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
file://ntpd.list \
"
-SRC_URI[md5sum] = "783edaf1d68ddf651bde64eda54a579d"
-SRC_URI[sha256sum] = "1960e4f081f6aafd108d721bc3ab15f9e8dfd08dc08339aa95bca9d2545e4eb7"
+SRC_URI[sha256sum] = "f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19"
inherit autotools update-rc.d useradd systemd pkgconfig
--
2.17.1
^ permalink raw reply related [flat|nested] 48+ messages in thread