diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-05-27 22:25:15 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-05-27 22:25:15 +0200 |
| commit | b3f8958f0a1f59729314d26d084d409b6cfed570 (patch) | |
| tree | dece70626d6d52d0a23358872440193752ae40d0 | |
| parent | dc0a87f3d991c9361b69dabe0384b075e1384a77 (diff) | |
libx11: add 1.2
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch | 23 | ||||
| -rw-r--r-- | recipes/xorg-lib/libx11_1.2.bb | 31 |
3 files changed, 58 insertions, 0 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index f8edfd1bf4..5597f83eee 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -11978,6 +11978,10 @@ sha256=da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82 md5=2f2beb98e71f397e1209beaca4e97cb1 sha256=d172e5a401a2607f4ff145db4e8e09c193a1980bbb2c5c7f824e61ee3fdfdff3 +[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.2.tar.bz2] +md5=c6265b59ea2b594fd68e33f9125b4d20 +sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051 + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libX11-X11R7.0-1.0.0.tar.bz2] md5=dcf59f148c978816ebbe3fbc5c9ef0e1 sha256=89a3c2d8324ff9d0d91682503407310f7df30a74915cd253be3a75247b044248 diff --git a/recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch new file mode 100644 index 0000000000..9e9e75ea43 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch @@ -0,0 +1,23 @@ +--- /tmp/Makefile.am 2009-05-27 22:19:39.000000000 +0200 ++++ libX11-1.2/src/util/Makefile.am 2009-05-27 22:21:31.000000000 +0200 +@@ -1,20 +1 @@ +-# $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) +- +-CC = @CC_FOR_BUILD@ +- + 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/recipes/xorg-lib/libx11_1.2.bb b/recipes/xorg-lib/libx11_1.2.bb new file mode 100644 index 0000000000..a3d000f030 --- /dev/null +++ b/recipes/xorg-lib/libx11_1.2.bb @@ -0,0 +1,31 @@ +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" + +XORG_PN = "libX11" + +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ + file://keysymdef_include.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 + sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c + 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" |