[10/25] xset: update 1.2.4 -> 1.2.5

Message ID	20221228073721.3454255-10-alex@linutronix.de
State	Accepted, archived
Commit	5a1265a159459e21a73076bfefdfd3e7483a92e4
Headers	show Return-Path: <alex.kanavin@gmail.com> ip: 209.85.221.50, mailfrom: alex.kanavin@gmail.com) From: Alexander Kanavin <alex.kanavin@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin <alex@linutronix.de> Subject: [PATCH 10/25] xset: update 1.2.4 -> 1.2.5 Date: Wed, 28 Dec 2022 08:37:06 +0100 Message-Id: <20221228073721.3454255-10-alex@linutronix.de> In-Reply-To: <20221228073721.3454255-1-alex@linutronix.de> References: <20221228073721.3454255-1-alex@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/25] systemd: update 251.8 -> 252.4 \| expand [01/25] systemd: update 251.8 -> 252.4 [02/25] dpkg: update 1.21.9 -> 1.21.13 [03/25] python3-installer: update 0.5.1 -> 0.6.0 [04/25] python3: update 3.11.0 -> 3.11.1 [05/25] weston: update 11.0.0 -> 11.0.1 [06/25] xhost: update 1.0.8 -> 1.0.9 [07/25] xinit: update 1.4.1 -> 1.4.2 [08/25] xkbcomp: update 1.4.5 -> 1.4.6 [09/25] xprop: update 1.2.5 -> 1.2.6 [10/25] xset: update 1.2.4 -> 1.2.5 [11/25] xvinfo: update 1.1.4 -> 1.1.5 [12/25] xf86-video-vesa: update 2.5.0 -> 2.6.0 [13/25] libice: update 1.0.10 -> 1.1.1 [14/25] libxcomposite: update 0.4.5 -> 0.4.6 [15/25] libxdamage: update 1.1.5 -> 1.1.6 [16/25] libxres: update 1.2.1 -> 1.2.2 [17/25] libxscrnsaver: update 1.2.3 -> 1.2.4 [18/25] libxv: update 1.0.11 -> 1.0.12 [19/25] jquery: upgrade 3.6.1 -> 3.6.2 [20/25] libmodule-build-perl: update 0.4231 -> 0.4232 [21/25] python3-chardet: upgrade 5.0.0 -> 5.1.0 [22/25] libarchive: upgrade 3.6.1 -> 3.6.2 [23/25] stress-ng: upgrade 0.15.00 -> 0.15.01 [24/25] vulkan: upgrade 1.3.231.1 -> 1.3.236.0 [25/25] Revert "python3-native: further tweak to sysconfig.py to find python includes correctly"

Message ID

20221228073721.3454255-10-alex@linutronix.de

State

Accepted, archived

Commit

5a1265a159459e21a73076bfefdfd3e7483a92e4

Headers

From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 10/25] xset: update 1.2.4 -> 1.2.5
Date: Wed, 28 Dec 2022 08:37:06 +0100
Message-Id: <20221228073721.3454255-10-alex@linutronix.de>
In-Reply-To: <20221228073721.3454255-1-alex@linutronix.de>
References: <20221228073721.3454255-1-alex@linutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[01/25] systemd: update 251.8 -> 252.4 | expand

Commit Message

Alexander Kanavin Dec. 28, 2022, 7:37 a.m. UTC

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-app/xset/disable-xkb.patch           | 23 ++++++++++++-------
 .../xorg-app/{xset_1.2.4.bb => xset_1.2.5.bb} |  5 ++--
 2 files changed, 18 insertions(+), 10 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xset_1.2.4.bb => xset_1.2.5.bb} (76%)

diff --git a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
index a97c7b72fa..0bb05a3b88 100644
--- a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
+++ b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
@@ -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"])
diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.4.bb b/meta/recipes-graphics/xorg-app/xset_1.2.5.bb
similarity index 76%
rename from meta/recipes-graphics/xorg-app/xset_1.2.4.bb
rename to meta/recipes-graphics/xorg-app/xset_1.2.5.bb
index e21120e788..398530f342 100644
--- a/meta/recipes-graphics/xorg-app/xset_1.2.4.bb
+++ b/meta/recipes-graphics/xorg-app/xset_1.2.5.bb
@@ -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"

[10/25] xset: update 1.2.4 -> 1.2.5

Commit Message

Patch