From 175e3becf5b4ef6790d0e90c24c8e093c8a5052c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 7 Apr 2008 17:28:12 +0000
Subject: xtrans: Revert 1.1 to 1.0.4 to fix abstract socket breakage and fix
 the toolchain

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4186 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/xorg-lib/xtrans-sdk_1.0.4.bb |  7 +++++++
 meta/packages/xorg-lib/xtrans-sdk_1.1.bb   |  5 -----
 meta/packages/xorg-lib/xtrans_1.0.4.bb     | 12 ++++++++++++
 meta/packages/xorg-lib/xtrans_1.1.bb       | 14 --------------
 4 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 meta/packages/xorg-lib/xtrans-sdk_1.0.4.bb
 delete mode 100644 meta/packages/xorg-lib/xtrans-sdk_1.1.bb
 create mode 100644 meta/packages/xorg-lib/xtrans_1.0.4.bb
 delete mode 100644 meta/packages/xorg-lib/xtrans_1.1.bb

(limited to 'meta/packages/xorg-lib')

diff --git a/meta/packages/xorg-lib/xtrans-sdk_1.0.4.bb b/meta/packages/xorg-lib/xtrans-sdk_1.0.4.bb
new file mode 100644
index 000000000..e018a6422
--- /dev/null
+++ b/meta/packages/xorg-lib/xtrans-sdk_1.0.4.bb
@@ -0,0 +1,7 @@
+require xtrans_${PV}.bb
+
+DEPENDS = "util-macros-sdk"
+
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
+
+inherit sdk
diff --git a/meta/packages/xorg-lib/xtrans-sdk_1.1.bb b/meta/packages/xorg-lib/xtrans-sdk_1.1.bb
deleted file mode 100644
index 9f671180b..000000000
--- a/meta/packages/xorg-lib/xtrans-sdk_1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xtrans_${PV}.bb
-
-DEPENDS = "util-macros-sdk"
-
-inherit sdk
diff --git a/meta/packages/xorg-lib/xtrans_1.0.4.bb b/meta/packages/xorg-lib/xtrans_1.0.4.bb
new file mode 100644
index 000000000..2400d3bec
--- /dev/null
+++ b/meta/packages/xorg-lib/xtrans_1.0.4.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+PR = "r2"
+
+SRC_URI += "file://fix-missing-includepath.patch;patch=1"
+
+RDEPENDS_${PN}-dev = ""
+
+XORG_PN = "xtrans"
diff --git a/meta/packages/xorg-lib/xtrans_1.1.bb b/meta/packages/xorg-lib/xtrans_1.1.bb
deleted file mode 100644
index 92c055714..000000000
--- a/meta/packages/xorg-lib/xtrans_1.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-lib-common.inc
-
-SRC_URI += "file://abstract_socket_fix.patch;patch=1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans"
-
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-PE = "1"
-PR = "r4"
-
-RDEPENDS_${PN}-dev = ""
-
-XORG_PN = "xtrans"
-- 
cgit v1.2.3