summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--meta/packages/xorg-app/xset_1.1.0.bb (renamed from meta/packages/xorg-app/xset_1.0.4.bb)6
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index cfa45b89ac..5d4813ee68 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -130,7 +130,7 @@ PREFERRED_VERSION_xrandr ?= "1.2.3"
130PREFERRED_VERSION_xrdb ?= "1.0.5" 130PREFERRED_VERSION_xrdb ?= "1.0.5"
131PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2" 131PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
132PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2" 132PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2"
133PREFERRED_VERSION_xset ?= "1.0.4" 133PREFERRED_VERSION_xset ?= "1.1.0"
134PREFERRED_VERSION_xtrans ?= "1.2.2" 134PREFERRED_VERSION_xtrans ?= "1.2.2"
135PREFERRED_VERSION_xtrans-native ?= "1.2.2" 135PREFERRED_VERSION_xtrans-native ?= "1.2.2"
136PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.2" 136PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.2"
diff --git a/meta/packages/xorg-app/xset_1.0.4.bb b/meta/packages/xorg-app/xset_1.1.0.bb
index 21a6f5f227..817b097213 100644
--- a/meta/packages/xorg-app/xset_1.0.4.bb
+++ b/meta/packages/xorg-app/xset_1.1.0.bb
@@ -1,12 +1,14 @@
1require xorg-app-common.inc 1require xorg-app-common.inc
2 2
3DESCRIPTION = "user preference utility for X" 3DESCRIPTION = "Utility of setting various user preference options of the display"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d"
5DISTRO_PN_ALIAS = "Fedora=xorg-x11-server-utils;Ubuntu=x11-xserver-utils;Debian=x11-xserver-utils;Opensuse=xorg-x11" 6DISTRO_PN_ALIAS = "Fedora=xorg-x11-server-utils;Ubuntu=x11-xserver-utils;Debian=x11-xserver-utils;Opensuse=xorg-x11"
6DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau" 7DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
8PR = "r0"
7PE = "1" 9PE = "1"
8 10
9SRC_URI += "file://disable-xkb.patch;patch=1" 11SRC_URI += "file://disable-xkb.patch"
10 12
11CFLAGS += "-D_GNU_SOURCE" 13CFLAGS += "-D_GNU_SOURCE"
12EXTRA_OECONF = "--disable-xkb" 14EXTRA_OECONF = "--disable-xkb"