diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-11-29 11:14:11 -0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-11-29 14:48:33 -0800 |
| commit | 30582835b44a474416dcc8b887bfc2bc32e0e3f8 (patch) | |
| tree | 7d35f6cc9998fd04910a2de0ec85a6118650ae21 /meta | |
| parent | e3a8ef74b4ebb8ec131d18960552b52865626d1e (diff) | |
| download | openembedded-core-30582835b44a474416dcc8b887bfc2bc32e0e3f8.tar.gz openembedded-core-30582835b44a474416dcc8b887bfc2bc32e0e3f8.tar.bz2 openembedded-core-30582835b44a474416dcc8b887bfc2bc32e0e3f8.tar.xz openembedded-core-30582835b44a474416dcc8b887bfc2bc32e0e3f8.zip | |
xdpyinfo: Update to 1.3.0
* Rebase patch to update code
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb (renamed from meta/recipes-graphics/xorg-app/xdpyinfo_1.2.0.bb) | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch index b10143df4..1e8199cc6 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" diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.2.0.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb index d975d8295..a118d0d63 100644 --- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.2.0.bb +++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb @@ -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" |