summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2013-03-24 22:46:38 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-03-24 22:46:38 (GMT)
commit035b405414af3c920e6b0f874fa17fdbd2fdb5a2 (patch)
tree39f10ebe3b35f92724613bf22953726e721ea1fb
parentbe8e32d585f38cb5527fa65c53bf23fba025c62c (diff)
parent96182fac06916e642184da40a1b3589d6aa293dd (diff)
downloadbuildroot-035b405414af3c920e6b0f874fa17fdbd2fdb5a2.tar.gz
buildroot-035b405414af3c920e6b0f874fa17fdbd2fdb5a2.tar.bz2
Merge branch 'x11r77_v2' of https://bitbucket.org/baekdahl/buildroot
-rw-r--r--package/libdrm/Config.in1
-rw-r--r--package/libdrm/libdrm.mk3
-rw-r--r--package/x11r7/Config.in12
-rw-r--r--package/x11r7/libxcb/libxcb.mk2
-rw-r--r--package/x11r7/mesa3d/mesa3d.mk2
-rw-r--r--package/x11r7/xapp_iceauth/xapp_iceauth.mk2
-rw-r--r--package/x11r7/xapp_luit/xapp_luit.mk2
-rw-r--r--package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk2
-rw-r--r--package/x11r7/xapp_sessreg/xapp_sessreg.mk2
-rw-r--r--package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk2
-rw-r--r--package/x11r7/xapp_smproxy/xapp_smproxy.mk2
-rw-r--r--package/x11r7/xapp_xauth/xapp_xauth.mk2
-rw-r--r--package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk2
-rw-r--r--package/x11r7/xapp_xdbedizzy/Config.in2
-rw-r--r--package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk2
-rw-r--r--package/x11r7/xapp_xdm/Config.in1
-rw-r--r--package/x11r7/xapp_xdm/xapp_xdm.mk2
-rw-r--r--package/x11r7/xapp_xdpyinfo/Config.in2
-rw-r--r--package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk4
-rw-r--r--package/x11r7/xapp_xedit/Config.in1
-rw-r--r--package/x11r7/xapp_xedit/xapp_xedit.mk2
-rw-r--r--package/x11r7/xapp_xev/xapp_xev.mk2
-rw-r--r--package/x11r7/xapp_xgamma/xapp_xgamma.mk2
-rw-r--r--package/x11r7/xapp_xhost/xapp_xhost.mk2
-rw-r--r--package/x11r7/xapp_xinit/Config.in10
-rw-r--r--package/x11r7/xapp_xinit/xapp_xinit.mk12
-rw-r--r--package/x11r7/xapp_xinput/xapp_xinput.mk2
-rw-r--r--package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk2
-rw-r--r--package/x11r7/xapp_xkbevd/xapp_xkbevd.mk2
-rw-r--r--package/x11r7/xapp_xlogo/Config.in1
-rw-r--r--package/x11r7/xapp_xlogo/xapp_xlogo.mk2
-rw-r--r--package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk2
-rw-r--r--package/x11r7/xapp_xlsclients/xapp_xlsclients.mk2
-rw-r--r--package/x11r7/xapp_xmodmap/xapp_xmodmap.mk2
-rw-r--r--package/x11r7/xapp_xmore/Config.in1
-rw-r--r--package/x11r7/xapp_xmore/xapp_xmore.mk2
-rw-r--r--package/x11r7/xapp_xplsprinters/Config.in7
-rw-r--r--package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk12
-rw-r--r--package/x11r7/xapp_xpr/xapp_xpr.mk2
-rw-r--r--package/x11r7/xapp_xprehashprinterlist/Config.in6
-rw-r--r--package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk12
-rw-r--r--package/x11r7/xapp_xprop/xapp_xprop.mk2
-rw-r--r--package/x11r7/xapp_xrandr/xapp_xrandr.mk2
-rw-r--r--package/x11r7/xapp_xrdb/xapp_xrdb.mk2
-rw-r--r--package/x11r7/xapp_xset/Config.in1
-rw-r--r--package/x11r7/xapp_xset/xapp_xset.mk4
-rw-r--r--package/x11r7/xapp_xwd/xapp_xwd.mk2
-rw-r--r--package/x11r7/xapp_xwininfo/xapp_xwininfo.mk2
-rw-r--r--package/x11r7/xapp_xwud/xapp_xwud.mk2
-rw-r--r--package/x11r7/xcb-proto/xcb-proto.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-evdev/Config.in4
-rw-r--r--package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk4
-rw-r--r--package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-synaptics/Config.in1
-rw-r--r--package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk4
-rw-r--r--package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0001-fix-segfault.patch34
-rw-r--r--package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0002-port-abi-12.patch196
-rw-r--r--package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.1-cross-compile.patch29
-rw-r--r--package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch11
-rw-r--r--package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk2
-rw-r--r--package/x11r7/xfont_font-bitstream-speedo/Config.in4
-rw-r--r--package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk15
-rw-r--r--package/x11r7/xfont_font-util/xfont_font-util.mk2
-rw-r--r--package/x11r7/xkeyboard-config/xkeyboard-config.mk2
-rw-r--r--package/x11r7/xlib_libFS/xlib_libFS.mk2
-rw-r--r--package/x11r7/xlib_libICE/xlib_libICE.mk2
-rw-r--r--package/x11r7/xlib_libSM/xlib_libSM.mk2
-rw-r--r--package/x11r7/xlib_libX11/xlib_libX11.mk2
-rw-r--r--package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk2
-rw-r--r--package/x11r7/xlib_libXau/xlib_libXau.mk2
-rw-r--r--package/x11r7/xlib_libXaw/Config.in1
-rw-r--r--package/x11r7/xlib_libXaw/xlib_libXaw.mk4
-rw-r--r--package/x11r7/xlib_libXcursor/xlib_libXcursor.mk2
-rw-r--r--package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk2
-rw-r--r--package/x11r7/xlib_libXext/xlib_libXext.mk2
-rw-r--r--package/x11r7/xlib_libXfixes/xlib_libXfixes.mk2
-rw-r--r--package/x11r7/xlib_libXfont/Config.in1
-rw-r--r--package/x11r7/xlib_libXfont/xlib_libXfont.mk4
-rw-r--r--package/x11r7/xlib_libXfontcache/Config.in7
-rw-r--r--package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk14
-rw-r--r--package/x11r7/xlib_libXft/xlib_libXft.mk2
-rw-r--r--package/x11r7/xlib_libXi/xlib_libXi.mk2
-rw-r--r--package/x11r7/xlib_libXinerama/xlib_libXinerama.mk2
-rw-r--r--package/x11r7/xlib_libXmu/xlib_libXmu.mk2
-rw-r--r--package/x11r7/xlib_libXp/Config.in8
-rw-r--r--package/x11r7/xlib_libXp/xlib_libXp.mk14
-rw-r--r--package/x11r7/xlib_libXpm/xlib_libXpm.mk2
-rw-r--r--package/x11r7/xlib_libXprintAppUtil/Config.in7
-rw-r--r--package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk13
-rw-r--r--package/x11r7/xlib_libXprintUtil/Config.in8
-rw-r--r--package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk13
-rw-r--r--package/x11r7/xlib_libXrandr/xlib_libXrandr.mk2
-rw-r--r--package/x11r7/xlib_libXres/xlib_libXres.mk2
-rw-r--r--package/x11r7/xlib_libXtst/xlib_libXtst.mk2
-rw-r--r--package/x11r7/xlib_libXv/xlib_libXv.mk2
-rw-r--r--package/x11r7/xlib_libXvMC/xlib_libXvMC.mk2
-rw-r--r--package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0001-fix-compilation.patch27
-rw-r--r--package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0002-fix-compilation.patch28
-rw-r--r--package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk2
-rw-r--r--package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk2
-rw-r--r--package/x11r7/xlib_libdmx/xlib_libdmx.mk2
-rw-r--r--package/x11r7/xlib_libfontenc/xlib_libfontenc.mk2
-rw-r--r--package/x11r7/xlib_liboldX/Config.in5
-rw-r--r--package/x11r7/xlib_liboldX/xlib_liboldX.mk14
-rw-r--r--package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk2
-rw-r--r--package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk2
-rw-r--r--package/x11r7/xlib_libxkbui/Config.in7
-rw-r--r--package/x11r7/xlib_libxkbui/xlib_libxkbui.mk13
-rw-r--r--package/x11r7/xlib_xtrans/xlib_xtrans.mk2
-rw-r--r--package/x11r7/xproto_applewmproto/xproto_applewmproto.mk2
-rw-r--r--package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk2
-rw-r--r--package/x11r7/xproto_dri2proto/xproto_dri2proto.mk2
-rw-r--r--package/x11r7/xproto_fontsproto/xproto_fontsproto.mk2
-rw-r--r--package/x11r7/xproto_glproto/xproto_glproto.mk2
-rw-r--r--package/x11r7/xproto_inputproto/xproto_inputproto.mk2
-rw-r--r--package/x11r7/xproto_kbproto/xproto_kbproto.mk2
-rw-r--r--package/x11r7/xproto_printproto/Config.in4
-rw-r--r--package/x11r7/xproto_printproto/xproto_printproto.mk13
-rw-r--r--package/x11r7/xproto_recordproto/xproto_recordproto.mk2
-rw-r--r--package/x11r7/xproto_resourceproto/xproto_resourceproto.mk2
-rw-r--r--package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk2
-rw-r--r--package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk2
-rw-r--r--package/x11r7/xproto_xextproto/xproto_xextproto.mk2
-rw-r--r--package/x11r7/xproto_xf86rushproto/Config.in4
-rw-r--r--package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk13
-rw-r--r--package/x11r7/xproto_xproto/xproto_xproto.mk2
-rw-r--r--package/x11r7/xserver_xorg-server/Config.in1
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk3
-rw-r--r--package/x11r7/xutil_makedepend/xutil_makedepend.mk2
156 files changed, 410 insertions, 418 deletions
diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index f1c3358..8bf676b 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
select BR2_PACKAGE_XLIB_LIBXXF86VM
select BR2_PACKAGE_XLIB_LIBXMU
+ select BR2_PACKAGE_XLIB_LIBPCIACCESS
select BR2_PACKAGE_XPROTO_DRI2PROTO
select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
# libatomic_ops is only available on a subset of the supported
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index 4ccfa52..5dd276f 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -3,7 +3,7 @@
# libdrm
#
#############################################################
-LIBDRM_VERSION = 2.4.23
+LIBDRM_VERSION = 2.4.38
LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
LIBDRM_SITE = http://dri.freedesktop.org/libdrm/
LIBDRM_INSTALL_STAGING = YES
@@ -13,6 +13,7 @@ LIBDRM_DEPENDENCIES = \
xproto_xf86vidmodeproto \
xlib_libXxf86vm \
xlib_libXmu \
+ xlib_libpciaccess \
xproto_dri2proto \
xlib_libpthread-stubs \
host-pkgconf
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 7b32ac7..971ef37 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -32,15 +32,11 @@ if BR2_PACKAGE_XORG7
source package/x11r7/xlib_libXext/Config.in
source package/x11r7/xlib_libXfixes/Config.in
source package/x11r7/xlib_libXfont/Config.in
- source package/x11r7/xlib_libXfontcache/Config.in
source package/x11r7/xlib_libXft/Config.in
source package/x11r7/xlib_libXi/Config.in
source package/x11r7/xlib_libXinerama/Config.in
source package/x11r7/xlib_libXmu/Config.in
- source package/x11r7/xlib_libXp/Config.in
source package/x11r7/xlib_libXpm/Config.in
- source package/x11r7/xlib_libXprintAppUtil/Config.in
- source package/x11r7/xlib_libXprintUtil/Config.in
source package/x11r7/xlib_libXrandr/Config.in
source package/x11r7/xlib_libXrender/Config.in
source package/x11r7/xlib_libXres/Config.in
@@ -52,9 +48,7 @@ if BR2_PACKAGE_XORG7
source package/x11r7/xlib_libXxf86vm/Config.in
source package/x11r7/xlib_libdmx/Config.in
source package/x11r7/xlib_libfontenc/Config.in
- source package/x11r7/xlib_liboldX/Config.in
source package/x11r7/xlib_libxkbfile/Config.in
- source package/x11r7/xlib_libxkbui/Config.in
source package/x11r7/xlib_xtrans/Config.in
source package/x11r7/xlib_libpciaccess/Config.in
source package/x11r7/xlib_libpthread-stubs/Config.in
@@ -109,7 +103,6 @@ if BR2_PACKAGE_XORG7
source package/x11r7/xapp_xgamma/Config.in
source package/x11r7/xapp_xgc/Config.in
source package/x11r7/xapp_xhost/Config.in
- source package/x11r7/xapp_xinit/Config.in
source package/x11r7/xapp_xinput/Config.in
source package/x11r7/xapp_xinput-calibrator/Config.in
source package/x11r7/xapp_xkbcomp/Config.in
@@ -128,9 +121,7 @@ if BR2_PACKAGE_XORG7
source package/x11r7/xapp_xmh/Config.in
source package/x11r7/xapp_xmodmap/Config.in
source package/x11r7/xapp_xmore/Config.in
- source package/x11r7/xapp_xplsprinters/Config.in
source package/x11r7/xapp_xpr/Config.in
- source package/x11r7/xapp_xprehashprinterlist/Config.in
source package/x11r7/xapp_xprop/Config.in
source package/x11r7/xapp_xrandr/Config.in
source package/x11r7/xapp_xrdb/Config.in
@@ -206,7 +197,6 @@ if BR2_PACKAGE_XORG7
source package/x11r7/xfont_font-bh-type1/Config.in
source package/x11r7/xfont_font-bitstream-100dpi/Config.in
source package/x11r7/xfont_font-bitstream-75dpi/Config.in
- source package/x11r7/xfont_font-bitstream-speedo/Config.in
source package/x11r7/xfont_font-bitstream-type1/Config.in
source package/x11r7/xfont_font-cronyx-cyrillic/Config.in
source package/x11r7/xfont_font-cursor-misc/Config.in
@@ -242,7 +232,6 @@ if BR2_PACKAGE_XORG7
source package/x11r7/xproto_glproto/Config.in
source package/x11r7/xproto_inputproto/Config.in
source package/x11r7/xproto_kbproto/Config.in
- source package/x11r7/xproto_printproto/Config.in
source package/x11r7/xproto_randrproto/Config.in
source package/x11r7/xproto_recordproto/Config.in
source package/x11r7/xproto_renderproto/Config.in
@@ -255,7 +244,6 @@ if BR2_PACKAGE_XORG7
source package/x11r7/xproto_xf86bigfontproto/Config.in
source package/x11r7/xproto_xf86dgaproto/Config.in
source package/x11r7/xproto_xf86driproto/Config.in
- source package/x11r7/xproto_xf86rushproto/Config.in
source package/x11r7/xproto_xf86vidmodeproto/Config.in
source package/x11r7/xproto_xineramaproto/Config.in
source package/x11r7/xproto_xproto/Config.in
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 15eeeef..0999dc4 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -3,7 +3,7 @@
# libxcb
#
#############################################################
-LIBXCB_VERSION = 1.7
+LIBXCB_VERSION = 1.8.1
LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2
LIBXCB_SITE = http://xcb.freedesktop.org/dist/
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index b16d5e6..7b7f5b4 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -4,7 +4,7 @@
#
#############################################################
-MESA3D_VERSION = 7.10.1
+MESA3D_VERSION = 7.10.3
MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
MESA3D_AUTORECONF = YES
diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
index 569f053..a42e5bd 100644
--- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk
+++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_ICEAUTH_VERSION = 1.0.4
+XAPP_ICEAUTH_VERSION = 1.0.5
XAPP_ICEAUTH_SOURCE = iceauth-$(XAPP_ICEAUTH_VERSION).tar.bz2
XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_ICEAUTH_DEPENDENCIES = xlib_libICE xlib_libX11
diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk
index 7a0ab35..ddb7883 100644
--- a/package/x11r7/xapp_luit/xapp_luit.mk
+++ b/package/x11r7/xapp_luit/xapp_luit.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_LUIT_VERSION = 1.1.0
+XAPP_LUIT_VERSION = 1.1.1
XAPP_LUIT_SOURCE = luit-$(XAPP_LUIT_VERSION).tar.bz2
XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_LUIT_DEPENDENCIES = xlib_libX11 xlib_libfontenc
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index 9915549..2f299a6 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_MKFONTSCALE_VERSION = 1.0.8
+XAPP_MKFONTSCALE_VERSION = 1.1.0
XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index 6b0fbde..6f7fd88 100644
--- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_SESSREG_VERSION = 1.0.6
+XAPP_SESSREG_VERSION = 1.0.7
XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2
XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto
diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
index ef28f1c..1f1e5d3 100644
--- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
+++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_SETXKBMAP_VERSION = 1.2.0
+XAPP_SETXKBMAP_VERSION = 1.3.0
XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.bz2
XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
index 2653cf4..11c470d 100644
--- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk
+++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_SMPROXY_VERSION = 1.0.4
+XAPP_SMPROXY_VERSION = 1.0.5
XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.bz2
XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt
diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk
index d075c05..a34ec00 100644
--- a/package/x11r7/xapp_xauth/xapp_xauth.mk
+++ b/package/x11r7/xapp_xauth/xapp_xauth.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XAUTH_VERSION = 1.0.5
+XAPP_XAUTH_VERSION = 1.0.7
XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2
XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XAUTH_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu
diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
index 64fe99f..7b513a8 100644
--- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
+++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XCMSDB_VERSION = 1.0.3
+XAPP_XCMSDB_VERSION = 1.0.4
XAPP_XCMSDB_SOURCE = xcmsdb-$(XAPP_XCMSDB_VERSION).tar.bz2
XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCMSDB_DEPENDENCIES = xlib_libX11
diff --git a/package/x11r7/xapp_xdbedizzy/Config.in b/package/x11r7/xapp_xdbedizzy/Config.in
index 5cba398..e4a5960 100644
--- a/package/x11r7/xapp_xdbedizzy/Config.in
+++ b/package/x11r7/xapp_xdbedizzy/Config.in
@@ -1,7 +1,5 @@
config BR2_PACKAGE_XAPP_XDBEDIZZY
bool "xdbedizzy"
select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XLIB_LIBXP
- select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
help
X.Org xdbedizzy application
diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
index bab2151..f5925fc 100644
--- a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
+++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
@@ -7,6 +7,6 @@
XAPP_XDBEDIZZY_VERSION = 1.0.2
XAPP_XDBEDIZZY_SOURCE = xdbedizzy-$(XAPP_XDBEDIZZY_VERSION).tar.bz2
XAPP_XDBEDIZZY_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext xlib_libXp xlib_libXprintUtil
+XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xdm/Config.in b/package/x11r7/xapp_xdm/Config.in
index c962993..477cd77 100644
--- a/package/x11r7/xapp_xdm/Config.in
+++ b/package/x11r7/xapp_xdm/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_XAPP_XDM
bool "xdm"
# Runtime dependency: can't start an X server unless there is one
depends on BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XAPP_XINIT
select BR2_PACKAGE_XAPP_SESSREG
select BR2_PACKAGE_XAPP_XRDB
select BR2_PACKAGE_XLIB_LIBX11
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index 16b6aa9..1c74708 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -8,7 +8,7 @@ XAPP_XDM_VERSION = 1.1.11
XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2
XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
-XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
+XAPP_XDM_DEPENDENCIES = xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
XAPP_XDM_CONF_OPT = --with-utmp-file=/var/adm/utmpx \
--with-wtmp-file=/var/adm/wtmpx
diff --git a/package/x11r7/xapp_xdpyinfo/Config.in b/package/x11r7/xapp_xdpyinfo/Config.in
index e6ff686..261a63f 100644
--- a/package/x11r7/xapp_xdpyinfo/Config.in
+++ b/package/x11r7/xapp_xdpyinfo/Config.in
@@ -3,14 +3,12 @@ config BR2_PACKAGE_XAPP_XDPYINFO
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXI
- select BR2_PACKAGE_XLIB_LIBXP
select BR2_PACKAGE_XLIB_LIBXRENDER
select BR2_PACKAGE_XLIB_LIBXTST
select BR2_PACKAGE_XLIB_LIBXXF86DGA
select BR2_PACKAGE_XLIB_LIBXXF86VM
select BR2_PACKAGE_XPROTO_INPUTPROTO
select BR2_PACKAGE_XPROTO_KBPROTO
- select BR2_PACKAGE_XPROTO_PRINTPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO
select BR2_PACKAGE_XPROTO_XF86DGAPROTO
select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index fea4fb0..0b724de 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -4,9 +4,9 @@
#
################################################################################
-XAPP_XDPYINFO_VERSION = 1.2.0
+XAPP_XDPYINFO_VERSION = 1.3.0
XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2
XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx
+XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xedit/Config.in b/package/x11r7/xapp_xedit/Config.in
index 98e230d..5a70459 100644
--- a/package/x11r7/xapp_xedit/Config.in
+++ b/package/x11r7/xapp_xedit/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_XAPP_XEDIT
bool "xedit"
select BR2_PACKAGE_XLIB_LIBXAW
- select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
help
simple text editor for X
diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk
index f69d122..3e26f36 100644
--- a/package/x11r7/xapp_xedit/xapp_xedit.mk
+++ b/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -7,6 +7,6 @@
XAPP_XEDIT_VERSION = 1.2.0
XAPP_XEDIT_SOURCE = xedit-$(XAPP_XEDIT_VERSION).tar.bz2
XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XEDIT_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil
+XAPP_XEDIT_DEPENDENCIES = xlib_libXaw
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
index c246be5..bf4cd30 100644
--- a/package/x11r7/xapp_xev/xapp_xev.mk
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XEV_VERSION = 1.1.0
+XAPP_XEV_VERSION = 1.2.0
XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2
XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XEV_DEPENDENCIES = xlib_libX11
diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
index b755c85..6e2197d 100644
--- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk
+++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XGAMMA_VERSION = 1.0.4
+XAPP_XGAMMA_VERSION = 1.0.5
XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.bz2
XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm
diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk
index 874bf5e..2b72d81 100644
--- a/package/x11r7/xapp_xhost/xapp_xhost.mk
+++ b/package/x11r7/xapp_xhost/xapp_xhost.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XHOST_VERSION = 1.0.4
+XAPP_XHOST_VERSION = 1.0.5
XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2
XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu
diff --git a/package/x11r7/xapp_xinit/Config.in b/package/x11r7/xapp_xinit/Config.in
deleted file mode 100644
index aede5d9..0000000
--- a/package/x11r7/xapp_xinit/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_XAPP_XINIT
- bool "xinit"
- # Runtime dependency: can't start an X server unless there is one
- depends on BR2_PACKAGE_XSERVER_XORG_SERVER
- # Runtime dependency; mcookie is also in util-linux
- select BR2_PACKAGE_MCOOKIE if !BR2_PACKAGE_UTIL_LINUX
- select BR2_PACKAGE_XAPP_XAUTH
- select BR2_PACKAGE_XLIB_LIBX11
- help
- X Window System initializer
diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk
deleted file mode 100644
index fc9218d..0000000
--- a/package/x11r7/xapp_xinit/xapp_xinit.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xapp_xinit -- X Window System initializer
-#
-################################################################################
-
-XAPP_XINIT_VERSION = 1.3.2
-XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2
-XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk
index 022deec..0eaa50c 100644
--- a/package/x11r7/xapp_xinput/xapp_xinput.mk
+++ b/package/x11r7/xapp_xinput/xapp_xinput.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XINPUT_VERSION = 1.5.4
+XAPP_XINPUT_VERSION = 1.6.0
XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2
XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi
diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index 5bfb01b..095c047 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XKBCOMP_VERSION = 1.2.0
+XAPP_XKBCOMP_VERSION = 1.2.4
XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
index 0e93b48..6327b20 100644
--- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
+++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XKBEVD_VERSION = 1.1.2
+XAPP_XKBEVD_VERSION = 1.1.3
XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.bz2
XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile
diff --git a/package/x11r7/xapp_xlogo/Config.in b/package/x11r7/xapp_xlogo/Config.in
index 04f779d..aacb75f 100644
--- a/package/x11r7/xapp_xlogo/Config.in
+++ b/package/x11r7/xapp_xlogo/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_XAPP_XLOGO
bool "xlogo"
select BR2_PACKAGE_XLIB_LIBXAW
- select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
select BR2_PACKAGE_XLIB_LIBXRENDER
select BR2_PACKAGE_XLIB_LIBXFT
help
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index 674b943..73de828 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -7,7 +7,7 @@
XAPP_XLOGO_VERSION = 1.0.4
XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2
XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender \
+XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXrender \
xlib_libXft host-pkgconf
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
index 1863ca6..c10f5c2 100644
--- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
+++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XLSATOMS_VERSION = 1.1.0
+XAPP_XLSATOMS_VERSION = 1.1.1
XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2
XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu
diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
index 259fab5..c8bf930 100644
--- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XLSCLIENTS_VERSION = 1.1.1
+XAPP_XLSCLIENTS_VERSION = 1.1.2
XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2
XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu libxcb xcb-util
diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
index 4fa06cd..a1a1882 100644
--- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XMODMAP_VERSION = 1.0.5
+XAPP_XMODMAP_VERSION = 1.0.7
XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2
XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMODMAP_DEPENDENCIES = xlib_libX11
diff --git a/package/x11r7/xapp_xmore/Config.in b/package/x11r7/xapp_xmore/Config.in
index 23fd147..80c3950 100644
--- a/package/x11r7/xapp_xmore/Config.in
+++ b/package/x11r7/xapp_xmore/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_XAPP_XMORE
bool "xmore"
- select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
select BR2_PACKAGE_XLIB_LIBXAW
help
plain text display program for the X Window System
diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk
index c77c3dd..e5c54b0 100644
--- a/package/x11r7/xapp_xmore/xapp_xmore.mk
+++ b/package/x11r7/xapp_xmore/xapp_xmore.mk
@@ -7,6 +7,6 @@
XAPP_XMORE_VERSION = 1.0.1
XAPP_XMORE_SOURCE = xmore-$(XAPP_XMORE_VERSION).tar.bz2
XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XMORE_DEPENDENCIES = xlib_libXprintUtil xlib_libXaw
+XAPP_XMORE_DEPENDENCIES = xlib_libXaw
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xplsprinters/Config.in b/package/x11r7/xapp_xplsprinters/Config.in
deleted file mode 100644
index 16a139b..0000000
--- a/package/x11r7/xapp_xplsprinters/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_XAPP_XPLSPRINTERS
- bool "xplsprinters"
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXP
- select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
- help
- shows a list of Xprint printers and it's attributes
diff --git a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
deleted file mode 100644
index 4d2c697..0000000
--- a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xapp_xplsprinters -- shows a list of Xprint printers and it's attributes
-#
-################################################################################
-
-XAPP_XPLSPRINTERS_VERSION = 1.0.1
-XAPP_XPLSPRINTERS_SOURCE = xplsprinters-$(XAPP_XPLSPRINTERS_VERSION).tar.bz2
-XAPP_XPLSPRINTERS_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XPLSPRINTERS_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk
index e2c944f..c1220dc 100644
--- a/package/x11r7/xapp_xpr/xapp_xpr.mk
+++ b/package/x11r7/xapp_xpr/xapp_xpr.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XPR_VERSION = 1.0.3
+XAPP_XPR_VERSION = 1.0.4
XAPP_XPR_SOURCE = xpr-$(XAPP_XPR_VERSION).tar.bz2
XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XPR_DEPENDENCIES = xlib_libX11 xlib_libXmu
diff --git a/package/x11r7/xapp_xprehashprinterlist/Config.in b/package/x11r7/xapp_xprehashprinterlist/Config.in
deleted file mode 100644
index 056fdb6..0000000
--- a/package/x11r7/xapp_xprehashprinterlist/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_XAPP_XPREHASHPRINTERLIST
- bool "xprehashprinterlist"
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXP
- help
- Recomputes the list of available printers.
diff --git a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
deleted file mode 100644
index 5ae32d2..0000000
--- a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# xapp_xprehashprinterlist -- Recomputes the list of available printers.
-#
-################################################################################
-
-XAPP_XPREHASHPRINTERLIST_VERSION = 1.0.1
-XAPP_XPREHASHPRINTERLIST_SOURCE = xprehashprinterlist-$(XAPP_XPREHASHPRINTERLIST_VERSION).tar.bz2
-XAPP_XPREHASHPRINTERLIST_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XPREHASHPRINTERLIST_DEPENDENCIES = xlib_libX11 xlib_libXp
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk
index 65e55d7..d442ce9 100644
--- a/package/x11r7/xapp_xprop/xapp_xprop.mk
+++ b/package/x11r7/xapp_xprop/xapp_xprop.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XPROP_VERSION = 1.2.0
+XAPP_XPROP_VERSION = 1.2.1
XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2
XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu
diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
index 5a1b363..07c4c59 100644
--- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XRANDR_VERSION = 1.3.4
+XAPP_XRANDR_VERSION = 1.3.5
XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.bz2
XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11
diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
index f6e5e51..60908c7 100644
--- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk
+++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XRDB_VERSION = 1.0.7
+XAPP_XRDB_VERSION = 1.0.9
XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2
XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu
diff --git a/package/x11r7/xapp_xset/Config.in b/package/x11r7/xapp_xset/Config.in
index ff697e5..71497ab 100644
--- a/package/x11r7/xapp_xset/Config.in
+++ b/package/x11r7/xapp_xset/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_XAPP_XSET
bool "xset"
- select BR2_PACKAGE_XLIB_LIBXFONTCACHE
select BR2_PACKAGE_XLIB_LIBXMU
help
X.Org xset application
diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk
index 088cebc..afa6b53 100644
--- a/package/x11r7/xapp_xset/xapp_xset.mk
+++ b/package/x11r7/xapp_xset/xapp_xset.mk
@@ -4,9 +4,9 @@
#
################################################################################
-XAPP_XSET_VERSION = 1.2.1
+XAPP_XSET_VERSION = 1.2.2
XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2
XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app
-XAPP_XSET_DEPENDENCIES = xlib_libXfontcache xlib_libXmu
+XAPP_XSET_DEPENDENCIES = xlib_libXmu
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk
index 94ae800..17ad452 100644
--- a/package/x11r7/xapp_xwd/xapp_xwd.mk
+++ b/package/x11r7/xapp_xwd/xapp_xwd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XWD_VERSION = 1.0.4
+XAPP_XWD_VERSION = 1.0.5
XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2
XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu
diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
index e7f0e03..b9f5f67 100644
--- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
+++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XWININFO_VERSION = 1.1.1
+XAPP_XWININFO_VERSION = 1.1.2
XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2
XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu
diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk
index cbe229f..acf5cca 100644
--- a/package/x11r7/xapp_xwud/xapp_xwud.mk
+++ b/package/x11r7/xapp_xwud/xapp_xwud.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XWUD_VERSION = 1.0.3
+XAPP_XWUD_VERSION = 1.0.4
XAPP_XWUD_SOURCE = xwud-$(XAPP_XWUD_VERSION).tar.bz2
XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XWUD_DEPENDENCIES = xlib_libX11
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index 18ca6f6..e76f829 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -3,7 +3,7 @@
# xcb-proto
#
#############################################################
-XCB_PROTO_VERSION = 1.6
+XCB_PROTO_VERSION = 1.7.1
XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.bz2
XCB_PROTO_SITE = http://xcb.freedesktop.org/dist/
diff --git a/package/x11r7/xdriver_xf86-input-evdev/Config.in b/package/x11r7/xdriver_xf86-input-evdev/Config.in
index 798fffc..cc159c9 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/Config.in
+++ b/package/x11r7/xdriver_xf86-input-evdev/Config.in
@@ -1,7 +1,11 @@
config BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV
bool "xf86-input-evdev"
+ depends on BR2_PACKAGE_UDEV # libudev is configure dependency
select BR2_PACKAGE_XPROTO_INPUTPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_XPROTO
help
Generic Linux input driver
+
+comment "xf86-input-evdev requires udev to be enabled"
+ depends on !BR2_PACKAGE_UDEV
diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
index 1f69388..aca0373 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -4,9 +4,9 @@
#
################################################################################
-XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.5.0
+XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.7.0
XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VERSION).tar.bz2
XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto udev
$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index e4b2324..e76ff9c 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.5.0
+XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.1
XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2
XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
index 2035e1f..5834b51 100644
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.5.0
+XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.6.1
XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2
XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
index 39f5396..4d670bd 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.6.0
+XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.7.2
XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2
XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-input-synaptics/Config.in b/package/x11r7/xdriver_xf86-input-synaptics/Config.in
index 9c214b7..6b5e5b6 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/Config.in
+++ b/package/x11r7/xdriver_xf86-input-synaptics/Config.in
@@ -3,5 +3,6 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_SYNAPTICS
select BR2_PACKAGE_XPROTO_INPUTPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_MTDEV
help
X.Org driver for synaptics input devices
diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
index e66acb5..74a3f86 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
@@ -4,9 +4,9 @@
#
################################################################################
-XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.3.0
+XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.6.1
XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.bz2
XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto mtdev
$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0001-fix-segfault.patch b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0001-fix-segfault.patch
new file mode 100644
index 0000000..adef18b
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0001-fix-segfault.patch
@@ -0,0 +1,34 @@
+Fetch from: https://launchpad.net/ubuntu/+archive/primary/+files/xf86-input-tslib_0.0.6-7build3.debian.tar.gz
+
+Signed-off-by: Jesper Baekdahl <jbb@gamblify.com>
+---
+--- xf86-input-tslib-0.0.6/src/tslib.c 2009-10-19 18:07:18.000000000 +0300
++++ xf86-input-tslib-0.0.6.new/src/tslib.c 2010-02-12 16:15:05.000000000 +0200
+@@ -103,8 +103,6 @@
+ static void
+ PointerControlProc(DeviceIntPtr dev, PtrCtrl * ctrl)
+ {
+- ErrorF("%s\n", __FUNCTION__);
+- return;
+ }
+
+ static Bool
+@@ -406,7 +404,9 @@
+ xf86MotionHistoryAllocate(pInfo);
+ #endif
+
+- break;
++ if (!InitPtrFeedbackClassDeviceStruct(device, PointerControlProc))
++ return !Success;
++ break;
+
+ case DEVICE_ON:
+ AddEnabledDevice(pInfo->fd);
+@@ -435,6 +435,7 @@
+ xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
+ ts_close(priv->ts);
+ xfree(pInfo->private);
++ pInfo->private = NULL;
+ xf86DeleteInput(pInfo, 0);
+ }
+
diff --git a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0002-port-abi-12.patch b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0002-port-abi-12.patch
new file mode 100644
index 0000000..eb8fb54
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib-0002-port-abi-12.patch
@@ -0,0 +1,196 @@
+Fetch from: https://launchpad.net/ubuntu/+archive/primary/+files/xf86-input-tslib_0.0.6-7build3.debian.tar.gz
+Fixes build against newer versions of xorg.
+
+Signed-off-by: Jesper Baekdahl <jbb@gamblify.com>
+---
+Index: xf86-input-tslib-trunk/src/tslib.c
+===================================================================
+--- xf86-input-tslib-trunk/src/tslib.c (revision 48)
++++ xf86-input-tslib-trunk/src/tslib.c (working copy)
+@@ -69,6 +69,13 @@
+ #define DEFAULT_HEIGHT 240
+ #define DEFAULT_WIDTH 320
+
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
++#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options), NULL)
++#else
++#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options))
++#endif
++
++
+ enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 };
+
+ enum button_state { BUTTON_NOT_PRESSED = 0, BUTTON_1_PRESSED = 1, BUTTON_3_CLICK = 3, BUTTON_3_CLICKED=4, BUTTON_EMULATION_OFF=-1 };
+@@ -106,7 +113,7 @@
+ }
+
+ static Bool
+-ConvertProc( LocalDevicePtr local,
++ConvertProc( InputInfoPtr local,
+ int first,
+ int num,
+ int v0,
+@@ -135,7 +142,7 @@
+ return t;
+ }
+
+-static void ReadInput (LocalDevicePtr local)
++static void ReadInput (InputInfoPtr local)
+ {
+ struct ts_priv *priv = (struct ts_priv *) (local->private);
+ struct ts_sample samp;
+@@ -382,7 +389,11 @@
+ axiswidth - 1, /* max val */
+ axiswidth, /* resolution */
+ 0, /* min_res */
+- axiswidth); /* max_res */
++ axiswidth /* max_res */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++ ,Absolute
++#endif
++ );
+
+ InitValuatorAxisStruct(device, 1,
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+@@ -392,7 +403,11 @@
+ axisheight - 1, /* max val */
+ axisheight, /* resolution */
+ 0, /* min_res */
+- axisheight); /* max_res */
++ axisheight /* max_res */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++ ,Absolute
++#endif
++ );
+
+ if (InitProximityClassDeviceStruct (device) == FALSE) {
+ ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n");
+@@ -434,7 +449,7 @@
+ ErrorF("%s\n", __FUNCTION__);
+ xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
+ ts_close(priv->ts);
+- xfree(pInfo->private);
++ free(pInfo->private);
+ pInfo->private = NULL;
+ xf86DeleteInput(pInfo, 0);
+ }
+@@ -444,47 +459,57 @@
+ *
+ * called when the module subsection is found in XF86Config
+ */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++static int
++xf86TslibInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
++#else
+ static InputInfoPtr
+ xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
++#endif
+ {
+ struct ts_priv *priv;
+ char *s;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ InputInfoPtr pInfo;
++#endif
+
+- priv = xcalloc (1, sizeof (struct ts_priv));
++ priv = calloc (1, sizeof (struct ts_priv));
+ if (!priv)
+- return NULL;
++ return BadValue;
+
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ if (!(pInfo = xf86AllocateInput(drv, 0))) {
+- xfree(priv);
+- return NULL;
++ free(priv);
++ return BadValue;
+ }
+
+ /* Initialise the InputInfoRec. */
+ pInfo->name = dev->identifier;
+- pInfo->type_name = XI_TOUCHSCREEN;
+ pInfo->flags =
+ XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE |
+ XI86_SEND_DRAG_EVENTS;
+- pInfo->device_control = xf86TslibControlProc;
+- pInfo->read_input = ReadInput;
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+ pInfo->motion_history_proc = xf86GetMotionEvents;
+ pInfo->history_size = 0;
+ #endif
+- pInfo->control_proc = NULL;
++ pInfo->conf_idev = dev;
+ pInfo->close_proc = NULL;
+- pInfo->switch_mode = NULL;
+ pInfo->conversion_proc = ConvertProc;
+ pInfo->reverse_conversion_proc = NULL;
+- pInfo->dev = NULL;
+ pInfo->private_flags = 0;
+ pInfo->always_core_feedback = 0;
+- pInfo->conf_idev = dev;
++#endif
++
++ pInfo->type_name = XI_TOUCHSCREEN;
++ pInfo->control_proc = NULL;
++ pInfo->read_input = ReadInput;
++ pInfo->device_control = xf86TslibControlProc;
++ pInfo->switch_mode = NULL;
+ pInfo->private = priv;
++ pInfo->dev = NULL;
+
+ /* Collect the options, and process the common options. */
+- xf86CollectInputOptions(pInfo, NULL, NULL);
++ COLLECT_INPUT_OPTIONS(pInfo, NULL);
+ xf86ProcessCommonOptions(pInfo, pInfo->options);
+
+ priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 );
+@@ -510,23 +535,31 @@
+ priv->rotate = TSLIB_ROTATE_NONE;
+ }
+
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ s = xf86CheckStrOption(dev->commonOptions, "path", NULL);
++#else
++ s = xf86CheckStrOption(pInfo->options, "path", NULL);
++#endif
+ if (!s)
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ s = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
++#else
++ s = xf86CheckStrOption(pInfo->options, "Device", NULL);
++#endif
+
+ priv->ts = ts_open(s, 1);
+- xfree(s);
++ free(s);
+
+ if (!priv->ts) {
+ ErrorF("ts_open failed (device=%s)\n",s);
+ xf86DeleteInput(pInfo, 0);
+- return NULL;
++ return BadValue;
+ }
+
+ if (ts_config(priv->ts)) {
+ ErrorF("ts_config failed\n");
+ xf86DeleteInput(pInfo, 0);
+- return NULL;
++ return BadValue;
+ }
+
+ pInfo->fd = ts_fd(priv->ts);
+@@ -536,11 +569,13 @@
+ priv->state = BUTTON_EMULATION_OFF;
+ }
+
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ /* Mark the device configured */
+ pInfo->flags |= XI86_CONFIGURED;
++#endif
+
+ /* Return the configured device */
+- return (pInfo);
++ return Success;
+ }
+
+ _X_EXPORT InputDriverRec TSLIB = {
diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
index c54b2aa..024ec01 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.6.10
+XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.8.0
XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2
XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
index 191467d..c1a8beb 100644
--- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_INPUT_VOID_VERSION = 1.3.1
+XDRIVER_XF86_INPUT_VOID_VERSION = 1.4.0
XDRIVER_XF86_INPUT_VOID_SOURCE = xf86-input-void-$(XDRIVER_XF86_INPUT_VOID_VERSION).tar.bz2
XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_INPUT_VOID_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
index d3b3bd7..739a4d5 100644
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.3
+XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.4
XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
index b106735..6940a20 100644
--- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
+++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_AST_VERSION = 0.91.10
+XDRIVER_XF86_VIDEO_AST_VERSION = 0.93.10
XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver
diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
index ea2d3c3..65ecffb 100644
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_ATI_VERSION = 6.14.1
+XDRIVER_XF86_VIDEO_ATI_VERSION = 6.14.4
XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xineramaproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
index 8071460..97f0257 100644
--- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.3.2
+XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.4.0
XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
index b1c98ec..5c03585 100644
--- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.4
+XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.5
XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
index 785f2db..2b963a4 100644
--- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
+++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.10
+XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.13
XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
index 64d50ed..2d4f80f 100644
--- a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
+++ b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_GLIDE_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_GLIDE_VERSION = 1.2.0
XDRIVER_XF86_VIDEO_GLIDE_SOURCE = xf86-video-glide-$(XDRIVER_XF86_VIDEO_GLIDE_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_GLIDE_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_GLIDE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.1-cross-compile.patch b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.1-cross-compile.patch
deleted file mode 100644
index 8c420d3..0000000
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.1-cross-compile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.ac 2008-06-23 11:17:07.000000000 -0400
-+++ b/configure.ac 2008-06-23 11:16:31.000000000 -0400
-@@ -75,12 +75,20 @@ CPPFLAGS="$SAVE_CPPFLAGS"
- AC_HEADER_STDC
-
- if test "$DRI" != no; then
-- AC_CHECK_FILE([${sdkdir}/dri.h],
-- [have_dri_h="yes"], [have_dri_h="no"])
-- AC_CHECK_FILE([${sdkdir}/sarea.h],
-- [have_sarea_h="yes"], [have_sarea_h="no"])
-- AC_CHECK_FILE([${sdkdir}/dristruct.h],
-- [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+ if test "$cross_compiling" = "no" ; then
-+ AC_CHECK_FILE([${sdkdir}/dri.h],
-+ [have_dri_h="yes"], [have_dri_h="no"])
-+ AC_CHECK_FILE([${sdkdir}/sarea.h],
-+ [have_sarea_h="yes"], [have_sarea_h="no"])
-+ AC_CHECK_FILE([${sdkdir}/dristruct.h],
-+ [have_dristruct_h="yes"], [have_dristruct_h="no"])
-+ AC_CHECK_FILE([${sdkdir}/damage.h],
-+ [have_damage_h="yes"], [have_damage_h="no"])
-+ else
-+ have_dri_h="yes"
-+ have_sarea_h="yes"
-+ have_dristruct_h="yes"
-+ fi
- fi
-
- AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
index cd294a5..40a0716 100644
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.5
+XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.7
XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES
diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index 4852a75..d2f2cd5 100644
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.4
+XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.5
XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch
deleted file mode 100644
index 0b020ac..0000000
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac.orig 2010-01-04 22:20:07.000000000 +0000
-+++ b/configure.ac 2010-02-19 12:12:50.000000000 +0000
-@@ -103,7 +103,7 @@
- CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
- CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
- AC_MSG_CHECKING([whether to include DRI support])
--if test x$DRI != xno; then
-+if test "$cross_compiling" = "no" -a test x$DRI != xno; then
- AC_CHECK_FILE([${sdkdir}/dri.h],
- [have_dri_h="yes"], [have_dri_h="no"])
- AC_CHECK_FILE([${sdkdir}/sarea.h],
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index b5bdf1a..3450ab8 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.13.0
+XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.19.0
XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES
diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
index ad83661..6e25cd1 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
+++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.8.2
+XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.9.1
XDRIVER_XF86_VIDEO_MACH64_SOURCE = xf86-video-mach64-$(XDRIVER_XF86_VIDEO_MACH64_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES
diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index 391ca20..17e4579 100644
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.13
+XDRIVER_XF86_VIDEO_MGA_VERSION = 1.5.0
XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index c92a49d..2690e38 100644
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.5
+XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.6
XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
index 4924a91..9edac5f 100644
--- a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
+++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_NEWPORT_VERSION = 0.2.3
+XDRIVER_XF86_VIDEO_NEWPORT_VERSION = 0.2.4
XDRIVER_XF86_VIDEO_NEWPORT_SOURCE = xf86-video-newport-$(XDRIVER_XF86_VIDEO_NEWPORT_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_NEWPORT_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_NEWPORT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
index 9abc02e..e61a369 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -3,7 +3,7 @@
# openchrome
#
#############################################################
-XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.2.904
+XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.2.906
XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_OPENCHROME_SITE = http://www.openchrome.org/releases
diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
index 8eeef50..a6603d7 100644
--- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
+++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_R128_VERSION = 6.8.1
+XDRIVER_XF86_VIDEO_R128_VERSION = 6.8.2
XDRIVER_XF86_VIDEO_R128_SOURCE = xf86-video-r128-$(XDRIVER_XF86_VIDEO_R128_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_R128_AUTORECONF = YES
diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
index 89eb55b..92d84b5 100644
--- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.3.1
+XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.3.4
XDRIVER_XF86_VIDEO_SAVAGE_SOURCE = xf86-video-savage-$(XDRIVER_XF86_VIDEO_SAVAGE_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES
diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
index 88e8f07..d7db8ce 100644
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.7.4
+XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.7.6
XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
index 390c613..762f6ab 100644
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.3
+XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.4
XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
index 5031319..db3ba8c 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.3
+XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.4
XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES
diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
index a6002e8..00e50a1 100644
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.4
+XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.5
XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
index b8831a0..fea2365 100644
--- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_VESA_VERSION = 2.3.0
+XDRIVER_XF86_VIDEO_VESA_VERSION = 2.3.1
XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
index 6e87ce1..bd014a6 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_VMWARE_VERSION = 11.0.3
+XDRIVER_XF86_VIDEO_VMWARE_VERSION = 12.0.2
XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto
diff --git a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
index 355e42c..c2948b2 100644
--- a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
+++ b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_WSFB_VERSION = 0.3.0
+XDRIVER_XF86_VIDEO_WSFB_VERSION = 0.4.0
XDRIVER_XF86_VIDEO_WSFB_SOURCE = xf86-video-wsfb-$(XDRIVER_XF86_VIDEO_WSFB_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_WSFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_WSFB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
diff --git a/package/x11r7/xfont_font-bitstream-speedo/Config.in b/package/x11r7/xfont_font-bitstream-speedo/Config.in
deleted file mode 100644
index 70750f6..0000000
--- a/package/x11r7/xfont_font-bitstream-speedo/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XFONT_FONT_BITSTREAM_SPEEDO
- bool "font-bitstream-speedo"
- help
- No description available
diff --git a/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk b/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
deleted file mode 100644
index 79cb6ca..0000000
--- a/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# font-bitstream-speedo -- No description available
-#
-################################################################################
-
-XFONT_FONT_BITSTREAM_SPEEDO_VERSION = 1.0.1
-XFONT_FONT_BITSTREAM_SPEEDO_SOURCE = font-bitstream-speedo-$(XFONT_FONT_BITSTREAM_SPEEDO_VERSION).tar.bz2
-XFONT_FONT_BITSTREAM_SPEEDO_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_BITSTREAM_SPEEDO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BITSTREAM_SPEEDO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
-XFONT_FONT_BITSTREAM_SPEEDO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-
-$(eval $(autotools-package))
-
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index f91b998..f318500 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XFONT_FONT_UTIL_VERSION = 1.2.0
+XFONT_FONT_UTIL_VERSION = 1.3.0
XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
XFONT_FONT_UTIL_DEPENDENCIES = host-pkgconf
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index c619da9..bd3314c 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -3,7 +3,7 @@
# xkeyboard-config
#
#############################################################
-XKEYBOARD_CONFIG_VERSION = 2.0
+XKEYBOARD_CONFIG_VERSION = 2.6
XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp
diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index 47fb03a..58a87dd 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBFS_VERSION = 1.0.3
+XLIB_LIBFS_VERSION = 1.0.4
XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2
XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBFS_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index c9eda7e..77fc310 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBICE_VERSION = 1.0.7
+XLIB_LIBICE_VERSION = 1.0.8
XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2
XLIB_LIBICE_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBICE_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index a8d1eff..ee2d25f 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBSM_VERSION = 1.2.0
+XLIB_LIBSM_VERSION = 1.2.1
XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2
XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBSM_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index ca4f06e..3b106cd 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBX11_VERSION = 1.4.2
+XLIB_LIBX11_VERSION = 1.5.0
XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBX11_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index 11cfa99..3885aa1 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXSCRNSAVER_VERSION = 1.2.1
+XLIB_LIBXSCRNSAVER_VERSION = 1.2.2
XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2
XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index 6a228a2..dc7f91e 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXAU_VERSION = 1.0.6
+XLIB_LIBXAU_VERSION = 1.0.7
XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2
XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXAU_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXaw/Config.in b/package/x11r7/xlib_libXaw/Config.in
index 1c10bc0..3695bb6 100644
--- a/package/x11r7/xlib_libXaw/Config.in
+++ b/package/x11r7/xlib_libXaw/Config.in
@@ -5,6 +5,5 @@ config BR2_PACKAGE_XLIB_LIBXAW
select BR2_PACKAGE_XLIB_LIBXMU
select BR2_PACKAGE_XLIB_LIBXPM
select BR2_PACKAGE_XPROTO_XPROTO
- select BR2_PACKAGE_XLIB_LIBXP
help
X.Org Xaw library
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index 6c8a681..5e95ae0 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -4,11 +4,11 @@
#
################################################################################
-XLIB_LIBXAW_VERSION = 1.0.9
+XLIB_LIBXAW_VERSION = 1.0.11
XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2
XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXAW_INSTALL_STAGING = YES
-XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto xlib_libXp
+XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto
XLIB_LIBXAW_CONF_OPT = --disable-docs
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index 5adffb2..0b2c8ae 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXCURSOR_VERSION = 1.1.11
+XLIB_LIBXCURSOR_VERSION = 1.1.13
XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.bz2
XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXCURSOR_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 5a702e5..1437836 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXDMCP_VERSION = 1.1.0
+XLIB_LIBXDMCP_VERSION = 1.1.1
XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2
XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXDMCP_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index 2ce38ef..390ed0c 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXEXT_VERSION = 1.2.0
+XLIB_LIBXEXT_VERSION = 1.3.1
XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2
XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXEXT_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 35bb125..9b2a309 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXFIXES_VERSION = 4.0.5
+XLIB_LIBXFIXES_VERSION = 5.0
XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2
XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXFIXES_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXfont/Config.in b/package/x11r7/xlib_libXfont/Config.in
index 407a099..cc1da0e 100644
--- a/package/x11r7/xlib_libXfont/Config.in
+++ b/package/x11r7/xlib_libXfont/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_XLIB_LIBXFONT
select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_XLIB_LIBFONTENC
select BR2_PACKAGE_XLIB_XTRANS
- select BR2_PACKAGE_XPROTO_FONTCACHEPROTO
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_XPROTO
select BR2_PACKAGE_XFONT_ENCODINGS
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index c08a69b..72f9416 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -4,12 +4,12 @@
#
################################################################################
-XLIB_LIBXFONT_VERSION = 1.4.3
+XLIB_LIBXFONT_VERSION = 1.4.5
XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2
XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXFONT_AUTORECONF = YES
XLIB_LIBXFONT_INSTALL_STAGING = YES
-XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings
+XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontsproto xproto_xproto xfont_encodings
XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
HOST_XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
diff --git a/package/x11r7/xlib_libXfontcache/Config.in b/package/x11r7/xlib_libXfontcache/Config.in
deleted file mode 100644
index 3a20451..0000000
--- a/package/x11r7/xlib_libXfontcache/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBXFONTCACHE
- bool "libXfontcache"
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XPROTO_FONTCACHEPROTO
- help
- X.Org Xfontcache library
diff --git a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
deleted file mode 100644
index b2faf5c..0000000
--- a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# xlib_libXfontcache -- X.Org Xfontcache library
-#
-################################################################################
-
-XLIB_LIBXFONTCACHE_VERSION = 1.0.5
-XLIB_LIBXFONTCACHE_SOURCE = libXfontcache-$(XLIB_LIBXFONTCACHE_VERSION).tar.bz2
-XLIB_LIBXFONTCACHE_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXFONTCACHE_INSTALL_STAGING = YES
-XLIB_LIBXFONTCACHE_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_fontcacheproto
-XLIB_LIBXFONTCACHE_CONF_OPT = --disable-malloc0returnsnull
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index eab75ef..9bf10ef 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXFT_VERSION = 2.2.0
+XLIB_LIBXFT_VERSION = 2.3.1
XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2
XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXFT_AUTORECONF = YES
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index b658df6..b258883 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXI_VERSION = 1.4.2
+XLIB_LIBXI_VERSION = 1.6.1
XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2
XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXI_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index a716e95..ae3d41a 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXINERAMA_VERSION = 1.1.1
+XLIB_LIBXINERAMA_VERSION = 1.1.2
XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2
XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXINERAMA_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index ce20897..fd2a679 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXMU_VERSION = 1.1.0
+XLIB_LIBXMU_VERSION = 1.1.1
XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2
XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXMU_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXp/Config.in b/package/x11r7/xlib_libXp/Config.in
deleted file mode 100644
index 532d8ac..0000000
--- a/package/x11r7/xlib_libXp/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBXP
- bool "libXp"
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXAU
- select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XPROTO_PRINTPROTO
- help
- X.Org Xp library
diff --git a/package/x11r7/xlib_libXp/xlib_libXp.mk b/package/x11r7/xlib_libXp/xlib_libXp.mk
deleted file mode 100644
index 9b2e4de..0000000
--- a/package/x11r7/xlib_libXp/xlib_libXp.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# xlib_libXp -- X.Org Xp library
-#
-################################################################################
-
-XLIB_LIBXP_VERSION = 1.0.1
-XLIB_LIBXP_SOURCE = libXp-$(XLIB_LIBXP_VERSION).tar.bz2
-XLIB_LIBXP_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXP_INSTALL_STAGING = YES
-XLIB_LIBXP_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xproto_printproto
-XLIB_LIBXP_CONF_OPT = --disable-malloc0returnsnull
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 8e1001b..bef2d01 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXPM_VERSION = 3.5.9
+XLIB_LIBXPM_VERSION = 3.5.10
XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2
XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXPM_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXprintAppUtil/Config.in b/package/x11r7/xlib_libXprintAppUtil/Config.in
deleted file mode 100644
index 351675a..0000000
--- a/package/x11r7/xlib_libXprintAppUtil/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBXPRINTAPPUTIL
- bool "libXprintAppUtil"
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXP
- select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
- help
- X.Org XprintAppUtil library
diff --git a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
deleted file mode 100644
index b01af40..0000000
--- a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xlib_libXprintAppUtil -- X.Org XprintAppUtil library
-#
-################################################################################
-
-XLIB_LIBXPRINTAPPUTIL_VERSION = 1.0.1
-XLIB_LIBXPRINTAPPUTIL_SOURCE = libXprintAppUtil-$(XLIB_LIBXPRINTAPPUTIL_VERSION).tar.bz2
-XLIB_LIBXPRINTAPPUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXPRINTAPPUTIL_INSTALL_STAGING = YES
-XLIB_LIBXPRINTAPPUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXprintUtil/Config.in b/package/x11r7/xlib_libXprintUtil/Config.in
deleted file mode 100644
index 1f397f4..0000000
--- a/package/x11r7/xlib_libXprintUtil/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBXPRINTUTIL
- bool "libXprintUtil"
- select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XLIB_LIBXP
- select BR2_PACKAGE_XLIB_LIBXT
- select BR2_PACKAGE_XPROTO_PRINTPROTO
- help
- X.Org XprintUtil library
diff --git a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
deleted file mode 100644
index 8e76686..0000000
--- a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xlib_libXprintUtil -- X.Org XprintUtil library
-#
-################################################################################
-
-XLIB_LIBXPRINTUTIL_VERSION = 1.0.1
-XLIB_LIBXPRINTUTIL_SOURCE = libXprintUtil-$(XLIB_LIBXPRINTUTIL_VERSION).tar.bz2
-XLIB_LIBXPRINTUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXPRINTUTIL_INSTALL_STAGING = YES
-XLIB_LIBXPRINTUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXt xproto_printproto
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index 1ff166c..6c3fdbf 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXRANDR_VERSION = 1.3.1
+XLIB_LIBXRANDR_VERSION = 1.3.2
XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2
XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXRANDR_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index 8b6e31b..d2d492f 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXRES_VERSION = 1.0.5
+XLIB_LIBXRES_VERSION = 1.0.6
XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2
XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXRES_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index ea12389..8ca44b7 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXTST_VERSION = 1.2.0
+XLIB_LIBXTST_VERSION = 1.2.1
XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.bz2
XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXTST_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index 8d69217..06c1145 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXV_VERSION = 1.0.6
+XLIB_LIBXV_VERSION = 1.0.7
XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2
XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXV_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index f6d2912..5b92612 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXVMC_VERSION = 1.0.6
+XLIB_LIBXVMC_VERSION = 1.0.7
XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2
XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXVMC_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0001-fix-compilation.patch b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0001-fix-compilation.patch
new file mode 100644
index 0000000..23ab117
--- /dev/null
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0001-fix-compilation.patch
@@ -0,0 +1,27 @@
+Backported from d4f89f7f42484963575b4c7d2fa694051e111e76
+
+Signed-off-by: Jesper Baekdahl <jbb@gamblify.com>
+---
+From d4f89f7f42484963575b4c7d2fa694051e111e76 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri, 09 Mar 2012 10:48:14 +0000
+Subject: Include <stdint.h> for uintptr_t
+
+Found-by: Tinderbox
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
+index 32f455b..964de18 100644
+--- a/src/XF86DGA2.c
++++ b/src/XF86DGA2.c
+@@ -21,6 +21,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
+ #include <X11/extensions/extutil.h>
+ #include <stdio.h>
+
++#include <stdint.h>
+
+ /* If you change this, change the Bases[] array below as well */
+ #define MAX_HEADS 16
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0002-fix-compilation.patch b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0002-fix-compilation.patch
new file mode 100644
index 0000000..f586e2e
--- /dev/null
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0002-fix-compilation.patch
@@ -0,0 +1,28 @@
+Backported from 56b5a5887349e9d0e1d28da157fe6441ca691f56
+
+Signed-off-by: Jesper Baekdahl <jbb@gamblify.com>
+---
+From 56b5a5887349e9d0e1d28da157fe6441ca691f56 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu, 08 Mar 2012 19:49:36 +0000
+Subject: Build fix when sizeof(off_t) > sizeof(void *)
+
+https://trac.macports.org/ticket/33532
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
+index e81b486..32f455b 100644
+--- a/src/XF86DGA2.c
++++ b/src/XF86DGA2.c
+@@ -928,7 +928,7 @@ DGAMapPhysical(
+ if ((pMap->fd = open(name, O_RDWR)) < 0)
+ return False;
+ pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
+- MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
++ MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
+ if (pMap->virtual == (void *)-1)
+ return False;
+ mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index 2bd9ce7..d57b794 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXXF86DGA_VERSION = 1.1.2
+XLIB_LIBXXF86DGA_VERSION = 1.1.3
XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2
XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index b445f02..f032b06 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXXF86VM_VERSION = 1.1.1
+XLIB_LIBXXF86VM_VERSION = 1.1.2
XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2
XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXXF86VM_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index 6429bb3..0b21f8d 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBDMX_VERSION = 1.1.1
+XLIB_LIBDMX_VERSION = 1.1.2
XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.bz2
XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBDMX_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index 219cf7a..191db88 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBFONTENC_VERSION = 1.1.0
+XLIB_LIBFONTENC_VERSION = 1.1.1
XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2
XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBFONTENC_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_liboldX/Config.in b/package/x11r7/xlib_liboldX/Config.in
deleted file mode 100644
index e312921..0000000
--- a/package/x11r7/xlib_liboldX/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBOLDX
- bool "liboldX"
- select BR2_PACKAGE_XLIB_LIBX11
- help
- X.Org oldX library
diff --git a/package/x11r7/xlib_liboldX/xlib_liboldX.mk b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
deleted file mode 100644
index f4db12b..0000000
--- a/package/x11r7/xlib_liboldX/xlib_liboldX.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# xlib_liboldX -- X.Org oldX library
-#
-################################################################################
-
-XLIB_LIBOLDX_VERSION = 1.0.1
-XLIB_LIBOLDX_SOURCE = liboldX-$(XLIB_LIBOLDX_VERSION).tar.bz2
-XLIB_LIBOLDX_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBOLDX_INSTALL_STAGING = YES
-XLIB_LIBOLDX_DEPENDENCIES = xlib_libX11
-XLIB_LIBOLDX_CONF_OPT = --disable-malloc0returnsnull
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
index 53e0356..f2a5d24 100644
--- a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
+++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBPCIACCESS_VERSION = 0.12.1
+XLIB_LIBPCIACCESS_VERSION = 0.13.1
XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2
XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBPCIACCESS_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index 6db20db..bd63961 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXKBFILE_VERSION = 1.0.7
+XLIB_LIBXKBFILE_VERSION = 1.0.8
XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2
XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXKBFILE_INSTALL_STAGING = YES
diff --git a/package/x11r7/xlib_libxkbui/Config.in b/package/x11r7/xlib_libxkbui/Config.in
deleted file mode 100644
index ceab305..0000000
--- a/package/x11r7/xlib_libxkbui/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_XLIB_LIBXKBUI
- bool "libxkbui"
- select BR2_PACKAGE_XLIB_LIBXKBFILE
- select BR2_PACKAGE_XLIB_LIBXT
- select BR2_PACKAGE_XPROTO_KBPROTO
- help
- X.Org xkbui library
diff --git a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
deleted file mode 100644
index 7e6ec25..0000000
--- a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xlib_libxkbui -- X.Org xkbui library
-#
-################################################################################
-
-XLIB_LIBXKBUI_VERSION = 1.0.2
-XLIB_LIBXKBUI_SOURCE = libxkbui-$(XLIB_LIBXKBUI_VERSION).tar.bz2
-XLIB_LIBXKBUI_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXKBUI_INSTALL_STAGING = YES
-XLIB_LIBXKBUI_DEPENDENCIES = xlib_libxkbfile xlib_libXt xproto_kbproto
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index 8582985..1d2d68a 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_XTRANS_VERSION = 1.2.6
+XLIB_XTRANS_VERSION = 1.2.7
XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2
XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_XTRANS_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
index f7b763a..a860227 100644
--- a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
+++ b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_APPLEWMPROTO_VERSION = 1.4.1
+XPROTO_APPLEWMPROTO_VERSION = 1.4.2
XPROTO_APPLEWMPROTO_SOURCE = applewmproto-$(XPROTO_APPLEWMPROTO_VERSION).tar.bz2
XPROTO_APPLEWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_APPLEWMPROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
index dc236fa..1cf4b5f 100644
--- a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
+++ b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_BIGREQSPROTO_VERSION = 1.1.1
+XPROTO_BIGREQSPROTO_VERSION = 1.1.2
XPROTO_BIGREQSPROTO_SOURCE = bigreqsproto-$(XPROTO_BIGREQSPROTO_VERSION).tar.bz2
XPROTO_BIGREQSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
index 99af25c..f2f3875 100644
--- a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
+++ b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_DRI2PROTO_VERSION = 2.3
+XPROTO_DRI2PROTO_VERSION = 2.6
XPROTO_DRI2PROTO_SOURCE = dri2proto-$(XPROTO_DRI2PROTO_VERSION).tar.bz2
XPROTO_DRI2PROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_DRI2PROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
index 5252fd9..bb5efd3 100644
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
+++ b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_FONTSPROTO_VERSION = 2.1.1
+XPROTO_FONTSPROTO_VERSION = 2.1.2
XPROTO_FONTSPROTO_SOURCE = fontsproto-$(XPROTO_FONTSPROTO_VERSION).tar.bz2
XPROTO_FONTSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_FONTSPROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk
index f576d0d..38a9a65 100644
--- a/package/x11r7/xproto_glproto/xproto_glproto.mk
+++ b/package/x11r7/xproto_glproto/xproto_glproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_GLPROTO_VERSION = 1.4.12
+XPROTO_GLPROTO_VERSION = 1.4.15
XPROTO_GLPROTO_SOURCE = glproto-$(XPROTO_GLPROTO_VERSION).tar.bz2
XPROTO_GLPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_GLPROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index 9e9b0ab..a265d96 100644
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_INPUTPROTO_VERSION = 2.0.1
+XPROTO_INPUTPROTO_VERSION = 2.2
XPROTO_INPUTPROTO_SOURCE = inputproto-$(XPROTO_INPUTPROTO_VERSION).tar.bz2
XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_INPUTPROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
index 8fcc8df..1c1973a 100644
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_KBPROTO_VERSION = 1.0.5
+XPROTO_KBPROTO_VERSION = 1.0.6
XPROTO_KBPROTO_SOURCE = kbproto-$(XPROTO_KBPROTO_VERSION).tar.bz2
XPROTO_KBPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_KBPROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_printproto/Config.in b/package/x11r7/xproto_printproto/Config.in
deleted file mode 100644
index 69e214f..0000000
--- a/package/x11r7/xproto_printproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_PRINTPROTO
- bool "printproto"
- help
- X.Org Print protocol headers
diff --git a/package/x11r7/xproto_printproto/xproto_printproto.mk b/package/x11r7/xproto_printproto/xproto_printproto.mk
deleted file mode 100644
index 641553f..0000000
--- a/package/x11r7/xproto_printproto/xproto_printproto.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xproto_printproto -- X.Org Print protocol headers
-#
-################################################################################
-
-XPROTO_PRINTPROTO_VERSION = 1.0.5
-XPROTO_PRINTPROTO_SOURCE = printproto-$(XPROTO_PRINTPROTO_VERSION).tar.bz2
-XPROTO_PRINTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_PRINTPROTO_INSTALL_STAGING = YES
-XPROTO_PRINTPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_recordproto/xproto_recordproto.mk b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
index 73f8a33..e97ebef 100644
--- a/package/x11r7/xproto_recordproto/xproto_recordproto.mk
+++ b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_RECORDPROTO_VERSION = 1.14
+XPROTO_RECORDPROTO_VERSION = 1.14.2
XPROTO_RECORDPROTO_SOURCE = recordproto-$(XPROTO_RECORDPROTO_VERSION).tar.bz2
XPROTO_RECORDPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_RECORDPROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
index 7f8121d..4ff8736 100644
--- a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
+++ b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_RESOURCEPROTO_VERSION = 1.1.1
+XPROTO_RESOURCEPROTO_VERSION = 1.2.0
XPROTO_RESOURCEPROTO_SOURCE = resourceproto-$(XPROTO_RESOURCEPROTO_VERSION).tar.bz2
XPROTO_RESOURCEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
index 360db11..34e708c 100644
--- a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
+++ b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_SCRNSAVERPROTO_VERSION = 1.2.1
+XPROTO_SCRNSAVERPROTO_VERSION = 1.2.2
XPROTO_SCRNSAVERPROTO_SOURCE = scrnsaverproto-$(XPROTO_SCRNSAVERPROTO_VERSION).tar.bz2
XPROTO_SCRNSAVERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index 027ef4f..d13a361 100644
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_XCMISCPROTO_VERSION = 1.2.1
+XPROTO_XCMISCPROTO_VERSION = 1.2.2
XPROTO_XCMISCPROTO_SOURCE = xcmiscproto-$(XPROTO_XCMISCPROTO_VERSION).tar.bz2
XPROTO_XCMISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index 8114f78..cf7bd21 100644
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_XEXTPROTO_VERSION = 7.2.0
+XPROTO_XEXTPROTO_VERSION = 7.2.1
XPROTO_XEXTPROTO_SOURCE = xextproto-$(XPROTO_XEXTPROTO_VERSION).tar.bz2
XPROTO_XEXTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_XEXTPROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xproto_xf86rushproto/Config.in b/package/x11r7/xproto_xf86rushproto/Config.in
deleted file mode 100644
index 961c31f..0000000
--- a/package/x11r7/xproto_xf86rushproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_XF86RUSHPROTO
- bool "xf86rushproto"
- help
- X.Org XF86Rush protocol headers
diff --git a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
deleted file mode 100644
index 1609430..0000000
--- a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xproto_xf86rushproto -- X.Org XF86Rush protocol headers
-#
-################################################################################
-
-XPROTO_XF86RUSHPROTO_VERSION = 1.1.2
-XPROTO_XF86RUSHPROTO_SOURCE = xf86rushproto-$(XPROTO_XF86RUSHPROTO_VERSION).tar.bz2
-XPROTO_XF86RUSHPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XF86RUSHPROTO_INSTALL_STAGING = YES
-XPROTO_XF86RUSHPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
index 1f480b5..25d1541 100644
--- a/package/x11r7/xproto_xproto/xproto_xproto.mk
+++ b/package/x11r7/xproto_xproto/xproto_xproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XPROTO_XPROTO_VERSION = 7.0.21
+XPROTO_XPROTO_VERSION = 7.0.23
XPROTO_XPROTO_SOURCE = xproto-$(XPROTO_XPROTO_VERSION).tar.bz2
XPROTO_XPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
XPROTO_XPROTO_INSTALL_STAGING = YES
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 21b0700..c860a1d 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -45,7 +45,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
select BR2_PACKAGE_XPROTO_XF86DGAPROTO
select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_MESA3D
- select BR2_PACKAGE_XPROTO_XF86RUSHPROTO
select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
select BR2_PACKAGE_XPROTO_XPROTO
select BR2_PACKAGE_XUTIL_UTIL_MACROS
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 140cb8b..f0b19aa 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XSERVER_XORG_SERVER_VERSION = 1.9.4
+XSERVER_XORG_SERVER_VERSION = 1.12.2
XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
XSERVER_XORG_SERVER_MAKE = $(MAKE1) # make install fails with parallel make
@@ -46,7 +46,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xproto_xextproto \
xproto_xf86bigfontproto \
xproto_xf86dgaproto \
- xproto_xf86rushproto \
xproto_xf86vidmodeproto \
xproto_xproto \
xkeyboard-config \
diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
index e6b6238..ff4d9bd 100644
--- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XUTIL_MAKEDEPEND_VERSION = 1.0.2
+XUTIL_MAKEDEPEND_VERSION = 1.0.4
XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.bz2
XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util