xorg: bump viewres, xbiff, xcalc, xeyes, xf86-input-joystick

* remove old recipes/xorg-app/xeyes_1.0.991.bb because its only snapshot
* remove old recipes/xorg-driver/xf86-input-joystick_1.4.99.2.bb
* bump preferred version of eyes and xf86-input-joystick even for R7.5

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 11 insertions, 8 deletions

diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc
index f4128aabc5..a8e0e49ce0 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc
@@ -32,7 +32,7 @@ PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
 PREFERRED_VERSION_xditview ?= "1.0.1"
 PREFERRED_VERSION_xdm ?= "1.1.9"
 PREFERRED_VERSION_xedit ?= "1.1.2"
-PREFERRED_VERSION_xeyes ?= "1.0.991"
+PREFERRED_VERSION_xeyes ?= "1.1.0"
 PREFERRED_VERSION_xf86dga ?= "1.0.2"
 PREFERRED_VERSION_xfd ?= "1.0.1"
 PREFERRED_VERSION_xfindproxy ?= "1.0.1"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
index 766afe486a..6e8c93a95a 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
@@ -77,7 +77,6 @@ PREFERRED_VERSION_xvinfo ?= "1.1.0"
 PREFERRED_VERSION_xwd ?= "1.0.3"
 PREFERRED_VERSION_xwininfo ?= "1.0.5"
 PREFERRED_VERSION_xwud ?= "1.0.2"
-#driver
 
 # data
 PREFERRED_VERSION_xbitmaps ?= "1.1.0"
@@ -91,7 +90,7 @@ PREFERRED_VERSION_xorg-sgml-doctools ?= "1.3"
 PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0"
 PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.3.0"
-PREFERRED_VERSION_xf86-input-joystick ?= "1.4.99.2"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.5.0"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0"
 PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.0"
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index 7da1c16a2a..bea2b4105c 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Wed Dec 16 09:33:47 CET 2009
+#Thu Dec 31 14:54:51 CET 2009
 #app
 PREFERRED_VERSION_appres ?= "1.0.2"
 PREFERRED_VERSION_bdftopcf ?= "1.0.2"
@@ -32,12 +32,12 @@ PREFERRED_VERSION_setxkbmap ?= "1.1.0"
 PREFERRED_VERSION_showfont ?= "1.0.2"
 PREFERRED_VERSION_smproxy ?= "1.0.3"
 PREFERRED_VERSION_twm ?= "1.0.4"
-PREFERRED_VERSION_viewres ?= "1.0.1"
+PREFERRED_VERSION_viewres ?= "1.0.2"
 PREFERRED_VERSION_x11perf ?= "1.5.1"
 PREFERRED_VERSION_xauth ?= "1.0.4"
 PREFERRED_VERSION_xbacklight ?= "1.1.1"
-PREFERRED_VERSION_xbiff ?= "1.0.1"
-PREFERRED_VERSION_xcalc ?= "1.0.2"
+PREFERRED_VERSION_xbiff ?= "1.0.2"
+PREFERRED_VERSION_xcalc ?= "1.0.3"
 PREFERRED_VERSION_xclipboard ?= "1.1.0"
 PREFERRED_VERSION_xclock ?= "1.0.4"
 PREFERRED_VERSION_xcmsdb ?= "1.0.2"
@@ -52,7 +52,7 @@ PREFERRED_VERSION_xdpyinfo ?= "1.1.0"
 PREFERRED_VERSION_xdriinfo ?= "1.0.3"
 PREFERRED_VERSION_xedit ?= "1.1.2"
 PREFERRED_VERSION_xev ?= "1.0.4"
-PREFERRED_VERSION_xeyes ?= "1.0.991"
+PREFERRED_VERSION_xeyes ?= "1.1.0"
 PREFERRED_VERSION_xf86dga ?= "1.0.2"
 PREFERRED_VERSION_xfd ?= "1.0.1"
 PREFERRED_VERSION_xfindproxy ?= "1.0.1"
@@ -156,6 +156,7 @@ PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2"
 PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4"
 PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
 PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
+#PREFERRED_VERSION_xf86-video-intel ?= "2.9.99.902"
 PREFERRED_VERSION_xf86-video-intel ?= "2.9.1"
 PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2"
 PREFERRED_VERSION_xf86-video-mga ?= "1.9.100"
@@ -189,6 +190,7 @@ PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
 PREFERRED_VERSION_xf86-video-vesa ?= "2.2.1"
 PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
 PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
+#PREFERRED_VERSION_xf86-video-vmware ?= "10.16.9"
 PREFERRED_VERSION_xf86-video-vmware ?= "10.16.8"
 PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3"
 PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0"
@@ -292,6 +294,7 @@ PREFERRED_VERSION_libpciaccess ?= "0.11.0"
 PREFERRED_VERSION_libxkbfile ?= "1.0.6"
 PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
 PREFERRED_VERSION_libxkbui ?= "1.0.2"
+#PREFERRED_VERSION_pixman ?= "0.17.2"
 PREFERRED_VERSION_pixman ?= "0.16.2"
 PREFERRED_VERSION_xtrans ?= "1.2.5"
 PREFERRED_VERSION_xtrans-native ?= "1.2.5"
@@ -350,4 +353,5 @@ PREFERRED_VERSION_util-macros ?= "1.4.1"
 PREFERRED_VERSION_util-macros-native ?= "1.4.1"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
 #xserver
+#PREFERRED_VERSION_xserver-xorg ?= "1.7.99.2"
 PREFERRED_VERSION_xserver-xorg ?= "1.7.3"