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>
This commit is contained in:
Saul Wold 2011-11-29 11:14:11 -08:00 committed by Richard Purdie
parent e9b8a4ce79
commit 7fe0d3583f
2 changed files with 10 additions and 8 deletions

View File

@ -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"

View File

@ -15,7 +15,7 @@ PE = "1"
SRC_URI += "file://disable-xkb.patch"
SRC_URI[md5sum] = "c52fda7bbc80e74b7839f29298cb1d77"
SRC_URI[sha256sum] = "fe5bad498ecfbf21f9a2a18eee5ece9de5d52f68878f250db8f575c9b872b5ce"
SRC_URI[md5sum] = "1ef08f4c8d0e669c2edd49e4a1bf650d"
SRC_URI[sha256sum] = "23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f"
EXTRA_OECONF = "--disable-xkb"