libx11: Upgrade to 1.1.5, rename diet-x11 to libx11-diet for consistent naming. Create common .inc file for diet,trim and full-fat version versions

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5320 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 0 insertions, 31 deletions

diff --git a/meta/packages/xorg-lib/libx11_1.1.4.bb b/meta/packages/xorg-lib/libx11_1.1.4.bb
deleted file mode 100644
index 7ab3a7bb94..0000000000
--- a/meta/packages/xorg-lib/libx11_1.1.4.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Base X libs."
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-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; 
-                mv makekeys.c.orig makekeys.c || true
-                touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} 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"