summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-11-29 11:14:11 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-30 15:15:02 +0000
commit7fe0d3583f3bac2afdd3b5f58e9164749faa6167 (patch)
treefb9efe05d91a9e178aded7f43c686f215daa51ff /meta/recipes-graphics
parente9b8a4ce793b6a387832edd30837e06eaaa83adc (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch14
-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 b10143df48..1e8199cc66 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 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3--- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100 3Index: xdpyinfo-1.3.0/configure.ac
4+++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100 4===================================================================
5@@ -45,11 +45,15 @@ 5--- xdpyinfo-1.3.0.orig/configure.ac 2011-10-21 21:34:21.000000000 -0700
6+++ xdpyinfo-1.3.0/configure.ac 2011-11-28 20:06:56.554056935 -0800
7@@ -47,11 +47,15 @@
6 AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>]) 8 AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>])
7 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) 9 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
8 10
9+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), 11+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
10+ XKB="$enableval", XKB="yes") 12+ XKB="$enableval", XKB="yes")
11+if test "x$XKB" = "xyes" ; then 13+if test "x$XKB" = "xyes" ; then
12 PKG_CHECK_MODULES(DPY_XKB, x11, 14 PKG_CHECK_MODULES(DPY_XKB, x11,
13 [SAVE_CPPFLAGS="$CPPFLAGS" 15 [SAVE_CPPFLAGS="$CPPFLAGS"
14 CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS" 16 CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS"
15 AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>]) 17 AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>])
16 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) 18 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
17+fi 19+fi
18 20
19 PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, 21 PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm,
20 [SAVE_CPPFLAGS="$CPPFLAGS" 22 [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 d975d82952..a118d0d635 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"
15 15
16SRC_URI += "file://disable-xkb.patch" 16SRC_URI += "file://disable-xkb.patch"
17 17
18SRC_URI[md5sum] = "c52fda7bbc80e74b7839f29298cb1d77" 18SRC_URI[md5sum] = "1ef08f4c8d0e669c2edd49e4a1bf650d"
19SRC_URI[sha256sum] = "fe5bad498ecfbf21f9a2a18eee5ece9de5d52f68878f250db8f575c9b872b5ce" 19SRC_URI[sha256sum] = "23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f"
20 20
21EXTRA_OECONF = "--disable-xkb" 21EXTRA_OECONF = "--disable-xkb"