diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-12 12:41:49 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-12 14:27:32 +0200 |
| commit | 9e1bbdf672b12d0d7788eeba90f7a079c56bc0c6 (patch) | |
| tree | 135a713ede7fb0f84b485e6b270d28423b812813 /recipes/xorg-lib | |
| parent | 44ded83e917c4d8b47b215648efc2860f794c764 (diff) | |
| download | openembedded-9e1bbdf672b12d0d7788eeba90f7a079c56bc0c6.tar.gz | |
xorg: add latest versions for 2010-08-12
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-lib')
| -rw-r--r-- | recipes/xorg-lib/libx11-1.3.5/dolt-fix.patch | 22 | ||||
| -rw-r--r-- | recipes/xorg-lib/libx11-1.3.5/keysymdef_include.patch | 21 | ||||
| -rw-r--r-- | recipes/xorg-lib/libx11-1.3.5/x11_disable_makekeys.patch | 29 | ||||
| -rw-r--r-- | recipes/xorg-lib/libx11_1.3.5.bb | 6 |
4 files changed, 78 insertions, 0 deletions
diff --git a/recipes/xorg-lib/libx11-1.3.5/dolt-fix.patch b/recipes/xorg-lib/libx11-1.3.5/dolt-fix.patch new file mode 100644 index 0000000000..7e96075aa3 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.5/dolt-fix.patch @@ -0,0 +1,22 @@ +Index: libX11-1.3.4/m4/dolt.m4 +=================================================================== +--- libX11-1.3.4/m4/dolt.m4 ++++ libX11-1.3.4/m4/dolt.m4 +@@ -155,7 +155,7 @@ dnl without '=', because automake does n + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool + #!$DOLT_BASH + __DOLTLIBTOOL__EOF__ +- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool ++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool + top_builddir_slash="${0%%doltlibtool}" + : ${top_builddir_slash:=./} + args=() +@@ -171,7 +171,7 @@ done + if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" + else +- exec ${top_builddir_slash}libtool "$[]@" ++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@" + fi + __DOLTLIBTOOL__EOF__ + diff --git a/recipes/xorg-lib/libx11-1.3.5/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.5/keysymdef_include.patch new file mode 100644 index 0000000000..0cab165f74 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.5/keysymdef_include.patch @@ -0,0 +1,21 @@ +Index: libX11-1.3.4/configure.ac +=================================================================== +--- libX11-1.3.4.orig/configure.ac ++++ libX11-1.3.4/configure.ac +@@ -355,8 +355,14 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, + # Find keysymdef.h + # + AC_MSG_CHECKING([keysymdef.h]) +-dir=`$PKG_CONFIG --variable=includedir xproto` +-KEYSYMDEF="$dir/X11/keysymdef.h" ++AC_ARG_WITH(keysymdef, ++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), ++ KEYSYMDEF=$withval, KEYSYMDEF="") ++ ++if test x$KEYSYMDEF = x; then ++ dir=`${PKG_CONFIG} --variable=includedir xproto` ++ KEYSYMDEF="$dir/X11/keysymdef.h" ++fi + if test -f "$KEYSYMDEF"; then + AC_MSG_RESULT([$KEYSYMDEF]) + else diff --git a/recipes/xorg-lib/libx11-1.3.5/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.5/x11_disable_makekeys.patch new file mode 100644 index 0000000000..9763313975 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.5/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/recipes/xorg-lib/libx11_1.3.5.bb b/recipes/xorg-lib/libx11_1.3.5.bb new file mode 100644 index 0000000000..8c61aa756d --- /dev/null +++ b/recipes/xorg-lib/libx11_1.3.5.bb @@ -0,0 +1,6 @@ +require libx11.inc +PR = "${INC_PR}.0" + +SRC_URI += " file://dolt-fix.patch" +SRC_URI[archive.md5sum] = "a1175b6667fcb249c6f1d725965944e3" +SRC_URI[archive.sha256sum] = "c95a3e3b5c7d45f933f922bdf6c757640f1c370369e85130bb75a9810dc6ede6" |