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>

9 files changed, 41 insertions, 12 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 1799a2a0ff..48f8ff3591 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -27250,6 +27250,10 @@ sha256=074b4576113e89213940e3ea3901dd035ab317255cd78c929aa52d89227f1f37
 md5=cdbed540daf7975b56000420c9aa5bf9
 sha256=bf49cd45ffb197a6992b3b7c99c94161eaf7cf6a2b661d3905ac382bedce34b8
 
+[http://xorg.freedesktop.org/releases/individual/app/viewres-1.0.2.tar.bz2]
+md5=f35c4ad7e1aa1ee2b25373dcdc34345b
+sha256=85c7207f89bfb13cc9f3c3c9d9a785094e7576e5e3e7ef0450544c4cd6bbbf3b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/viewres-X11R7.0-1.0.1.tar.bz2]
 md5=004bf8dd4646aca86faf5aa22b0c3f2f
 sha256=0ee43fd2dd9c8b60fad0e3d89bb04dcb8d7e398b33bbcc603a8e0900c3144a28
@@ -27954,6 +27958,10 @@ sha256=c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4
 md5=404f5add4537d22dd109c33e518a5190
 sha256=9845b1fa8a1cfd408f01fd69b66808068e847cdc925d114c7723c17934a96503
 
+[http://xorg.freedesktop.org/releases/individual/app/xbiff-1.0.2.tar.bz2]
+md5=1d4ad06725f9dc4b877ecd210b7b1607
+sha256=7c21763a90599ad627739804ba76dd33516b76cce440294e1154bf680eca60f7
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xbiff-X11R7.0-1.0.1.tar.bz2]
 md5=c4eb71a3187586d02365a67fc1445e54
 sha256=c9c899fddcb5053d6cf2a00a933b6e6b0429af547efbe85f89ad3bb35176bbec
@@ -27982,6 +27990,10 @@ sha256=17484e5fec0ebe7dd8df7218fde1449c52be3f4c6377a85a9fd86e377a7f4248
 md5=d31a99795b9668f047aa11bf36df6df0
 sha256=96375e2d212e7249d14d0beac73c1a6d89252b5fcf571bd9f5c7303a14bb4a32
 
+[http://xorg.freedesktop.org/releases/individual/app/xcalc-1.0.3.tar.bz2]
+md5=0b981e360b54584fcb6dc2ec4658c406
+sha256=96c413998c664a8397313d749b20e18308bcd82187a89446a64b3557b089b42f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xcalc-X11R7.0-1.0.1.tar.bz2]
 md5=c1ecea85be15f746a59931e288768bdb
 sha256=a1af9c7474307077e69cf86c185c77a3a1454ada64e3abf766fcdee6e92b4fd6
@@ -28358,6 +28370,10 @@ sha256=530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
 md5=ba1b886bd6104018fe78ab431d83ce4d
 sha256=594324114bb20a502102a9a584dfa5c63d85aa60b7975fd7587d82d42c8ef115
 
+[http://xorg.freedesktop.org/releases/individual/app/xeyes-1.1.0.tar.bz2]
+md5=933f6d2b132d14f707f1f3c87b39ebe2
+sha256=996b9641fea06e2f0dde9cbf5fb31b5cd139376198057a88ca59820fdb94d507
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xeyes-X11R7.0-1.0.1.tar.bz2]
 md5=3ffafa7f222ea799bcd9fcd85c60ab98
 sha256=e93bb322fe96ceabd0581bb70101aaa1001b0b8f894b3ae0e1fa2e4b38f41af2
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"
diff --git a/recipes/xorg-app/viewres_1.0.2.bb b/recipes/xorg-app/viewres_1.0.2.bb
new file mode 100644
index 0000000000..f884467096
--- /dev/null
+++ b/recipes/xorg-app/viewres_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxt"
+
diff --git a/recipes/xorg-app/xbiff_1.0.2.bb b/recipes/xorg-app/xbiff_1.0.2.bb
new file mode 100644
index 0000000000..e3264d7684
--- /dev/null
+++ b/recipes/xorg-app/xbiff_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxaw xbitmaps libxext"
+
diff --git a/recipes/xorg-app/xcalc_1.0.3.bb b/recipes/xorg-app/xcalc_1.0.3.bb
new file mode 100644
index 0000000000..54b7549f5c
--- /dev/null
+++ b/recipes/xorg-app/xcalc_1.0.3.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+DESCRIPTION = "scientific calculator for X"
+DEPENDS += " libxaw libxt"
+PE = "1"
diff --git a/recipes/xorg-app/xeyes_1.0.991.bb b/recipes/xorg-app/xeyes_1.1.0.bb
index 07ce0724fa..07ce0724fa 100644
--- a/recipes/xorg-app/xeyes_1.0.991.bb
+++ b/recipes/xorg-app/xeyes_1.1.0.bb
diff --git a/recipes/xorg-driver/xf86-input-joystick_1.4.99.2.bb b/recipes/xorg-driver/xf86-input-joystick_1.4.99.2.bb
deleted file mode 100644
index a53297fd8a..0000000000
--- a/recipes/xorg-driver/xf86-input-joystick_1.4.99.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-driver-input.inc
-
-DESCRIPTION = "X.Org X server -- joystick input driver"
-PE = "1"