* [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
@ 2020-02-19 19:47 ` Alexander Kanavin
2020-02-23 13:02 ` Adrian Bunk
2020-02-19 19:47 ` [PATCH 03/13] webkitgtk: unbreak wayland build Alexander Kanavin
` (10 subsequent siblings)
11 siblings, 1 reply; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-19 19:47 UTC (permalink / raw)
To: openembedded-core
Also enabling wayland if x11 is not enabled is not necessarily
the correct decision.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
index 3eb27a1550..153bc8db11 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
@@ -38,7 +38,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \
gettext-native glib-2.0 glib-2.0-native libtasn1 \
"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \
enchant \
libsecret \
--
2.25.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive
2020-02-19 19:47 ` [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive Alexander Kanavin
@ 2020-02-23 13:02 ` Adrian Bunk
2020-02-23 13:05 ` Alexander Kanavin
0 siblings, 1 reply; 21+ messages in thread
From: Adrian Bunk @ 2020-02-23 13:02 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: openembedded-core
On Wed, Feb 19, 2020 at 08:47:41PM +0100, Alexander Kanavin wrote:
> Also enabling wayland if x11 is not enabled is not necessarily
> the correct decision.
>...
> -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
> ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \
>...
Not a new issue, but I guess something should change regarding the
REQUIRED_DISTRO_FEATURES = "x11 opengl"
cu
Adrian
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive
2020-02-23 13:02 ` Adrian Bunk
@ 2020-02-23 13:05 ` Alexander Kanavin
2020-02-23 14:38 ` Adrian Bunk
0 siblings, 1 reply; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-23 13:05 UTC (permalink / raw)
To: Adrian Bunk; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 761 bytes --]
Right, I think this line can be simply dropped. Care to make a patch?
Alex
On Sun, 23 Feb 2020 at 14:02, Adrian Bunk <bunk@stusta.de> wrote:
> On Wed, Feb 19, 2020 at 08:47:41PM +0100, Alexander Kanavin wrote:
> > Also enabling wayland if x11 is not enabled is not necessarily
> > the correct decision.
> >...
> > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11',
> 'x11', 'wayland' ,d)} \
> > +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11',
> d)} \
> > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
> 'webgl opengl', '' ,d)} \
> >...
>
> Not a new issue, but I guess something should change regarding the
> REQUIRED_DISTRO_FEATURES = "x11 opengl"
>
> cu
> Adrian
>
[-- Attachment #2: Type: text/html, Size: 1219 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 03/13] webkitgtk: unbreak wayland build
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
2020-02-19 19:47 ` [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive Alexander Kanavin
@ 2020-02-19 19:47 ` Alexander Kanavin
2020-02-19 23:52 ` Richard Purdie
2020-02-19 19:47 ` [PATCH 04/13] wayland: convert to meson build Alexander Kanavin
` (9 subsequent siblings)
11 siblings, 1 reply; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-19 19:47 UTC (permalink / raw)
To: openembedded-core
webkit nowadays requires a couple of supplementary libraries for this,
so bring them in (courtesy of meta-webkit[1], which will hopefully
adjust without a lot of trouble).
[1] https://github.com/Igalia/meta-webkit/
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-sato/webkit/libwpe_1.4.0.1.bb | 15 +++++++++++++++
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +-
meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb | 15 +++++++++++++++
3 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
create mode 100644 meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
new file mode 100644
index 0000000000..346ca9b1d8
--- /dev/null
+++ b/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
@@ -0,0 +1,15 @@
+SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit."
+HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe"
+BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
+DEPENDS = "virtual/egl libxkbcommon"
+
+# Workaround build issue with RPi userland EGL libraries.
+CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}"
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b"
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
index 153bc8db11..585723772e 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
@@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
libsecret \
"
-PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland"
+PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"
PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
new file mode 100644
index 0000000000..7db5806d9d
--- /dev/null
+++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
@@ -0,0 +1,15 @@
+SUMMARY = "WPE's backend based on a freedesktop.org stack."
+HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo"
+BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66"
+DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe"
+
+DEPENDS_append_class-target = " wayland-native"
+
+inherit cmake
+
+SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d"
+
--
2.25.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 04/13] wayland: convert to meson build
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
2020-02-19 19:47 ` [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive Alexander Kanavin
2020-02-19 19:47 ` [PATCH 03/13] webkitgtk: unbreak wayland build Alexander Kanavin
@ 2020-02-19 19:47 ` Alexander Kanavin
2020-02-20 16:21 ` Joshua Watt
2020-02-19 19:47 ` [PATCH 05/13] weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines Alexander Kanavin
` (8 subsequent siblings)
11 siblings, 1 reply; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-19 19:47 UTC (permalink / raw)
To: openembedded-core
Replace an autotools-specific .pc adjustment patch with a meson-specific one.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...hardcode-the-path-to-wayland-scanner.patch | 26 +++++++++++++++
...-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++
.../wayland/wayland/fixpathinpcfiles.patch | 32 -------------------
.../wayland/wayland_1.18.0.bb | 11 ++++---
4 files changed, 59 insertions(+), 37 deletions(-)
create mode 100644 meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch
create mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
delete mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch
new file mode 100644
index 0000000000..2199548bdf
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch
@@ -0,0 +1,26 @@
+From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Mon, 17 Feb 2020 21:46:18 +0100
+Subject: [PATCH] Do not hardcode the path to wayland-scanner
+
+This results in host contamination during builds.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ src/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 294aee0..7e410fa 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -49,7 +49,7 @@ pkgconfig.generate(
+ 'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
+ 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()),
+ 'bindir=' + join_paths('${prefix}', get_option('bindir')),
+- 'wayland_scanner=${bindir}/wayland-scanner'
++ 'wayland_scanner=wayland-scanner'
+ ],
+ filebase: 'wayland-scanner'
+ )
diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
new file mode 100644
index 0000000000..f98037a850
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
@@ -0,0 +1,27 @@
+From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Sun, 16 Feb 2020 16:29:53 +0100
+Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH
+
+Otherwise, meson attempts to use the target pkg-config and fails.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ src/meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 3e8c9bf..294aee0 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -55,8 +55,7 @@ pkgconfig.generate(
+ )
+
+ if meson.is_cross_build()
+- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0')
+- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
++ wayland_scanner_for_build = find_program('wayland-scanner')
+ else
+ wayland_scanner_for_build = wayland_scanner
+ endif
diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
deleted file mode 100644
index ad3526d984..0000000000
--- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix wayland-client and wayland-scanner pc files
-
-Upstream-Status: Pending
-
-Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
-
-Index: wayland-1.14.0/src/wayland-client.pc.in
-===================================================================
---- wayland-1.14.0.orig/src/wayland-client.pc.in
-+++ wayland-1.14.0/src/wayland-client.pc.in
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- datarootdir=@datarootdir@
--pkgdatadir=@datadir@/@PACKAGE@
-+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
- libdir=@libdir@
- includedir=@includedir@
-
-Index: wayland-1.14.0/src/wayland-scanner.pc.in
-===================================================================
---- wayland-1.14.0.orig/src/wayland-scanner.pc.in
-+++ wayland-1.14.0/src/wayland-scanner.pc.in
-@@ -2,7 +2,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- datarootdir=@datarootdir@
- pkgdatadir=@datadir@/@PACKAGE@
--wayland_scanner=@bindir@/wayland-scanner
-+wayland_scanner=wayland-scanner
-
- Name: Wayland Scanner
- Description: Wayland scanner
diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
index 7a3f075552..a702b3f6cc 100644
--- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
@@ -13,20 +13,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
DEPENDS = "expat libffi wayland-native"
SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
- file://fixpathinpcfiles.patch \
+ file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \
+ file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \
"
SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65"
SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d"
UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
-inherit autotools pkgconfig
+inherit meson pkgconfig
PACKAGECONFIG ??= "dtd-validation"
-PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,,"
+PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,,"
-EXTRA_OECONF = "--disable-documentation --with-host-scanner"
-EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"
+EXTRA_OEMESON = "-Ddocumentation=false"
+EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false"
# Wayland installs a M4 macro for other projects to use, which uses the target
# pkg-config to find files. Replace pkg-config with pkg-config-native.
--
2.25.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 04/13] wayland: convert to meson build
2020-02-19 19:47 ` [PATCH 04/13] wayland: convert to meson build Alexander Kanavin
@ 2020-02-20 16:21 ` Joshua Watt
2020-02-20 16:38 ` Alexander Kanavin
0 siblings, 1 reply; 21+ messages in thread
From: Joshua Watt @ 2020-02-20 16:21 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
On Wed, Feb 19, 2020 at 1:49 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Replace an autotools-specific .pc adjustment patch with a meson-specific one.
This can (and did) break meta-mingw in the autobuilder, but I pushed
the fix to master-next of meta-mingw
(https://git.yoctoproject.org/cgit/cgit.cgi/meta-mingw/commit/?h=master-next&id=32ccf9d5089694e4a58951ca1a38452f889a27ef),
so that can be pulled in to try again
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> ...hardcode-the-path-to-wayland-scanner.patch | 26 +++++++++++++++
> ...-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++
> .../wayland/wayland/fixpathinpcfiles.patch | 32 -------------------
> .../wayland/wayland_1.18.0.bb | 11 ++++---
> 4 files changed, 59 insertions(+), 37 deletions(-)
> create mode 100644 meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch
> create mode 100644 meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
> delete mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
>
> diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch
> new file mode 100644
> index 0000000000..2199548bdf
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch
> @@ -0,0 +1,26 @@
> +From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Mon, 17 Feb 2020 21:46:18 +0100
> +Subject: [PATCH] Do not hardcode the path to wayland-scanner
> +
> +This results in host contamination during builds.
> +
> +Upstream-Status: Inappropriate [oe-core specific]
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +---
> + src/meson.build | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/meson.build b/src/meson.build
> +index 294aee0..7e410fa 100644
> +--- a/src/meson.build
> ++++ b/src/meson.build
> +@@ -49,7 +49,7 @@ pkgconfig.generate(
> + 'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
> + 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()),
> + 'bindir=' + join_paths('${prefix}', get_option('bindir')),
> +- 'wayland_scanner=${bindir}/wayland-scanner'
> ++ 'wayland_scanner=wayland-scanner'
> + ],
> + filebase: 'wayland-scanner'
> + )
> diff --git a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
> new file mode 100644
> index 0000000000..f98037a850
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
> @@ -0,0 +1,27 @@
> +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Sun, 16 Feb 2020 16:29:53 +0100
> +Subject: [PATCH] meson.build: find the native wayland-scanner directly in PATH
> +
> +Otherwise, meson attempts to use the target pkg-config and fails.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +---
> + src/meson.build | 3 +--
> + 1 file changed, 1 insertion(+), 2 deletions(-)
> +
> +diff --git a/src/meson.build b/src/meson.build
> +index 3e8c9bf..294aee0 100644
> +--- a/src/meson.build
> ++++ b/src/meson.build
> +@@ -55,8 +55,7 @@ pkgconfig.generate(
> + )
> +
> + if meson.is_cross_build()
> +- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0')
> +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
> ++ wayland_scanner_for_build = find_program('wayland-scanner')
> + else
> + wayland_scanner_for_build = wayland_scanner
> + endif
> diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
> deleted file mode 100644
> index ad3526d984..0000000000
> --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -Fix wayland-client and wayland-scanner pc files
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
> -
> -Index: wayland-1.14.0/src/wayland-client.pc.in
> -===================================================================
> ---- wayland-1.14.0.orig/src/wayland-client.pc.in
> -+++ wayland-1.14.0/src/wayland-client.pc.in
> -@@ -1,7 +1,7 @@
> - prefix=@prefix@
> - exec_prefix=@exec_prefix@
> - datarootdir=@datarootdir@
> --pkgdatadir=@datadir@/@PACKAGE@
> -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
> - libdir=@libdir@
> - includedir=@includedir@
> -
> -Index: wayland-1.14.0/src/wayland-scanner.pc.in
> -===================================================================
> ---- wayland-1.14.0.orig/src/wayland-scanner.pc.in
> -+++ wayland-1.14.0/src/wayland-scanner.pc.in
> -@@ -2,7 +2,7 @@ prefix=@prefix@
> - exec_prefix=@exec_prefix@
> - datarootdir=@datarootdir@
> - pkgdatadir=@datadir@/@PACKAGE@
> --wayland_scanner=@bindir@/wayland-scanner
> -+wayland_scanner=wayland-scanner
> -
> - Name: Wayland Scanner
> - Description: Wayland scanner
> diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
> index 7a3f075552..a702b3f6cc 100644
> --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb
> +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
> @@ -13,20 +13,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
> DEPENDS = "expat libffi wayland-native"
>
> SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
> - file://fixpathinpcfiles.patch \
> + file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \
> + file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \
> "
> SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65"
> SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d"
>
> UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
>
> -inherit autotools pkgconfig
> +inherit meson pkgconfig
>
> PACKAGECONFIG ??= "dtd-validation"
> -PACKAGECONFIG[dtd-validation] = "--enable-dtd-validation,--disable-dtd-validation,libxml2,,"
> +PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,,"
>
> -EXTRA_OECONF = "--disable-documentation --with-host-scanner"
> -EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"
> +EXTRA_OEMESON = "-Ddocumentation=false"
> +EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false"
>
> # Wayland installs a M4 macro for other projects to use, which uses the target
> # pkg-config to find files. Replace pkg-config with pkg-config-native.
> --
> 2.25.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 04/13] wayland: convert to meson build
2020-02-20 16:21 ` Joshua Watt
@ 2020-02-20 16:38 ` Alexander Kanavin
0 siblings, 0 replies; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-20 16:38 UTC (permalink / raw)
To: Joshua Watt; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 8060 bytes --]
Thanks for looking into it :)
Alex
On Thu, 20 Feb 2020 at 17:21, Joshua Watt <jpewhacker@gmail.com> wrote:
> On Wed, Feb 19, 2020 at 1:49 PM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > Replace an autotools-specific .pc adjustment patch with a meson-specific
> one.
>
> This can (and did) break meta-mingw in the autobuilder, but I pushed
> the fix to master-next of meta-mingw
> (
> https://git.yoctoproject.org/cgit/cgit.cgi/meta-mingw/commit/?h=master-next&id=32ccf9d5089694e4a58951ca1a38452f889a27ef
> ),
> so that can be pulled in to try again
>
> >
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> > ...hardcode-the-path-to-wayland-scanner.patch | 26 +++++++++++++++
> > ...-the-native-wayland-scanner-directly.patch | 27 ++++++++++++++++
> > .../wayland/wayland/fixpathinpcfiles.patch | 32 -------------------
> > .../wayland/wayland_1.18.0.bb | 11 ++++---
> > 4 files changed, 59 insertions(+), 37 deletions(-)
> > create mode 100644
> meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch
> > create mode 100644
> meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
> > delete mode 100644
> meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
> >
> > diff --git
> a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch
> b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch
> > new file mode 100644
> > index 0000000000..2199548bdf
> > --- /dev/null
> > +++
> b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch
> > @@ -0,0 +1,26 @@
> > +From cbb28635a1079d68e62dbaa1e21791a20dbbbaf4 Mon Sep 17 00:00:00 2001
> > +From: Alexander Kanavin <alex.kanavin@gmail.com>
> > +Date: Mon, 17 Feb 2020 21:46:18 +0100
> > +Subject: [PATCH] Do not hardcode the path to wayland-scanner
> > +
> > +This results in host contamination during builds.
> > +
> > +Upstream-Status: Inappropriate [oe-core specific]
> > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > +---
> > + src/meson.build | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/src/meson.build b/src/meson.build
> > +index 294aee0..7e410fa 100644
> > +--- a/src/meson.build
> > ++++ b/src/meson.build
> > +@@ -49,7 +49,7 @@ pkgconfig.generate(
> > + 'datarootdir=' + join_paths('${prefix}',
> get_option('datadir')),
> > + 'pkgdatadir=' + join_paths('${datarootdir}',
> meson.project_name()),
> > + 'bindir=' + join_paths('${prefix}',
> get_option('bindir')),
> > +- 'wayland_scanner=${bindir}/wayland-scanner'
> > ++ 'wayland_scanner=wayland-scanner'
> > + ],
> > + filebase: 'wayland-scanner'
> > + )
> > diff --git
> a/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
> b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
> > new file mode 100644
> > index 0000000000..f98037a850
> > --- /dev/null
> > +++
> b/meta/recipes-graphics/wayland/wayland/0002-meson.build-find-the-native-wayland-scanner-directly.patch
> > @@ -0,0 +1,27 @@
> > +From 2582d2653ba80917d7bc47088e1a5f49530fddaa Mon Sep 17 00:00:00 2001
> > +From: Alexander Kanavin <alex.kanavin@gmail.com>
> > +Date: Sun, 16 Feb 2020 16:29:53 +0100
> > +Subject: [PATCH] meson.build: find the native wayland-scanner directly
> in PATH
> > +
> > +Otherwise, meson attempts to use the target pkg-config and fails.
> > +
> > +Upstream-Status: Pending
> > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > +---
> > + src/meson.build | 3 +--
> > + 1 file changed, 1 insertion(+), 2 deletions(-)
> > +
> > +diff --git a/src/meson.build b/src/meson.build
> > +index 3e8c9bf..294aee0 100644
> > +--- a/src/meson.build
> > ++++ b/src/meson.build
> > +@@ -55,8 +55,7 @@ pkgconfig.generate(
> > + )
> > +
> > + if meson.is_cross_build()
> > +- scanner_dep = dependency('wayland-scanner', native: true,
> version: '>=1.14.0')
> > +- wayland_scanner_for_build =
> find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
> > ++ wayland_scanner_for_build = find_program('wayland-scanner')
> > + else
> > + wayland_scanner_for_build = wayland_scanner
> > + endif
> > diff --git
> a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
> b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
> > deleted file mode 100644
> > index ad3526d984..0000000000
> > --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
> > +++ /dev/null
> > @@ -1,32 +0,0 @@
> > -Fix wayland-client and wayland-scanner pc files
> > -
> > -Upstream-Status: Pending
> > -
> > -Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
> > -
> > -Index: wayland-1.14.0/src/wayland-client.pc.in
> > -===================================================================
> > ---- wayland-1.14.0.orig/src/wayland-client.pc.in
> > -+++ wayland-1.14.0/src/wayland-client.pc.in
> > -@@ -1,7 +1,7 @@
> > - prefix=@prefix@
> > - exec_prefix=@exec_prefix@
> > - datarootdir=@datarootdir@
> > --pkgdatadir=@datadir@/@PACKAGE@
> > -+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
> > - libdir=@libdir@
> > - includedir=@includedir@
> > -
> > -Index: wayland-1.14.0/src/wayland-scanner.pc.in
> > -===================================================================
> > ---- wayland-1.14.0.orig/src/wayland-scanner.pc.in
> > -+++ wayland-1.14.0/src/wayland-scanner.pc.in
> > -@@ -2,7 +2,7 @@ prefix=@prefix@
> > - exec_prefix=@exec_prefix@
> > - datarootdir=@datarootdir@
> > - pkgdatadir=@datadir@/@PACKAGE@
> > --wayland_scanner=@bindir@/wayland-scanner
> > -+wayland_scanner=wayland-scanner
> > -
> > - Name: Wayland Scanner
> > - Description: Wayland scanner
> > diff --git a/meta/recipes-graphics/wayland/wayland_1.18.0.bb
> b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
> > index 7a3f075552..a702b3f6cc 100644
> > --- a/meta/recipes-graphics/wayland/wayland_1.18.0.bb
> > +++ b/meta/recipes-graphics/wayland/wayland_1.18.0.bb
> > @@ -13,20 +13,21 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
> > DEPENDS = "expat libffi wayland-native"
> >
> > SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz
> \
> > - file://fixpathinpcfiles.patch \
> > +
> file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \
> > +
> file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \
> > "
> > SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65"
> > SRC_URI[sha256sum] =
> "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d"
> >
> > UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
> >
> > -inherit autotools pkgconfig
> > +inherit meson pkgconfig
> >
> > PACKAGECONFIG ??= "dtd-validation"
> > -PACKAGECONFIG[dtd-validation] =
> "--enable-dtd-validation,--disable-dtd-validation,libxml2,,"
> > +PACKAGECONFIG[dtd-validation] =
> "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,,"
> >
> > -EXTRA_OECONF = "--disable-documentation --with-host-scanner"
> > -EXTRA_OECONF_class-native = "--disable-documentation
> --disable-libraries"
> > +EXTRA_OEMESON = "-Ddocumentation=false"
> > +EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false"
> >
> > # Wayland installs a M4 macro for other projects to use, which uses the
> target
> > # pkg-config to find files. Replace pkg-config with pkg-config-native.
> > --
> > 2.25.0
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 11340 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 05/13] weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
` (2 preceding siblings ...)
2020-02-19 19:47 ` [PATCH 04/13] wayland: convert to meson build Alexander Kanavin
@ 2020-02-19 19:47 ` Alexander Kanavin
2020-03-12 20:54 ` Khem Raj
2020-02-19 19:47 ` [PATCH 06/13] qemumips: use std vga instead of cirrus vga Alexander Kanavin
` (7 subsequent siblings)
11 siblings, 1 reply; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-19 19:47 UTC (permalink / raw)
To: openembedded-core
The fbdev backend is not documented, and not the default;
as the emulated hardware in qemu now supports DRM/KMS
(both std and virtio), we should align with upstream default
and vast majority of users. Empty init file will cause
weston to default to the KMS backend.
Note that 3D acceleration via virgl is not required; the backend
renders fine via the software driver in mesa. However, kvm
is more or less required to keep the UI responsive.
Also, other qemu targets (mips and arm in particular) continue
to use the fbdev backend, as in the absence of kvm, the performance
of software GL paths falls to unacceptable level.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini | 0
meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini | 0
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini
create mode 100644 meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini
diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini
new file mode 100644
index 0000000000..e69de29bb2
--
2.25.0
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 05/13] weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines
2020-02-19 19:47 ` [PATCH 05/13] weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines Alexander Kanavin
@ 2020-03-12 20:54 ` Khem Raj
0 siblings, 0 replies; 21+ messages in thread
From: Khem Raj @ 2020-03-12 20:54 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
On Wed, Feb 19, 2020 at 11:49 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> The fbdev backend is not documented, and not the default;
> as the emulated hardware in qemu now supports DRM/KMS
> (both std and virtio), we should align with upstream default
> and vast majority of users. Empty init file will cause
> weston to default to the KMS backend.
>
> Note that 3D acceleration via virgl is not required; the backend
> renders fine via the software driver in mesa. However, kvm
> is more or less required to keep the UI responsive.
>
> Also, other qemu targets (mips and arm in particular) continue
> to use the fbdev backend, as in the absence of kvm, the performance
> of software GL paths falls to unacceptable level.
>
drm backend change did not work directly with musl, I will send a
patch to enable WESTON_DISABLE_ATOMIC when launching weston
which should fix the launch errors seen
[18:58:45.628] launching '/usr/libexec/weston-desktop-shell'
[18:58:45.737] atomic: couldn't commit new state: Invalid argument
[18:58:45.737] repaint-flush failed: Invalid argument
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini | 0
> meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini | 0
> 2 files changed, 0 insertions(+), 0 deletions(-)
> create mode 100644 meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini
> create mode 100644 meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini
>
> diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini
> new file mode 100644
> index 0000000000..e69de29bb2
> --
> 2.25.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 06/13] qemumips: use std vga instead of cirrus vga
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
` (3 preceding siblings ...)
2020-02-19 19:47 ` [PATCH 05/13] weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines Alexander Kanavin
@ 2020-02-19 19:47 ` Alexander Kanavin
2020-02-19 19:47 ` [PATCH 07/13] createrepo-c: upgrade 0.15.5 -> 0.15.7 Alexander Kanavin
` (6 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-19 19:47 UTC (permalink / raw)
To: openembedded-core
This is what the upstream recommends nowadays:
https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
I have verified that both X and weston continue to boot and look
right; however xorg.conf file needs to be removed as it is cirrus
specific and doesn't work and isn't needed with std vga.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/conf/machine/include/qemuboot-mips.inc | 2 +-
.../xserver-xf86-config/qemumips/xorg.conf | 39 -------------------
.../xserver-xf86-config/qemumips64/xorg.conf | 39 -------------------
3 files changed, 1 insertion(+), 79 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc
index d44b96c18c..f1f7c2ae20 100644
--- a/meta/conf/machine/include/qemuboot-mips.inc
+++ b/meta/conf/machine/include/qemuboot-mips.inc
@@ -7,4 +7,4 @@ QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet"
QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
# For graphics to work we need to define the VGA device as well as the necessary USB devices
-QB_OPT_APPEND += "-device cirrus-vga"
+QB_OPT_APPEND += "-vga std"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
deleted file mode 100644
index 1d3c64f620..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-
-Section "Files"
-EndSection
-
-Section "Device"
- Identifier "Graphics Controller"
- Driver "fbdev"
-EndSection
-
-Section "Monitor"
- Identifier "Generic Monitor"
- Option "DPMS"
- # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
- Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync
- # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
- ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync
- # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
- ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync
- # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
- ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync
- # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
- ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync
-EndSection
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Graphics Controller"
- Monitor "Generic Monitor"
- DefaultDepth 16
- SubSection "Display"
- Modes "640x480"
- EndSubSection
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
- Option "AllowEmptyInput" "no"
-EndSection
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
deleted file mode 100644
index 03b94dc3af..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-
-Section "Files"
-EndSection
-
-Section "Device"
- Identifier "Graphics Controller"
- Driver "fbdev"
-EndSection
-
-Section "Monitor"
- Identifier "Generic Monitor"
- Option "DPMS"
- # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
- Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync
- # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
- ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync
- # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
- ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync
- # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
- ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync
- # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
- ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync
-EndSection
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Graphics Controller"
- Monitor "Generic Monitor"
- DefaultDepth 16
- SubSection "Display"
- Modes "640x480"
- EndSubSection
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
- Option "AllowEmptyInput" "no"
-EndSection
--
2.25.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 07/13] createrepo-c: upgrade 0.15.5 -> 0.15.7
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
` (4 preceding siblings ...)
2020-02-19 19:47 ` [PATCH 06/13] qemumips: use std vga instead of cirrus vga Alexander Kanavin
@ 2020-02-19 19:47 ` Alexander Kanavin
2020-02-19 19:47 ` [PATCH 08/13] epiphany: upgrade 3.34.3.1 -> 3.34.4 Alexander Kanavin
` (5 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-19 19:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../{createrepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.15.5.bb => createrepo-c_0.15.7.bb} (95%)
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb
similarity index 95%
rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb
rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb
index 9b6c89c348..c6a53ffece 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.5.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.7.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
"
-SRCREV = "db3a2da68842efd8a8f69c40a222dfb15bb1f4fe"
+SRCREV = "4ab6b56b8b718396386982afba4ade297c14d91a"
S = "${WORKDIR}/git"
--
2.25.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 08/13] epiphany: upgrade 3.34.3.1 -> 3.34.4
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
` (5 preceding siblings ...)
2020-02-19 19:47 ` [PATCH 07/13] createrepo-c: upgrade 0.15.5 -> 0.15.7 Alexander Kanavin
@ 2020-02-19 19:47 ` Alexander Kanavin
2020-02-19 19:47 ` [PATCH 09/13] libsecret: upgrade 0.20.0 -> 0.20.1 Alexander Kanavin
` (4 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-19 19:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../epiphany/{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_3.34.3.1.bb => epiphany_3.34.4.bb} (85%)
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb
similarity index 85%
rename from meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.34.4.bb
index 7e1573348e..ddb4c2794f 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.34.3.1.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb
@@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://0002-help-meson.build-disable-the-use-of-yelp.patch \
"
-SRC_URI[archive.md5sum] = "c8010e7ef1b0fd2da1e613e17445062a"
-SRC_URI[archive.sha256sum] = "00e479fba108f44b1830370780b98116d87fc277eb1a4eed8e229dcdf04aea6d"
+SRC_URI[archive.md5sum] = "a559f164bb7d6cbeceb348648076830b"
+SRC_URI[archive.sha256sum] = "60e190fc07ec7e33472e60c7e633e04004f7e277a0ffc5e9cd413706881e598d"
FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
--
2.25.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 09/13] libsecret: upgrade 0.20.0 -> 0.20.1
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
` (6 preceding siblings ...)
2020-02-19 19:47 ` [PATCH 08/13] epiphany: upgrade 3.34.3.1 -> 3.34.4 Alexander Kanavin
@ 2020-02-19 19:47 ` Alexander Kanavin
2020-02-19 19:47 ` [PATCH 10/13] meson: upgrade 0.53.0 -> 0.53.1 Alexander Kanavin
` (3 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-19 19:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...ection-Rename-internal-functions-to-.patch | 144 ------------------
...ibsecret_0.20.0.bb => libsecret_0.20.1.bb} | 5 +-
2 files changed, 2 insertions(+), 147 deletions(-)
delete mode 100644 meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch
rename meta/recipes-gnome/libsecret/{libsecret_0.20.0.bb => libsecret_0.20.1.bb} (81%)
diff --git a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch b/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch
deleted file mode 100644
index 269c12b010..0000000000
--- a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 59bcb169c4777bb3b1a50fee2ae20e4e8574b749 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <dueno@src.gnome.org>
-Date: Tue, 14 Jan 2020 10:09:29 +0100
-Subject: [PATCH] secret-file-collection: Rename internal functions to avoid
- conflicts
-
-As encrypt() is a standard POSIX function, its declaration had
-conflict with our own. Let's be more verbose about naming of the
-internal crypto functions.
-
-Fixes #35.
-
-Upstream-Status: Backport [https://github.com/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- libsecret/secret-file-collection.c | 38 +++++++++++++++---------------
- 1 file changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/libsecret/secret-file-collection.c b/libsecret/secret-file-collection.c
-index 79863ea..8ffb542 100644
---- a/libsecret/secret-file-collection.c
-+++ b/libsecret/secret-file-collection.c
-@@ -68,7 +68,7 @@ enum {
- };
-
- static gboolean
--derive (SecretFileCollection *self)
-+do_derive_key (SecretFileCollection *self)
- {
- const gchar *password;
- gsize n_password;
-@@ -93,9 +93,9 @@ derive (SecretFileCollection *self)
- }
-
- static gboolean
--calculate_mac (SecretFileCollection *self,
-- const guint8 *value, gsize n_value,
-- guint8 *buffer)
-+do_calculate_mac (SecretFileCollection *self,
-+ const guint8 *value, gsize n_value,
-+ guint8 *buffer)
- {
- gcry_mac_hd_t hd;
- gcry_error_t gcry;
-@@ -130,9 +130,9 @@ calculate_mac (SecretFileCollection *self,
- }
-
- static gboolean
--decrypt (SecretFileCollection *self,
-- guint8 *data,
-- gsize n_data)
-+do_decrypt (SecretFileCollection *self,
-+ guint8 *data,
-+ gsize n_data)
- {
- gcry_cipher_hd_t hd;
- gcry_error_t gcry;
-@@ -164,9 +164,9 @@ decrypt (SecretFileCollection *self,
- }
-
- static gboolean
--encrypt (SecretFileCollection *self,
-- guint8 *data,
-- gsize n_data)
-+do_encrypt (SecretFileCollection *self,
-+ guint8 *data,
-+ gsize n_data)
- {
- gcry_cipher_hd_t hd;
- gcry_error_t gcry;
-@@ -311,7 +311,7 @@ on_load_contents (GObject *source_object,
- self->modified = g_date_time_new_now_utc ();
- self->usage_count = 0;
-
-- if (!derive (self)) {
-+ if (!do_derive_key (self)) {
- g_task_return_new_error (task,
- SECRET_ERROR,
- SECRET_ERROR_PROTOCOL,
-@@ -375,7 +375,7 @@ on_load_contents (GObject *source_object,
- g_assert (n_data == salt_size);
-
- self->salt = g_bytes_new (data, n_data);
-- if (!derive (self)) {
-+ if (!do_derive_key (self)) {
- g_task_return_new_error (task,
- SECRET_ERROR,
- SECRET_ERROR_PROTOCOL,
-@@ -442,7 +442,7 @@ hash_attributes (SecretFileCollection *self,
- GVariant *variant;
-
- value = g_hash_table_lookup (attributes, l->data);
-- if (!calculate_mac (self, (guint8 *)value, strlen (value), buffer)) {
-+ if (!do_calculate_mac (self, (guint8 *)value, strlen (value), buffer)) {
- g_list_free (keys);
- return NULL;
- }
-@@ -485,7 +485,7 @@ hashed_attributes_match (SecretFileCollection *self,
- return FALSE;
- }
-
-- if (!calculate_mac (self, value, strlen ((char *)value), buffer)) {
-+ if (!do_calculate_mac (self, value, strlen ((char *)value), buffer)) {
- g_variant_unref (hashed_attribute);
- return FALSE;
- }
-@@ -584,7 +584,7 @@ secret_file_collection_replace (SecretFileCollection *self,
- g_variant_store (serialized_item, data);
- g_variant_unref (serialized_item);
- memset (data + n_data, n_padded - n_data, n_padded - n_data);
-- if (!encrypt (self, data, n_padded)) {
-+ if (!do_encrypt (self, data, n_padded)) {
- egg_secure_free (data);
- g_set_error (error,
- SECRET_ERROR,
-@@ -593,8 +593,8 @@ secret_file_collection_replace (SecretFileCollection *self,
- return FALSE;
- }
-
-- if (!calculate_mac (self, data, n_padded + IV_SIZE,
-- data + n_padded + IV_SIZE)) {
-+ if (!do_calculate_mac (self, data, n_padded + IV_SIZE,
-+ data + n_padded + IV_SIZE)) {
- egg_secure_free (data);
- g_set_error (error,
- SECRET_ERROR,
-@@ -681,7 +681,7 @@ _secret_file_item_decrypt (GVariant *encrypted,
- }
- n_padded -= IV_SIZE + MAC_SIZE;
-
-- if (!calculate_mac (collection, data, n_padded + IV_SIZE, mac)) {
-+ if (!do_calculate_mac (collection, data, n_padded + IV_SIZE, mac)) {
- egg_secure_free (data);
- g_set_error (error,
- SECRET_ERROR,
-@@ -699,7 +699,7 @@ _secret_file_item_decrypt (GVariant *encrypted,
- return FALSE;
- }
-
-- if (!decrypt (collection, data, n_padded)) {
-+ if (!do_decrypt (collection, data, n_padded)) {
- egg_secure_free (data);
- g_set_error (error,
- SECRET_ERROR,
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb
similarity index 81%
rename from meta/recipes-gnome/libsecret/libsecret_0.20.0.bb
rename to meta/recipes-gnome/libsecret/libsecret_0.20.1.bb
index aa3dfab581..72511af02d 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb
@@ -13,9 +13,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native"
PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
-SRC_URI += " file://0001-secret-file-collection-Rename-internal-functions-to-.patch"
-SRC_URI[archive.md5sum] = "335750caeed47f50496b3b0e6a1875ff"
-SRC_URI[archive.sha256sum] = "f1187370b453106af878e30c284a121ba0c513da8bb4170b329d66e250bdae43"
+SRC_URI[archive.md5sum] = "d2dd660a8d502099317bc8af9f30302e"
+SRC_URI[archive.sha256sum] = "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447"
# http://errors.yoctoproject.org/Errors/Details/20228/
ARM_INSTRUCTION_SET_armv4 = "arm"
--
2.25.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 10/13] meson: upgrade 0.53.0 -> 0.53.1
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
` (7 preceding siblings ...)
2020-02-19 19:47 ` [PATCH 09/13] libsecret: upgrade 0.20.0 -> 0.20.1 Alexander Kanavin
@ 2020-02-19 19:47 ` Alexander Kanavin
2020-02-19 19:47 ` [PATCH 11/13] p11-kit: upgrade 0.23.18.1 -> 0.23.20 Alexander Kanavin
` (2 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-19 19:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/meson/meson.inc | 4 ++--
.../meson/0001-Make-CPU-family-warnings-fatal.patch | 2 +-
...0002-Support-building-allarch-recipes-again.patch | 2 +-
.../meson/meson/0003-native_bindir.patch | 12 ++++++------
.../meson/{meson_0.53.0.bb => meson_0.53.1.bb} | 0
...sdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} | 0
6 files changed, 10 insertions(+), 10 deletions(-)
rename meta/recipes-devtools/meson/{meson_0.53.0.bb => meson_0.53.1.bb} (100%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} (100%)
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index c0ce7d338b..d391c9cf29 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
"
-SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
-SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
+SRC_URI[sha256sum] = "ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04"
+SRC_URI[md5sum] = "9bf73f7b5a2426a7c8674a809bb8cae2"
SRC_URI_append_class-native = " \
file://0001-Make-CPU-family-warnings-fatal.patch \
diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
index 74d5b4ca66..9ce31e5489 100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
@@ -1,4 +1,4 @@
-From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001
+From ee638fd4a299bfc53a2238e9f71ae310c8d97460 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal
diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
index 1529ebe9fe..ce18660756 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
@@ -1,4 +1,4 @@
-From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001
+From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index 76c1aa9ac1..dc822fb1fc 100644
--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
@@ -1,4 +1,4 @@
-From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
+From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
-index f17b9f2..b5c9c92 100644
+index 40e304c..4b687df 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -184,7 +184,7 @@ class Dependency:
@@ -73,7 +73,7 @@ index f17b9f2..b5c9c92 100644
+ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
return cache[(self.pkgbin, targs, fenv)]
- def _convert_mingw_paths(self, args: List[str]) -> List[str]:
+ def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
(self.name, out_raw))
self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
@@ -93,7 +93,7 @@ index f17b9f2..b5c9c92 100644
if ret != 0:
if self.required:
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
-index bdcc4a7..e2de847 100644
+index da411ef..856506a 100644
--- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py
@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
@@ -105,7 +105,7 @@ index bdcc4a7..e2de847 100644
if prefix:
self.bindir = os.path.join(prefix, 'bin')
-@@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency):
+@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency):
applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
for application in applications:
try:
@@ -114,7 +114,7 @@ index bdcc4a7..e2de847 100644
except MesonException:
pass
-@@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency):
+@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency):
QtBaseDependency.__init__(self, 'qt5', env, kwargs)
def get_pkgconfig_host_bins(self, core):
diff --git a/meta/recipes-devtools/meson/meson_0.53.0.bb b/meta/recipes-devtools/meson/meson_0.53.1.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.53.0.bb
rename to meta/recipes-devtools/meson/meson_0.53.1.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb
--
2.25.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 11/13] p11-kit: upgrade 0.23.18.1 -> 0.23.20
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
` (8 preceding siblings ...)
2020-02-19 19:47 ` [PATCH 10/13] meson: upgrade 0.53.0 -> 0.53.1 Alexander Kanavin
@ 2020-02-19 19:47 ` Alexander Kanavin
2020-02-20 10:26 ` Richard Purdie
2020-02-19 19:47 ` [PATCH 12/13] vala: upgrade 0.46.5 -> 0.46.6 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 13/13] virglrenderer: upgrade 0.8.1 -> 0.8.2 Alexander Kanavin
11 siblings, 1 reply; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-19 19:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} (93%)
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb
similarity index 93%
rename from meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
rename to meta/recipes-support/p11-kit/p11-kit_0.23.20.bb
index 19895ec269..26833ef431 100644
--- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
+++ b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb
@@ -9,7 +9,7 @@ DEPENDS = "libtasn1 libtasn1-native libffi"
DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
SRC_URI = "git://github.com/p11-glue/p11-kit"
-SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6"
+SRCREV = "762cdaa2cd5c5ec09cc844f9a6bdc551c7f6c8ed"
S = "${WORKDIR}/git"
PACKAGECONFIG ??= ""
--
2.25.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 11/13] p11-kit: upgrade 0.23.18.1 -> 0.23.20
2020-02-19 19:47 ` [PATCH 11/13] p11-kit: upgrade 0.23.18.1 -> 0.23.20 Alexander Kanavin
@ 2020-02-20 10:26 ` Richard Purdie
0 siblings, 0 replies; 21+ messages in thread
From: Richard Purdie @ 2020-02-20 10:26 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core
On Wed, 2020-02-19 at 20:47 +0100, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> .../p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> rename meta/recipes-support/p11-kit/{p11-kit_0.23.18.1.bb => p11-kit_0.23.20.bb} (93%)
>
> diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb
> similarity index 93%
> rename from meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
> rename to meta/recipes-support/p11-kit/p11-kit_0.23.20.bb
> index 19895ec269..26833ef431 100644
> --- a/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
> +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb
> @@ -9,7 +9,7 @@ DEPENDS = "libtasn1 libtasn1-native libffi"
> DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
>
> SRC_URI = "git://github.com/p11-glue/p11-kit"
> -SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6"
> +SRCREV = "762cdaa2cd5c5ec09cc844f9a6bdc551c7f6c8ed"
> S = "${WORKDIR}/git"
>
> PACKAGECONFIG ??= ""
This version adds bash-completion which is triggering in some builds
and isn't deterministic.
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/291
Cheers,
Richard
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 12/13] vala: upgrade 0.46.5 -> 0.46.6
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
` (9 preceding siblings ...)
2020-02-19 19:47 ` [PATCH 11/13] p11-kit: upgrade 0.23.18.1 -> 0.23.20 Alexander Kanavin
@ 2020-02-19 19:47 ` Alexander Kanavin
2020-02-19 19:47 ` [PATCH 13/13] virglrenderer: upgrade 0.8.1 -> 0.8.2 Alexander Kanavin
11 siblings, 0 replies; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-19 19:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/vala/{vala_0.46.5.bb => vala_0.46.6.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/vala/{vala_0.46.5.bb => vala_0.46.6.bb} (57%)
diff --git a/meta/recipes-devtools/vala/vala_0.46.5.bb b/meta/recipes-devtools/vala/vala_0.46.6.bb
similarity index 57%
rename from meta/recipes-devtools/vala/vala_0.46.5.bb
rename to meta/recipes-devtools/vala/vala_0.46.6.bb
index 9233d109dd..66f620384c 100644
--- a/meta/recipes-devtools/vala/vala_0.46.5.bb
+++ b/meta/recipes-devtools/vala/vala_0.46.6.bb
@@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat
file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
"
-SRC_URI[md5sum] = "a0a2eb8babb72c1b4e81c4f1b98429df"
-SRC_URI[sha256sum] = "1a7847d2599d902c805a58b95b72b69e64c0223c2f6220163998a7ab4b42db1d"
+SRC_URI[md5sum] = "d9af125648505503b139ebc2d2c9eee5"
+SRC_URI[sha256sum] = "ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a"
--
2.25.0
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 13/13] virglrenderer: upgrade 0.8.1 -> 0.8.2
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
` (10 preceding siblings ...)
2020-02-19 19:47 ` [PATCH 12/13] vala: upgrade 0.46.5 -> 0.46.6 Alexander Kanavin
@ 2020-02-19 19:47 ` Alexander Kanavin
11 siblings, 0 replies; 21+ messages in thread
From: Alexander Kanavin @ 2020-02-19 19:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../{virglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/virglrenderer/{virglrenderer_0.8.1.bb => virglrenderer_0.8.2.bb} (94%)
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb
similarity index 94%
rename from meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb
rename to meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb
index 133618844a..1046b8504f 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.1.bb
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb
@@ -9,7 +9,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10"
DEPENDS = "libdrm mesa libepoxy"
-SRCREV = "66c57963aaf09a1c41056bd2a001da1d51957a14"
+SRCREV = "7d204f3927be65fb3365dce01dbcd04d447a4985"
SRC_URI = "git://anongit.freedesktop.org/virglrenderer \
file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \
file://0001-meson.build-use-python3-directly-for-python.patch \
--
2.25.0
^ permalink raw reply related [flat|nested] 21+ messages in thread