Skip to contentSkip to conversation

Patch review

PATCH In review akuster 5 participants 48 messages Jul 1, 2020 – Jul 15, 2020 Zstd

lore
Share & tools
lore

akuster

author
#0 lore raw

cover Patch review

Please provide feedback by Friday

The following changes since commit 8a72d29e0876830ffd96b85d7d0308302eb07a5d:

python3-docutils: Remove, moved to OE-core (2020-06-12 09:32:24 -0700)

are available in the Git repository at:

git://git.openembedded.org/meta-openembedded-contrib stable/dunfell-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/dunfell-nut

Alex Kiernan (1):
zstd: Upgrade 1.4.4 -> 1.4.5

Andreas Müller (4):
libblockdev: upgrade 2.23 -> 2.24
vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber
patches
openh264: upgrade 2.1.0 -> 2.1.1
tcpreplay: upgrade 4.3.2 -> 4.3.3

Armin Kuster (1):
ntp: update 4.2.8p15

Changqing Li (2):
python-django: add RDEPENDS
python-m2crypto: Add RDEPENDS

Christian Eggers (1):
linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit
time_t

Khem Raj (1):
multipath-tools: Fix build with json-c 0.14 and newer

Konrad Weihmann (3):
netkit-rsh: properly append PACKAGECONFIG
zile: properly append PACKAGECONFIG
libtalloc: fix upstream url

Leon Anavi (1):
python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17

Mingli Yu (1):
python3-m2crypto: add the missing rdepends

Paul Eggleton (1):
protobuf-c: disable parallelism to avoid race condition

Pierre-Jean Texier (9):
zchunk: upgrade 1.1.5 -> 1.1.6
uriparser: upgrade 0.9.3 -> 0.9.4
jsoncpp: upgrade 1.9.2 -> 1.9.3
jpnevulator: upgrade 2.3.4 -> 2.3.5
libnftnl: upgrade 1.1.6 -> 1.1.7
nftables: upgrade 0.9.4 -> 0.9.5
haveged: upgrade 1.9.8 -> 1.9.9
rsnapshot: upgrade 1.4.2 -> 1.4.3
fuse3: upgrade 3.9.1 -> 3.9.2

[email protected] (1):
python-django: set CVE_PRODUCT to be django

Wang Mingyu (3):
postgresql: 12.2 -> 12.3
openipmi: upgrade 2.0.28 -> 2.0.29
twm: upgrade 1.0.10 -> 1.0.11

Zang Ruochen (3):
proj: upgrade 7.0.0 -> 7.0.1
libvpx: upgrade 1.8.1 -> 1.8.2
mm-common: upgrade 1.0..0 -> 1.0.1

 .../fuse/{fuse3_3.9.1.bb => fuse3_3.9.2.bb}   |   3 +-
 .../{openh264_2.1.0.bb => openh264_2.1.1.bb}  |   4 +-
 ...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 +-
 .../{libnftnl_1.1.6.bb => libnftnl_1.1.7.bb}  |   2 +-
 .../{nftables_0.9.4.bb => nftables_0.9.5.bb}  |   3 +-
 .../netkit-rsh/netkit-rsh_0.17.bb             |   2 +-
 .../libtalloc/libtalloc_2.3.0.bb              |   2 +-
 .../ntp/{ntp_4.2.8p14.bb => ntp_4.2.8p15.bb}  |   3 +-
 ...{openipmi_2.0.28.bb => openipmi_2.0.29.bb} |   4 +-
 ...{tcpreplay_4.3.2.bb => tcpreplay_4.3.3.bb} |   4 +-
 .../linuxptp/time_t_maybe_long_long.patch     | 135 ++++++++++++++++++
 .../linuxptp/linuxptp_2.0.bb                  |   1 +
 ...{mm-common_1.0.0.bb => mm-common_1.0.1.bb} |   4 +-
 ...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 +-
 .../{jsoncpp_1.9.2.bb => jsoncpp_1.9.3.bb}    |   2 +-
 .../protobuf/protobuf-c_1.3.3.bb              |   5 +
 .../{haveged_1.9.8.bb => haveged_1.9.9.bb}    |   4 +-
 .../jpnevulator/jpnevulator_git.bb            |   4 +-
 ...ibblockdev_2.23.bb => libblockdev_2.24.bb} |   7 +-
 .../0001-Fix-legacy-build-after-2103.patch    |  27 ++++
 .../zstd/{zstd_1.4.4.bb => zstd_1.4.5.bb}     |   6 +-
 .../xorg-app/{twm_1.0.10.bb => twm_1.0.11.bb} |   5 +-
 .../webm/{libvpx_1.8.1.bb => libvpx_1.8.2.bb} |   2 +-
 .../proj/{proj_7.0.0.bb => proj_7.0.1.bb}     |   4 +-
 ...1-fix-boolean-value-with-json-c-0.14.patch |  42 ++++++
 .../multipath-tools/multipath-tools_0.8.4.bb  |   1 +
 .../rsnapshot/rsnapshot_git.bb                |   4 +-
 ...{uriparser_0.9.3.bb => uriparser_0.9.4.bb} |   5 +-
 .../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 +-
 meta-oe/recipes-support/zile/zile_2.4.14.bb   |   2 +-
 .../recipes-devtools/python/python-django.inc |   3 +
 .../python/python-m2crypto.inc                |  12 +-
 ...1.3.12.bb => python3-sqlalchemy_1.3.17.bb} |   6 +-
 42 files changed, 330 insertions(+), 206 deletions(-)
 rename meta-filesystems/recipes-support/fuse/{fuse3_3.9.1.bb => fuse3_3.9.2.bb} (91%)
 rename meta-multimedia/recipes-multimedia/openh264/{openh264_2.1.0.bb => openh264_2.1.1.bb} (94%)
 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
 rename meta-networking/recipes-filter/libnftnl/{libnftnl_1.1.6.bb => libnftnl_1.1.7.bb} (88%)
 rename meta-networking/recipes-filter/nftables/{nftables_0.9.4.bb => nftables_0.9.5.bb} (90%)
 rename meta-networking/recipes-support/ntp/{ntp_4.2.8p14.bb => ntp_4.2.8p15.bb} (98%)
 rename meta-networking/recipes-support/openipmi/{openipmi_2.0.28.bb => openipmi_2.0.29.bb} (96%)
 rename meta-networking/recipes-support/tcpreplay/{tcpreplay_4.3.2.bb => tcpreplay_4.3.3.bb} (75%)
 create mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch
 rename meta-oe/recipes-core/mm-common/{mm-common_1.0.0.bb => mm-common_1.0.1.bb} (66%)
 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%)
 rename meta-oe/recipes-devtools/jsoncpp/{jsoncpp_1.9.2.bb => jsoncpp_1.9.3.bb} (93%)
 rename meta-oe/recipes-extended/haveged/{haveged_1.9.8.bb => haveged_1.9.9.bb} (96%)
 rename meta-oe/recipes-extended/libblockdev/{libblockdev_2.23.bb => libblockdev_2.24.bb} (94%)
 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%)
 rename meta-oe/recipes-graphics/xorg-app/{twm_1.0.10.bb => twm_1.0.11.bb} (67%)
 rename meta-oe/recipes-multimedia/webm/{libvpx_1.8.1.bb => libvpx_1.8.2.bb} (96%)
 rename meta-oe/recipes-navigation/proj/{proj_7.0.0.bb => proj_7.0.1.bb} (75%)
 create mode 100644 meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch
 rename meta-oe/recipes-support/uriparser/{uriparser_0.9.3.bb => uriparser_0.9.4.bb} (64%)
 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%)
 rename meta-python/recipes-devtools/python/{python3-sqlalchemy_1.3.12.bb => python3-sqlalchemy_1.3.17.bb} (67%)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/32 zchunk: upgrade 1.1.5 -> 1.1.6

From: Pierre-Jean Texier <[email protected]>

- Remove patches already in version

(cherry picked from commit d3e33a705a0bf36fe2876ae59e1bfed0f52e27e1)
---
 .../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%)
meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch deleted +0 -39
deleted file mode 100644
index 64e0e8ed61..0000000000
@@ -1,39 +0,0 @@
-From 78247d478cec254bad27f4ed97b532f4f54bf1b0 Mon Sep 17 00:00:00 2001
-From: Pierre-Jean Texier <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch deleted +0 -61

61 lines not on this page · raw message

meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb renamed from meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb +2 -6
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
@@ -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 = "\
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 2/32 uriparser: upgrade 0.9.3 -> 0.9.4

In reply to akuster

From: Pierre-Jean Texier <[email protected]>

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

(cherry picked from commit 27adb9336cda4eea9fcd2e881807756f6d53eae0)
---
 .../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%)
meta-oe/recipes-support/uriparser/uriparser_0.9.4.bb renamed from meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb +2 -3
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
@@ -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"
 
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 3/32 jsoncpp: upgrade 1.9.2 -> 1.9.3

In reply to akuster

From: Pierre-Jean Texier <[email protected]>

See full changelog https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3

(cherry picked from commit 65e124eef373680726ac045677cbec7d9080a289)
---
 .../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%)
meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb renamed from meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb +1 -1
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
@@ -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"
Signature · 1 line
2.17.1
author
#15 lore raw

PATCH 4/32 proj: upgrade 7.0.0 -> 7.0.1

In reply to akuster

From: Zang Ruochen <[email protected]>

-Added md5 verification.

(cherry picked from commit adedd567be1b10f725b5fcd55cb61af856fb3316)
---
 .../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%)
meta-oe/recipes-navigation/proj/proj_7.0.1.bb renamed from meta-oe/recipes-navigation/proj/proj_7.0.0.bb +3 -1
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
@@ -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"
 
Signature · 1 line
2.17.1
author
#16 lore raw

PATCH 5/32 netkit-rsh: properly append PACKAGECONFIG

In reply to akuster

From: Konrad Weihmann <[email protected]>

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

(cherry picked from commit 4cca3eff387dc6630915ba4238b97712589308b8)
---
 meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb +1 -1
index a6716d06ce..f6c05daa18 100644
@@ -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'
Signature · 1 line
2.17.1
author
#17 lore raw

PATCH 6/32 zile: properly append PACKAGECONFIG

In reply to akuster

From: Konrad Weihmann <[email protected]>

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

(cherry picked from commit 1a1194a92bca9276676679588a4cda9ff31713ee)
---
 meta-oe/recipes-support/zile/zile_2.4.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/zile/zile_2.4.14.bb +1 -1
index 3b846c1511..acd491498e 100644
@@ -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,"
Signature · 1 line
2.17.1
author
#18 lore raw

PATCH 7/32 postgresql: 12.2 -> 12.3

In reply to akuster

From: Wang Mingyu <[email protected]>

0001-Use-pkg-config-for-libxml2-detection.patch
removed since it is not available in 12.3

(cherry picked from commit 04dc1ffc16eaa2eca6299341b2a86e56b9e98367)
[Bug fix only update]
---
 ...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%)
meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch deleted +0 -50
deleted file mode 100644
index 84cd5c1579..0000000000
@@ -1,50 +0,0 @@
-From d3ee8c8df5808b63e86f40831f2ba62cbb33d291 Mon Sep 17 00:00:00 2001
-From: Changqing Li <[email protected]>
-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 <[email protected]>
-
-update to version 10.4
-Signed-off-by: Changqing Li <[email protected]>
-
-Update for version 12.0
-Signed-off-by: Zheng Ruoqin <[email protected]>
----
- 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
-
meta-oe/recipes-dbs/postgresql/postgresql.inc +0 -1
index d35711c1e5..5b20098a72 100644
@@ -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"
meta-oe/recipes-dbs/postgresql/postgresql_12.3.bb renamed from meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb +2 -2
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
@@ -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"
Signature · 1 line
2.17.1
author
#19 lore raw

PATCH 8/32 multipath-tools: Fix build with json-c 0.14 and newer

In reply to akuster

From: Khem Raj <[email protected]>

(cherry picked from commit 1b0ce2ce1d388d223ff337e5683d9b026b7082ba)
---
 ...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
meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch new file +42 -0
new file mode 100644
index 0000000000..cf97b491e1
@@ -0,0 +1,42 @@
+From 5ae81386a8cfea4180738c261cd3f7944a631199 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +1 -0
index af34a4b392..0d03191373 100644
@@ -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"
Signature · 1 line
2.17.1
author
#22 lore raw

PATCH 9/32 libblockdev: upgrade 2.23 -> 2.24

In reply to akuster

From: Andreas Müller <[email protected]>

Change SRC_URI: all udisks related sources moved to
https://github.com/storaged-project

(cherry picked from commit dc25abfed8ce775ceb23dd483fe85924dc550bfe)
---
 .../{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%)
meta-oe/recipes-extended/libblockdev/libblockdev_2.24.bb renamed from meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb +2 -5
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
@@ -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"
Signature · 1 line
2.17.1
author
#23 lore raw

PATCH 10/32 libvpx: upgrade 1.8.1 -> 1.8.2

In reply to akuster

From: Zang Ruochen <[email protected]>

(cherry picked from commit 91b30560e4a4e5a40744d01dfa1339ad8ba96a7e)
---
 .../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%)
meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb renamed from meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb +1 -1
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
@@ -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 \
            "
Signature · 1 line
2.17.1
author
#24 lore raw

PATCH 11/32 vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches

In reply to akuster

From: Andreas Müller <[email protected]>

(cherry picked from commit aadbc77f8e132301403c1187e8d0488d526f8817)
[AK: meta-QT5 dufell has 5.15 so this is seems reasonable.]
---
 ...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
meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch renamed from meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch +0 -0
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
meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch renamed from meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch +0 -0
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
meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch renamed from meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch +0 -0
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
meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch renamed from meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch +0 -0
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
meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch new file +56 -0

56 lines not on this page · raw message

meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb +5 -4
index f6c7a606d5..24898a5a7f 100644
@@ -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"
 
Signature · 1 line
2.17.1
author
#27 lore raw

PATCH 12/32 jpnevulator: upgrade 2.3.4 -> 2.3.5

In reply to akuster

From: Pierre-Jean Texier <[email protected]>

See changelog https://github.com/snarlistic/jpnevulator/blob/master/Changelog

(cherry picked from commit 28bf55bafc57c905755f32d685452492db9eae41)
---
 meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb +2 -2
index d2819f76c5..50dd74b685 100644
@@ -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"
 
Signature · 1 line
2.17.1
author
#28 lore raw

PATCH 13/32 libnftnl: upgrade 1.1.6 -> 1.1.7

In reply to akuster

From: Pierre-Jean Texier <[email protected]>

See https://lwn.net/Articles/822353/

(cherry picked from commit 9e7912b8fd841001a2ffb78dc32edc86fd70b8cd)
---
 .../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%)
meta-networking/recipes-filter/libnftnl/libnftnl_1.1.7.bb renamed from meta-networking/recipes-filter/libnftnl/libnftnl_1.1.6.bb +1 -1
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
@@ -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 \
            "
Signature · 1 line
2.17.1
author
#29 lore raw

PATCH 14/32 nftables: upgrade 0.9.4 -> 0.9.5

In reply to akuster

From: Pierre-Jean Texier <[email protected]>

(cherry picked from commit bf1ac503e8a54387a6b46623235dadff0d14596e)
---
 .../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%)
meta-networking/recipes-filter/nftables/nftables_0.9.5.bb renamed from meta-networking/recipes-filter/nftables/nftables_0.9.4.bb +1 -2
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
@@ -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
 
Signature · 1 line
2.17.1
author
#30 lore raw

PATCH 15/32 haveged: upgrade 1.9.8 -> 1.9.9

In reply to akuster

From: Pierre-Jean Texier <[email protected]>

(cherry picked from commit 339b7c6c34b33be852f8f5a5ee57660495b54cc6)
---
 .../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%)
meta-oe/recipes-extended/haveged/haveged_1.9.9.bb renamed from meta-oe/recipes-extended/haveged/haveged_1.9.8.bb +2 -2
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
@@ -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"
Signature · 1 line
2.17.1
author
#31 lore raw

PATCH 16/32 mm-common: upgrade 1.0..0 -> 1.0.1

In reply to akuster

From: Zang Ruochen <[email protected]>

(cherry picked from commit 15e57216d05e31935855b38fb41b5732aee257ef)
---
 .../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%)
meta-oe/recipes-core/mm-common/mm-common_1.0.1.bb renamed from meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb +2 -2
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
@@ -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"
Signature · 1 line
2.17.1
author
#32 lore raw

PATCH 17/32 python-django: add RDEPENDS

In reply to akuster

From: Changqing Li <[email protected]>

fix error:
ModuleNotFoundError: No module named 'distutils'

(cherry picked from commit 1407d43bc4b2b8b7c2de35a4173556c08dca36a9)
---
 meta-python/recipes-devtools/python/python-django.inc | 1 +
 1 file changed, 1 insertion(+)
meta-python/recipes-devtools/python/python-django.inc +1 -0
index 54c77c8276..73b7ac99f9 100644
@@ -28,4 +28,5 @@ RDEPENDS_${PN} += "\
     ${PYTHON_PN}-threading \
     ${PYTHON_PN}-unixadmin \
     ${PYTHON_PN}-xml \
+    ${PYTHON_PN}-distutils \
 "
Signature · 1 line
2.17.1
author
#33 lore raw

PATCH 18/32 python-m2crypto: Add RDEPENDS

In reply to akuster

From: Changqing Li <[email protected]>

fix errors:
ModuleNotFoundError: No module named 'distutils'
ModuleNotFoundError: No module named 'asyncore'
ModuleNotFoundError: No module named 'xmlrpc'

(cherry picked from commit 1d6071e97157851dbfbdf26f302fc5ec8f6ee4db)
---
 meta-python/recipes-devtools/python/python-m2crypto.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-python/recipes-devtools/python/python-m2crypto.inc +5 -1
index 76dd58ce04..881fdf1cc2 100644
@@ -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}"
Signature · 1 line
2.17.1
author
#34 lore raw

PATCH 19/32 python-django: set CVE_PRODUCT to be django

In reply to akuster

From: "[email protected]" <[email protected]>

(cherry picked from commit 639eae8901467c0bf79a05b6b6e6cda94a937ae9)
---
 meta-python/recipes-devtools/python/python-django.inc | 2 ++
 1 file changed, 2 insertions(+)
meta-python/recipes-devtools/python/python-django.inc +2 -0
index 73b7ac99f9..c02b3fa522 100644
@@ -30,3 +30,5 @@ RDEPENDS_${PN} += "\
     ${PYTHON_PN}-xml \
     ${PYTHON_PN}-distutils \
 "
+
+CVE_PRODUCT = "django"
Signature · 1 line
2.17.1
author
#35 lore raw

PATCH 20/32 python3-m2crypto: add the missing rdepends

In reply to akuster

From: Mingli Yu <[email protected]>

Add the missing rdepends to fix the error such as below:

 # python3
 [snip]
Quoted 1 line
Quoted 1 line
Quoted 1 line

import M2Crypto

ModuleNotFoundError: No module named 'decimal'

(cherry picked from commit fe77eaab8f0c3be9e1fbfeef69400f4f06748613)
---
 .../recipes-devtools/python/python-m2crypto.inc    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
meta-python/recipes-devtools/python/python-m2crypto.inc +10 -4
index 881fdf1cc2..81c81645af 100644
@@ -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}"
Signature · 1 line
2.17.1
author
#36 lore raw

PATCH 21/32 zstd: Upgrade 1.4.4 -> 1.4.5

In reply to akuster

From: Alex Kiernan <[email protected]>

(cherry picked from commit f6aa84fcf197bb74ed2a4dc1e3bb898fc884e27b)
---
 .../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%)
meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch new file +27 -0
new file mode 100644
index 0000000000..c701554b8b
@@ -0,0 +1,27 @@
+From 93cec0c1d6d0be8dd3a9d01d3e7f2099f1728df7 Mon Sep 17 00:00:00 2001
+From: Orivej Desh <[email protected]>
+Date: Fri, 22 May 2020 12:48:02 +0000
+Subject: [PATCH] Fix legacy build after #2103
+
+Upstream-Status: Backport
+Signed-of-by: Alex Kiernan <[email protected]>
+---
+ 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
+
meta-oe/recipes-extended/zstd/zstd_1.4.5.bb renamed from meta-oe/recipes-extended/zstd/zstd_1.4.4.bb +4 -2
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
@@ -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"
Signature · 1 line
2.17.1
author
#37 lore raw

PATCH 22/32 rsnapshot: upgrade 1.4.2 -> 1.4.3

In reply to akuster

From: Pierre-Jean Texier <[email protected]>

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.

(cherry picked from commit 4ea3135e945aadba7d1cb6424a861378c484b570)

---
 meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +2 -2
index efe95b1019..dcadede0ed 100644
@@ -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 \
Signature · 1 line
2.17.1
author
#38 lore raw

PATCH 23/32 fuse3: upgrade 3.9.1 -> 3.9.2

In reply to akuster

From: Pierre-Jean Texier <[email protected]>

See changelog https://github.com/libfuse/libfuse/releases/tag/fuse-3.9.2

(cherry picked from commit b6979461fdf6709d196efc7485c1e6e0ceace0e0)
---
 .../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%)
meta-filesystems/recipes-support/fuse/fuse3_3.9.2.bb renamed from meta-filesystems/recipes-support/fuse/fuse3_3.9.1.bb +1 -2
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
@@ -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}"
 
Signature · 1 line
2.17.1
author
#39 lore raw

PATCH 24/32 protobuf-c: disable parallelism to avoid race condition

In reply to akuster

From: Paul Eggleton <[email protected]>

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

(cherry picked from commit 3251fe210a91d13ab2a6c5b7ecb283aa8e019020)
---
 meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb +5 -0
index 94c3893574..ed8773443e 100644
@@ -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}"
Signature · 1 line
2.17.1
author
#40 lore raw

PATCH 25/32 openipmi: upgrade 2.0.28 -> 2.0.29

In reply to akuster

From: Wang Mingyu <[email protected]>

???Signed-off-by: Wang Mingyu <[email protected]>

(cherry picked from commit 0b0c102d8c6daae12894f47f9523fe27fca5b15f)
---
 .../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%)
meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb renamed from meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb +2 -2
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
@@ -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
 
Signature · 1 line
2.17.1
author
#41 lore raw

PATCH 26/32 twm: upgrade 1.0.10 -> 1.0.11

In reply to akuster

From: Wang Mingyu <[email protected]>

??Signed-off-by: Wang Mingyu <[email protected]>

(cherry picked from commit 8f6facb77e13c9dc53056f30283d0dd33a9c8679)
---
 .../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%)
meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb renamed from meta-oe/recipes-graphics/xorg-app/twm_1.0.10.bb +3 -2
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
@@ -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"
Signature · 1 line
2.17.1
author
#42 lore raw

PATCH 27/32 libtalloc: fix upstream url

In reply to akuster

From: Konrad Weihmann <[email protected]>

https://samba.org seems to be gone, switch to https://www.samba.org

(cherry picked from commit 9a85b925c51308f93475d7cc8e2ddda90dff30fd)
---
 meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb +1 -1
index 9f8ebcc410..59deb15b63 100644
@@ -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 \
 "
Signature · 1 line
2.17.1
author
#43 lore raw

PATCH 28/32 linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit time_t

In reply to akuster

From: Christian Eggers <[email protected]>

Back ported upstream patch:
https://github.com/richardcochran/linuxptp/commit/7de73fefc378cc42b9ed1115b3afa409d0250a48

(cherry picked from commit 924bd4dd084cb86704c52fecee5bd147186a6efb)
---
 .../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
meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch new file +135 -0
new file mode 100644
index 0000000000..af99d2b7f9
@@ -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 <[email protected]>
+---
+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);
+ 	}
+ }
+ 
meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb +1 -0
index eb262d36b2..930c6673dc 100644
@@ -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"
Signature · 1 line
2.17.1
author
#44 lore raw

PATCH 29/32 openh264: upgrade 2.1.0 -> 2.1.1

In reply to akuster

From: Andreas Müller <[email protected]>

Quoted 1 line
Quoted 1 line

From [1]

* release x86 and x64 libraries for android platform
* Bug fixes

[1] https://github.com/cisco/openh264/releases

(cherry picked from commit 69716e959bddb3b56dffb07bc308cfb6e1e80bb6)
---
 .../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%)
meta-multimedia/recipes-multimedia/openh264/openh264_2.1.1.bb renamed from meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb +2 -2
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
@@ -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 \
            "
Signature · 1 line
2.17.1
author
#45 lore raw

PATCH 30/32 tcpreplay: upgrade 4.3.2 -> 4.3.3

In reply to akuster

From: Andreas Müller <[email protected]>

Quoted 1 line
Quoted 1 line

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

(cherry picked from commit 822963c6cba8edde6d91fc56e2f0ae9e7a730551)
---
 .../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%)
meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.3.bb renamed from meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.2.bb +2 -2
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
@@ -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"
 
Signature · 1 line
2.17.1
author
#46 lore raw

PATCH 31/32 python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17

In reply to akuster

From: Leon Anavi <[email protected]>

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.

(cherry picked from commit 5fef53b9989767dae9288274df871639e7c1c4a1)
---
 ...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%)
meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.17.bb renamed from meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.12.bb +3 -3
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
@@ -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
Signature · 1 line
2.17.1
author
#47 lore raw

PATCH 32/32 ntp: update 4.2.8p15

In reply to akuster

From: Armin Kuster <[email protected]>

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

(cherry picked from commit c9384d7fc40acdf8b5ed668ac3f5fa0e2ad4dbd1)
---
 .../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%)
meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb renamed from meta-networking/recipes-support/ntp/ntp_4.2.8p14.bb +1 -2
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
@@ -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
 
Signature · 1 line
2.17.1
#25 lore raw

Re: [oe] [dunfel 11/32] vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches

In reply to akuster
Quoted 1 line

[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)

Quoted 158 lines · akuster

From: Andreas Müller <[email protected]>

(cherry picked from commit aadbc77f8e132301403c1187e8d0488d526f8817)
[AK: meta-QT5 dufell has 5.15 so this is seems reasonable.]
---
 ...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

meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch new file +18 -0
@@ -0,0 +1,56 @@
+From c805c6f64da6d8b03355b4796865b75e2f3b500d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
+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 <[email protected]>
+---
+ 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

meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch new file +12 -0
+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

meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch new file +12 -0
+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

meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch new file +14 -0
+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
+
meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb +5 -4
index f6c7a606d5..24898a5a7f 100644
@@ -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

author
#26 lore raw

Re: [oe] [dunfel 11/32] vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches

Quoted 4 lines · Martin Jansa
Quoted 1 line

  [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

Quoted 184 lines

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 <[email protected] <mailto:[email protected]>> wrote:

    From: Andreas Müller <[email protected]
    <mailto:[email protected]>>

    Signed-off-by: Andreas Müller <[email protected]
    <mailto:[email protected]>>
    Signed-off-by: Khem Raj <[email protected]
    <mailto:[email protected]>>
    (cherry picked from commit aadbc77f8e132301403c1187e8d0488d526f8817)
    [AK: meta-QT5 dufell has 5.15 so this is seems reasonable.]
    Signed-off-by: Armin Kuster <[email protected]
    <mailto:[email protected]>>
    ---
     ...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?= <[email protected]
    <mailto:[email protected]>>
    +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 <[email protected]
    <mailto:[email protected]>>
    +---
    + 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
author
#21 lore raw

Re: [oe] [dunfel 08/32] multipath-tools: Fix build with json-c 0.14 and newer

Quoted 1 line · Adrian Bunk

dunfell has json-c 0.13.1

k. thanks,
-armin

Quoted 2 lines

cu
Adrian

#4 lore raw

Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3

In reply to akuster

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.

Quoted 37 lines · akuster

From: Pierre-Jean Texier <[email protected]>

See full changelog
https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3

(cherry picked from commit 65e124eef373680726ac045677cbec7d9080a289)
---
 .../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%)

meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb renamed from meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb +1 -2
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
@@ -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

author
#5 lore raw

Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3

Quoted 3 lines · Martin Jansa

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

Quoted 55 lines

On Wed, Jul 1, 2020 at 2:07 AM akuster <[email protected] <mailto:[email protected]>> wrote:

    From: Pierre-Jean Texier <[email protected]
    <mailto:[email protected]>>

    See full changelog
    https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3

    Signed-off-by: Pierre-Jean Texier <[email protected]
    <mailto:[email protected]>>
    Signed-off-by: Khem Raj <[email protected]
    <mailto:[email protected]>>
    (cherry picked from commit 65e124eef373680726ac045677cbec7d9080a289)
    Signed-off-by: Armin Kuster <[email protected]
    <mailto:[email protected]>>
    ---
     .../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
#6 lore raw

Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3

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.

Quoted 58 lines · On Thu, Jul 9, 2020 at 6:06 PM akuster808 <[email protected]> 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

Quoted 37 lines · akuster

From: Pierre-Jean Texier <[email protected]>

See full changelog
https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3

(cherry picked from commit 65e124eef373680726ac045677cbec7d9080a289)
---
 .../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%)

meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb renamed from meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb +1 -2
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
@@ -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

#7 lore raw

Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3

Quoted 11 lines · Martin Jansa

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.

Quoted 76 lines

On Thu, Jul 9, 2020 at 6:06 PM akuster808 <[email protected] <mailto:[email protected]>> wrote:

    On 7/9/20 8:21 AM, Martin Jansa wrote:
Quoted 3 lines

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

Quoted 55 lines
    On Wed, Jul 1, 2020 at 2:07 AM akuster <[email protected]
    <mailto:[email protected]>> wrote:

        From: Pierre-Jean Texier <[email protected]
        <mailto:[email protected]>>

        See full changelog
        https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3

        Signed-off-by: Pierre-Jean Texier <[email protected]
        <mailto:[email protected]>>
        Signed-off-by: Khem Raj <[email protected]
        <mailto:[email protected]>>
        (cherry picked from commit
        65e124eef373680726ac045677cbec7d9080a289)
        Signed-off-by: Armin Kuster <[email protected]
        <mailto:[email protected]>>
        ---
         .../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
author
#13 lore raw

Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3

In reply to Khem Raj
Quoted 12 lines · Khem Raj
Quoted 10 lines · Martin Jansa

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).

Quoted 4 lines
Quoted 1 line

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.

Quoted 7 lines

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

Quoted 72 lines
Quoted 72 lines

On Thu, Jul 9, 2020 at 6:06 PM akuster808 <[email protected] <mailto:[email protected]>> wrote:

    On 7/9/20 8:21 AM, Martin Jansa wrote:
Quoted 3 lines

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

Quoted 54 lines
    On Wed, Jul 1, 2020 at 2:07 AM akuster <[email protected]
    <mailto:[email protected]>> wrote:

        From: Pierre-Jean Texier <[email protected]
        <mailto:[email protected]>>

        See full changelog
        https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3

        Signed-off-by: Pierre-Jean Texier <[email protected]
        <mailto:[email protected]>>
        Signed-off-by: Khem Raj <[email protected]
        <mailto:[email protected]>>
        (cherry picked from commit
        65e124eef373680726ac045677cbec7d9080a289)
        Signed-off-by: Armin Kuster <[email protected]
        <mailto:[email protected]>>
        ---
         .../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
#14 lore raw

Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3

Quoted 23 lines · On 7/10/20 8:55 AM, akuster808 wrote:
Quoted 12 lines · Khem Raj
Quoted 10 lines · Martin Jansa

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).

Quoted 4 lines
Quoted 1 line

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.

Quoted 3 lines

but then I see

Quoted 7 lines
Quoted 4 lines

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.

Quoted 75 lines

-armin

Quoted 72 lines
Quoted 72 lines

On Thu, Jul 9, 2020 at 6:06 PM akuster808 <[email protected] <mailto:[email protected]>> wrote:

     On 7/9/20 8:21 AM, Martin Jansa wrote:
Quoted 3 lines

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

Quoted 54 lines
     On Wed, Jul 1, 2020 at 2:07 AM akuster <[email protected]
     <mailto:[email protected]>> wrote:

         From: Pierre-Jean Texier <[email protected]
         <mailto:[email protected]>>

         See full changelog
         https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.3

         Signed-off-by: Pierre-Jean Texier <[email protected]
         <mailto:[email protected]>>
         Signed-off-by: Khem Raj <[email protected]
         <mailto:[email protected]>>
         (cherry picked from commit
         65e124eef373680726ac045677cbec7d9080a289)
         Signed-off-by: Armin Kuster <[email protected]
         <mailto:[email protected]>>
         ---
          .../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
#11 lore raw

Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3

Quoted 6 lines · On Mon, Jul 13, 2020 at 1:25 AM <[email protected]> wrote:

Hi,

Quoted 2 lines · akuster
Quoted 8 lines
Quoted 6 lines · On 7/10/20 12:37 AM, [email protected] wrote:
Quoted 4 lines

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?

Quoted 12 lines

-Mikko

Quoted 9 lines

-armin

Quoted 5 lines

https://abi-laboratory.pro/index.php?view=timeline&l=jsoncpp

Cheers,

-Mikko

author
#12 lore raw

Re: [oe] [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3

Quoted 6 lines · Khem Raj
Quoted 5 lines · On Mon, Jul 13, 2020 at 1:25 AM <[email protected]> wrote:

Hi,

Quoted 2 lines · akuster

On 7/10/20 12:37 AM, [email protected] wrote:

Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
Quoted 4 lines

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

Quoted 10 lines
Quoted 10 lines

-Mikko

Quoted 7 lines

-armin

Quoted 5 lines

https://abi-laboratory.pro/index.php?view=timeline&l=jsoncpp

Cheers,

-Mikko