diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support')
21 files changed, 174 insertions, 196 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.31.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.32.bb index de07bfd23..394d0e887 100644 --- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.31.bb +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.32.bb @@ -11,8 +11,8 @@ SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ file://0001-Add-build-rule-for-README.patch \ " -SRC_URI[md5sum] = "e4690f3362f95adb2332fd47a2b08212" -SRC_URI[sha256sum] = "6b48d7b6e4390e038d25630f8664fe81618ab00f232d6efbe0e3cc6df28ce8f7" +SRC_URI[md5sum] = "c4c70e928455f6ac3c4d02c4d2a654e9" +SRC_URI[sha256sum] = "545f4ab7887d512aa4b6967b80ef18a77b790c34769718452737a633cefc1639" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch index e108e0279..5f1f8a9f9 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch +++ b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch @@ -105,3 +105,23 @@ Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp } // SUITE(connections_and_errors) +--- cpprest-2.10.16.orig/Release/tests/functional/http/client/redirect_tests.cpp ++++ cpprest-2.10.16/Release/tests/functional/http/client/redirect_tests.cpp +@@ -159,7 +159,7 @@ SUITE(redirect_tests) + VERIFY_NO_THROWS(reply.get()); + } + } +- ++/* + TEST(does_not_follow_https_to_http_by_default) + { + handle_timeout([] { +@@ -182,7 +182,7 @@ SUITE(redirect_tests) + ); + }); + } +- ++*/ + TEST_FIXTURE(uri_address, follows_permanent_redirect) + { + #if USING_WINHTTP diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb index dee5ae256..5d7dbd8bd 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb +++ b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb @@ -11,8 +11,8 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste file://disable-float-tests.patch \ file://disable-outside-tests.patch " -# tag 2.10.15 -SRCREV= "b94bc32ff84e815ba44c567f6fe4af5f5f6b3048" +# tag 2.10.16 +SRCREV= "18212a2a7967e12d740bfb957e500892b3463c88" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb new file mode 100644 index 000000000..7d4e12dfb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb @@ -0,0 +1,17 @@ +SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based on IMAP queries" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ccca8573ead8e965c130b6b2946a36ab" + +SRC_URI = "https://codeload.github.com/lefcha/${BPN}/tar.gz/v${PV};downloadfilename=v${PV}.tar.gz" +SRC_URI[sha256sum] = "90af9bc9875e03fb5a09a3233287b74dd817867cb18ec9ff52fead615755563e" + +DEPENDS= "openssl lua libpcre" + +EXTRA_OEMAKE_append = " PREFIX=${prefix}" + +do_install(){ + oe_runmake DESTDIR=${D} install + + # No need for manuals at this point, MANDIR is hardcoded to depend on prefix + rm -rf ${D}${prefix}/man +} diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.28.4.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb index 9b9c19104..74343683f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.28.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb @@ -1,12 +1,12 @@ SUMMARY = "the Git linkable library" HOMEPAGE = "http://libgit2.github.com/" LICENSE = "GPL-2.0-with-GCC-exception & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=3f2cd5d3cccd71d62066ba619614592b" +LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e" -DEPENDS = "curl openssl zlib libssh2 libgcrypt" +DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.28" -SRCREV = "106a5f27586504ea371528191f0ea3aac2ad432b" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0" +SRCREV = "7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0" S = "${WORKDIR}/git" @@ -16,6 +16,7 @@ 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/libgpiod/libgpiod.inc b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc index 07ce35a7f..cae3145dd 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc @@ -14,3 +14,6 @@ EXTRA_OECONF = "--enable-tools" PACKAGES =+ " ${PN}-tools" FILES_${PN}-tools = "${bindir}/*" + +PACKAGES =+ "libgpiodcxx" +FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" diff --git a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb index 114ce4607..ff3047f32 100644 --- a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb +++ b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb @@ -14,12 +14,12 @@ by several applications e.g. to determine MIME types for filenames." SECTION = "System Environment/Base" LICENSE = "PD & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=100fcfb84512ccc03ffc7d89ac391305" +LIC_FILES_CHKSUM = "file://COPYING;md5=8dce08227d135cfda1f19d4c0c6689de" SRC_URI = "https://releases.pagure.org/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "2c26e18e912a5cf00318fcf7f8f2d747" -SRC_URI[sha256sum] = "d7b023b237d6053bf05ff6786e0663c55c614efcc99cdf856120be13b5c29157" +SRC_URI[md5sum] = "d5701a1a541383c0eda328f4a6518751" +SRC_URI[sha256sum] = "f7381516bc1a937348efd1d0e14618e0a2afc5d59fe821dd248632d5601b59b5" do_install() { oe_runmake install DESTDIR=${D} sysconfdir=${sysconfdir} mandir=${mandir} diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch new file mode 100644 index 000000000..ac8733769 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch @@ -0,0 +1,44 @@ +From fd90d952edaa4b27e62a29fdba7a201288d440eb Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Sun, 10 May 2020 21:22:53 +0800 +Subject: [PATCH] fix bug of do_compile and do_install + +when multiple processes make run in parallel, +because of dependency error will occur. + +Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> +--- + Makefile | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1dee3680..bea0a0b2 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,9 +28,22 @@ all: $(BUILDDIRS) + $(BUILDDIRS): + $(MAKE) -C $@ + +-multipath multipathd mpathpersist: libmultipath ++multipath multipathd mpathpersist libmpathpersist : libmultipath + mpathpersist: libmpathpersist + ++DEPS_ON_MULTIPATH := \ ++ multipath \ ++ libmultipath/prioritizers \ ++ libmultipath/checkers \ ++ libmultipath/foreign \ ++ multipathd \ ++ mpathpersist \ ++ libmpathpersist ++ ++$(DEPS_ON_MULTIPATH:=.install): libmultipath.install ++mpathpersist.install: libmpathpersist.install ++libdmmp.install libmultipath/foreign.install: mpathpersist.install ++ + $(BUILDDIRS.clean): + $(MAKE) -C ${@:.clean=} clean + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch index 77dd96fee..17542fd4f 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch @@ -1,9 +1,12 @@ From 436f7594485e35523269e662c4b5dc3a2c10ff9b Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 26 Nov 2018 09:19:17 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 19 - Apr 2017 06:10:01 -0500 Subject: [PATCH] RH: use rpm optflags if present +Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep +17 + 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, +19 + Apr 2017 06:10:01 -0500 Subject: [PATCH] RH: use rpm optflags if +present Use the passed in optflags when compiling as an RPM, and keep the default flags as close as possible to the current fedora flags, while @@ -17,26 +20,20 @@ update this patch to new version Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - Makefile.inc | 25 ++++++++++++++++--------- - 1 file changed, 16 insertions(+), 9 deletions(-) + Makefile.inc | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Makefile.inc b/Makefile.inc -index b86cba6..295afb9 100644 +index 42dbb5bf..55a06c60 100644 --- a/Makefile.inc +++ b/Makefile.inc -@@ -85,15 +85,22 @@ TEST_CC_OPTION = $(shell \ +@@ -89,15 +89,23 @@ TEST_CC_OPTION = $(shell \ echo "$(2)"; \ fi) -STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) -ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,) -- --OPTFLAGS = -O2 -g -pipe -Wall -Wextra -Wformat=2 -Werror=implicit-int \ -- -Werror=implicit-function-declaration -Werror=format-security \ -- -Wno-sign-compare -Wno-unused-parameter -Wno-clobbered \ -- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \ -- -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \ -- --param=ssp-buffer-size=4 +-WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered,) +ifndef RPM_OPT_FLAGS + STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) + OPTFLAGS = -O2 -g -pipe -Wall -Werror=format-security \ @@ -54,8 +51,14 @@ index b86cba6..295afb9 100644 + -Wno-unused-parameter -Werror=cast-qual \ + -Werror=discarded-qualifiers +-OPTFLAGS = -O2 -g -pipe -Werror -Wall -Wextra -Wformat=2 -Werror=implicit-int \ +- -Werror=implicit-function-declaration -Werror=format-security \ +- $(WNOCLOBBERED) \ +- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \ +- $(STACKPROT) --param=ssp-buffer-size=4 + CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ -MMD -MP $(CFLAGS) -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch index 724bef813..5fd6d668e 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch @@ -1,9 +1,12 @@ From 0f54b3120ca06ff3168cdbf901a27b68c4638398 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Thu, 26 Sep 2019 16:29:48 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri, 17 - Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel cmdline +Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep +17 + 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri, +17 + Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel +cmdline mpath.wwids with -A This patch adds another option to multipath, "-A", which reads @@ -23,18 +26,15 @@ Update this patch to new version 0.8.2 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - libmultipath/wwids.c | 44 +++++++++++++++++++++++++++++++++++++++++++ - libmultipath/wwids.h | 1 + - multipath/main.c | 9 ++++++++- - multipath/multipath.8 | 3 +++ - multipathd/multipathd.service | 1 + - 5 files changed, 57 insertions(+), 1 deletion(-) + libmultipath/wwids.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ + libmultipath/wwids.h | 1 + + 2 files changed, 45 insertions(+) diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c -index ef74812..19c4d68 100644 +index 28a2150d..a0bfa851 100644 --- a/libmultipath/wwids.c +++ b/libmultipath/wwids.c -@@ -444,3 +444,47 @@ int op ## _wwid(const char *wwid) \ +@@ -454,3 +454,47 @@ int op ## _wwid(const char *wwid) \ declare_failed_wwid_op(is_failed, false) declare_failed_wwid_op(mark_failed, true) declare_failed_wwid_op(unmark_failed, true) @@ -83,7 +83,7 @@ index ef74812..19c4d68 100644 + return ret; +} diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h -index 0c6ee54..e32a0b0 100644 +index 0c6ee54d..e32a0b0e 100644 --- a/libmultipath/wwids.h +++ b/libmultipath/wwids.h @@ -17,6 +17,7 @@ int remember_wwid(char *wwid); @@ -94,73 +94,6 @@ index 0c6ee54..e32a0b0 100644 enum { WWID_IS_NOT_FAILED = 0, -diff --git a/multipath/main.c b/multipath/main.c -index 96a1146..5fc65ef 100644 ---- a/multipath/main.c -+++ b/multipath/main.c -@@ -139,6 +139,7 @@ usage (char * progname) - fprintf (stderr, " %s [-v level] [-l|-ll] [device]\n", progname); - fprintf (stderr, " %s [-v level] [-a|-w] device\n", progname); - fprintf (stderr, " %s [-v level] -W\n", progname); -+ fprintf (stderr, " %s [-v level] -A\n", progname); - fprintf (stderr, " %s [-v level] [-i] [-c|-C] device\n", progname); - fprintf (stderr, " %s [-v level] [-i] [-u|-U]\n", progname); - fprintf (stderr, " %s [-h|-t|-T]\n", progname); -@@ -151,6 +152,8 @@ usage (char * progname) - " -f flush a multipath device map\n" - " -F flush all multipath device maps\n" - " -a add a device wwid to the wwids file\n" -+ " -A add devices from kernel command line mpath.wwids\n" -+ " parameters to wwids file\n" - " -c check if a device should be a path in a multipath device\n" - " -C check if a multipath device has usable paths\n" - " -q allow queue_if_no_path when multipathd is not running\n" -@@ -905,7 +908,7 @@ main (int argc, char *argv[]) - exit(RTVL_FAIL); - multipath_conf = conf; - conf->retrigger_tries = 0; -- while ((arg = getopt(argc, argv, ":adcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) { -+ while ((arg = getopt(argc, argv, ":aAdcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) { - switch(arg) { - case 1: printf("optarg : %s\n",optarg); - break; -@@ -998,6 +1001,10 @@ main (int argc, char *argv[]) - case 'R': - retries = atoi(optarg); - break; -+ case 'A': -+ if (remember_cmdline_wwid() != 0) -+ exit(1); -+ exit(0); - case ':': - fprintf(stderr, "Missing option argument\n"); - usage(argv[0]); -diff --git a/multipath/multipath.8 b/multipath/multipath.8 -index 9cdd05a..1e120f3 100644 ---- a/multipath/multipath.8 -+++ b/multipath/multipath.8 -@@ -167,6 +167,9 @@ itself doesn't attempt to do I/O on the device. - Check if the device specified in the program environment should be - a path in a multipath device. - . -+.B \-A -+add wwids from any kernel command line mpath.wwid parameters to the wwids file -+. - .TP - .B \-U - Check if the device specified in the program environment is a multipath device -diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service -index 17434ce..0fbcc46 100644 ---- a/multipathd/multipathd.service -+++ b/multipathd/multipathd.service -@@ -15,6 +15,7 @@ Type=notify - NotifyAccess=main - LimitCORE=infinity - ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath -+ExecStartPre=-/sbin/multipath -A - ExecStart=/sbin/multipathd -d -s - ExecReload=/sbin/multipathd reconfigure - TasksMax=infinity -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index 9e2d86b9a..2795a8d09 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -43,11 +43,12 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ file://0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ file://0030-Always-use-devmapper.patch \ file://0031-Always-use-devmapper-for-kpartx.patch \ + file://0001-fix-bug-of-do_compile-and-do_install.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" -SRCREV = "6c3bd369b23e959700527e0e2e6d5b2a1bd36294" +SRCREV = "d4915917655b3d205aa0e339ca13080ed8182d0d" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb index fba80ce2a..36e6cd8fc 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb @@ -47,6 +47,10 @@ inherit siteinfo TD = "${S}/tentative-dist" TDS = "${S}/tentative-dist-staging" +# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a +# which caused -march conflicts in gcc +TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" + TARGET_CC_ARCH += "${LDFLAGS}" do_configure_prepend_libc-musl () { diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch index 5f909c1a8..9e6a61371 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch @@ -1,4 +1,4 @@ -From 85b882b4ceb57fe6538f47af58d0a970923fde0e Mon Sep 17 00:00:00 2001 +From 9b4959b97d2e95d4b49cf6ca2a3fce3cdb484f2d Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Date: Thu, 31 Mar 2016 00:20:15 +0200 Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp @@ -11,10 +11,10 @@ Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake -index ae8748c..305abdb 100644 +index 257af6fcc6..f88460450f 100644 --- a/3rdparty/ippicv/ippicv.cmake +++ b/3rdparty/ippicv/ippicv.cmake -@@ -39,18 +39,5 @@ function(download_ippicv root_var) +@@ -34,18 +34,5 @@ function(download_ippicv root_var) endif() set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv") diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch index 40d3f53e1..948a80faf 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch @@ -1,4 +1,4 @@ -From 9659f5a1e75fc29c9879c301767bba72ecf9042a Mon Sep 17 00:00:00 2001 +From 66e50ee69fa9ee2469d349100e70d8b296c4b4dc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 11 Sep 2018 00:21:18 -0700 Subject: [PATCH] Dont use isystem @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 2 insertions(+) diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake -index 59bc826..055dfce 100644 +index 08cd06def4..46c9c02da3 100644 --- a/cmake/OpenCVPCHSupport.cmake +++ b/cmake/OpenCVPCHSupport.cmake @@ -18,6 +18,8 @@ IF(CV_GCC) diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch index f8ccd1d55..1e47f8b16 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch @@ -1,4 +1,4 @@ -From fe27d0e2341683606704115949d16250e4cacbfa Mon Sep 17 00:00:00 2001 +From e4ec6cea72da9e9ae5ba57140fa2f5c63f1f8295 Mon Sep 17 00:00:00 2001 From: Jason Wessel <jason.wessel@windriver.com> Date: Wed, 9 May 2018 13:33:59 -0700 Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function @@ -11,10 +11,10 @@ Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 1 file changed, 8 insertions(+) diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp -index 0d360ad..566df66 100644 +index 6dca724a89..ae55dd4555 100644 --- a/modules/videoio/src/cap_ffmpeg_impl.hpp +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp -@@ -736,6 +736,14 @@ struct ImplMutex::Impl +@@ -774,6 +774,14 @@ struct ImplMutex::Impl #endif diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch deleted file mode 100644 index 43d32fbc7..000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 1edc925ecd7fb54d2dc78452069084475fbe2a70 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 16 Jan 2020 08:52:00 -0800 -Subject: [PATCH] carotene: Replace ipcp-unit-growth with ipa-cp-unit-growth on gcc >= 10 - -gcc 10+ has renamed this option, therefore check for gcc version before -deciding which name to use for opt parameter - -Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/16369] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - 3rdparty/carotene/CMakeLists.txt | 8 ++++++-- - 3rdparty/carotene/hal/CMakeLists.txt | 7 ++++++- - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/3rdparty/carotene/CMakeLists.txt b/3rdparty/carotene/CMakeLists.txt -index bfa9368d79..1c43b85b28 100644 ---- a/3rdparty/carotene/CMakeLists.txt -+++ b/3rdparty/carotene/CMakeLists.txt -@@ -20,8 +20,12 @@ if(CMAKE_COMPILER_IS_GNUCC) - # - matchTemplate about 5-10% - # - goodFeaturesToTrack 10-20% - # - cornerHarris 30% for some cases -- -- set_source_files_properties(${carotene_sources} COMPILE_FLAGS "--param ipcp-unit-growth=100000 --param inline-unit-growth=100000 --param large-stack-frame-growth=5000") -+ set_source_files_properties(${carotene_sources} COMPILE_FLAGS "--param inline-unit-growth=100000 --param large-stack-frame-growth=5000") -+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10.0.0") -+ set_source_files_properties(${carotene_sources} COMPILE_FLAGS "--param ipcp-unit-growth=100000 ${COMPILE_FLAGS}") -+ else() -+ set_source_files_properties(${carotene_sources} COMPILE_FLAGS "--param ipa-cp-unit-growth=100000 ${COMPILE_FLAGS}") -+ endif() - endif() - - add_library(carotene_objs OBJECT -diff --git a/3rdparty/carotene/hal/CMakeLists.txt b/3rdparty/carotene/hal/CMakeLists.txt -index c4b9acaedd..bbc5b11a80 100644 ---- a/3rdparty/carotene/hal/CMakeLists.txt -+++ b/3rdparty/carotene/hal/CMakeLists.txt -@@ -90,7 +90,12 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ${carotene_defs}) - # matchTemplate about 5-10% - # goodFeaturesToTrack 10-20% - # cornerHarris 30% for some cases -- set_source_files_properties(impl.cpp $<TARGET_OBJECTS:carotene_objs> COMPILE_FLAGS "--param ipcp-unit-growth=100000 --param inline-unit-growth=100000 --param large-stack-frame-growth=5000") -+ set_source_files_properties(impl.cpp $<TARGET_OBJECTS:carotene_objs> COMPILE_FLAGS "--param inline-unit-growth=100000 --param large-stack-frame-growth=5000") -+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10.0.0") -+ set_source_files_properties(impl.cpp $<TARGET_OBJECTS:carotene_objs> COMPILE_FLAGS "--param ipcp-unit-growth=100000 ${COMPILE_FLAGS}") -+ else() -+ set_source_files_properties(impl.cpp $<TARGET_OBJECTS:carotene_objs> COMPILE_FLAGS "--param ipa-cp-unit-growth=100000 ${COMPILE_FLAGS}") -+ endif() - # set_source_files_properties(impl.cpp $<TARGET_OBJECTS:carotene_objs> COMPILE_FLAGS "--param ipcp-unit-growth=100000 --param inline-unit-growth=100000 --param large-stack-frame-growth=5000") - endif() - --- -2.25.0 - 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 index 46198fb7b..20d54d407 100644 --- 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 @@ -1,4 +1,4 @@ -From 46ffa1f8f443b71673774fcb864eb741bbc26200 Mon Sep 17 00:00:00 2001 +From 78e2fc167fd27ab17175dcfd6eccf6f74bd5e1c7 Mon Sep 17 00:00:00 2001 From: Bian Naimeng <biannm@cn.fujitsu.com> Date: Wed, 19 Apr 2017 03:11:37 +0900 Subject: [PATCH] Make opencv-ts create share library intead of static. @@ -10,7 +10,7 @@ Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt -index f95bed0..ee67858 100644 +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) diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch index 336c2e08e..bb47ef2ba 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch @@ -1,4 +1,4 @@ -From 867caccc358266f7021f076fc8c8e41bf048782c Mon Sep 17 00:00:00 2001 +From f42c9b8c7bafcadc7e95fb25a391707f970eb426 Mon Sep 17 00:00:00 2001 From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Date: Fri, 19 May 2017 04:27:50 +0900 Subject: [PATCH] To fix errors as following: @@ -21,10 +21,10 @@ Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp -index b9d6b74..f1ee7ee 100644 +index ed7491a89a..80919d13ee 100644 --- a/modules/ts/include/opencv2/ts.hpp +++ b/modules/ts/include/opencv2/ts.hpp -@@ -622,7 +622,7 @@ protected: +@@ -728,7 +728,7 @@ protected: } }; @@ -33,7 +33,7 @@ index b9d6b74..f1ee7ee 100644 struct DefaultRngAuto { -@@ -685,7 +685,7 @@ private: +@@ -791,7 +791,7 @@ private: #endif #endif @@ -43,7 +43,7 @@ index b9d6b74..f1ee7ee 100644 #define CV_TEST_INIT0_NOOP (void)0 diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp -index 11572e9..438112e 100644 +index 11572e9f48..438112e2aa 100644 --- a/modules/ts/include/opencv2/ts/ocl_test.hpp +++ b/modules/ts/include/opencv2/ts/ocl_test.hpp @@ -82,7 +82,7 @@ inline UMat ToUMat(InputArray src) @@ -56,7 +56,7 @@ index 11572e9..438112e 100644 #define MAX_VALUE 357 diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp -index b5cea3e..e5b0b4b 100644 +index b2a4cac241..b94c681c0c 100644 --- a/modules/ts/include/opencv2/ts/ts_ext.hpp +++ b/modules/ts/include/opencv2/ts/ts_ext.hpp @@ -9,7 +9,7 @@ diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/download.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/download.patch index fa8db8807..33ac48312 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/download.patch +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/download.patch @@ -1,3 +1,8 @@ +From b18a280fab06a680d9f831bf8b462647f3cb6214 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 9 Jan 2020 16:24:24 +0000 +Subject: [PATCH] opencv: abort configure if we need to download + This CMake module will download files during do_configure. This is bad as it means we can't do offline builds. @@ -6,8 +11,12 @@ Add an option to disallow downloads by emitting a fatal error. Upstream-Status: Pending Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + cmake/OpenCVDownload.cmake | 6 ++++++ + 1 file changed, 6 insertions(+) + diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake -index cdc47ad2cb..74573f45a2 100644 +index 63cf6d3238..4acf477f70 100644 --- a/cmake/OpenCVDownload.cmake +++ b/cmake/OpenCVDownload.cmake @@ -14,6 +14,7 @@ @@ -18,7 +27,7 @@ index cdc47ad2cb..74573f45a2 100644 set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files") if(DEFINED ENV{OPENCV_DOWNLOAD_PATH}) set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH "${HELP_OPENCV_DOWNLOAD_PATH}") -@@ -153,6 +154,11 @@ function(ocv_download) +@@ -156,6 +157,11 @@ function(ocv_download) # Download if(NOT EXISTS "${CACHE_CANDIDATE}") @@ -28,5 +37,5 @@ index cdc47ad2cb..74573f45a2 100644 + endif() + ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"") - file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}" - INACTIVITY_TIMEOUT 60 + foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST}) + ocv_download_log("#try ${try}") diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb index d781da600..2587b189c 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb @@ -3,16 +3,16 @@ HOMEPAGE = "http://opencv.org/" SECTION = "libs" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6450921bb12a3133c8f5cb2a80343710" +LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad" -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7" -SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" +SRCREV_opencv = "01b2c5a77ca6dbef3baef24ebc0a5984579231d9" +SRCREV_contrib = "e6f32c6a69043456a806a4e802ee3ce7b7059c93" +SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" @@ -21,17 +21,17 @@ def ipp_filename(d): import re arch = d.getVar('TARGET_ARCH') if re.match("i.86$", arch): - return "ippicv_2019_lnx_ia32_general_20180723.tgz" + return "ippicv_2020_lnx_ia32_20191018_general.tgz" else: - return "ippicv_2019_lnx_intel64_general_20180723.tgz" + return "ippicv_2020_lnx_intel64_20191018_general.tgz" def ipp_md5sum(d): import re arch = d.getVar('TARGET_ARCH') if re.match("i.86$", arch): - return "4f38432c30bfd6423164b7a24bbc98a0" + return "ad189a940fb60eb71f291321322fe3e8" else: - return "c0bd78adb4156bbf552c1dfe90599607" + return "7421de0095c7a39162ae13a6098782f9" IPP_FILENAME = "${@ipp_filename(d)}" IPP_MD5 = "${@ipp_md5sum(d)}" @@ -39,7 +39,7 @@ IPP_MD5 = "${@ipp_md5sum(d)}" SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;destsuffix=ipp;name=ipp \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ 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 \ @@ -48,10 +48,9 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ 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://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \ file://download.patch \ " -PV = "4.1.0" +PV = "4.3.0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.3.bb index 5b663489f..3c93493f7 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://remmina.org" SECTION = "Support" LICENSE = "GPLv2 & openssl" LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" -DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret libxkbfile" +DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret libxkbfile" DEPENDS_append_libc-musl = " libexecinfo" @@ -11,8 +11,7 @@ LDFLAGS_append_libc-musl = " -lexecinfo" SRC_URI = "https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/Remmina-v${PV}.tar.bz2 \ " -SRC_URI[md5sum] = "6da599c3a5cab2df37a70f8fba2f5438" -SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea556af1a" +SRC_URI[sha256sum] = "3ed23be326be0bf3c98428c1b4f4c948c1ded2048bd27f107380e12574797930" S = "${WORKDIR}/Remmina-v${PV}" |