summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--meta/packages/xorg-app/xdpyinfo_1.1.0.bb (renamed from meta/packages/xorg-app/xdpyinfo_1.0.3.bb)6
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 3c57460cc..256d39805 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -102,7 +102,7 @@ PREFERRED_VERSION_xauth ?= "1.0.4"
PREFERRED_VERSION_xcmiscproto ?= "1.2.0"
PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0"
PREFERRED_VERSION_xcmiscproto-nativesdk ?= "1.2.0"
-PREFERRED_VERSION_xdpyinfo ?= "1.0.3"
+PREFERRED_VERSION_xdpyinfo ?= "1.1.0"
PREFERRED_VERSION_xev ?= "1.0.3"
PREFERRED_VERSION_xextproto ?= "7.1.0"
PREFERRED_VERSION_xextproto-native ?= "7.1.0"
diff --git a/meta/packages/xorg-app/xdpyinfo_1.0.3.bb b/meta/packages/xorg-app/xdpyinfo_1.1.0.bb
index 4764a7089..f5d47e139 100644
--- a/meta/packages/xorg-app/xdpyinfo_1.0.3.bb
+++ b/meta/packages/xorg-app/xdpyinfo_1.1.0.bb
@@ -1,11 +1,11 @@
require xorg-app-common.inc
DESCRIPTION = "X display information utility"
-LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
-PR = "r1"
+PR = "r0"
PE = "1"
-SRC_URI += "file://disable-xkb.patch;patch=1"
+SRC_URI += "file://disable-xkb.patch"
EXTRA_OECONF = "--disable-xkb"