[OE-core] [PATCH] util-macros/preferred-xorg-versions: Update to 1.13.0

[Michael Lippautz]

* Deps are taken from org.openembedded.dev
* Required by libx11 1.4.3+

Signed-off-by: Michael Lippautz <michael.lippautz at gmail.com>
---
 .../distro/include/preferred-xorg-versions.inc     |    4 +-
 meta/recipes-graphics/xorg-util/util-macros.inc    |   18 +++++++++++++++
 .../xorg-util/util-macros_1.11.0.bb                |   24 --------------------
 .../xorg-util/util-macros_1.13.0.bb                |    7 +++++
 4 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-util/util-macros.inc
 delete mode 100644 meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
 create mode 100644 meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index b164b77..dd67d95 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -92,8 +92,8 @@ PREFERRED_VERSION_renderproto-nativesdk ?= "0.11.1"
 PREFERRED_VERSION_resourceproto ?= "1.1.1"
 PREFERRED_VERSION_scrnsaverproto ?= "1.2.1"
 PREFERRED_VERSION_trapproto ?= "3.4.3"
-PREFERRED_VERSION_util-macros ?= "1.11.0"
-PREFERRED_VERSION_util-macros-native ?= "1.11.0"
+PREFERRED_VERSION_util-macros ?= "1.13.0"
+PREFERRED_VERSION_util-macros-native ?= "1.13.0"
 PREFERRED_VERSION_videoproto ?= "2.3.1"
 PREFERRED_VERSION_windowswmproto ?= "1.0.4"
 PREFERRED_VERSION_x11perf ?= "1.5.2"
diff --git a/meta/recipes-graphics/xorg-util/util-macros.inc b/meta/recipes-graphics/xorg-util/util-macros.inc
new file mode 100644
index 0000000..06e3b0f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-util/util-macros.inc
@@ -0,0 +1,18 @@
+require xorg-util-common.inc
+
+SUMMARY = "X autotools macros"
+DESCRIPTION = "M4 autotools macros used by various X.org programs."
+LICENSE = "MIT & MIT-style"
+
+INC_PR = "r2"
+PE = "1"
+
+ALLOW_EMPTY = "1"
+BBCLASSEXTEND = "native nativesdk"
+
+DEPENDS = "libgpg-error"
+DEPENDS_virtclass-native = "gettext"
+DEPENDS_virtclass-nativesdk = "gettext"
+
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
deleted file mode 100644
index 765a577..0000000
--- a/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "X autotools macros"
-
-DESCRIPTION = "M4 autotools macros used by various X.org programs."
-
-require xorg-util-common.inc
-
-LICENSE = "MIT & MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1970511fddd439b07a6ba789d28ff662"
-
-PE = "1"
-PR = "r0"
-
-# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
-DEPENDS = "libgpg-error"
-DEPENDS_virtclass-native = "gettext"
-DEPENDS_virtclass-nativesdk = "gettext"
-
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "8580021f3a9e242ab09d23d62e475d53"
-SRC_URI[sha256sum] = "212c3d14474d7cffdbc22437d4896211a5dce6b99b02b96229c9be7d963c90cf"
diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb
new file mode 100644
index 0000000..0eff870
--- /dev/null
+++ b/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb
@@ -0,0 +1,7 @@
+require util-macros.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "31e9ddcbc1d8bc8c09ab180443974dd1"
+SRC_URI[archive.sha256sum] = "7bff944fb120192e7fe1706e9c0b7e41666e7983ce3e2bdef0b7734392d9e695"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1970511fddd439b07a6ba789d28ff662"
-- 
1.7.3.4