From 7fe0d3583f3bac2afdd3b5f58e9164749faa6167 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 29 Nov 2011 11:14:11 -0800 Subject: xdpyinfo: Update to 1.3.0 * Rebase patch to update code (From OE-Core rev: 30582835b44a474416dcc8b887bfc2bc32e0e3f8) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../xorg-app/xdpyinfo/disable-xkb.patch | 14 ++++++++------ meta/recipes-graphics/xorg-app/xdpyinfo_1.2.0.bb | 21 --------------------- meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+), 27 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-app/xdpyinfo_1.2.0.bb create mode 100644 meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb (limited to 'meta/recipes-graphics/xorg-app') 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 @@ 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 ]) 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 ]) 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.2.0.bb deleted file mode 100644 index d975d82952..0000000000 --- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.2.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Display information utility for X" - -DESCRIPTION = "Xdpyinfo is a utility for displaying information about an \ -X server. It is used to examine the capabilities of a server, the \ -predefined values for various parameters used in communicating between \ -clients and the server, and the different types of screens and visuals \ -that are available." - -LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" -DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau" -PR = "r0" -PE = "1" - -SRC_URI += "file://disable-xkb.patch" - -SRC_URI[md5sum] = "c52fda7bbc80e74b7839f29298cb1d77" -SRC_URI[sha256sum] = "fe5bad498ecfbf21f9a2a18eee5ece9de5d52f68878f250db8f575c9b872b5ce" - -EXTRA_OECONF = "--disable-xkb" diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb new file mode 100644 index 0000000000..a118d0d635 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb @@ -0,0 +1,21 @@ +require xorg-app-common.inc + +SUMMARY = "Display information utility for X" + +DESCRIPTION = "Xdpyinfo is a utility for displaying information about an \ +X server. It is used to examine the capabilities of a server, the \ +predefined values for various parameters used in communicating between \ +clients and the server, and the different types of screens and visuals \ +that are available." + +LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" +DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau" +PR = "r0" +PE = "1" + +SRC_URI += "file://disable-xkb.patch" + +SRC_URI[md5sum] = "1ef08f4c8d0e669c2edd49e4a1bf650d" +SRC_URI[sha256sum] = "23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f" + +EXTRA_OECONF = "--disable-xkb" -- cgit v1.2.3-54-g00ecf