diff options
-rw-r--r-- | meta/conf/distro/include/preferred-xorg-versions.inc | 2 | ||||
-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" | |||
130 | PREFERRED_VERSION_xrdb ?= "1.0.5" | 130 | PREFERRED_VERSION_xrdb ?= "1.0.5" |
131 | PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2" | 131 | PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2" |
132 | PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2" | 132 | PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2" |
133 | PREFERRED_VERSION_xset ?= "1.0.4" | 133 | PREFERRED_VERSION_xset ?= "1.1.0" |
134 | PREFERRED_VERSION_xtrans ?= "1.2.2" | 134 | PREFERRED_VERSION_xtrans ?= "1.2.2" |
135 | PREFERRED_VERSION_xtrans-native ?= "1.2.2" | 135 | PREFERRED_VERSION_xtrans-native ?= "1.2.2" |
136 | PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.2" | 136 | PREFERRED_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 @@ | |||
1 | require xorg-app-common.inc | 1 | require xorg-app-common.inc |
2 | 2 | ||
3 | DESCRIPTION = "user preference utility for X" | 3 | DESCRIPTION = "Utility of setting various user preference options of the display" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d" | ||
5 | DISTRO_PN_ALIAS = "Fedora=xorg-x11-server-utils;Ubuntu=x11-xserver-utils;Debian=x11-xserver-utils;Opensuse=xorg-x11" | 6 | DISTRO_PN_ALIAS = "Fedora=xorg-x11-server-utils;Ubuntu=x11-xserver-utils;Debian=x11-xserver-utils;Opensuse=xorg-x11" |
6 | DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau" | 7 | DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau" |
8 | PR = "r0" | ||
7 | PE = "1" | 9 | PE = "1" |
8 | 10 | ||
9 | SRC_URI += "file://disable-xkb.patch;patch=1" | 11 | SRC_URI += "file://disable-xkb.patch" |
10 | 12 | ||
11 | CFLAGS += "-D_GNU_SOURCE" | 13 | CFLAGS += "-D_GNU_SOURCE" |
12 | EXTRA_OECONF = "--disable-xkb" | 14 | EXTRA_OECONF = "--disable-xkb" |