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

8 files changed, 68 insertions, 46 deletions

diff --git a/meta/packages/xorg-lib/diet-x11_1.1.4.bb b/meta/packages/xorg-lib/diet-x11_1.1.4.bb
deleted file mode 100644
index 19a9efecbf..0000000000
--- a/meta/packages/xorg-lib/diet-x11_1.1.4.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/libx11-diet_1.1.5.bb b/meta/packages/xorg-lib/libx11-diet_1.1.5.bb
new file mode 100644
index 0000000000..0830a44554
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-diet_1.1.5.bb
@@ -0,0 +1,18 @@
+require libx11_${PV}.bb
+
+PE = "1"
+PR = "r0"
+
+SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
+            file://include_fix.patch;patch=1 \
+            file://X18NCMSstubs.diff;patch=1 \
+            file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
+
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/packages/xorg-lib/libx11-native_1.1.4.bb b/meta/packages/xorg-lib/libx11-native_1.1.5.bb
index 71b45afdf4..71b45afdf4 100644
--- a/meta/packages/xorg-lib/libx11-native_1.1.4.bb
+++ b/meta/packages/xorg-lib/libx11-native_1.1.5.bb
diff --git a/meta/packages/xorg-lib/libx11-sdk_1.1.4.bb b/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb
index 6140d13701..6140d13701 100644
--- a/meta/packages/xorg-lib/libx11-sdk_1.1.4.bb
+++ b/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb
diff --git a/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..2a8a55cdf5
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch
@@ -0,0 +1,30 @@
+---
+ src/util/Makefile.am |   17 -----------------
+ 1 file changed, 17 deletions(-)
+
+Index: libX11-1.1.2/src/util/Makefile.am
+===================================================================
+--- libX11-1.1.2.orig/src/util/Makefile.am      2007-08-22 14:17:42.000000000 +0100
++++ libX11-1.1.2/src/util/Makefile.am   2007-08-22 14:18:04.000000000 +0100
+@@ -1,21 +1,4 @@
+ # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
+ 
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS=$(X11_CFLAGS)
+-
+-#override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-
+ EXTRA_DIST = mkks.sh
+ 
+-if LINT
+-# Check source code with tools like lint & sparse
+-
+-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-               $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+-
+-lint:
+-       $(LINT) $(ALL_LINT_FLAGS) makekeys.c
+-
+-endif LINT
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 "
-
diff --git a/meta/packages/xorg-lib/libx11_1.1.4.bb b/meta/packages/xorg-lib/libx11.inc
index 7ab3a7bb94..f4f52fdf7e 100644
--- a/meta/packages/xorg-lib/libx11_1.1.4.bb
+++ b/meta/packages/xorg-lib/libx11.inc
@@ -1,18 +1,12 @@
 require xorg-lib-common.inc
 
-DESCRIPTION = "Base X libs."
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+DESCRIPTION = "X11 protocol and utility library"
 PROVIDES = "virtual/libx11"
-PE = "1"
-PR = "r3"
 
 XORG_PN = "libX11"
+LEAD_SONAME = "libX11.so"
 
-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"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
 do_compile() {
         (
diff --git a/meta/packages/xorg-lib/libx11_1.1.5.bb b/meta/packages/xorg-lib/libx11_1.1.5.bb
new file mode 100644
index 0000000000..81d3f91fa6
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_1.1.5.bb
@@ -0,0 +1,12 @@
+require libx11.inc
+
+PE = "1"
+PR = "r0"
+
+SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
+            file://include_fix.patch;patch=1"
+
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+
+EXTRA_OECONF += "--without-xcb"