From c87764fefff10735006a31fab72d76c243a3eb40 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 27 Jun 2020 00:16:32 -0500 Subject: meta-openembedded: subtree update:fe77eaab8f..629696b64b MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Change-Id: I66b8b206b1f74dab49ef7c266e145127ba27869b --- .../meta-oe/recipes-support/asio/asio_1.12.2.bb | 26 -------------- .../meta-oe/recipes-support/asio/asio_1.16.1.bb | 27 ++++++++++++++ .../recipes-support/libgit2/libgit2_1.0.0.bb | 22 ------------ .../recipes-support/libgit2/libgit2_1.0.1.bb | 22 ++++++++++++ .../opencv/0001-Make-ts-module-external.patch | 42 ++++++++++++++++++++++ ...-ts-create-share-library-intead-of-static.patch | 24 ------------- .../meta-oe/recipes-support/opencv/opencv_4.3.0.bb | 2 +- .../recipes-support/rsnapshot/rsnapshot_git.bb | 4 +-- .../meta-oe/recipes-support/sass/libsass_3.6.3.bb | 13 ------- .../meta-oe/recipes-support/sass/libsass_git.bb | 14 ++++++++ 10 files changed, 108 insertions(+), 88 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/asio/asio_1.16.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb (limited to 'meta-openembedded/meta-oe/recipes-support') diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.2.bb b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.2.bb deleted file mode 100644 index 35f875fdc..000000000 --- a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.2.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Asio is a cross-platform C++ library for network and low-level \ - I/O programming that provides developers with a consistent asynchronous \ - model using a modern C++ approach." -AUTHOR = "Christopher M. Kohlhoff (chris at kohlhoff dot com)" -HOMEPAGE = "http://think-async.com/Asio" -SECTION = "libs" -LICENSE = "BSL-1.0" - -DEPENDS = "openssl" - -SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" - -inherit autotools - -ALLOW_EMPTY_${PN} = "1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3e73f311a3af69e6df275e8c3b1c09b5" - -SRC_URI[md5sum] = "312e53385e2daad10f08d57f91ad3431" -SRC_URI[sha256sum] = "4e27dcb37456ba707570334b91f4798721111ed67b69915685eac141895779aa" - -SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" - -PACKAGECONFIG ??= "boost" - -PACKAGECONFIG[boost] = "--with-boost,--without-boost,boost" diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.16.1.bb b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.16.1.bb new file mode 100644 index 000000000..f381d12fb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.16.1.bb @@ -0,0 +1,27 @@ +SUMMARY = "Asio is C++ library for network and low-level I/O programming" +DESCRIPTION = "Asio is a cross-platform C++ library for network and low-level \ + I/O programming that provides developers with a consistent asynchronous \ + model using a modern C++ approach." +AUTHOR = "Christopher M. Kohlhoff (chris at kohlhoff dot com)" +HOMEPAGE = "http://think-async.com/Asio" +SECTION = "libs" +LICENSE = "BSL-1.0" + +DEPENDS = "openssl" + +SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" + +inherit autotools + +ALLOW_EMPTY_${PN} = "1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=de86c8210a433f72bd3cc98e797a6084" + +SRC_URI[md5sum] = "569f4b082c652ae8a8ad94fb470016f9" +SRC_URI[sha256sum] = "e271db76dbbcda9835ed1c9c94deb2ba3f4589c3ebcaa71d99ac694b8d62638c" + +SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" + +PACKAGECONFIG ??= "boost" + +PACKAGECONFIG[boost] = "--with-boost,--without-boost,boost" diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb deleted file mode 100644 index 74343683f..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "the Git linkable library" -HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e" - -DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" - -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0" -SRCREV = "7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "\ - -DBUILD_CLAR=OFF \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DLIB_INSTALL_DIR=${libdir} \ - -DREGEX_BACKEND='pcre2' \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb new file mode 100644 index 000000000..363ed4d65 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "the Git linkable library" +HOMEPAGE = "http://libgit2.github.com/" +LICENSE = "GPL-2.0-with-GCC-exception & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e" + +DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" + +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0" +SRCREV = "0ced29612dacb67eefe0c562a5c1d3aab21cce96" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "\ + -DBUILD_CLAR=OFF \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DLIB_INSTALL_DIR=${libdir} \ + -DREGEX_BACKEND='pcre2' \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch new file mode 100644 index 000000000..d56b8ae67 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch @@ -0,0 +1,42 @@ +From 11bbf909e08594628bd757d989ae34cf1bfe200b Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Thu, 18 Jun 2020 05:51:38 +0000 +Subject: [PATCH] Make ts module external + +Make ts module external + +Reference: https://github.com/qbonnard/opencv/commit/6b229c5834cb9a0930425e762a6c7b03244d7abb + +Upstream-Status: Submitted [https://github.com/opencv/opencv/issues/8408] + +Signed-off-by: Mingli Yu +--- + modules/ts/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt +index f95bed0793..66f315bcca 100644 +--- a/modules/ts/CMakeLists.txt ++++ b/modules/ts/CMakeLists.txt +@@ -4,9 +4,6 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) + ocv_module_disable(ts) + endif() + +-set(OPENCV_MODULE_TYPE STATIC) +-set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) +- + if(WINRT) + # WINRT doesn't have access to environment variables + # so adding corresponding macros during CMake run +@@ -16,7 +13,7 @@ endif() + + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) + +-ocv_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) ++ocv_add_module(ts opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) + + ocv_glob_module_sources() + ocv_module_include_directories() +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch deleted file mode 100644 index 20d54d407..000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 78e2fc167fd27ab17175dcfd6eccf6f74bd5e1c7 Mon Sep 17 00:00:00 2001 -From: Bian Naimeng -Date: Wed, 19 Apr 2017 03:11:37 +0900 -Subject: [PATCH] Make opencv-ts create share library intead of static. - -Signed-off-by: Lei Maohui - ---- - modules/ts/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt -index f95bed0793..ee67858df8 100644 ---- a/modules/ts/CMakeLists.txt -+++ b/modules/ts/CMakeLists.txt -@@ -4,7 +4,7 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) - ocv_module_disable(ts) - endif() - --set(OPENCV_MODULE_TYPE STATIC) -+#set(OPENCV_MODULE_TYPE STATIC) - set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) - - if(WINRT) diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb index 2587b189c..7927ce25f 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb @@ -44,11 +44,11 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ - file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ file://0001-Dont-use-isystem.patch \ file://download.patch \ + file://0001-Make-ts-module-external.patch \ " PV = "4.3.0" diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index efe95b101..dcadede0e 100644 --- a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -20,8 +20,8 @@ RDEPENDS_${PN} = "rsync \ perl-module-overloading \ " -SRCREV = "27209563f924a22f510698ea225f53ea52f07cb4" -PV = "1.4.2+git${SRCPV}" +SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9" +PV = "1.4.3+git${SRCPV}" SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ file://configure-fix-cmd_rsync.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.3.bb b/meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.3.bb deleted file mode 100644 index d893be223..000000000 --- a/meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "C/C++ port of the Sass CSS precompiler" -HOMEPAGE = "http://sass-lang.com/libsass" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" - -inherit autotools - -SRC_URI = "git://github.com/sass/libsass.git;branch=master" -SRCREV = "e1c16e09b4a953757a15149deaaf28a3fd81dc97" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb new file mode 100644 index 000000000..9cba3a890 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb @@ -0,0 +1,14 @@ +SUMMARY = "C/C++ port of the Sass CSS precompiler" +HOMEPAGE = "http://sass-lang.com/libsass" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" + +inherit autotools + +SRC_URI = "git://github.com/sass/libsass.git;branch=master" +SRCREV = "8d312a1c91bb7dd22883ebdfc829003f75a82396" +PV = "3.6.4" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" -- cgit v1.2.3