diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-11-29 11:14:11 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-30 15:15:02 +0000 |
| commit | 7fe0d3583f3bac2afdd3b5f58e9164749faa6167 (patch) | |
| tree | fb9efe05d91a9e178aded7f43c686f215daa51ff /meta/recipes-graphics/xorg-app/xdpyinfo | |
| parent | e9b8a4ce793b6a387832edd30837e06eaaa83adc (diff) | |
| download | ast2050-yocto-poky-7fe0d3583f3bac2afdd3b5f58e9164749faa6167.zip ast2050-yocto-poky-7fe0d3583f3bac2afdd3b5f58e9164749faa6167.tar.gz | |
xdpyinfo: Update to 1.3.0
* Rebase patch to update code
(From OE-Core rev: 30582835b44a474416dcc8b887bfc2bc32e0e3f8)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-app/xdpyinfo')
| -rw-r--r-- | meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch index b10143d..1e8199c 100644 --- a/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch +++ b/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch @@ -1,20 +1,22 @@ Upstream-Status: Pending ---- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100 -+++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100 -@@ -45,11 +45,15 @@ +Index: xdpyinfo-1.3.0/configure.ac +=================================================================== +--- xdpyinfo-1.3.0.orig/configure.ac 2011-10-21 21:34:21.000000000 -0700 ++++ xdpyinfo-1.3.0/configure.ac 2011-11-28 20:06:56.554056935 -0800 +@@ -47,11 +47,15 @@ AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) +AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), -+ XKB="$enableval", XKB="yes") ++ XKB="$enableval", XKB="yes") +if test "x$XKB" = "xyes" ; then - PKG_CHECK_MODULES(DPY_XKB, x11, + PKG_CHECK_MODULES(DPY_XKB, x11, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS" AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) +fi - PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, + PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, [SAVE_CPPFLAGS="$CPPFLAGS" |
