xset: upgrade to latest 1.1.0

Signed-off-by: Yu Ke <ke.yu@intel.com>

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index cfa45b89ac71c7b7e36dbe3e450cdcc4f57c4377..5d4813ee68bf951812371b918e645f48fbe6833d 100644 (file)
--- 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"
 PREFERRED_VERSION_xrdb ?= "1.0.5"
 PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
 PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2"
-PREFERRED_VERSION_xset ?= "1.0.4"
+PREFERRED_VERSION_xset ?= "1.1.0"
 PREFERRED_VERSION_xtrans ?= "1.2.2"
 PREFERRED_VERSION_xtrans-native ?= "1.2.2"
 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
similarity index 59%
rename from meta/packages/xorg-app/xset_1.0.4.bb
rename to meta/packages/xorg-app/xset_1.1.0.bb
index 21a6f5f2278f45ae851350c92f7e8597ece4da88..817b097213742ac838939f6bc0a0cc67aefcb5f8 100644 (file)
--- a/meta/packages/xorg-app/xset_1.0.4.bb
+++ b/meta/packages/xorg-app/xset_1.1.0.bb
@@ -1,12 +1,14 @@
 require xorg-app-common.inc
 
-DESCRIPTION = "user preference utility for X"
+DESCRIPTION = "Utility of setting various user preference options of the display"
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d"
 DISTRO_PN_ALIAS = "Fedora=xorg-x11-server-utils;Ubuntu=x11-xserver-utils;Debian=x11-xserver-utils;Opensuse=xorg-x11"
 DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
+PR = "r0"
 PE = "1"
 
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
 
 CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--disable-xkb"