mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

Bump libX11 to 1.3.2

Browse Source 
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
This commit is contained in:
Paulius Zaleckas
2010-02-28 11:33:42 +02:00
parent dd253742b3
commit 1d956c9190
3 changed files with 2 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/x11r7/xlib_libX11/Config.in
View File

@@ -13,5 +13,5 @@ config BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XPROTO_BIGREQSPROTO select BR2_PACKAGE_XPROTO_BIGREQSPROTO
select BR2_PACKAGE_XPROTO_XCMISCPROTO select BR2_PACKAGE_XPROTO_XCMISCPROTO
help help
libX11 1.1.1 libX11 1.3.2
X.Org X11 library X.Org X11 library

40
package/x11r7/xlib_libX11/xlib_libX11-1.1.5-keysymdef.patch
View File

@@ -1,40 +0,0 @@
[patch]: configure: add --with-keysymdef argument for cross compilation
Based on a similar patch from Openembedded.
The libX11 configure script hardcodes the location to keysymdef.h as
<prefix>/include/X11/keysymdef.h, which is fine for native compilation,
but breaks with cross compilation as that directory is a location on
the target, not the build host.
Fix it by providing an explicit --with-keysymdef=<full-path-to-file>.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>Index: libX11-1.1.5/configure.ac
===================================================================
--- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000
+++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000
@@ -221,13 +221,21 @@
# 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])
+ AC_MSG_RESULT([$KEYSYMDEF])
else
AC_MSG_ERROR([Cannot find keysymdef.h])
fi
+
AC_SUBST(KEYSYMDEF)
AM_CONDITIONAL(UDC, test xfalse = xtrue)

2
package/x11r7/xlib_libX11/xlib_libX11.mk
View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
XLIB_LIBX11_VERSION = 1.1.5 XLIB_LIBX11_VERSION = 1.3.2
XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBX11_AUTORECONF = YES XLIB_LIBX11_AUTORECONF = YES