diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-03 09:52:37 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-11 17:04:33 +0100 |
| commit | ccebeb736c785cc6ade075798a1d5c27f106d780 (patch) | |
| tree | d25514f44ebbbbae6776ca6cf3b5e62725d5b323 /meta/recipes-graphics/xorg-lib/libx11-1.3.4 | |
| parent | 10c87f3f695215000c218b0dd0a3652ee97738e7 (diff) | |
| download | openembedded-core-ccebeb736c785cc6ade075798a1d5c27f106d780.tar.gz openembedded-core-ccebeb736c785cc6ade075798a1d5c27f106d780.tar.bz2 openembedded-core-ccebeb736c785cc6ade075798a1d5c27f106d780.tar.xz openembedded-core-ccebeb736c785cc6ade075798a1d5c27f106d780.zip | |
libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4
* because there isn't libx11-1.3.4 recipe anymore
* remove older versions from libx11-trim directory
* notice that DESCRIPTION says xcb is disabled and EXTRA_OECONF has
--with-xcb
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-1.3.4')
4 files changed, 0 insertions, 111 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch deleted file mode 100644 index eeb4175b4..000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- libX11-1.3.4.orig/configure.ac -+++ libX11-1.3.4/configure.ac -@@ -353,9 +353,9 @@ - # - # 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 -f "$KEYSYMDEF"; then - AC_MSG_RESULT([$KEYSYMDEF]) - else diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch deleted file mode 100644 index e5eacf051..000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch +++ /dev/null @@ -1,45 +0,0 @@ -Because the size of "unsigned long" is different between 32-bit -and 64-bit, judge whether target is 32-bit or 64-bit and tell -"makekey". - -Upstream-Status: Pending - -Signed-off-by: dbuitenh@windriver.com - ---- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 -+++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 -@@ -33,6 +33,7 @@ - #include <X11/keysymdef.h> - #include <stdio.h> - #include <stdlib.h> -+#include <stdint.h> - - typedef unsigned long Signature; - -@@ -124,7 +125,12 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif -+ - first = j = sig % z; - for (k = 0; tab[j]; k++) { - j += first + 1; -@@ -163,7 +169,11 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif - first = j = sig % z; - while (offsets[j]) { - j += first + 1; diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch deleted file mode 100644 index bf6c7d59c..000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch +++ /dev/null @@ -1,12 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- libX11-1.3.4.orig/configure.ac -+++ libX11-1.3.4/configure.ac -@@ -32,7 +32,6 @@ - - # Checks for programs. - AC_PROG_LIBTOOL --DOLT - AC_PROG_CC - PKG_PROG_PKG_CONFIG - diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch deleted file mode 100644 index 561b57762..000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - src/util/Makefile.am | 21 ----------------- - 1 file changed, 21 deletions(-) - ---- libX11-1.3.4.orig/src/util/Makefile.am -+++ libX11-1.3.4/src/util/Makefile.am -@@ -1,24 +1,3 @@ - --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 |