[oe] [PATCH] dnsmasq: CVE-2019-14834
Backport the CVE patch from the upstream to fix the memory leak.
Signed-off-by: Zhixiong Chi
---
...-dnsmasq-fix-memory-leak-in-helper-c.patch | 49 +++
.../recipes-support/dnsmasq/dnsmasq_2.80.bb | 1 +
2 files changed, 50 insertions(+)
create mode 100644
meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch
diff --git
a/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch
b/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch
new file mode 100644
index 0..ccd6f82ae
--- /dev/null
+++
b/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch
@@ -0,0 +1,49 @@
+From 69bc94779c2f035a9fffdb5327a54c3aeca73ed5 Mon Sep 17 00:00:00 2001
+From: Simon Kelley
+Date: Wed, 14 Aug 2019 20:44:50 +0100
+Subject: [PATCH] Fix memory leak in helper.c
+
+Thanks to Xu Mingjie for spotting this.
+
+CVE: CVE-2019-14834
+Upstream-Status: Backport
+Signed-off-by: Zhixiong Chi
+---
+ src/helper.c | 12 +---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/helper.c b/src/helper.c
+index 33ba120..c392eec 100644
+--- a/src/helper.c
b/src/helper.c
+@@ -82,7 +82,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t
gid, long max_fd)
+ pid_t pid;
+ int i, pipefd[2];
+ struct sigaction sigact;
+-
++ unsigned char *alloc_buff = NULL;
++
+ /* create the pipe through which the main program sends us commands,
+ then fork our process. */
+ if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1)
+@@ -188,11 +189,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid,
gid_t gid, long max_fd)
+ struct script_data data;
+ char *p, *action_str, *hostname = NULL, *domain = NULL;
+ unsigned char *buf = (unsigned char *)daemon->namebuff;
+- unsigned char *end, *extradata, *alloc_buff = NULL;
++ unsigned char *end, *extradata;
+ int is6, err = 0;
+ int pipeout[2];
+
+- free(alloc_buff);
++ /* Free rarely-allocated memory from previous iteration. */
++ if (alloc_buff)
++ {
++free(alloc_buff);
++alloc_buff = NULL;
++ }
+
+ /* we read zero bytes when pipe closed: this is our signal to exit */
+ if (!read_write(pipefd[0], (unsigned char *), sizeof(data), 1))
+--
+1.7.10.4
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb
b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb
index 6f3d5daa6..827565051 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb
@@ -5,5 +5,6 @@ SRC_URI[dnsmasq-2.80.sha256sum] =
"9e4a58f816ce0033ce383c549b7d4058ad9b823968d35
SRC_URI += "\
file://lua.patch \
file://0001-dnsmasq-fix-build-against-5.2-headers.patch \
+file://0001-dnsmasq-fix-memory-leak-in-helper-c.patch \
"
--
2.23.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] OpenEmbedded Workshop at FOSDEM20 schedule
On 1/9/20 2:28 PM, Jon Mason wrote: > The OpenEmbedded Workshop 2020 schedule is now available > https://pretalx.com/oe-workshop-2020/schedule/ > > As you can see, there are some very compelling talks. Buy your > tickets now, before we sell out. > https://pretix.eu/OpenEmbedded/oe-workshop-2020/ This looks great. Thanks to everyone who is making this happen. - armin > > Thank you, > The OpenEmbedded Board -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 8/9] libsigc++-3: upgrade 3.0.0 -> 3.0.2
On Thu, Jan 9, 2020 at 11:07 PM Khem Raj wrote: > > you have good commit msg so I merged this with earlier patch proposed here > > https://patchwork.openembedded.org/patch/168647/ missed that patch - sorry. I fell over this one by GNOME 3.34.3 [1] and just cross-checked it against layerindex. [1] https://download.gnome.org/core/3.34/3.34.3/sources/ Andreas Andreas -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] OpenEmbedded Workshop at FOSDEM20 schedule
The OpenEmbedded Workshop 2020 schedule is now available https://pretalx.com/oe-workshop-2020/schedule/ As you can see, there are some very compelling talks. Buy your tickets now, before we sell out. https://pretix.eu/OpenEmbedded/oe-workshop-2020/ Thank you, The OpenEmbedded Board -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/9] poppler: upgrade 0.82.0 -> 0.84.0
On Thu, Jan 9, 2020 at 11:01 PM Randy MacLeod wrote: > > On 1/9/20 4:05 PM, Andreas Müller wrote: > > From announcements: > > > > Release 0.84.0: > > core: > > * Fix crash when converting from Unicode to ASCII-7 > > * Splash::scaleImageYdXu: Protect against crash if srcWidth is too big > > * JBIG2Stream: fix potential crash in malformed documents > > * JBIG2Stream: fix leak in reset() if called several times > > * Internal code improvements > > > > utils: > > * pdfimages: Add error message if first page is larger then number of > > pages. > > * pdfinfo: Improved paper size recognition > > * pdfsig: Fix exit code when dumping signatures > > * pdftocairo: Error out when even/odd selects 0 pages > > * pdftohtml: Fix memory leak > > * pdftoppm: Add an option to scale before rotate > > * pdftoppm: Add -hide-annotations option > > * pdftoppm: Error out when even/odd selects 0 pages > > * pdftops: Improve -optimizecolorspace > > > > qt5: > > * Code cleanups > > > > glib: > > * Fix compiler warnings > > > > Release 0.83.0: > > core: > > * Improve when a file is recognized as Linearized > > * Improve const-ness of the code > > * Make code a bit more readable/maintanable > > * Fix uninitialized memory uses in broken files > > > > utils: > > * pdffonts: Make code a bit more readable/maintanable > > * pdftohtml: Make code a bit more readable/maintanable > > > > qt5: > > * Remove a bunch of unused internal functions > > * trUtf8 -> tr (less warnings) > > > > build system: > > * make-glib-api-docs: switch to python3 > > Nice. > > Andreas, > > Have you by chance tried to add ptest coverage for poppler? > If not, Matthew may do that. > > Have not done any ptest on this - just some runtime tests on target with evince Andreas -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 8/9] libsigc++-3: upgrade 3.0.0 -> 3.0.2
you have good commit msg so I merged this with earlier patch proposed here
https://patchwork.openembedded.org/patch/168647/
On Thu, Jan 9, 2020 at 1:06 PM Andreas Müller wrote:
>
> From [1]:
>
> 3.0.2 (stable)
>
> * Build: Meson build improvements.
> (Kjell Ahlstedt, Chun-Wei Fan)
>
> From [2]:
>
> 3.0.1 (stable)
>
> * Build:
> - Add meson build, alongside the existing autotools and CMake builds.
> (Kjell Ahlstedt, Chun-Wei Fan)
> - CMake: Fix the MSVC build, enable warnings, and disable unnecessary
> warnings, with MVSC.
> (Stuart Dootson)
> * connection: Allow copying of empty connections.
> (Aigrind)
> * sigc++/adaptors/bind.h: Make bind_functor::bound_ public.
> (Used by sigc::visitor::do_visit_each().
> (Kjell Ahlstedt) Bug #26
> * test_limit_reference: Avoid virtual-move-assign warning
> (seen with g++ 9.2)
> (Murray Cumming)
> * signal: slot_iterator_buf: Remove unused T_result default type
> (Murray Cumming)
> * tests: Slight cleanups
> (Murray Cumming)
> * Remove unused #ifdefed code.
> (Murray Cumming)
>
> [1] http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.0/libsigc++-3.0.2.news
> [2] http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.0/libsigc++-3.0.1.news
>
> Signed-off-by: Andreas Müller
> ---
> .../{libsigc++-3_3.0.0.bb => libsigc++-3_3.0.2.bb}| 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> rename meta-oe/recipes-core/libsigc++-2.0/{libsigc++-3_3.0.0.bb =>
> libsigc++-3_3.0.2.bb} (77%)
>
> diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb
> b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.2.bb
> similarity index 77%
> rename from meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb
> rename to meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.2.bb
> index 3c0330f50..0acdb3e98 100644
> --- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb
> +++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.2.bb
> @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=959bffe2993816eb32ec4bc1ec1d5875"
> DEPENDS = "mm-common"
>
> SRC_URI =
> "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.0/libsigc++-${PV}.tar.xz;
> -SRC_URI[md5sum] = "6ffe924f1d8624b5716468cde67dc03f"
> -SRC_URI[sha256sum] =
> "50a0855c1eb26e6044ffe888dbe061938ab4241f96d8f3754ea7ead38ab8ed06"
> +SRC_URI[md5sum] = "1f93f8ed4ead38e876157834b2c57c21"
> +SRC_URI[sha256sum] =
> "4b77676de1e74774ec456bcc6ac6f04a2791a12cc1fe07f8305d4c3c86e2f339"
>
> S = "${WORKDIR}/libsigc++-${PV}"
>
> --
> 2.21.0
>
> --
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/9] poppler: upgrade 0.82.0 -> 0.84.0
On 1/9/20 4:05 PM, Andreas Müller wrote: From announcements: Release 0.84.0: core: * Fix crash when converting from Unicode to ASCII-7 * Splash::scaleImageYdXu: Protect against crash if srcWidth is too big * JBIG2Stream: fix potential crash in malformed documents * JBIG2Stream: fix leak in reset() if called several times * Internal code improvements utils: * pdfimages: Add error message if first page is larger then number of pages. * pdfinfo: Improved paper size recognition * pdfsig: Fix exit code when dumping signatures * pdftocairo: Error out when even/odd selects 0 pages * pdftohtml: Fix memory leak * pdftoppm: Add an option to scale before rotate * pdftoppm: Add -hide-annotations option * pdftoppm: Error out when even/odd selects 0 pages * pdftops: Improve -optimizecolorspace qt5: * Code cleanups glib: * Fix compiler warnings Release 0.83.0: core: * Improve when a file is recognized as Linearized * Improve const-ness of the code * Make code a bit more readable/maintanable * Fix uninitialized memory uses in broken files utils: * pdffonts: Make code a bit more readable/maintanable * pdftohtml: Make code a bit more readable/maintanable qt5: * Remove a bunch of unused internal functions * trUtf8 -> tr (less warnings) build system: * make-glib-api-docs: switch to python3 Nice. Andreas, Have you by chance tried to add ptest coverage for poppler? If not, Matthew may do that. -- # Randy MacLeod # Wind River Linux -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 8/9] libsigc++-3: upgrade 3.0.0 -> 3.0.2
From [1]:
3.0.2 (stable)
* Build: Meson build improvements.
(Kjell Ahlstedt, Chun-Wei Fan)
From [2]:
3.0.1 (stable)
* Build:
- Add meson build, alongside the existing autotools and CMake builds.
(Kjell Ahlstedt, Chun-Wei Fan)
- CMake: Fix the MSVC build, enable warnings, and disable unnecessary
warnings, with MVSC.
(Stuart Dootson)
* connection: Allow copying of empty connections.
(Aigrind)
* sigc++/adaptors/bind.h: Make bind_functor::bound_ public.
(Used by sigc::visitor::do_visit_each().
(Kjell Ahlstedt) Bug #26
* test_limit_reference: Avoid virtual-move-assign warning
(seen with g++ 9.2)
(Murray Cumming)
* signal: slot_iterator_buf: Remove unused T_result default type
(Murray Cumming)
* tests: Slight cleanups
(Murray Cumming)
* Remove unused #ifdefed code.
(Murray Cumming)
[1] http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.0/libsigc++-3.0.2.news
[2] http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.0/libsigc++-3.0.1.news
Signed-off-by: Andreas Müller
---
.../{libsigc++-3_3.0.0.bb => libsigc++-3_3.0.2.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-core/libsigc++-2.0/{libsigc++-3_3.0.0.bb =>
libsigc++-3_3.0.2.bb} (77%)
diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb
b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.2.bb
similarity index 77%
rename from meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb
rename to meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.2.bb
index 3c0330f50..0acdb3e98 100644
--- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb
+++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.2.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=959bffe2993816eb32ec4bc1ec1d5875"
DEPENDS = "mm-common"
SRC_URI =
"http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.0/libsigc++-${PV}.tar.xz;
-SRC_URI[md5sum] = "6ffe924f1d8624b5716468cde67dc03f"
-SRC_URI[sha256sum] =
"50a0855c1eb26e6044ffe888dbe061938ab4241f96d8f3754ea7ead38ab8ed06"
+SRC_URI[md5sum] = "1f93f8ed4ead38e876157834b2c57c21"
+SRC_URI[sha256sum] =
"4b77676de1e74774ec456bcc6ac6f04a2791a12cc1fe07f8305d4c3c86e2f339"
S = "${WORKDIR}/libsigc++-${PV}"
--
2.21.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 5/9] evolution-data-server: upgrade 3.34.2 -> 3.34.3
From [1]: Evolution-Data-Server 3.34.3 2020-01-03 --- Bug Fixes: I#177 - DAV: Ignore 404 responses on content refresh (Milan Crha) Translations: Yi-Jyun Pan (zh_TW) [1] http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/3.34/evolution-data-server-3.34.3.news Signed-off-by: Andreas Müller --- .../evolution-data-server/evolution-data-server.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 0e58b0cc2..1eae3df35 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.md5sum] = "7a0571ac358664c6e96accd3ac4cd245" -SRC_URI[archive.sha256sum] = "3eb89f82eee042884a8d65737564fe48829c3ae187f067cbcdec2b088d2fe89b" -PV = "3.34.2" +SRC_URI[archive.md5sum] = "687d6d7242d60a8a3a3322eee6a45dca" +SRC_URI[archive.sha256sum] = "d2dfac5ca76e05e872fbb06a57cae0dace64818c4dce1e906b0396888270c3a9" +PV = "3.34.3" -- 2.21.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 9/9] libsigc++-3: let meson build
Signed-off-by: Andreas Müller
---
meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.2.bb
b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.2.bb
index 0acdb3e98..26bd02c7b 100644
--- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.2.bb
+++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.2.bb
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] =
"4b77676de1e74774ec456bcc6ac6f04a2791a12cc1fe07f8305d4c3c86
S = "${WORKDIR}/libsigc++-${PV}"
-inherit autotools
+inherit setuptools3 meson
FILES_${PN}-dev += "${libdir}/sigc++-*/"
FILES_${PN}-doc += "${datadir}/devhelp"
--
2.21.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 6/9] gjs: upgrade 1.58.3 -> 1.58.4
From [1]:
Version 1.58.4
--
- Now prints a warning when constructing an unregistered object inheriting from
GObject (i.e. if you forgot to use GObject.registerClass.) In 1.58.2 this
would throw an exception, which broke some existing code, so that change was
reverted in 1.58.3. In this version the check is reinstated, but we log a
warning instead of throwing an exception, so that people know to fix their
code, but without breaking things.
NOTE: In 1.64 (the next stable release) the warning will be changed back into
an exception, because code with this problem can be subtly broken and cause
unexpected errors elsewhere. So make sure to fix your code if you get this
warning.
- Closed bugs and merge requests:
* GSettings crash fixes [Andy Holmes, !373]
- Memory savings for Cairo objects [Philip Chimento, !374]
- Fix for crash in debug functions [Philip Chimento, !374]
[1] http://ftp.gnome.org/pub/gnome/sources/gjs/1.58/gjs-1.58.4.news
Signed-off-by: Andreas Müller
---
meta-gnome/recipes-gnome/gjs/{gjs_1.58.3.bb => gjs_1.58.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-gnome/recipes-gnome/gjs/{gjs_1.58.3.bb => gjs_1.58.4.bb} (87%)
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.58.3.bb
b/meta-gnome/recipes-gnome/gjs/gjs_1.58.4.bb
similarity index 87%
rename from meta-gnome/recipes-gnome/gjs/gjs_1.58.3.bb
rename to meta-gnome/recipes-gnome/gjs/gjs_1.58.4.bb
index ddd5196b2..eb7d323a6 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs_1.58.3.bb
+++ b/meta-gnome/recipes-gnome/gjs/gjs_1.58.4.bb
@@ -11,8 +11,8 @@ DEPENDS = "mozjs gtk+3"
inherit gnomebase gsettings gobject-introspection vala gettext features_check
upstream-version-is-even
-SRC_URI[archive.md5sum] = "bce6dea9a6583a8b3c6af5854df76aaf"
-SRC_URI[archive.sha256sum] =
"ca9fcd47b95ab0fc445301b2595e51fcea24d6f3cd87c190fe07006146d773ae"
+SRC_URI[archive.md5sum] = "385f4baa266991a08d3e425bc69ee962"
+SRC_URI[archive.sha256sum] =
"261a3f666c771d7744965fe71b804fc2c3a3d46a8e3e8d4f7ed5ef97967ebd5f"
SRC_URI += "file://0001-Disable-tests-on-host.patch"
# gobject-introspection is mandatory and cannot be configured
--
2.21.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 4/9] gnome-shell: upgrade 3.34.2 -> 3.34.3
Frmo announcement:
* polkitAgent: Fix confirming via keyboard when password-less [Jonas; #2066]
* Misc. bug fixes and cleanups [Florian; !906]
Signed-off-by: Andreas Müller
---
.../{gnome-shell_3.34.2.bb => gnome-shell_3.34.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-gnome/recipes-gnome/gnome-shell/{gnome-shell_3.34.2.bb =>
gnome-shell_3.34.3.bb} (91%)
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.2.bb
b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.3.bb
similarity index 91%
rename from meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.2.bb
rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.3.bb
index cd8b3ad0a..463fbf46f 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.3.bb
@@ -30,8 +30,8 @@ GTKDOC_MESON_OPTION = "gtk_doc"
REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
-SRC_URI[archive.md5sum] = "b01d6772917148c81d472584f6b36c83"
-SRC_URI[archive.sha256sum] =
"703264db2fafe02d1db53d701cb99a4a757c46e7569e7b9d690dda009fc03b4d"
+SRC_URI[archive.md5sum] = "a0f7d78f57616076890f0e3b7f12196a"
+SRC_URI[archive.sha256sum] =
"2474bef386c5a47d7be285aa22e24125c46ba5f860a25a1a36a90de4e456bd8a"
PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES',
'systemd', d)}"
PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth"
--
2.21.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 7/9] gnome-desktop3: upgrade 3.34.2 -> 3.34.3
From [1]:
==
Version 3.34.3
==
- seccomp is not supported ATM on riscv64 architecture, blacklist it for now
(#128)
[1]
http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/3.34/gnome-desktop-3.34.3.news
Signed-off-by: Andreas Müller
---
.../0001-meson.build-Disable-libseccomp-for-all-archs.patch | 6 +++---
.../{gnome-desktop3_3.34.2.bb => gnome-desktop3_3.34.3.bb} | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
rename meta-gnome/recipes-gnome/gnome-desktop/{gnome-desktop3_3.34.2.bb =>
gnome-desktop3_3.34.3.bb} (88%)
diff --git
a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch
b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch
index e93d5b674..4b3894f05 100644
---
a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch
+++
b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch
@@ -18,14 +18,14 @@ Signed-off-by: Andreas Müller
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
-index 83407b4..80eab84 100644
+index 2e7160d..f83677d 100644
--- a/meson.build
+++ b/meson.build
-@@ -53,12 +53,7 @@ udev_dep = dependency('libudev', required:
get_option('udev'))
+@@ -58,12 +58,7 @@ udev_dep = dependency('libudev', required:
get_option('udev'))
host_os = host_machine.system()
host_cpu = host_machine.cpu()
supported_os = ['linux']
--unsupported_cpus = ['alpha', 'ia64', 'm68k', 'sh4', 'sparc', 'sparc64']
+-unsupported_cpus = ['alpha', 'ia64', 'm68k', 'riscv64', 'sh4', 'sparc',
'sparc64']
-if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu)
- seccomp_dep = dependency('libseccomp')
-else
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.2.bb
b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.3.bb
similarity index 88%
rename from meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.2.bb
rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.3.bb
index 19f73a6e5..cdd11aa90 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.3.bb
@@ -14,8 +14,8 @@ inherit gnomebase itstool pkgconfig upstream-version-is-even
gobject-introspecti
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
-SRC_URI[archive.md5sum] = "a0fda8ee9283536e281405e94af15776"
-SRC_URI[archive.sha256sum] =
"4081ba619733da33ec6ba98cd52170ee99a90439709df4df333e5c9e631f28ed"
+SRC_URI[archive.md5sum] = "cdcd3006f55d8c8813315bef6f4f6b71"
+SRC_URI[archive.sha256sum] =
"acc2efc847574fd21d8f200679f111c2b1eb5ae2c041e0034e7c18450a7d9c6d"
SRC_URI += " \
file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
--
2.21.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 3/9] mutter: upgrade 3.34.2 -> 3.34.3
From announcement:
* Fix window recording on HiDPI [Pascal; !976]
* Fix top-left pixel being insensitive to clicks [Sebastian; #893]
Signed-off-by: Andreas Müller
---
.../mutter/{mutter_3.34.2.bb => mutter_3.34.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-gnome/recipes-gnome/mutter/{mutter_3.34.2.bb => mutter_3.34.3.bb}
(95%)
diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.34.2.bb
b/meta-gnome/recipes-gnome/mutter/mutter_3.34.3.bb
similarity index 95%
rename from meta-gnome/recipes-gnome/mutter/mutter_3.34.2.bb
rename to meta-gnome/recipes-gnome/mutter/mutter_3.34.3.bb
index 992915bb7..9afa269ed 100644
--- a/meta-gnome/recipes-gnome/mutter/mutter_3.34.2.bb
+++ b/meta-gnome/recipes-gnome/mutter/mutter_3.34.3.bb
@@ -22,8 +22,8 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gsettings gobject-introspection gettext
upstream-version-is-even features_check
-SRC_URI[archive.md5sum] = "4515ccdb762a243d65757f5ab073d206"
-SRC_URI[archive.sha256sum] =
"2d6f7763193766d4652d43d0d0de2e49e60ca571eca0a7f1e6341fbd67f90b2d"
+SRC_URI[archive.md5sum] = "c3ee46ae7b84d9d0e8dd3f9e04a61ab1"
+SRC_URI[archive.sha256sum] =
"cdf57ddd0bc35db952b732b77c796760e65d1ce2f7df31273e5c8d4759ed4a89"
SRC_URI += "file://0001-cogl-Fix-GLES2-fallback.patch"
# x11 is still manadatory - see meson.build
--
2.21.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/9] xfce4-terminal: upgrade 0.8.9 -> 0.8.9.1
This is a hotfix release for 0.8.9:
Release notes for 0.8.9.1
=
This is a bug-fix release featuring only one change.
0.8.9.1
===
- Fix "Open terminal here" functionality that was broken in release
0.8.9 (bug #16307)
Signed-off-by: Andreas Müller
---
.../{xfce4-terminal_0.8.9.bb => xfce4-terminal_0.8.9.1.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-apps/xfce4-terminal/{xfce4-terminal_0.8.9.bb =>
xfce4-terminal_0.8.9.1.bb} (70%)
diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.9.bb
b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.9.1.bb
similarity index 70%
rename from meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.9.bb
rename to meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.9.1.bb
index 493758c18..4bdd4cbf2 100644
--- a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.9.bb
+++ b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.9.1.bb
@@ -8,7 +8,7 @@ inherit xfce-app
FILES_${PN} += "${datadir}/xfce4 \
${datadir}/gnome-control-center"
-SRC_URI[md5sum] = "cb40a6cc5b3e35fa4d68f1b702f11027"
-SRC_URI[sha256sum] =
"247683a51a964cfaa6b1e92030afe9f782efebfcb550a464170b53eb94216795"
+SRC_URI[md5sum] = "cb995e4891a3c547bf133b31e4840d01"
+SRC_URI[sha256sum] =
"0deb0d06e50a8a41fb00e2c3773f0793882cb9f073ae16ead887bb9681c514cd"
RRECOMMENDS_${PN} += "vte-prompt"
--
2.21.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/9] poppler: upgrade 0.82.0 -> 0.84.0
From announcements:
Release 0.84.0:
core:
* Fix crash when converting from Unicode to ASCII-7
* Splash::scaleImageYdXu: Protect against crash if srcWidth is too big
* JBIG2Stream: fix potential crash in malformed documents
* JBIG2Stream: fix leak in reset() if called several times
* Internal code improvements
utils:
* pdfimages: Add error message if first page is larger then number of pages.
* pdfinfo: Improved paper size recognition
* pdfsig: Fix exit code when dumping signatures
* pdftocairo: Error out when even/odd selects 0 pages
* pdftohtml: Fix memory leak
* pdftoppm: Add an option to scale before rotate
* pdftoppm: Add -hide-annotations option
* pdftoppm: Error out when even/odd selects 0 pages
* pdftops: Improve -optimizecolorspace
qt5:
* Code cleanups
glib:
* Fix compiler warnings
Release 0.83.0:
core:
* Improve when a file is recognized as Linearized
* Improve const-ness of the code
* Make code a bit more readable/maintanable
* Fix uninitialized memory uses in broken files
utils:
* pdffonts: Make code a bit more readable/maintanable
* pdftohtml: Make code a bit more readable/maintanable
qt5:
* Remove a bunch of unused internal functions
* trUtf8 -> tr (less warnings)
build system:
* make-glib-api-docs: switch to python3
Signed-off-by: Andreas Müller
---
.../recipes-support/poppler/poppler/basename-include.patch| 4 ++--
.../poppler/{poppler_0.82.0.bb => poppler_0.84.0.bb} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta-oe/recipes-support/poppler/{poppler_0.82.0.bb =>
poppler_0.84.0.bb} (93%)
diff --git a/meta-oe/recipes-support/poppler/poppler/basename-include.patch
b/meta-oe/recipes-support/poppler/poppler/basename-include.patch
index c18a5f5c0..3d6d7a8f1 100644
--- a/meta-oe/recipes-support/poppler/poppler/basename-include.patch
+++ b/meta-oe/recipes-support/poppler/poppler/basename-include.patch
@@ -16,8 +16,8 @@ index 830c1c80..e93eb368 100644
--- a/goo/gbasename.cc
+++ b/goo/gbasename.cc
@@ -46,6 +46,10 @@
- #include
- #include
+ #include
+ #include
+#if !defined(__GLIBC__)
+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
diff --git a/meta-oe/recipes-support/poppler/poppler_0.82.0.bb
b/meta-oe/recipes-support/poppler/poppler_0.84.0.bb
similarity index 93%
rename from meta-oe/recipes-support/poppler/poppler_0.82.0.bb
rename to meta-oe/recipes-support/poppler/poppler_0.84.0.bb
index 37f859353..0f3e50571 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.82.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.84.0.bb
@@ -6,8 +6,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
file://0001-Do-not-overwrite-all-our-build-flags.patch \
file://basename-include.patch \
"
-SRC_URI[md5sum] = "4d6106c2382c5e66072e0b355acc3640"
-SRC_URI[sha256sum] =
"234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"
+SRC_URI[md5sum] = "e14a8aca8809908ad4364c32c17bcb92"
+SRC_URI[sha256sum] =
"c7a130da743b38a548f7a21fe5940506fb1949f4ebdd3209f0e5b302fa139731"
DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
--
2.21.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] websocketpp: add various upstream accepted and proposed patches to fix various issues, including:
On Thu, Jan 9, 2020 at 2:41 AM Gianfranco Costamagna
wrote:
>
> Hello, I sent a new version some seconds ago.
>
> For the Upstream-Status, I would like to prefer avoiding doing that, because
> I copy-paste the patches from my Debian packaging,
if they are verbatim copy them perhaps they should be using wget
fetcher and not stored locally, so then they will be checksummed for
any changes from upstream as well as they will get url location for
patches for OE in metadata its
good to have the patch header as per
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status
we are trying to nudge us to have this info in patch headers to make
it easy for future reference.
> with no differences at all (and on the next upstream release they will be all
> dropped), and the patch name is the PR number, because I just add them via
> wget command, something like:
> wget https://github.com/zaphoyd/websocketpp/pull/857.patch
>
> the "tests" are just meant to see if everything builds fine with newer
> toolchains (e.g. new boost version), while examples...
> I don't plan to add them yet, unless somebody asks for them.
>
> In any case, I prefer to add them in a subpackage, after patching the
> upstream CMake system to install them into the filesystem, and after I do
> that in Debian.
>
I see this is WIP which is ok we can wait.
> let me know if it sounds good for you!
>
> G.
>
>
> Il giorno mer 8 gen 2020 alle ore 20:26 Khem Raj ha
> scritto:
>>
>> On Wed, Jan 8, 2020 at 9:11 AM Gianfranco Costamagna
>> wrote:
>> >
>> > - build failure with boost 1.71
>> > - bad installation of header files correct version on some OSes.
>> > - fix version minor number
>> >
>> > Signed-off-by: Gianfranco Costamagna
>> > Signed-off-by: Gianfranco Costamagna
>> > ---
>> > .../websocketpp/websocketpp-0.8.1/771.patch | 22 ++
>> > .../websocketpp/websocketpp-0.8.1/842.patch | 30 +++
>> > .../websocketpp/websocketpp-0.8.1/855.patch | 23 ++
>> > .../websocketpp/websocketpp_0.8.1.bb | 5
>> > 4 files changed, 80 insertions(+)
>> > create mode 100644
>> > meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
>> > create mode 100644
>> > meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
>> > create mode 100644
>> > meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
>> >
>> > diff --git
>> > a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
>> > b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
>> > new file mode 100644
>> > index 0..bc65efb7d
>> > --- /dev/null
>> > +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
>> > @@ -0,0 +1,22 @@
>> > +From 4bccfb04a264704ec9b80ba332ee1cf113ce7f1b Mon Sep 17 00:00:00 2001
>> > +From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?=
>> > +Date: Thu, 1 Nov 2018 20:58:10 +0100
>> > +Subject: [PATCH] Update version number in CMakeLists.txt to 0.8.1
>> > +
>> > +---
>> > + CMakeLists.txt | 2 +-
>> > + 1 file changed, 1 insertion(+), 1 deletion(-)
>> > +
>> > +diff --git a/CMakeLists.txt b/CMakeLists.txt
>> > +index 2786aba9..2d13117b 100644
>> > +--- a/CMakeLists.txt
>> > b/CMakeLists.txt
>> > +@@ -24,7 +24,7 @@ endif ()
>> > + Project name and version
>> > + set (WEBSOCKETPP_MAJOR_VERSION 0)
>> > + set (WEBSOCKETPP_MINOR_VERSION 8)
>> > +-set (WEBSOCKETPP_PATCH_VERSION 0)
>> > ++set (WEBSOCKETPP_PATCH_VERSION 1)
>> > + set (WEBSOCKETPP_VERSION
>> > ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
>> > +
>> > + if(POLICY CMP0048)
>> > diff --git
>> > a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
>> > b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
>> > new file mode 100644
>> > index 0..c3651e94a
>> > --- /dev/null
>> > +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
>> > @@ -0,0 +1,30 @@
>> > +From 7f7e2be01b4fa6580ce27f668e61adf37853ad67 Mon Sep 17 00:00:00 2001
>> > +From: Schrijvers Luc
>> > +Date: Wed, 18 Sep 2019 11:35:43 +0200
>> > +Subject: [PATCH] Fix "include" directory installation. the variable
>> > + INSTALL_INCLUDE_DIR already exists, and defaults to include if not
>> > + specificied otherwise. Using it allows people to customize the
>> > installation
>> > + from outside, fixing issues with other OS like Haiku
>> > +
>> > +Signed-off-by: Gianfranco Costamagna
>> > +Signed-off-by: Gianfranco Costamagna
>> > +---
>> > + cmake/CMakeHelpers.cmake | 2 +-
>> > + 1 file changed, 1 insertion(+), 1 deletion(-)
>> > +
>> > +diff --git a/cmake/CMakeHelpers.cmake b/cmake/CMakeHelpers.cmake
>> > +index 1478f4b..f603632 100644
>> > +--- a/cmake/CMakeHelpers.cmake
>> > b/cmake/CMakeHelpers.cmake
>> > +@@ -80,7 +80,7 @@ macro (final_target)
>> > + endif ()
>> > +
>> > + install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME}
>> > +-
[oe] [PATCH v2] opencv: abort configure if we need to download
OpenCV's habit of downloading files during do_configure is bad form
(as it becomes impossible to do offline builds), so add an option to
error out if a download would be needed.
Signed-off-by: Ross Burton
---
.../opencv/opencv/download.patch | 32 +++
.../recipes-support/opencv/opencv_4.1.0.bb| 2 ++
2 files changed, 34 insertions(+)
create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch
diff --git a/meta-oe/recipes-support/opencv/opencv/download.patch
b/meta-oe/recipes-support/opencv/opencv/download.patch
new file mode 100644
index 00..fa8db88078
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/download.patch
@@ -0,0 +1,32 @@
+This CMake module will download files during do_configure. This is bad as it
+means we can't do offline builds.
+
+Add an option to disallow downloads by emitting a fatal error.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton
+
+diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
+index cdc47ad2cb..74573f45a2 100644
+--- a/cmake/OpenCVDownload.cmake
b/cmake/OpenCVDownload.cmake
+@@ -14,6 +14,7 @@
+ #RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will
be appended to it
+ # Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is /.cache
+
++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads")
+ 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)
+
+ # Download
+ if(NOT EXISTS "${CACHE_CANDIDATE}")
++if(NOT OPENCV_ALLOW_DOWNLOADS)
++ message(FATAL_ERROR "Not going to download ${DL_FILENAME}")
++ return()
++endif()
++
+ ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
+ file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}"
+ INACTIVITY_TIMEOUT 60
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 03e4f58dca..f679ccb05f 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -48,6 +48,7 @@ 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://download.patch \
"
PV = "4.1.0"
@@ -87,6 +88,7 @@ EXTRA_OECMAKE =
"-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
-DIPPROOT=${WORKDIR}/ippicv_lnx \
-DOPENCV_GENERATE_PKGCONFIG=ON \
-DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
+-DOPENCV_ALLOW_DOWNLOADS=OFF \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1
-DENABLE_SSE42=1", "", d)} \
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/4] opencv: also download face alignment data in do_fetch()
The face alignment data is downloaded in do_configure, so download it in
do_fetch and add it to the cache.
Signed-off-by: Ross Burton
---
meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index cfc7854e1d..487393f388 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -15,6 +15,7 @@ SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
+SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"
def ipp_filename(d):
import re
@@ -41,6 +42,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;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
\
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 \
@@ -73,6 +75,7 @@ do_unpack_extra() {
}
cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
+cache data ${WORKDIR}/face/*.dat
}
addtask unpack_extra after do_unpack before do_patch
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/4] opencv: don't download during configure
OpenCV downloads data files during the CMake configure phase, which
is bad because fetching should only happen in do_fetch (and if proxies
are needed, won't be set in do_configure).
The recipe attempts to solve this already by having the repositories in
SRC_URI and moving the files to the correct place before do_configure().
However they are written to ${B} which is then wiped in do_configure so
they're not used.
The OpenCV download logic has a download cache with specially formatted
filenames, so take the downloaded files and populate the cache.
Signed-off-by: Ross Burton
---
.../recipes-support/opencv/opencv_4.1.0.bb| 23 +--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 5e89db0977..cfc7854e1d 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -51,10 +51,28 @@ PV = "4.1.0"
S = "${WORKDIR}/git"
+# OpenCV wants to download more files during configure. We download these in
+# do_fetch and construct a source cache in the format it expects
+OPENCV_DLDIR = "${WORKDIR}/downloads"
+
do_unpack_extra() {
tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR}
-cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
-cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
+
+md5() {
+# Return the MD5 of $1
+echo $(md5sum $1 | cut -d' ' -f1)
+}
+cache() {
+TAG=$1
+shift
+mkdir --parents ${OPENCV_DLDIR}/$TAG
+for F in $*; do
+DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F)
+test -e $DEST || ln -s $F $DEST
+done
+}
+cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
+cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
}
addtask unpack_extra after do_unpack before do_patch
@@ -65,6 +83,7 @@ EXTRA_OECMAKE =
"-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
-DOPENCV_ICV_HASH=${IPP_MD5} \
-DIPPROOT=${WORKDIR}/ippicv_lnx \
-DOPENCV_GENERATE_PKGCONFIG=ON \
+-DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1
-DENABLE_SSE42=1", "", d)} \
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 4/4] opencv: abort configure if we need to download
OpenCV's habit of downloading files during do_configure is bad form
(as it becomes impossible to do offline builds), so add an option to
error out if a download would be needed.
Signed-off-by: Ross Burton
---
meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 03e4f58dca..f679ccb05f 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -48,6 +48,7 @@ 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://download.patch \
"
PV = "4.1.0"
@@ -87,6 +88,7 @@ EXTRA_OECMAKE =
"-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
-DIPPROOT=${WORKDIR}/ippicv_lnx \
-DOPENCV_GENERATE_PKGCONFIG=ON \
-DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
+-DOPENCV_ALLOW_DOWNLOADS=OFF \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1
-DENABLE_SSE42=1", "", d)} \
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 3/4] opencv: PACKAGECONFIG for G-API, use system ADE
The Graph API is enabled by default, and if ADE isn't present it will
download a copy of the source during do_configure.
Add a PACKAGECONFIG for the Graph API, and depend on the ADE that we
package.
Signed-off-by: Ross Burton
---
meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 487393f388..03e4f58dca 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -93,10 +93,11 @@ EXTRA_OECMAKE =
"-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
"
EXTRA_OECMAKE_append_x86 = " -DX86=ON"
-PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples
tbb gphoto2 \
+PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer
samples tbb gphoto2 \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "",
d)}"
+PACKAGECONFIG[gapi] = "-DWITH_ADE=ON
-Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade"
PACKAGECONFIG[amdblas] =
"-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
PACKAGECONFIG[amdfft] =
"-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON
-DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native,"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] cpprest: fix cmake installation directory
This should help reverse-dependencies find the cmake files also in multiarch
locations
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb
b/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb
index 53f6469b2..11c8eab55 100644
--- a/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb
+++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f"
DEPENDS = "openssl websocketpp zlib boost brotli"
-EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake -DCPPREST_EXCLUDE_BROTLI=OFF
-DWERROR=OFF"
+EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk
-DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF"
SRC_URI =
"git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \
file://disable-float-tests.patch \
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] brotli: rename static libraries avoding the -static suffix.
This leads to link failures such as the ones described here:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=943321
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
meta-oe/recipes-extended/brotli/brotli_1.0.7.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
b/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
index b4d4773ee..e4e454bda 100644
--- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
+++ b/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
@@ -12,3 +12,9 @@ SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
S = "${WORKDIR}/git"
inherit cmake lib_package
+
+do_install_append () {
+ for lib in $(ls ${D}${libdir}/*-static.a); do
+ mv -v "${lib}" "$(echo ${lib} | sed s/-static//)"
+ done
+}
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] websocketpp: add various upstream accepted and proposed patches to fix various issues, including:
Hello, I sent a new version some seconds ago.
For the Upstream-Status, I would like to prefer avoiding doing that,
because I copy-paste the patches from my Debian packaging,
with no differences at all (and on the next upstream release they will be
all dropped), and the patch name is the PR number, because I just add them
via wget command, something like:
wget https://github.com/zaphoyd/websocketpp/pull/857.patch
the "tests" are just meant to see if everything builds fine with newer
toolchains (e.g. new boost version), while examples...
I don't plan to add them yet, unless somebody asks for them.
In any case, I prefer to add them in a subpackage, after patching the
upstream CMake system to install them into the filesystem, and after I do
that in Debian.
let me know if it sounds good for you!
G.
Il giorno mer 8 gen 2020 alle ore 20:26 Khem Raj ha
scritto:
> On Wed, Jan 8, 2020 at 9:11 AM Gianfranco Costamagna
> wrote:
> >
> > - build failure with boost 1.71
> > - bad installation of header files correct version on some OSes.
> > - fix version minor number
> >
> > Signed-off-by: Gianfranco Costamagna
> > Signed-off-by: Gianfranco Costamagna
> > ---
> > .../websocketpp/websocketpp-0.8.1/771.patch | 22 ++
> > .../websocketpp/websocketpp-0.8.1/842.patch | 30 +++
> > .../websocketpp/websocketpp-0.8.1/855.patch | 23 ++
> > .../websocketpp/websocketpp_0.8.1.bb | 5
> > 4 files changed, 80 insertions(+)
> > create mode 100644
> meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
> > create mode 100644
> meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
> > create mode 100644
> meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
> >
> > diff --git
> a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
> b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
> > new file mode 100644
> > index 0..bc65efb7d
> > --- /dev/null
> > +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
> > @@ -0,0 +1,22 @@
> > +From 4bccfb04a264704ec9b80ba332ee1cf113ce7f1b Mon Sep 17 00:00:00 2001
> > +From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?=
> > +Date: Thu, 1 Nov 2018 20:58:10 +0100
> > +Subject: [PATCH] Update version number in CMakeLists.txt to 0.8.1
> > +
> > +---
> > + CMakeLists.txt | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/CMakeLists.txt b/CMakeLists.txt
> > +index 2786aba9..2d13117b 100644
> > +--- a/CMakeLists.txt
> > b/CMakeLists.txt
> > +@@ -24,7 +24,7 @@ endif ()
> > + Project name and version
> > + set (WEBSOCKETPP_MAJOR_VERSION 0)
> > + set (WEBSOCKETPP_MINOR_VERSION 8)
> > +-set (WEBSOCKETPP_PATCH_VERSION 0)
> > ++set (WEBSOCKETPP_PATCH_VERSION 1)
> > + set (WEBSOCKETPP_VERSION
> ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
> > +
> > + if(POLICY CMP0048)
> > diff --git
> a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
> b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
> > new file mode 100644
> > index 0..c3651e94a
> > --- /dev/null
> > +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
> > @@ -0,0 +1,30 @@
> > +From 7f7e2be01b4fa6580ce27f668e61adf37853ad67 Mon Sep 17 00:00:00 2001
> > +From: Schrijvers Luc
> > +Date: Wed, 18 Sep 2019 11:35:43 +0200
> > +Subject: [PATCH] Fix "include" directory installation. the variable
> > + INSTALL_INCLUDE_DIR already exists, and defaults to include if not
> > + specificied otherwise. Using it allows people to customize the
> installation
> > + from outside, fixing issues with other OS like Haiku
> > +
> > +Signed-off-by: Gianfranco Costamagna
> > +Signed-off-by: Gianfranco Costamagna
> > +---
> > + cmake/CMakeHelpers.cmake | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/cmake/CMakeHelpers.cmake b/cmake/CMakeHelpers.cmake
> > +index 1478f4b..f603632 100644
> > +--- a/cmake/CMakeHelpers.cmake
> > b/cmake/CMakeHelpers.cmake
> > +@@ -80,7 +80,7 @@ macro (final_target)
> > + endif ()
> > +
> > + install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME}
> > +- DESTINATION include/
> > ++ DESTINATION ${INSTALL_INCLUDE_DIR}/
> > + FILES_MATCHING PATTERN "*.hpp*")
> > + endmacro ()
> > +
> > +--
> > +2.17.1
> > +
> > diff --git
> a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
> b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
> > new file mode 100644
> > index 0..e44a21c9f
> > --- /dev/null
> > +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
> > @@ -0,0 +1,23 @@
> > +From 3590d77bb9753fbbf076028e2395182ced6466ba Mon Sep 17 00:00:00 2001
> > +From: Gianfranco Costamagna
> > +Date: Wed, 8 Jan 2020 17:59:48 +0100
> > +Subject: [PATCH] Fix cmake find boost with version >= 1.71
> > +
> > +For some reasons
[oe] [meta-oe][PATCH] websocketpp: add various upstream accepted and proposed patches to fix various issues, including:
- build failure with boost 1.71
- bad installation of header files correct version on some OSes.
- fix version minor number
- fix Scons script not being Python3 ready
- build examples and tests only if ptest is enabled in DISTRO_FEATURES
- do not depend on websocketpp from -dev package, because this is an header
only dev package for now
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../websocketpp/websocketpp-0.8.1/771.patch | 22 +++
.../websocketpp/websocketpp-0.8.1/842.patch | 30
.../websocketpp/websocketpp-0.8.1/855.patch | 23 +++
.../websocketpp/websocketpp-0.8.1/857.patch | 132 ++
.../websocketpp/websocketpp_0.8.1.bb | 15 +-
5 files changed, 221 insertions(+), 1 deletion(-)
create mode 100644
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
create mode 100644
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
create mode 100644
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
create mode 100644
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch
diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
new file mode 100644
index 0..bc65efb7d
--- /dev/null
+++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
@@ -0,0 +1,22 @@
+From 4bccfb04a264704ec9b80ba332ee1cf113ce7f1b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?=
+Date: Thu, 1 Nov 2018 20:58:10 +0100
+Subject: [PATCH] Update version number in CMakeLists.txt to 0.8.1
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2786aba9..2d13117b 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif ()
+ Project name and version
+ set (WEBSOCKETPP_MAJOR_VERSION 0)
+ set (WEBSOCKETPP_MINOR_VERSION 8)
+-set (WEBSOCKETPP_PATCH_VERSION 0)
++set (WEBSOCKETPP_PATCH_VERSION 1)
+ set (WEBSOCKETPP_VERSION
${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
+
+ if(POLICY CMP0048)
diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
new file mode 100644
index 0..c3651e94a
--- /dev/null
+++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
@@ -0,0 +1,30 @@
+From 7f7e2be01b4fa6580ce27f668e61adf37853ad67 Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc
+Date: Wed, 18 Sep 2019 11:35:43 +0200
+Subject: [PATCH] Fix "include" directory installation. the variable
+ INSTALL_INCLUDE_DIR already exists, and defaults to include if not
+ specificied otherwise. Using it allows people to customize the installation
+ from outside, fixing issues with other OS like Haiku
+
+Signed-off-by: Gianfranco Costamagna
+Signed-off-by: Gianfranco Costamagna
+---
+ cmake/CMakeHelpers.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/CMakeHelpers.cmake b/cmake/CMakeHelpers.cmake
+index 1478f4b..f603632 100644
+--- a/cmake/CMakeHelpers.cmake
b/cmake/CMakeHelpers.cmake
+@@ -80,7 +80,7 @@ macro (final_target)
+ endif ()
+
+ install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME}
+- DESTINATION include/
++ DESTINATION ${INSTALL_INCLUDE_DIR}/
+ FILES_MATCHING PATTERN "*.hpp*")
+ endmacro ()
+
+--
+2.17.1
+
diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
new file mode 100644
index 0..a1ee627b3
--- /dev/null
+++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
@@ -0,0 +1,23 @@
+From 3590d77bb9753fbbf076028e2395182ced6466ba Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Wed, 8 Jan 2020 17:59:48 +0100
+Subject: [PATCH] Fix cmake find boost with version >= 1.71
+
+For some reasons "system;thread;random;unit_test_framework" was seen as a
single module, because of the quotes.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d13117b..9a46bc10 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -213,7 +213,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
+ set (Boost_USE_MULTITHREADED TRUE)
+ set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0"
"1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these!
+
+-find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}")
++find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS})
+
+ if (Boost_FOUND)
+ # Boost is a project wide global dependency.
diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch
b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch
new file mode 100644
index 0..f221cd699
--- /dev/null
+++
[oe] [meta-oe][PATCH] libplist: upgrade 2.0.0 -> 2.1.0
Signed-off-by: Wang Mingyu
---
.../libimobiledevice/{libplist_2.0.0.bb => libplist_2.1.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-extended/libimobiledevice/{libplist_2.0.0.bb =>
libplist_2.1.0.bb} (94%)
diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb
b/meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb
similarity index 94%
rename from meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb
rename to meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb
index 43c1fd5ca..48dec47a8 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb
@@ -8,7 +8,7 @@ DEPENDS = "libxml2 glib-2.0 swig python"
inherit autotools pkgconfig pythonnative
-SRCREV = "62ec804736435fa34e37e66e228e17e2aacee1d7"
+SRCREV = "3df02d4d0e9008771e8622fdc10de8333b3f0d85"
SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https \
"
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libgphoto2: upgrade 2.5.17 -> 2.5.23
Signed-off-by: Wang Mingyu
---
.../gphoto2/{libgphoto2_2.5.17.bb => libgphoto2_2.5.23.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-graphics/gphoto2/{libgphoto2_2.5.17.bb =>
libgphoto2_2.5.23.bb} (91%)
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb
b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb
similarity index 91%
rename from meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb
rename to meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb
index 623037bc3..a3bdf9cea 100644
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb
@@ -14,8 +14,8 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2
file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
"
-SRC_URI[libgphoto2.md5sum] = "ae78e7a7936a6962c3a22b256bee1869"
-SRC_URI[libgphoto2.sha256sum] =
"417464f0a313fa937e8a71cdf18a371cf01e750830195cd63ae31da0d092b555"
+SRC_URI[libgphoto2.md5sum] = "bf052ce815e607dc781c5b0f3c5ca5c0"
+SRC_URI[libgphoto2.sha256sum] =
"d8af23364aa40fd8607f7e073df74e7ace05582f4ba13f1724d12d3c97e8852d"
inherit autotools pkgconfig gettext lib_package
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] haveged: upgrade 1.9.6 -> 1.9.8
Signed-off-by: Wang Mingyu
---
.../haveged/{haveged_1.9.6.bb => haveged_1.9.8.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-extended/haveged/{haveged_1.9.6.bb => haveged_1.9.8.bb}
(96%)
diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb
b/meta-oe/recipes-extended/haveged/haveged_1.9.8.bb
similarity index 96%
rename from meta-oe/recipes-extended/haveged/haveged_1.9.6.bb
rename to meta-oe/recipes-extended/haveged/haveged_1.9.8.bb
index e5b9bc947..403956efa 100644
--- a/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb
+++ b/meta-oe/recipes-extended/haveged/haveged_1.9.8.bb
@@ -5,8 +5,8 @@ HOMEPAGE = "http://www.issihosts.com/haveged/index.html;
LICENSE = "GPLv3"
LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-# v1.9.6
-SRCREV = "1470a82a7f79110c79beea1ca5f2d3b0fd1a4668"
+# v1.9.8
+SRCREV = "8cd0266472aff59821718c4410e80f28978310f9"
SRC_URI = "git://github.com/jirka-h/haveged.git \
"
S = "${WORKDIR}/git"
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gtkwave: upgrade 3.3.102 -> 3.3.103
Signed-off-by: Wang Mingyu
---
.../gtkwave/{gtkwave_3.3.102.bb => gtkwave_3.3.103.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-graphics/gtkwave/{gtkwave_3.3.102.bb =>
gtkwave_3.3.103.bb} (85%)
diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb
b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb
similarity index 85%
rename from meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb
rename to meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb
index cd3b6629e..286d9aa6a 100644
--- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb
+++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=75859989545e37968a99b631ef42722e"
SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz;
-SRC_URI[md5sum] = "13da7d4235d4031fde52971830458850"
-SRC_URI[sha256sum] =
"80bb7cb92db45872209f4ca48fc95a0460e0d89b0fe0c310c836d9b04c77fec7"
+SRC_URI[md5sum] = "5a9a5913f9a02a333b2b23626f153fd7"
+SRC_URI[sha256sum] =
"c325abf7cf26c53309a67c0ecaaf196774fa982a717a102c599ac8a516eeeaf7"
inherit pkgconfig autotools gettext texinfo
DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0"
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gphoto2: upgrade 2.5.14 -> 2.5.23
Signed-off-by: Wang Mingyu
---
.../gphoto2/{gphoto2_2.5.14.bb => gphoto2_2.5.23.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-graphics/gphoto2/{gphoto2_2.5.14.bb =>
gphoto2_2.5.23.bb} (79%)
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb
b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.23.bb
similarity index 79%
rename from meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb
rename to meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.23.bb
index 75ad7f4f0..ef3100f66 100644
--- a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb
+++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.23.bb
@@ -11,8 +11,8 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \
file://0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch \
"
-SRC_URI[gphoto2.md5sum] = "6c6a21b5e879330cdd71ef92dce36399"
-SRC_URI[gphoto2.sha256sum] =
"9302d02fb472d4936988382b7277ccdc4edaf7ede56c490278912ffd0627699c"
+SRC_URI[gphoto2.md5sum] = "0abd5ae8315109ae66bf06ac37902678"
+SRC_URI[gphoto2.sha256sum] =
"df87092100e7766c9d0a4323217c91908a9c891c0d3670ebf40b76903be458d1"
inherit autotools pkgconfig gettext
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gnuplot: upgrade 5.2.2 -> 5.2.8
Signed-off-by: Wang Mingyu
---
.../gnuplot/{gnuplot_5.2.2.bb => gnuplot_5.2.8.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-extended/gnuplot/{gnuplot_5.2.2.bb => gnuplot_5.2.8.bb}
(94%)
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb
b/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb
similarity index 94%
rename from meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb
rename to meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb
index 898627bc1..926d8851d 100644
--- a/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb
@@ -22,8 +22,8 @@ SRC_URI_append_class-target = " \
file://0004-Add-configure-option-to-find-qt5-native-tools.patch \
"
-SRC_URI[archive.md5sum] = "60aedd08998160593199459dea8467fe"
-SRC_URI[archive.sha256sum] =
"a416d22f02bdf3873ef82c5eb7f8e94146795811ef808e12b035ada88ef7b1a1"
+SRC_URI[archive.md5sum] = "2df8767c7399bee57a96296d46b4d5fb"
+SRC_URI[archive.sha256sum] =
"60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37"
SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
SRC_URI[qtplot.sha256sum] =
"6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132"
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] rocksdb: Fix compile error for DEBUG_BUILD
On Thu, Jan 09, 2020 at 04:30:41PM +0800, Robert Yang wrote: > On 1/9/20 4:14 PM, Adrian Bunk wrote: > > On Thu, Jan 09, 2020 at 03:13:57PM +0800, Robert Yang wrote: > > > > > > > > > On 1/8/20 5:27 PM, Adrian Bunk wrote: > > > > On Wed, Jan 08, 2020 at 02:09:03PM +0800, Robert Yang wrote: > > > > > Fixed do_compile error when DEBUG_BUILD = "1": > > > > > db/write_thread.cc:183:14: error: 'state' may be used uninitialized > > > > > in this function [-Werror=maybe-uninitialized] > > > > > ... > > > > > > > > -Og warnings are not 100% reliable, and in general -Werror is > > > > problematic for distributions. > > > > > > > > Does building with -DFAIL_ON_WARNINGS=OFF fix this problem? > > > > > > Yes, it works. > > > > > > I think that the correct way to fix it is initialize it rather than ignore > > > the error. > > > > Is the error a bug in the code, or is it a bogus warning from the compiler? > > > > When the warning happens only with -Og this is a known case of bogus > > warnings in gcc, and the correct way to fix it is to ignore the bogus > > warning. > > I checked the code, it won't be used before uninitialized. But I still think > that assign it an initial value is better than ignore the warnings, there > might be other vars really have this issue. Silencing a warning can be worse than ignoring it. The first question should be *why* a variable has this problem. Often the problem is that something is wrong with the code that was supposed to set the variable, and just setting some default might also result in misbehaving code - only the warning is no longer visible hiding the problem. >From a distribution point of view it does not make sense to fix random warnings in the old codebases of the few upstreams that default to -Werror while noone cares about warnings indicating actual problems in all the other recipes - -Werror is a very useful tool for upstream but mostly pain for distributions. > // Robert cu Adrian -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] rocksdb: Fix compile error for DEBUG_BUILD
On 1/9/20 4:14 PM, Adrian Bunk wrote: On Thu, Jan 09, 2020 at 03:13:57PM +0800, Robert Yang wrote: On 1/8/20 5:27 PM, Adrian Bunk wrote: On Wed, Jan 08, 2020 at 02:09:03PM +0800, Robert Yang wrote: Fixed do_compile error when DEBUG_BUILD = "1": db/write_thread.cc:183:14: error: 'state' may be used uninitialized in this function [-Werror=maybe-uninitialized] ... -Og warnings are not 100% reliable, and in general -Werror is problematic for distributions. Does building with -DFAIL_ON_WARNINGS=OFF fix this problem? Yes, it works. I think that the correct way to fix it is initialize it rather than ignore the error. Is the error a bug in the code, or is it a bogus warning from the compiler? When the warning happens only with -Og this is a known case of bogus warnings in gcc, and the correct way to fix it is to ignore the bogus warning. I checked the code, it won't be used before uninitialized. But I still think that assign it an initial value is better than ignore the warnings, there might be other vars really have this issue. // Robert // Robert cu Adrian -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] rocksdb: Fix compile error for DEBUG_BUILD
On Thu, Jan 09, 2020 at 03:13:57PM +0800, Robert Yang wrote: > > > On 1/8/20 5:27 PM, Adrian Bunk wrote: > > On Wed, Jan 08, 2020 at 02:09:03PM +0800, Robert Yang wrote: > > > Fixed do_compile error when DEBUG_BUILD = "1": > > > db/write_thread.cc:183:14: error: 'state' may be used uninitialized in > > > this function [-Werror=maybe-uninitialized] > > > ... > > > > -Og warnings are not 100% reliable, and in general -Werror is > > problematic for distributions. > > > > Does building with -DFAIL_ON_WARNINGS=OFF fix this problem? > > Yes, it works. > > I think that the correct way to fix it is initialize it rather than ignore > the error. Is the error a bug in the code, or is it a bogus warning from the compiler? When the warning happens only with -Og this is a known case of bogus warnings in gcc, and the correct way to fix it is to ignore the bogus warning. > // Robert cu Adrian -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
