summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-app/xdpyinfo
diff options
context:
space:
mode:
authorChris Larson <kergoth@openedhand.com>2006-08-15 11:58:37 +0000
committerChris Larson <kergoth@openedhand.com>2006-08-15 11:58:37 +0000
commitca10363baac7de9581ec90ab47957f973e1dbdc4 (patch)
tree2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/packages/xorg-app/xdpyinfo
parentc210d01a7ca8c00ddc45d292878b89086b137129 (diff)
downloadpoky-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz
Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-app/xdpyinfo')
-rw-r--r--meta/packages/xorg-app/xdpyinfo/disable-xkb.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/meta/packages/xorg-app/xdpyinfo/disable-xkb.patch b/meta/packages/xorg-app/xdpyinfo/disable-xkb.patch
new file mode 100644
index 0000000000..24af21f4fc
--- /dev/null
+++ b/meta/packages/xorg-app/xdpyinfo/disable-xkb.patch
@@ -0,0 +1,18 @@
1--- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100
2+++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100
3@@ -45,11 +45,15 @@
4 AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>])
5 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
6
7+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
8+ XKB="$enableval", XKB="yes")
9+if test "x$XKB" = "xyes" ; then
10 PKG_CHECK_MODULES(DPY_XKB, x11,
11 [SAVE_CPPFLAGS="$CPPFLAGS"
12 CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS"
13 AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>])
14 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
15+fi
16
17 PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm,
18 [SAVE_CPPFLAGS="$CPPFLAGS"