xvkbd: bump version

And fix dependencies while we're at it.

Signed-off-by: Paul Jones <paul@pauljones.id.au>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 70ae9d7f4a09af35421690f8219585adf630ce5a..12702a4ecbd649c70d7e32dbde008d6dd9164d95 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,7 @@
        libxcb, mplayer, pciutils, xdriver_xf86-video-openchrome,
        usb_modeswitch, usbutils, wpa_supplicant, xapp_bdftopcf,
        xapp_mkfontdir, xfont_encodings, xlib_libX11, xlib_libXfont,
-       xlib_xtrans, xproto_fontcacheproto, xproto_fontsproto.
+       xlib_xtrans, xproto_fontcacheproto, xproto_fontsproto, xvkbd
 
        Removed packages: vice
 

diff --git a/package/xvkbd/Config.in b/package/xvkbd/Config.in
index 888367a2df529b961e1e4297e6305a9efcf87ba3..8a4b84765b84968658a1f0c8abacbe1fc0e8b4a7 100644 (file)
--- a/package/xvkbd/Config.in
+++ b/package/xvkbd/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_XVKBD
        bool "xvkbd"
        depends on BR2_PACKAGE_XORG7
+       select BR2_PACKAGE_XLIB_LIBXAW
        help
          on-screen keyboard for X
 

diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index 8f0202181eb77c40b3232e14b2edfeaced1e2985..b7da396dbf98264564de32ec65d4c0ca7c7705a5 100644 (file)
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -3,7 +3,7 @@
 # xvkbd
 #
 #############################################################
-XVKBD_VERSION = 2.8
+XVKBD_VERSION = 3.2
 XVKBD_SOURCE = xvkbd-$(XVKBD_VERSION).tar.gz
 XVKBD_SITE = http://homepage3.nifty.com/tsato/xvkbd
 XVKBD_AUTORECONF = NO
@@ -15,7 +15,7 @@ XVKBD_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_CC) \
 
 XVKBD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
-XVKBD_DEPENDENCIES = xserver_xorg-server
+XVKBD_DEPENDENCIES = xserver_xorg-server xlib_libXaw
 
 $(eval $(call AUTOTARGETS,package,xvkbd))