From 8e3e46639f903a527ce52310bc91b46c65f0e580 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Fri, 28 Mar 2008 15:35:03 +0000
Subject: libx11: upgraded to 1.1.4

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4143 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/xorg-lib/diet-x11_1.1.3.bb      | 10 ---------
 meta/packages/xorg-lib/diet-x11_1.1.4.bb      | 10 +++++++++
 meta/packages/xorg-lib/libx11-native_1.1.3.bb |  7 -------
 meta/packages/xorg-lib/libx11-native_1.1.4.bb |  7 +++++++
 meta/packages/xorg-lib/libx11-sdk_1.1.3.bb    |  8 --------
 meta/packages/xorg-lib/libx11-sdk_1.1.4.bb    |  8 ++++++++
 meta/packages/xorg-lib/libx11_1.1.3.bb        | 29 ---------------------------
 meta/packages/xorg-lib/libx11_1.1.4.bb        | 29 +++++++++++++++++++++++++++
 8 files changed, 54 insertions(+), 54 deletions(-)
 delete mode 100644 meta/packages/xorg-lib/diet-x11_1.1.3.bb
 create mode 100644 meta/packages/xorg-lib/diet-x11_1.1.4.bb
 delete mode 100644 meta/packages/xorg-lib/libx11-native_1.1.3.bb
 create mode 100644 meta/packages/xorg-lib/libx11-native_1.1.4.bb
 delete mode 100644 meta/packages/xorg-lib/libx11-sdk_1.1.3.bb
 create mode 100644 meta/packages/xorg-lib/libx11-sdk_1.1.4.bb
 delete mode 100644 meta/packages/xorg-lib/libx11_1.1.3.bb
 create mode 100644 meta/packages/xorg-lib/libx11_1.1.4.bb

(limited to 'meta')

diff --git a/meta/packages/xorg-lib/diet-x11_1.1.3.bb b/meta/packages/xorg-lib/diet-x11_1.1.3.bb
deleted file mode 100644
index 19a9efecb..000000000
--- a/meta/packages/xorg-lib/diet-x11_1.1.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11_${PV}.bb
-
-SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
-            file://fix-disable-xlocale.diff;patch=1 \
-            file://fix-utf8-wrong-define.patch;patch=1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/packages/xorg-lib/diet-x11_1.1.4.bb b/meta/packages/xorg-lib/diet-x11_1.1.4.bb
new file mode 100644
index 000000000..19a9efecb
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11_1.1.4.bb
@@ -0,0 +1,10 @@
+require libx11_${PV}.bb
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+            file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/packages/xorg-lib/libx11-native_1.1.3.bb b/meta/packages/xorg-lib/libx11-native_1.1.3.bb
deleted file mode 100644
index 9d8158bca..000000000
--- a/meta/packages/xorg-lib/libx11-native_1.1.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require libx11_${PV}.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-
-inherit native
diff --git a/meta/packages/xorg-lib/libx11-native_1.1.4.bb b/meta/packages/xorg-lib/libx11-native_1.1.4.bb
new file mode 100644
index 000000000..9d8158bca
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-native_1.1.4.bb
@@ -0,0 +1,7 @@
+require libx11_${PV}.bb
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+
+inherit native
diff --git a/meta/packages/xorg-lib/libx11-sdk_1.1.3.bb b/meta/packages/xorg-lib/libx11-sdk_1.1.3.bb
deleted file mode 100644
index 75ba26e54..000000000
--- a/meta/packages/xorg-lib/libx11-sdk_1.1.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libx11_${PV}.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
-DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk"
-PROVIDES = ""
-
-inherit sdk
diff --git a/meta/packages/xorg-lib/libx11-sdk_1.1.4.bb b/meta/packages/xorg-lib/libx11-sdk_1.1.4.bb
new file mode 100644
index 000000000..75ba26e54
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-sdk_1.1.4.bb
@@ -0,0 +1,8 @@
+require libx11_${PV}.bb
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk"
+PROVIDES = ""
+
+inherit sdk
diff --git a/meta/packages/xorg-lib/libx11_1.1.3.bb b/meta/packages/xorg-lib/libx11_1.1.3.bb
deleted file mode 100644
index 88771558f..000000000
--- a/meta/packages/xorg-lib/libx11_1.1.3.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Base X libs."
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto"
-PROVIDES = "virtual/libx11"
-PE = "1"
-PR = "r3"
-
-XORG_PN = "libX11"
-
-SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
-            file://include_fix.patch;patch=1" 
-
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-do_compile() {
-	(
-		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-		# mv to stop it getting rebuilt
-		mv makekeys.c makekeys.c.orig
-		cd ../../
-	) || exit 1
-	oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
diff --git a/meta/packages/xorg-lib/libx11_1.1.4.bb b/meta/packages/xorg-lib/libx11_1.1.4.bb
new file mode 100644
index 000000000..88771558f
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_1.1.4.bb
@@ -0,0 +1,29 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "virtual/libx11"
+PE = "1"
+PR = "r3"
+
+XORG_PN = "libX11"
+
+SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
+            file://include_fix.patch;patch=1" 
+
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+		# mv to stop it getting rebuilt
+		mv makekeys.c makekeys.c.orig
+		cd ../../
+	) || exit 1
+	oe_runmake
+}
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
-- 
cgit v1.2.3