xset: update 1.2.4 -> 1.2.5

(From OE-Core rev: 5a1265a159459e21a73076bfefdfd3e7483a92e4)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-12-28 08:37:06 +01:00
committed by Richard Purdie
parent e845404841
commit 9554725e15
2 changed files with 18 additions and 10 deletions

View File

@@ -1,14 +1,21 @@
add "-disable-xkb" option
From 3090dcafac7c8080091b5e3e3720209c65251a1a Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 22 May 2006 22:15:57 +0000
Subject: [PATCH] add "-disable-xkb" option
Upstream-Status: Pending
Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com>
Index: xset-1.2.3/configure.ac
===================================================================
--- xset-1.2.3.orig/configure.ac
+++ xset-1.2.3/configure.ac
@@ -53,11 +53,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext,
---
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configure.ac b/configure.ac
index e7c2bdf..8e1ed5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext,
AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
@@ -22,5 +29,5 @@ Index: xset-1.2.3/configure.ac
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+fi
AC_ARG_WITH(xf86misc, AS_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]),
[USE_XF86MISC="$withval"], [USE_XF86MISC="yes"])
AC_ARG_WITH(xf86misc, AS_HELP_STRING([--with-xf86misc],[Enable xf86misc support.]),
[USE_XF86MISC="$withval"], [USE_XF86MISC="no"])

View File

@@ -12,8 +12,9 @@ PE = "1"
SRC_URI += "file://disable-xkb.patch"
SRC_URI[md5sum] = "70ea7bc7bacf1a124b1692605883f620"
SRC_URI[sha256sum] = "e4fd95280df52a88e9b0abc1fee11dcf0f34fc24041b9f45a247e52df941c957"
SRC_URI_EXT = "xz"
SRC_URI[sha256sum] = "9f692d55635b3862cd63633b1222a87680ec283c7a8e8ed6dd698a3147f75e2f"
CFLAGS += "-D_GNU_SOURCE"
EXTRA_OECONF = "--disable-xkb --without-fontcache"