diff mbox series

[12/12] xset: build with meson

Message ID 20260715140507.2329605-12-ross.burton@arm.com
State New
Headers show
Series [01/12] libxml2: clean up xmlconf mode fixups | expand

Commit Message

Ross Burton July 15, 2026, 2:05 p.m. UTC 
We can drop disable-xkb.patch as meson.build checks for the existance of
XKBlib.h.

Don't explicitly disable xkb and fontcache, these are automatically
detected with meson.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../xorg-app/xset/disable-xkb.patch           | 32 -------------------
 meta/recipes-graphics/xorg-app/xset_1.2.6.bb  |  5 ++-
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
diff mbox series

Patch

diff --git a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
deleted file mode 100644
index e099623688c..00000000000
--- a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From a9a90a95047a0a08bb0fd0823961ed9707f451d4 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>
----
- configure.ac | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index e578bfe..1847258 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"])
- 
-+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
-+		XKB="$enableval", XKB="yes")
-+if test "x$XKB" = "xyes" ; then
- PKG_CHECK_MODULES(SET_XKB, x11,
- 	[SAVE_CPPFLAGS="$CPPFLAGS"
- 	CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
- 	AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
- 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-+fi
- 
- AC_ARG_WITH(xf86misc, AS_HELP_STRING([--with-xf86misc],[Enable xf86misc support.]),
-                 [USE_XF86MISC="$withval"], [USE_XF86MISC="no"])
diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.6.bb b/meta/recipes-graphics/xorg-app/xset_1.2.6.bb
index 300aec9ebc8..7bd863f2d76 100644
--- a/meta/recipes-graphics/xorg-app/xset_1.2.6.bb
+++ b/meta/recipes-graphics/xorg-app/xset_1.2.6.bb
@@ -10,11 +10,10 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=373a2cff5a5e58e7ccff069e0ce9fe74"
 DEPENDS += "libxext libxmu libxau"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch"
-
 SRC_URI_EXT = "xz"
 
 SRC_URI[sha256sum] = "623837349ea887bc003f01ee2e4b6b8ddd9c2774f632c6d70eead1b56306b695"
 
+XORGBUILDCLASS = "meson"
+
 CFLAGS += "-D_GNU_SOURCE"
-EXTRA_OECONF = "--disable-xkb --without-fontcache"