summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-11 20:18:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 15:13:50 +0100
commitbbe27db677743021f738d3d4868b181f6bcf39c6 (patch)
tree9717634c66ce923593e79cddc5d3a698e64a23ed /meta
parentad02e381e1c0b92a45681572f95aa52a48d32e35 (diff)
downloadpoky-bbe27db677743021f738d3d4868b181f6bcf39c6.tar.gz
libx11-diet: remove un-needed chunk from stubs patch
(From OE-Core rev: 41c1b76c2c1b875bf72331f6b89cf7f5e2bba9f2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff20
1 files changed, 0 insertions, 20 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
index 8cd1870363..9e91a8bbab 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
@@ -519,23 +519,3 @@ Index: libX11-1.3/src/locking.c
519 _XLockMutex_fn = _XLockMutex; 519 _XLockMutex_fn = _XLockMutex;
520 _XUnlockMutex_fn = _XUnlockMutex; 520 _XUnlockMutex_fn = _XUnlockMutex;
521 _XCreateMutex_fn = _XCreateMutex; 521 _XCreateMutex_fn = _XCreateMutex;
522Index: libX11-1.3/configure.ac
523===================================================================
524--- libX11-1.3.orig/configure.ac
525+++ libX11-1.3/configure.ac
526@@ -289,7 +289,14 @@ else
527 fi
528 AC_SUBST(KEYSYMDEF)
529
530-AM_CONDITIONAL(UDC, test xfalse = xtrue)
531+AC_ARG_ENABLE(udc,
532+ AC_HELP_STRING([--disable-udc],
533+ [Disable Xlib support for UDC *EXPERIMENTAL*]),
534+ [UDC=$enableval],[UDC=yes])
535+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
536+if test x"$UDC" = "xyes"; then
537+ AC_DEFINE(UDC,1,[Include support for UDC])
538+fi
539
540 AC_ARG_ENABLE(xcms,
541 AC_HELP_STRING([--disable-xcms],