meta-openembedded: subtree update:fe77eaab8f..629696b64b

Alex Kiernan (4):
      zstd: Upgrade 1.4.4 -> 1.4.5
      libxmlb: Add recipe
      libjcat: Add recipe
      gcab: Add recipe

Andreas Müller (14):
      libdvdcss: upgrade 1.3.0 -> 1.4.2
      vlc: upgrade 3.0.10 -> 3.0.11
      netdata: upgrade 1.17.0 -> 1.22.1
      libsass: upgrade 3.6.3 -> 3.6.4 / rename recipe
      gnome-desktop3: upgrade 3.36.2 -> 3.36.3.1
      evince: upgrade 3.36.3 -> 3.36.5
      gnome-control-center: upgrade 3.36.2 -> 3.36.3
      redis: upgrade 5.0.9 -> 6.0.4
      squid: upgrade 4.9 -> 4.12
      libgit2: upgrade 1.0.0 -> 1.0.1
      openh264: upgrade 2.1.0 -> 2.1.1
      tcpreplay: upgrade 4.3.2 -> 4.3.3
      asio: upgrade 1.12.2 -> 1.16.1
      Revert "packagegroup-xfce-base: add RDEPEND packagegroup-core-x11"

Anuj Mittal (2):
      opencl: move headers and loader recipe to common directory
      opencl-clhpp: add recipe

Armin Kuster (9):
      python3-configobj: Add package
      python3-croniter: add package
      python3-flask-versioned: Add package
      python3-huey: Add package
      python3-sqlsoup: add package
      python3-smpplib: add package
      python3-pyrad: add package
      libuv: pkg now in core, remove
      ntp: update 4.2.8p15

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

Konrad Weihmann (1):
      libtalloc: fix upstream url

Leon Anavi (82):
      python3-packaging: Consolidate in a single file
      python3-packaging: Upgrade 20.3 -> 20.4
      python3-parse-type: Consolidate in a single file
      python3-parse-type: Upgrade 0.4.2 -> 0.5.2
      python3-javaobj-py3: Consolidate in a single file
      python3-jsonpointer: Consolidate in a single file
      python3-kconfiglib: Consolidate in a single file
      python3-twisted: Consolidate in a single file
      python3-twisted: Upgrade 19.10.0 -> 20.3.0
      protobuf: Upgrade 3.11.4 -> 3.12.3
      xscreensaver: Upgrade 5.39 -> 5.44
      python3-iso8601: Consolidate in a single file
      python3-isodate: Consolidate in a single file
      python3-incremental: Consolidate in a single file
      python3-itsdangerous: Consolidate in a single file
      python3-importlib-metadata: Consolidate in a single file
      python3-importlib-metadata: Upgrade 1.5.2 -> 1.6.1
      python3-can: Upgrade 3.3.2 -> 3.3.3
      python3-psutil: Consolidate in a single file
      python3-protobuf: Consolidate in a single file
      python3-protobuf: Upgrade 3.11.3 -> 3.12.2
      python-kconfiglib.inc: Remove
      sip3: Consolidate in a single file
      sip3: Upgrade 4.19.19 -> 4.19.23
      python3-pexpect: Consolidate in a single file
      python3-periphery: Consolidate in a single file
      python3-periphery: Upgrade 2.0.1 -> 2.1.0
      python3-pocketsphinx: Inherit features_check
      python3-parse: Consolidate in a single file
      python3-passlib: Consolidate in a single file
      python3-pathlib2: Consolidate in a single file
      python3-pretend: Consolidate in a single file
      python3-prompt-toolkit: Consolidate in a single file
      python3-prompt-toolkit: Upgrade 2.0.10 -> 3.0.5
      python3-ptyprocess: Consolidate in a single file
      python3-booleanpy: Upgrade 3.7 to 3.8
      python3-toml: Upgrade 0.10.0 -> 0.10.1
      python3-msgpack: Upgrade 0.6.2 -> 1.0.0
      lirc: Add python3 to the run-time dependencies
      python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17
      python3-sh: Upgrade 1.12.14 -> 1.13.1
      python3-certifi: Upgrade 2019.11.28 -> 2020.6.20
      python3-setuptools-scm: Upgrade 3.5.0 -> 4.1.2
      python3-more-itertools: Upgrade 8.3.0 -> 8.4.0
      python3-configparser: Upgrade 4.0.2 -> 5.0.0
      python3-pytest-timeout: Upgrade 1.3.4 -> 1.4.1
      python3-semver: Upgrade 2.8.1 -> 2.10.2
      python3-spidev: Upgrade 3.4 -> 3.5
      python3-pint: Upgrade 0.12 -> 0.13
      python3-xxhash: Upgrade 1.4.3 -> 1.4.4
      python3-networkx: Consolidate in a single file
      python3-netifaces: Consolidate in a single file
      python3-netaddr: Consolidate in a single file
      python3-netaddr: Upgrade 0.7.19 -> 0.7.20
      python3-ndg-httpsclient: Consolidate in a single file
      python3-lazy-object-proxy: Consolidate in a single file
      python3-lazy-object-proxy: Upgrade 1.4.3 -> 1.5.0
      python3-license-expression: Consolidate in a single file
      python3-license-expression: Upgrade 1.0 -> 1.2
      python3-wcwidth: Upgrade 0.2.4 -> 0.2.5
      python3-ordered-set: Upgrade 3.1.1 -> 4.0.2
      python3-cheetah: Upgrade 3.2.4 -> 3.2.5
      python3-cmd2: Upgrade 0.9.23 -> 1.1.0
      python3-pyrsistent: Upgrade 0.15.7 -> 0.16.0
      python3-requests-file: Upgrade 1.4.3 -> 1.5.1
      python3-msk: Upgrade 0.3.13 -> 0.3.15
      python3-pyperf: Upgrade 1.7.1 -> 2.0.0
      python3-padatious: Upgrade 0.4.7 -> 0.4.8
      python3-croniter: Upgrade 0.3.33 -> 0.3.34
      python3-lrparsing: Consolidate in a single file
      python3-pytun: Consolidate in a single file
      python3-jsonpatch: Upgrade 1.25 -> 1.26
      python3-socketio: Upgrade 4.5.1 -> 4.6.0
      python3-twine: Upgrade 3.1.1 -> 3.2.0
      python3-pyexpect: Upgrade 1.0.19 -> 1.0.20
      python3-pyjks: Upgrade 19.0.0 -> 20.0.0
      python3-ruamel-yaml: Upgrade 0.16.5 0> 0.16.10
      python3-pandas: Upgrade 1.0.3 -> 1.0.5
      python3-matplotlib: Upgrade 3.2.1 -> 3.2.2
      python3-coverage: Upgrade 5.0.2 -> 5.1
      python3-coloredlogs: Upgrade 10.0 -> 14.0
      python3-astroid: Upgrade 2.3.3 -> 2.4.2

Liwei Song (1):
      pm-graph: add flags support for RT kernel

Madhavan Krishnan (1):
      libcamera: Bumped to latest source revision

Martin Jansa (1):
      ace: fix installation paths when usrmerge is used

Mingli Yu (1):
      opencv: make ts module external

Ovidiu Panait (1):
      freediameter: upgrade 1.3.2 -> 1.4.0

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

Peace Lee (1):
      Update commit for version 3.9.7

Pierre-Jean Texier (3):
      rsnapshot: upgrade 1.4.2 -> 1.4.3
      libzip: upgrade 1.7.0 -> 1.7.1
      fuse3: upgrade 3.9.1 -> 3.9.2

Ryan Rowe (3):
      python3-typeguard: Upgrade 2.7.1 -> 2.9.1
      add python3-dynamic-dispatch
      add python3-argexec

Sakib Sajal (1):
      python3-requests-toolbelt: add recipe for v0.9.1

Trevor Gamblin (1):
      python3-django: upgrade 2.2.7 -> 2.2.13

Wang Mingyu (4):
      openipmi: upgrade 2.0.28 -> 2.0.29
      twm: upgrade 1.0.10 -> 1.0.11
      python3-wtforms: upgrade 2.2.1 -> 2.3.1
      python3-py: upgrade 1.8.1 -> 1.8.2

Zang Ruochen (6):
      python3-geojson: Enable ptest
      python3-intervals: Enable ptest
      python3-ipy: Enable ptest
      python3-iso3166: Enable ptest
      python-html2text: Enable ptest
      python3-gunicorn: Enable ptest

Zheng Ruoqin (3):
      python3-cachetools: Enable ptest
      python3-dnspython: Enable ptest
      python3-dominate: Enable ptest

lumag (1):
      lmsensors: do not depend on lmsensors-isatools on non-x86

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I66b8b206b1f74dab49ef7c266e145127ba27869b

5 files changed, 139 insertions, 21 deletions

diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb
index 24315320e4..e35bce7f3c 100644
--- a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb
+++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb
@@ -24,6 +24,8 @@ inherit pkgconfig
 
 CXXFLAGS_append = " -fpermissive -Wnodeprecated-declarations"
 
+EXTRA_OEMAKE += "INSTALL_LIB=${baselib}"
+
 do_install() {
     export D="${D}"
     oe_runmake install
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch
index 207b85ab9c..1b8e218658 100644
--- a/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch
+++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch
@@ -6,7 +6,6 @@ diff -ruN ACE_wrappers1/ace/config.h ACE_wrappers/ace/config.h
 diff -ruN ACE_wrappers1/include/makeinclude/platform_macros.GNU ACE_wrappers/include/makeinclude/platform_macros.GNU
 --- ACE_wrappers1/include/makeinclude/platform_macros.GNU	1970-01-01 02:00:00.000000000 +0200
 +++ ACE_wrappers/include/makeinclude/platform_macros.GNU	2018-10-31 15:11:18.265392460 +0200
-@@ -0,0 +1,3 @@
+@@ -0,0 +1,2 @@
 +INSTALL_PREFIX = $(D)$(exec_prefix)
-+INSTALL_LIB = $(base_libdir)
 +include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.38.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.38.0.bb
deleted file mode 100644
index afc9b2f2ea..0000000000
--- a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.38.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "A multi-platform support library with a focus on asynchronous I/O"
-HOMEPAGE = "https://github.com/libuv/libuv"
-BUGTRACKER = "https://github.com/libuv/libuv/issues"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47"
-
-SRCREV = "1ab9ea3790378f9f25c4e78e9e2b511c75f9c9ed"
-SRC_URI = "git://github.com/libuv/libuv;branch=v1.x"
-
-S = "${WORKDIR}/git"
-
-inherit autotools
-
-do_configure() {
-    ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh"
-    oe_runconf
-}
-
-BBCLASSEXTEND = "native"
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch
new file mode 100644
index 0000000000..af99d2b7f9
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch
@@ -0,0 +1,135 @@
+Fix printf if time_t is long long
+
+On some platforms, time_t has recently switched from "long" to "long
+long" [1]. For these platforms it is necessary to use "%lld" as printf
+format specifier because the ABI differs between "long" and "long long".
+
+I found no way for creating something similar to PRId64 for time_t. No
+idea how to determine whether it's "long" or "long long". So I cast
+everything to "long long" instead.
+
+[1] https://git.musl-libc.org/cgit/musl/commit/?id=38143339646a4ccce8afe298c34467767c899f51
+
+Upstream-Status: Accepted [next version is after 2.0]
+Upstream-Patch: https://github.com/richardcochran/linuxptp/commit/7de73fefc378cc42b9ed1115b3afa409d0250a48
+
+Signed-off-by: Christian Eggers <ceggers@arri.de>
+---
+diff -Naur linuxptp-2.0.org/phc_ctl.c linuxptp-2.0/phc_ctl.c
+--- linuxptp-2.0.org/phc_ctl.c	2018-08-12 23:08:43.000000000 +0200
++++ linuxptp-2.0/phc_ctl.c	2020-05-29 21:34:26.166519963 +0200
+@@ -230,8 +230,8 @@
+ 			strerror(errno));
+ 		return -1;
+ 	} else {
+-		pr_notice("set clock time to %ld.%09ld or %s",
+-			ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec));
++		pr_notice("set clock time to %lld.%09ld or %s",
++			(long long)ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec));
+ 	}
+ 
+ 	return args_to_eat;
+@@ -248,8 +248,8 @@
+ 
+ 		return -1;
+ 	} else {
+-		pr_notice("clock time is %ld.%09lu or %s",
+-			ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec));
++		pr_notice("clock time is %lld.%09lu or %s",
++			(long long)ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec));
+ 	}
+ 
+ 	/* get operation does not require any arguments */
+diff -Naur linuxptp-2.0.org/print.c linuxptp-2.0/print.c
+--- linuxptp-2.0.org/print.c	2018-08-12 23:08:43.000000000 +0200
++++ linuxptp-2.0/print.c	2020-05-29 21:34:26.166519963 +0200
+@@ -73,16 +73,16 @@
+ 
+ 	if (verbose) {
+ 		f = level >= LOG_NOTICE ? stdout : stderr;
+-		fprintf(f, "%s[%ld.%03ld]: %s%s%s\n",
++		fprintf(f, "%s[%lld.%03ld]: %s%s%s\n",
+ 			progname ? progname : "",
+-			ts.tv_sec, ts.tv_nsec / 1000000,
++			(long long)ts.tv_sec, ts.tv_nsec / 1000000,
+ 			message_tag ? message_tag : "", message_tag ? " " : "",
+ 			buf);
+ 		fflush(f);
+ 	}
+ 	if (use_syslog) {
+-		syslog(level, "[%ld.%03ld] %s%s%s",
+-		       ts.tv_sec, ts.tv_nsec / 1000000,
++		syslog(level, "[%lld.%03ld] %s%s%s",
++		       (long long)ts.tv_sec, ts.tv_nsec / 1000000,
+ 		       message_tag ? message_tag : "", message_tag ? " " : "",
+ 		       buf);
+ 	}
+diff -Naur linuxptp-2.0.org/unicast_service.c linuxptp-2.0/unicast_service.c
+--- linuxptp-2.0.org/unicast_service.c	2018-08-12 23:08:43.000000000 +0200
++++ linuxptp-2.0/unicast_service.c	2020-05-29 21:36:23.170497415 +0200
+@@ -209,9 +209,9 @@
+ 	tmo = now.tv_sec + req->durationField;
+ 	if (tmo > client->grant_tmo) {
+ 		client->grant_tmo = tmo;
+-		pr_debug("%s grant of 0x%x extended to %ld",
++		pr_debug("%s grant of 0x%x extended to %lld",
+ 			 pid2str(&client->portIdentity),
+-			 client->message_types, tmo);
++			 client->message_types, (long long)tmo);
+ 	}
+ }
+ 
+@@ -226,8 +226,8 @@
+ 	interval = pqueue_peek(p->unicast_service->queue);
+ 	if (interval) {
+ 		tmo.it_value = interval->tmo;
+-		pr_debug("arming timer tmo={%ld,%ld}",
+-			 interval->tmo.tv_sec, interval->tmo.tv_nsec);
++		pr_debug("arming timer tmo={%lld,%ld}",
++			 (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec);
+ 	} else {
+ 		pr_debug("stopping unicast service timer");
+ 	}
+@@ -499,8 +499,8 @@
+ 
+ 	while ((interval = pqueue_peek(p->unicast_service->queue)) != NULL) {
+ 
+-		pr_debug("peek i={2^%d} tmo={%ld,%ld}", interval->log_period,
+-			 interval->tmo.tv_sec, interval->tmo.tv_nsec);
++		pr_debug("peek i={2^%d} tmo={%lld,%ld}", interval->log_period,
++			 (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec);
+ 
+ 		if (timespec_compare(&now, &interval->tmo) >= 0) {
+ 			break;
+@@ -519,8 +519,8 @@
+ 		}
+ 
+ 		interval_increment(interval);
+-		pr_debug("next i={2^%d} tmo={%ld,%ld}", interval->log_period,
+-			 interval->tmo.tv_sec, interval->tmo.tv_nsec);
++		pr_debug("next i={2^%d} tmo={%lld,%ld}", interval->log_period,
++			 (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec);
+ 		pqueue_insert(p->unicast_service->queue, interval);
+ 	}
+ 
+diff -Naur linuxptp-2.0.org/unicast_client.c linuxptp-2.0/unicast_client.c
+--- linuxptp-2.0.org/unicast_client.c	2018-08-12 23:08:43.000000000 +0200
++++ linuxptp-2.0/unicast_client.c	2020-06-02 11:13:06.922997844 +0200
+@@ -216,7 +216,7 @@
+ 				       long duration)
+ {
+ 	struct timespec now;
+-	long tmo;
++	time_t tmo;
+ 
+ 	if (clock_gettime(CLOCK_MONOTONIC, &now)) {
+ 		pr_err("clock_gettime failed: %m");
+@@ -226,7 +226,7 @@
+ 	tmo = now.tv_sec + duration;
+ 	if (!master->renewal_tmo || tmo < master->renewal_tmo) {
+ 		master->renewal_tmo = tmo;
+-		pr_debug("port %d: renewal timeout at %ld", portnum(p), tmo);
++		pr_debug("port %d: renewal timeout at %lld", portnum(p), (long long)tmo);
+ 	}
+ }
+ 
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
index eb262d36b2..930c6673dc 100644
--- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
+++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \
            file://build-Allow-CC-and-prefix-to-be-overriden.patch \
            file://no-incdefs-using-host-headers.patch \
+           file://time_t_maybe_long_long.patch \
            "
 
 SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11"