Skip to contentSkip to conversation

Revert "go: Use dl.google.com for SRC_URI"

PATCH In review Alexander Kanavin 3 participants 13 messages May 10, 2021 – May 13, 2021 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/8 Revert "go: Use dl.google.com for SRC_URI"

This reverts commit 4118415d4bc6243c98a1440195826be7cbad24f1.

This was found to be unnecessary, and broke upstream version checks.

---
 meta/recipes-devtools/go/go-common.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/go/go-common.inc +1 -1
index c368b95b69..39a681a712 100644
@@ -14,7 +14,7 @@ LICENSE = "BSD-3-Clause"
 
 inherit goarch
 
-SRC_URI = "https://dl.google.com/go/go${PV}.src.tar.gz;name=main"
+SRC_URI = "https://golang.org/dl/go${PV}.src.tar.gz;name=main"
 S = "${WORKDIR}/go"
 B = "${S}"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.src\.tar"
Signature · 1 line
2.31.1
#1 lore raw

PATCH 2/8 gdk-pixbuf: rewrite the cross-build support for tests

It was scattered over four different patches, and wasn't guarded by a configuration option. Hopefully the new patch is acceptable to upstream.

---
 .../0001-Add-use_prebuilt_tools-option.patch  | 140 ++++++++++++++++++
 ...f-decisions-around-cross-compilation.patch |  38 -----
 ...bnailer-and-pixdata-cross-compile-fa.patch |  95 ------------
 ...nd-thumbnailer-cross-compile-failure.patch |  28 ----
 ...ailer-and-tests-also-in-cross-builds.patch |  29 ----
 .../gdk-pixbuf/gdk-pixbuf_2.42.6.bb           |   9 +-
 6 files changed, 145 insertions(+), 194 deletions(-)
 create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch
 delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
 delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
 delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
 delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch new file +140 -0
new file mode 100644
index 0000000000..e6c4e4f5bc
@@ -0,0 +1,140 @@
+From 4a4aa5bef894b74b5bd7f2b8ed862527ce2d84ac Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Sat, 8 May 2021 21:58:54 +0200
+Subject: [PATCH] Add use_prebuilt_tools option
+
+This allows using the gdk-pixbuf tools from the host to
+build and install tests in a cross-compile scenarion.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ gdk-pixbuf/meson.build  | 11 +++++++++--
+ meson.build             |  6 +++---
+ meson_options.txt       |  4 ++++
+ tests/meson.build       |  2 --
+ thumbnailer/meson.build | 11 ++++++++---
+ 5 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
+index 8b0590b..7331491 100644
+--- a/gdk-pixbuf/meson.build
++++ b/gdk-pixbuf/meson.build
+@@ -342,13 +342,20 @@ foreach bin: gdkpixbuf_bin
+                    include_directories: [ root_inc, gdk_pixbuf_inc ],
+                    c_args: common_cflags + gdk_pixbuf_cflags,
+                    install: true)
+-  meson.override_find_program(bin_name, bin)
++  if not get_option('use_prebuilt_tools')
++      meson.override_find_program(bin_name, bin)
++  endif
+ 
+   # Used in tests
+   set_variable(bin_name.underscorify(), bin)
+ endforeach
+ 
+-if not meson.is_cross_build()
++if get_option('use_prebuilt_tools')
++    gdk_pixbuf_query_loaders = find_program('gdk-pixbuf-query-loaders', required: true)
++    gdk_pixbuf_pixdata = find_program('gdk-pixbuf-pixdata', required: true)
++endif
++
++if not meson.is_cross_build() or get_option('use_prebuilt_tools')
+   # The 'loaders.cache' used for testing, so we don't accidentally
+   # load the installed cache; we always build it by default
+   loaders_cache = custom_target('loaders.cache',
+diff --git a/meson.build b/meson.build
+index 7a1409b..0bc73eb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -403,16 +403,16 @@ subdir('gdk-pixbuf')
+ # i18n
+ subdir('po')
+ 
+-if not meson.is_cross_build()
++if not meson.is_cross_build() or get_option('use_prebuilt_tools')
+   subdir('tests')
+-  subdir('thumbnailer')
+ endif
++subdir('thumbnailer')
+ 
+ # Documentation
+ build_docs = get_option('gtk_doc') or get_option('docs')
+ subdir('docs')
+ 
+-if not meson.is_cross_build()
++if not meson.is_cross_build() or get_option('use_prebuilt_tools')
+   meson.add_install_script('build-aux/post-install.py',
+     gdk_pixbuf_bindir,
+     gdk_pixbuf_libdir,
+diff --git a/meson_options.txt b/meson_options.txt
+index 0ee6718..cc29855 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -49,4 +49,8 @@ option('gio_sniffing',
+        description: 'Perform file type detection using GIO (Unused on MacOS and Windows)',
+        type: 'boolean',
+        value: true)
++option('use_prebuilt_tools',
++       description: 'Use prebuilt gdk-pixbuf tools from the host for cross-compilation',
++       type: 'boolean',
++       value: false)
+ 
+diff --git a/tests/meson.build b/tests/meson.build
+index 7c6cb11..2b61d6e 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@ if enabled_loaders.contains('png') and host_system != 'windows'
+       '@OUTPUT@',
+     ],
+     depends: [
+-      gdk_pixbuf_pixdata,
+       loaders_cache,
+     ],
+   )
+@@ -41,7 +40,6 @@ if enabled_loaders.contains('png') and host_system != 'windows'
+       '@OUTPUT@',
+     ],
+     depends: [
+-      gdk_pixbuf_pixdata,
+       loaders_cache,
+     ],
+   )
+diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build
+index b6a206d..b02b1c2 100644
+--- a/thumbnailer/meson.build
++++ b/thumbnailer/meson.build
+@@ -6,13 +6,20 @@ bin = executable('gdk-pixbuf-thumbnailer',
+            ],
+            dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ],
+            install: true)
+-meson.override_find_program('gdk-pixbuf-thumbnailer', bin)
++if not get_option('use_prebuilt_tools')
++    meson.override_find_program('gdk-pixbuf-thumbnailer', bin)
++endif
+ 
+ gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types',
+                                          'gdk-pixbuf-print-mime-types.c',
++                                         install: true,
+                                          c_args: common_cflags,
+                                          dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ])
+ 
++if get_option('use_prebuilt_tools')
++    gdk_pixbuf_print_mime_types = find_program('gdk-pixbuf-print-mime-types', required: true)
++endif
++
+ custom_target('thumbnailer',
+               input: 'gdk-pixbuf-thumbnailer.thumbnailer.in',
+               output: 'gdk-pixbuf-thumbnailer.thumbnailer',
+@@ -26,8 +33,6 @@ custom_target('thumbnailer',
+                 '@OUTPUT@',
+               ],
+               depends: [
+-                gdk_pixbuf_print_mime_types,
+-                gdk_pixbuf_pixdata,
+                 loaders_cache,
+               ],
+               install: true,
+-- 
+2.24.0
+
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch deleted +0 -38
deleted file mode 100644
index e461404918..0000000000
@@ -1,38 +0,0 @@
-From be8a47e0c21e5577d4f5669d339dfec6299b25be Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Thu, 14 Feb 2019 18:06:25 +0100
-Subject: [PATCH] Generate loaders.cache using a native tool when
- cross-compiling
-
-Otherwise meson would attempt to run a target binary.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- gdk-pixbuf/meson.build | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
-index 5cddbec..78c8bd3 100644
---- a/gdk-pixbuf/meson.build
-+++ b/gdk-pixbuf/meson.build
-@@ -324,8 +324,16 @@ if not meson.is_cross_build()
-                                 build_by_default: true)
-   loaders_dep = declare_dependency(sources: [ loaders_cache ])
- else
--  loaders_cache = []
--  loaders_dep = declare_dependency()
-+  loaders_cache = custom_target('loaders.cache',
-+                                output: 'loaders.cache',
-+                                capture: true,
-+                                command: [
-+                                  'gdk-pixbuf-query-loaders',
-+                                  dynamic_loaders,
-+                                ],
-+                                depends: dynamic_loaders_dep,
-+                                build_by_default: true)
-+  loaders_dep = declare_dependency(sources: [ loaders_cache ])
- endif
- 
- pkgconfig = import('pkgconfig')
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch deleted +0 -95

95 lines not on this page · raw message

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch deleted +0 -28
deleted file mode 100644
index 110b32a490..0000000000
@@ -1,28 +0,0 @@
-From 8c7ced988def52654946458a3779e383b27f14f7 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Thu, 14 Feb 2019 17:56:10 +0100
-Subject: [PATCH] Work-around thumbnailer cross-compile failure
-
-Install gdk-pixbuf-print-mime-types that's needed for thumbnail
-metadata generation.
-
-The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057
-
-Upstream-Status: Inappropriate [workaround]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- thumbnailer/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build
-index e801144..aaafec8 100644
---- a/thumbnailer/meson.build
-+++ b/thumbnailer/meson.build
-@@ -10,6 +10,7 @@ executable('gdk-pixbuf-thumbnailer',
- gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types',
-                                          'gdk-pixbuf-print-mime-types.c',
-                                          c_args: common_cflags,
-+                                         install: true,
-                                          dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ])
- 
- custom_target('thumbnailer',
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch deleted +0 -29
deleted file mode 100644
index cd9f88befc..0000000000
@@ -1,29 +0,0 @@
-From d02a8e202d2fe5caf3449683e0ccdf84a482a325 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 5 Jun 2019 14:17:55 +0200
-Subject: [PATCH] Build thumbnailer and tests also in cross builds.
-
-Upstream-Status: Inappropriate [relies on oe-core specific hacks]
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- meson.build | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 73034d1..d114016 100644
---- a/meson.build
-+++ b/meson.build
-@@ -378,10 +378,8 @@ subdir('gdk-pixbuf')
- # i18n
- subdir('po')
- 
--if not meson.is_cross_build()
--  subdir('tests')
--  subdir('thumbnailer')
--endif
-+subdir('tests')
-+subdir('thumbnailer')
- 
- # Documentation
- build_docs = get_option('gtk_doc') or get_option('docs')
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb +5 -4
index e28423efd9..f171464f4d 100644
@@ -20,10 +20,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://run-ptest \
            file://fatal-loader.patch \
-           file://0001-Work-around-thumbnailer-cross-compile-failure.patch \
-           file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \
-           file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \
-           file://0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch \
+           file://0001-Add-use_prebuilt_tools-option.patch \
            "
 
 SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f"
@@ -47,6 +44,10 @@ PACKAGECONFIG[jpeg] = "-Djpeg=true,-Djpeg=false,jpeg"
 PACKAGECONFIG[tiff] = "-Dtiff=true,-Dtiff=false,tiff"
 PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false"
 
+EXTRA_OEMESON_class-target = " \
+    -Duse_prebuilt_tools=true \
+"
+
 PACKAGES =+ "${PN}-xlib"
 
 # For GIO image type sniffing
Signature · 1 line
2.31.1
#2 lore raw

PATCH 3/8 expat: upgrade 2.2.10 -> 2.3.0

In reply to Alexander Kanavin

Drop 0001-Add-output-of-tests-result.patch (difficult to rebase). I have verified that ptests still pass, and print PASS for every test. If they start failing we can revisit what kind of output would be beneficial.

---
 .../0001-Add-output-of-tests-result.patch     | 83 -------------------
 meta/recipes-core/expat/expat/run-ptest       |  4 +-
 .../expat/{expat_2.2.10.bb => expat_2.3.0.bb} |  7 +-
 3 files changed, 5 insertions(+), 89 deletions(-)
 delete mode 100644 meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch
 rename meta/recipes-core/expat/{expat_2.2.10.bb => expat_2.3.0.bb} (81%)
meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch deleted +0 -83
deleted file mode 100644
index c5c18ead74..0000000000
@@ -1,83 +0,0 @@
-From aa84835a00bfd65e784d58411e76f60658e939dc Mon Sep 17 00:00:00 2001
-From: Oleksandr Popovych <[email protected]>
-Date: Tue, 18 Feb 2020 19:04:55 +0200
-Subject: [PATCH] Add output of tests result
-
-Added console output of testing results in form 'RESULT: TEST_NAME'.
-
-Changed verbose mode of test application set by '-v' ('--verbose')
-argument to CK_NORMAL.
-Added new supported argument '-vv' ('--extra-verbose') that changes
-verbose mode of test application to CK_VERBOSE. Results of each test
-are shown in output only if this mode is set.
-
-Upstream-Status: Denied
-
-This patch changes potentially deprecated feature that shoud be changed
-in upstream. [https://github.com/libexpat/libexpat/issues/382]
-
-Signed-off-by: Oleksandr Popovych <[email protected]>
----
- tests/minicheck.c | 10 +++++++++-
- tests/runtests.c  |  4 +++-
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/expat/tests/minicheck.c b/expat/tests/minicheck.c
-index a5a1efb..94fa412 100644
---- a/tests/minicheck.c
-+++ b/tests/minicheck.c
-@@ -164,6 +164,8 @@ srunner_run_all(SRunner *runner, int verbosity) {
-       if (tc->setup != NULL) {
-         /* setup */
-         if (setjmp(env)) {
-+          if (verbosity >= CK_VERBOSE)
-+            printf("SKIP: %s\n", _check_current_function);
-           add_failure(runner, verbosity);
-           continue;
-         }
-@@ -171,6 +173,8 @@ srunner_run_all(SRunner *runner, int verbosity) {
-       }
-       /* test */
-       if (setjmp(env)) {
-+        if (verbosity >= CK_VERBOSE)
-+          printf("FAIL: %s\n", _check_current_function);
-         add_failure(runner, verbosity);
-         continue;
-       }
-@@ -178,12 +182,16 @@ srunner_run_all(SRunner *runner, int verbosity) {
-
-       /* teardown */
-       if (tc->teardown != NULL) {
--        if (setjmp(env)) {
-+        if (setjmp(env)) {
-+          if (verbosity >= CK_VERBOSE)
-+           printf("PASS: %s\n", _check_current_function);
-           add_failure(runner, verbosity);
-           continue;
-         }
-         tc->teardown();
-       }
-+      if (verbosity >= CK_VERBOSE)
-+        printf("PASS: %s\n", _check_current_function);
-     }
-     tc = tc->next_tcase;
-   }
-diff --git a/tests/runtests.c b/expat/tests/runtests.c
-index 7791fe0..75724e5 100644
---- a/tests/runtests.c
-+++ b/tests/runtests.c
-@@ -11619,9 +11619,11 @@ main(int argc, char *argv[]) {
-   for (i = 1; i < argc; ++i) {
-     char *opt = argv[i];
-     if (strcmp(opt, "-v") == 0 || strcmp(opt, "--verbose") == 0)
--      verbosity = CK_VERBOSE;
-+      verbosity = CK_NORMAL;
-     else if (strcmp(opt, "-q") == 0 || strcmp(opt, "--quiet") == 0)
-       verbosity = CK_SILENT;
-+    else if (strcmp(opt, "-vv") == 0 || strcmp(opt, "--extra-verbose") == 0)
-+	verbosity = CK_VERBOSE;
-     else {
-       fprintf(stderr, "runtests: unknown option '%s'\n", opt);
-       return 2;
---
-2.17.1
meta/recipes-core/expat/expat/run-ptest +2 -2
index 1b39cec8e5..59d8ab57e3 100644
@@ -18,6 +18,6 @@ TIME=$(which time)
 
 echo "Architecture: $(uname -m)" > ${output}
 echo "Image: $(uname -sr)" >> ${output}
-${TIME} -f 'Execution time: %e s' bash -c "testCheck runtests -vv" |& tee -a ${output}
-${TIME} -f 'Execution time: %e s' bash -c "testCheck runtestspp -vv" |& tee -a ${output}
+${TIME} -f 'Execution time: %e s' bash -c "testCheck runtests -v" |& tee -a ${output}
+${TIME} -f 'Execution time: %e s' bash -c "testCheck runtestspp -v" |& tee -a ${output}
 echo
meta/recipes-core/expat/expat_2.3.0.bb renamed from meta/recipes-core/expat/expat_2.2.10.bb +3 -4
similarity index 81%
rename from meta/recipes-core/expat/expat_2.2.10.bb
rename to meta/recipes-core/expat/expat_2.3.0.bb
index fa263775b3..14d2855df3 100644
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \
            file://libtool-tag.patch \
-	   file://run-ptest \
-	   file://0001-Add-output-of-tests-result.patch \
-	  "
+           file://run-ptest \
+           "
 
-SRC_URI[sha256sum] = "b2c160f1b60e92da69de8e12333096aeb0c3bf692d41c60794de278af72135a5"
+SRC_URI[sha256sum] = "f122a20eada303f904d5e0513326c5b821248f2d4d2afbf5c6f1339e511c0586"
 
 EXTRA_OECMAKE_class-native += "-DEXPAT_BUILD_DOCS=OFF"
 
Signature · 1 line
2.31.1
#3 lore raw

PATCH 4/8 ffmpeg: update 4.3.2 -> 4.4

In reply to Alexander Kanavin

Drop mips64_cpu_detection.patch as upstream
has changed the code in a way that's difficult
to rebase. I have confirmed that builds on qemumip64 still work, and the patch does not say clearly what was the way to reproduce the failure it's aiming to address.

---
 .../ffmpeg/ffmpeg/mips64_cpu_detection.patch  | 32 -------------------
 .../ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} |  3 +-
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} (98%)
meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch deleted +0 -32
deleted file mode 100644
index 69429af8f0..0000000000
@@ -1,32 +0,0 @@
-It will add -mips64r6 and -mips64r2 to cmdline which will
-cause conflicts
-
-in OE we user mips32r2 and mips64r2 for mips arch versions
-so there is no benefit of detecting it automatically by
-poking at tools especially in cross env
-
-Fixes errors like
-
-linking -mnan=2008 module with previous -mnan=legacy modules
-failed to merge target specific data of file
-
--Khem
-Upstream-Status: Inappropriate [OE-Specific]
-
-Index: ffmpeg-3.1.1/configure
-===================================================================
---- ffmpeg-3.1.1.orig/configure
-+++ ffmpeg-3.1.1/configure
-@@ -5220,12 +5220,9 @@ elif enabled mips; then
- 
-     # Enable minimum ISA based on selected options
-     if enabled mips64; then
--        enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6'
-         enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2'
-         disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64'
-     else
--        enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6'
--        enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5'
-         enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2'
-         disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32'
-     fi
meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb +1 -2
similarity index 98%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb
index 08be38ca50..19a8e58370 100644
@@ -24,10 +24,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
 SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
-           file://mips64_cpu_detection.patch \
            file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
            "
-SRC_URI[sha256sum] = "46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb"
+SRC_URI[sha256sum] = "06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909"
 
 # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
 ARM_INSTRUCTION_SET_armv4 = "arm"
Signature · 1 line
2.31.1
#4 lore raw

Re: [OE-core] [PATCH 4/8] ffmpeg: update 4.3.2 -> 4.4

Quoted 7 lines · Alexander Kanavin

Drop mips64_cpu_detection.patch as upstream
has changed the code in a way that's difficult
to rebase. I have confirmed that builds on qemumip64 still work, and the patch does not say clearly what was the way to reproduce the failure it's aiming to address.

this fail on mips see https://errors.yoctoproject.org/Errors/Details/580763/

MACHINE=qemumips bitbake ffmpeg

should reproduce it.

Quoted 71 lines
---
 .../ffmpeg/ffmpeg/mips64_cpu_detection.patch  | 32 -------------------
 .../ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} |  3 +-
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} (98%)
meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch deleted +0 -32
deleted file mode 100644
index 69429af8f0..0000000000
@@ -1,32 +0,0 @@
-It will add -mips64r6 and -mips64r2 to cmdline which will
-cause conflicts
-
-in OE we user mips32r2 and mips64r2 for mips arch versions
-so there is no benefit of detecting it automatically by
-poking at tools especially in cross env
-
-Fixes errors like
-
-linking -mnan=2008 module with previous -mnan=legacy modules
-failed to merge target specific data of file
-
--Khem
-Upstream-Status: Inappropriate [OE-Specific]
-
-Index: ffmpeg-3.1.1/configure
-===================================================================
---- ffmpeg-3.1.1.orig/configure
-+++ ffmpeg-3.1.1/configure
-@@ -5220,12 +5220,9 @@ elif enabled mips; then
-
-     # Enable minimum ISA based on selected options
-     if enabled mips64; then
--        enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6'
-         enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2'
-         disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64'
-     else
--        enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6'
--        enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5'
-         enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2'
-         disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32'
-     fi
meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb +1 -3
similarity index 98%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb
index 08be38ca50..19a8e58370 100644
@@ -24,10 +24,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
 SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
-           file://mips64_cpu_detection.patch \
            file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
            "
-SRC_URI[sha256sum] = "46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb"
+SRC_URI[sha256sum] = "06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909"
 
 # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
 ARM_INSTRUCTION_SET_armv4 = "arm"
--

2.31.1

#5 lore raw

PATCH 5/8 powertop: update 2.13 -> 2.14

In reply to Alexander Kanavin

Drop configure() tweaks, none of them are needed anymore, and particularly the ncurses tweak was changing the build in a way that is not clear (and no one remembers why it was there in the first place).

Adjust LDFLAGS as somehow -pthread isn't there --> link failures.

---
 .../{powertop_2.13.bb => powertop_2.14.bb}         | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
 rename meta/recipes-kernel/powertop/{powertop_2.13.bb => powertop_2.14.bb} (64%)
meta/recipes-kernel/powertop/powertop_2.14.bb renamed from meta/recipes-kernel/powertop/powertop_2.13.bb +3 -11
similarity index 64%
rename from meta/recipes-kernel/powertop/powertop_2.13.bb
rename to meta/recipes-kernel/powertop/powertop_2.14.bb
index 8c7e78fd94..cb7f3c4dc1 100644
@@ -9,21 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 SRC_URI = "git://github.com/fenrus75/powertop;protocol=https \
     file://0001-wakeup_xxx.h-include-limits.h.patch \
 "
-SRCREV = "184cee06b2d64679bae5f806fe0a218827fdde99"
+SRCREV = "52f022f9bbe6e060fba11701d657a8d9762702ba"
 
 S = "${WORKDIR}/git"
 
-inherit autotools gettext pkgconfig bash-completion
+LDFLAGS_append = " -pthread"
 
-# we do not want libncursesw if we can
-do_configure_prepend() {
-    # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one
-    sed -i -e "s/ncursesw//g" ${S}/configure.ac
-    mkdir -p ${B}/src/tuning/
-    echo "${PV}" > ${S}/version-long
-    echo "${PV}" > ${S}/version-short
-    cp ${STAGING_DATADIR}/aclocal/ax_require_defined.m4 ${S}/m4/
-}
+inherit autotools gettext pkgconfig bash-completion
 
 inherit update-alternatives
 ALTERNATIVE_${PN} = "powertop"
Signature · 1 line
2.31.1
#6 lore raw

PATCH 6/8 mesa: add lmsensors PACKAGECONFIG

In reply to Alexander Kanavin
---
 meta/recipes-graphics/mesa/mesa.inc | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-graphics/mesa/mesa.inc +2 -0
index a85f94c75e..4cec1034e4 100644
@@ -167,6 +167,8 @@ PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false"
 
 PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
 
+PACKAGECONFIG[lmsensors] = "-Dlmsensors=enabled,-Dlmsensors=disabled,lmsensors"
+
 # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
 FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
 
Signature · 1 line
2.31.1
#7 lore raw

PATCH 7/8 meson: update 0.57.2 -> 0.58.0

In reply to Alexander Kanavin

Rebase patches; dropped chunks (and cross-prop-default.patch) have been removed upstream.

Move native-only patches to all-patches, as they're a pain to rebase separately.

---
 meta/recipes-devtools/meson/meson.inc         | 10 +---
 .../0001-Make-CPU-family-warnings-fatal.patch | 18 +++---
 ...sues-that-arise-when-cross-compiling.patch |  8 +--
 ...-not-manipulate-the-environment-when.patch | 14 ++---
 ...pport-building-allarch-recipes-again.patch | 10 ++--
 .../meson/meson/0003-native_bindir.patch      | 58 +++++--------------
 .../meson/meson/cross-prop-default.patch      | 23 --------
 .../{meson_0.57.2.bb => meson_0.58.0.bb}      |  0
 ...on_0.57.2.bb => nativesdk-meson_0.58.0.bb} |  0
 9 files changed, 43 insertions(+), 98 deletions(-)
 delete mode 100644 meta/recipes-devtools/meson/meson/cross-prop-default.patch
 rename meta/recipes-devtools/meson/{meson_0.57.2.bb => meson_0.58.0.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.57.2.bb => nativesdk-meson_0.58.0.bb} (100%)
meta/recipes-devtools/meson/meson.inc +3 -7
index 10e7d8a1ce..12a48fc992 100644
@@ -12,16 +12,12 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0003-native_bindir.patch \
            file://0001-python-module-do-not-manipulate-the-environment-when.patch \
            file://disable-rpath-handling.patch \
-           file://cross-prop-default.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
            file://gi-target-dep.patch \
+           file://0001-Make-CPU-family-warnings-fatal.patch \
+           file://0002-Support-building-allarch-recipes-again.patch \
            "
-SRC_URI[sha256sum] = "3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5"
-
-SRC_URI_append_class-native = " \
-    file://0001-Make-CPU-family-warnings-fatal.patch \
-    file://0002-Support-building-allarch-recipes-again.patch \
-"
+SRC_URI[sha256sum] = "f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd"
 
 UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
 UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +10 -8
index 300797f9ee..bcccfabd17 100644
@@ -1,34 +1,33 @@
-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00 2001
+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
-Subject: [PATCH] Make CPU family warnings fatal
+Subject: [PATCH 1/2] Make CPU family warnings fatal
 
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Ross Burton <[email protected]>
-
 ---
  mesonbuild/envconfig.py   | 2 +-
  mesonbuild/environment.py | 4 +---
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index ba35d16..2d3c34c 100644
+index c6a4df3..4d58c91 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -262,7 +262,7 @@ class MachineInfo:
+@@ -266,7 +266,7 @@ class MachineInfo:
  
          cpu_family = literal['cpu_family']
          if cpu_family not in known_cpu_families:
--            mlog.warning('Unknown CPU family {}, please report this at https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
+-            mlog.warning(f'Unknown CPU family {cpu_family}, please report this at https://github.com/mesonbuild/meson/issues/new')
 +            raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))
  
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 756dd81..4d2c2b6 100644
+index fc9b703..eea8345 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
              trial = 'ppc64'
  
      if trial not in known_cpu_families:
@@ -39,3 +38,6 @@ index 756dd81..4d2c2b6 100644
  
      return trial
  
+-- 
+2.24.0
+
meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +4 -4
index 471f1500da..ce90e515da 100644
@@ -1,4 +1,4 @@
-From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
+From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 4 Aug 2017 16:16:41 +0300
 Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling
@@ -20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 4 insertions(+)
 
 diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index bcf77b9..6a4b472 100644
+index dc2979e..c9ff9bd 100644
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
-             args.append('--{}={}'.format(program_name, path))
+@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
+             args.append(f'--{program_name}={path}')
          if namespace:
              args.append('--namespace=' + namespace)
 +        gtkdoc_exe_wrapper = state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +7 -7
index eb0e90dbdd..fdadc6869b 100644
@@ -1,4 +1,4 @@
-From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
+From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 19 Nov 2018 14:24:26 +0100
 Subject: [PATCH] python module: do not manipulate the environment when calling
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 12 deletions(-)
 
 diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index 07be318..b770603 100644
+index 422155b..aaf5844 100644
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
-@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
+@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
                  old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
                  old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
  
@@ -26,9 +26,9 @@ index 07be318..b770603 100644
 -
                  try:
                      self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
-                     mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir))
-@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir))
+                     mlog.debug(f'Found "{pkg_name}" via pkgconfig lookup in LIBPC ({pkg_libdir})')
+@@ -83,13 +78,6 @@ class PythonDependency(ExternalDependency):
+                     mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir})')
                      mlog.debug(e)
  
 -                if old_pkg_path is not None:
@@ -39,5 +39,5 @@ index 07be318..b770603 100644
 -                else:
 -                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
              else:
-                 mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))
+                 mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir}), this is likely due to a relocated python installation')
  
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +6 -4
index f6175a194c..dcc1ce9c27 100644
@@ -1,19 +1,18 @@
-From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00 2001
+From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
-Subject: [PATCH] Support building allarch recipes again
+Subject: [PATCH 2/2] Support building allarch recipes again
 
 This registers "allarch" as a known CPU family.
 
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Peter Kjellerstedt <[email protected]>
-
 ---
  mesonbuild/envconfig.py | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 2d3c34c..b9e7908 100644
+index 4d58c91..ff01ad1 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ from pathlib import Path
@@ -24,3 +23,6 @@ index 2d3c34c..b9e7908 100644
      'aarch64',
      'alpha',
      'arc',
+-- 
+2.24.0
+
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +13 -45

111 lines not on this page · raw message

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -23
deleted file mode 100644
index 772395e879..0000000000
@@ -1,23 +0,0 @@
-meson.build files that use cc.run() in native builds can silently fallback to
-meson.get_cross_property() in cross builds without an exe-wrapper, but there's
-no way to know that this is happening.
-
-As the defaults may be pessimistic (for example, disabling the support for a
-feature that should be enabled) emit a warning when the default is used, so that
-the recipe can explicitly set the cross property as relevant.
-
-Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/5071]
-Signed-off-by: Ross Burton <[email protected]>
-
-diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
-index 3c3cfae0..10e741ae 100644
---- a/mesonbuild/interpreter.py
-+++ b/mesonbuild/interpreter.py
-@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject):
-             return props[propname]
-         except Exception:
-             if len(args) == 2:
-+                mlog.warning('Cross property %s is using default value %s' % (propname, args[1]))
-                 return args[1]
-             raise InterpreterException('Unknown cross property: %s.' % propname)
- 
meta/recipes-devtools/meson/meson_0.58.0.bb renamed from meta/recipes-devtools/meson/meson_0.57.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.57.2.bb
rename to meta/recipes-devtools/meson/meson_0.58.0.bb
meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
Signature · 1 line
2.31.1
#8 lore raw

Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0

Looks like this patch failed buildepoxy.EpoxyTest.test_epoxy test

https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/stdio

Quoted 438 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Alexander Kanavin
Sent: Monday, 10 May, 2021 9:01 PM
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0

Rebase patches; dropped chunks (and cross-prop-default.patch) have been removed upstream.

Move native-only patches to all-patches, as they're a pain to rebase separately.

---
meta/recipes-devtools/meson/meson.inc | 10 +---
.../0001-Make-CPU-family-warnings-fatal.patch | 18 +++--- ...sues-that-arise- when-cross-compiling.patch | 8 +-- ...-not-manipulate-the-environment- when.patch | 14 ++--- ...pport-building-allarch-recipes-again.patch | 10 ++--

.../meson/meson/0003-native_bindir.patch      | 58 +++++--------------
.../meson/meson/cross-prop-default.patch      | 23 --------
.../{meson_0.57.2.bb => meson_0.58.0.bb}      |  0
...on_0.57.2.bb => nativesdk-meson_0.58.0.bb} |  0
9 files changed, 43 insertions(+), 98 deletions(-)  delete mode 100644

meta/recipes-devtools/meson/meson/cross-prop-default.patch rename meta/recipes-devtools/meson/{meson_0.57.2.bb => meson_0.58.0.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk- meson_0.57.2.bb => nativesdk-meson_0.58.0.bb} (100%)

meta/recipes- renamed from meta/recipes-devtools/meson/meson.inc +0 -0

devtools/meson/meson.inc
index 10e7d8a1ce..12a48fc992 100644

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -12,16 +12,12 @@ SRC_URI =

"https://github.com/mesonbuild/meson/releases/download/${PV}/meson- ${P

           file://0003-native_bindir.patch \
           file://0001-python-module-do-not-manipulate-the-environment-
when.patch \
           file://disable-rpath-handling.patch \
-           file://cross-prop-default.patch \
           file://0001-modules-python.py-do-not-substitute-python-s-
install.patch \
           file://gi-target-dep.patch \
meta/recipes-devtools/meson/meson.inc +2 -1
+           file://0001-Make-CPU-family-warnings-fatal.patch \
+           file://0002-Support-building-allarch-recipes-again.patch \
           "
-SRC_URI[sha256sum] =

"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5"

meta/recipes-devtools/meson/meson.inc +1 -5
-
-SRC_URI_append_class-native = " \
-    file://0001-Make-CPU-family-warnings-fatal.patch \
-    file://0002-Support-building-allarch-recipes-again.patch \
-"
+SRC_URI[sha256sum] =

"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd"

UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"

(quoted diff) +0 -0

warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make- CPU-family-warnings-fatal.patch
index 300797f9ee..bcccfabd17 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-fa
+++ tal.patch

meta/recipes-devtools/meson/meson.inc +0 -1
@@ -1,34 +1,33 @@
-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00

2001
+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 2001
From: Ross Burton <[email protected]>
Date: Tue, 3 Jul 2018 13:59:09 +0100

meta/recipes-devtools/meson/meson.inc +1 -1
-Subject: [PATCH] Make CPU family warnings fatal
+Subject: [PATCH 1/2] Make CPU family warnings fatal

Upstream-Status: Inappropriate [OE specific]

meta/recipes-devtools/meson/meson.inc +0 -2
-
---
 mesonbuild/envconfig.py   | 2 +-
 mesonbuild/environment.py | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +0 -0

ba35d16..2d3c34c 100644

mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +1 -0
+index c6a4df3..4d58c91 100644
mesonbuild/envconfig.py +1 -2
-@@ -262,7 +262,7 @@ class MachineInfo:
+@@ -266,7 +266,7 @@ class MachineInfo:
 
         cpu_family = literal['cpu_family']
         if cpu_family not in known_cpu_families:
--            mlog.warning('Unknown CPU family {}, please report this at

https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
+- mlog.warning(f'Unknown CPU family {cpu_family}, please report this
at https://github.com/mesonbuild/meson/issues/new')
+ raise EnvironmentException('Unknown CPU family {}, see
https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))

endian = literal['endian']
if endian not in ('little', 'big'):

mesonbuild/environment.py - renamed from mesonbuild/environment.py +1 -0
index 756dd81..4d2c2b6 100644
+index fc9b703..eea8345 100644
mesonbuild/environment.py +0 -1
-@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) ->

str:
+@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
trial = 'ppc64'

if trial not in known_cpu_families:

mesonbuild/environment.py +3 -0
@@ -39,3 +38,6 @@ index 756dd81..4d2c2b6 100644
 
     return trial
 
+--
+2.24.0
+
(quoted diff) +0 -0

that-arise-when-cross-compiling.patch b/meta/recipes- devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross- compiling.patch
index 471f1500da..ce90e515da 100644
--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that- arise-when-cross-compiling.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-aris +++ e-when-cross-compiling.patch

(quoted diff) +1 -1
@@ -1,4 +1,4 @@
-From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
+From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00

2001
From: Alexander Kanavin <[email protected]>
Date: Fri, 4 Aug 2017 16:16:41 +0300
Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling @@ - 20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <[email protected]>

 1 file changed, 4 insertions(+)
(quoted diff) +0 -0

b/mesonbuild/modules/gnome.py -index bcf77b9..6a4b472 100644

meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +1 -0
+index dc2979e..c9ff9bd 100644
mesonbuild/modules/gnome.py +3 -2
-@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
-             args.append('--{}={}'.format(program_name, path))
+@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
+             args.append(f'--{program_name}={path}')
         if namespace:
             args.append('--namespace=' + namespace)
+        gtkdoc_exe_wrapper =

state.environment.properties.host.get('gtkdoc_exe_wrapper', None)

(quoted diff) +0 -0

not-manipulate-the-environment-when.patch b/meta/recipes- devtools/meson/meson/0001-python-module-do-not-manipulate-the- environment-when.patch
index eb0e90dbdd..fdadc6869b 100644
--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not- manipulate-the-environment-when.patch
+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not- manipu
+++ late-the-environment-when.patch

mesonbuild/modules/gnome.py +1 -1
@@ -1,4 +1,4 @@
-From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
+From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00

2001
From: Alexander Kanavin <[email protected]>
Date: Mon, 19 Nov 2018 14:24:26 +0100
Subject: [PATCH] python module: do not manipulate the environment when calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>

 1 file changed, 12 deletions(-)
(quoted diff) +0 -0

b/mesonbuild/modules/python.py -index 07be318..b770603 100644

mesonbuild/modules/gnome.py +1 -0
+index 422155b..aaf5844 100644
mesonbuild/modules/python.py +3 -5
-@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
+@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
                 old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
                 old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
@@ -26,9 +26,9 @@ index 07be318..b770603 100644
-
                 try:
                     self.pkgdep = PkgConfigDependency(pkg_name, environment,
 kwargs)
-                     mlog.debug('Found "{}" via pkgconfig lookup in LIBPC
 ({})'.format(pkg_name, pkg_libdir))
-@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug('"{}" could not be found in LIBPC
 ({})'.format(pkg_name, pkg_libdir))
+                     mlog.debug(f'Found "{pkg_name}" via pkgconfig
+lookup in LIBPC ({pkg_libdir})') @@ -83,13 +78,6 @@ class

PythonDependency(ExternalDependency):

mesonbuild/modules/python.py +5 -4
+                     mlog.debug(f'"{pkg_name}" could not be found in
+LIBPC ({pkg_libdir})')
                     mlog.debug(e)
 
-                if old_pkg_path is not None:
@@ -39,5 +39,5 @@ index 07be318..b770603 100644
-                else:
-                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
             else:
-                 mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to
 a relocated python installation'.format(pkg_name, pkg_libdir))
+                 mlog.debug(f'"{pkg_name}" could not be found in LIBPC
+ ({pkg_libdir}), this is likely due to a relocated python
+ installation')
(quoted diff) +0 -0

allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002- Support-building-allarch-recipes-again.patch
index f6175a194c..dcc1ce9c27 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch- recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch- re
+++ cipes-again.patch

(quoted diff) +0 -1
@@ -1,19 +1,18 @@
-From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00

2001
+From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <[email protected]>
Date: Thu, 26 Jul 2018 16:32:49 +0200

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +1 -1
-Subject: [PATCH] Support building allarch recipes again
+Subject: [PATCH 2/2] Support building allarch recipes again

This registers "allarch" as a known CPU family.

Upstream-Status: Inappropriate [OE specific]

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +0 -2
-
---
 mesonbuild/envconfig.py | 1 +
 1 file changed, 1 insertion(+)
mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +0 -0

2d3c34c..b9e7908 100644

mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +1 -0
+index 4d58c91..ff01ad1 100644
mesonbuild/envconfig.py +0 -0
@@ -36,6 +36,7 @@ from pathlib import Path @@ -24,3 +23,6 @@ index

2d3c34c..b9e7908 100644

     'aarch64',
     'alpha',
     'arc',

+--
+2.24.0

mesonbuild/envconfig.py +1 -0
+
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -1
index ed85116c4f..89257b9e05 100644
@@ -1,4 +1,4 @@
-From 1546e1f95a119175b7a4e4272a26dd85505e5ede Mon Sep 17 00:00:00

2001
+From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <[email protected]>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -18,23 +18,22 @@ Signed-off-by: Ricardo Ribalda Delgado

<[email protected]>

---
 mesonbuild/dependencies/base.py | 19 +++++++++++--------

- mesonbuild/dependencies/ui.py | 6 +++---
- 2 files changed, 14 insertions(+), 11 deletions(-)
+ 1 file changed, 11 insertions(+), 8 deletions(-)

(quoted diff) +0 -0

b/mesonbuild/dependencies/base.py -index cd77b4b..7e3f338 100644

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -0
+index 14380d4..d0c443f 100644
mesonbuild/dependencies/base.py +1 -2
-@@ -192,7 +192,7 @@ class Dependency:
+@@ -179,7 +179,7 @@ class Dependency:
     def get_exe_args(self, compiler):
         return []
 
-    def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str,

T.Any]) -> str:
+ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str,
T.Any], use_native=False) -> str:
- raise DependencyException('{!r} is not a pkgconfig
dependency'.format(self.name))

mesonbuild/dependencies/base.py +11 -10
+         raise DependencyException(f'{self.name!r} is not a pkgconfig
+ dependency')
 
     def get_configtool_variable(self, variable_name):
-@@ -280,7 +280,7 @@ class InternalDependency(Dependency):
+@@ -267,7 +267,7 @@ class InternalDependency(Dependency):
             return True
         return any(d.is_built() for d in self.ext_deps)
@@ -43,7 +42,7 @@ index cd77b4b..7e3f338 100644
         raise DependencyException('Method "get_pkgconfig_variable()" is '
                                   'invalid for an internal dependency')
 
-@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency):
+@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency):
         return s.format(self.__class__.__name__, self.name, self.is_found,
                         self.version_reqs)
 
@@ -57,16 +56,16 @@ index cd77b4b..7e3f338 100644
         p, out, err = Popen_safe(cmd, env=env)
         rc, out, err = p.returncode, out.strip(), err.strip()
         call = ' '.join(cmd)
-@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency):
-             env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir
-             mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir)
+@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency):
+             if key.startswith('PKG_'):
+                 mlog.debug(f'env[{key}]: {value}')
 
-    def _call_pkgbin(self, args, env=None):
+    def _call_pkgbin(self, args, env=None, use_native=False):
         # Always copy the environment since we're going to modify it
         # with pkg-config variables
         if env is None:
-@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency):
         targs = tuple(args)
         cache = PkgConfigDependency.pkgbin_cache
         if (self.pkgbin, targs, fenv) not in cache:
@@ -75,7 +74,7 @@ index cd77b4b..7e3f338 100644
         return cache[(self.pkgbin, targs, fenv)]
 
     def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
-@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency):
                                       (self.name, out_raw))
         self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
 
@@ -84,7 +83,7 @@ index cd77b4b..7e3f338 100644
         options = ['--variable=' + variable_name, self.name]
 
         if 'define_variable' in kwargs:
-@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
 
             options = ['--define-variable=' + '='.join(definition)] + options
 
@@ -93,34 +92,3 @@ index cd77b4b..7e3f338 100644
         variable = ''
         if ret != 0:
             if self.required:
-diff --git a/mesonbuild/dependencies/ui.py

b/mesonbuild/dependencies/ui.py -index d897d76..a598d2e 100644 ---- a/mesonbuild/dependencies/ui.py
-+++ b/mesonbuild/dependencies/ui.py
-@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):

mesonbuild/dependencies/base.py +0 -14
-         self.bindir = self.get_pkgconfig_host_bins(core)
-         if not self.bindir:
-             # If exec_prefix is not defined, the pkg-config file is broken
--            prefix = core.get_pkgconfig_variable('exec_prefix', {})
-+            prefix = core.get_pkgconfig_variable('exec_prefix', {},
-+ use_native=True)
-             if prefix:
-                 self.bindir = os.path.join(prefix, 'bin')
-
-@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
-         applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
-         for application in applications:
-             try:
--                return os.path.dirname(core.get_pkgconfig_variable('%s_location' %

application, {}))
-+ return
-+ os.path.dirname(core.get_pkgconfig_variable('%s_location' % -+ application, {}, use_native=True))

mesonbuild/dependencies/base.py +0 -13
-             except MesonException:
-                 pass
-
-@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency):
-         QtBaseDependency.__init__(self, 'qt5', env, kwargs)
-
-     def get_pkgconfig_host_bins(self, core):
--        return core.get_pkgconfig_variable('host_bins', {})
-+        return core.get_pkgconfig_variable('host_bins', {},
-+ use_native=True)
-
-     def get_private_includes(self, mod_inc_dir, module):
-         return _qt_get_private_includes(mod_inc_dir, module, self.version)
meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -2
deleted file mode 100644
index 772395e879..0000000000
@@ -1,23 +0,0 @@
-meson.build files that use cc.run() in native builds can silently fallback to
-meson.get_cross_property() in cross builds without an exe-wrapper, but

there's -no way to know that this is happening.

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -2
-
-As the defaults may be pessimistic (for example, disabling the support for a -

feature that should be enabled) emit a warning when the default is used, so that -the recipe can explicitly set the cross property as relevant.

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -2
-
-Upstream-Status: Submitted

[https://github.com/mesonbuild/meson/pull/5071]

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -3
-Signed-off-by: Ross Burton <[email protected]>
-
-diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py -index

3c3cfae0..10e741ae 100644
---- a/mesonbuild/interpreter.py
-+++ b/mesonbuild/interpreter.py
-@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject):

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -8
-             return props[propname]
-         except Exception:
-             if len(args) == 2:
-+                mlog.warning('Cross property %s is using default value
-+ %s' % (propname, args[1]))
-                 return args[1]
-             raise InterpreterException('Unknown cross property: %s.' % propname)
-
meta/recipes- renamed from meta/recipes-devtools/meson/meson_0.57.2.bb +0 -0

devtools/meson/meson_0.58.0.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.57.2.bb rename to meta/recipes-devtools/meson/meson_0.58.0.bb

meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb +0 -1
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
--

2.31.1

#9 lore raw

Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0

Thank you, I will look into it.

Alex

Quoted 467 lines · Chee Yang

Looks like this patch failed buildepoxy.EpoxyTest.test_epoxy test

https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/stdio

https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/stdio

Quoted 11 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Alexander Kanavin
Sent: Monday, 10 May, 2021 9:01 PM
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0

Rebase patches; dropped chunks (and cross-prop-default.patch) have been removed upstream.

Quoted 7 lines

Move native-only patches to all-patches, as they're a pain to rebase separately.

---
meta/recipes-devtools/meson/meson.inc | 10 +---
.../0001-Make-CPU-family-warnings-fatal.patch | 18 +++---

...sues-that-arise-

Quoted 2 lines

when-cross-compiling.patch | 8 +-- ...-not-manipulate-the-environment- when.patch | 14 ++--- ...pport-building-allarch-recipes-again.patch | 10

++--

Quoted 79 lines
.../meson/meson/0003-native_bindir.patch      | 58 +++++--------------
.../meson/meson/cross-prop-default.patch      | 23 --------
.../{meson_0.57.2.bb => meson_0.58.0.bb}      |  0
...on_0.57.2.bb => nativesdk-meson_0.58.0.bb} |  0
9 files changed, 43 insertions(+), 98 deletions(-)  delete mode 100644

meta/recipes-devtools/meson/meson/cross-prop-default.patch rename meta/recipes-devtools/meson/{meson_0.57.2.bb => meson_0.58.0.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk- meson_0.57.2.bb => nativesdk-meson_0.58.0.bb} (100%)

meta/recipes- renamed from meta/recipes-devtools/meson/meson.inc +0 -0

devtools/meson/meson.inc
index 10e7d8a1ce..12a48fc992 100644

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -12,16 +12,12 @@ SRC_URI =

"https://github.com/mesonbuild/meson/releases/download/${PV}/meson- ${P

           file://0003-native_bindir.patch \
           file://0001-python-module-do-not-manipulate-the-environment-
when.patch \
           file://disable-rpath-handling.patch \
-           file://cross-prop-default.patch \
           file://0001-modules-python.py-do-not-substitute-python-s-
install.patch \
           file://gi-target-dep.patch \
meta/recipes-devtools/meson/meson.inc +2 -1
+           file://0001-Make-CPU-family-warnings-fatal.patch \
+           file://0002-Support-building-allarch-recipes-again.patch \
           "
-SRC_URI[sha256sum] =

"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5"

meta/recipes-devtools/meson/meson.inc +1 -5
-
-SRC_URI_append_class-native = " \
-    file://0001-Make-CPU-family-warnings-fatal.patch \
-    file://0002-Support-building-allarch-recipes-again.patch \
-"
+SRC_URI[sha256sum] =

"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd"

UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"

(quoted diff) +0 -0

warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make- CPU-family-warnings-fatal.patch
index 300797f9ee..bcccfabd17 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-fa
+++ tal.patch

meta/recipes-devtools/meson/meson.inc +0 -1
@@ -1,34 +1,33 @@
-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00

2001
+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 2001
From: Ross Burton <[email protected]>
Date: Tue, 3 Jul 2018 13:59:09 +0100

meta/recipes-devtools/meson/meson.inc +1 -1
-Subject: [PATCH] Make CPU family warnings fatal
+Subject: [PATCH 1/2] Make CPU family warnings fatal

Upstream-Status: Inappropriate [OE specific]

meta/recipes-devtools/meson/meson.inc +0 -2
-
---
 mesonbuild/envconfig.py   | 2 +-
 mesonbuild/environment.py | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +0 -0

ba35d16..2d3c34c 100644

mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +1 -0
+index c6a4df3..4d58c91 100644
mesonbuild/envconfig.py +1 -2
-@@ -262,7 +262,7 @@ class MachineInfo:
+@@ -266,7 +266,7 @@ class MachineInfo:
 
         cpu_family = literal['cpu_family']
         if cpu_family not in known_cpu_families:
--            mlog.warning('Unknown CPU family {}, please report this at
Quoted 2 lines

https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
+- mlog.warning(f'Unknown CPU family {cpu_family}, please

report this

Quoted 90 lines

at https://github.com/mesonbuild/meson/issues/new')
+ raise EnvironmentException('Unknown CPU family {}, see
https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))

endian = literal['endian']
if endian not in ('little', 'big'):

mesonbuild/environment.py - renamed from mesonbuild/environment.py +1 -0
index 756dd81..4d2c2b6 100644
+index fc9b703..eea8345 100644
mesonbuild/environment.py +0 -1
-@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) ->

str:
+@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
trial = 'ppc64'

if trial not in known_cpu_families:

mesonbuild/environment.py +3 -0
@@ -39,3 +38,6 @@ index 756dd81..4d2c2b6 100644
 
     return trial
 
+--
+2.24.0
+
(quoted diff) +0 -0

that-arise-when-cross-compiling.patch b/meta/recipes- devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross- compiling.patch
index 471f1500da..ce90e515da 100644
--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that- arise-when-cross-compiling.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-aris +++ e-when-cross-compiling.patch

(quoted diff) +1 -1
@@ -1,4 +1,4 @@
-From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
+From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00

2001
From: Alexander Kanavin <[email protected]>
Date: Fri, 4 Aug 2017 16:16:41 +0300
Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling @@ - 20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <[email protected]>

 1 file changed, 4 insertions(+)
(quoted diff) +0 -0

b/mesonbuild/modules/gnome.py -index bcf77b9..6a4b472 100644

meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +1 -0
+index dc2979e..c9ff9bd 100644
mesonbuild/modules/gnome.py +3 -2
-@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
-             args.append('--{}={}'.format(program_name, path))
+@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
+             args.append(f'--{program_name}={path}')
         if namespace:
             args.append('--namespace=' + namespace)
+        gtkdoc_exe_wrapper =

state.environment.properties.host.get('gtkdoc_exe_wrapper', None)

(quoted diff) +0 -0

not-manipulate-the-environment-when.patch b/meta/recipes- devtools/meson/meson/0001-python-module-do-not-manipulate-the- environment-when.patch
index eb0e90dbdd..fdadc6869b 100644
--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not- manipulate-the-environment-when.patch
+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not- manipu
+++ late-the-environment-when.patch

mesonbuild/modules/gnome.py +1 -1
@@ -1,4 +1,4 @@
-From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
+From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00

2001
From: Alexander Kanavin <[email protected]>
Date: Mon, 19 Nov 2018 14:24:26 +0100
Subject: [PATCH] python module: do not manipulate the environment when calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>

 1 file changed, 12 deletions(-)
(quoted diff) +0 -0

b/mesonbuild/modules/python.py -index 07be318..b770603 100644

mesonbuild/modules/gnome.py +1 -0
+index 422155b..aaf5844 100644
mesonbuild/modules/python.py +1 -1
-@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
+@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
                 old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
                 old_pkg_path = os.environ.get('PKG_CONFIG_PATH')

mesonbuild/modules/python.py index 07be318..b770603 100644 · line 27

Quoted 3 lines
mesonbuild/modules/python.py +0 -1
@@ -26,9 +26,9 @@ index 07be318..b770603 100644
-
                 try:
                     self.pkgdep = PkgConfigDependency(pkg_name,

environment,

Quoted 15 lines
mesonbuild/modules/python.py +2 -3
 kwargs)
-                     mlog.debug('Found "{}" via pkgconfig lookup in LIBPC
 ({})'.format(pkg_name, pkg_libdir))
-@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug('"{}" could not be found in LIBPC
 ({})'.format(pkg_name, pkg_libdir))
+                     mlog.debug(f'Found "{pkg_name}" via pkgconfig
+lookup in LIBPC ({pkg_libdir})') @@ -83,13 +78,6 @@ class

PythonDependency(ExternalDependency):

mesonbuild/modules/python.py +2 -1
+                     mlog.debug(f'"{pkg_name}" could not be found in
+LIBPC ({pkg_libdir})')
                     mlog.debug(e)
 
-                if old_pkg_path is not None:

mesonbuild/modules/python.py index 07be318..b770603 100644 · line 42

Quoted 4 lines
mesonbuild/modules/python.py +0 -3
@@ -39,5 +39,5 @@ index 07be318..b770603 100644
-                else:
-                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
             else:
-                 mlog.debug('"{}" could not be found in LIBPC ({}), this

is likely due to

Quoted 73 lines
mesonbuild/modules/python.py +3 -0
 a relocated python installation'.format(pkg_name, pkg_libdir))
+                 mlog.debug(f'"{pkg_name}" could not be found in LIBPC
+ ({pkg_libdir}), this is likely due to a relocated python
+ installation')
(quoted diff) +0 -0

allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002- Support-building-allarch-recipes-again.patch
index f6175a194c..dcc1ce9c27 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch- recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch- re
+++ cipes-again.patch

(quoted diff) +0 -1
@@ -1,19 +1,18 @@
-From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00

2001
+From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <[email protected]>
Date: Thu, 26 Jul 2018 16:32:49 +0200

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +1 -1
-Subject: [PATCH] Support building allarch recipes again
+Subject: [PATCH 2/2] Support building allarch recipes again

This registers "allarch" as a known CPU family.

Upstream-Status: Inappropriate [OE specific]

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +0 -2
-
---
 mesonbuild/envconfig.py | 1 +
 1 file changed, 1 insertion(+)
mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +0 -0

2d3c34c..b9e7908 100644

mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +1 -0
+index 4d58c91..ff01ad1 100644
mesonbuild/envconfig.py +0 -0
@@ -36,6 +36,7 @@ from pathlib import Path @@ -24,3 +23,6 @@ index

2d3c34c..b9e7908 100644

     'aarch64',
     'alpha',
     'arc',

+--
+2.24.0

mesonbuild/envconfig.py +1 -0
+
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -1
index ed85116c4f..89257b9e05 100644
@@ -1,4 +1,4 @@
-From 1546e1f95a119175b7a4e4272a26dd85505e5ede Mon Sep 17 00:00:00

2001
+From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <[email protected]>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -18,23 +18,22 @@ Signed-off-by: Ricardo Ribalda Delgado

<[email protected]>

---
 mesonbuild/dependencies/base.py | 19 +++++++++++--------

- mesonbuild/dependencies/ui.py | 6 +++---
- 2 files changed, 14 insertions(+), 11 deletions(-)
+ 1 file changed, 11 insertions(+), 8 deletions(-)

(quoted diff) +0 -0

b/mesonbuild/dependencies/base.py -index cd77b4b..7e3f338 100644

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -0
+index 14380d4..d0c443f 100644

mesonbuild/dependencies/base.py

Quoted 6 lines
mesonbuild/dependencies/base.py +1 -2
-@@ -192,7 +192,7 @@ class Dependency:
+@@ -179,7 +179,7 @@ class Dependency:
     def get_exe_args(self, compiler):
         return []
 
-    def get_pkgconfig_variable(self, variable_name: str, kwargs:

T.Dict[str,

Quoted 2 lines

T.Any]) -> str:
+ def get_pkgconfig_variable(self, variable_name: str, kwargs:

T.Dict[str,

Quoted 13 lines

T.Any], use_native=False) -> str:
- raise DependencyException('{!r} is not a pkgconfig
dependency'.format(self.name))

mesonbuild/dependencies/base.py +3 -1
+         raise DependencyException(f'{self.name!r} is not a pkgconfig
+ dependency')
 
     def get_configtool_variable(self, variable_name):
-@@ -280,7 +280,7 @@ class InternalDependency(Dependency):
+@@ -267,7 +267,7 @@ class InternalDependency(Dependency):
             return True
         return any(d.is_built() for d in self.ext_deps)

mesonbuild/dependencies/base.py index cd77b4b..7e3f338 100644 · line 42

Quoted 1 line
mesonbuild/dependencies/base.py +0 -0
@@ -43,7 +42,7 @@ index cd77b4b..7e3f338 100644
         raise DependencyException('Method "get_pkgconfig_variable()" is

'

mesonbuild/dependencies/base.py index cd77b4b..7e3f338 100644 · line 46

Quoted 5 lines
mesonbuild/dependencies/base.py +1 -1
                                   'invalid for an internal dependency')
 
-@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency):
+@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency):
         return s.format(self.__class__.__name__, self.name,

self.is_found,

Quoted 24 lines
mesonbuild/dependencies/base.py +5 -5
                         self.version_reqs)
 
@@ -57,16 +56,16 @@ index cd77b4b..7e3f338 100644
         p, out, err = Popen_safe(cmd, env=env)
         rc, out, err = p.returncode, out.strip(), err.strip()
         call = ' '.join(cmd)
-@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency):
-             env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir
-             mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir)
+@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency):
+             if key.startswith('PKG_'):
+                 mlog.debug(f'env[{key}]: {value}')
 
-    def _call_pkgbin(self, args, env=None):
+    def _call_pkgbin(self, args, env=None, use_native=False):
         # Always copy the environment since we're going to modify it
         # with pkg-config variables
         if env is None:
-@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency):
         targs = tuple(args)
         cache = PkgConfigDependency.pkgbin_cache
         if (self.pkgbin, targs, fenv) not in cache:

mesonbuild/dependencies/base.py index cd77b4b..7e3f338 100644 · line 79

Quoted 7 lines
mesonbuild/dependencies/base.py +1 -1
@@ -75,7 +74,7 @@ index cd77b4b..7e3f338 100644
         return cache[(self.pkgbin, targs, fenv)]
 
     def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
-@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency):
                                       (self.name, out_raw))
         self.link_args, self.raw_link_args = self._search_libs(out,

out_raw)

mesonbuild/dependencies/base.py index cd77b4b..7e3f338 100644 · line 88

Quoted 9 lines
mesonbuild/dependencies/base.py +1 -1
@@ -84,7 +83,7 @@ index cd77b4b..7e3f338 100644
         options = ['--variable=' + variable_name, self.name]
 
         if 'define_variable' in kwargs:
-@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
 
             options = ['--define-variable=' + '='.join(definition)] +

options

mesonbuild/dependencies/base.py

Quoted 13 lines
mesonbuild/dependencies/base.py +0 -1
@@ -93,34 +92,3 @@ index cd77b4b..7e3f338 100644
         variable = ''
         if ret != 0:
             if self.required:
-diff --git a/mesonbuild/dependencies/ui.py

b/mesonbuild/dependencies/ui.py -index d897d76..a598d2e 100644 ---- a/mesonbuild/dependencies/ui.py
-+++ b/mesonbuild/dependencies/ui.py
-@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):

mesonbuild/dependencies/base.py +0 -3
-         self.bindir = self.get_pkgconfig_host_bins(core)
-         if not self.bindir:
-             # If exec_prefix is not defined, the pkg-config file is

broken

mesonbuild/dependencies/base.py

Quoted 11 lines

-- prefix = core.get_pkgconfig_variable('exec_prefix', {})
-+ prefix = core.get_pkgconfig_variable('exec_prefix', {},
-+ use_native=True)

mesonbuild/dependencies/base.py +0 -8
-             if prefix:
-                 self.bindir = os.path.join(prefix, 'bin')
-
-@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
-         applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
-         for application in applications:
-             try:
--                return

os.path.dirname(core.get_pkgconfig_variable('%s_location' %

Quoted 7 lines

application, {}))
-+ return
-+ os.path.dirname(core.get_pkgconfig_variable('%s_location' % -+ application, {}, use_native=True))

mesonbuild/dependencies/base.py +0 -3
-             except MesonException:
-                 pass
-

mesonbuild/dependencies/base.py

Quoted 10 lines
mesonbuild/dependencies/base.py +0 -10
-@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency):
-         QtBaseDependency.__init__(self, 'qt5', env, kwargs)
-
-     def get_pkgconfig_host_bins(self, core):
--        return core.get_pkgconfig_variable('host_bins', {})
-+        return core.get_pkgconfig_variable('host_bins', {},
-+ use_native=True)
-
-     def get_private_includes(self, mod_inc_dir, module):
-         return _qt_get_private_includes(mod_inc_dir, module,

self.version)

meta/recipes-devtools/meson/meson/cross-prop-default.patch line 1

Quoted 8 lines
meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -1
deleted file mode 100644
index 772395e879..0000000000
@@ -1,23 +0,0 @@
-meson.build files that use cc.run() in native builds can silently

fallback to

meta/recipes-devtools/meson/meson/cross-prop-default.patch

Quoted 4 lines
meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -1
-meson.get_cross_property() in cross builds without an exe-wrapper, but

there's -no way to know that this is happening.

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -2
-
-As the defaults may be pessimistic (for example, disabling the support

for a -

Quoted 1 line

feature that should be enabled) emit a warning when the default is used,

so

Quoted 11 lines

that -the recipe can explicitly set the cross property as relevant.

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -2
-
-Upstream-Status: Submitted

[https://github.com/mesonbuild/meson/pull/5071]

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -3
-Signed-off-by: Ross Burton <[email protected]>
-
-diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py -index

3c3cfae0..10e741ae 100644
---- a/mesonbuild/interpreter.py
-+++ b/mesonbuild/interpreter.py
-@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject):

meta/recipes-devtools/meson/meson/cross-prop-default.patch

Quoted 7 lines
meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -7
-             return props[propname]
-         except Exception:
-             if len(args) == 2:
-+                mlog.warning('Cross property %s is using default value
-+ %s' % (propname, args[1]))
-                 return args[1]
-             raise InterpreterException('Unknown cross property: %s.' %

propname)

Quoted 13 lines
meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -1
-
meta/recipes- renamed from meta/recipes-devtools/meson/meson_0.57.2.bb +0 -0

devtools/meson/meson_0.58.0.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.57.2.bb rename to meta/recipes-devtools/meson/meson_0.58.0.bb

meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb +0 -1
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
--

2.31.1

#10 lore raw

Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0

I think these error is related to this patch or the gdk-pixbuf patch in this series . meson
https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/2089/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/1635/steps/11/logs/stdio
gdk-pixbuf
https://autobuilder.yoctoproject.org/typhoon/#/builders/119/builds/271/steps/12/logs/stdio

From: Alexander Kanavin <[email protected]>
Sent: Thursday, 13 May, 2021 1:04 AM
To: Lee, Chee Yang <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0

Thank you, I will look into it.

Alex

On Wed, 12 May 2021 at 13:26, Lee, Chee Yang <[email protected]<mailto:[email protected]>> wrote:
Looks like this patch failed buildepoxy.EpoxyTest.test_epoxy test

https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/stdio

Quoted 438 lines

-----Original Message-----
From: [email protected]<mailto:[email protected]> <openembedded- [email protected]<mailto:[email protected]>> On Behalf Of Alexander Kanavin
Sent: Monday, 10 May, 2021 9:01 PM
To: [email protected]<mailto:[email protected]>
Cc: Alexander Kanavin <[email protected]<mailto:[email protected]>>
Subject: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0

Rebase patches; dropped chunks (and cross-prop-default.patch) have been removed upstream.

Move native-only patches to all-patches, as they're a pain to rebase separately.

---
meta/recipes-devtools/meson/meson.inc | 10 +---
.../0001-Make-CPU-family-warnings-fatal.patch | 18 +++--- ...sues-that-arise- when-cross-compiling.patch | 8 +-- ...-not-manipulate-the-environment-
when.patch | 14 ++--- ...pport-building-allarch-recipes-again.patch | 10 ++--
.../meson/meson/0003-native_bindir.patch | 58 +++++--------------
.../meson/meson/cross-prop-default.patch | 23 --------
.../{meson_0.57.2.bb<http://meson_0.57.2.bb> => meson_0.58.0.bb<http://meson_0.58.0.bb>} | 0
...on_0.57.2.bb<http://on_0.57.2.bb> => nativesdk-meson_0.58.0.bb<http://nativesdk-meson_0.58.0.bb>} | 0

9 files changed, 43 insertions(+), 98 deletions(-)  delete mode 100644

meta/recipes-devtools/meson/meson/cross-prop-default.patch
rename meta/recipes-devtools/meson/{meson_0.57.2.bb<http://meson_0.57.2.bb> => meson_0.58.0.bb<http://meson_0.58.0.bb>} (100%) rename meta/recipes-devtools/meson/{nativesdk- meson_0.57.2.bb<http://meson_0.57.2.bb> => nativesdk-meson_0.58.0.bb<http://nativesdk-meson_0.58.0.bb>} (100%)

meta/recipes- renamed from meta/recipes-devtools/meson/meson.inc +0 -0

devtools/meson/meson.inc
index 10e7d8a1ce..12a48fc992 100644

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -12,16 +12,12 @@ SRC_URI =

"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-<https://github.com/mesonbuild/meson/releases/download/$%7BPV%7D/meson-> ${P

           file://0003-native_bindir.patch \
           file://0001-python-module-do-not-manipulate-the-environment-
when.patch \
           file://disable-rpath-handling.patch \
-           file://cross-prop-default.patch \
           file://0001-modules-python.py-do-not-substitute-python-s-
install.patch \
           file://gi-target-dep.patch \
meta/recipes-devtools/meson/meson.inc +2 -1
+           file://0001-Make-CPU-family-warnings-fatal.patch \
+           file://0002-Support-building-allarch-recipes-again.patch \
           "
-SRC_URI[sha256sum] =

"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5"

meta/recipes-devtools/meson/meson.inc +1 -5
-
-SRC_URI_append_class-native = " \
-    file://0001-Make-CPU-family-warnings-fatal.patch \
-    file://0002-Support-building-allarch-recipes-again.patch \
-"
+SRC_URI[sha256sum] =

"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd"

UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"

(quoted diff) +0 -0

warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make- CPU-family-warnings-fatal.patch
index 300797f9ee..bcccfabd17 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-fa
+++ tal.patch

meta/recipes-devtools/meson/meson.inc +0 -1
@@ -1,34 +1,33 @@
-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00

2001
+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 2001
From: Ross Burton <[email protected]<mailto:[email protected]>>
Date: Tue, 3 Jul 2018 13:59:09 +0100

meta/recipes-devtools/meson/meson.inc +1 -1
-Subject: [PATCH] Make CPU family warnings fatal
+Subject: [PATCH 1/2] Make CPU family warnings fatal

Upstream-Status: Inappropriate [OE specific]

meta/recipes-devtools/meson/meson.inc +0 -2
-
---
 mesonbuild/envconfig.py   | 2 +-
 mesonbuild/environment.py | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +0 -0

ba35d16..2d3c34c 100644

mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +1 -0
+index c6a4df3..4d58c91 100644
mesonbuild/envconfig.py +1 -2
-@@ -262,7 +262,7 @@ class MachineInfo:
+@@ -266,7 +266,7 @@ class MachineInfo:
 
         cpu_family = literal['cpu_family']
         if cpu_family not in known_cpu_families:
--            mlog.warning('Unknown CPU family {}, please report this at

https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
+- mlog.warning(f'Unknown CPU family {cpu_family}, please report this
at https://github.com/mesonbuild/meson/issues/new')
+ raise EnvironmentException('Unknown CPU family {}, see
https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))

endian = literal['endian']
if endian not in ('little', 'big'):

mesonbuild/environment.py - renamed from mesonbuild/environment.py +1 -0
index 756dd81..4d2c2b6 100644
+index fc9b703..eea8345 100644
mesonbuild/environment.py +0 -1
-@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) ->

str:
+@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
trial = 'ppc64'

if trial not in known_cpu_families:

mesonbuild/environment.py +3 -0
@@ -39,3 +38,6 @@ index 756dd81..4d2c2b6 100644
 
     return trial
 
+--
+2.24.0
+
(quoted diff) +0 -0

that-arise-when-cross-compiling.patch b/meta/recipes- devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross- compiling.patch
index 471f1500da..ce90e515da 100644
--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that- arise-when-cross-compiling.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-aris +++ e-when-cross-compiling.patch

(quoted diff) +1 -1
@@ -1,4 +1,4 @@
-From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
+From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00

2001
From: Alexander Kanavin <[email protected]<mailto:[email protected]>>
Date: Fri, 4 Aug 2017 16:16:41 +0300
Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling @@ -
20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <[email protected]<mailto:[email protected]>>

 1 file changed, 4 insertions(+)
(quoted diff) +0 -0

b/mesonbuild/modules/gnome.py -index bcf77b9..6a4b472 100644

meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +1 -0
+index dc2979e..c9ff9bd 100644
mesonbuild/modules/gnome.py +3 -2
-@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
-             args.append('--{}={}'.format(program_name, path))
+@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
+             args.append(f'--{program_name}={path}')
         if namespace:
             args.append('--namespace=' + namespace)
+        gtkdoc_exe_wrapper =

state.environment.properties.host.get('gtkdoc_exe_wrapper', None)

(quoted diff) +0 -0

not-manipulate-the-environment-when.patch b/meta/recipes- devtools/meson/meson/0001-python-module-do-not-manipulate-the- environment-when.patch
index eb0e90dbdd..fdadc6869b 100644
--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not- manipulate-the-environment-when.patch
+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not- manipu
+++ late-the-environment-when.patch

mesonbuild/modules/gnome.py +1 -1
@@ -1,4 +1,4 @@
-From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
+From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00

2001
From: Alexander Kanavin <[email protected]<mailto:[email protected]>>
Date: Mon, 19 Nov 2018 14:24:26 +0100
Subject: [PATCH] python module: do not manipulate the environment when calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <[email protected]<mailto:[email protected]>>

 1 file changed, 12 deletions(-)
(quoted diff) +0 -0

b/mesonbuild/modules/python.py -index 07be318..b770603 100644

mesonbuild/modules/gnome.py +1 -0
+index 422155b..aaf5844 100644
mesonbuild/modules/python.py +3 -5
-@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
+@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
                 old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
                 old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
@@ -26,9 +26,9 @@ index 07be318..b770603 100644
-
                 try:
                     self.pkgdep = PkgConfigDependency(pkg_name, environment,
 kwargs)
-                     mlog.debug('Found "{}" via pkgconfig lookup in LIBPC
 ({})'.format(pkg_name, pkg_libdir))
-@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug('"{}" could not be found in LIBPC
 ({})'.format(pkg_name, pkg_libdir))
+                     mlog.debug(f'Found "{pkg_name}" via pkgconfig
+lookup in LIBPC ({pkg_libdir})') @@ -83,13 +78,6 @@ class

PythonDependency(ExternalDependency):

mesonbuild/modules/python.py +5 -4
+                     mlog.debug(f'"{pkg_name}" could not be found in
+LIBPC ({pkg_libdir})')
                     mlog.debug(e)
 
-                if old_pkg_path is not None:
@@ -39,5 +39,5 @@ index 07be318..b770603 100644
-                else:
-                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
             else:
-                 mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to
 a relocated python installation'.format(pkg_name, pkg_libdir))
+                 mlog.debug(f'"{pkg_name}" could not be found in LIBPC
+ ({pkg_libdir}), this is likely due to a relocated python
+ installation')
(quoted diff) +0 -0

allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002- Support-building-allarch-recipes-again.patch
index f6175a194c..dcc1ce9c27 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch- recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch- re
+++ cipes-again.patch

(quoted diff) +0 -1
@@ -1,19 +1,18 @@
-From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00

2001
+From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <[email protected]<mailto:[email protected]>>
Date: Thu, 26 Jul 2018 16:32:49 +0200

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +1 -1
-Subject: [PATCH] Support building allarch recipes again
+Subject: [PATCH 2/2] Support building allarch recipes again

This registers "allarch" as a known CPU family.

Upstream-Status: Inappropriate [OE specific]

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +0 -2
-
---
 mesonbuild/envconfig.py | 1 +
 1 file changed, 1 insertion(+)
mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +0 -0

2d3c34c..b9e7908 100644

mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +1 -0
+index 4d58c91..ff01ad1 100644
mesonbuild/envconfig.py +0 -0
@@ -36,6 +36,7 @@ from pathlib import Path @@ -24,3 +23,6 @@ index

2d3c34c..b9e7908 100644

     'aarch64',
     'alpha',
     'arc',

+--
+2.24.0

mesonbuild/envconfig.py +1 -0
+
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -1
index ed85116c4f..89257b9e05 100644
@@ -1,4 +1,4 @@
-From 1546e1f95a119175b7a4e4272a26dd85505e5ede Mon Sep 17 00:00:00

2001
+From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00
2001
From: Ricardo Ribalda Delgado <[email protected]<mailto:[email protected]>>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -18,23 +18,22 @@ Signed-off-by: Ricardo Ribalda Delgado

<[email protected]<mailto:[email protected]>>

---
 mesonbuild/dependencies/base.py | 19 +++++++++++--------

- mesonbuild/dependencies/ui.py | 6 +++---
- 2 files changed, 14 insertions(+), 11 deletions(-)
+ 1 file changed, 11 insertions(+), 8 deletions(-)

(quoted diff) +0 -0

b/mesonbuild/dependencies/base.py -index cd77b4b..7e3f338 100644

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -0
+index 14380d4..d0c443f 100644
mesonbuild/dependencies/base.py +1 -2
-@@ -192,7 +192,7 @@ class Dependency:
+@@ -179,7 +179,7 @@ class Dependency:
     def get_exe_args(self, compiler):
         return []
 
-    def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str,

T.Any]) -> str:
+ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str,
T.Any], use_native=False) -> str:
- raise DependencyException('{!r} is not a pkgconfig
dependency'.format(self.name<http://self.name>))

mesonbuild/dependencies/base.py +11 -10
+         raise DependencyException(f'{self.name<http://self.name>!r} is not a pkgconfig
+ dependency')
 
     def get_configtool_variable(self, variable_name):
-@@ -280,7 +280,7 @@ class InternalDependency(Dependency):
+@@ -267,7 +267,7 @@ class InternalDependency(Dependency):
             return True
         return any(d.is_built() for d in self.ext_deps)
@@ -43,7 +42,7 @@ index cd77b4b..7e3f338 100644
         raise DependencyException('Method "get_pkgconfig_variable()" is '
                                   'invalid for an internal dependency')
 
-@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency):
+@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency):
         return s.format(self.__class__.__name__, self.name<http://self.name>, self.is_found,
                         self.version_reqs)
 
@@ -57,16 +56,16 @@ index cd77b4b..7e3f338 100644
         p, out, err = Popen_safe(cmd, env=env)
         rc, out, err = p.returncode, out.strip(), err.strip()
         call = ' '.join(cmd)
-@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency):
-             env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir
-             mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir)
+@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency):
+             if key.startswith('PKG_'):
+                 mlog.debug(f'env[{key}]: {value}')
 
-    def _call_pkgbin(self, args, env=None):
+    def _call_pkgbin(self, args, env=None, use_native=False):
         # Always copy the environment since we're going to modify it
         # with pkg-config variables
         if env is None:
-@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency):
         targs = tuple(args)
         cache = PkgConfigDependency.pkgbin_cache
         if (self.pkgbin, targs, fenv) not in cache:
@@ -75,7 +74,7 @@ index cd77b4b..7e3f338 100644
         return cache[(self.pkgbin, targs, fenv)]
 
     def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
-@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency):
                                       (self.name<http://self.name>, out_raw))
         self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
 
@@ -84,7 +83,7 @@ index cd77b4b..7e3f338 100644
         options = ['--variable=' + variable_name, self.name<http://self.name>]
 
         if 'define_variable' in kwargs:
-@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
 
             options = ['--define-variable=' + '='.join(definition)] + options
 
@@ -93,34 +92,3 @@ index cd77b4b..7e3f338 100644
         variable = ''
         if ret != 0:
             if self.required:
-diff --git a/mesonbuild/dependencies/ui.py

b/mesonbuild/dependencies/ui.py -index d897d76..a598d2e 100644 ---- a/mesonbuild/dependencies/ui.py
-+++ b/mesonbuild/dependencies/ui.py
-@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):

mesonbuild/dependencies/base.py +0 -14
-         self.bindir = self.get_pkgconfig_host_bins(core)
-         if not self.bindir:
-             # If exec_prefix is not defined, the pkg-config file is broken
--            prefix = core.get_pkgconfig_variable('exec_prefix', {})
-+            prefix = core.get_pkgconfig_variable('exec_prefix', {},
-+ use_native=True)
-             if prefix:
-                 self.bindir = os.path.join(prefix, 'bin')
-
-@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
-         applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
-         for application in applications:
-             try:
--                return os.path.dirname(core.get_pkgconfig_variable('%s_location' %

application, {}))
-+ return
-+ os.path.dirname(core.get_pkgconfig_variable('%s_location' % -+ application, {}, use_native=True))

mesonbuild/dependencies/base.py +0 -13
-             except MesonException:
-                 pass
-
-@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency):
-         QtBaseDependency.__init__(self, 'qt5', env, kwargs)
-
-     def get_pkgconfig_host_bins(self, core):
--        return core.get_pkgconfig_variable('host_bins', {})
-+        return core.get_pkgconfig_variable('host_bins', {},
-+ use_native=True)
-
-     def get_private_includes(self, mod_inc_dir, module):
-         return _qt_get_private_includes(mod_inc_dir, module, self.version)
meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -2
deleted file mode 100644
index 772395e879..0000000000
@@ -1,23 +0,0 @@
-meson.build files that use cc.run() in native builds can silently fallback to
-meson.get_cross_property() in cross builds without an exe-wrapper, but

there's -no way to know that this is happening.

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -2
-
-As the defaults may be pessimistic (for example, disabling the support for a -

feature that should be enabled) emit a warning when the default is used, so that -the recipe can explicitly set the cross property as relevant.

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -2
-
-Upstream-Status: Submitted

[https://github.com/mesonbuild/meson/pull/5071]

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -3
-Signed-off-by: Ross Burton <[email protected]<mailto:[email protected]>>
-
-diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py -index

3c3cfae0..10e741ae 100644
---- a/mesonbuild/interpreter.py
-+++ b/mesonbuild/interpreter.py
-@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject):

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -8
-             return props[propname]
-         except Exception:
-             if len(args) == 2:
-+                mlog.warning('Cross property %s is using default value
-+ %s' % (propname, args[1]))
-                 return args[1]
-             raise InterpreterException('Unknown cross property: %s.' % propname)
-
meta/recipes- renamed from meta/recipes-devtools/meson/meson_0.57.2.bb<http://meson_0.57.2.bb> +0 -0

devtools/meson/meson_0.58.0.bb<http://meson_0.58.0.bb>
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.57.2.bb<http://meson_0.57.2.bb> rename to meta/recipes-devtools/meson/meson_0.58.0.bb<http://meson_0.58.0.bb>

meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb<http://nativesdk-meson_0.58.0.bb> renamed from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb<http://nativesdk-meson_0.57.2.bb> +0 -1
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb<http://nativesdk-meson_0.57.2.bb>
rename to meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb<http://nativesdk-meson_0.58.0.bb>
--

2.31.1

#11 lore raw

Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0

I'm addressing that as well, thanks for notifying.

Alex

Quoted 501 lines · Chee Yang

I think these error is related to this patch or the gdk-pixbuf patch in this series .
meson

https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/2089/steps/14/logs/stdio

https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/1635/steps/11/logs/stdio
gdk-pixbuf

https://autobuilder.yoctoproject.org/typhoon/#/builders/119/builds/271/steps/12/logs/stdio

*From:* Alexander Kanavin <[email protected]> *Sent:* Thursday, 13 May, 2021 1:04 AM
*To:* Lee, Chee Yang <[email protected]>
*Cc:* [email protected] *Subject:* Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0

Thank you, I will look into it.

Alex

On Wed, 12 May 2021 at 13:26, Lee, Chee Yang <[email protected]> wrote:

Looks like this patch failed buildepoxy.EpoxyTest.test_epoxy test

https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/stdio

https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/stdio

Quoted 11 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Alexander Kanavin
Sent: Monday, 10 May, 2021 9:01 PM
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0

Rebase patches; dropped chunks (and cross-prop-default.patch) have been removed upstream.

Quoted 7 lines

Move native-only patches to all-patches, as they're a pain to rebase separately.

---
meta/recipes-devtools/meson/meson.inc | 10 +---
.../0001-Make-CPU-family-warnings-fatal.patch | 18 +++---

...sues-that-arise-

Quoted 2 lines

when-cross-compiling.patch | 8 +-- ...-not-manipulate-the-environment- when.patch | 14 ++--- ...pport-building-allarch-recipes-again.patch | 10

++--

Quoted 79 lines
.../meson/meson/0003-native_bindir.patch      | 58 +++++--------------
.../meson/meson/cross-prop-default.patch      | 23 --------
.../{meson_0.57.2.bb => meson_0.58.0.bb}      |  0
...on_0.57.2.bb => nativesdk-meson_0.58.0.bb} |  0
9 files changed, 43 insertions(+), 98 deletions(-)  delete mode 100644

meta/recipes-devtools/meson/meson/cross-prop-default.patch rename meta/recipes-devtools/meson/{meson_0.57.2.bb => meson_0.58.0.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk- meson_0.57.2.bb => nativesdk-meson_0.58.0.bb} (100%)

meta/recipes- renamed from meta/recipes-devtools/meson/meson.inc +0 -0

devtools/meson/meson.inc
index 10e7d8a1ce..12a48fc992 100644

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -12,16 +12,12 @@ SRC_URI =

"https://github.com/mesonbuild/meson/releases/download/${PV}/meson- ${P

           file://0003-native_bindir.patch \
           file://0001-python-module-do-not-manipulate-the-environment-
when.patch \
           file://disable-rpath-handling.patch \
-           file://cross-prop-default.patch \
           file://0001-modules-python.py-do-not-substitute-python-s-
install.patch \
           file://gi-target-dep.patch \
meta/recipes-devtools/meson/meson.inc +2 -1
+           file://0001-Make-CPU-family-warnings-fatal.patch \
+           file://0002-Support-building-allarch-recipes-again.patch \
           "
-SRC_URI[sha256sum] =

"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5"

meta/recipes-devtools/meson/meson.inc +1 -5
-
-SRC_URI_append_class-native = " \
-    file://0001-Make-CPU-family-warnings-fatal.patch \
-    file://0002-Support-building-allarch-recipes-again.patch \
-"
+SRC_URI[sha256sum] =

"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd"

UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"

(quoted diff) +0 -0

warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make- CPU-family-warnings-fatal.patch
index 300797f9ee..bcccfabd17 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-fa
+++ tal.patch

meta/recipes-devtools/meson/meson.inc +0 -1
@@ -1,34 +1,33 @@
-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00

2001
+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 2001
From: Ross Burton <[email protected]>
Date: Tue, 3 Jul 2018 13:59:09 +0100

meta/recipes-devtools/meson/meson.inc +1 -1
-Subject: [PATCH] Make CPU family warnings fatal
+Subject: [PATCH 1/2] Make CPU family warnings fatal

Upstream-Status: Inappropriate [OE specific]

meta/recipes-devtools/meson/meson.inc +0 -2
-
---
 mesonbuild/envconfig.py   | 2 +-
 mesonbuild/environment.py | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +0 -0

ba35d16..2d3c34c 100644

mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +1 -0
+index c6a4df3..4d58c91 100644
mesonbuild/envconfig.py +1 -2
-@@ -262,7 +262,7 @@ class MachineInfo:
+@@ -266,7 +266,7 @@ class MachineInfo:
 
         cpu_family = literal['cpu_family']
         if cpu_family not in known_cpu_families:
--            mlog.warning('Unknown CPU family {}, please report this at
Quoted 2 lines

https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
+- mlog.warning(f'Unknown CPU family {cpu_family}, please

report this

Quoted 90 lines

at https://github.com/mesonbuild/meson/issues/new')
+ raise EnvironmentException('Unknown CPU family {}, see
https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))

endian = literal['endian']
if endian not in ('little', 'big'):

mesonbuild/environment.py - renamed from mesonbuild/environment.py +1 -0
index 756dd81..4d2c2b6 100644
+index fc9b703..eea8345 100644
mesonbuild/environment.py +0 -1
-@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) ->

str:
+@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
trial = 'ppc64'

if trial not in known_cpu_families:

mesonbuild/environment.py +3 -0
@@ -39,3 +38,6 @@ index 756dd81..4d2c2b6 100644
 
     return trial
 
+--
+2.24.0
+
(quoted diff) +0 -0

that-arise-when-cross-compiling.patch b/meta/recipes- devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross- compiling.patch
index 471f1500da..ce90e515da 100644
--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that- arise-when-cross-compiling.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-aris +++ e-when-cross-compiling.patch

(quoted diff) +1 -1
@@ -1,4 +1,4 @@
-From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
+From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00

2001
From: Alexander Kanavin <[email protected]>
Date: Fri, 4 Aug 2017 16:16:41 +0300
Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling @@ - 20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <[email protected]>

 1 file changed, 4 insertions(+)
(quoted diff) +0 -0

b/mesonbuild/modules/gnome.py -index bcf77b9..6a4b472 100644

meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +1 -0
+index dc2979e..c9ff9bd 100644
mesonbuild/modules/gnome.py +3 -2
-@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
-             args.append('--{}={}'.format(program_name, path))
+@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
+             args.append(f'--{program_name}={path}')
         if namespace:
             args.append('--namespace=' + namespace)
+        gtkdoc_exe_wrapper =

state.environment.properties.host.get('gtkdoc_exe_wrapper', None)

(quoted diff) +0 -0

not-manipulate-the-environment-when.patch b/meta/recipes- devtools/meson/meson/0001-python-module-do-not-manipulate-the- environment-when.patch
index eb0e90dbdd..fdadc6869b 100644
--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not- manipulate-the-environment-when.patch
+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not- manipu
+++ late-the-environment-when.patch

mesonbuild/modules/gnome.py +1 -1
@@ -1,4 +1,4 @@
-From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
+From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00

2001
From: Alexander Kanavin <[email protected]>
Date: Mon, 19 Nov 2018 14:24:26 +0100
Subject: [PATCH] python module: do not manipulate the environment when calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>

 1 file changed, 12 deletions(-)
(quoted diff) +0 -0

b/mesonbuild/modules/python.py -index 07be318..b770603 100644

mesonbuild/modules/gnome.py +1 -0
+index 422155b..aaf5844 100644
mesonbuild/modules/python.py +1 -1
-@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
+@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
                 old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
                 old_pkg_path = os.environ.get('PKG_CONFIG_PATH')

mesonbuild/modules/python.py index 07be318..b770603 100644 · line 27

Quoted 3 lines
mesonbuild/modules/python.py +0 -1
@@ -26,9 +26,9 @@ index 07be318..b770603 100644
-
                 try:
                     self.pkgdep = PkgConfigDependency(pkg_name,

environment,

Quoted 15 lines
mesonbuild/modules/python.py +2 -3
 kwargs)
-                     mlog.debug('Found "{}" via pkgconfig lookup in LIBPC
 ({})'.format(pkg_name, pkg_libdir))
-@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug('"{}" could not be found in LIBPC
 ({})'.format(pkg_name, pkg_libdir))
+                     mlog.debug(f'Found "{pkg_name}" via pkgconfig
+lookup in LIBPC ({pkg_libdir})') @@ -83,13 +78,6 @@ class

PythonDependency(ExternalDependency):

mesonbuild/modules/python.py +2 -1
+                     mlog.debug(f'"{pkg_name}" could not be found in
+LIBPC ({pkg_libdir})')
                     mlog.debug(e)
 
-                if old_pkg_path is not None:

mesonbuild/modules/python.py index 07be318..b770603 100644 · line 42

Quoted 4 lines
mesonbuild/modules/python.py +0 -3
@@ -39,5 +39,5 @@ index 07be318..b770603 100644
-                else:
-                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
             else:
-                 mlog.debug('"{}" could not be found in LIBPC ({}), this

is likely due to

Quoted 73 lines
mesonbuild/modules/python.py +3 -0
 a relocated python installation'.format(pkg_name, pkg_libdir))
+                 mlog.debug(f'"{pkg_name}" could not be found in LIBPC
+ ({pkg_libdir}), this is likely due to a relocated python
+ installation')
(quoted diff) +0 -0

allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002- Support-building-allarch-recipes-again.patch
index f6175a194c..dcc1ce9c27 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch- recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch- re
+++ cipes-again.patch

(quoted diff) +0 -1
@@ -1,19 +1,18 @@
-From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00

2001
+From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <[email protected]>
Date: Thu, 26 Jul 2018 16:32:49 +0200

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +1 -1
-Subject: [PATCH] Support building allarch recipes again
+Subject: [PATCH 2/2] Support building allarch recipes again

This registers "allarch" as a known CPU family.

Upstream-Status: Inappropriate [OE specific]

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +0 -2
-
---
 mesonbuild/envconfig.py | 1 +
 1 file changed, 1 insertion(+)
mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +0 -0

2d3c34c..b9e7908 100644

mesonbuild/envconfig.py -index renamed from mesonbuild/envconfig.py +1 -0
+index 4d58c91..ff01ad1 100644
mesonbuild/envconfig.py +0 -0
@@ -36,6 +36,7 @@ from pathlib import Path @@ -24,3 +23,6 @@ index

2d3c34c..b9e7908 100644

     'aarch64',
     'alpha',
     'arc',

+--
+2.24.0

mesonbuild/envconfig.py +1 -0
+
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -1
index ed85116c4f..89257b9e05 100644
@@ -1,4 +1,4 @@
-From 1546e1f95a119175b7a4e4272a26dd85505e5ede Mon Sep 17 00:00:00

2001
+From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <[email protected]>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -18,23 +18,22 @@ Signed-off-by: Ricardo Ribalda Delgado

<[email protected]>

---
 mesonbuild/dependencies/base.py | 19 +++++++++++--------

- mesonbuild/dependencies/ui.py | 6 +++---
- 2 files changed, 14 insertions(+), 11 deletions(-)
+ 1 file changed, 11 insertions(+), 8 deletions(-)

(quoted diff) +0 -0

b/mesonbuild/dependencies/base.py -index cd77b4b..7e3f338 100644

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -0
+index 14380d4..d0c443f 100644

mesonbuild/dependencies/base.py

Quoted 6 lines
mesonbuild/dependencies/base.py +1 -2
-@@ -192,7 +192,7 @@ class Dependency:
+@@ -179,7 +179,7 @@ class Dependency:
     def get_exe_args(self, compiler):
         return []
 
-    def get_pkgconfig_variable(self, variable_name: str, kwargs:

T.Dict[str,

Quoted 2 lines

T.Any]) -> str:
+ def get_pkgconfig_variable(self, variable_name: str, kwargs:

T.Dict[str,

Quoted 13 lines

T.Any], use_native=False) -> str:
- raise DependencyException('{!r} is not a pkgconfig
dependency'.format(self.name))

mesonbuild/dependencies/base.py +3 -1
+         raise DependencyException(f'{self.name!r} is not a pkgconfig
+ dependency')
 
     def get_configtool_variable(self, variable_name):
-@@ -280,7 +280,7 @@ class InternalDependency(Dependency):
+@@ -267,7 +267,7 @@ class InternalDependency(Dependency):
             return True
         return any(d.is_built() for d in self.ext_deps)

mesonbuild/dependencies/base.py index cd77b4b..7e3f338 100644 · line 42

Quoted 1 line
mesonbuild/dependencies/base.py +0 -0
@@ -43,7 +42,7 @@ index cd77b4b..7e3f338 100644
         raise DependencyException('Method "get_pkgconfig_variable()" is

'

mesonbuild/dependencies/base.py index cd77b4b..7e3f338 100644 · line 46

Quoted 5 lines
mesonbuild/dependencies/base.py +1 -1
                                   'invalid for an internal dependency')
 
-@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency):
+@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency):
         return s.format(self.__class__.__name__, self.name,

self.is_found,

Quoted 24 lines
mesonbuild/dependencies/base.py +5 -5
                         self.version_reqs)
 
@@ -57,16 +56,16 @@ index cd77b4b..7e3f338 100644
         p, out, err = Popen_safe(cmd, env=env)
         rc, out, err = p.returncode, out.strip(), err.strip()
         call = ' '.join(cmd)
-@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency):
-             env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir
-             mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir)
+@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency):
+             if key.startswith('PKG_'):
+                 mlog.debug(f'env[{key}]: {value}')
 
-    def _call_pkgbin(self, args, env=None):
+    def _call_pkgbin(self, args, env=None, use_native=False):
         # Always copy the environment since we're going to modify it
         # with pkg-config variables
         if env is None:
-@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency):
         targs = tuple(args)
         cache = PkgConfigDependency.pkgbin_cache
         if (self.pkgbin, targs, fenv) not in cache:

mesonbuild/dependencies/base.py index cd77b4b..7e3f338 100644 · line 79

Quoted 7 lines
mesonbuild/dependencies/base.py +1 -1
@@ -75,7 +74,7 @@ index cd77b4b..7e3f338 100644
         return cache[(self.pkgbin, targs, fenv)]
 
     def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
-@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency):
                                       (self.name, out_raw))
         self.link_args, self.raw_link_args = self._search_libs(out,

out_raw)

mesonbuild/dependencies/base.py index cd77b4b..7e3f338 100644 · line 88

Quoted 9 lines
mesonbuild/dependencies/base.py +1 -1
@@ -84,7 +83,7 @@ index cd77b4b..7e3f338 100644
         options = ['--variable=' + variable_name, self.name]
 
         if 'define_variable' in kwargs:
-@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
 
             options = ['--define-variable=' + '='.join(definition)] +

options

mesonbuild/dependencies/base.py

Quoted 13 lines
mesonbuild/dependencies/base.py +0 -1
@@ -93,34 +92,3 @@ index cd77b4b..7e3f338 100644
         variable = ''
         if ret != 0:
             if self.required:
-diff --git a/mesonbuild/dependencies/ui.py

b/mesonbuild/dependencies/ui.py -index d897d76..a598d2e 100644 ---- a/mesonbuild/dependencies/ui.py
-+++ b/mesonbuild/dependencies/ui.py
-@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):

mesonbuild/dependencies/base.py +0 -3
-         self.bindir = self.get_pkgconfig_host_bins(core)
-         if not self.bindir:
-             # If exec_prefix is not defined, the pkg-config file is

broken

mesonbuild/dependencies/base.py

Quoted 11 lines

-- prefix = core.get_pkgconfig_variable('exec_prefix', {})
-+ prefix = core.get_pkgconfig_variable('exec_prefix', {},
-+ use_native=True)

mesonbuild/dependencies/base.py +0 -8
-             if prefix:
-                 self.bindir = os.path.join(prefix, 'bin')
-
-@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
-         applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
-         for application in applications:
-             try:
--                return

os.path.dirname(core.get_pkgconfig_variable('%s_location' %

Quoted 7 lines

application, {}))
-+ return
-+ os.path.dirname(core.get_pkgconfig_variable('%s_location' % -+ application, {}, use_native=True))

mesonbuild/dependencies/base.py +0 -3
-             except MesonException:
-                 pass
-

mesonbuild/dependencies/base.py

Quoted 10 lines
mesonbuild/dependencies/base.py +0 -10
-@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency):
-         QtBaseDependency.__init__(self, 'qt5', env, kwargs)
-
-     def get_pkgconfig_host_bins(self, core):
--        return core.get_pkgconfig_variable('host_bins', {})
-+        return core.get_pkgconfig_variable('host_bins', {},
-+ use_native=True)
-
-     def get_private_includes(self, mod_inc_dir, module):
-         return _qt_get_private_includes(mod_inc_dir, module,

self.version)

meta/recipes-devtools/meson/meson/cross-prop-default.patch line 1

Quoted 8 lines
meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -1
deleted file mode 100644
index 772395e879..0000000000
@@ -1,23 +0,0 @@
-meson.build files that use cc.run() in native builds can silently

fallback to

meta/recipes-devtools/meson/meson/cross-prop-default.patch

Quoted 4 lines
meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -1
-meson.get_cross_property() in cross builds without an exe-wrapper, but

there's -no way to know that this is happening.

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -2
-
-As the defaults may be pessimistic (for example, disabling the support

for a -

Quoted 1 line

feature that should be enabled) emit a warning when the default is used,

so

Quoted 11 lines

that -the recipe can explicitly set the cross property as relevant.

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -2
-
-Upstream-Status: Submitted

[https://github.com/mesonbuild/meson/pull/5071]

meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -3
-Signed-off-by: Ross Burton <[email protected]>
-
-diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py -index

3c3cfae0..10e741ae 100644
---- a/mesonbuild/interpreter.py
-+++ b/mesonbuild/interpreter.py
-@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject):

meta/recipes-devtools/meson/meson/cross-prop-default.patch

Quoted 7 lines
meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -7
-             return props[propname]
-         except Exception:
-             if len(args) == 2:
-+                mlog.warning('Cross property %s is using default value
-+ %s' % (propname, args[1]))
-                 return args[1]
-             raise InterpreterException('Unknown cross property: %s.' %

propname)

Quoted 13 lines
meta/recipes-devtools/meson/meson/cross-prop-default.patch deleted +0 -1
-
meta/recipes- renamed from meta/recipes-devtools/meson/meson_0.57.2.bb +0 -0

devtools/meson/meson_0.58.0.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.57.2.bb rename to meta/recipes-devtools/meson/meson_0.58.0.bb

meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb +0 -1
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
--

2.31.1

#12 lore raw

PATCH 8/8 gstreamer1.0-plugins-base_1.18.4.bb: backport a patch to fix meson 0.58 builds

In reply to Alexander Kanavin
---
 ...c91697a141fea7317aff7f0f28e5a861db99.patch | 50 +++++++++++++++++++
 .../gstreamer1.0-plugins-base_1.18.4.bb       |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch new file +50 -0
new file mode 100644
index 0000000000..a2f5dff5e9
@@ -0,0 +1,50 @@
+From 4ef5c91697a141fea7317aff7f0f28e5a861db99 Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <[email protected]>
+Date: Mon, 26 Apr 2021 14:25:03 -0400
+Subject: [PATCH] gstgl: Fix build when Meson >= 0.58.0rc1
+
+"implicit_include_directories: false" now also means that current build
+directory is not added to include paths by default any more. We have to
+add it manually because we have some custom_target() that generate
+headers in current build directory.
+
+See https://github.com/mesonbuild/meson/issues/8700.
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1125>
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ gst-libs/gst/gl/meson.build | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
+index 66668644e..53891625a 100644
+--- a/gst-libs/gst/gl/meson.build
++++ b/gst-libs/gst/gl/meson.build
+@@ -1004,11 +1004,20 @@ if build_gstgl
+     command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@'])
+   gen_sources = [gl_enumtypes_h]
+ 
++  common_args = gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL']
++
++  # We have custom_target() that generate headers in the current build dir,
++  # but with implicit_include_directories: false, meson >= 0.58.0 won't include
++  # it by default. We cannot use include_directories('.') here because it would
++  # also include current source dir which is what we want to avoid because
++  # case-insensitive FS would include gst-libs/gl/egl/egl.h as EGL/egl.h.
++  common_args += '-I@0@'.format(meson.current_build_dir())
++
+   gstgl = library('gstgl-' + api_version,
+     gl_sources, gl_egl_sources, gl_x11_sources, gl_wayland_sources, gl_priv_sources, gl_enumtypes_c, gl_enumtypes_h,
+-    c_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'],
+-    cpp_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'],
+-    objc_args : gst_plugins_base_args + gl_cpp_args + gl_objc_args + ['-DBUILDING_GST_GL'],
++    c_args : common_args,
++    cpp_args : common_args,
++    objc_args : common_args + gl_objc_args,
+     include_directories : [configinc, libsinc, gl_includes],
+     version : libversion,
+     soversion : soversion,
+-- 
+GitLab
+
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb +1 -0
index beddfb0386..73b433ab91 100644
@@ -11,6 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba
            file://0003-viv-fb-Make-sure-config.h-is-included.patch \
            file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \
            file://0004-glimagesink-Downrank-to-marginal.patch \
+           file://4ef5c91697a141fea7317aff7f0f28e5a861db99.patch \
            "
 SRC_URI[sha256sum] = "29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323"
 
Signature · 1 line
2.31.1