diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-09-07 23:27:26 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-11 17:04:33 +0100 |
| commit | c3ae134362382fd0db6ee34613b0c258076ef9b6 (patch) | |
| tree | 42fa0c38f88c1027e19b8da24a3c86c975e9236a /meta/recipes-graphics/xorg-lib | |
| parent | 70abb59e71a2aed5ef7faf5ba9b56f695d562382 (diff) | |
| download | openembedded-core-c3ae134362382fd0db6ee34613b0c258076ef9b6.tar.gz openembedded-core-c3ae134362382fd0db6ee34613b0c258076ef9b6.tar.bz2 openembedded-core-c3ae134362382fd0db6ee34613b0c258076ef9b6.tar.xz openembedded-core-c3ae134362382fd0db6ee34613b0c258076ef9b6.zip | |
libx11: add new version 1.4.4
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
3 files changed, 70 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch new file mode 100644 index 000000000..d1bdab977 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> + +diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac +--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 ++++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 +@@ -355,7 +355,14 @@ + # Find keysymdef.h + # + AC_MSG_CHECKING([keysym definitions]) +-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++AC_ARG_WITH(keysymdefdir, ++ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), ++ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") ++ ++if test x$KEYSYMDEFDIR = x; then ++ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++fi ++ + FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" + for i in $FILES; do + if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch new file mode 100644 index 000000000..976331397 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch @@ -0,0 +1,29 @@ +Index: libX11-1.3.4/src/util/Makefile.am +=================================================================== +--- libX11-1.3.4.orig/src/util/Makefile.am ++++ libX11-1.3.4/src/util/Makefile.am +@@ -1,24 +1 @@ +- +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(X11_CFLAGS) \ +- $(CWARNFLAGS) +- +-CC = @CC_FOR_BUILD@ +-CPPFLAGS = @CPPFLAGS_FOR_BUILD@ +-CFLAGS = @CFLAGS_FOR_BUILD@ +-LDFLAGS = @LDFLAGS_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/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb new file mode 100644 index 000000000..823b3dcbe --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb @@ -0,0 +1,18 @@ +require libx11.inc +inherit gettext + +BBCLASSEXTEND = "native nativesdk" + +EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11" + +DEPENDS += "util-macros xtrans libxdmcp libxau \ + bigreqsproto xproto xextproto xcmiscproto \ + xf86bigfontproto kbproto inputproto libxcb \ + xproto-native" + +SRC_URI += " file://keysymdef_include.patch \ + file://x11_disable_makekeys.patch \ + " + +SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" +SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" |