boost: update 1.84.0 -> 1.85.0
Subsystems (2)
PATCH 1/13 boost: update 1.84.0 -> 1.85.0
From: Alexander Kanavin <[email protected]>
---
.../boost/{boost-1.84.0.inc => boost-1.85.0.inc} | 2 +-
...uild-native_1.84.0.bb => boost-build-native_1.85.0.bb} | 2 +-
...t-set-up-arch-instruction-set-flags-we-do-that-o.patch | 6 +++---
.../boost/0001-dont-setup-compiler-flags-m32-m64.patch | 4 ++--
.../boost/boost/boost-math-disable-pch-for-gcc.patch | 8 ++++----
.../boost/{boost_1.84.0.bb => boost_1.85.0.bb} | 0
6 files changed, 11 insertions(+), 11 deletions(-)
rename meta/recipes-support/boost/{boost-1.84.0.inc => boost-1.85.0.inc} (90%)
rename meta/recipes-support/boost/{boost-build-native_1.84.0.bb => boost-build-native_1.85.0.bb} (92%)
rename meta/recipes-support/boost/{boost_1.84.0.bb => boost_1.85.0.bb} (100%)meta/recipes-support/boost/boost-1.85.0.inc renamed from meta/recipes-support/boost/boost-1.84.0.inc +1 -1
@@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" -SRC_URI[sha256sum] = "cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454" +SRC_URI[sha256sum] = "7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
meta/recipes-support/boost/boost-build-native_1.85.0.bb renamed from meta/recipes-support/boost/boost-build-native_1.84.0.bb +1 -1
@@ -7,7 +7,7 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master" -SRCREV = "8d86b9a85407d73d6e8c631771f18c2a237d2d71" +SRCREV = "b0311a0d4f3bb0f93d06d3c6faca510c7f5a2012" PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "boost-(?P<pver>(\d+(\.\d+)+))"
meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +3 -3
@@ -1,4 +1,4 @@ -From 18185e939ca121335a6172c8e50872af8122a759 Mon Sep 17 00:00:00 2001 +From 0130a1c0d8ba3c0d59258cb79e8b4a04fe6d8eec Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 18 Dec 2018 15:42:57 +0100 Subject: [PATCH] Don't set up arch/instruction-set flags, we do that
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 153 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index 834f5e1bf..493a43e6d 100644 +index e5f8f53a4..0186545e8 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -1113,156 +1113,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : +@@ -1111,156 +1111,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : <architecture>$(architecture)/<instruction-set>$(instruction-set) : $(values) ; }
meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch +2 -2
@@ -1,4 +1,4 @@ -From bbb0845c0a79238fb2e84cca41826a0944b6ce7e Mon Sep 17 00:00:00 2001 +From 9c3d6fa3544ca7bd6d8c4f4edbb62282cbc35861 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> Date: Thu, 14 Nov 2019 10:13:53 +0800 Subject: [PATCH] dont setup compiler flags -m32/-m64
@@ -13,7 +13,7 @@ Signed-off-by: Anuj Mittal <[email protected]> 1 file changed, 14 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index 493a43e6d..42dccbdfe 100644 +index 0186545e8..ba33c4086 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam @@ -360,20 +360,6 @@ local rule compile-link-flags ( * )
meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch +4 -4
@@ -1,4 +1,4 @@ -From d6864bd78c01c5e8578805a7b67555c70a0e99a2 Mon Sep 17 00:00:00 2001 +From a61dd2b1336c06d232df58212ece88067e8a80bb Mon Sep 17 00:00:00 2001 From: Jackie Huang <[email protected]> Date: Fri, 23 Sep 2016 01:04:50 -0700 Subject: [PATCH] boost-math: disable pch for gcc
@@ -14,13 +14,13 @@ Signed-off-by: Jackie Huang <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/math/build/Jamfile.v2 b/libs/math/build/Jamfile.v2 -index fd840287e..5aff7d724 100644 +index 6549e06b7..342cbf0b1 100644 --- a/libs/math/build/Jamfile.v2 +++ b/libs/math/build/Jamfile.v2 -@@ -14,7 +14,7 @@ project +@@ -13,7 +13,7 @@ project + <toolset>intel-win:<linkflags>-nologo #<toolset>intel-linux:<pch>off <toolset>intel-darwin:<pch>off - <toolset>msvc-7.1:<pch>off - <toolset>gcc,<target-os>windows:<pch>off + <toolset>gcc:<pch>off #<toolset>gcc:<cxxflags>-fvisibility=hidden
meta/recipes-support/boost/boost_1.85.0.bb renamed from meta/recipes-support/boost/boost_1.84.0.bb +0 -0
Signature · 1 line
2.39.2
PATCH 2/13 libgit2: update 1.7.2 -> 1.8.1
From: Alexander Kanavin <[email protected]>
License-update: additional MIT-licensed components
---
.../libgit2/{libgit2_1.7.2.bb => libgit2_1.8.1.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-support/libgit2/{libgit2_1.7.2.bb => libgit2_1.8.1.bb} (68%)meta/recipes-support/libgit2/libgit2_1.8.1.bb renamed from meta/recipes-support/libgit2/libgit2_1.7.2.bb +3 -3
@@ -1,12 +1,12 @@ SUMMARY = "the Git linkable library" HOMEPAGE = "http://libgit2.github.com/" LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause & Zlib & ISC & LGPL-2.1-or-later & CC0-1.0 & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=5bdf47bbc9a39dc6ce076d59e322dc17" +LIC_FILES_CHKSUM = "file://COPYING;md5=8eacfdc17c8f4d219e131a073973b97d" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.7;protocol=https" -SRCREV = "a418d9d4ab87bae16b87d8f37143a4687ae0e4b2" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https" +SRCREV = "36f7e21ad757a3dacc58cf7944329da6bc1d6e96" S = "${WORKDIR}/git"
Signature · 1 line
2.39.2
PATCH 3/13 pinentry: update 1.2.1 -> 1.3.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
License-update: formatting, FSF address
---
.../gpg-error_pkconf.patch | 56 ++++++++++++++-----
.../libassuan_pkgconf.patch | 24 ++++----
.../{pinentry_1.2.1.bb => pinentry_1.3.0.bb} | 4 +-
3 files changed, 56 insertions(+), 28 deletions(-)
rename meta/recipes-support/pinentry/{pinentry-1.2.1 => pinentry-1.3.0}/gpg-error_pkconf.patch (82%)
rename meta/recipes-support/pinentry/{pinentry-1.2.1 => pinentry-1.3.0}/libassuan_pkgconf.patch (88%)
rename meta/recipes-support/pinentry/{pinentry_1.2.1.bb => pinentry_1.3.0.bb} (88%)meta/recipes-support/pinentry/pinentry-1.3.0/gpg-error_pkconf.patch renamed from meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch +42 -14
@@ -1,4 +1,4 @@ -From 785777dc0bc6b69ff68c91547ec6b6634049662f Mon Sep 17 00:00:00 2001 +From ccc3c6a8d469bbfa6717b970cfe70816c1fd545e Mon Sep 17 00:00:00 2001 From: Armin Kuster <[email protected]> Date: Fri, 2 Sep 2005 11:50:01 +0000 Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and
@@ -9,20 +9,20 @@ the gpg-error recipe for gpg-error.pc generation. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster <[email protected]> - --- - m4/gpg-error.m4 | 160 ++---------------------------------------------- - 1 file changed, 4 insertions(+), 156 deletions(-) + m4/gpg-error.m4 | 184 ++---------------------------------------------- + 1 file changed, 5 insertions(+), 179 deletions(-) diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 -index 4b5cd40..7dfbb83 100644 +index 7fa52b1..c0784ed 100644 --- a/m4/gpg-error.m4 +++ b/m4/gpg-error.m4 -@@ -26,160 +26,12 @@ dnl config script does not match the host specification the script - dnl is added to the gpg_config_script_warn variable. +@@ -15,188 +15,18 @@ + dnl + dnl Find gpg-error-config, for backward compatibility dnl - AC_DEFUN([AM_PATH_GPG_ERROR], --[ AC_REQUIRE([AC_CANONICAL_HOST]) +-dnl _AM_PATH_POSSIBLE_GPG_ERROR_CONFIG +-AC_DEFUN([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG],[dnl - gpg_error_config_prefix="" - dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, - dnl since that is consistent with how our three siblings use the directory/
@@ -58,9 +58,14 @@ index 4b5cd40..7dfbb83 100644 - fi - - AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) -- min_gpg_error_version=ifelse([$1], ,1.33,$1) -- ok=no +-]) - +-dnl +-dnl Find gpgrt-config, which uses .pc file +-dnl (minimum pkg-config functionality, supporting cross build) +-dnl +-dnl _AM_PATH_GPGRT_CONFIG +-AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl - AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH]) - if test "$GPGRT_CONFIG" != "no"; then - # Determine gpgrt_libdir
@@ -116,8 +121,9 @@ index 4b5cd40..7dfbb83 100644 - fi - if test -n "$gpgrt_libdir"; then break; fi - done -- else -- # When we cannot determine system libdir-format, use this: +- fi +- if test -z "$gpgrt_libdir"; then +- # No valid pkgconfig dir in any of the system directories, fallback - gpgrt_libdir=${possible_libdir1} - fi - else
@@ -131,12 +137,33 @@ index 4b5cd40..7dfbb83 100644 - AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) - gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` - else +- gpg_error_config_version=`$GPG_ERROR_CONFIG --version` - unset GPGRT_CONFIG - fi - elif test "$GPG_ERROR_CONFIG" != "no"; then - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` - unset GPGRT_CONFIG - fi +-]) +- +-dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, +-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +-dnl +-dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, +-dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are +-dnl used for programs requireing real multi thread support. +-dnl + dnl If a prefix option is not used, the config script is first + dnl searched in $SYSROOT/bin and then along $PATH. If the used + dnl config script does not match the host specification the script + dnl is added to the gpg_config_script_warn variable. + dnl +-AC_DEFUN([AM_PATH_GPG_ERROR],[dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl +-AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl +- min_gpg_error_version=ifelse([$1], ,1.33,$1) +- ok=no - if test "$GPG_ERROR_CONFIG" != "no"; then - req_major=`echo $min_gpg_error_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
@@ -157,6 +184,7 @@ index 4b5cd40..7dfbb83 100644 - fi - fi - AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) ++AC_DEFUN([AM_PATH_GPG_ERROR], +[ + min_gpg_error_version=ifelse([$1], ,0.0,$1) + PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version gpg-error], [ok=yes], [ok=no])
@@ -183,7 +211,7 @@ index 4b5cd40..7dfbb83 100644 if test x"$gpg_error_config_host" != xnone ; then if test x"$gpg_error_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -194,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], +@@ -211,10 +41,6 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl fi fi else
meta/recipes-support/pinentry/pinentry-1.3.0/libassuan_pkgconf.patch renamed from meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch +12 -12
@@ -1,4 +1,4 @@ -From 26fb6c3faa27180c8ed9ada1728c3d8683a65f3a Mon Sep 17 00:00:00 2001 +From fb6179fabb5e793a83cbb0d0d45814d99b97807a Mon Sep 17 00:00:00 2001 From: Armin Kuster <[email protected]> Date: Thu, 22 May 2014 10:50:00 +0100 Subject: [PATCH] libassuan: Improve pkgconfig support
@@ -9,17 +9,16 @@ the libassuan recipe for libassuan.pc generation. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster <[email protected]> - --- configure.ac | 4 +-- - m4/libassuan.m4 | 93 ++++--------------------------------------------- - 2 files changed, 9 insertions(+), 88 deletions(-) + m4/libassuan.m4 | 94 ++++--------------------------------------------- + 2 files changed, 9 insertions(+), 89 deletions(-) diff --git a/configure.ac b/configure.ac -index d8dcc0c..ca51766 100644 +index f04c00d..8e6da5c 100644 --- a/configure.ac +++ b/configure.ac -@@ -267,8 +267,8 @@ if test "$have_libassuan" = "yes"; then +@@ -263,8 +263,8 @@ if test "$have_libassuan" = "yes"; then [version of the libassuan library]) fi
@@ -31,7 +30,7 @@ index d8dcc0c..ca51766 100644 dnl Checks for libsecmem. diff --git a/m4/libassuan.m4 b/m4/libassuan.m4 -index df50484..2057412 100644 +index a2eb5d9..897f407 100644 --- a/m4/libassuan.m4 +++ b/m4/libassuan.m4 @@ -15,30 +15,8 @@ dnl
@@ -51,7 +50,7 @@ index df50484..2057412 100644 - fi - - use_gpgrt_config="" -- if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then - if $GPGRT_CONFIG libassuan --exists; then - LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan" - AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
@@ -67,7 +66,7 @@ index df50484..2057412 100644 tmp=ifelse([$1], ,1:0.9.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -48,58 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -48,59 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], min_libassuan_version="$tmp" fi
@@ -112,6 +111,7 @@ index df50484..2057412 100644 - - if test $ok = yes; then - AC_MSG_RESULT([yes ($libassuan_config_version)]) +- AC_DEFINE(LIBASSUAN_API_REQUESTED, $req_libassuan_api, Requested API version for libassuan) - else - AC_MSG_RESULT(no) - fi
@@ -128,7 +128,7 @@ index df50484..2057412 100644 if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([LIBASSUAN API version]) if test "$req_libassuan_api" -eq "$tmp" ; then -@@ -114,11 +45,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -117,11 +47,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], if test $ok = yes; then if test x"$host" != x ; then
@@ -141,7 +141,7 @@ index df50484..2057412 100644 if test x"$libassuan_config_host" != xnone ; then if test x"$libassuan_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -141,7 +68,7 @@ dnl Test whether libassuan has at least MINIMUM-VERSION. This is +@@ -144,7 +70,7 @@ dnl Test whether libassuan has at least MINIMUM-VERSION. This is dnl used to test for features only available in newer versions. dnl AC_DEFUN([AM_CHECK_LIBASSUAN],
@@ -150,7 +150,7 @@ index df50484..2057412 100644 if test $ok = yes; then ifelse([$2], , :, [$2]) else -@@ -157,16 +84,10 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +@@ -160,16 +86,10 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS dnl AC_DEFUN([AM_PATH_LIBASSUAN],
meta/recipes-support/pinentry/pinentry_1.3.0.bb renamed from meta/recipes-support/pinentry/pinentry_1.2.1.bb +2 -2
@@ -6,7 +6,7 @@ DESCRIPTION = "\ HOMEPAGE = "http://www.gnupg.org/related_software/pinentry/index.en.html" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gettext-native libassuan libgpg-error"
@@ -16,7 +16,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://gpg-error_pkconf.patch \ " -SRC_URI[sha256sum] = "457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067" +SRC_URI[sha256sum] = "9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de" inherit autotools pkgconfig
Signature · 1 line
2.39.2
Re: [OE-core] [PATCH 03/13] pinentry: update 1.2.1 -> 1.3.0
I fixed it up in my branch but you forgot to update oescripts.OEListPackageconfigTests.test_packageconfig_flags_option_all Maybe it would be nice to have a comment in the recipe.
Quoted 271 lines · Alexander Kanavin
From: Alexander Kanavin <[email protected]>
License-update: formatting, FSF address
Signed-off-by Alexander Kanavin <[email protected]>--- .../gpg-error_pkconf.patch | 56 ++++++++++++++----- .../libassuan_pkgconf.patch | 24 ++++---- .../{pinentry_1.2.1.bb => pinentry_1.3.0.bb} | 4 +- 3 files changed, 56 insertions(+), 28 deletions(-) rename meta/recipes-support/pinentry/{pinentry-1.2.1 => pinentry-1.3.0}/gpg-error_pkconf.patch (82%) rename meta/recipes-support/pinentry/{pinentry-1.2.1 => pinentry-1.3.0}/libassuan_pkgconf.patch (88%) rename meta/recipes-support/pinentry/{pinentry_1.2.1.bb => pinentry_1.3.0.bb} (88%)meta/recipes-support/pinentry/pinentry-1.3.0/gpg-error_pkconf.patch renamed from meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch +42
-14@@ -1,4 +1,4 @@ -From 785777dc0bc6b69ff68c91547ec6b6634049662f Mon Sep 17 00:00:00 2001 +From ccc3c6a8d469bbfa6717b970cfe70816c1fd545e Mon Sep 17 00:00:00 2001 From: Armin Kuster <[email protected]> Date: Fri, 2 Sep 2005 11:50:01 +0000 Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and@@ -9,20 +9,20 @@ the gpg-error recipe for gpg-error.pc generation. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster <[email protected]> - --- - m4/gpg-error.m4 | 160 ++---------------------------------------------- - 1 file changed, 4 insertions(+), 156 deletions(-) + m4/gpg-error.m4 | 184 ++---------------------------------------------- + 1 file changed, 5 insertions(+), 179 deletions(-) diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 -index 4b5cd40..7dfbb83 100644 +index 7fa52b1..c0784ed 100644 --- a/m4/gpg-error.m4 +++ b/m4/gpg-error.m4 -@@ -26,160 +26,12 @@ dnl config script does not match the host specification the script - dnl is added to the gpg_config_script_warn variable. +@@ -15,188 +15,18 @@ + dnl + dnl Find gpg-error-config, for backward compatibility dnl - AC_DEFUN([AM_PATH_GPG_ERROR], --[ AC_REQUIRE([AC_CANONICAL_HOST]) +-dnl _AM_PATH_POSSIBLE_GPG_ERROR_CONFIG +-AC_DEFUN([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG],[dnl - gpg_error_config_prefix="" - dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, - dnl since that is consistent with how our three siblings use the directory/@@ -58,9 +58,14 @@ index 4b5cd40..7dfbb83 100644 - fi - - AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) -- min_gpg_error_version=ifelse([$1], ,1.33,$1) -- ok=no +-]) - +-dnl +-dnl Find gpgrt-config, which uses .pc file +-dnl (minimum pkg-config functionality, supporting cross build) +-dnl +-dnl _AM_PATH_GPGRT_CONFIG +-AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl - AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH]) - if test "$GPGRT_CONFIG" != "no"; then - # Determine gpgrt_libdir@@ -116,8 +121,9 @@ index 4b5cd40..7dfbb83 100644 - fi - if test -n "$gpgrt_libdir"; then break; fi - done -- else -- # When we cannot determine system libdir-format, use this: +- fi +- if test -z "$gpgrt_libdir"; then +- # No valid pkgconfig dir in any of the system directories, fallback - gpgrt_libdir=${possible_libdir1} - fi - else@@ -131,12 +137,33 @@ index 4b5cd40..7dfbb83 100644 - AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) - gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` - else +- gpg_error_config_version=`$GPG_ERROR_CONFIG --version` - unset GPGRT_CONFIG - fi - elif test "$GPG_ERROR_CONFIG" != "no"; then - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` - unset GPGRT_CONFIG - fi +-]) +- +-dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, +-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +-dnl +-dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, +-dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are +-dnl used for programs requireing real multi thread support. +-dnl + dnl If a prefix option is not used, the config script is first + dnl searched in $SYSROOT/bin and then along $PATH. If the used + dnl config script does not match the host specification the script + dnl is added to the gpg_config_script_warn variable. + dnl +-AC_DEFUN([AM_PATH_GPG_ERROR],[dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl +-AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl +- min_gpg_error_version=ifelse([$1], ,1.33,$1) +- ok=no - if test "$GPG_ERROR_CONFIG" != "no"; then - req_major=`echo $min_gpg_error_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`@@ -157,6 +184,7 @@ index 4b5cd40..7dfbb83 100644 - fi - fi - AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) ++AC_DEFUN([AM_PATH_GPG_ERROR], +[ + min_gpg_error_version=ifelse([$1], ,0.0,$1) + PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version gpg-error], [ok=yes], [ok=no])@@ -183,7 +211,7 @@ index 4b5cd40..7dfbb83 100644 if test x"$gpg_error_config_host" != xnone ; then if test x"$gpg_error_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -194,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], +@@ -211,10 +41,6 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl fi fi elsemeta/recipes-support/pinentry/pinentry-1.3.0/libassuan_pkgconf.patch renamed from meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch +12
-12@@ -1,4 +1,4 @@ -From 26fb6c3faa27180c8ed9ada1728c3d8683a65f3a Mon Sep 17 00:00:00 2001 +From fb6179fabb5e793a83cbb0d0d45814d99b97807a Mon Sep 17 00:00:00 2001 From: Armin Kuster <[email protected]> Date: Thu, 22 May 2014 10:50:00 +0100 Subject: [PATCH] libassuan: Improve pkgconfig support@@ -9,17 +9,16 @@ the libassuan recipe for libassuan.pc generation. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster <[email protected]> - --- configure.ac | 4 +-- - m4/libassuan.m4 | 93 ++++--------------------------------------------- - 2 files changed, 9 insertions(+), 88 deletions(-) + m4/libassuan.m4 | 94 ++++--------------------------------------------- + 2 files changed, 9 insertions(+), 89 deletions(-) diff --git a/configure.ac b/configure.ac -index d8dcc0c..ca51766 100644 +index f04c00d..8e6da5c 100644 --- a/configure.ac +++ b/configure.ac -@@ -267,8 +267,8 @@ if test "$have_libassuan" = "yes"; then +@@ -263,8 +263,8 @@ if test "$have_libassuan" = "yes"; then [version of the libassuan library]) fi@@ -31,7 +30,7 @@ index d8dcc0c..ca51766 100644 dnl Checks for libsecmem. diff --git a/m4/libassuan.m4 b/m4/libassuan.m4 -index df50484..2057412 100644 +index a2eb5d9..897f407 100644 --- a/m4/libassuan.m4 +++ b/m4/libassuan.m4 @@ -15,30 +15,8 @@ dnl@@ -51,7 +50,7 @@ index df50484..2057412 100644 - fi - - use_gpgrt_config="" -- if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then - if $GPGRT_CONFIG libassuan --exists; then - LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan" - AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])@@ -67,7 +66,7 @@ index df50484..2057412 100644 tmp=ifelse([$1], ,1:0.9.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -48,58 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -48,59 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], min_libassuan_version="$tmp" fi@@ -112,6 +111,7 @@ index df50484..2057412 100644 - - if test $ok = yes; then - AC_MSG_RESULT([yes ($libassuan_config_version)]) +- AC_DEFINE(LIBASSUAN_API_REQUESTED, $req_libassuan_api, Requested API version for libassuan) - else - AC_MSG_RESULT(no) - fi@@ -128,7 +128,7 @@ index df50484..2057412 100644 if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([LIBASSUAN API version]) if test "$req_libassuan_api" -eq "$tmp" ; then -@@ -114,11 +45,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -117,11 +47,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], if test $ok = yes; then if test x"$host" != x ; then@@ -141,7 +141,7 @@ index df50484..2057412 100644 if test x"$libassuan_config_host" != xnone ; then if test x"$libassuan_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -141,7 +68,7 @@ dnl Test whether libassuan has at least MINIMUM-VERSION. This is +@@ -144,7 +70,7 @@ dnl Test whether libassuan has at least MINIMUM-VERSION. This is dnl used to test for features only available in newer versions. dnl AC_DEFUN([AM_CHECK_LIBASSUAN],@@ -150,7 +150,7 @@ index df50484..2057412 100644 if test $ok = yes; then ifelse([$2], , :, [$2]) else -@@ -157,16 +84,10 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +@@ -160,16 +86,10 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS dnl AC_DEFUN([AM_PATH_LIBASSUAN],meta/recipes-support/pinentry/pinentry_1.3.0.bb renamed from meta/recipes-support/pinentry/pinentry_1.2.1.bb +2
-2@@ -6,7 +6,7 @@ DESCRIPTION = "\ HOMEPAGE = "http://www.gnupg.org/related_software/pinentry/index.en.html" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gettext-native libassuan libgpg-error"@@ -16,7 +16,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://gpg-error_pkconf.patch \ " -SRC_URI[sha256sum] = "457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067" +SRC_URI[sha256sum] = "9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de" inherit autotools pkgconfigSignature · 11 lines
2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199920): https://lists.openembedded.org/g/openembedded-core/message/199920 Mute This Topic: https://lists.openembedded.org/mt/106334727/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 4/13 mobile-broadband-provider-info: upgrade 20230416 -> 20240407
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Convert to meson.
--- .../mobile-broadband-provider-info_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +3 -3
@@ -5,13 +5,13 @@ SECTION = "network" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04" -SRCREV = "aae7c68671d225e6d35224613d5b98192b9b2ffe" -PV = "20230416" +SRCREV = "55ba955d53305df96123534488fd160ea882b4dd" +PV = "20240407" PE = "1" SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=main" S = "${WORKDIR}/git" -inherit autotools +inherit meson DEPENDS += "libxslt-native"
Signature · 1 line
2.39.2
PATCH 5/13 cmake: upgrade 3.28.3 -> 3.29.3
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
License-update: copyright years
---
.../{cmake-native_3.28.3.bb => cmake-native_3.29.3.bb} | 0
meta/recipes-devtools/cmake/cmake.inc | 4 ++--
.../cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch | 9 +++------
...le-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | 9 ++++-----
.../cmake/{cmake_3.28.3.bb => cmake_3.29.3.bb} | 0
5 files changed, 9 insertions(+), 13 deletions(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.28.3.bb => cmake-native_3.29.3.bb} (100%)
rename meta/recipes-devtools/cmake/{cmake_3.28.3.bb => cmake_3.29.3.bb} (100%)meta/recipes-devtools/cmake/cmake-native_3.29.3.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.28.3.bb +0 -0
meta/recipes-devtools/cmake/cmake.inc +2 -2
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.cmake.org/" BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=9d3d12c5f3b4c1f83650adcc65b59c06 \ +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=718f05155941b33862726348d3cd46ce \ file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ "
@@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1" +SRC_URI[sha256sum] = "252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch +3 -6
@@ -1,4 +1,4 @@ -From d33d8a5e9f3b25a80d47b72b1a8a6624a85563c1 Mon Sep 17 00:00:00 2001 +From 946011cbfd686fe6bd2cec94494f6b0c4394bb6c Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Wed, 28 Dec 2022 17:51:27 +0800 Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2
@@ -18,10 +18,10 @@ Signed-off-by: Trevor Gamblin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt -index 9387247366..d3de01f4e8 100644 +index 3dd24f1e..4a0f6773 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt -@@ -88,7 +88,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") +@@ -91,7 +91,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options") set(SHARE_LIB_OBJECT OFF) set(USE_LIBIDN2 ON)
@@ -30,6 +30,3 @@ index 9387247366..d3de01f4e8 100644 set(USE_NGTCP2 OFF) set(USE_QUICHE OFF) set(USE_WIN32_IDN OFF) --- -2.43.0 -
meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch +4 -5
@@ -1,4 +1,4 @@ -From fd9a04c1434e12f21c043385e306e0b52d38d749 Mon Sep 17 00:00:00 2001 +From 2d3f6933f78d393514a48f8222ac8c3c39cb5fc7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador <[email protected]> Date: Thu, 5 Jul 2018 10:28:04 -0300 Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal
@@ -13,16 +13,15 @@ Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton <[email protected]> Signed-off-by: Otavio Salvador <[email protected]> - --- Utilities/cmlibarchive/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt -index bfcaf30..2960683 100644 +index e47184b7..e4964c32 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt -@@ -682,12 +682,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) +@@ -721,12 +721,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)
@@ -35,5 +34,5 @@ index bfcaf30..2960683 100644 +SET(HAVE_EXT2FS_EXT2_FS_H 0) +SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0) LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) + LA_CHECK_INCLUDE_FILE("fnmatch.h" HAVE_FNMATCH_H) LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) - LA_CHECK_INCLUDE_FILE("io.h" HAVE_IO_H)
meta/recipes-devtools/cmake/cmake_3.29.3.bb renamed from meta/recipes-devtools/cmake/cmake_3.28.3.bb +0 -0
Signature · 1 line
2.39.2
Re: [OE-core] [PATCH 05/13] cmake: upgrade 3.28.3 -> 3.29.3
https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/9373/steps/13/logs/stdio
Quoted 124 lines · Alexander Kanavin
From: Alexander Kanavin <[email protected]>
License-update: copyright years
Signed-off-by Alexander Kanavin <[email protected]>--- .../{cmake-native_3.28.3.bb => cmake-native_3.29.3.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 4 ++-- .../cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch | 9 +++------ ...le-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | 9 ++++----- .../cmake/{cmake_3.28.3.bb => cmake_3.29.3.bb} | 0 5 files changed, 9 insertions(+), 13 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.28.3.bb => cmake-native_3.29.3.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.28.3.bb => cmake_3.29.3.bb} (100%)meta/recipes-devtools/cmake/cmake-native_3.29.3.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.28.3.bb +0
-0meta/recipes-devtools/cmake/cmake.inc +2
-2@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.cmake.org/" BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=9d3d12c5f3b4c1f83650adcc65b59c06 \ +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=718f05155941b33862726348d3cd46ce \ file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ "@@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1" +SRC_URI[sha256sum] = "252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch +3
-6@@ -1,4 +1,4 @@ -From d33d8a5e9f3b25a80d47b72b1a8a6624a85563c1 Mon Sep 17 00:00:00 2001 +From 946011cbfd686fe6bd2cec94494f6b0c4394bb6c Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Wed, 28 Dec 2022 17:51:27 +0800 Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2@@ -18,10 +18,10 @@ Signed-off-by: Trevor Gamblin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt -index 9387247366..d3de01f4e8 100644 +index 3dd24f1e..4a0f6773 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt -@@ -88,7 +88,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") +@@ -91,7 +91,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options") set(SHARE_LIB_OBJECT OFF) set(USE_LIBIDN2 ON)@@ -30,6 +30,3 @@ index 9387247366..d3de01f4e8 100644 set(USE_NGTCP2 OFF) set(USE_QUICHE OFF) set(USE_WIN32_IDN OFF) --- -2.43.0 -meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch +4
-5@@ -1,4 +1,4 @@ -From fd9a04c1434e12f21c043385e306e0b52d38d749 Mon Sep 17 00:00:00 2001 +From 2d3f6933f78d393514a48f8222ac8c3c39cb5fc7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador <[email protected]> Date: Thu, 5 Jul 2018 10:28:04 -0300 Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal@@ -13,16 +13,15 @@ Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton <[email protected]> Signed-off-by: Otavio Salvador <[email protected]> - --- Utilities/cmlibarchive/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt -index bfcaf30..2960683 100644 +index e47184b7..e4964c32 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt -@@ -682,12 +682,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) +@@ -721,12 +721,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)@@ -35,5 +34,5 @@ index bfcaf30..2960683 100644 +SET(HAVE_EXT2FS_EXT2_FS_H 0) +SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0) LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) + LA_CHECK_INCLUDE_FILE("fnmatch.h" HAVE_FNMATCH_H) LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) - LA_CHECK_INCLUDE_FILE("io.h" HAVE_IO_H)meta/recipes-devtools/cmake/cmake_3.29.3.bb renamed from meta/recipes-devtools/cmake/cmake_3.28.3.bb +0
-0Signature · 11 lines
2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199922): https://lists.openembedded.org/g/openembedded-core/message/199922 Mute This Topic: https://lists.openembedded.org/mt/106334730/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [OE-core] [PATCH 05/13] cmake: upgrade 3.28.3 -> 3.29.3
Forgot to squash the fix in. I sent a v2.
Alex
Quoted 134 lines · Alexandre Belloni
https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/9373/steps/13/logs/stdio
Quoted 116 lines · Alexander Kanavin
From: Alexander Kanavin <[email protected]>
License-update: copyright years
Signed-off-by Alexander Kanavin <[email protected]>--- .../{cmake-native_3.28.3.bb => cmake-native_3.29.3.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 4 ++-- .../cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch | 9 +++------ ...le-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | 9 ++++----- .../cmake/{cmake_3.28.3.bb => cmake_3.29.3.bb} | 0 5 files changed, 9 insertions(+), 13 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.28.3.bb => cmake-native_3.29.3.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.28.3.bb => cmake_3.29.3.bb} (100%)meta/recipes-devtools/cmake/cmake-native_3.29.3.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.28.3.bb +0
-0meta/recipes-devtools/cmake/cmake.inc +2
-2@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.cmake.org/" BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=9d3d12c5f3b4c1f83650adcc65b59c06 \ +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=718f05155941b33862726348d3cd46ce \ file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ "@@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1" +SRC_URI[sha256sum] = "252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch +3
-6@@ -1,4 +1,4 @@ -From d33d8a5e9f3b25a80d47b72b1a8a6624a85563c1 Mon Sep 17 00:00:00 2001 +From 946011cbfd686fe6bd2cec94494f6b0c4394bb6c Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Wed, 28 Dec 2022 17:51:27 +0800 Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2@@ -18,10 +18,10 @@ Signed-off-by: Trevor Gamblin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt -index 9387247366..d3de01f4e8 100644 +index 3dd24f1e..4a0f6773 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt -@@ -88,7 +88,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") +@@ -91,7 +91,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options") set(SHARE_LIB_OBJECT OFF) set(USE_LIBIDN2 ON)@@ -30,6 +30,3 @@ index 9387247366..d3de01f4e8 100644 set(USE_NGTCP2 OFF) set(USE_QUICHE OFF) set(USE_WIN32_IDN OFF) --- -2.43.0 -meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch +4
-5@@ -1,4 +1,4 @@ -From fd9a04c1434e12f21c043385e306e0b52d38d749 Mon Sep 17 00:00:00 2001 +From 2d3f6933f78d393514a48f8222ac8c3c39cb5fc7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador <[email protected]> Date: Thu, 5 Jul 2018 10:28:04 -0300 Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal@@ -13,16 +13,15 @@ Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton <[email protected]> Signed-off-by: Otavio Salvador <[email protected]> - --- Utilities/cmlibarchive/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt -index bfcaf30..2960683 100644 +index e47184b7..e4964c32 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt -@@ -682,12 +682,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) +@@ -721,12 +721,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)@@ -35,5 +34,5 @@ index bfcaf30..2960683 100644 +SET(HAVE_EXT2FS_EXT2_FS_H 0) +SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0) LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) + LA_CHECK_INCLUDE_FILE("fnmatch.h" HAVE_FNMATCH_H) LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) - LA_CHECK_INCLUDE_FILE("io.h" HAVE_IO_H)meta/recipes-devtools/cmake/cmake_3.29.3.bb renamed from meta/recipes-devtools/cmake/cmake_3.28.3.bb +0
-1--2.39.2
Quoted 8 lines
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199922): https://lists.openembedded.org/g/openembedded-core/message/199922
Mute This Topic: https://lists.openembedded.org/mt/106334730/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=---
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
PATCH 6/13 zstd: upgrade 1.5.5 -> 1.5.6
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop patch that was merged upstream.
---
...-use-directly-for-the-test-c-snippet.patch | 39 -------------------
.../zstd/{zstd_1.5.5.bb => zstd_1.5.6.bb} | 5 +--
2 files changed, 2 insertions(+), 42 deletions(-)
delete mode 100644 meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch
rename meta/recipes-extended/zstd/{zstd_1.5.5.bb => zstd_1.5.6.bb} (91%)meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 121ef5253a49065dea6a89536ca7bd3dabd40e25 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 19 Jun 2023 17:10:09 +0200 -Subject: [PATCH] pzstd: use c++14 without conditions - -Doing this check with a direct c++ snippet is prone to portability problems: - -- \043 is not portable between shells: dash expands it to #, -bash does not; - -- using # directly works with make 4.3 but does not with make 4.2. - -Let's just use the c++ version that covers both the code and the gtest. - -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/3682] -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - contrib/pzstd/Makefile | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile -index e62f8e87..58fb82a1 100644 ---- a/contrib/pzstd/Makefile -+++ b/contrib/pzstd/Makefile -@@ -37,11 +37,8 @@ CFLAGS += -Wno-deprecated-declarations - PZSTD_INC = -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(PROGDIR) -I. - GTEST_INC = -isystem googletest/googletest/include - --# If default C++ version is older than C++11, explicitly set C++11, which is the --# minimum required by the code. --ifeq ($(shell echo "\043if __cplusplus < 201103L\n\043error\n\043endif" | $(CXX) -x c++ -Werror -c - -o /dev/null 2>/dev/null && echo 1 || echo 0),0) --PZSTD_CXX_STD := -std=c++11 --endif -+# Set the minimum required by gtest -+PZSTD_CXX_STD := -std=c++14 - - PZSTD_CPPFLAGS = $(PZSTD_INC) - PZSTD_CCXXFLAGS =
meta/recipes-extended/zstd/zstd_1.5.6.bb renamed from meta/recipes-extended/zstd/zstd_1.5.5.bb +2 -3
@@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \ file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0 \ " -SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https \ - file://0001-pzstd-use-directly-for-the-test-c-snippet.patch" +SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https" -SRCREV = "63779c798237346c2b245c546c40b72a5a5913fe" +SRCREV = "794ea1b0afca0f020f4e57b6732332231fb23c70" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" CVE_PRODUCT = "zstandard"
Signature · 1 line
2.39.2
PATCH 7/13 icu: upgrade 74-2 -> 75-1
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
License-update: copyright years
---
meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb | 3 +++
meta/recipes-support/icu/{icu_74-2.bb => icu_75-1.bb} | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
rename meta/recipes-support/icu/{icu_74-2.bb => icu_75-1.bb} (95%)meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb +3 -0
@@ -32,6 +32,9 @@ PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" LEAD_SONAME = "libharfbuzz.so" +# Remove when https://github.com/harfbuzz/harfbuzz/issues/4671 is resolved +EXTRA_OEMESON += "-Dcpp_std=c++17" + do_install:append() { # If no tools are installed due to PACKAGECONFIG then this directory might # still be installed, so remove it to stop packaging warnings.
meta/recipes-support/icu/icu_75-1.bb renamed from meta/recipes-support/icu/icu_74-2.bb +3 -3
@@ -78,7 +78,7 @@ FILES:libicuio = "${libdir}/libicuio.so.*" BBCLASSEXTEND = "native nativesdk" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=08dc3852df8fffa807301902ad899ff8" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=9cf7c317c3f2a0962437465a9022dbe9" def icu_download_version(d): pvsplit = d.getVar('PV').split('-')
@@ -111,8 +111,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ SRC_URI:append:class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[code.sha256sum] = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c" -SRC_URI[data.sha256sum] = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6" +SRC_URI[code.sha256sum] = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef" +SRC_URI[data.sha256sum] = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1" UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases"
Signature · 1 line
2.39.2
Re: [OE-core] [PATCH 07/13] icu: upgrade 74-2 -> 75-1
Quoted 17 lines · Alexander Kanavin via lists.openembedded.org
From: Alexander Kanavin <[email protected]>
License-update: copyright years
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb | 3 +++ meta/recipes-support/icu/{icu_74-2.bb => icu_75-1.bb} | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) rename meta/recipes-support/icu/{icu_74-2.bb => icu_75-1.bb} (95%)meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb +0
-0
meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" · line 36
Quoted 5 lines
meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb +2
-0@@ -32,6 +32,9 @@ PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" LEAD_SONAME = "libharfbuzz.so" +# Remove when https://github.com/harfbuzz/harfbuzz/issues/4671 is resolved +EXTRA_OEMESON += "-Dcpp_std=c++17"
GCC 13+ and clang16+ defaults to c++17, so I wonder why it does not work here.
Quoted 43 lines
meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb +1
-0+ do_install:append() { # If no tools are installed due to PACKAGECONFIG then this directory might # still be installed, so remove it to stop packaging warnings.meta/recipes-support/icu/icu_75-1.bb renamed from meta/recipes-support/icu/icu_74-2.bb +3
-4@@ -78,7 +78,7 @@ FILES:libicuio = "${libdir}/libicuio.so.*" BBCLASSEXTEND = "native nativesdk" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=08dc3852df8fffa807301902ad899ff8" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=9cf7c317c3f2a0962437465a9022dbe9" def icu_download_version(d): pvsplit = d.getVar('PV').split('-')@@ -111,8 +111,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ SRC_URI:append:class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[code.sha256sum] = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c" -SRC_URI[data.sha256sum] = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6" +SRC_URI[code.sha256sum] = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef" +SRC_URI[data.sha256sum] = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1" UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" --2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199924): https://lists.openembedded.org/g/openembedded-core/message/199924
Mute This Topic: https://lists.openembedded.org/mt/106334732/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 07/13] icu: upgrade 74-2 -> 75-1
Quoted 4 lines · Khem Raj
meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" · line 36
Quoted 2 lines
meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb +2
-0+# Remove when https://github.com/harfbuzz/harfbuzz/issues/4671 is resolved +EXTRA_OEMESON += "-Dcpp_std=c++17"GCC 13+ and clang16+ defaults to c++17, so I wonder why it does not work here.
harfbuzz resets that to c++11:
https://github.com/harfbuzz/harfbuzz/blob/main/meson.build#L7
Alex
Re: [OE-core] [PATCH 07/13] icu: upgrade 74-2 -> 75-1
Quoted 9 lines · Alexander Kanavin
Quoted 1 line · Khem Raj
Quoted 1 line
+# Remove when https://github.com/harfbuzz/harfbuzz/issues/4671 is
resolved
Quoted 2 lines
Quoted 1 line
+EXTRA_OEMESON += "-Dcpp_std=c++17>
GCC 13+ and clang16+ defaults to c++17, so I wonder why it does not work
here.
harfbuzz resets that to c++11:
https://github.com/harfbuzz/harfbuzz/blob/main/meson.build#L7
I see. Thanks, ideally harfbuzz should have done it as a fallback if default were not > c++11
Quoted 4 lines
<https://github.com/harfbuzz/harfbuzz/blob/main/meson.build#L7>
Alex
Re: [OE-core] [PATCH 07/13] icu: upgrade 74-2 -> 75-1
Quoted 5 lines · Khem Raj
Quoted 2 lines
harfbuzz resets that to c++11:
https://github.com/harfbuzz/harfbuzz/blob/main/meson.build#L7I see. Thanks, ideally harfbuzz should have done it as a fallback if default were not > c++11
They want to stay at c++11 even when default is higher, no idea why:
https://github.com/harfbuzz/harfbuzz/pull/4733
Alex
Re: [OE-core] [PATCH 07/13] icu: upgrade 74-2 -> 75-1
Quoted 11 lines · Alexander Kanavin
Quoted 5 lines · Khem Raj
Quoted 2 lines
harfbuzz resets that to c++11:
https://github.com/harfbuzz/harfbuzz/blob/main/meson.build#L7I see. Thanks, ideally harfbuzz should have done it as a fallback if
default were not > c++11
They want to stay at c++11 even when default is higher, no idea why:
https://github.com/harfbuzz/harfbuzz/pull/4733
I guess they are open to use it if icu is enabled so may be that’s an opening
Quoted 2 lines
Alex
PATCH 8/13 libxcb: upgrade 1.16.1 -> 1.17.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
.../libxcb/0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch | 7 ++-----
.../xorg-lib/{libxcb_1.16.1.bb => libxcb_1.17.0.bb} | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxcb_1.16.1.bb => libxcb_1.17.0.bb} (93%)meta/recipes-graphics/xorg-lib/libxcb/0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch +2 -5
@@ -1,4 +1,4 @@ -From d55b6b1fa87700f3eae3a29522972d2e7be7d53e Mon Sep 17 00:00:00 2001 +From b529f25a3dcd1547f49d341a0a34fbc1379ed58d Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 14 Jan 2023 10:11:35 -0800 Subject: [PATCH] use _Alignof to avoid UB in ALIGNOF
@@ -20,7 +20,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/c_client.py b/src/c_client.py -index fd256f0..4e48f13 100644 +index b7db543..ec81758 100644 --- a/src/c_client.py +++ b/src/c_client.py @@ -288,7 +288,6 @@ def c_open(self):
@@ -40,6 +40,3 @@ index fd256f0..4e48f13 100644 % (space, 'char' if field.c_field_type == 'void' or field.type.is_switch --- -2.39.0 -
meta/recipes-graphics/xorg-lib/libxcb_1.17.0.bb renamed from meta/recipes-graphics/xorg-lib/libxcb_1.16.1.bb +1 -1
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \ file://0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch" -SRC_URI[sha256sum] = "f24d187154c8e027b358fc7cb6588e35e33e6a92f11c668fe77396a7ae66e311" +SRC_URI[sha256sum] = "599ebf9996710fea71622e6e184f3a8ad5b43d0e5fa8c4e407123c88a59a6d55" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.39.2
PATCH 9/13 xserver-xorg: upgrade 21.1.12 -> 21.1.13
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
.../0001-Avoid-duplicate-definitions-of-IOPortBase.patch | 3 +--
...ciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch | 9 +++------
.../{xserver-xorg_21.1.12.bb => xserver-xorg_21.1.13.bb} | 2 +-
3 files changed, 5 insertions(+), 9 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.12.bb => xserver-xorg_21.1.13.bb} (92%)meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch +1 -2
@@ -1,4 +1,4 @@ -From ce3b8a230a3805c9b557c1f106795675bd034860 Mon Sep 17 00:00:00 2001 +From cedc797e1a0850039a25b7e387b342e54fffcc97 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 17 Aug 2020 10:50:51 -0700 Subject: [PATCH] Avoid duplicate definitions of IOPortBase
@@ -10,7 +10,6 @@ compiler.h:528: multiple definition of `IOPortBase'; Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> - --- hw/xfree86/os-support/linux/lnx_video.c | 1 + 1 file changed, 1 insertion(+)
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch +3 -6
@@ -1,4 +1,4 @@ -From d77cdc5e1eee26821ab98c947abea53fb7b18fe5 Mon Sep 17 00:00:00 2001 +From ad8967de36e6e2a185b71ce1d701448cda4ef3e2 Mon Sep 17 00:00:00 2001 From: California Sullivan <[email protected]> Date: Fri, 16 Mar 2018 17:23:11 -0700 Subject: [PATCH] xf86pciBus.c: use Intel ddx only for pre-gen4 hardware
@@ -20,10 +20,10 @@ Signed-off-by: California Sullivan <[email protected]> 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c -index e61ae0cd4..d70c99197 100644 +index aeeed8b..db705bf 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c -@@ -1173,7 +1173,23 @@ xf86VideoPtrToDriverList(struct pci_device *dev, +@@ -1174,7 +1174,23 @@ xf86VideoPtrToDriverList(struct pci_device *dev, XF86MatchedDrivers *md) case 0x0bef: /* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */ break;
@@ -48,6 +48,3 @@ index e61ae0cd4..d70c99197 100644 driverList[0] = "intel"; break; } --- -2.14.3 -
meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.13.bb renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.12.bb +1 -1
@@ -3,7 +3,7 @@ require xserver-xorg.inc SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ " -SRC_URI[sha256sum] = "1e016e2be1b5ccdd65eac3ea08e54bd13ce8f4f6c3fb32ad6fdac4e71729a90f" +SRC_URI[sha256sum] = "b45a02d5943f72236a360d3cc97e75134aa4f63039ff88c04686b508a3dc740c" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades.
Signature · 1 line
2.39.2
PATCH 10/13 meson: upgrade 1.3.1 -> 1.4.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
.../meson/0001-Make-CPU-family-warnings-fatal.patch | 11 +++++------
...odule-do-not-manipulate-the-environment-when.patch | 9 ++++-----
.../0002-Support-building-allarch-recipes-again.patch | 7 +++----
.../meson/{meson_1.3.1.bb => meson_1.4.0.bb} | 2 +-
4 files changed, 13 insertions(+), 16 deletions(-)
rename meta/recipes-devtools/meson/{meson_1.3.1.bb => meson_1.4.0.bb} (98%)meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +5 -6
@@ -1,21 +1,20 @@ -From b77cbe67df5fa0998946503f207c256ee740bb5f Mon Sep 17 00:00:00 2001 +From c61c93f43b70ba0670d41e841bff9f2a7186cc2f 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 Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton <[email protected]> - --- mesonbuild/envconfig.py | 4 ++-- mesonbuild/environment.py | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 07f1229..a35c356 100644 +index 0e9cd23..b44e60c 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -285,8 +285,8 @@ class MachineInfo(HoldableObject): +@@ -276,8 +276,8 @@ class MachineInfo(HoldableObject): 'but is missing {}.'.format(minimum_literal - set(literal))) cpu_family = literal['cpu_family']
@@ -27,10 +26,10 @@ index 07f1229..a35c356 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 2ba2054..d798e3b 100644 +index af69f64..248d6dd 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -359,10 +359,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -379,10 +379,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: if compilers and not any_compiler_has_define(compilers, '__mips64'): trial = 'mips'
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +4 -5
@@ -1,4 +1,4 @@ -From e85683698aa3556bf14fc6d35f2c067f16af520b Mon Sep 17 00:00:00 2001 +From b4c0602a56d3517ab66b98a7dbb69defe77d29a3 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
@@ -6,16 +6,15 @@ Subject: [PATCH] python module: do not manipulate the environment when calling Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> - --- mesonbuild/dependencies/python.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py -index 9aea6bd..8c13ede 100644 +index b9b17f8..a305afb 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py -@@ -380,9 +380,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -381,9 +381,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', empty.name = 'python' return empty
@@ -25,7 +24,7 @@ index 9aea6bd..8c13ede 100644 try: return PythonPkgConfigDependency(name, env, kwargs, installation, True) finally: -@@ -391,8 +388,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -392,8 +389,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', os.environ[name] = value elif name in os.environ: del os.environ[name]
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +3 -4
@@ -1,4 +1,4 @@ -From 6fb8db54929b40e1fd7ac949ef44f0d37df0bae9 Mon Sep 17 00:00:00 2001 +From 7f69bfabb87d311d7409ea6699f7dee8e9b3a95b 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
@@ -7,16 +7,15 @@ 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 a35c356..436355f 100644 +index b44e60c..c70e8cb 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -38,6 +38,7 @@ from pathlib import Path +@@ -28,6 +28,7 @@ from pathlib import Path known_cpu_families = (
meta/recipes-devtools/meson/meson_1.4.0.bb renamed from meta/recipes-devtools/meson/meson_1.3.1.bb +1 -1
@@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ " -SRC_URI[sha256sum] = "6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7" +SRC_URI[sha256sum] = "8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" inherit python_setuptools_build_meta github-releases
Signature · 1 line
2.39.2
PATCH 11/13 gtk-doc: upgrade 1.33.2 -> 1.34.0
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop merged patch.
---
...t-error-out-if-xsltproc-is-not-found.patch | 9 +++----
...code-paths-to-perl-python-in-scripts.patch | 23 +++++++++---------
...01-Don-t-use-docdir-from-environment.patch | 24 -------------------
.../gtk-doc/files/conditionaltests.patch | 14 ++++-------
.../gtk-doc/files/no-clobber.patch | 7 +++---
.../gtk-doc/files/pkg-config-native.patch | 3 +--
.../{gtk-doc_1.33.2.bb => gtk-doc_1.34.0.bb} | 3 +--
7 files changed, 24 insertions(+), 59 deletions(-)
delete mode 100644 meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch
rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.33.2.bb => gtk-doc_1.34.0.bb} (94%)meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch +3 -6
@@ -1,4 +1,4 @@ -From 8b7fbbb405959f2868ad6eadd7dd00018758a8a5 Mon Sep 17 00:00:00 2001 +From 50d3b9d3ca0e1ff47c8e7559303855530e58839a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 7 Sep 2016 14:52:04 +0300 Subject: [PATCH] Do not error out if xsltproc is not found.
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index b0c88d7..2a61d6e 100644 +index 8725074..0491090 100644 --- a/configure.ac +++ b/configure.ac -@@ -58,7 +58,7 @@ dnl Check for xsltproc +@@ -37,7 +37,7 @@ dnl Check for xsltproc dnl AC_PATH_PROG([XSLTPROC], [xsltproc]) if test -z "$XSLTPROC"; then
@@ -26,6 +26,3 @@ index b0c88d7..2a61d6e 100644 fi dnl --- -2.9.3 -
meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch +11 -12
@@ -1,4 +1,4 @@ -From 80e6aff72affa6d92f5abd7ff6353dfc4a7bff38 Mon Sep 17 00:00:00 2001 +From 64163565f8d6853b02e53308a6e6ba23d9d96299 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 31 Aug 2016 16:44:46 +0300 Subject: [PATCH] Do not hardocode paths to perl/python in scripts.
@@ -9,7 +9,6 @@ on targets either. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> - --- gtkdoc-check.in | 2 +- gtkdoc-depscan.in | 2 +-
@@ -25,7 +24,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gtkdoc-check.in b/gtkdoc-check.in -index 8c8e917..f6a25f6 100755 +index d9e2ad5..9ec526d 100755 --- a/gtkdoc-check.in +++ b/gtkdoc-check.in @@ -1,4 +1,4 @@
@@ -35,7 +34,7 @@ index 8c8e917..f6a25f6 100755 # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in -index 9bfaf30..aadc952 100755 +index c43317c..200837c 100755 --- a/gtkdoc-depscan.in +++ b/gtkdoc-depscan.in @@ -1,4 +1,4 @@
@@ -45,7 +44,7 @@ index 9bfaf30..aadc952 100755 from __future__ import print_function diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in -index 44f6bd1..26fbd93 100755 +index f9c4905..ed2ead1 100755 --- a/gtkdoc-fixxref.in +++ b/gtkdoc-fixxref.in @@ -1,4 +1,4 @@
@@ -55,7 +54,7 @@ index 44f6bd1..26fbd93 100755 # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in -index 42d5731..3a56d56 100755 +index 641f3c4..35e95fb 100755 --- a/gtkdoc-mkdb.in +++ b/gtkdoc-mkdb.in @@ -1,4 +1,4 @@
@@ -65,7 +64,7 @@ index 42d5731..3a56d56 100755 # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in -index 0d0a15d..914ff55 100755 +index b09f7a9..8d45966 100755 --- a/gtkdoc-mkhtml.in +++ b/gtkdoc-mkhtml.in @@ -1,4 +1,4 @@
@@ -75,7 +74,7 @@ index 0d0a15d..914ff55 100755 # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in -index c5445cd..65db71a 100755 +index 8f7b018..9bac0b6 100755 --- a/gtkdoc-mkman.in +++ b/gtkdoc-mkman.in @@ -1,4 +1,4 @@
@@ -85,7 +84,7 @@ index c5445cd..65db71a 100755 # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-mkpdf.in b/gtkdoc-mkpdf.in -index e8c0c03..f807236 100755 +index 7dca4b0..808f92d 100755 --- a/gtkdoc-mkpdf.in +++ b/gtkdoc-mkpdf.in @@ -1,4 +1,4 @@
@@ -95,7 +94,7 @@ index e8c0c03..f807236 100755 # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in -index 17a71c2..ec3fd28 100755 +index e8b0bf5..a960d8f 100755 --- a/gtkdoc-rebase.in +++ b/gtkdoc-rebase.in @@ -1,4 +1,4 @@
@@ -105,7 +104,7 @@ index 17a71c2..ec3fd28 100755 # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in -index 954c811..f461504 100755 +index 7893ebc..b7eb83d 100755 --- a/gtkdoc-scan.in +++ b/gtkdoc-scan.in @@ -1,4 +1,4 @@
@@ -115,7 +114,7 @@ index 954c811..f461504 100755 # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in -index 4cbe130..52c2c24 100755 +index 7660c70..c6ff072 100755 --- a/gtkdoc-scangobj.in +++ b/gtkdoc-scangobj.in @@ -1,4 +1,4 @@
meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch deleted +0 -24
@@ -1,24 +0,0 @@ -From 72dfeec0e49478b0bfb471c4155044391bad8e6c Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Fri, 8 Dec 2023 10:35:25 +0000 -Subject: [PATCH] Don't use docdir from environment - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/73] -Signed-off-by: Ross Burton <[email protected]> ---- - buildsystems/autotools/gtkdocize.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/buildsystems/autotools/gtkdocize.in b/buildsystems/autotools/gtkdocize.in -index 83127bf..76dcbfd 100755 ---- a/buildsystems/autotools/gtkdocize.in -+++ b/buildsystems/autotools/gtkdocize.in -@@ -39,7 +39,7 @@ set - $args - - # assume working directory if srcdir is not set - test "$srcdir" || srcdir=. --test "$docdir" || docdir="$srcdir" -+docdir="$srcdir" - - # detect configure script - no_configure_found=0
meta/recipes-gnome/gtk-doc/files/conditionaltests.patch +5 -9
@@ -1,23 +1,22 @@ -From 78bbf185934147a69ceb4b617d424e12e70997bf Mon Sep 17 00:00:00 2001 +From 9aa9230a305e964b2417daea2b51e43b2dee607c Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Tue, 27 Jun 2017 21:00:58 +0100 -Subject: [PATCH 3/3] gtk-doc: Handle floating gtk-doc dependency +Subject: [PATCH] gtk-doc: Handle floating gtk-doc dependency Allow the tests to be explicitly disabled to avoid floating dependnecy issues. This is not really an issue with RSS but is on previous releases. RP 2017/6/27 Upstream-Status: Pending - --- configure.ac | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/configure.ac b/configure.ac -index 684e2d1..e5e3aab 100644 +index 0491090..4270c88 100644 --- a/configure.ac +++ b/configure.ac -@@ -146,6 +146,11 @@ if test "x$GCC" = "xyes"; then +@@ -82,6 +82,11 @@ if test "x$GCC" = "xyes"; then fi fi
@@ -29,7 +28,7 @@ index 684e2d1..e5e3aab 100644 dnl if glib is available we can enable the tests PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], [ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`" -@@ -156,6 +161,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], +@@ -92,6 +97,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], build_tests="no" ] )
@@ -41,6 +40,3 @@ index 684e2d1..e5e3aab 100644 AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes ) dnl this enables the rule in test/Makefile.am AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes) --- -2.14.1 -
meta/recipes-gnome/gtk-doc/files/no-clobber.patch +3 -4
@@ -1,4 +1,4 @@ -From 8bc4c1f169f89bc5531da5b7e892b8f20e0f9a18 Mon Sep 17 00:00:00 2001 +From fa5e31e02b9d3c6c5ec3cdc1f34dd6c179520fd0 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Wed, 21 Mar 2018 14:47:29 +0000 Subject: [PATCH] gtk-doc: don't regenerate gtk-doc in do_install
@@ -20,16 +20,15 @@ files which don't already exist. Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571] Signed-off-by: Ross Burton <[email protected]> - --- buildsystems/autotools/gtk-doc.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildsystems/autotools/gtk-doc.make b/buildsystems/autotools/gtk-doc.make -index 7d9a27f..8cb336d 100644 +index fb2e7e2..4f6fe2b 100644 --- a/buildsystems/autotools/gtk-doc.make +++ b/buildsystems/autotools/gtk-doc.make -@@ -111,7 +111,7 @@ setup-build.stamp: +@@ -112,7 +112,7 @@ setup-build.stamp: destdir=`dirname $(abs_builddir)/$$file`; \ test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +1 -2
@@ -1,11 +1,10 @@ -From ebb0f7313a0931f646e86badce2627eff2fa37a8 Mon Sep 17 00:00:00 2001 +From c11fba9bcb8d55568067e626bd959841c05081e5 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Mon, 5 Sep 2016 22:25:44 +0100 Subject: [PATCH] Use native pkg-config when looking for gtk-doc. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <[email protected]> - --- buildsystems/autotools/gtk-doc.m4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-gnome/gtk-doc/gtk-doc_1.34.0.bb renamed from meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb +1 -2
@@ -21,12 +21,11 @@ PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" CACHED_CONFIGUREVARS += "ac_cv_path_XSLTPROC=xsltproc" -SRC_URI[archive.sha256sum] = "cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43" +SRC_URI[archive.sha256sum] = "b20b72b32a80bc18c7f975c9d4c16460c2276566a0b50f87d6852dff3aa7861c" SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ file://conditionaltests.patch \ file://no-clobber.patch \ - file://0001-Don-t-use-docdir-from-environment.patch \ " SRC_URI:append:class-native = " file://pkg-config-native.patch"
Signature · 1 line
2.39.2
PATCH 12/13 gstreamer1.0: update 1.22.11 -> 1.24.3
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Drop gstreamer1.0-omx recipe as upstream has removed it:
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4976
kate plugin dropped from bad.
amrnb/amrwb moved from ugly to good.
---
meta/conf/distro/include/maintainers.inc | 1 -
...ct-has-a-different-signature-on-musl.patch | 3 +-
...ools_1.22.11.bb => gst-devtools_1.24.3.bb} | 2 +-
....22.11.bb => gstreamer1.0-libav_1.24.3.bb} | 2 +-
.../gstreamer/gstreamer1.0-omx_1.22.11.bb | 47 -------------------
...ialized-warnings-when-compiling-with.patch | 5 +-
...-avoid-including-sys-poll.h-directly.patch | 5 +-
...issing-opencv-data-dir-in-yocto-buil.patch | 19 ++++----
....bb => gstreamer1.0-plugins-bad_1.24.3.bb} | 3 +-
...et-caps-from-src-pad-when-query-caps.patch | 5 +-
...parse-enhance-SSA-text-lines-parsing.patch | 5 +-
...iv-fb-Make-sure-config.h-is-included.patch | 3 +-
...bb => gstreamer1.0-plugins-base_1.24.3.bb} | 2 +-
...ine-ioctl_req_t-for-posix-linux-case.patch | 38 ---------------
...bb => gstreamer1.0-plugins-good_1.24.3.bb} | 7 +--
...bb => gstreamer1.0-plugins-ugly_1.24.3.bb} | 4 +-
...22.11.bb => gstreamer1.0-python_1.24.3.bb} | 2 +-
....bb => gstreamer1.0-rtsp-server_1.24.3.bb} | 2 +-
....22.11.bb => gstreamer1.0-vaapi_1.24.3.bb} | 2 +-
...spect-the-idententaion-used-in-meson.patch | 7 ++-
...ts-add-support-for-install-the-tests.patch | 21 ++++-----
...s-use-a-dictionaries-for-environment.patch | 7 ++-
...er-script-to-run-the-installed_tests.patch | 7 ++-
...r1.0_1.22.11.bb => gstreamer1.0_1.24.3.bb} | 2 +-
24 files changed, 51 insertions(+), 150 deletions(-)
rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.22.11.bb => gst-devtools_1.24.3.bb} (95%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.22.11.bb => gstreamer1.0-libav_1.24.3.bb} (91%)
delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.11.bb
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.22.11.bb => gstreamer1.0-plugins-bad_1.24.3.bb} (98%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.22.11.bb => gstreamer1.0-plugins-base_1.24.3.bb} (98%)
delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.22.11.bb => gstreamer1.0-plugins-good_1.24.3.bb} (93%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.22.11.bb => gstreamer1.0-plugins-ugly_1.24.3.bb} (85%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.22.11.bb => gstreamer1.0-python_1.24.3.bb} (91%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.22.11.bb => gstreamer1.0-rtsp-server_1.24.3.bb} (90%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.22.11.bb => gstreamer1.0-vaapi_1.24.3.bb} (95%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.22.11.bb => gstreamer1.0_1.24.3.bb} (97%)meta/conf/distro/include/maintainers.inc +0 -1
@@ -244,7 +244,6 @@ RECIPE_MAINTAINER:pn-gst-devtools = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-gst-examples = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-gstreamer1.0 = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-gstreamer1.0-libav = "Anuj Mittal <[email protected]>" -RECIPE_MAINTAINER:pn-gstreamer1.0-omx = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-gstreamer1.0-meta-base = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-gstreamer1.0-plugins-bad = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-gstreamer1.0-plugins-base = "Anuj Mittal <[email protected]>"
meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch +1 -2
@@ -1,4 +1,4 @@ -From 0c73b8131efba63c5cd37ea8c7551434c3b57304 Mon Sep 17 00:00:00 2001 +From c20894a5e6f52aa9fe3437e733a228b1a0eb6428 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sun, 9 Sep 2018 17:38:10 -0700 Subject: [PATCH] connect has a different signature on musl
@@ -11,7 +11,6 @@ typcasted to struct sockaddr_in* type inside the function before use Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> - --- validate/plugins/fault_injection/socket_interposer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-multimedia/gstreamer/gst-devtools_1.24.3.bb renamed from meta/recipes-multimedia/gstreamer/gst-devtools_1.22.11.bb +1 -1
@@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV} file://0001-connect-has-a-different-signature-on-musl.patch \ " -SRC_URI[sha256sum] = "07766425ecb5bf857ab5ad3962321c55cd89f9386b720843f9df71c0a455eb9b" +SRC_URI[sha256sum] = "b91114a2fd958f42acf441186e87e2bec93538ef35a9f8248111197360ffb237" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS:${PN} = "git"
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.3.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.11.bb +1 -1
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ " SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" -SRC_URI[sha256sum] = "6b13dcc9332ef27a7c1e7005c0196883874f91622f8aa6e52f218b05b15d2bf5" +SRC_URI[sha256sum] = "d9c5b152468a45c1fa8351410422090a7192707ad74d2e1a4367f5254e188d91" S = "${WORKDIR}/gst-libav-${PV}"
meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.11.bb deleted +0 -47
47 lines not on this page · raw message
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch +2 -3
@@ -1,4 +1,4 @@ -From 8be0c6ac60c96e87d8aa443be9c431844dc3d92a Mon Sep 17 00:00:00 2001 +From bb7f964d51de6b888b3b7a6d0c3d260fcad24008 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <[email protected]> Date: Tue, 26 Jan 2016 15:16:01 -0800 Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os
@@ -6,13 +6,12 @@ Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os Upstream-Status: Pending Signed-off-by: Andre McCurdy <[email protected]> - --- gst-libs/gst/codecparsers/gstvc1parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c -index 2c60ced..e8226d8 100644 +index f9af175..6661e2e 100644 --- a/gst-libs/gst/codecparsers/gstvc1parser.c +++ b/gst-libs/gst/codecparsers/gstvc1parser.c @@ -1730,7 +1730,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size,
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch +2 -3
@@ -1,4 +1,4 @@ -From 426ee79adeecc24605426030a486d7c5a755048c Mon Sep 17 00:00:00 2001 +From 25efc5b2d22aed4527470ef93970664b210bf8c5 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <[email protected]> Date: Wed, 3 Feb 2016 18:05:41 -0800 Subject: [PATCH] avoid including <sys/poll.h> directly
@@ -8,13 +8,12 @@ musl libc generates warnings if <sys/poll.h> is included directly. Upstream-Status: Pending Signed-off-by: Andre McCurdy <[email protected]> - --- sys/dvb/gstdvbsrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c -index b8e5b1a..5bca6e5 100644 +index 33ee3ff..b8ddea9 100644 --- a/sys/dvb/gstdvbsrc.c +++ b/sys/dvb/gstdvbsrc.c @@ -98,7 +98,7 @@
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +9 -10
@@ -1,4 +1,4 @@ -From e6eb7536fcfc2c75f7831f67b1f16f3f36ef2545 Mon Sep 17 00:00:00 2001 +From 39fbcdfc5383bdae95293a3109c847f64d193b54 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin <[email protected]> Date: Mon, 27 Jan 2020 10:22:35 +0000 Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build
@@ -12,18 +12,17 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Andrey Zhizhikin <[email protected]> Signed-off-by: Jose Quaresma <[email protected]> - --- - ext/opencv/meson.build | 3 +++ + gst-libs/gst/opencv/meson.build | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build -index 37e2015..326f737 100644 ---- a/ext/opencv/meson.build -+++ b/ext/opencv/meson.build -@@ -87,6 +87,9 @@ if opencv_found - opencv_prefix = opencv_dep.get_variable('prefix') - gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] +diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build +index 1d337f1..f47939a 100644 +--- a/gst-libs/gst/opencv/meson.build ++++ b/gst-libs/gst/opencv/meson.build +@@ -52,6 +52,9 @@ if opencv_found + # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral] + gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral']) + pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() + opencv_prefix = pkgconf_sysroot + opencv_prefix
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.3.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.11.bb +1 -2
@@ -10,7 +10,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0002-avoid-including-sys-poll.h-directly.patch \ file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " -SRC_URI[sha256sum] = "808d3b33fc4c71aeb2561c364a87c2e8a3e2343319a83244c8391be4b09499c8" +SRC_URI[sha256sum] = "e90f26c7dc9c76f4aa599b758cfd6d8c10d6a0b9cb265ba2c3c9bdf3888558f8" S = "${WORKDIR}/gst-plugins-bad-${PV}"
@@ -124,7 +124,6 @@ EXTRA_OEMESON += " \ -Dgs=disabled \ -Dgsm=disabled \ -Diqa=disabled \ - -Dkate=disabled \ -Dladspa=disabled \ -Dldac=disabled \ -Dlv2=disabled \
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch +2 -3
@@ -1,4 +1,4 @@ -From 63fe5a7b4ef70e2c490bad3b0838329935a8d77c Mon Sep 17 00:00:00 2001 +From 5a4d65e13a326103ac02f156c01b6fcbb0269902 Mon Sep 17 00:00:00 2001 From: zhouming <[email protected]> Date: Wed, 14 May 2014 10:16:20 +0800 Subject: [PATCH] ENGR00312515: get caps from src pad when query caps
@@ -8,7 +8,6 @@ https://bugzilla.gnome.org/show_bug.cgi?id=728312 Upstream-Status: Pending Signed-off-by: zhouming <[email protected]> - --- gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
@@ -17,7 +16,7 @@ Signed-off-by: zhouming <[email protected]> diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c old mode 100644 new mode 100755 -index 173da37..2b7f34c +index ef0ff90..53f05c8 --- a/gst-libs/gst/tag/gsttagdemux.c +++ b/gst-libs/gst/tag/gsttagdemux.c @@ -1796,6 +1796,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch +2 -3
@@ -1,4 +1,4 @@ -From 7bf9525528c8f4a47413d7f82214d76f95f0c5f6 Mon Sep 17 00:00:00 2001 +From 21b8339077f52ec9220e0d3d1f3872e23c7c2e88 Mon Sep 17 00:00:00 2001 From: Mingke Wang <[email protected]> Date: Thu, 19 Mar 2015 14:17:10 +0800 Subject: [PATCH] ssaparse: enhance SSA text lines parsing.
@@ -9,7 +9,6 @@ and there's are maybe multiple Dialog lines in one input buffer. Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/178] Signed-off-by: Mingke Wang <[email protected]> - --- gst/subparse/gstssaparse.c | 150 +++++++++++++++++++++++++++++++++---- 1 file changed, 134 insertions(+), 16 deletions(-)
@@ -18,7 +17,7 @@ Signed-off-by: Mingke Wang <[email protected]> diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c old mode 100644 new mode 100755 -index d6fdb9c..5ebe678 +index 42fbb42..2dab51c --- a/gst/subparse/gstssaparse.c +++ b/gst/subparse/gstssaparse.c @@ -270,6 +270,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch +1 -2
@@ -1,4 +1,4 @@ -From 2b07840122bc2e83bd23dad59aa80d9479f2e1e4 Mon Sep 17 00:00:00 2001 +From 246e6f5ed75696b2e9d9a9ee8cd59252724e1334 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani <[email protected]> Date: Tue, 21 May 2019 14:01:11 +0200 Subject: [PATCH] viv-fb: Make sure config.h is included
@@ -8,7 +8,6 @@ This prevents build errors due to missing GST_API_* symbols Upstream-Status: Pending Signed-off-by: Carlos Rafael Giani <[email protected]> - --- gst-libs/gst/gl/gl-prelude.h | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.3.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.11.bb +1 -1
@@ -11,7 +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 \ " -SRC_URI[sha256sum] = "65eaf72296cc5edc985695a4d80affc931e64a79f4879d05615854f7a2cf5bd1" +SRC_URI[sha256sum] = "f1094397eaa7932f06e57ebbb075aa33aa2c76e4b75630a16b02c8d4af46832e" S = "${WORKDIR}/gst-plugins-base-${PV}"
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From b77d4806fd5de50d0b017a3e6a19c5bfdef7b3e4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 13 Feb 2023 12:47:31 -0800 -Subject: [PATCH] v4l2: Define ioctl_req_t for posix/linux case - -this is an issue seen with musl based linux distros e.g. alpine [1] -musl is not going to change this since it breaks ABI/API interfaces -Newer compilers are stringent ( e.g. clang16 ) which can now detect -signature mismatches in function pointers too, existing code warned but -did not error with older clang - -Fixes -gstv4l2object.c:544:23: error: incompatible function pointer types assigning to 'gint (*)(gint, ioctl_req_t, ...)' (aka 'int (*)(int, unsigned long, ...)') from 'int (int, int, ...)' [-Wincompatible-function-pointer-types] - v4l2object->ioctl = ioctl; - ^ ~~~~~ - -[1] https://gitlab.alpinelinux.org/alpine/aports/-/issues/7580 - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3950] -Signed-off-by: Khem Raj <[email protected]> - ---- - sys/v4l2/gstv4l2object.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h -index d95b375..5223cbb 100644 ---- a/sys/v4l2/gstv4l2object.h -+++ b/sys/v4l2/gstv4l2object.h -@@ -76,6 +76,8 @@ typedef gboolean (*GstV4l2UpdateFpsFunction) (GstV4l2Object * v4l2object); - * 'unsigned long' for the 2nd parameter */ - #ifdef __ANDROID__ - typedef unsigned ioctl_req_t; -+#elif defined(__linux__) && !defined(__GLIBC__) /* musl/linux */ -+typedef int ioctl_req_t; - #else - typedef gulong ioctl_req_t; - #endif
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.3.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb +4 -3
@@ -4,10 +4,9 @@ SUMMARY = "'Good' GStreamer plugins" HOMEPAGE = "https://gstreamer.freedesktop.org/" BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues" -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ - file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch" +SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" -SRC_URI[sha256sum] = "6ddd032381827d31820540735f0004b429436b0bdac19aaeab44fa22faad52e2" +SRC_URI[sha256sum] = "150f914e61dc05600b68b88ca103c7cc227130158e389ea9ea159f4050a2ebb0" S = "${WORKDIR}/gst-plugins-good-${PV}"
@@ -36,6 +35,8 @@ X11DISABLEOPTS = "-Dximagesrc=disabled -Dximagesrc-xshm=disabled -Dximagesrc-xfi QT5WAYLANDDEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" +PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr" +PACKAGECONFIG[amrwb] = "-Damrwbdec=enabled,-Damrwbdec=disabled,opencore-amr" PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm-native" PACKAGECONFIG[bz2] = "-Dbz2=enabled,-Dbz2=disabled,bzip2" PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo"
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.3.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb +1 -3
@@ -15,7 +15,7 @@ SRC_URI = " \ https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "7758b7decfd20c00cae5700822bcbbf03f98c723e33e17634db2e07ca1da60bf" +SRC_URI[sha256sum] = "4c951341c4c648630b6fe1234ec113d81dd2d248529bf2b5478e0ad077c80ed3" S = "${WORKDIR}/gst-plugins-ugly-${PV}"
@@ -27,8 +27,6 @@ PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ " -PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr" -PACKAGECONFIG[amrwb] = "-Damrwbdec=enabled,-Damrwbdec=disabled,opencore-amr" PACKAGECONFIG[a52dec] = "-Da52dec=enabled,-Da52dec=disabled,liba52" PACKAGECONFIG[cdio] = "-Dcdio=enabled,-Dcdio=disabled,libcdio" PACKAGECONFIG[dvdread] = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread"
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.3.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.11.bb +1 -1
@@ -8,7 +8,7 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "f7a5450d93fd81bf46060dca7f4a048d095b6717961fec211731a11a994c99a7" +SRC_URI[sha256sum] = "ecdb3e2ba94ea2c82b93a8c715d5a7e04f9726a8838c0a6b17694928fd1e8595" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.3.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.11.bb +1 -1
@@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server" SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[sha256sum] = "ec49d474750a6ff6729c85b448abc607fb6840b21717ad7abc967e2adbf07a24" +SRC_URI[sha256sum] = "62628ecca78b8f5b51c59a4d602c65e9205ffc50c3c83cd61fab1f6348b63565" S = "${WORKDIR}/${PNREAL}-${PV}"
meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.3.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.11.bb +1 -1
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "6eae1360658302b9b512fa46b4d06f5b818dfce5f2f43d7d710ca8142719d8ad" +SRC_URI[sha256sum] = "845f2efe0dca8dab234dde8fb091da2cd06a9d2a683422b56dcb688954f9070e" S = "${WORKDIR}/${REALPN}-${PV}" DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch +3 -4
@@ -1,4 +1,4 @@ -From 5372cd5bf2a9dd247b9c5fc6e4fe248046dbb085 Mon Sep 17 00:00:00 2001 +From 381f50a27766c425af36a7203061716497e6603f Mon Sep 17 00:00:00 2001 From: Jose Quaresma <[email protected]> Date: Sun, 11 Apr 2021 19:48:13 +0100 Subject: [PATCH] tests: respect the idententaion used in meson
@@ -6,16 +6,15 @@ Subject: [PATCH] tests: respect the idententaion used in meson Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] Signed-off-by: Jose Quaresma <[email protected]> - --- tests/check/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/check/meson.build b/tests/check/meson.build -index 9787b0a..16caac7 100644 +index 6540279..e9501fe 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build -@@ -145,11 +145,11 @@ foreach t : core_tests +@@ -146,11 +146,11 @@ foreach t : core_tests if not skip_test exe = executable(test_name, fname,
meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch +10 -11
@@ -1,4 +1,4 @@ -From 27e977d03b0f7c1d0bf19621ef0cec0585410e7b Mon Sep 17 00:00:00 2001 +From 31dea17a1d5de0003719a875a1089df43a50219a Mon Sep 17 00:00:00 2001 From: Jose Quaresma <[email protected]> Date: Sun, 11 Apr 2021 19:48:13 +0100 Subject: [PATCH] tests: add support for install the tests
@@ -10,7 +10,6 @@ This will provide to run the tests using the gnome-desktop-testing [1] Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] Signed-off-by: Jose Quaresma <[email protected]> - --- meson.build | 4 ++++ meson_options.txt | 1 +
@@ -20,10 +19,10 @@ Signed-off-by: Jose Quaresma <[email protected]> create mode 100644 tests/check/template.test.in diff --git a/meson.build b/meson.build -index 60c7bec..f7650b1 100644 +index efcf189..c97d9a8 100644 --- a/meson.build +++ b/meson.build -@@ -606,6 +606,10 @@ if bashcomp_dep.found() +@@ -624,6 +624,10 @@ if bashcomp_dep.found() endif endif
@@ -35,10 +34,10 @@ index 60c7bec..f7650b1 100644 pkgconfig = import('pkgconfig') diff --git a/meson_options.txt b/meson_options.txt -index 7363bdb..a34ba37 100644 +index 340fb58..5b87f68 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso +@@ -16,6 +16,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso option('memory-alignment', type: 'combo', choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'], value: 'malloc')
@@ -47,14 +46,14 @@ index 7363bdb..a34ba37 100644 # Feature options option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') diff --git a/tests/check/meson.build b/tests/check/meson.build -index 16caac7..f2d400f 100644 +index e9501fe..08f8fd8 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build -@@ -124,10 +124,16 @@ test_defines = [ +@@ -125,10 +125,16 @@ test_defines = [ '-UG_DISABLE_ASSERT', '-UG_DISABLE_CAST_CHECKS', '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"', -- '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"', +- '-DTESTFILE="' + fsmod.as_posix(meson.current_source_dir()) + '/meson.build"', '-DGST_DISABLE_DEPRECATED', ]
@@ -68,7 +67,7 @@ index 16caac7..f2d400f 100644 # sanity checking if get_option('check').disabled() if get_option('tests').enabled() -@@ -150,6 +156,8 @@ foreach t : core_tests +@@ -151,6 +157,8 @@ foreach t : core_tests include_directories : [configinc], link_with : link_with_libs, dependencies : gst_deps + test_deps,
@@ -77,7 +76,7 @@ index 16caac7..f2d400f 100644 ) env = environment() -@@ -161,6 +169,18 @@ foreach t : core_tests +@@ -162,6 +170,18 @@ foreach t : core_tests env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer')
meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch +3 -4
@@ -1,4 +1,4 @@ -From 7041bc5adf9501beb1428d8bbae6b351a6bf07f9 Mon Sep 17 00:00:00 2001 +From 453865e8938c5f50f14409b67246bbbd801fa44d Mon Sep 17 00:00:00 2001 From: Jose Quaresma <[email protected]> Date: Sat, 24 Apr 2021 10:34:47 +0100 Subject: [PATCH] tests: use a dictionaries for environment
@@ -9,16 +9,15 @@ use a dictionary as this is simplest solution to install the environment. Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] Signed-off-by: Jose Quaresma <[email protected]> - --- tests/check/meson.build | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/check/meson.build b/tests/check/meson.build -index f2d400f..50dff7f 100644 +index 08f8fd8..330abaa 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build -@@ -160,14 +160,19 @@ foreach t : core_tests +@@ -161,14 +161,19 @@ foreach t : core_tests install: installed_tests_enabled, )
meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch +3 -4
@@ -1,4 +1,4 @@ -From 1b1d1ce4227b6bea7c7def5dac4a663486e070c2 Mon Sep 17 00:00:00 2001 +From 506ff13a044439a170f770b6663a64c942ae0a05 Mon Sep 17 00:00:00 2001 From: Jose Quaresma <[email protected]> Date: Sun, 2 May 2021 01:58:01 +0100 Subject: [PATCH] tests: add helper script to run the installed_tests
@@ -10,7 +10,6 @@ testing framework. Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] Signed-off-by: Jose Quaresma <[email protected]> - --- tests/check/meson.build | 17 +++++++++++++++++ tests/check/template.sh.in | 9 +++++++++
@@ -19,10 +18,10 @@ Signed-off-by: Jose Quaresma <[email protected]> create mode 100755 tests/check/template.sh.in diff --git a/tests/check/meson.build b/tests/check/meson.build -index 50dff7f..2b9e979 100644 +index 330abaa..5d383b1 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build -@@ -184,6 +184,23 @@ foreach t : core_tests +@@ -185,6 +185,23 @@ foreach t : core_tests install_dir: installed_tests_metadir, configuration: test_conf )
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.24.3.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.11.bb +1 -1
@@ -22,7 +22,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x file://0003-tests-use-a-dictionaries-for-environment.patch \ file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \ " -SRC_URI[sha256sum] = "3d16259e9dab8b002c57ce208a09b350d8282f5b0197306c0cdba9a0d0799744" +SRC_URI[sha256sum] = "1225ef4a329fae1cadc5ec727dab249ad567e8072879493561ceb91ed34aa414" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \
Signature · 1 line
2.39.2
PATCH 13/13 libomxil: remove the recipe
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Now-removed gstreamer omx plugin was the only consumer, and it's all very obsolete and hasn't seen development in years.
--- meta/conf/distro/include/distro_alias.inc | 1 - meta/conf/distro/include/maintainers.inc | 1 - .../libomxil-0.9.3/configure-fix.patch | 58 ------------------- .../disable-so-versioning.patch | 36 ------------ .../dynamicloader-linking.patch | 20 ------- .../libomxil-0.9.3/makefile-docdir-fix.patch | 19 ------ .../libomxil-0.9.3/parallel-make.patch | 18 ------ .../libomxil/libomxil_0.9.3.bb | 45 -------------- 8 files changed, 198 deletions(-) delete mode 100644 meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch delete mode 100644 meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch delete mode 100644 meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch delete mode 100644 meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch delete mode 100644 meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch delete mode 100644 meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
meta/conf/distro/include/distro_alias.inc +0 -1
@@ -151,7 +151,6 @@ DISTRO_PN_ALIAS:pn-libnewt = "Debian=libnewt0.52 Fedora=newt" DISTRO_PN_ALIAS:pn-libnewt-python = "Ubuntu=python-newt Fedora=newt-python" DISTRO_PN_ALIAS:pn-libnl = "Mandriva=libnl Fedora=libnl" DISTRO_PN_ALIAS:pn-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns" -DISTRO_PN_ALIAS:pn-libomxil = "OSPDT upstream=http://omxil.sourceforge.net/" DISTRO_PN_ALIAS:pn-libowl = "Debian=owl OpenedHand" DISTRO_PN_ALIAS:pn-libpam = "Meego=pam Fedora=pam OpenSuSE=pam Ubuntu=pam Mandriva=pam Debian=pam" DISTRO_PN_ALIAS:pn-libpcre = "Mandriva=libpcre0 Fedora=pcre"
meta/conf/distro/include/maintainers.inc +0 -1
@@ -365,7 +365,6 @@ RECIPE_MAINTAINER:pn-libnsl2 = "Khem Raj <[email protected]>" RECIPE_MAINTAINER:pn-libnss-mdns = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-libnss-nis = "Khem Raj <[email protected]>" RECIPE_MAINTAINER:pn-libogg = "Anuj Mittal <[email protected]>" -RECIPE_MAINTAINER:pn-libomxil = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-libpam = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-libpcap = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-libpciaccess = "Wang Mingyu <[email protected]>"
meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch deleted +0 -58
58 lines not on this page · raw message
meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch deleted +0 -36
@@ -1,36 +0,0 @@ -Disable so versioning since they are really not a versioned shared lib. - -Upstream-Status: Submitted @ https://sourceforge.net/p/omxil/bugs/59/ - -Signed-off-by: Drew Moseley <[email protected]> - -diff -rub libomxil-bellagio-0.9.3-orig/src/components/audio_effects/Makefile.am libomxil-bellagio-0.9.3/src/components/audio_effects/Makefile.am ---- libomxil-bellagio-0.9.3-orig/src/components/audio_effects/Makefile.am 2014-07-20 15:22:00.858425234 -0400 -+++ libomxil-bellagio-0.9.3/src/components/audio_effects/Makefile.am 2014-07-20 15:25:42.687525225 -0400 -@@ -10,4 +10,5 @@ - libomxaudio_effects_la_CFLAGS = -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/base -+libomxaudio_effects_la_LDFLAGS = -avoid-version - -diff -rub libomxil-bellagio-0.9.3-orig/src/components/clocksrc/Makefile.am libomxil-bellagio-0.9.3/src/components/clocksrc/Makefile.am ---- libomxil-bellagio-0.9.3-orig/src/components/clocksrc/Makefile.am 2014-07-20 15:22:00.858425234 -0400 -+++ libomxil-bellagio-0.9.3/src/components/clocksrc/Makefile.am 2014-07-20 15:24:49.151259753 -0400 -@@ -10,4 +10,4 @@ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/base -- -+libomxclocksrc_la_LDFLAGS = -avoid-version -diff -rub libomxil-bellagio-0.9.3-orig/src/components/videoscheduler/Makefile.am libomxil-bellagio-0.9.3/src/components/videoscheduler/Makefile.am ---- libomxil-bellagio-0.9.3-orig/src/components/videoscheduler/Makefile.am 2014-07-20 15:22:00.862425254 -0400 -+++ libomxil-bellagio-0.9.3/src/components/videoscheduler/Makefile.am 2014-07-20 15:22:36.462601786 -0400 -@@ -6,7 +6,7 @@ - library_entry_point.c - - libomxvideosched_la_LIBADD = $(top_builddir)/src/libomxil-bellagio.la --libomxvideosched_la_LDFLAGS = -+libomxvideosched_la_LDFLAGS = -avoid-version - libomxvideosched_la_CFLAGS = -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/base
meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch deleted +0 -20
@@ -1,20 +0,0 @@ -This patch fixes link issue when libomxdynamicloader.so is loaded : -Missing symbol RM_Deinit. - -This patch comes from "http://pkgs.fedoraproject.org/cgit/libomxil-bellagio.git/commit/?h=f17&id=4996a95828943d345e51ded6876c3103653eecf8" - -Upstream-Status: Pending - -Signed-off-by: Sébastien Mennetrier <[email protected]> - ---- a/src/dynamic_loader/Makefile.am 2014-02-25 15:29:10.128549636 +0100 -+++ b/src/dynamic_loader/Makefile.am 2014-02-25 15:30:15.756548808 +0100 -@@ -3,7 +3,7 @@ - omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la - libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h - --libomxdynamicloader_la_LDFLAGS = -+libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(top_builddir)/src/.libs - libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/base \
meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch deleted +0 -19
@@ -1,19 +0,0 @@ -This patch is to remove DESTDIR in docdir. -Otherwise, when users install by running `make install DESTDIR=/alternate/directory' specified in the file INSTALL, the doc will go into /alternate/directory/alternate/directory, which is not expected. - -Upstream-Status: Pending - -Signed-off-by: Shane Wang <[email protected]> - -diff -r 30b597e4e70d Makefile.am ---- a/Makefile.am Wed Dec 28 15:38:35 2011 +0800 -+++ b/Makefile.am Wed Dec 28 15:39:25 2011 +0800 -@@ -7,7 +7,7 @@ - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libomxil-bellagio.pc - --docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@ -+docdir = $(prefix)/share/doc/@PACKAGE@ - doc_DATA = README \ - ChangeLog \ - TODO
meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch deleted +0 -18
@@ -1,18 +0,0 @@ -This patch is to make libomxil Makefile support "make -jN". -The omxregister_bellagio stuffs depend on libomxil_bellagio library. - -Upstream-Status: Pending - -Signed-off-by: Shane Wang <[email protected]> - -diff -r f59d077d3dd5 Makefile.am ---- a/src/Makefile.am Wed Dec 28 10:54:36 2011 +0800 -+++ b/src/Makefile.am Wed Dec 28 10:55:46 2011 +0800 -@@ -7,6 +7,7 @@ - omxregister_bellagio_SOURCES = omxregister.c common.c common.h - omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \ - -I$(top_srcdir)/include -+omxregister_bellagio_LDADD = $(lib_LTLIBRARIES) - omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) - - lib_LTLIBRARIES = libomxil-bellagio.la
meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb deleted +0 -45
45 lines not on this page · raw message
Signature · 1 line
2.39.2