From patchwork Thu Mar 2 08:31:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 20345 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 730C7C7EE33 for ; Thu, 2 Mar 2023 08:31:28 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.10285.1677745880488950054 for ; Thu, 02 Mar 2023 00:31:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=oFtYQbaO; spf=pass (domain: gmail.com, ip: 209.85.214.176, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f176.google.com with SMTP id n6so15396322plf.5 for ; Thu, 02 Mar 2023 00:31:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=crBQyNXHapN9E9qEeBM2NqSHrGuyKRm09JwVxfZ+q7A=; b=oFtYQbaOQT2lB0SyXzpqZgHf2LIhx9sst8/VH3W3fkOAvpxFBbBqvaZAlfStmc2rVP likdX4buYAwqC8JXkJGdjVC1nVi7o8rq4dQ1UuwMf2rhk0vYD6FpXB84kHv18LYZTeYl wV1hF7B1r5ha/RXeVpav9J9B7CH7TC5jih6DZaQRAyD+WabFZ9nDQcok2pHgWLJdfAc7 N1Qds42vo4gBUGZndXmyOECjMPLTyA1aOHMMn10d8gUTY8CZTFHEdm1mViceTlblkvbO /sZlBGKBqXHPyrhVQXuXTKEp0HIjC69ILeqG238TTdQT4mKzffrCtteFb+lmqhbKQYm+ 5/wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=crBQyNXHapN9E9qEeBM2NqSHrGuyKRm09JwVxfZ+q7A=; b=PoKcwuGD3IG1mZuQJmyDRolnRjbUnzcDQbRMZXXBI6gpLqoJvZYFiJErsZggszVwqm 0bSI6LVRb59ehzbb9jWsRHqvAkqznurpzB/B+72v4lPgxl4T/c0dfNcaDeiYb2aGmFC1 oQzQOT4VcXUKvVv5OX2hRiAss7dOLnNnio9B6TZfXanrO2q7ShtBAsF6/Faaev5qkMBc pZXjqgX1X2SPO4rBqqETUzqYOcf0jKUl7LtzA9TFbMQ3FyTQ6OPdvIJu9A80JmEVBjJ+ ahGngdxsTsU/pHkzuI7sP3mHCQD+beTlkXcw3PRsClGSlVLQC3jzHDEokLk3XQYHTMYE rgEQ== X-Gm-Message-State: AO0yUKXAqhQRBhZBVQ2ZCucdpli9abzSxx9v+MT8iGMUsJEiHAFJ6qr+ hoZfYyMf8+tpgeQj7drB/Lk2mI0Scrg= X-Google-Smtp-Source: AK7set/cu7BlgMjGP48VK42jI2cbaKFWeUbKu31wwDxsirnXFJk1AB8wOSZJv5HDg29vIBZsetKtOA== X-Received: by 2002:a17:903:283:b0:19c:d309:4612 with SMTP id j3-20020a170903028300b0019cd3094612mr10553405plr.6.1677745879279; Thu, 02 Mar 2023 00:31:19 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::1ac4]) by smtp.gmail.com with ESMTPSA id w13-20020a170902d70d00b0019aeddce6casm9670994ply.205.2023.03.02.00.31.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:31:18 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/5] pkcs11-helper: Update to latest tip of trunk Date: Thu, 2 Mar 2023 00:31:12 -0800 Message-Id: <20230302083116.1332448-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.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 ; Thu, 02 Mar 2023 08:31:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101327 This helps fixing build with clang16 Signed-off-by: Khem Raj --- meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.29.0.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.29.0.bb b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.29.0.bb index a34a4b9140..d17ac1e7e1 100644 --- a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.29.0.bb +++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.29.0.bb @@ -18,8 +18,9 @@ LIC_FILES_CHKSUM = " \ SRC_URI = "git://github.com/OpenSC/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" -# v1.27 -SRCREV = "2306f896c2f3c147792300155316fd65825aabad" +# master +SRCREV = "f23911037d9790a3f3a3447a78d31a6362358e21" +PV .= "+1.30.0+git${SRCPV}" UPSTREAM_CHECK_GITTAGREGEX = "pkcs11-helper-(?P\d+(\.\d+)+)" From patchwork Thu Mar 2 08:31:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 20346 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 6D828C7EE36 for ; Thu, 2 Mar 2023 08:31:28 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web10.10286.1677745880896162953 for ; Thu, 02 Mar 2023 00:31:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=DUId1+pv; spf=pass (domain: gmail.com, ip: 209.85.216.53, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f53.google.com with SMTP id bo22so4518489pjb.4 for ; Thu, 02 Mar 2023 00:31:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=8D4VCqMNnbXP7r3AhYFqXkTEoiRIYmL/UQapxzeWZkY=; b=DUId1+pvljXRP+1z1FzYfdSCRcF6PMqRFISt8IsMYBDjXt/gpBl3OC2n8lErdlQ6oO dBxYi8eQwPxMTTG2Vcev752vguKZcn1hXwfGQppMaU2w8DSiN4+DBUeG0/9SUv2GtU63 Z21Y8DD7kgezRao5nZS/rmxeZA2NmG0m79AOSjkY37ute9MHtmZinv5y3oELzxGD0sn9 1HqbftMPwStK5JfyvJJHIVQjlGxwbdwBAYJQTkZ9II8Pr/6Xb6lT31NiP5RGbgPOBMVf i50sbLCwOiEx8yMO/QhpLAf74Z4L70npD8iAKWMtPETd8cEUvpdGBFMyK5IMR1X12o7F mleg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=8D4VCqMNnbXP7r3AhYFqXkTEoiRIYmL/UQapxzeWZkY=; b=MKPiLXre5OYvQVinWUQh777uHFJfuwOH7kqOx5E4+NlNtqRY/hPxA6b7xNEMxegQu1 JhJDTcGVPcJoEZxqKiYQx+fyY6TovC1JKSBvgvebiaD2NdyvMBjnayLICLxlvGN8+ZJt NNOiJVkt2jHEgvDm/2eJ9cbiCJCsL7ILLZ4sCbcv72I1Aisq/60c90q/+Fm/KuZ0RKRg HOpBenJMg+cJOwUT+iooocEZgJgAgeRlAPRfE3ywdnSiXoaCTy2wI1UUWmA8nSUxnWqm A1mdqZpuCwjmkrHbaudPVwNhPyOFBfJ/uydUSCs0a6WQqIu+TRQQnT4rPr+txNwrrtZK FNpA== X-Gm-Message-State: AO0yUKUw6k4oIrV1p7+fzFfbwy0Qp+sPscmtNs1qq8klcjNMg4j4I6HY a4dBG4EaDbRhSWhM0+MSa91raBmIjs8= X-Google-Smtp-Source: AK7set8BLR73nmzUfB7bCscY0bMvb57vdTpff2gAgbbjExBKNnMlWWKdqyRwXS1oe/xBJtHVXBljWA== X-Received: by 2002:a17:90b:1d88:b0:237:8417:d9e3 with SMTP id pf8-20020a17090b1d8800b002378417d9e3mr11005649pjb.15.1677745880033; Thu, 02 Mar 2023 00:31:20 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::1ac4]) by smtp.gmail.com with ESMTPSA id w13-20020a170902d70d00b0019aeddce6casm9670994ply.205.2023.03.02.00.31.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:31:19 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/5] glm: Update to tip of trunk Date: Thu, 2 Mar 2023 00:31:13 -0800 Message-Id: <20230302083116.1332448-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230302083116.1332448-1-raj.khem@gmail.com> References: <20230302083116.1332448-1-raj.khem@gmail.com> 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 ; Thu, 02 Mar 2023 08:31:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101328 Do not use -Werror on clang Signed-off-by: Khem Raj --- .../0001-Do-not-use-Werror-with-clang.patch | 30 +++++++++++++++++++ .../glm/glm/0001-Silence-clang-warnings.patch | 20 ------------- meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb | 6 ++-- 3 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch diff --git a/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch b/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch new file mode 100644 index 0000000000..7b3e005ff9 --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch @@ -0,0 +1,30 @@ +From ee405855bca7d6399ff1a1aef952010056c84ff6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 1 Mar 2023 21:08:09 -0800 +Subject: [PATCH] Do not use -Werror with clang + +Too many warnings to handle for a distro build + +Signed-off-by: Khem Raj +--- + test/CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index e7f85f19..0b6fd980 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -197,10 +197,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + message("GLM: Clang - ${CMAKE_CXX_COMPILER_ID} compiler") + endif() + +- add_compile_options(-Werror -Weverything) +- add_compile_options(-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++11-long-long -Wno-padded -Wno-gnu-anonymous-struct -Wno-nested-anon-types) +- add_compile_options(-Wno-undefined-reinterpret-cast -Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-global-constructors -Wno-unused-macros -Wno-format-nonliteral) +- + elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + if(NOT GLM_QUIET) + message("GLM: GCC - ${CMAKE_CXX_COMPILER_ID} compiler") +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch b/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch index 3a62fffe3a..10692dd423 100644 --- a/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch +++ b/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch @@ -26,8 +26,6 @@ Signed-off-by: Khem Raj test/gtx/gtx_fast_trigonometry.cpp | 30 ++++++++++++------------------ 3 files changed, 14 insertions(+), 20 deletions(-) -diff --git a/glm/ext/quaternion_common.inl b/glm/ext/quaternion_common.inl -index 0e4a3bb2..6f99f52d 100644 --- a/glm/ext/quaternion_common.inl +++ b/glm/ext/quaternion_common.inl @@ -104,7 +104,7 @@ namespace glm @@ -39,21 +37,6 @@ index 0e4a3bb2..6f99f52d 100644 return (sin(angle - a * phi)* x + sin(a * phi) * z) / sin(angle); } } -diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl -index 70485098..a4af2a06 100644 ---- a/glm/gtc/random.inl -+++ b/glm/gtc/random.inl -@@ -22,7 +22,7 @@ namespace detail - GLM_FUNC_QUALIFIER static vec<1, uint8, P> call() - { - return vec<1, uint8, P>( -- std::rand() % std::numeric_limits::max()); -+ static_cast(std::rand()) % std::numeric_limits::max()); - } - }; - -diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp -index 8bf86ba0..ddaa708b 100644 --- a/test/gtx/gtx_fast_trigonometry.cpp +++ b/test/gtx/gtx_fast_trigonometry.cpp @@ -19,15 +19,14 @@ namespace fastCos @@ -160,6 +143,3 @@ index 8bf86ba0..ddaa708b 100644 const std::clock_t timestamp3 = std::clock(); const std::clock_t time_fast = timestamp2 - timestamp1; const std::clock_t time_default = timestamp3 - timestamp2; --- -2.31.1 - diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb index 9edcb2b6e1..3797314b47 100644 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb @@ -11,19 +11,19 @@ LIC_FILES_CHKSUM = "file://copying.txt;md5=462e4b97f73ef12f8171c3c546ce4e8d" SRC_URI = " \ git://github.com/g-truc/glm;branch=master;protocol=https \ file://0001-Silence-clang-warnings.patch \ + file://0001-Do-not-use-Werror-with-clang.patch \ file://glmConfig.cmake.in \ file://glmConfigVersion.cmake.in \ file://glm.pc.in \ file://glmTargets.cmake \ " -SRCREV = "bf71a834948186f4097caa076cd2663c69a10e1e" +SRCREV = "efec5db081e3aad807d0731e172ac597f6a39447" +PV .= "+0.9.9.9+git${SRCPV}" S = "${WORKDIR}/git" inherit cmake -CXXFLAGS:append:toolchain-clang = " -Wno-error=invalid-utf8 -Wno-error=disabled-macro-expansion -Wno-error=reserved-identifier" - do_install() { install -d ${D}${includedir} ${D}${docdir}/glm ${D}${libdir}/pkgconfig ${D}${libdir}/cmake/glm cp -R --no-dereference --preserve=mode,links ${S}/glm ${D}${includedir} From patchwork Thu Mar 2 08:31:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 20349 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 7B22CC7EE3A for ; Thu, 2 Mar 2023 08:31:28 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.10285.1677745880488950054 for ; Thu, 02 Mar 2023 00:31:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jixvZGAD; spf=pass (domain: gmail.com, ip: 209.85.214.176, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f176.google.com with SMTP id n6so15396368plf.5 for ; Thu, 02 Mar 2023 00:31:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=JnaMcl/RFIlQYZSu/6LHqRtVJgWZZ5ypRMlXTgEC894=; b=jixvZGADx6JGJ7dpokqyAmmDPyJaT8ka6H+jMlhIp6N2STqgAsWCEJ9k1u0i1vHOEz 5ZfO3bPwnabi3rbqyYtTMuIn+CpsCZuqk5//zbw4s7oQ1RYXj8tEW/rmrgs9G/xWgkUe EtI1fuqpCPFAEqjrKdz0hNmmVuWuXG8pvCciXLt3hEiqhGFqovmCaXrMSTOBM9sd4BNJ LO0+Pw8whMXSudZ8c+hTXvIIGgQjs41+b7ySHRorqu3G5D9WBF3kwG/EWdCkV/Dlfmkr Y93B8QYNHq9k/ppwT+z95vqY4kZtH86Hw3iOE3TDK2wKIoWyqfqnoLGC7f/D6vzbXCuK 1S9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=JnaMcl/RFIlQYZSu/6LHqRtVJgWZZ5ypRMlXTgEC894=; b=SCCQUffP0sLzZJ0/Z9Rlei6+aTYquaKZDClubLOsfB74cy08pVwfhOa4+B95xjGdTX wqHm9MGw9HroVhPplak7lZH9SS241QcaemVVmxlitoLAPxAzft64YKJpQtOdH9UMAUCT eJwNCMg6P3ptOH/z4UMm+Ghin1bkLyBwzknaSoIq6BIDAkawr8+ncQ7yTK6lDuIf6p7d 7q6+QIpJY8HpL0nbCYBcHEZmuuQNnXf5UtGyjbO42E6ZFd7G67Bj1Har9P3F1ToFxe6B OOxyD3+vZIFLpLyOhLrOg855iJ7HhO2gbxATHEGWhRa15ybFrZ2Y8TKfQL0L8IeHovwX uIJw== X-Gm-Message-State: AO0yUKXgxLj8n7d8a5FRm6bvPEIVIrFz7H6h3GbgT2B5qVhMZpC3Y9nt oscNBQV1LIGoyKsJe33Vm1A220tbIfU= X-Google-Smtp-Source: AK7set/v7tHvhKCJHPaHPyKbDGwaVC3a7WHTKEuyOSUP31mhjUpJSRdrorXrzGXwblYOM1elwQP1qA== X-Received: by 2002:a17:903:1d2:b0:19d:1f42:b018 with SMTP id e18-20020a17090301d200b0019d1f42b018mr1549114plh.27.1677745880982; Thu, 02 Mar 2023 00:31:20 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::1ac4]) by smtp.gmail.com with ESMTPSA id w13-20020a170902d70d00b0019aeddce6casm9670994ply.205.2023.03.02.00.31.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:31:20 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/5] libsdl2-ttf: Upgrade to 2.20.2 Date: Thu, 2 Mar 2023 00:31:14 -0800 Message-Id: <20230302083116.1332448-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230302083116.1332448-1-raj.khem@gmail.com> References: <20230302083116.1332448-1-raj.khem@gmail.com> 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 ; Thu, 02 Mar 2023 08:31:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101329 Fix build with clang16 while here Signed-off-by: Khem Raj --- ...ction-signatures-to-match-without-ca.patch | 69 +++++++++++++++++++ ...l2-ttf_2.20.1.bb => libsdl2-ttf_2.20.2.bb} | 7 +- 2 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch rename meta-oe/recipes-graphics/libsdl/{libsdl2-ttf_2.20.1.bb => libsdl2-ttf_2.20.2.bb} (76%) diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch new file mode 100644 index 0000000000..8cb76c35d6 --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch @@ -0,0 +1,69 @@ +From 6c52693d264ca3dc8e15a92f56cf3a636639bb6c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= +Date: Fri, 28 Oct 2022 22:17:15 +0300 +Subject: [PATCH] freetype: Fix function signatures to match without casts + +Clang 16 has got a new stricter warning for casts of function types +(see https://github.com/llvm/llvm-project/commit/1aad641c793090b4d036c03e737df2ebe2c32c57). + +This new warning gets included as part of the existing error +diagnostic setting of -Wcast-function-type. + +This fixes errors like these: + +../src/hb-ft.cc:1011:34: error: cast from 'void (*)(FT_Face)' (aka 'void (*)(FT_FaceRec_ *)') to 'FT_Generic_Finalizer' (aka 'void (*)(void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict] + ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize; + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169] +--- + src/hb-ft.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/hb-ft.cc b/src/hb-ft.cc +index a6beb9f0f..a35e75b18 100644 +--- a/src/hb-ft.cc ++++ b/src/hb-ft.cc +@@ -729,8 +729,9 @@ hb_ft_face_create_referenced (FT_Face ft_face) + } + + static void +-hb_ft_face_finalize (FT_Face ft_face) ++hb_ft_face_finalize (void *arg) + { ++ FT_Face ft_face = (FT_Face) arg; + hb_face_destroy ((hb_face_t *) ft_face->generic.data); + } + +@@ -762,7 +763,7 @@ hb_ft_face_create_cached (FT_Face ft_face) + ft_face->generic.finalizer (ft_face); + + ft_face->generic.data = hb_ft_face_create (ft_face, nullptr); +- ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize; ++ ft_face->generic.finalizer = hb_ft_face_finalize; + } + + return hb_face_reference ((hb_face_t *) ft_face->generic.data); +@@ -949,8 +950,9 @@ get_ft_library () + } + + static void +-_release_blob (FT_Face ft_face) ++_release_blob (void *arg) + { ++ FT_Face ft_face = (FT_Face) arg; + hb_blob_destroy ((hb_blob_t *) ft_face->generic.data); + } + +@@ -1032,7 +1034,7 @@ hb_ft_font_set_funcs (hb_font_t *font) + #endif + + ft_face->generic.data = blob; +- ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob; ++ ft_face->generic.finalizer = _release_blob; + + _hb_ft_font_set_funcs (font, ft_face, true); + hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING); +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.1.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb similarity index 76% rename from meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.1.bb rename to meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb index b8732b4c86..7d352f4218 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.1.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb @@ -2,17 +2,18 @@ SUMMARY = "Simple DirectMedia Layer truetype font library" SECTION = "libs" DEPENDS = "libsdl2 freetype virtual/egl" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=771dca8728b18d39b130e19b36514371" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68" SRC_URI = " \ git://github.com/libsdl-org/SDL_ttf.git;branch=release-2.20.x;protocol=https \ git://github.com/libsdl-org/freetype.git;branch=VER-2-12-1-SDL;destsuffix=git/external/freetype;name=freetype;protocol=https \ git://github.com/libsdl-org/harfbuzz.git;branch=2.9.1-SDL;destsuffix=git/external/harfbuzz;name=harfbuzz;protocol=https \ + file://0001-freetype-Fix-function-signatures-to-match-without-ca.patch;patchdir=external/harfbuzz \ file://automake_foreign.patch \ " -SRCREV = "0a652b598625d16ea7016665095cb1e9bce9ef4f" +SRCREV = "89d1692fd8fe91a679bb943d377bfbd709b52c23" SRCREV_freetype = "6fc77cee03e078e97afcee0c0e06a2d3274b9a29" -SRCREV_harfbuzz = "6022fe2f68d028ee178284f297b3902ffdf65b03" +SRCREV_harfbuzz = "43931e3e596c04044861770b831c8f9452e2d3b0" S = "${WORKDIR}/git" From patchwork Thu Mar 2 08:31:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 20347 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 7B194C7EE37 for ; Thu, 2 Mar 2023 08:31:28 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web10.10287.1677745882654474465 for ; Thu, 02 Mar 2023 00:31:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Gomlaf8V; spf=pass (domain: gmail.com, ip: 209.85.214.172, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id i3so16789785plg.6 for ; Thu, 02 Mar 2023 00:31:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=KtiWP5rHLmyZ4W3ChqWIosA1AHQ64eNkVCyngPe2RPo=; b=Gomlaf8VZ0bKXrtsA+gx9m2j1TVCzSRCbhptrQaKkATTLg9TTnDZpn0EslBkWfSMm3 QWj9J9IRjWKzyqg5p+7nqoJCVD0mRU9Y8+y41nB4ZjqMUj86ilpU5DgE5rEk9EGVEOqf QRICz8r/hXNJj6ljiq3h0BVGT6lIXHXUKUVvO8TVvGdVxt8XR38VgQXQb5F4RDvEpn8v indjTHakfwSCRpwCFoxGjGu+C1BNW0wtYvHvg24Ovwi4tHToHOiTBxxPtiN5ySdnsazB boruUK0zYn95Vso1me7im4TZRmvmrNsZxbBhSf/mnNScTn5x+KECORwiVwMUBSrbreDb HkOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=KtiWP5rHLmyZ4W3ChqWIosA1AHQ64eNkVCyngPe2RPo=; b=dFO5qsTApC9GQPfvunbOvXmXaLDzh4qngbtLkWBehMFf4nLF4EzNkgJoq5Tw7x7k6i 0HVEtkQVBCZIA8yHiiSMuRW9nfyvjFJPg4gfdOHgLYkUw1A4aVDw3gVVj+fI7WeSZgBg Bl7snORRAMlf4tpCm9GsDMVtZxl5TLH7ta5NWfN/cfUFPwpw7DYXTEDRRGaiSxVsGBiS rE/t6TCDAA1/AeHgoUO+dqDEfSv3W1QnD9ryHCfQXMyMKKHPvgB3aobZB/BNpXX3AJUr nKdS2+r1H19O9sdiqwfKOpIXic05w/rHKOp9glVzqXjewBi0l8qicBvHX3LHoXrXlWOJ nixg== X-Gm-Message-State: AO0yUKUZfk8KKPPJSRcAHIneNrZdJh4wYSB8tV+ewMkj8FJL+1sU1T0S RWm0AClsmR+clbKpZO3aIHI+gOEJmi4= X-Google-Smtp-Source: AK7set/DfdG9iaPMVJ7/txvv9bMatD5FFrBNsUSFgi2vv1itz3k7hdBtPJBpwBMOQ1KSi06HZkf+Sg== X-Received: by 2002:a17:903:2301:b0:19a:ae30:3a42 with SMTP id d1-20020a170903230100b0019aae303a42mr1564568plh.21.1677745881836; Thu, 02 Mar 2023 00:31:21 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::1ac4]) by smtp.gmail.com with ESMTPSA id w13-20020a170902d70d00b0019aeddce6casm9670994ply.205.2023.03.02.00.31.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:31:21 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 4/5] libsdl-image: Fix build with clang16 Date: Thu, 2 Mar 2023 00:31:15 -0800 Message-Id: <20230302083116.1332448-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230302083116.1332448-1-raj.khem@gmail.com> References: <20230302083116.1332448-1-raj.khem@gmail.com> 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 ; Thu, 02 Mar 2023 08:31:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101330 Signed-off-by: Khem Raj --- ...-png-img-Fix-prototypes-of-callbacks.patch | 52 +++++++++++++++++++ .../libsdl/libsdl-image_1.2.12.bb | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/libsdl/libsdl-image/0001-png-img-Fix-prototypes-of-callbacks.patch diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-image/0001-png-img-Fix-prototypes-of-callbacks.patch b/meta-oe/recipes-graphics/libsdl/libsdl-image/0001-png-img-Fix-prototypes-of-callbacks.patch new file mode 100644 index 0000000000..1bbfa99210 --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl/libsdl-image/0001-png-img-Fix-prototypes-of-callbacks.patch @@ -0,0 +1,52 @@ +From 41791738221fdb7574fc8e23f84214910cdce098 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 1 Mar 2023 21:51:40 -0800 +Subject: [PATCH] png-img: Fix prototypes of callbacks + +Clang-16 is flagging function pointer mismatches + +Upstream-Status: Inappropriate [No upstream] +Signed-off-by: Khem Raj +--- + IMG_png.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/IMG_png.c b/IMG_png.c +index 5f91f15..4d5bdb6 100644 +--- a/IMG_png.c ++++ b/IMG_png.c +@@ -78,15 +78,15 @@ + static struct { + int loaded; + void *handle; +- png_infop (*png_create_info_struct) (png_structp png_ptr); ++ png_infop (*png_create_info_struct) (png_const_structp png_ptr); + png_structp (*png_create_read_struct) (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn); + void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); +- png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); +- png_voidp (*png_get_io_ptr) (png_structp png_ptr); +- png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr); +- png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); +- png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); +- png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag); ++ png_uint_32 (*png_get_IHDR) (png_const_structp png_ptr, png_const_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); ++ png_voidp (*png_get_io_ptr) (png_const_structp png_ptr); ++ png_byte (*png_get_channels) (png_const_structp png_ptr, png_const_infop info_ptr); ++ png_uint_32 (*png_get_PLTE) (png_const_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); ++ png_uint_32 (*png_get_tRNS) (png_const_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); ++ png_uint_32 (*png_get_valid) (png_const_structp png_ptr, png_const_infop info_ptr, png_uint_32 flag); + void (*png_read_image) (png_structp png_ptr, png_bytepp image); + void (*png_read_info) (png_structp png_ptr, png_infop info_ptr); + void (*png_read_update_info) (png_structp png_ptr, png_infop info_ptr); +@@ -95,7 +95,7 @@ static struct { + void (*png_set_packing) (png_structp png_ptr); + void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn); + void (*png_set_strip_16) (png_structp png_ptr); +- int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check); ++ int (*png_sig_cmp) (png_const_bytep sig, png_size_t start, png_size_t num_to_check); + #ifndef LIBPNG_VERSION_12 + jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); + #endif +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb b/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb index 5a93dc19a8..01137bb0ca 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227" DEPENDS = "tiff zlib libpng jpeg libsdl" SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ + file://0001-png-img-Fix-prototypes-of-callbacks.patch \ file://configure.patch" -SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb" SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699" S = "${WORKDIR}/SDL_image-${PV}" From patchwork Thu Mar 2 08:31:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 20348 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 6D7E9C6FA8E for ; Thu, 2 Mar 2023 08:31:28 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.10288.1677745883655719010 for ; Thu, 02 Mar 2023 00:31:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WnKcGDEV; spf=pass (domain: gmail.com, ip: 209.85.214.170, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f170.google.com with SMTP id a2so6340815plm.4 for ; Thu, 02 Mar 2023 00:31:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=27RFUtQVc+vtd2x38KWxDEqG26YgwS60vD5ZpAKc3kQ=; b=WnKcGDEVIEt49TpIgNghHrEn8BL2vFmNssmlPNxfYNmZXatetcNpkgrpOML1ZafF31 VJGENc/Hf8m62YrAWY5sQpyd7JlqKnbwkZ2bCst2NoHh2/YWXH8jPJ6hnwJ0+GABVxux kGCht1SDaseCvo1k0jNDbyla5sjyNexExTcbDSSTWdqkjf5fesGd7QILuweIsHvKZrKx yBQAvldWDTaSxwhfftcD3s53NtHFN1ZCnOKMgPDe6gWXH+dyjXZ0+UwY82L9qoq6WVBV Ng2ASd8Q3eYqJSNBAzpdx3Qa6uFnm/bDK4hQKxc6UrltSgrKxMQp/uWAhYddtkj/K4V2 DiCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=27RFUtQVc+vtd2x38KWxDEqG26YgwS60vD5ZpAKc3kQ=; b=tGDH25JwdELpkwUxfxfSGU7ptWeNJP/mPcultGBLWVio3AhrVkLdt3kWRA/6h9EU3Z 9b3hT8ihtIx8O+aVLixQScBpYCQx3ISCac+A5MxmG1FxFuL5eb3a97F+FxnR8MaNt5Xm 1HdNyr0x6MjPd7lMGsvvXXRrqUchyeT9c6oWiK5a4OyUNYiE4eCC9iNlq5BUE2Y2N49m oJ5r8Eebjme9Bsv5m2ONcRqzxeB9q9zmq5Bhg/1ekqs2cbarrSCBTNX5dUHSQx3RZ+KP zStB5J0I1ej0Jgho84fMOo8sv5BWqeXnv9Qhy3/a0FK6cCEakcYRzBoeeqoFqddmTtnA GYmQ== X-Gm-Message-State: AO0yUKUEsnSda3bjiIz/OAxwZ6n6A8rMhhK6WNEC2td3/d8fkcX4rn9L yPHeWrQdjeLcSrySsKZ0pEmbbQWLIV4= X-Google-Smtp-Source: AK7set9kKZI+FCEdmQWm7slwJqQFiYYr6qjsZ29+P/qU5QIGtNIIE8XzxntivNQr+QWmxW51nJAgtg== X-Received: by 2002:a17:902:cf0a:b0:19d:244:a3a4 with SMTP id i10-20020a170902cf0a00b0019d0244a3a4mr9506460plg.47.1677745882846; Thu, 02 Mar 2023 00:31:22 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::1ac4]) by smtp.gmail.com with ESMTPSA id w13-20020a170902d70d00b0019aeddce6casm9670994ply.205.2023.03.02.00.31.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:31:22 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 5/5] gphoto2: Fix build with clang16 + musl Date: Thu, 2 Mar 2023 00:31:16 -0800 Message-Id: <20230302083116.1332448-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230302083116.1332448-1-raj.khem@gmail.com> References: <20230302083116.1332448-1-raj.khem@gmail.com> 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 ; Thu, 02 Mar 2023 08:31:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101331 Signed-off-by: Khem Raj --- ...ototypes-of-callbacks-with-libgphoto.patch | 50 +++++++++++++++++++ .../gphoto2/gphoto2_2.5.28.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch new file mode 100644 index 0000000000..abe38e12ce --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch @@ -0,0 +1,50 @@ +From 366930ccc1a261c3eb883da2bf3c655162ccd75f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 1 Mar 2023 22:58:37 -0800 +Subject: [PATCH] Match prototypes of callbacks with libgphoto + +In https://github.com/gphoto/gphoto2/pull/535/commits/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e +we tried to fix by using pthread_t but it also needs to make changes in +libgphoto and these changes can be invasive, therefore lets revert to +older types and to fix musl problem fix it via type casts + +Upstream-Status: Submitted [https://github.com/gphoto/gphoto2/pull/569] +Signed-off-by: Khem Raj +--- + gphoto2/main.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gphoto2/main.c b/gphoto2/main.c +index 0dac947..cd3c990 100644 +--- a/gphoto2/main.c ++++ b/gphoto2/main.c +@@ -1198,7 +1198,7 @@ thread_func (void *data) + pthread_cleanup_pop (1); + } + +-static pthread_t ++static unsigned int + start_timeout_func (Camera *camera, unsigned int timeout, + CameraTimeoutFunc func, void __unused__ *data) + { +@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeout, + + pthread_create (&tid, NULL, thread_func, td); + +- return (tid); ++ return (unsigned int)tid; + } + + static void +-stop_timeout_func (Camera __unused__ *camera, pthread_t id, ++stop_timeout_func (Camera __unused__ *camera, unsigned int id, + void __unused__ *data) + { +- pthread_t tid = id; ++ pthread_t tid = (pthread_t)id; + + pthread_cancel (tid); + pthread_join (tid, NULL); +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb index fe33940475..513845194d 100644 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb @@ -9,6 +9,7 @@ RDEPENDS:gphoto2 = "libgphoto2" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \ file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ file://0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch \ + file://0001-Match-prototypes-of-callbacks-with-libgphoto.patch \ " SRC_URI[gphoto2.sha256sum] = "2a648dcdf12da19e208255df4ebed3e7d2a02f905be4165f2443c984cf887375"