summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-29 19:22:21 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-29 19:22:21 +0000
commit3081d60d5a9f8accf016bd43f0ef13dffa9a519b (patch)
treeec015addd2f39581f0e5a7de3b5ded785952f4cf
parentef3ef90918f63f7f92229e5de97573dcc78d515c (diff)
downloadpoky-3081d60d5a9f8accf016bd43f0ef13dffa9a519b.tar.gz
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
-rw-r--r--meta/packages/xorg-lib/diet-x11_1.1.4.bb10
-rw-r--r--meta/packages/xorg-lib/libx11-diet_1.1.5.bb18
-rw-r--r--meta/packages/xorg-lib/libx11-native_1.1.5.bb (renamed from meta/packages/xorg-lib/libx11-native_1.1.4.bb)0
-rw-r--r--meta/packages/xorg-lib/libx11-sdk_1.1.5.bb (renamed from meta/packages/xorg-lib/libx11-sdk_1.1.4.bb)0
-rw-r--r--meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch30
-rw-r--r--meta/packages/xorg-lib/libx11-trim_1.1.5.bb32
-rw-r--r--meta/packages/xorg-lib/libx11.inc (renamed from meta/packages/xorg-lib/libx11_1.1.4.bb)12
-rw-r--r--meta/packages/xorg-lib/libx11_1.1.5.bb12
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 @@
1require libx11_${PV}.bb
2
3SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
4 file://fix-disable-xlocale.diff;patch=1 \
5 file://fix-utf8-wrong-define.patch;patch=1"
6
7FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
8
9EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
10CFLAGS += "-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 @@
1require libx11_${PV}.bb
2
3PE = "1"
4PR = "r0"
5
6SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
7 file://include_fix.patch;patch=1 \
8 file://X18NCMSstubs.diff;patch=1 \
9 file://fix-disable-xlocale.diff;patch=1 \
10 file://fix-utf8-wrong-define.patch;patch=1"
11
12DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
13 libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
14
15FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
16
17EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
18CFLAGS += "-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 @@
1---
2 src/util/Makefile.am | 17 -----------------
3 1 file changed, 17 deletions(-)
4
5Index: libX11-1.1.2/src/util/Makefile.am
6===================================================================
7--- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100
8+++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100
9@@ -1,21 +1,4 @@
10 # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
11
12-noinst_PROGRAMS=makekeys
13-
14-makekeys_CFLAGS=$(X11_CFLAGS)
15-
16-#override CC = gcc
17-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
18-
19 EXTRA_DIST = mkks.sh
20
21-if LINT
22-# Check source code with tools like lint & sparse
23-
24-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
25- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
26-
27-lint:
28- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
29-
30-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 @@
1require xorg-lib-common.inc 1require libx11.inc
2
3DESCRIPTION = "X11 protocol and utility library"
4DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto"
5
6#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
7#SRC_URI += "file://X18NCMSstubs.diff;patch=1 "
8
9PROVIDES = "virtual/libx11"
10 2
11PE = "1" 3PE = "1"
12PR = "r1" 4PR = "r4"
13 5
14XORG_PN = "libX11" 6DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto"
15LEAD_SONAME = "libX11.so"
16 7
17SRC_URI += "file://include_fix.patch;patch=1" 8SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
9 file://include_fix.patch;patch=1"
18 10
19EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
20#EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb"
21EXTRA_OECONF += "--disable-xcms --with-xcb" 11EXTRA_OECONF += "--disable-xcms --with-xcb"
22
23do_compile() {
24 (
25 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
26 cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
27 cd ../../
28 ) || exit 1
29 oe_runmake
30}
31
32FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB "
33
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 @@
1require xorg-lib-common.inc 1require xorg-lib-common.inc
2 2
3DESCRIPTION = "Base X libs." 3DESCRIPTION = "X11 protocol and utility library"
4DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
5 libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
6PROVIDES = "virtual/libx11" 4PROVIDES = "virtual/libx11"
7PE = "1"
8PR = "r3"
9 5
10XORG_PN = "libX11" 6XORG_PN = "libX11"
7LEAD_SONAME = "libX11.so"
11 8
12SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ 9EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
13 file://include_fix.patch;patch=1"
14
15EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
16 10
17do_compile() { 11do_compile() {
18 ( 12 (
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 @@
1require libx11.inc
2
3PE = "1"
4PR = "r0"
5
6SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
7 file://include_fix.patch;patch=1"
8
9DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
10 libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
11
12EXTRA_OECONF += "--without-xcb"