summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2008-04-08 09:57:57 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2008-04-08 09:57:57 +0000
commitfe7d1276ba72fb55093eb0243b5d3eb197159e6c (patch)
tree7cf1631d21b70ec414b5613e53306c9018d625e5 /packages
parent83f6d01df2f8f4ba919d178d7a88e75694403886 (diff)
libx11: added 1.1.4 from Poky
Diffstat (limited to 'packages')
-rw-r--r--packages/xorg-lib/diet-x11_1.1.4.bb10
-rw-r--r--packages/xorg-lib/libx11-native_1.1.4.bb7
-rw-r--r--packages/xorg-lib/libx11_1.1.4.bb29
3 files changed, 46 insertions, 0 deletions
diff --git a/packages/xorg-lib/diet-x11_1.1.4.bb b/packages/xorg-lib/diet-x11_1.1.4.bb
new file mode 100644
index 0000000000..19a9efecbf
--- /dev/null
+++ b/packages/xorg-lib/diet-x11_1.1.4.bb
@@ -0,0 +1,10 @@
+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/packages/xorg-lib/libx11-native_1.1.4.bb b/packages/xorg-lib/libx11-native_1.1.4.bb
new file mode 100644
index 0000000000..9d8158bca6
--- /dev/null
+++ b/packages/xorg-lib/libx11-native_1.1.4.bb
@@ -0,0 +1,7 @@
+require libx11_${PV}.bb
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+
+inherit native
diff --git a/packages/xorg-lib/libx11_1.1.4.bb b/packages/xorg-lib/libx11_1.1.4.bb
new file mode 100644
index 0000000000..88771558f8
--- /dev/null
+++ b/packages/xorg-lib/libx11_1.1.4.bb
@@ -0,0 +1,29 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+ libxdmcp xf86bigfontproto kbproto inputproto"
+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; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} 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"