From patchwork Thu Nov 21 08:37:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13881757 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A9F881CB9F6 for ; Thu, 21 Nov 2024 08:37:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732178273; cv=none; b=I5D4ynpaCdE9Cjw1GnYDOl+wlpkztt7TzyKgaJIXLBpdRqAOrHpz3WdHOhIUeDC37qPKtgIwMoTPwNpqMfhe/SYBPJDBd45EkJp7Eb29fWyNnott/uYu9ToWNDmmfawyS4Jl25xxbZVSZx9k+WSSLBh0EP2hRx2vazFAC5+it7I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732178273; c=relaxed/simple; bh=sfiRXQ37CBgftuvI9xjYjJEtqT6cfVKJEDx/2tMCGSE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hCJv3Z7DsS1nAOM8vCHrJTU4yGXrCZbCu7wh6QNC3K+bM61kdMPEBSHtatSnPTKNok1SfS7JJMTsbLt9sHNNbOnh/QPwGj6+DIxJiclrn4kIYov99o8OXRClFucbq5cZCM3MGP/tYIc3k1BlEe8D5X4M5VnASeCCgI9kg05dNrw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net; spf=pass smtp.mailfrom=gmx.net; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b=Ea1b9gRT; arc=none smtp.client-ip=212.227.17.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b="Ea1b9gRT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1732178268; x=1732783068; i=ps.report@gmx.net; bh=sfiRXQ37CBgftuvI9xjYjJEtqT6cfVKJEDx/2tMCGSE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID: MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=Ea1b9gRTBEAem742RCUBZWWy6va1mwf1Ow3WnkRVTWHH3zSfVHbo3LEnKtccE5yh FKvwvLSPfzofR+a95lqF5BV8yIHD/cm1iGLZHIa92xwQIgMXKCvX1kt4Bs7WKCtHi 3OHlKvVCG9M6SmHnNuNrR2rNSC6xGU/aFJqF+E27u38jKY5cF5PbEsJbex+bnQT33 vKQg4ZEXHVM2mBKoBjYzh2O3GsrE2mHi9hMvV4JWiBUqub4sSJ5ERki/jXHPX0bQr kZIQaB7B3xZOeQlwQabRcy+lLUpTTt674HoKpuY4wT4JhDCz7iqpCrOjTN0+77SL7 oGlsvgomIHPy2MFn5g== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.206]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N2mFY-1tsVpw297c-012Fux; Thu, 21 Nov 2024 09:37:48 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Cc: Peter Seiderer Subject: [PATCH v4l-utils v1] meson: remove two pre-0.60 workarounds Date: Thu, 21 Nov 2024 09:37:36 +0100 Message-ID: <20241121083736.16439-1-ps.report@gmx.net> X-Mailer: git-send-email 2.47.0 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:hOi4bmA6jRLlYJhpM3fB/dmeZxy+kITnmkMBtz70DmkeRt3/utG WThGmEVMPTdNIARi7ChrTvGxod3V2hENTysDunBUaLm6Gcjohal/FdR9NaoS6+Wauu/zwgq KwgLs4F6xF9ht47zeXj0z03qQardU+3Wdd226NupdBxyI1pFo+qkCDdoIRCe/9zVLcNZ6+d 0eFWWxAlvxSO/anjrgukg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:87PsFsexjyc=;EuLVGjCmYB8XUnRKAIDr9Wm7gg4 rf0v7gCPWf6hQGvaRCgsKplt8YaVOLrnJXuer1S6dwXEaL19ecb8SET1L5/bWzoMBQecdeQin u3Yya1LkMF+fnMn7JObmtLa/7zfcIxqYgzoS76dGIrWv/YNkm3kCvz6NvIgbNvStzVTVw1xXK Bh9TFJvOud7lMliQeLVY6HVkuDZRlZs5GHK7wHDDONqvokXvjbogQ234R827LPq54u1g3fOaq /I0APfhbx821ysv2LmHjShvfuZYqT+UYTxaBnsSwclGQ3OUVZoBqvJtkMB46W9qpPoE/a9ZHq y0DgjpTURAqcDBaSyk5sehJtmV7HPKmfjlCRYS0Rt3VOTCcpWCodozB5DGJMPL1Ku35wa8Ebo cRgEknW3IeacmSM+ny2ZpxTAMVH7+vaEEgBHA4IrYtUgr1+tT9+N7Y5oawfVJvm0fQSyNFP3A dL/jQ+PTibC8UsRLsYNKgRoJ9H2jEqGq1B6FRNbbMSUO9b2hVi7b2WAFriPpR3yWx2u0OYi5x i3MRaJKAAQVY5BG302HQFxbKBzIDdz6erX9BWvlKh8SClBlJwpkYSqFgUh+OiJ8uqWEJztyFA fmf4/7Gy4wvq+vIwKUTmSDnosv/BYeueeQk0+kFWIl8c+LW0gfG+lhg8liz1IrqBdbLQtvpSM +f3cJhunbdcMCB1FN2h4EbC+gNugcG35IrEqXSimLAsxDZnUfGkrWQWSl1HCdEJyVGBkmjrmW EuhFAL1a5Xu2dS72OT0N1tNyiEBkqN3pT/lr4NGayRzeXOKkZVKvHl4am8aPLS5hfodXfdVjG D2iX5rLEp9s5rsA0fQGBI7z/Ql+cGhySN2k0iLmY0SxOEH52lh/97qEp7d7CWMA97zVh2ORml JvPhmOR0bcqK7Wc/4dNHMof+miQ7ulKZIpcd2MqoVZGLc1kMTomgoLuio Now as the meson required version is bumped to 0.60 it is time to remove two pre-0.60 workarounds: - use meson.project_source_root() instead of meson.current_source_dir() as suggested in comment for meson >= 0.56 - use install_emptydir instead of install_subdir as suggested in comment for meson >= 0.60, fixes the following warnings: utils/keytable/meson.build:89: WARNING: Project targets '>= 0.60' but uses feature deprecated since '0.60.0': install_subdir with empty directory. It worked by accident and is buggy. Use install_emptydir instead. WARNING: Deprecated features used: * 0.60.0: {'install_subdir with empty directory'} Signed-off-by: Peter Seiderer --- meson.build | 3 +-- utils/keytable/meson.build | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index a8843c8f..aad8a794 100644 --- a/meson.build +++ b/meson.build @@ -9,8 +9,7 @@ project('v4l-utils', 'c', 'cpp', ], license : 'LGPL 2.1+') -# meson >= 0.56 can use instead meson.project_source_root() -source_root = meson.current_source_dir() +source_root = meson.project_source_root() cc = meson.get_compiler('c') cpp = meson.get_compiler('cpp') diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build index c02d4ea9..e214e0b5 100644 --- a/utils/keytable/meson.build +++ b/utils/keytable/meson.build @@ -82,9 +82,4 @@ endif endif endif -# Install non-existing directory to create empty directory structure -# See: https://github.com/mesonbuild/meson/issues/2904 -# This should be replaced with install_emptydir() when bumping the minimum meson -# version to 0.60.0. -install_subdir('protocols', - install_dir : ir_keytable_user_dir) +install_emptydir(ir_keytable_user_dir / 'protocols')