From patchwork Fri Jun 13 12:06:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 23561 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 7ED3AC3237 for ; Fri, 13 Jun 2025 12:06:30 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 32BBD68DBE; Fri, 13 Jun 2025 14:06:29 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="So6QLxwT"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 19F5F68DB4 for ; Fri, 13 Jun 2025 14:06:27 +0200 (CEST) Received: from pb-laptop.local (185.221.143.107.nat.pool.zt.hu [185.221.143.107]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 91739ED for ; Fri, 13 Jun 2025 14:06:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1749816377; bh=nvwdyTm1SY6y6aHwcI5j/8y38rwQBJoiT9W6p6/bEKM=; h=From:To:Subject:Date:From; b=So6QLxwTxtW+5wykDeq2TMBVO8hN2pawKTD3gt66MdQSONL+mE1Z7bxqn7EkfciO1 XTFUZPZfdEtXyw1UD1eTxtRRYMd/keoHCyizln9DMewT7lJ1zV3R1Cx8oZWz/VcqkI vpnCo9T0m3mA0zkxqy0QdIaBPCQGNMnjXTYEvHDY= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1] meson: Update `gtest` wrap to 1.17.0 Date: Fri, 13 Jun 2025 14:06:23 +0200 Message-ID: <20250613120623.1073184-1-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Update `gtest` to the latest available version in the wrapdb, 1.17.0, which was released on 2025-04-30. The wrap file has not been updated since it was added, using version 1.11.0, which was released more than 4 years ago. Due to changes in the wrap file, googletest is compiled as a library instead of just attaching its sources the build targets using it, so the `default_library=static` option is added to preserve the same behaviour. Signed-off-by: Barnabás Pőcze --- src/apps/lc-compliance/meson.build | 5 ++++- subprojects/.gitignore | 2 +- subprojects/gtest.wrap | 18 +++++++++--------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/apps/lc-compliance/meson.build b/src/apps/lc-compliance/meson.build index 80b9a1602..cb2506b65 100644 --- a/src/apps/lc-compliance/meson.build +++ b/src/apps/lc-compliance/meson.build @@ -2,7 +2,10 @@ libgtest = dependency('gtest', version : '>=1.10.0', required : get_option('lc-compliance'), - fallback : ['gtest', 'gtest_dep']) + fallback : ['gtest', 'gtest_dep'], + default_options : [ + 'default_library=static', + ]) if opt_lc_compliance.disabled() or not libevent.found() or not libgtest.found() lc_compliance_enabled = false diff --git a/subprojects/.gitignore b/subprojects/.gitignore index b08d69907..3e9a39182 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -1,6 +1,6 @@ # SPDX-License-Identifier: CC0-1.0 -/googletest-release* +/googletest-* /libpisp /libyaml /libyuv diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap index 8892e1842..3a9771450 100644 --- a/subprojects/gtest.wrap +++ b/subprojects/gtest.wrap @@ -1,13 +1,13 @@ -# SPDX-License-Identifier: CC0-1.0 - [wrap-file] -directory = googletest-release-1.11.0 -source_url = https://github.com/google/googletest/archive/release-1.11.0.zip -source_filename = gtest-1.11.0.zip -source_hash = 353571c2440176ded91c2de6d6cd88ddd41401d14692ec1f99e35d013feda55a -patch_filename = gtest_1.11.0-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.11.0-1/get_patch -patch_hash = d38c39184384608b08419be52aed1d0f9d9d1b5ed71c0c35e51cccbdddab7084 +directory = googletest-1.17.0 +source_url = https://github.com/google/googletest/archive/refs/tags/v1.17.0.tar.gz +source_filename = googletest-1.17.0.tar.gz +source_hash = 65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c +patch_filename = gtest_1.17.0-3_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.17.0-3/get_patch +patch_hash = 3e2799683f27c6dce138b7bae823416581c467ddde755c9a516c0863225f0ceb +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.17.0-3/googletest-1.17.0.tar.gz +wrapdb_version = 1.17.0-3 [provide] gtest = gtest_dep