From e26585bb1b50575cabd3ad2ec072fa74acd4c16c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 31 Jan 2007 09:57:04 +0000
Subject: libx11: 1.0.1 -> 1.1.1

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1237 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb | 22 ---------------------
 meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb | 27 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 22 deletions(-)
 delete mode 100644 meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
 create mode 100644 meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb

diff --git a/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
deleted file mode 100644
index bbd499334..000000000
--- a/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,22 +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"
-# RPROVIDES = "virtual/libx11"
-
-XORG_PN = "libX11"
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
-
-do_compile() {
-	(
-		unset CC LD CXX CCLD
-		oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
-	)
-	rm -f ${STAGING_INCDIR}/X11/Xlib.h
-	oe_runmake
-}
diff --git a/meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb b/meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb
new file mode 100644
index 000000000..73b6d910b
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb
@@ -0,0 +1,27 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+
+DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+	libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "virtual/libx11"
+# RPROVIDES = "virtual/libx11"
+
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-1.1.1.tar.bz2"
+S = "${WORKDIR}/${XORG_PN}-1.1.1"
+
+XORG_PN = "libX11"
+
+EXTRA_OECONF += "--without-xcb"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+		oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+	)
+	rm -f ${STAGING_INCDIR}/X11/Xlib.h
+	oe_runmake
+}
-- 
cgit v1.2.3