From patchwork Wed Jun 28 15:00:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26625 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 34BF7EB64D7 for ; Wed, 28 Jun 2023 15:00:58 +0000 (UTC) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by mx.groups.io with SMTP id smtpd.web11.18931.1687964450666027006 for ; Wed, 28 Jun 2023 08:00:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=A7ovOdpu; spf=pass (domain: gmail.com, ip: 209.85.218.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-9920a6a6cb0so275213966b.3 for ; Wed, 28 Jun 2023 08:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687964449; x=1690556449; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MDASrGUs4f/xYIShmb+pZm6lVZPB2pfGQuKDXCT/KYs=; b=A7ovOdpufb8Xy6oIy9afY9AHJceCWZ7Ls5GFwLn2gr8/7v6q24HR8fcihvoPnVCfaE W+JP2JZfVP8kgl75l7NPdil9qlJaV3SMEXWa9iidspcAw4CFZ9cAbjMs9JMvWka8fHaJ JSliOH4OJ/dAkDFeEGO1fhCdr7N1cz4IzSa/k4+qtJ6frPbSxr+PvFw2HkFAHF/wZnxz eiHBWIaj1VA0JOpSM598wLvM4RFwj1ifbW6ZpXjgXG5VFYbVOBfFnkMkWy/TRv2Ui3lE e59vv/gb/Rpf7McEvVGszInu+eUkQ6DRvrfvEfw/Oj0n3fzzZyZFxvJUPDfGIthH+npG NxIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687964449; x=1690556449; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MDASrGUs4f/xYIShmb+pZm6lVZPB2pfGQuKDXCT/KYs=; b=HF0dcOaie5mguXM56jDEc8PybpobaYlUBXc/c8FHxOvI0ln5mMJrT2Qt0O6vR2wXIU W+uLp2tNqtblGIfdCg4MPhUu/9yaB1piNb6Gti+oQLm+iofT8hKqDQ4Ef82lVogePGB8 cWUW4W/qlSJYl+xmXM9FVWIX+diUD3OvWZwt7LjftCp86a+rGp0ADCQNampNiRD99dDs x/mQcCzyQnfUa5d2dxAbrCCN/Jun6uOGAZnV6b7PKUL2J5/8sD5vdmnKoom8lryyZ5sR B2oZhLne2fgZzYbmVoz6vXJRQW9AUl2B6VEdwNefAhT1RRpCpKESgqnXdjee+3AAhi1o r18w== X-Gm-Message-State: AC+VfDwUqy9kGnPghWG6QPB/c5gmb0EWMnd5qPLVmjattLxDt8uLjH4h pkXNl5H9ihPcIcvybb3SpEvx9CppOW8XyA== X-Google-Smtp-Source: ACHHUZ7jMqF4uVhWU2E6/Gk6r34VasF3RPPABAC4P3OFf18+fTEllQ0Zf/0gVLpI4m5ru4E49gfcyQ== X-Received: by 2002:a17:907:2ce9:b0:98e:2423:708 with SMTP id hz9-20020a1709072ce900b0098e24230708mr7997253ejc.62.1687964448858; Wed, 28 Jun 2023 08:00:48 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m3-20020a170906720300b009926928d486sm969433ejk.35.2023.06.28.08.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 08:00:48 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/4] gstreamer1.0-plugins-base: enable glx/opengl support Date: Wed, 28 Jun 2023 17:00:40 +0200 Message-Id: <20230628150043.70814-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 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 ; Wed, 28 Jun 2023 15:00:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183588 This is required by latest webkit when built with x11 support. Signed-off-by: Alexander Kanavin --- .../gstreamer/gstreamer1.0-plugins-base_1.22.4.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.4.bb index 7b78c7d5c90..3c0cb7dc6cf 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.4.bb @@ -21,7 +21,8 @@ inherit gobject-introspection # opengl packageconfig factored out to make it easy for distros # and BSP layers to choose OpenGL APIs/platforms/window systems -PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" +PACKAGECONFIG_X11 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl glx', '', d)}" +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl ${PACKAGECONFIG_X11}', '', d)}" PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ @@ -32,7 +33,7 @@ PACKAGECONFIG ??= " \ " OPENGL_APIS = 'opengl gles2' -OPENGL_PLATFORMS = 'egl' +OPENGL_PLATFORMS = 'egl glx' X11DEPENDS = "virtual/libx11 libsm libxrender libxv" X11ENABLEOPTS = "-Dx11=enabled -Dxvideo=enabled -Dxshm=enabled" @@ -61,6 +62,7 @@ PACKAGECONFIG[gles2] = ",,virtual/libgles2" # OpenGL platform packageconfigs PACKAGECONFIG[egl] = ",,virtual/egl" +PACKAGECONFIG[glx] = ",,virtual/libgl" # OpenGL window systems (except for X11) PACKAGECONFIG[gbm] = ",,virtual/libgbm libgudev libdrm" From patchwork Wed Jun 28 15:00:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26628 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 37F64EB64DC for ; Wed, 28 Jun 2023 15:00:58 +0000 (UTC) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.groups.io with SMTP id smtpd.web10.18763.1687964451208362090 for ; Wed, 28 Jun 2023 08:00:51 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=Qg2jH5HE; spf=pass (domain: gmail.com, ip: 209.85.218.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-98934f000a5so702109866b.2 for ; Wed, 28 Jun 2023 08:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687964449; x=1690556449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vi5t2a9MYuyp/wIaphUCkXkHQWz5PuRamRT27WH+Db8=; b=Qg2jH5HEumQoFEMGO06HKnq/vhvxBaJED9T/wWZmqjqv/soO3lhO5XmY1A9ceDAPR6 smSslDzvLxEpO8WLDoW+/yYWpVelbK+0Dvfz+3dYu8gV0jSkvjNb40r2b7h7Jc739ay9 EPC4RZIq19tVgtYNFOqvpB3Z3bhS6uwvsadXQtZdV/XL4Lh4CVejnHXhhLRvZe4SYxdR vo8EgNxERGEHijvOVWEf7+bDBFG+GnbNa2RTw4N3JH+bC6UUvAhuKwjpsnTo7+buttL2 koiGcqfwojt1mYuURi7RaM1zF9pHj2rQvrIyvBPBnXYcZUgt4U3lUhJylGB0hu436Y1h nZsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687964449; x=1690556449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vi5t2a9MYuyp/wIaphUCkXkHQWz5PuRamRT27WH+Db8=; b=ZB3wLSIAYQwu577MIdGby8tIDdJiLryIASe9r0MZSNeN3m1ZaX8H0ZK1DpFTLle8sH ur5YAXJOGUGP8O0SQeHCuprY7wtdhwJXP+n0Yc6R7IoIcHy0Y0hQmhJt072b2tHXGka/ H5x/DFepbBGtcbiuoMacT3Ac0wnXzjqH0sE1XRcEsf/xuP2A9mTtHymRJCOcJa2mAR36 N/hrIf+X7CWEtKXcxMIuBllZ/m8UjfpKNdno/loP5zST7N0RifAlFDT7toggYBHpddUU joqwjPvP20wEjvSwsIWbSkf18dH97mU4V/9B/t2BZRD8Xdwe0DNGH3DGkudQznJ5eN2y QRcQ== X-Gm-Message-State: AC+VfDyrhjVweAVdsPN2KFENUEqIUayJyd1wgW451fnyQkGhPGxMY/BG ymdIRnuWdqeE5R4c1v4lUpWQWUDbQjnglA== X-Google-Smtp-Source: ACHHUZ4eor9Tb9OZ0cWnZ1W7f8cSF8ydoMX0IADZRB2hyW3e12CvlmnIpmtu5qpQU+EavouDTcJjcQ== X-Received: by 2002:a17:907:848:b0:988:aeb7:2a37 with SMTP id ww8-20020a170907084800b00988aeb72a37mr24888444ejb.33.1687964449456; Wed, 28 Jun 2023 08:00:49 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m3-20020a170906720300b009926928d486sm969433ejk.35.2023.06.28.08.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 08:00:49 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/4] webkitgtk: update 2.38.5 -> 2.40.2 Date: Wed, 28 Jun 2023 17:00:41 +0200 Message-Id: <20230628150043.70814-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230628150043.70814-1-alex@linutronix.de> References: <20230628150043.70814-1-alex@linutronix.de> MIME-Version: 1.0 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 ; Wed, 28 Jun 2023 15:00:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183589 Drop backports. Add extra options that require additional dependencies, and fail without them. Disable the recipe on ancient x86 without SSE support; SSE is now required. Signed-off-by: Alexander Kanavin --- meta/recipes-gnome/epiphany/epiphany_43.1.bb | 3 ++ ...tCore-CMakeLists.txt-ensure-reproduc.patch | 28 +++++++++++++ ...44e17d258106617b0e6d783d073b188a2548.patch | 42 ++++++++++++------- ...290ab4ab35258a6da9b13795c9b0f7894bf4.patch | 41 ++++++++++++++++++ ...0b55f52ff8b883296f4845269e2ed746acb3.patch | 37 ---------------- ...bb461f040b90453bc4e100dcf967243ecd98.patch | 30 ------------- ...ebkitgtk_2.38.5.bb => webkitgtk_2.40.2.bb} | 16 ++++--- 7 files changed, 111 insertions(+), 86 deletions(-) create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch create mode 100644 meta/recipes-sato/webkit/webkitgtk/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch delete mode 100644 meta/recipes-sato/webkit/webkitgtk/93920b55f52ff8b883296f4845269e2ed746acb3.patch delete mode 100644 meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch rename meta/recipes-sato/webkit/{webkitgtk_2.38.5.bb => webkitgtk_2.40.2.bb} (90%) diff --git a/meta/recipes-gnome/epiphany/epiphany_43.1.bb b/meta/recipes-gnome/epiphany/epiphany_43.1.bb index ea22723a97a..c97ede459da 100644 --- a/meta/recipes-gnome/epiphany/epiphany_43.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_43.1.bb @@ -38,3 +38,6 @@ PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" + +# ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 +COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch new file mode 100644 index 00000000000..bbe265059d5 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch @@ -0,0 +1,28 @@ +From cd65e3d9256a4f6eb7906a9f10678c29a4ffef2f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 26 Jun 2023 14:30:02 +0200 +Subject: [PATCH] Source/JavaScriptCore/CMakeLists.txt: ensure reproducibility + of __TIMESTAMP__ + +__TIMESTAMP__ refers to mtime of the file that contains it, which is unstable +and breaks binary reproducibility when the file is generated at build time. To ensure +this does not happen, mtime should be set from the original file. + +Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/15293] +Signed-off-by: Alexander Kanavin +--- + Source/JavaScriptCore/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt +index 43dc22ff..c2e3b1cd 100644 +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -159,6 +159,7 @@ add_custom_command( + OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBytecodeCacheVersion.cpp + MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/runtime/JSCBytecodeCacheVersion.cpp.in + COMMAND ${PERL_EXECUTABLE} -pe s/CACHED_TYPES_CKSUM/__TIMESTAMP__/ ${JAVASCRIPTCORE_DIR}/runtime/JSCBytecodeCacheVersion.cpp.in > ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBytecodeCacheVersion.cpp ++ COMMAND touch -r ${JAVASCRIPTCORE_DIR}/runtime/JSCBytecodeCacheVersion.cpp.in ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBytecodeCacheVersion.cpp + VERBATIM + ) + diff --git a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch b/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch index 32f92f7ff5f..34e0ff9af38 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch @@ -1,8 +1,8 @@ -From 0d3344e17d258106617b0e6d783d073b188a2548 Mon Sep 17 00:00:00 2001 +From 647c93de99a0f71f478d76a4cc7714eba7ba1447 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 11:19:06 +0300 -Subject: [PATCH] [ARM][NEON] FELightningNEON.cpp fails to build, NEON fast - path seems unused https://bugs.webkit.org/show_bug.cgi?id=241182 +Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems + unused https://bugs.webkit.org/show_bug.cgi?id=241182 Reviewed by NOBODY (OOPS!). @@ -30,19 +30,21 @@ left for a follow-up fix. * Source/WebCore/platform/graphics/filters/PointLightSource.h: * Source/WebCore/platform/graphics/filters/SpotLightSource.h: * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: ---- + Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/1233] Signed-off-by: Khem Raj - +--- .../cpu/arm/filters/FELightingNEON.cpp | 4 +- - .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- + .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ - 7 files changed, 57 insertions(+), 36 deletions(-) + 7 files changed, 56 insertions(+), 35 deletions(-) +diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +index f6ff8c20..42a97ffc 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() @@ -63,6 +65,8 @@ Signed-off-by: Khem Raj { // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] +diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +index b17c603d..e4629cda 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ @@ -104,7 +108,7 @@ Signed-off-by: Khem Raj 0, 0, 0, -@@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeo +@@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS // Set light source arguments. floatArguments.constOne = 1; @@ -133,7 +137,7 @@ Signed-off-by: Khem Raj floatArguments.lightX = spotLightSource.position().x(); floatArguments.lightY = spotLightSource.position().y(); floatArguments.lightZ = spotLightSource.position().z(); -@@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeo +@@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS if (spotLightSource.specularExponent() == 1) neonData.flags |= FLAG_CONE_EXPONENT_IS_1; } else { @@ -142,7 +146,7 @@ Signed-off-by: Khem Raj floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); -@@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeo +@@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS // Set lighting arguments. floatArguments.surfaceScale = data.surfaceScale; floatArguments.minusSurfaceScaleDividedByFour = -data.surfaceScale / 4; @@ -192,16 +196,18 @@ Signed-off-by: Khem Raj } parallelJobs.execute(); return; -@@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeo +@@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS } // namespace WebCore #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) - -#endif // FELightingNEON_h +diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h +index 70c6512f..b032c82e 100644 --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -@@ -25,6 +25,10 @@ - #include "LightSource.h" +@@ -26,6 +26,10 @@ + #include #include +namespace WTF { @@ -211,6 +217,8 @@ Signed-off-by: Khem Raj namespace WebCore { class DistantLightSource : public LightSource { +diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h +index 53beb596..e78a9354 100644 --- a/Source/WebCore/platform/graphics/filters/FELighting.h +++ b/Source/WebCore/platform/graphics/filters/FELighting.h @@ -35,8 +35,6 @@ @@ -222,7 +230,7 @@ Signed-off-by: Khem Raj class FELighting : public FilterEffect { public: const Color& lightingColor() const { return m_lightingColor; } -@@ -67,11 +65,6 @@ protected: +@@ -64,11 +62,6 @@ protected: std::unique_ptr createSoftwareApplier() const override; @@ -234,6 +242,8 @@ Signed-off-by: Khem Raj Color m_lightingColor; float m_surfaceScale; float m_diffuseConstant; +diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h +index 3a5723f0..675d63f5 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ @@ -247,6 +257,8 @@ Signed-off-by: Khem Raj namespace WebCore { class PointLightSource : public LightSource { +diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h +index 684626f7..dea58389 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ @@ -260,6 +272,8 @@ Signed-off-by: Khem Raj namespace WebCore { class SpotLightSource : public LightSource { +diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +index c974d921..e2896660 100644 --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ diff --git a/meta/recipes-sato/webkit/webkitgtk/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch b/meta/recipes-sato/webkit/webkitgtk/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch new file mode 100644 index 00000000000..79da855ff45 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch @@ -0,0 +1,41 @@ +From 4977290ab4ab35258a6da9b13795c9b0f7894bf4 Mon Sep 17 00:00:00 2001 +From: Diego Pino Garcia +Date: Mon, 22 May 2023 19:58:50 -0700 +Subject: [PATCH] [GLIB] Fix build error after 264196@main + https://bugs.webkit.org/show_bug.cgi?id=256917 + +Reviewed by Michael Catanzaro. + +Variable BWRAP_EXECUTABLE is only defined when BUBBLEWRAP_SANDBOX is +enabled. + +* Source/WTF/wtf/glib/Sandbox.cpp: +(WTF::isInsideUnsupportedContainer): + +Canonical link: https://commits.webkit.org/264395@main +Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/4977290ab4ab35258a6da9b13795c9b0f7894bf4] +Signed-off-by: Alexander Kanavin +--- + Source/WTF/wtf/glib/Sandbox.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/WTF/wtf/glib/Sandbox.cpp b/Source/WTF/wtf/glib/Sandbox.cpp +index 7d84e830ab33e..9b07bb8cb5a9b 100644 +--- a/Source/WTF/wtf/glib/Sandbox.cpp ++++ b/Source/WTF/wtf/glib/Sandbox.cpp +@@ -36,6 +36,7 @@ bool isInsideFlatpak() + return returnValue; + } + ++#if ENABLE(BUBBLEWRAP_SANDBOX) + bool isInsideUnsupportedContainer() + { + static bool inContainer = g_file_test("/run/.containerenv", G_FILE_TEST_EXISTS); +@@ -64,6 +65,7 @@ bool isInsideUnsupportedContainer() + + return inContainer && !supportedContainer; + } ++#endif + + bool isInsideSnap() + { diff --git a/meta/recipes-sato/webkit/webkitgtk/93920b55f52ff8b883296f4845269e2ed746acb3.patch b/meta/recipes-sato/webkit/webkitgtk/93920b55f52ff8b883296f4845269e2ed746acb3.patch deleted file mode 100644 index 762de409957..00000000000 --- a/meta/recipes-sato/webkit/webkitgtk/93920b55f52ff8b883296f4845269e2ed746acb3.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 93920b55f52ff8b883296f4845269e2ed746acb3 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 31 Mar 2023 12:24:09 -0700 -Subject: [PATCH] Fix build of SourceBrush.cpp - https://bugs.webkit.org/show_bug.cgi?id=254821 - -Unreviewed build fix. - -* Source/WebCore/platform/graphics/SourceBrush.cpp: -(WebCore::SourceBrush::setGradient): -(WebCore::SourceBrush::setPattern): - -Canonical link: https://commits.webkit.org/262434@main - -Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/93920b55f52ff8b883296f4845269e2ed746acb3] -Signed-off-by: Khem Raj ---- - Source/WebCore/platform/graphics/SourceBrush.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/Source/WebCore/platform/graphics/SourceBrush.cpp -+++ b/Source/WebCore/platform/graphics/SourceBrush.cpp -@@ -65,12 +65,12 @@ Pattern* SourceBrush::pattern() const - - void SourceBrush::setGradient(Ref&& gradient, const AffineTransform& spaceTransform) - { -- m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } }; -+ m_brush = Brush { Brush::LogicalGradient { { WTFMove(gradient) }, spaceTransform } }; - } - - void SourceBrush::setPattern(Ref&& pattern) - { -- m_brush = { WTFMove(pattern) }; -+ m_brush = Brush { WTFMove(pattern) }; - } - - WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush) diff --git a/meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch b/meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch deleted file mode 100644 index 1ff9dcea7ef..00000000000 --- a/meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d318bb461f040b90453bc4e100dcf967243ecd98 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 16 Jan 2023 16:55:26 -0800 -Subject: [PATCH] WebKitGTK 2.39.4 does not build due to missing #include in - ANGLE https://bugs.webkit.org/show_bug.cgi?id=250689 - -Unreviewed build fix. - -* Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h: - -Canonical link: https://commits.webkit.org/258968@main - -Upstream-Status: Backport [https://bugs.webkit.org/show_bug.cgi?id=250689] -Signed-off-by: Khem Raj ---- - Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h -index 94cb93e01fc0..ec7bda372f30 100644 ---- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h -+++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h -@@ -12,6 +12,7 @@ - - #include - #include -+#include - #include - #include - diff --git a/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.40.2.bb similarity index 90% rename from meta/recipes-sato/webkit/webkitgtk_2.38.5.bb rename to meta/recipes-sato/webkit/webkitgtk_2.40.2.bb index f7fa6dfb98c..ac6681a0ced 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.40.2.bb @@ -13,10 +13,10 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ file://reproducibility.patch \ file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ - file://d318bb461f040b90453bc4e100dcf967243ecd98.patch \ - file://93920b55f52ff8b883296f4845269e2ed746acb3.patch \ + file://4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch \ + file://0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch \ " -SRC_URI[sha256sum] = "40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7" +SRC_URI[sha256sum] = "96898870d994da406ee7a632816dcde9a3bb395ee5f344fcb3f3b8cc8a77e000" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen @@ -28,6 +28,7 @@ CVE_PRODUCT = "webkitgtk webkitgtk\+" DEPENDS += " \ ruby-native \ gperf-native \ + unifdef-native \ cairo \ harfbuzz \ jpeg \ @@ -72,6 +73,8 @@ PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" +PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" +PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" EXTRA_OECMAKE = " \ -DPORT=GTK \ @@ -137,6 +140,9 @@ ARM_INSTRUCTION_SET:armv7a = "thumb" ARM_INSTRUCTION_SET:armv7r = "thumb" ARM_INSTRUCTION_SET:armv7ve = "thumb" +# ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 +COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" + # introspection inside qemu-arm hangs forever on musl/arm builds # therefore disable GI_DATA GI_DATA_ENABLED:libc-musl:armv7a = "False" @@ -152,8 +158,8 @@ src_package_preprocess () { ${B}/JavaScriptCore/DerivedSources/*.h \ ${B}/JavaScriptCore/DerivedSources/yarr/*.h \ ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \ - ${B}/WebKit2Gtk/DerivedSources/webkit2/*.cpp \ - ${B}/WebKit2Gtk/DerivedSources/webkit2/*.h + ${B}/WebCore/DerivedSources/*.cpp \ + ${B}/WebKitGTK/DerivedSources/webkit/*.cpp } From patchwork Wed Jun 28 15:00:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26626 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 36A78EB64DA for ; Wed, 28 Jun 2023 15:00:58 +0000 (UTC) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by mx.groups.io with SMTP id smtpd.web11.18932.1687964451762189245 for ; Wed, 28 Jun 2023 08:00:52 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=TPqsBY0p; spf=pass (domain: gmail.com, ip: 209.85.218.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-98df69cacd1so425863066b.1 for ; Wed, 28 Jun 2023 08:00:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687964450; x=1690556450; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0pVmQA9NCyz4BFB1rQO+2CFZ4gfgkJMmZJG9EG+O/Mo=; b=TPqsBY0p5n8Ntll8m4nHI0l0rgyVeitAoa+2GNNajg+VFitlY3SaV5DpDIxm08h9nq B+oIKRShUqsW78r1mJZ7UPEXn/r6P+XRQIKvqqHIU0ZIsXeAhoujy30lkFzSqm6Ucu9K qOF7/AUSBUEflfnaptP7Y22fZGxuu3C84A4ruvApY5edkG7lm7iq+jXbunB1DQRxh423 g58g7yTNCUOAycZIHW2QbQkP3u2FOO2DNLWiEhowzpDoubE3VdqxhjQ3Uc7BdkcxYCFd xCfPvEt8iH/eN9qRhra41uoifGppjFYUTgIecf1z6N4US5pTfh4FUF2Xtplz8GlRd/Gv s5Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687964450; x=1690556450; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0pVmQA9NCyz4BFB1rQO+2CFZ4gfgkJMmZJG9EG+O/Mo=; b=IbWmZFVldYU0smOko7XcHzp/9RaCFC4cHHPfuGyOpdzVVGzKBjbeknZnlDPKm2Q1IQ XAxBr/po8G6jMG7oQAgmwdlizGMd5YyxWcBtCE/xFPRVMy3q7ZcTzHcUocl5CY3P+C0E ifHmisMTQk9i8R5pE7omw080FuRX5LiMFQeHJbF+nQCuQLptnIV5msOE/f3keRd/gxlu gxqWFU6X8OtsBcRCPJlsbpD5nTRAuLfvaEa0U2WczRHevEzfBR+P47D55noaagQB9+gZ QdIE1Y/DnNghknngjYtMXduVVEOwb/Jm71gDyvQAqZQieILlHixelcw3RKgM4FXNFV2w fqQg== X-Gm-Message-State: AC+VfDyl2195kKjxsUqldPhSsrS+FTfaZonFk33tlQJk9dpbNcx2P60e KunQuTKNZYP0m8jGSPl5d5+jrdLPahMecg== X-Google-Smtp-Source: ACHHUZ6Tzisv4/M59w4VtmirLOjlXCSJG8B2DsXYrjd3k6t928XmJsZYekGfEGk88udQ6OOXTOmC9Q== X-Received: by 2002:a17:906:72db:b0:992:a3d9:a7a0 with SMTP id m27-20020a17090672db00b00992a3d9a7a0mr17729ejl.68.1687964449992; Wed, 28 Jun 2023 08:00:49 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m3-20020a170906720300b009926928d486sm969433ejk.35.2023.06.28.08.00.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 08:00:49 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/4] python3-cryptography: update a patch to upstream's better followup fix Date: Wed, 28 Jun 2023 17:00:42 +0200 Message-Id: <20230628150043.70814-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230628150043.70814-1-alex@linutronix.de> References: <20230628150043.70814-1-alex@linutronix.de> MIME-Version: 1.0 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 ; Wed, 28 Jun 2023 15:00:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183590 Signed-off-by: Alexander Kanavin --- ...-directory-when-cross-compiling-9129.patch | 52 +++++++++++++++++++ ...i-substitute-include-path-from-targe.patch | 29 ----------- .../python/python3-cryptography_41.0.1.bb | 2 +- 3 files changed, 53 insertions(+), 30 deletions(-) create mode 100644 meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch delete mode 100644 meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch b/meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch new file mode 100644 index 00000000000..d720359ded7 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch @@ -0,0 +1,52 @@ +From 2f9cd402d3293f6efe0f3ac06f17c6c14edbed86 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sun, 25 Jun 2023 17:39:19 -0600 +Subject: [PATCH] Fix include directory when cross compiling (#9129) + +Upstream-Status: Backport [https://github.com/pyca/cryptography/pull/9129] +Signed-off-by: Alexander Kanavin +--- + src/rust/cryptography-cffi/build.rs | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/src/rust/cryptography-cffi/build.rs b/src/rust/cryptography-cffi/build.rs +index 07590ad2e..384af1ddb 100644 +--- a/src/rust/cryptography-cffi/build.rs ++++ b/src/rust/cryptography-cffi/build.rs +@@ -47,9 +47,14 @@ fn main() { + ) + .unwrap(); + println!("cargo:rustc-cfg=python_implementation=\"{}\"", python_impl); +- let python_include = run_python_script( ++ let python_includes = run_python_script( + &python, +- "import sysconfig; print(sysconfig.get_path('include'), end='')", ++ "import os; \ ++ import setuptools.dist; \ ++ import setuptools.command.build_ext; \ ++ b = setuptools.command.build_ext.build_ext(setuptools.dist.Distribution()); \ ++ b.finalize_options(); \ ++ print(os.pathsep.join(b.include_dirs), end='')", + ) + .unwrap(); + let openssl_include = +@@ -59,12 +64,15 @@ fn main() { + let mut build = cc::Build::new(); + build + .file(openssl_c) +- .include(python_include) + .include(openssl_include) + .flag_if_supported("-Wconversion") + .flag_if_supported("-Wno-error=sign-conversion") + .flag_if_supported("-Wno-unused-parameter"); + ++ for python_include in env::split_paths(&python_includes) { ++ build.include(python_include); ++ } ++ + // Enable abi3 mode if we're not using PyPy. + if python_impl != "PyPy" { + // cp37 (Python 3.7 to help our grep when we some day drop 3.7 support) +-- +2.30.2 + diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch b/meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch deleted file mode 100644 index 1a60abada79..00000000000 --- a/meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 04aac6c88152088778c6551dfa86b2fc446dc61c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 19 Jun 2023 13:27:28 +0200 -Subject: [PATCH] cryptography-cffi: substitute include path from target - sysroot - -Upstream-Status: Accepted [https://github.com/pyca/cryptography/pull/9105] - -Signed-off-by: Alexander Kanavin ---- - src/rust/cryptography-cffi/build.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rust/cryptography-cffi/build.rs b/src/rust/cryptography-cffi/build.rs -index 4a40990..08abb95 100644 ---- a/src/rust/cryptography-cffi/build.rs -+++ b/src/rust/cryptography-cffi/build.rs -@@ -48,7 +48,7 @@ fn main() { - println!("cargo:rustc-cfg=python_implementation=\"{}\"", python_impl); - let python_include = run_python_script( - &python, -- "import sysconfig; print(sysconfig.get_path('include'), end='')", -+ "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'), end='')", - ) - .unwrap(); - let openssl_include = --- -2.30.2 - diff --git a/meta/recipes-devtools/python/python3-cryptography_41.0.1.bb b/meta/recipes-devtools/python/python3-cryptography_41.0.1.bb index fc4f70246be..494ca233f00 100644 --- a/meta/recipes-devtools/python/python3-cryptography_41.0.1.bb +++ b/meta/recipes-devtools/python/python3-cryptography_41.0.1.bb @@ -11,7 +11,7 @@ LDSHARED += "-pthread" SRC_URI[sha256sum] = "d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006" SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ - file://0001-cryptography-cffi-substitute-include-path-from-targe.patch \ + file://0001-Fix-include-directory-when-cross-compiling-9129.patch \ file://check-memfree.py \ file://run-ptest \ " From patchwork Wed Jun 28 15:00:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 26627 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 516E7EB64DD for ; Wed, 28 Jun 2023 15:00:58 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web10.18764.1687964452259133807 for ; Wed, 28 Jun 2023 08:00:52 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=hHI7f5Ic; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-9922d6f003cso244549466b.0 for ; Wed, 28 Jun 2023 08:00:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687964450; x=1690556450; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rQgZZj9XfmIv9OcWKwJssj/pcKNFVXhHB9IZhYH7e6g=; b=hHI7f5IcJ3lwQ1/NBpNFwXSdtHfjCVIjbweYbFe4e8bp0igptmLMCAjA8NG16wmkYX KEI/1pndV0JGJgJOFddpND5g21PCf4Tbj81Tb8eFz+tbLmY9I+QHRpTVdGyWHhFmIuSf BWIE8imPaAw8AA/v5PEyH3sFA98SWLojF1zq/Hqnqtjg7CwlDgjmGOdfdomCnRlVCTpq /K94Z6Aqq4QmX5A0BtY6koXsC+FzczMbzJqlgvH+DLELnElQMtBgYDHZ9s7F7cGXY386 jC0p91W8FSds/WweJWm1HcHeZyqyaeYGkX1P4wiubAa0sa00R7mOZWgOQBUZpO6JxX1X h28w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687964450; x=1690556450; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rQgZZj9XfmIv9OcWKwJssj/pcKNFVXhHB9IZhYH7e6g=; b=lwGnmQNUHBQJsx1oUA+4R9/DNYUshVh+FT8oV6FXrnHv+XObdc8k09wNu/mHsqzDCE qyBu3MqWS3rWCjGe+z4kixV8DwavMQRBtha09os4DxkOGh09pjA83EuKVLzVrrTpLsox SIqLbX79AcYlaoc0f9MR2ebROVVUZqHc2KXOgveJlZrkcRGs/miqIMxAiBVSZsk0Wgei AudQS7T4cecJvhEpQntXzqLJE/yQpjq9FwYfTJFzHbnDe/h6iTcpyyNQrqS5yRVno5Sw PGyB2sotVBhWOzd/5/0H3qxnT3jLT5B5PQVyYMGBME6bVx/iaA91a5B1T3aUdFoRznlv rVIg== X-Gm-Message-State: AC+VfDylu1F5FrF1NUOlo79r5EAyK1XlIgFHFFsoVP6316jAVVxhx0J8 JuqJme5NGZLosXAOvYlXtoDcQ2lBx7BV1A== X-Google-Smtp-Source: ACHHUZ6d61IZZyyaw8H1YIETRWH9xbcmaxspaK+A+DnNDXAJ8Vmtr4pCeO3seoHy6CpG8SKkZmwhGQ== X-Received: by 2002:a17:907:3683:b0:987:9823:b9f with SMTP id bi3-20020a170907368300b0098798230b9fmr28555726ejc.28.1687964450528; Wed, 28 Jun 2023 08:00:50 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id m3-20020a170906720300b009926928d486sm969433ejk.35.2023.06.28.08.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 08:00:50 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/4] time64.inc: annotate and clean up recipe-specific Y2038 exceptions Date: Wed, 28 Jun 2023 17:00:43 +0200 Message-Id: <20230628150043.70814-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230628150043.70814-1-alex@linutronix.de> References: <20230628150043.70814-1-alex@linutronix.de> MIME-Version: 1.0 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 ; Wed, 28 Jun 2023 15:00:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183591 Additionally: - drop pseudo from INSANE_SKIP for 32bit time API check (pseudo passes the check; it's not clear where the issue may have been) - move rust exceptions to the cargo class, as the problem is common across the ecosystem, and needs to be fixed in the libc crate. Signed-off-by: Alexander Kanavin --- meta/classes-recipe/cargo_common.bbclass | 12 ++++++++++++ meta/conf/distro/include/time64.inc | 19 +++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/meta/classes-recipe/cargo_common.bbclass b/meta/classes-recipe/cargo_common.bbclass index 1ca0be471ce..db54826ddb6 100644 --- a/meta/classes-recipe/cargo_common.bbclass +++ b/meta/classes-recipe/cargo_common.bbclass @@ -174,3 +174,15 @@ oe_cargo_fix_env () { EXTRA_OECARGO_PATHS ??= "" EXPORT_FUNCTIONS do_configure + +# The culprit for this setting is the libc crate, +# which as of Jun 2023 calls directly into 32 bit time functions in glibc, +# bypassing all of glibc provisions to choose the right Y2038-safe functions. As +# rust components statically link with that crate, pretty much everything +# is affected, and so there's no point trying to have recipe-specific +# INSANE_SKIP entries. +# +# Upstream ticket and PR: +# https://github.com/rust-lang/libc/issues/3223 +# https://github.com/rust-lang/libc/pull/3175 +INSANE_SKIP:append = " 32bit-time" diff --git a/meta/conf/distro/include/time64.inc b/meta/conf/distro/include/time64.inc index a0cee4fad67..bc0c72226ba 100644 --- a/meta/conf/distro/include/time64.inc +++ b/meta/conf/distro/include/time64.inc @@ -27,22 +27,25 @@ GLIBC_64BIT_TIME_FLAGS:pn-glibc-testsuite = "" GLIBC_64BIT_TIME_FLAGS:pn-pipewire = "" # Pulseaudio override certain LFS64 functions e.g. open64 and intentionally # undefines _FILE_OFFSET_BITS, which wont work when _TIME_BITS=64 is set +# See https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/3770 GLIBC_64BIT_TIME_FLAGS:pn-pulseaudio = "" +# Undefines _FILE_OFFSET_BITS on purpose in +# libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp GLIBC_64BIT_TIME_FLAGS:pn-gcc-sanitizers = "" # https://github.com/strace/strace/issues/250 GLIBC_64BIT_TIME_FLAGS:pn-strace = "" -INSANE_SKIP:append:pn-cargo = " 32bit-time" +# Caused by the flags exceptions above INSANE_SKIP:append:pn-gcc-sanitizers = " 32bit-time" INSANE_SKIP:append:pn-glibc = " 32bit-time" INSANE_SKIP:append:pn-glibc-tests = " 32bit-time" -INSANE_SKIP:append:pn-librsvg = " 32bit-time" -INSANE_SKIP:append:pn-libstd-rs = " 32bit-time" -INSANE_SKIP:append:pn-pseudo = " 32bit-time" INSANE_SKIP:append:pn-pulseaudio = " 32bit-time" -INSANE_SKIP:append:pn-python3-bcrypt = " 32bit-time" -INSANE_SKIP:append:pn-python3-cryptography = " 32bit-time" -INSANE_SKIP:append:pn-rust = " 32bit-time" -INSANE_SKIP:append:pn-rust-hello-world = " 32bit-time" + +# Strace has tests that call 32 bit API directly, which is fair enough, e.g. +# /usr/lib/strace/ptest/tests/ioctl_termios uses 32-bit api 'ioctl' INSANE_SKIP:append:pn-strace = " 32bit-time" +# Additionally cargo_common class (i.e. everything written in rust) +# has the same INSANE_SKIP setting. +# Please check the comment in meta/classes-recipe/cargo_common.bbclass +# for information about why, and the overall Y2038 situation in rust.