[oe-commits] Martin Jansa : libxi: move to 1.3.2 with fixed ASCIIDOC test

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 00e29a97f4c085ca5faf8de3545c5f07c2981dff
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=00e29a97f4c085ca5faf8de3545c5f07c2981dff

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Aug  4 09:03:12 2010 +0200

libxi: move to 1.3.2 with fixed ASCIIDOC test

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../include/preferred-xorg-versions-live.inc       |    4 ++--
 recipes/xorg-lib/libxi_1.3.1.bb                    |   14 --------------
 recipes/xorg-lib/libxi_1.3.2.bb                    |   10 ++++++++++
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index e6d5b06..53d202a 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Mon Aug  2 10:12:14 CEST 2010
+#Wed Aug  4 08:58:39 CEST 2010
 #app
 PREFERRED_VERSION_appres ?= "1.0.2"
 PREFERRED_VERSION_bdftopcf ?= "1.0.2"
@@ -264,7 +264,7 @@ PREFERRED_VERSION_libxfont ?= "1.4.2"
 PREFERRED_VERSION_libxfont-native ?= "1.4.2"
 PREFERRED_VERSION_libxfontcache ?= "1.0.5"
 PREFERRED_VERSION_libxft ?= "2.1.14"
-PREFERRED_VERSION_libxi ?= "1.3.1"
+PREFERRED_VERSION_libxi ?= "1.3.2"
 PREFERRED_VERSION_libxinerama ?= "1.1"
 PREFERRED_VERSION_libxmu ?= "1.0.5"
 PREFERRED_VERSION_libxp ?= "1.0.0"
diff --git a/recipes/xorg-lib/libxi_1.3.1.bb b/recipes/xorg-lib/libxi_1.3.1.bb
deleted file mode 100644
index e25cb82..0000000
--- a/recipes/xorg-lib/libxi_1.3.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Input extension library"
-DEPENDS += "libxext inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-# because of broken ASCIIDOC in configure.ac 
-# http://cgit.freedesktop.org/xorg/lib/libXi/commit/?h=libXi-1.3-branch&id=d7d8a9e4fc37ab0f865e74ea1871617a3b542906
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI[archive.md5sum] = "75324546e3d1c0cce9d508feb05e4ed0"
-SRC_URI[archive.sha256sum] = "c38e88783f0f4dd2bd547f182060e83b5a963c973a6b0bb4e16be4c5e1776111"
-
-XORG_PN = "libXi"
diff --git a/recipes/xorg-lib/libxi_1.3.2.bb b/recipes/xorg-lib/libxi_1.3.2.bb
new file mode 100644
index 0000000..69d33ea
--- /dev/null
+++ b/recipes/xorg-lib/libxi_1.3.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Input extension library"
+DEPENDS += "libxext inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "26f93781356b1fdde08f7ee9cd5884d6"
+SRC_URI[archive.sha256sum] = "a6034b57ab65fd89584d23403f613c1e1ad1679614fa8562b7438880596ddc3a"
+
+XORG_PN = "libXi"