[07/12] xdpyinfo: build with meson

Message ID	20260715140507.2329605-7-ross.burton@arm.com
State	New
Headers	show Return-Path: <ross.burton@arm.com> ip: 217.140.110.172, mailfrom: ross.burton@arm.com) From: Ross Burton <ross.burton@arm.com> To: openembedded-core@lists.openembedded.org Subject: [PATCH 07/12] xdpyinfo: build with meson Date: Wed, 15 Jul 2026 15:05:02 +0100 Message-ID: <20260715140507.2329605-7-ross.burton@arm.com> In-Reply-To: <20260715140507.2329605-1-ross.burton@arm.com> References: <20260715140507.2329605-1-ross.burton@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable
Series	[01/12] libxml2: clean up xmlconf mode fixups \| expand [01/12] libxml2: clean up xmlconf mode fixups [02/12] evdev: build with meson [03/12] libpsl: use libidn2 instead of ICU [04/12] patchelf: build with meson [05/12] xorg-app-common: add builder class variable [06/12] mkfontscale: use meson [07/12] xdpyinfo: build with meson [08/12] xev: build with meson [09/12] xeyes: build with meson [10/12] xkbcomp: build with meson [11/12] xrandr: build with meson [12/12] xset: build with meson

Message ID

20260715140507.2329605-7-ross.burton@arm.com

State

New

Headers

From: Ross Burton <ross.burton@arm.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 07/12] xdpyinfo: build with meson
Date: Wed, 15 Jul 2026 15:05:02 +0100
Message-ID: <20260715140507.2329605-7-ross.burton@arm.com>
In-Reply-To: <20260715140507.2329605-1-ross.burton@arm.com>
References: <20260715140507.2329605-1-ross.burton@arm.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../xorg-app/xdpyinfo/disable-xkb.patch       | 22 -------------------
 .../xorg-app/xdpyinfo_1.4.0.bb                |  4 +---
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch

diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
deleted file mode 100644
index 1e8199cc668..00000000000
--- a/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
+++ /dev/null
@@ -1,22 +0,0 @@ 
-Upstream-Status: Pending
-
-Index: xdpyinfo-1.3.0/configure.ac
-===================================================================
---- xdpyinfo-1.3.0.orig/configure.ac	2011-10-21 21:34:21.000000000 -0700
-+++ xdpyinfo-1.3.0/configure.ac	2011-11-28 20:06:56.554056935 -0800
-@@ -47,11 +47,15 @@
- 	AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.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(DPY_XKB, x11,
- 	[SAVE_CPPFLAGS="$CPPFLAGS"
- 	CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS"
- 	AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>])
- 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-+fi
- 
- PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm,
- 	[SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.4.0.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.4.0.bb
index 804b284352d..6c6b31203ac 100644
--- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.4.0.bb
+++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.4.0.bb
@@ -12,9 +12,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3"
 DEPENDS += "libxtst libxext libxxf86vm libxi libxrender libxinerama libxau libxcomposite"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch"
-
 SRC_URI_EXT = "xz"
 SRC_URI[sha256sum] = "dc1de6e6e091ed46c4837b0ae9811e8182f7be0d2af638cab3e530ff081a48b6"
 
-EXTRA_OECONF = "--disable-xkb"
+XORGBUILDCLASS = "meson"

[07/12] xdpyinfo: build with meson

Commit Message

Patch