From f5dc76ff4f357b457a4f9713b2fdfde1e24e4660 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sun, 12 Jul 2026 05:24:44 +0000 Subject: [PATCH] xvinfo,xset: upgrade 1.1.5 -> 1.1.6,1.2.5 -> 1.2.6 --- .../xorg-app/xset/disable-xkb.patch | 5 ++-- .../xorg-app/{xset_1.2.5.bb => xset_1.2.6.bb} | 23 +++++++++++++++++-- .../{xvinfo_1.1.5.bb => xvinfo_1.1.6.bb} | 2 +- 3 files changed, 24 insertions(+), 6 deletions(-) rename meta/recipes-graphics/xorg-app/{xset_1.2.5.bb => xset_1.2.6.bb} (35%) rename meta/recipes-graphics/xorg-app/{xvinfo_1.1.5.bb => xvinfo_1.1.6.bb} (80%) diff --git a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch index 0bb05a3b88..a7476450a4 100644 --- a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch +++ b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch @@ -1,4 +1,4 @@ -From 3090dcafac7c8080091b5e3e3720209c65251a1a Mon Sep 17 00:00:00 2001 +From db7c9021b1853d5654e4ecfcfa31187afc845604 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 22 May 2006 22:15:57 +0000 Subject: [PATCH] add "-disable-xkb" option @@ -6,13 +6,12 @@ Subject: [PATCH] add "-disable-xkb" option Upstream-Status: Pending Rebase for 1.2.1 by: Yu Ke - --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac -index e7c2bdf..8e1ed5e 100644 +index e578bfe..1847258 100644 --- a/configure.ac +++ b/configure.ac @@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext, diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.5.bb b/meta/recipes-graphics/xorg-app/xset_1.2.6.bb similarity index 35% rename from meta/recipes-graphics/xorg-app/xset_1.2.5.bb rename to meta/recipes-graphics/xorg-app/xset_1.2.6.bb index 398530f342..9966377ecc 100644 --- a/meta/recipes-graphics/xorg-app/xset_1.2.5.bb +++ b/meta/recipes-graphics/xorg-app/xset_1.2.6.bb @@ -1,3 +1,22 @@ +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. +# The following is the difference between the old and the new license text. +# Please update the LICENSE value if needed, and summarize the changes in +# the commit message via 'License-Update:' tag. +# (example: 'License-Update: copyright years updated.') +# +# The changes: +# +# --- COPYING +# +++ COPYING +# @@ -1,3 +1,5 @@ +# +SPDX-License-Identifier: MIT-open-group +# + +# Copyright 1985, 1988, 1998 The Open Group +# +# Permission to use, copy, modify, distribute, and sell this software and its +# +# + require xorg-app-common.inc SUMMARY = "Utility for setting various user preference options of the display" @@ -6,7 +25,7 @@ DESCRIPTION = "xset is a utility that is used to set various user \ preference options of the display." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d" +LIC_FILES_CHKSUM = "file://COPYING;md5=373a2cff5a5e58e7ccff069e0ce9fe74" DEPENDS += "libxext libxmu libxau" PE = "1" @@ -14,7 +33,7 @@ SRC_URI += "file://disable-xkb.patch" SRC_URI_EXT = "xz" -SRC_URI[sha256sum] = "9f692d55635b3862cd63633b1222a87680ec283c7a8e8ed6dd698a3147f75e2f" +SRC_URI[sha256sum] = "623837349ea887bc003f01ee2e4b6b8ddd9c2774f632c6d70eead1b56306b695" CFLAGS += "-D_GNU_SOURCE" EXTRA_OECONF = "--disable-xkb --without-fontcache" diff --git a/meta/recipes-graphics/xorg-app/xvinfo_1.1.5.bb b/meta/recipes-graphics/xorg-app/xvinfo_1.1.6.bb similarity index 80% rename from meta/recipes-graphics/xorg-app/xvinfo_1.1.5.bb rename to meta/recipes-graphics/xorg-app/xvinfo_1.1.6.bb index d7e5d917ef..75f9b26a85 100644 --- a/meta/recipes-graphics/xorg-app/xvinfo_1.1.5.bb +++ b/meta/recipes-graphics/xorg-app/xvinfo_1.1.6.bb @@ -11,4 +11,4 @@ DEPENDS += " libxv" PE = "1" SRC_URI_EXT = "xz" -SRC_URI[sha256sum] = "3ede71ecb26d9614ccbc6916720285e95a2c7e0c5e19b8570eaaf72ad7c5c404" +SRC_URI[sha256sum] = "a436945e6a4ab70590358eec2b85d26970f7de480d27e8a25af8fe8421e88ae2" -- 2.47.1