From patchwork Mon Dec 16 12:15:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 54142 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D578E7717F for ; Mon, 16 Dec 2024 12:15:49 +0000 (UTC) Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by mx.groups.io with SMTP id smtpd.web11.55109.1734351341331899914 for ; Mon, 16 Dec 2024 04:15:41 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.81, mailfrom: f_l_k@t-online.de) Received: from fwd86.aul.t-online.de (fwd86.aul.t-online.de [10.223.144.112]) by mailout03.t-online.de (Postfix) with SMTP id 45A46A31 for ; Mon, 16 Dec 2024 13:15:38 +0100 (CET) Received: from intel-corei7-64.fritz.box ([84.154.162.147]) by fwd86.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1tNA0a-0JvUjx0; Mon, 16 Dec 2024 13:15:32 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 1/3] luajit: update Date: Mon, 16 Dec 2024 13:15:25 +0100 Message-ID: <20241216121527.1428075-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1734351332-E9FF89BF-27089953/0/0 CLEAN NORMAL X-TOI-MSGID: 3f3d0566-6657-4def-be34-389c05f5caf9 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 16 Dec 2024 12:15:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114332 Signed-off-by: Markus Volk --- meta-oe/recipes-devtools/luajit/luajit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb index 4189217541..6a79ffb897 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_git.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ " PV = "2.1" -SRCREV = "c525bcb9024510cad9e170e12b6209aedb330f83" +SRCREV = "19878ec05c239ccaf5f3d17af27670a963e25b8b" S = "${WORKDIR}/git" From patchwork Mon Dec 16 12:15:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 54144 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91226E77184 for ; Mon, 16 Dec 2024 12:15:49 +0000 (UTC) Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by mx.groups.io with SMTP id smtpd.web11.55110.1734351341416441700 for ; Mon, 16 Dec 2024 04:15:41 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.81, mailfrom: f_l_k@t-online.de) Received: from fwd86.aul.t-online.de (fwd86.aul.t-online.de [10.223.144.112]) by mailout03.t-online.de (Postfix) with SMTP id 473B6A38 for ; Mon, 16 Dec 2024 13:15:38 +0100 (CET) Received: from intel-corei7-64.fritz.box ([84.154.162.147]) by fwd86.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1tNA0a-0JvUjy0; Mon, 16 Dec 2024 13:15:32 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 2/3] lua-lgi: add recipe Date: Mon, 16 Dec 2024 13:15:26 +0100 Message-ID: <20241216121527.1428075-2-f_l_k@t-online.de> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241216121527.1428075-1-f_l_k@t-online.de> References: <20241216121527.1428075-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1734351332-CE7FB9BF-CB7CB7F6/10/3626336762 SUSPECT URL X-TOI-MSGID: 7860495d-d7a6-48c1-bcb0-63529958c60d List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 16 Dec 2024 12:15:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114334 gobject bindings for lua Required to build the lua51 loader for libpeas-2 Signed-off-by: Markus Volk --- meta-oe/recipes-support/lgi/lua-lgi_0.9.2.bb | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 meta-oe/recipes-support/lgi/lua-lgi_0.9.2.bb diff --git a/meta-oe/recipes-support/lgi/lua-lgi_0.9.2.bb b/meta-oe/recipes-support/lgi/lua-lgi_0.9.2.bb new file mode 100644 index 0000000000..1584a931c7 --- /dev/null +++ b/meta-oe/recipes-support/lgi/lua-lgi_0.9.2.bb @@ -0,0 +1,24 @@ +SUMMARY = "LGI is gobject-introspection based dynamic Lua binding to GObject based libraries." +HOMEPAGE = "https://https://github.com/pavouk/lgi" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a77b7838f84aa753d37f88fd9c9ccf7d" + +SRC_URI = "git://github.com/pavouk/lgi.git;protocol=https;branch=master" + +DEPENDS = " \ + luajit \ + luajit-native \ + cairo \ + gobject-introspection \ + gobject-introspection-native \ +" + +S = "${WORKDIR}/git" +SRCREV = "d7666f77e7ee33907c84f5efdef32aef2e1cc196" +SRCPV = "${PV}+${SRCREV}" + +inherit meson pkgconfig + +EXTRA_OEMESON += "--buildtype release -Dtests=false" + +FILES:${PN} = "${libdir} ${datadir}" From patchwork Mon Dec 16 12:15:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 54143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E184E77180 for ; Mon, 16 Dec 2024 12:15:49 +0000 (UTC) Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by mx.groups.io with SMTP id smtpd.web10.55290.1734351341417405342 for ; Mon, 16 Dec 2024 04:15:41 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.81, mailfrom: f_l_k@t-online.de) Received: from fwd86.aul.t-online.de (fwd86.aul.t-online.de [10.223.144.112]) by mailout03.t-online.de (Postfix) with SMTP id 48C69A3D for ; Mon, 16 Dec 2024 13:15:38 +0100 (CET) Received: from intel-corei7-64.fritz.box ([84.154.162.147]) by fwd86.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1tNA0a-0JvUjz0; Mon, 16 Dec 2024 13:15:32 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 3/3] libpeas: update 1.36.0 -> 2.0.5 Date: Mon, 16 Dec 2024 13:15:27 +0100 Message-ID: <20241216121527.1428075-3-f_l_k@t-online.de> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241216121527.1428075-1-f_l_k@t-online.de> References: <20241216121527.1428075-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1734351332-2EFFA9BF-55055F54/0/0 CLEAN NORMAL X-TOI-MSGID: ef77aeaa-bc57-4554-bfee-3b284cd86366 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 16 Dec 2024 12:15:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114333 - Drop 0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch peas-demo is not built anymore - Add patch to disable the broken check for lgi lgi does not support pkgconfig but it hasn't changed version since 2017 - Remove gtk+3 from depends and dont inherit gtk-icon-cache to not pull it in again indirectly - g-i is not required anymore and will be built depending on DISTRO_FEATURES - Dont package the loaders into separate packages to reduce required RDEPENDS. If a loader is not wanted on target it will be better to remove the according PACKAGECONFIG option to also remove the dependencies? Signed-off-by: Markus Volk --- ...-and-srcdir-paths-from-test-binaries.patch | 82 ------------------- .../libpeas/libpeas/disable-lgi-check.patch | 48 +++++++++++ .../recipes-gnome/libpeas/libpeas_1.36.0.bb | 28 ------- .../recipes-gnome/libpeas/libpeas_2.0.5.bb | 20 +++++ 4 files changed, 68 insertions(+), 110 deletions(-) delete mode 100644 meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch create mode 100644 meta-oe/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch delete mode 100644 meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb create mode 100644 meta-oe/recipes-gnome/libpeas/libpeas_2.0.5.bb diff --git a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch b/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch deleted file mode 100644 index 6bb48777ec..0000000000 --- a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch +++ /dev/null @@ -1,82 +0,0 @@ -From d798af685e9e1166400acbdab082c17b02dad85b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 18 May 2023 23:28:10 -0700 -Subject: [PATCH] Remove builddir and srcdir paths from test binaries - -Encoding buildtime paths is not needed since if these tests are to be -run they will be run on target where builddir structure most certainly -wont be available. - -Fixes -WARNING: libpeas-1.36.0-r0 do_package_qa: QA Issue: File /usr/bin/peas-demo in package libpeas-demo contains reference to TMPDIR [buildpaths] - -Upstream-Status: Inappropriate [Cross-compile specific] -Signed-off-by: Khem Raj ---- - peas-demo/meson.build | 2 +- - tests/libpeas-gtk/testing/meson.build | 4 ++-- - tests/libpeas/testing/meson.build | 4 ++-- - tests/testing-util/meson.build | 4 ++-- - 4 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/peas-demo/meson.build b/peas-demo/meson.build -index a3ec53b..855ebf2 100644 ---- a/peas-demo/meson.build -+++ b/peas-demo/meson.build -@@ -9,7 +9,7 @@ peas_demo_c = [ - - peas_demo_c_args = [ - '-DHAVE_CONFIG_H', -- '-DPEAS_BUILDDIR="@0@"'.format(builddir), -+ '-DPEAS_BUILDDIR="/usr/src/debug/libpeas"', - '-DPEAS_PREFIX="@0@"'.format(prefix), - '-DPEAS_LIBDIR="@0@"'.format(libdir), - ] -diff --git a/tests/libpeas-gtk/testing/meson.build b/tests/libpeas-gtk/testing/meson.build -index 646f42d..fd9a692 100644 ---- a/tests/libpeas-gtk/testing/meson.build -+++ b/tests/libpeas-gtk/testing/meson.build -@@ -19,8 +19,8 @@ libpeas_gtk_testing_deps = [ - - libpeas_gtk_testing_c_args = [ - '-DHAVE_CONFIG_H', -- '-DBUILDDIR="@0@"'.format(builddir), -- '-DSRCDIR="@0@"'.format(srcdir), -+ '-DBUILDDIR="/usr/src/debug/libpeas"', -+ '-DSRCDIR="/usr/src/debug/libpeas"', - ] - - libpeas_gtk_testing_lib = library( -diff --git a/tests/libpeas/testing/meson.build b/tests/libpeas/testing/meson.build -index 74ba7b1..084daa9 100644 ---- a/tests/libpeas/testing/meson.build -+++ b/tests/libpeas/testing/meson.build -@@ -21,8 +21,8 @@ libpeas_testing_deps = [ - - libpeas_testing_c_args = [ - '-DHAVE_CONFIG_H', -- '-DBUILDDIR="@0@"'.format(builddir), -- '-DSRCDIR="@0@"'.format(srcdir), -+ '-DBUILDDIR="/usr/src/debug/libpeas"', -+ '-DSRCDIR="/usr/src/debug/libpeas"', - ] - - libpeas_testing_lib = library( -diff --git a/tests/testing-util/meson.build b/tests/testing-util/meson.build -index 1c40740..83ad059 100644 ---- a/tests/testing-util/meson.build -+++ b/tests/testing-util/meson.build -@@ -17,8 +17,8 @@ libtesting_util_deps = [ - - libtesting_util_c_args = [ - '-DHAVE_CONFIG_H', -- '-DBUILDDIR="@0@"'.format(builddir), -- '-DSRCDIR="@0@"'.format(srcdir), -+ '-DBUILDDIR="/usr/src/debug/libpeas"', -+ '-DSRCDIR="/usr/src/debug/libpeas"', - '-UG_DISABLE_ASSERT', - '-UG_DISABLE_CAST_CHECKS', - ] --- -2.40.1 - diff --git a/meta-oe/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch b/meta-oe/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch new file mode 100644 index 0000000000..347731051f --- /dev/null +++ b/meta-oe/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch @@ -0,0 +1,48 @@ +From c9bb8f5c730745b48eb86404d0297ebc15bf9fa7 Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Mon, 16 Dec 2024 12:22:49 +0100 +Subject: [PATCH] meson + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Markus Volk +--- + meson.build | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +diff --git a/meson.build b/meson.build +index a8100af..0fb15d2 100644 +--- a/meson.build ++++ b/meson.build +@@ -148,8 +148,8 @@ if not lua51_dep.found() + lua51_dep = dependency('lua-5.1', version: lua_req, required: false) + endif + luajit_dep = dependency('luajit', version: luajit_req, required: false) +-lua_lgi_found = false +-lua_lgi_ver = 'not found' ++lua_lgi_found = true ++lua_lgi_ver = '0.9.0' + lua51_prg = find_program('lua5.1', required: false) + if not lua51_prg.found() + lua51_prg = find_program('lua51', required: false) +@@ -209,14 +209,9 @@ if lua_found + else + lua_prg = lua51_prg + endif +- lua_lgi_check = run_command(lua_prg, ['-e', 'print(require("lgi")._VERSION)']) +- if lua_lgi_check.returncode() == 0 +- lua_lgi_ver = lua_lgi_check.stdout().strip() +- if lua_lgi_ver.version_compare(lua_lgi_req) +- lua51_lgi_dep = declare_dependency(version: lua_lgi_ver) +- lua_lgi_found = true +- endif +- endif ++ lua_lgi_ver = '0.9.0' ++ lua_lgi_found = true ++ lua51_lgi_dep = declare_dependency(version: lua_lgi_ver) + message('lua-lgi version: ' + lua_lgi_ver) + endif + +-- +2.47.0 + diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb deleted file mode 100644 index 016981f04d..0000000000 --- a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "libpeas is a gobject-based plugins engine" -HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas" -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" - -DEPENDS = "gtk+3" - -GTKDOC_MESON_OPTION = "gtk_doc" - -inherit gnomebase gobject-introspection gi-docgen gtk-icon-cache features_check - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -# FIXME: When upgrading to libpeas 2, g-i is no longer needed. -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" - -SRC_URI += "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch" -SRC_URI[archive.sha256sum] = "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c" - -PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" - -PACKAGES =+ "${PN}-demo ${PN}-python3" -FILES:${PN}-demo = " \ - ${bindir}/peas-demo \ - ${libdir}/peas-demo \ -" - -RDEPENDS:${PN}-python3 = "python3-pygobject" -FILES:${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so" diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_2.0.5.bb b/meta-oe/recipes-gnome/libpeas/libpeas_2.0.5.bb new file mode 100644 index 0000000000..8c7d364765 --- /dev/null +++ b/meta-oe/recipes-gnome/libpeas/libpeas_2.0.5.bb @@ -0,0 +1,20 @@ +SUMMARY = "libpeas is a gobject-based plugins engine" +HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" + +DEPENDS = "glib-2.0" + +inherit gnomebase gobject-introspection vala gi-docgen + +SRC_URI += "file://disable-lgi-check.patch" +SRC_URI[archive.sha256sum] = "376f2f73d731b54e13ddbab1d91b6382cf6a980524def44df62add15489de6dd" + +PACKAGECONFIG ?= "python3 gjs lua51 ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection', 'vala', '', d)}" +PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject,python3-pygobject" +PACKAGECONFIG[gjs] = "-Dgjs=true,-Dgjs=false,gjs mozjs-128" +PACKAGECONFIG[lua51] = "-Dlua51=true,-Dlua51=false,luajit luajit-native,lua-lgi" +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" + +FILES:${PN} += "${libdir}/libpeas-2" +