From cf062bf45672923083094730515f7d5ce94b58fc Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Fri, 12 Nov 2010 13:04:07 +0800 Subject: xset: upgrade from 1.1.0 to 1.2.1 Signed-off-by: Yu Ke --- meta/conf/distro/include/preferred-xorg-versions.inc | 2 +- .../recipes-graphics/xorg-app/xset/disable-xkb.patch | 20 +++++++++++++------- meta/recipes-graphics/xorg-app/xset_1.1.0.bb | 13 ------------- meta/recipes-graphics/xorg-app/xset_1.2.1.bb | 13 +++++++++++++ 4 files changed, 27 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-app/xset_1.1.0.bb create mode 100644 meta/recipes-graphics/xorg-app/xset_1.2.1.bb (limited to 'meta') diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 2264a4708e..b343fcb7c4 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -130,7 +130,7 @@ PREFERRED_VERSION_xrandr ?= "1.3.2" PREFERRED_VERSION_xrdb ?= "1.0.5" PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2" PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.8.99.904" -PREFERRED_VERSION_xset ?= "1.1.0" +PREFERRED_VERSION_xset ?= "1.2.1" PREFERRED_VERSION_xtrans ?= "1.2.5" PREFERRED_VERSION_xtrans-native ?= "1.2.5" PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.5" diff --git a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch index 6060fbb995..2e728cfe0a 100644 --- a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch +++ b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch @@ -1,18 +1,24 @@ ---- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100 -+++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100 -@@ -42,11 +42,15 @@ +add "-disable-xkb" option + +Rebase for 1.2.1 by: Yu Ke + +diff --git a/configure.ac b/configure.ac +index 81c3ae4..26601bf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext, AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.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(SET_XKB, x11, + PKG_CHECK_MODULES(SET_XKB, x11, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS" AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include ]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) +fi - PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc, - [SAVE_CPPFLAGS="$CPPFLAGS" + AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]), + [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"]) diff --git a/meta/recipes-graphics/xorg-app/xset_1.1.0.bb b/meta/recipes-graphics/xorg-app/xset_1.1.0.bb deleted file mode 100644 index 2d80d3b38f..0000000000 --- a/meta/recipes-graphics/xorg-app/xset_1.1.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "Utility of setting various user preference options of the display" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d" -DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau" -PR = "r0" -PE = "1" - -SRC_URI += "file://disable-xkb.patch" - -CFLAGS += "-D_GNU_SOURCE" -EXTRA_OECONF = "--disable-xkb" diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.1.bb b/meta/recipes-graphics/xorg-app/xset_1.2.1.bb new file mode 100644 index 0000000000..2d80d3b38f --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xset_1.2.1.bb @@ -0,0 +1,13 @@ +require xorg-app-common.inc + +DESCRIPTION = "Utility of setting various user preference options of the display" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d" +DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau" +PR = "r0" +PE = "1" + +SRC_URI += "file://disable-xkb.patch" + +CFLAGS += "-D_GNU_SOURCE" +EXTRA_OECONF = "--disable-xkb" -- cgit 1.2.3-korg