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, 5 insertions, 27 deletions

diff --git a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb b/meta/packages/xorg-lib/libx11-trim_1.1.5.bb
index e99b2a07b0..accdc440db 100644
--- a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb
+++ b/meta/packages/xorg-lib/libx11-trim_1.1.5.bb
@@ -1,33 +1,11 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 protocol and utility library"
-DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto"
-
-#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-#SRC_URI += "file://X18NCMSstubs.diff;patch=1 "
-
-PROVIDES = "virtual/libx11"
+require libx11.inc
 
 PE = "1"
-PR = "r1"
+PR = "r4"
 
-XORG_PN = "libX11"
-LEAD_SONAME = "libX11.so"
+DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto"
 
-SRC_URI += "file://include_fix.patch;patch=1"
+SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
+            file://include_fix.patch;patch=1"
 
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-#EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb"
 EXTRA_OECONF += "--disable-xcms --with-xcb"
-
-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
-         cd ../../
-        ) || exit 1
-        oe_runmake
-}
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB "
-