Date   

[meta-oe] [PATCH] iperf3: upgrade 3.11 -> 3.12

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../recipes-benchmark/iperf3/{iperf3_3.11.bb => iperf3_3.12.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-benchmark/iperf3/{iperf3_3.11.bb => iperf3_3.12.bb} (95%)

diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.11.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.12.bb
similarity index 95%
rename from meta-oe/recipes-benchmark/iperf3/iperf3_3.11.bb
rename to meta-oe/recipes-benchmark/iperf3/iperf3_3.12.bb
index 2142a8ef1d..8c5ce36e85 100644
--- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.11.bb
+++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.12.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \
file://0001-configure.ac-check-for-CPP-prog.patch \
"

-SRCREV = "76bd67f6e90e239a7686202d2b1b595159826d24"
+SRCREV = "e61aaf8c95df956cefbc54fab7b3d78914664180"

S = "${WORKDIR}/git"

--
2.25.1


[meta-oe] [PATCH] hwdata: upgrade 0.362 -> 0.363

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../recipes-support/hwdata/{hwdata_0.362.bb => hwdata_0.363.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/hwdata/{hwdata_0.362.bb => hwdata_0.363.bb} (91%)

diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.362.bb b/meta-oe/recipes-support/hwdata/hwdata_0.363.bb
similarity index 91%
rename from meta-oe/recipes-support/hwdata/hwdata_0.362.bb
rename to meta-oe/recipes-support/hwdata/hwdata_0.363.bb
index e408c4db5a..ddfce3f391 100644
--- a/meta-oe/recipes-support/hwdata/hwdata_0.362.bb
+++ b/meta-oe/recipes-support/hwdata/hwdata_0.363.bb
@@ -5,7 +5,7 @@ SECTION = "System/Base"
LICENSE = "GPL-2.0-or-later | XFree86-1.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"

-SRCREV = "8a3647e5da0a157cbf1bff1845b0cdaf1ce1bdb0"
+SRCREV = "75df73ae53e2bb878b5dc62036679efb69210222"
SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https"
S = "${WORKDIR}/git"

--
2.25.1


[meta-gnome] [PATCH] gspell: upgrade 1.11.1 -> 1.12.0

wangmy
 

Changelog:
==========
* Use G_MODULE_EXPORT instead of the custom _GSPELL_EXTERN macro.
* Small maintenance tasks, some minor simplifications.
* Translation updates.

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../recipes-gnome/gspell/{gspell_1.11.1.bb => gspell_1.12.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-gnome/recipes-gnome/gspell/{gspell_1.11.1.bb => gspell_1.12.0.bb} (76%)

diff --git a/meta-gnome/recipes-gnome/gspell/gspell_1.11.1.bb b/meta-gnome/recipes-gnome/gspell/gspell_1.12.0.bb
similarity index 76%
rename from meta-gnome/recipes-gnome/gspell/gspell_1.11.1.bb
rename to meta-gnome/recipes-gnome/gspell/gspell_1.12.0.bb
index c76a48f19a..b7e4954964 100644
--- a/meta-gnome/recipes-gnome/gspell/gspell_1.11.1.bb
+++ b/meta-gnome/recipes-gnome/gspell/gspell_1.12.0.bb
@@ -7,4 +7,4 @@ DEPENDS = "gtk+3 iso-codes enchant2"

inherit gnomebase gettext gobject-introspection vala

-SRC_URI[archive.sha256sum] = "ef6aa4e3f711775158a7e241a5f809cf2426bc0e02c23a7d2b5c71fc3de00292"
+SRC_URI[archive.sha256sum] = "40d2850f1bb6e8775246fa1e39438b36caafbdbada1d28a19fa1ca07e1ff82ad"
--
2.25.1


Re: [meta-multimedia][PATCH] libcamera: Bump SRCREV and add libyaml to DEPENDS

Khem Raj
 

can you rebase this on master and resend?

On Sat, Oct 8, 2022 at 4:20 AM Devendra Tewari
<devendra.tewari@...> wrote:

Remove boost from DEPENDS because it is no longer needed.

Signed-off-by: Devendra Tewari <devendra.tewari@...>
---
meta-multimedia/recipes-multimedia/libcamera/libcamera.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb
index 0b9f3f7a5d6..53cd94cbf0e 100644
--- a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb
+++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb
@@ -12,13 +12,13 @@ SRC_URI = " \
git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \
"

-SRCREV = "acf8d028edda0a59b10e15962c2606137a4940af"
+SRCREV = "ed591e705c451d0ce14988ae96829a31a2ae2f9a"

PV = "202105+git${SRCPV}"

S = "${WORKDIR}/git"

-DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls boost chrpath-native libevent"
+DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls chrpath-native libevent libyaml"
DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}"

PACKAGES =+ "${PN}-gst"
--
2.37.3




Re: [meta-multimedia][PATCH] libcamera: Bump SRCREV and add libyaml to DEPENDS

Devendra Tewari
 



On 7 Oct 2022, at 18:46, Kieran Bingham <kieran.bingham@...> wrote:

Quoting Devendra Tewari (2022-10-04 23:51:06)
Signed-off-by: Devendra Tewari <devendra.tewari@...>
---
meta-multimedia/recipes-multimedia/libcamera/libcamera.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb
index 0b9f3f7a5d6..2d3f5e94937 100644
--- a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb
+++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb
@@ -12,13 +12,13 @@ SRC_URI = " \
        git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \
"

-SRCREV = "acf8d028edda0a59b10e15962c2606137a4940af"
+SRCREV = "ed591e705c451d0ce14988ae96829a31a2ae2f9a"

PV = "202105+git${SRCPV}"

S = "${WORKDIR}/git"

-DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls boost chrpath-native libevent"
+DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls boost chrpath-native libevent libyaml"

I believe boost can now be removed from these dependencies.

I’ve sent out an updated patch without boost. Please ignore this patch.

--
Kieran


DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}"

PACKAGES =+ "${PN}-gst"
-- 
2.37.3

Thanks,
Devendra


[meta-multimedia][PATCH] libcamera: Bump SRCREV and add libyaml to DEPENDS

Devendra Tewari
 

Remove boost from DEPENDS because it is no longer needed.

Signed-off-by: Devendra Tewari <devendra.tewari@...>
---
meta-multimedia/recipes-multimedia/libcamera/libcamera.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb
index 0b9f3f7a5d6..53cd94cbf0e 100644
--- a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb
+++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb
@@ -12,13 +12,13 @@ SRC_URI = " \
git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \
"

-SRCREV = "acf8d028edda0a59b10e15962c2606137a4940af"
+SRCREV = "ed591e705c451d0ce14988ae96829a31a2ae2f9a"

PV = "202105+git${SRCPV}"

S = "${WORKDIR}/git"

-DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls boost chrpath-native libevent"
+DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls chrpath-native libevent libyaml"
DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}"

PACKAGES =+ "${PN}-gst"
--
2.37.3


[meta-oe] [PATCH] freeglut: upgrade 3.2.1 -> 3.4.0

wangmy
 

Changelog:
=========
Add GLUT_ACTIVE_SUPER modifier, and corresponding GLUT_KEY_SUPER_L and GLUT_KEY_SUPER_R special keys.
Fix RGB mode (GLUT_RGBA) colors on 8bpp displays on windows (construct default RGB332 palette).
Fix indexed color context creation on X11 and windows (GLUT_INDEX).
Add missing colormap management functions for X11 and windows (glutSetColor, glutGetColor).
Fix crash when calling glutTimerFuncUcall.
Fix FreeBSD build by essentially disabling the joystick code for newer FreeBSD versions.
Add fallbacks for the old GLX (<1.3) context creation API (glXChooseVisual/glXCreateContext)
Add fallbacks for OpenGL 1.0 (no vertex arrays/client state).
Use nanosleep instead of usleep on UNIX, which is more widely supported on old UNIX systems.
Fix build on X11 if GL_SAMPLES is not defined.
Fix overly strict context version checking on Android leading to context creation failure in some cases.
Fix GLUT_CURSOR_INFO on windows, should be IDC_HAND, not IDC_HELP.
Fix mismatched font declarations on X11.
Add alternative simple ways to build freeglut with native tools only, without having to use cmake.
Fix build on windows with cmake 3.0.0. Explicitly link with gdi32.
Fix build on MSVC 2005.
Fix build on MacOS X. Link with all the necessary X libraries.
Fix build on SGI IRIX.
Fix build on Android (mismatched function prototypes and missing glutCreateMenuUcall).
Add support for the ninja multi-config generator.
Removed spurious dependency on a C++ compiler. One of the demos was being compiled as C++ for no reason.
Silence unnecessary warnings when VBOs or GLSL are not available.
New demo programs: 3dview, keyboard, joystick.
Documentation: added MacOS X build instructions.
Made it possible to eventually support building freeglut as a single compilation unit
Other minor fixes.

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../freeglut/{freeglut_3.2.1.bb => freeglut_3.4.0.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta-oe/recipes-graphics/freeglut/{freeglut_3.2.1.bb => freeglut_3.4.0.bb} (81%)

diff --git a/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb b/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb
similarity index 81%
rename from meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb
rename to meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb
index 6ef9f74c70..627ce23544 100644
--- a/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb
+++ b/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb
@@ -4,8 +4,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=89c0b58a3e01ce3d8254c9f59e78adfb"

SRC_URI = "https://sourceforge.net/projects/${BPN}/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "cd5c670c1086358598a6d4a9d166949d"
-SRC_URI[sha256sum] = "d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68"
+SRC_URI[sha256sum] = "3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec"

inherit cmake features_check

--
2.25.1


[meta-oe] [PATCH] dool: upgrade 1.0.0 -> 1.1.0

wangmy
 

Changelog:
========
Use unicode box drawing characters to make things look more modern
Add installation script
Make the output cleaner by using better ANSI line clearing options
Better compatibility on older versions of Python. Tested on Python 3.6
Memory calculation is now closer to free
Include "available" memory instead of "buffers"
Major README updates to help new users get started

Signed-off-by: Wang Mingyu <wangmy@...>
---
meta-oe/recipes-support/dool/{dool_1.0.0.bb => dool_1.1.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/dool/{dool_1.0.0.bb => dool_1.1.0.bb} (94%)

diff --git a/meta-oe/recipes-support/dool/dool_1.0.0.bb b/meta-oe/recipes-support/dool/dool_1.1.0.bb
similarity index 94%
rename from meta-oe/recipes-support/dool/dool_1.0.0.bb
rename to meta-oe/recipes-support/dool/dool_1.1.0.bb
index d34397c12a..dcb66c7fd4 100644
--- a/meta-oe/recipes-support/dool/dool_1.0.0.bb
+++ b/meta-oe/recipes-support/dool/dool_1.1.0.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=http
file://0001-Fix-build-error-as-following.patch \
"

-SRCREV = "34a3244b46aa70a31f871a7ca8ffa8d3a7b950d2"
+SRCREV = "41ec7b392b358dae29f0b587711d5c8f7f462805"

S = "${WORKDIR}/git"

--
2.25.1


[meta-oe] [PATCH] dnfdragora: upgrade 2.1.2 -> 2.1.3

wangmy
 

Changelog:
===========
This is a bug fixing release that contains the following changes

Changed widget weight to avoid wrong behavior and resizing limitations (see issue #206, issue #207 and libyui/libyui-gtk#83)
Added logging info if metadata have to be downloaded (expiration time).
Note that MetaData update_interval <= 0 means that tha check is disabled as well as if dnf-makecache.timer is enabled
Fixed clicking to the right of checkboxes wrong behaviour (issue #203)
Performed an "escape" on description text before showing it as package information (issue #191)

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../dnfdragora/{dnfdragora_2.1.2.bb => dnfdragora_2.1.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-graphics/dnfdragora/{dnfdragora_2.1.2.bb => dnfdragora_2.1.3.bb} (95%)

diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.2.bb b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.3.bb
similarity index 95%
rename from meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.2.bb
rename to meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.3.bb
index 671b8ca933..3a306ad951 100644
--- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.2.bb
+++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.3.bb
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/manatools/dnfdragora.git;branch=master;protocol=http
file://0001-To-fix-error-when-do_package.patch \
"

-SRCREV = "5cbbc07c9d015af284a424a172a379b385f05b6f"
+SRCREV = "5b0f4c38efb92c9dac1d39fade5b9a3c30f20ec4"

S = "${WORKDIR}/git"

--
2.25.1


[meta-oe] [PATCH] ctags: upgrade 5.9.20220925.0 -> 5.9.20221002.0

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../ctags/{ctags_5.9.20220925.0.bb => ctags_5.9.20221002.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-devtools/ctags/{ctags_5.9.20220925.0.bb => ctags_5.9.20221002.0.bb} (95%)

diff --git a/meta-oe/recipes-devtools/ctags/ctags_5.9.20220925.0.bb b/meta-oe/recipes-devtools/ctags/ctags_5.9.20221002.0.bb
similarity index 95%
rename from meta-oe/recipes-devtools/ctags/ctags_5.9.20220925.0.bb
rename to meta-oe/recipes-devtools/ctags/ctags_5.9.20221002.0.bb
index f5bacfd961..de9e6dbe6b 100644
--- a/meta-oe/recipes-devtools/ctags/ctags_5.9.20220925.0.bb
+++ b/meta-oe/recipes-devtools/ctags/ctags_5.9.20221002.0.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"

inherit autotools-brokensep pkgconfig manpages

-SRCREV = "299fe525048358ecdfecb9ca91505333c0fb14f4"
+SRCREV = "132379f59e223696f2382a84c2e12b6e7860a7ac"
SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https"

S = "${WORKDIR}/git"
--
2.25.1


[meta-networking][PATCH] strongswan: upgrade 5.9.7 -> 5.9.8

Yi Zhao
 

ChangeLog:
https://github.com/strongswan/strongswan/releases/tag/5.9.8

* Drop PACKAGECONFIG[scep] as scepclient has been removed.
* Add plugin-gcm to RDEPENDS as gcm plugin has been added to the default
plugins.

Signed-off-by: Yi Zhao <yi.zhao@...>
---
.../strongswan/{strongswan_5.9.7.bb => strongswan_5.9.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-support/strongswan/{strongswan_5.9.7.bb => strongswan_5.9.8.bb} (98%)

diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.8.bb
similarity index 98%
rename from meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
rename to meta-networking/recipes-support/strongswan/strongswan_5.9.8.bb
index 71ffb7ba4..266d43aa6 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.8.bb
@@ -11,7 +11,7 @@ DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss',
SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
"

-SRC_URI[sha256sum] = "9e64a2ba62efeac81abff1d962522404ebc6ed6c0d352a23ab7c0b2c639e3fcf"
+SRC_URI[sha256sum] = "d3303a43c0bd7b75a12b64855e8edcb53696f06190364f26d1533bde1f2e453c"

UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"

@@ -39,7 +39,6 @@ PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp"
PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap"
PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql"
PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl"
-PACKAGECONFIG[scep] = "--enable-scepclient,--disable-scepclient,"
PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup"
PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite"
PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke"
@@ -148,6 +147,7 @@ RDEPENDS:${PN} += "\
${PN}-plugin-dnskey \
${PN}-plugin-drbg \
${PN}-plugin-fips-prf \
+ ${PN}-plugin-gcm \
${PN}-plugin-hmac \
${PN}-plugin-kdf \
${PN}-plugin-kernel-netlink \
--
2.25.1


[meta-oe][PATCH] re2: fix branch name from master to main

Martin Jansa
 

re2 $ git branch -a --contains 166dbbeb3b0ab7e733b278e8f42a84f6882b8a25
* main
remotes/origin/HEAD -> origin/main
remotes/origin/main

Signed-off-by: Martin Jansa <Martin.Jansa@...>
---
meta-oe/recipes-support/re2/re2_2020.11.01.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/re2/re2_2020.11.01.bb b/meta-oe/recipes-support/re2/re2_2020.11.01.bb
index 698fe7e497..5ec1c6b5ab 100644
--- a/meta-oe/recipes-support/re2/re2_2020.11.01.bb
+++ b/meta-oe/recipes-support/re2/re2_2020.11.01.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760"

SRCREV = "166dbbeb3b0ab7e733b278e8f42a84f6882b8a25"

-SRC_URI = "git://github.com/google/re2.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https"

S = "${WORKDIR}/git"

--
2.38.0


[PATCH] [meta-oe] tio: correct license information

Michael Opdenacker
 

From: Michael Opdenacker <michael.opdenacker@...>

Source: https://github.com/tio/tio/blob/6618642acf28fec6d3e70ed75b50d4ce138ea08a/LICENSE
(corresponding to version 2.0, unchanged in latest master)

Signed-off-by: Michael Opdenacker <michael.opdenacker@...>
---
meta-oe/recipes-support/tio/tio_2.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/tio/tio_2.0.bb b/meta-oe/recipes-support/tio/tio_2.0.bb
index 3cc510081..54e448b6d 100644
--- a/meta-oe/recipes-support/tio/tio_2.0.bb
+++ b/meta-oe/recipes-support/tio/tio_2.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "tio is a simple serial device tool which features a \
straightforward command-line and configuration file interface to easily \
connect to serial TTY devices for basic I/O operations."

-LICENSE = "GPL-2.0-only"
+LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://LICENSE;md5=0e1a95b7892d3015ecd6d0016f601f2c"

SRC_URI = "git://github.com/tio/tio;protocol=https;nobranch=1"
--
2.34.1


Re: [OE-core][dunfell][PATCH] CVE-2021-3638 QEMU: ati-vga: inconsistent check in ati_2d_blt() may lead to out-of-bounds write

Steve Sakoman
 

Hi Vivek,

First of all, thanks for helping with CVEs!

Now for the feedback:

1. You sent this to the wrong list! It should be sent to
openembedded-core@...

2. A more standard subject/shortlog would be something like:
[OE-core][dunfell][PATCH] qemu: fix CVE-2021-3638
You give a detailed description in the commit message, so you just
need the top level info in the subject line. And it should always
start with the package/recipe name.

Thanks!

Steve

On Fri, Oct 7, 2022 at 2:32 AM vkumbhar <vkumbhar@...> wrote:

Source: https://lists.nongnu.org/archive/html/qemu-devel/2021-09/msg01682.html
MR: 116345
Type: Security Fix
Disposition: Backport from https://lists.nongnu.org/archive/html/qemu-devel/2021-09/msg01682.html
ChangeID: b3d3994010d6c7831db1c34a5a2f71923fcd157b
Description:
When building QEMU with DEBUG_ATI defined then running with
'-device ati-vga,romfile="" -d unimp,guest_errors -trace ati\*'
we get:

ati_mm_write 4 0x16c0 DP_CNTL <- 0x1
ati_mm_write 4 0x146c DP_GUI_MASTER_CNTL <- 0x2
ati_mm_write 4 0x16c8 DP_MIX <- 0xff0000
ati_mm_write 4 0x16c4 DP_DATATYPE <- 0x2
ati_mm_write 4 0x224 CRTC_OFFSET <- 0x0
ati_mm_write 4 0x142c DST_PITCH_OFFSET <- 0xfe00000
ati_mm_write 4 0x1420 DST_Y <- 0x3fff
ati_mm_write 4 0x1410 DST_HEIGHT <- 0x3fff
ati_mm_write 4 0x1588 DST_WIDTH_X <- 0x3fff3fff
ati_2d_blt: vram:0x7fff5fa00000 addr:0 ds:0x7fff61273800 stride:2560 bpp:32
rop:0xff
ati_2d_blt: 0 0 0, 0 127 0, (0,0) -> (16383,16383) 16383x16383 > ^
ati_2d_blt: pixman_fill(dst:0x7fff5fa00000, stride:254, bpp:8, x:16383,
y:16383, w:16383, h:16383, xor:0xff000000)
Thread 3 "qemu-system-i38" received signal SIGSEGV, Segmentation fault.
(gdb) bt
#0 0x00007ffff7f62ce0 in sse2_fill.lto_priv () at /lib64/libpixman-1.so.0
#1 0x00007ffff7f09278 in pixman_fill () at /lib64/libpixman-1.so.0
#2 0x0000555557b5a9af in ati_2d_blt (s=0x631000028800) at
hw/display/ati_2d.c:196
#3 0x0000555557b4b5a2 in ati_mm_write (opaque=0x631000028800, addr=5512,
data=1073692671, size=4) at hw/display/ati.c:843
#4 0x0000555558b90ec4 in memory_region_write_accessor (mr=0x631000039cc0,
addr=5512, ..., size=4, ...) at softmmu/memory.c:492

Commit 584acf34cb0 ("ati-vga: Fix reverse bit blts") introduced
the local dst_x and dst_y which adjust the (x, y) coordinates
depending on the direction in the SRCCOPY ROP3 operation, but
forgot to address the same issue for the PATCOPY, BLACKNESS and
WHITENESS operations, which also call pixman_fill().

Fix that now by using the adjusted coordinates in the pixman_fill
call, and update the related debug printf().

Signed-off-by: Vivek Kumbhar <vkumbhar@...>
---
meta/recipes-devtools/qemu/qemu.inc | 1 +
.../qemu/qemu/0001-CVE-2021-3638.patch | 42 +++++++++++++++++++
2 files changed, 43 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/0001-CVE-2021-3638.patch

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 7a963ad57c..b9ac4c663c 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -52,6 +52,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2019-20175.patch \
file://CVE-2020-24352.patch \
file://CVE-2020-25723.patch \
+ file://0001-CVE-2021-3638.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"

diff --git a/meta/recipes-devtools/qemu/qemu/0001-CVE-2021-3638.patch b/meta/recipes-devtools/qemu/qemu/0001-CVE-2021-3638.patch
new file mode 100644
index 0000000000..c4be2b0d33
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-CVE-2021-3638.patch
@@ -0,0 +1,42 @@
+From a4f43e9d91e4dbfab407d9ca10932c9c490b32a9 Mon Sep 17 00:00:00 2001
+From: Vivek Kumbhar <vkumbhar@...>
+Date: Fri, 7 Oct 2022 05:19:08 +0000
+Subject: [PATCH] CVE-2021-3638
+
+Upstream-Status: Inappropriate[https://lists.nongnu.org/archive/html/qemu-devel/2021-09/msg01682.html]
+CVE: CVE-2021-3638
+Signed-off-by: Vivek Kumbhar <vkumbhar@...>
+---
+ hw/display/ati_2d.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c
+index 23a8ae0c..395b523b 100644
+--- a/hw/display/ati_2d.c
++++ b/hw/display/ati_2d.c
+@@ -83,7 +83,7 @@ void ati_2d_blt(ATIVGAState *s)
+ DPRINTF("%d %d %d, %d %d %d, (%d,%d) -> (%d,%d) %dx%d %c %c\n",
+ s->regs.src_offset, s->regs.dst_offset, s->regs.default_offset,
+ s->regs.src_pitch, s->regs.dst_pitch, s->regs.default_pitch,
+- s->regs.src_x, s->regs.src_y, s->regs.dst_x, s->regs.dst_y,
++ s->regs.src_x, s->regs.src_y, dst_x, dst_y,
+ s->regs.dst_width, s->regs.dst_height,
+ (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ? '>' : '<'),
+ (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? 'v' : '^'));
+@@ -178,11 +178,11 @@ void ati_2d_blt(ATIVGAState *s)
+ dst_stride /= sizeof(uint32_t);
+ DPRINTF("pixman_fill(%p, %d, %d, %d, %d, %d, %d, %x)\n",
+ dst_bits, dst_stride, bpp,
+- s->regs.dst_x, s->regs.dst_y,
++ dst_x, dst_y,
+ s->regs.dst_width, s->regs.dst_height,
+ filler);
+ pixman_fill((uint32_t *)dst_bits, dst_stride, bpp,
+- s->regs.dst_x, s->regs.dst_y,
++ dst_x, dst_y,
+ s->regs.dst_width, s->regs.dst_height,
+ filler);
+ if (dst_bits >= s->vga.vram_ptr + s->vga.vbe_start_addr &&
+--
+2.18.2
+
--
2.18.2




[OE-core][dunfell][PATCH] CVE-2021-3638 QEMU: ati-vga: inconsistent check in ati_2d_blt() may lead to out-of-bounds write

vkumbhar <vkumbhar@...>
 

Source: https://lists.nongnu.org/archive/html/qemu-devel/2021-09/msg01682.html
MR: 116345
Type: Security Fix
Disposition: Backport from https://lists.nongnu.org/archive/html/qemu-devel/2021-09/msg01682.html
ChangeID: b3d3994010d6c7831db1c34a5a2f71923fcd157b
Description:
When building QEMU with DEBUG_ATI defined then running with
'-device ati-vga,romfile="" -d unimp,guest_errors -trace ati\*'
we get:

ati_mm_write 4 0x16c0 DP_CNTL <- 0x1
ati_mm_write 4 0x146c DP_GUI_MASTER_CNTL <- 0x2
ati_mm_write 4 0x16c8 DP_MIX <- 0xff0000
ati_mm_write 4 0x16c4 DP_DATATYPE <- 0x2
ati_mm_write 4 0x224 CRTC_OFFSET <- 0x0
ati_mm_write 4 0x142c DST_PITCH_OFFSET <- 0xfe00000
ati_mm_write 4 0x1420 DST_Y <- 0x3fff
ati_mm_write 4 0x1410 DST_HEIGHT <- 0x3fff
ati_mm_write 4 0x1588 DST_WIDTH_X <- 0x3fff3fff
ati_2d_blt: vram:0x7fff5fa00000 addr:0 ds:0x7fff61273800 stride:2560 bpp:32
rop:0xff
ati_2d_blt: 0 0 0, 0 127 0, (0,0) -> (16383,16383) 16383x16383 > ^
ati_2d_blt: pixman_fill(dst:0x7fff5fa00000, stride:254, bpp:8, x:16383,
y:16383, w:16383, h:16383, xor:0xff000000)
Thread 3 "qemu-system-i38" received signal SIGSEGV, Segmentation fault.
(gdb) bt
#0 0x00007ffff7f62ce0 in sse2_fill.lto_priv () at /lib64/libpixman-1.so.0
#1 0x00007ffff7f09278 in pixman_fill () at /lib64/libpixman-1.so.0
#2 0x0000555557b5a9af in ati_2d_blt (s=0x631000028800) at
hw/display/ati_2d.c:196
#3 0x0000555557b4b5a2 in ati_mm_write (opaque=0x631000028800, addr=5512,
data=1073692671, size=4) at hw/display/ati.c:843
#4 0x0000555558b90ec4 in memory_region_write_accessor (mr=0x631000039cc0,
addr=5512, ..., size=4, ...) at softmmu/memory.c:492

Commit 584acf34cb0 ("ati-vga: Fix reverse bit blts") introduced
the local dst_x and dst_y which adjust the (x, y) coordinates
depending on the direction in the SRCCOPY ROP3 operation, but
forgot to address the same issue for the PATCOPY, BLACKNESS and
WHITENESS operations, which also call pixman_fill().

Fix that now by using the adjusted coordinates in the pixman_fill
call, and update the related debug printf().

Signed-off-by: Vivek Kumbhar <vkumbhar@...>
---
meta/recipes-devtools/qemu/qemu.inc | 1 +
.../qemu/qemu/0001-CVE-2021-3638.patch | 42 +++++++++++++++++++
2 files changed, 43 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/0001-CVE-2021-3638.patch

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 7a963ad57c..b9ac4c663c 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -52,6 +52,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2019-20175.patch \
file://CVE-2020-24352.patch \
file://CVE-2020-25723.patch \
+ file://0001-CVE-2021-3638.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"

diff --git a/meta/recipes-devtools/qemu/qemu/0001-CVE-2021-3638.patch b/meta/recipes-devtools/qemu/qemu/0001-CVE-2021-3638.patch
new file mode 100644
index 0000000000..c4be2b0d33
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-CVE-2021-3638.patch
@@ -0,0 +1,42 @@
+From a4f43e9d91e4dbfab407d9ca10932c9c490b32a9 Mon Sep 17 00:00:00 2001
+From: Vivek Kumbhar <vkumbhar@...>
+Date: Fri, 7 Oct 2022 05:19:08 +0000
+Subject: [PATCH] CVE-2021-3638
+
+Upstream-Status: Inappropriate[https://lists.nongnu.org/archive/html/qemu-devel/2021-09/msg01682.html]
+CVE: CVE-2021-3638
+Signed-off-by: Vivek Kumbhar <vkumbhar@...>
+---
+ hw/display/ati_2d.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c
+index 23a8ae0c..395b523b 100644
+--- a/hw/display/ati_2d.c
++++ b/hw/display/ati_2d.c
+@@ -83,7 +83,7 @@ void ati_2d_blt(ATIVGAState *s)
+ DPRINTF("%d %d %d, %d %d %d, (%d,%d) -> (%d,%d) %dx%d %c %c\n",
+ s->regs.src_offset, s->regs.dst_offset, s->regs.default_offset,
+ s->regs.src_pitch, s->regs.dst_pitch, s->regs.default_pitch,
+- s->regs.src_x, s->regs.src_y, s->regs.dst_x, s->regs.dst_y,
++ s->regs.src_x, s->regs.src_y, dst_x, dst_y,
+ s->regs.dst_width, s->regs.dst_height,
+ (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ? '>' : '<'),
+ (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ? 'v' : '^'));
+@@ -178,11 +178,11 @@ void ati_2d_blt(ATIVGAState *s)
+ dst_stride /= sizeof(uint32_t);
+ DPRINTF("pixman_fill(%p, %d, %d, %d, %d, %d, %d, %x)\n",
+ dst_bits, dst_stride, bpp,
+- s->regs.dst_x, s->regs.dst_y,
++ dst_x, dst_y,
+ s->regs.dst_width, s->regs.dst_height,
+ filler);
+ pixman_fill((uint32_t *)dst_bits, dst_stride, bpp,
+- s->regs.dst_x, s->regs.dst_y,
++ dst_x, dst_y,
+ s->regs.dst_width, s->regs.dst_height,
+ filler);
+ if (dst_bits >= s->vga.vram_ptr + s->vga.vbe_start_addr &&
+--
+2.18.2
+
--
2.18.2


[meta-python][PATCH 2/2] python3-imageio: Upgrade 2.22.0 -> 2.22.1

Leon Anavi
 

Upgrade to release 2.22.1:

- Raise ImportError when iio-ffmpeg is missing
- EXR spec
- Remove stale funding platform

Signed-off-by: Leon Anavi <leon.anavi@...>
---
.../{python3-imageio_2.22.0.bb => python3-imageio_2.22.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-imageio_2.22.0.bb => python3-imageio_2.22.1.bb} (81%)

diff --git a/meta-python/recipes-devtools/python/python3-imageio_2.22.0.bb b/meta-python/recipes-devtools/python/python3-imageio_2.22.1.bb
similarity index 81%
rename from meta-python/recipes-devtools/python/python3-imageio_2.22.0.bb
rename to meta-python/recipes-devtools/python/python3-imageio_2.22.1.bb
index 6bc7b60f9..9e187bb13 100644
--- a/meta-python/recipes-devtools/python/python3-imageio_2.22.0.bb
+++ b/meta-python/recipes-devtools/python/python3-imageio_2.22.1.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=24cb9a367a9e641b459a01c4d15256ba"

-SRC_URI[sha256sum] = "a332d127ec387b2d3dca967fd065a90f1c1a4ba2343570b03fe2cebb6ed064ea"
+SRC_URI[sha256sum] = "465ec35f919d538906d3023b61ccec766d8e7575fe55fcbd7669ece55afb97ca"

inherit pypi setuptools3

--
2.30.2


[meta-python][PATCH 1/2] python3-tabulate: Upgrade 0.8.10 -> 0.9.0

Leon Anavi
 

Upgrade to release 0.9.0:

- Migrate to pyproject.toml project layout (PEP 621).
- New output formats: `asciidoc`, various `*grid` and `*outline`
formats.
- New output features: vertical row alignment, separating lines.
- New input format: list of dataclasses (Python 3.7 or later).
- Support infinite iterables as row indices.
- Improve column width options.
- Improve support for ANSI escape sequences and document the
behavior.
- Various bug fixes.

Signed-off-by: Leon Anavi <leon.anavi@...>
---
.../python/python3-tabulate_0.8.10.bb | 8 -------
.../python/python3-tabulate_0.9.0.bb | 21 +++++++++++++++++++
2 files changed, 21 insertions(+), 8 deletions(-)
delete mode 100644 meta-python/recipes-devtools/python/python3-tabulate_0.8.10.bb
create mode 100644 meta-python/recipes-devtools/python/python3-tabulate_0.9.0.bb

diff --git a/meta-python/recipes-devtools/python/python3-tabulate_0.8.10.bb b/meta-python/recipes-devtools/python/python3-tabulate_0.8.10.bb
deleted file mode 100644
index 222e6e7bb..000000000
--- a/meta-python/recipes-devtools/python/python3-tabulate_0.8.10.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-SUMMARY = "Pretty-print tabular data"
-HOMEPAGE = "https://github.com/astanin/python-tabulate"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6ad1430c0c4824ec6a5dbb9754b011d7"
-
-SRC_URI[sha256sum] = "6c57f3f3dd7ac2782770155f3adb2db0b1a269637e42f27599925e64b114f519"
-
-inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-tabulate_0.9.0.bb b/meta-python/recipes-devtools/python/python3-tabulate_0.9.0.bb
new file mode 100644
index 000000000..a25a1c66d
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-tabulate_0.9.0.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Pretty-print tabular data"
+HOMEPAGE = "https://github.com/astanin/python-tabulate"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6ad1430c0c4824ec6a5dbb9754b011d7"
+
+SRC_URI[sha256sum] = "0095b12bf5966de529c0feb1fa08671671b3368eec77d7ef7ab114be2c068b3c"
+
+inherit pypi python_setuptools_build_meta
+
+DEPENDS += " \
+ ${PYTHON_PN}-setuptools-scm-native \
+ ${PYTHON_PN}-toml-native \
+"
+
+RDEPENDS:${PN} += " \
+ ${PYTHON_PN}-html \
+ ${PYTHON_PN}-core \
+ ${PYTHON_PN}-io \
+ ${PYTHON_PN}-math \
+ ${PYTHON_PN}-profile \
+"
--
2.30.2


Re: [PATCH] opencv: fix reproducibility issues

Anuj Mittal
 

On Thu, 2022-10-06 at 11:30 -0700, Khem Raj wrote:
btw. I do see a QA warning, perhaps its not related to your change
but
I thought it would be good to check

https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/2082/steps/14/logs/warnings
Yes, there were ~30 of them earlier I think. This change fixes most of
them except this. I will send a separate change later to fix this last
one as well.

Thanks,

Anuj


On Thu, Oct 6, 2022 at 1:40 AM Anuj Mittal <anuj.mittal@...>
wrote:

Download and unpack contrib modules and other repositories in S
instead
of WORKDIR so they don't escape file-prefix-map substitutions.

Fixes a number of reproducibility problems because of OpenCV check
macros that were embedding path to files in contrib/.

Signed-off-by: Anuj Mittal <anuj.mittal@...>
---
 .../recipes-support/opencv/opencv_4.6.0.bb    | 30 +++++++++------
----
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb b/meta-
oe/recipes-support/opencv/opencv_4.6.0.bb
index f6c10054c..da1e659a4 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.6.0.bb
@@ -39,12 +39,12 @@ IPP_MD5 = "${@ipp_md5sum(d)}"

 SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg"
 SRC_URI =
"git://github.com/opencv/opencv.git;name=opencv;branch=master;proto
col=https \
-          
git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=
contrib;branch=master;protocol=https \
-          
git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20
191018;destsuffix=ipp;name=ipp;protocol=https \
-          
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeature
s2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc;protocol
=https \
-          
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeature
s2d_vgg_20160317;destsuffix=vgg;name=vgg;protocol=https \
-          
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_ali
gnment_20170818;destsuffix=face;name=face;protocol=https \
-          
git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;
destsuffix=wechat_qrcode;name=wechat-qrcode;protocol=https \
+          
git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;n
ame=contrib;branch=master;protocol=https \
+          
git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20
191018;destsuffix=git/ipp;name=ipp;protocol=https \
+          
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeature
s2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;prot
ocol=https \
+          
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeature
s2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \
+          
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_ali
gnment_20170818;destsuffix=git/face;name=face;protocol=https \
+          
git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;
destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \
           
file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
            file://0003-To-fix-errors-as-following.patch \
           
file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch
 \
@@ -52,7 +52,7 @@ SRC_URI =
"git://github.com/opencv/opencv.git;name=opencv;branch=master;proto
col
            file://download.patch \
            file://0001-Make-ts-module-external.patch \
            "
-SRC_URI:append:riscv64 = "
file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib
"
+SRC_URI:append:riscv64 = "
file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"

 S = "${WORKDIR}/git"

@@ -61,7 +61,7 @@ S = "${WORKDIR}/git"
 OPENCV_DLDIR = "${WORKDIR}/downloads"

 do_unpack_extra() {
-    tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR}
+    tar xzf ${S}/ipp/ippicv/${IPP_FILENAME} -C ${S}

     md5() {
         # Return the MD5 of $1
@@ -76,22 +76,22 @@ do_unpack_extra() {
             test -e $DEST || ln -s $F $DEST
         done
     }
-    cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
-    cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
-    cache data ${WORKDIR}/face/*.dat
-    cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.caffemodel
-    cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.prototxt
+    cache xfeatures2d/boostdesc ${S}/boostdesc/*.i
+    cache xfeatures2d/vgg ${S}/vgg/*.i
+    cache data ${S}/face/*.dat
+    cache wechat_qrcode ${S}/wechat_qrcode/*.caffemodel
+    cache wechat_qrcode ${S}/wechat_qrcode/*.prototxt
 }
 addtask unpack_extra after do_unpack before do_patch

 CMAKE_VERBOSE = "VERBOSE=1"

-EXTRA_OECMAKE = "-
DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
+EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules
\
     -DWITH_1394=OFF \
     -DENABLE_PRECOMPILED_HEADERS=OFF \
     -DCMAKE_SKIP_RPATH=ON \
     -DOPENCV_ICV_HASH=${IPP_MD5} \
-    -DIPPROOT=${WORKDIR}/ippicv_lnx \
+    -DIPPROOT=${S}/ippicv_lnx \
     -DOPENCV_GENERATE_PKGCONFIG=ON \
     -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
     -DOPENCV_ALLOW_DOWNLOADS=OFF \
--
2.37.3




[meta-multimedia][PATCH] x265: support aarch64

S. Lockwood-Childs
 

If PIC is turned on, x265 works on aarch64.

Signed-off-by: S. Lockwood-Childs <sjl@...>
---
meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
index c36619b81..d786afe81 100644
--- a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
+++ b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
@@ -18,7 +18,8 @@ SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b5
inherit lib_package pkgconfig cmake

EXTRA_OECMAKE:append:x86 = " -DENABLE_ASSEMBLY=OFF"
+EXTRA_OECMAKE:append:aarch64 = " -DENABLE_PIC=ON"

AS[unexport] = "1"

-COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
+COMPATIBLE_HOST = '(x86_64|i.86|aarch64).*-linux'
--
2.34.1


Re: [PATCH] opencv: fix reproducibility issues

Khem Raj
 

btw. I do see a QA warning, perhaps its not related to your change but
I thought it would be good to check

https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/2082/steps/14/logs/warnings

On Thu, Oct 6, 2022 at 1:40 AM Anuj Mittal <anuj.mittal@...> wrote:

Download and unpack contrib modules and other repositories in S instead
of WORKDIR so they don't escape file-prefix-map substitutions.

Fixes a number of reproducibility problems because of OpenCV check
macros that were embedding path to files in contrib/.

Signed-off-by: Anuj Mittal <anuj.mittal@...>
---
.../recipes-support/opencv/opencv_4.6.0.bb | 30 +++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb b/meta-oe/recipes-support/opencv/opencv_4.6.0.bb
index f6c10054c..da1e659a4 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.6.0.bb
@@ -39,12 +39,12 @@ IPP_MD5 = "${@ipp_md5sum(d)}"

SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg"
SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \
- git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib;branch=master;protocol=https \
- git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp;protocol=https \
- git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc;protocol=https \
- git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg;protocol=https \
- git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face;protocol=https \
- git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode;protocol=https \
+ git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=master;protocol=https \
+ git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=git/ipp;name=ipp;protocol=https \
+ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \
+ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \
+ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \
+ git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \
file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
file://0003-To-fix-errors-as-following.patch \
file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
@@ -52,7 +52,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol
file://download.patch \
file://0001-Make-ts-module-external.patch \
"
-SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib"
+SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"

S = "${WORKDIR}/git"

@@ -61,7 +61,7 @@ S = "${WORKDIR}/git"
OPENCV_DLDIR = "${WORKDIR}/downloads"

do_unpack_extra() {
- tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR}
+ tar xzf ${S}/ipp/ippicv/${IPP_FILENAME} -C ${S}

md5() {
# Return the MD5 of $1
@@ -76,22 +76,22 @@ do_unpack_extra() {
test -e $DEST || ln -s $F $DEST
done
}
- cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
- cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
- cache data ${WORKDIR}/face/*.dat
- cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.caffemodel
- cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.prototxt
+ cache xfeatures2d/boostdesc ${S}/boostdesc/*.i
+ cache xfeatures2d/vgg ${S}/vgg/*.i
+ cache data ${S}/face/*.dat
+ cache wechat_qrcode ${S}/wechat_qrcode/*.caffemodel
+ cache wechat_qrcode ${S}/wechat_qrcode/*.prototxt
}
addtask unpack_extra after do_unpack before do_patch

CMAKE_VERBOSE = "VERBOSE=1"

-EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
+EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \
-DWITH_1394=OFF \
-DENABLE_PRECOMPILED_HEADERS=OFF \
-DCMAKE_SKIP_RPATH=ON \
-DOPENCV_ICV_HASH=${IPP_MD5} \
- -DIPPROOT=${WORKDIR}/ippicv_lnx \
+ -DIPPROOT=${S}/ippicv_lnx \
-DOPENCV_GENERATE_PKGCONFIG=ON \
-DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
-DOPENCV_ALLOW_DOWNLOADS=OFF \
--
2.37.3