Rudi Heitbaum 2023-12-13 10:30:25 +00:00
parent 52533e4fa9
commit b0f02c49af
2 changed files with 2 additions and 34 deletions

View File

@ -5,8 +5,8 @@
# with 1.0.0 repeat delay is broken. test on upgrade
PKG_NAME="v4l-utils"
PKG_VERSION="1.26.0"
PKG_SHA256="dab463dc0215e55b2ef1f7a7ab230c3ae8102ea029547eefb4478da0fa8af505"
PKG_VERSION="1.26.1"
PKG_SHA256="4a71608c0ef7df2931176989e6d32b445c0bdc1030a2376d929c8ca6e550ec4e"
PKG_LICENSE="GPL"
PKG_SITE="http://linuxtv.org/"
PKG_URL="http://linuxtv.org/downloads/v4l-utils/${PKG_NAME}-${PKG_VERSION}.tar.xz"

View File

@ -1,32 +0,0 @@
From 4321b7651f2c0e76172ff742ecbd9f63fd24845a Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 8 Dec 2023 11:29:04 +0000
Subject: [PATCH] keytable: meson not passing rc_keymaps system directory
In the meson build ir_keytable_system_dir is used as the parent directory
for both rc_keymaps and rules.d, whereas udevrulesdir was defined
sepeartely in the configure script. Update the -DIR_KEYTABLE_SYSTEM_DIR
to include the rc_keymaps subdirectory aligning with the install_data
functions.
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
---
utils/keytable/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build
index 0ca08a18..4130a4be 100644
--- a/utils/keytable/meson.build
+++ b/utils/keytable/meson.build
@@ -17,7 +17,7 @@ ir_keytable_system_dir = udevdir
ir_keytable_user_dir = get_option('sysconfdir') / 'rc_keymaps'
ir_keytable_c_args = [
- '-DIR_KEYTABLE_SYSTEM_DIR="@0@"'.format(ir_keytable_system_dir),
+ '-DIR_KEYTABLE_SYSTEM_DIR="@0@"'.format(ir_keytable_system_dir / 'rc_keymaps'),
'-DIR_KEYTABLE_USER_DIR="@0@"'.format(ir_keytable_user_dir),
]
--
2.34.1