summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--meta/recipes-graphics/xorg-app/xset/disable-xkb.patch20
-rw-r--r--meta/recipes-graphics/xorg-app/xset_1.2.1.bb (renamed from meta/recipes-graphics/xorg-app/xset_1.1.0.bb)0
3 files changed, 14 insertions, 8 deletions
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"
130PREFERRED_VERSION_xrdb ?= "1.0.5" 130PREFERRED_VERSION_xrdb ?= "1.0.5"
131PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2" 131PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
132PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.8.99.904" 132PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.8.99.904"
133PREFERRED_VERSION_xset ?= "1.1.0" 133PREFERRED_VERSION_xset ?= "1.2.1"
134PREFERRED_VERSION_xtrans ?= "1.2.5" 134PREFERRED_VERSION_xtrans ?= "1.2.5"
135PREFERRED_VERSION_xtrans-native ?= "1.2.5" 135PREFERRED_VERSION_xtrans-native ?= "1.2.5"
136PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.5" 136PREFERRED_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 @@
1--- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100 1add "-disable-xkb" option
2+++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100 2
3@@ -42,11 +42,15 @@ 3Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com>
4
5diff --git a/configure.ac b/configure.ac
6index 81c3ae4..26601bf 100644
7--- a/configure.ac
8+++ b/configure.ac
9@@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext,
4 AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>]) 10 AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
5 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) 11 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
6 12
7+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), 13+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
8+ XKB="$enableval", XKB="yes") 14+ XKB="$enableval", XKB="yes")
9+if test "x$XKB" = "xyes" ; then 15+if test "x$XKB" = "xyes" ; then
10 PKG_CHECK_MODULES(SET_XKB, x11, 16 PKG_CHECK_MODULES(SET_XKB, x11,
11 [SAVE_CPPFLAGS="$CPPFLAGS" 17 [SAVE_CPPFLAGS="$CPPFLAGS"
12 CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS" 18 CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
13 AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>]) 19 AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
14 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) 20 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
15+fi 21+fi
16 22
17 PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc, 23 AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]),
18 [SAVE_CPPFLAGS="$CPPFLAGS" 24 [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.2.1.bb
index 2d80d3b38f..2d80d3b38f 100644
--- a/meta/recipes-graphics/xorg-app/xset_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-app/xset_1.2.1.bb