Merge branch 'shared/xorg-7.4-update' into org.openembedded.dev

3 files changed, 62 insertions, 121 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 33349fcde1..9bc0273466 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -116,7 +116,7 @@ PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}"
 
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
 
 #avr32 only has patches for binutils 2.17 in OE
 PREFERRED_VERSION_binutils_avr32 = "2.17"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index bd47256322..c1dc088ead 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -28,4 +28,4 @@ PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 PREFERRED_VERSION_udev 		= "124"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-PREFERRED_VERSION_xserver-xorg  = "1.4.2"
+PREFERRED_VERSION_xserver-xorg  = "1.5.1"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index d6cdc13d5d..548d8239e8 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -36,99 +36,44 @@ PREFERRED_VERSION_task-xorg ?= "X11R7.4"
 
 # app
 PREFERRED_VERSION_appres ?= "1.0.1"
-PREFERRED_VERSION_bdftopcf ?= "1.0.1"
-PREFERRED_VERSION_beforelight ?= "1.0.3"
 PREFERRED_VERSION_bitmap ?= "1.0.3"
-PREFERRED_VERSION_editres ?= "1.0.3"
-PREFERRED_VERSION_fontosfnt ?= "1.0.4"
-PREFERRED_VERSION_fslsfonts ?= "1.0.2"
-PREFERRED_VERSION_fstobdf ?= "1.0.3"
 PREFERRED_VERSION_iceauth ?= "1.0.2"
-PREFERRED_VERSION_ico ?= "1.0.2"
-PREFERRED_VERSION_lbxproxy ?= "1.0.1"
-PREFERRED_VERSION_listres ?= "1.0.1"
 PREFERRED_VERSION_luit ?= "1.0.3"
 PREFERRED_VERSION_mkfontdir-native ?= "1.0.4"
 PREFERRED_VERSION_mkfontdir ?= "1.0.4"
 PREFERRED_VERSION_mkfontscale ?= "1.0.5"
-PREFERRED_VERSION_oclock ?= "1.0.1"
-PREFERRED_VERSION_proxymngr ?= "1.0.1"
-PREFERRED_VERSION_rgb ?= "1.0.3"
-PREFERRED_VERSION_rstart ?= "1.0.2"
-PREFERRED_VERSION_scripts ?= "1.0.1"
-PREFERRED_VERSION_sessreg ?= "1.0.3"
+PREFERRED_VERSION_sessreg ?= "1.0.4"
 PREFERRED_VERSION_setxkbmap ?= "1.0.4"
-PREFERRED_VERSION_showfont ?= "1.0.2"
 PREFERRED_VERSION_smproxy ?= "1.0.2"
-PREFERRED_VERSION_twm ?= "1.0.4"
-PREFERRED_VERSION_viewres ?= "1.0.1"
 PREFERRED_VERSION_x11perf ?= "1.5"
 PREFERRED_VERSION_xauth ?= "1.0.3"
 PREFERRED_VERSION_xbacklight ?= "1.1"
-PREFERRED_VERSION_xbiff ?= "1.0.1"
-PREFERRED_VERSION_xcalc ?= "1.0.2"
-PREFERRED_VERSION_xclipboard ?= "1.0.1"
-PREFERRED_VERSION_xclock ?= "1.0.3"
-PREFERRED_VERSION_xcompmgr ?= "1.1.4"
 PREFERRED_VERSION_xcmsdb ?= "1.0.1"
-PREFERRED_VERSION_xconsole ?= "1.0.3"
 PREFERRED_VERSION_xcursorgen ?= "1.0.2"
-PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
-PREFERRED_VERSION_xditview ?= "1.0.1"
-PREFERRED_VERSION_xdm ?= "1.1.8"
 PREFERRED_VERSION_xdpyinfo ?= "1.0.3"
 PREFERRED_VERSION_xdriinfo ?= "1.0.2"
-PREFERRED_VERSION_xedit ?= "1.0.2"
 PREFERRED_VERSION_xev ?= "1.0.3"
-PREFERRED_VERSION_xeyes ?= "1.0.1"
-PREFERRED_VERSION_xxf86dga ?= "1.0.2"
-PREFERRED_VERSION_xfd ?= "1.0.1"
-PREFERRED_VERSION_xfindproxy ?= "1.0.1"
-PREFERRED_VERSION_xfontsel ?= "1.0.2"
-PREFERRED_VERSION_xfs ?= "1.0.8"
-PREFERRED_VERSION_xfsinfo ?= "1.0.2"
-PREFERRED_VERSION_xfwp ?= "1.0.1"
 PREFERRED_VERSION_xgamma ?= "1.0.2"
-PREFERRED_VERSION_xgc ?= "1.0.1"
 PREFERRED_VERSION_xhost ?= "1.0.2"
-PREFERRED_VERSION_xinit ?= "1.0.9"
 PREFERRED_VERSION_xinput ?= "1.3.0"
 PREFERRED_VERSION_xkbcomp ?= "1.0.5"
 PREFERRED_VERSION_xkbevd ?= "1.0.2"
-PREFERRED_VERSION_xkbprint ?= "1.0.1"
 PREFERRED_VERSION_xkbutils ?= "1.0.1"
 PREFERRED_VERSION_xkill ?= "1.0.1"
-PREFERRED_VERSION_xload ?= "1.0.2"
-PREFERRED_VERSION_xlogo ?= "1.0.1"
 PREFERRED_VERSION_xlsatoms ?= "1.0.1"
 PREFERRED_VERSION_xlsclients ?= "1.0.1"
-PREFERRED_VERSION_xlsfonts ?= "1.0.2"
-PREFERRED_VERSION_xmag ?= "1.0.2"
-PREFERRED_VERSION_xman ?= "1.0.3"
-PREFERRED_VERSION_xmessage ?= "1.0.2"
-PREFERRED_VERSION_xmh ?= "1.0.1"
 PREFERRED_VERSION_xmodmap ?= "1.0.3"
-PREFERRED_VERSION_xmore ?= "1.0.1"
-PREFERRED_VERSION_xphelloworld ?= "1.0.1"
-PREFERRED_VERSION_xplsprinters ?= "1.0.1"
 PREFERRED_VERSION_xpr ?= "1.0.2"
-PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
 PREFERRED_VERSION_xprop ?= "1.0.4"
 PREFERRED_VERSION_xrandr ?= "1.2.3"
 PREFERRED_VERSION_xrdb ?= "1.0.5"
 PREFERRED_VERSION_xrefresh ?= "1.0.2"
-PREFERRED_VERSION_xrx ?= "1.0.1"
 PREFERRED_VERSION_xset ?= "1.0.4"
 PREFERRED_VERSION_xsetmode ?= "1.0.0"
-PREFERRED_VERSION_xsetpointer ?= "1.0.1"
 PREFERRED_VERSION_xsetroot ?= "1.0.2"
-PREFERRED_VERSION_xsm ?= "1.0.1"
-PREFERRED_VERSION_xstdcmap ?= "1.0.1"
-PREFERRED_VERSION_xtrap ?= "1.0.2"
-PREFERRED_VERSION_xvidtune ?= "1.0.1"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
-PREFERRED_VERSION_xwd ?= "1.0.1"
-PREFERRED_VERSION_xwininfo ?= "1.0.3"
+PREFERRED_VERSION_xwd ?= "1.0.2"
+PREFERRED_VERSION_xwininfo ?= "1.0.4"
 PREFERRED_VERSION_xwud ?= "1.0.1"
 
 # data
@@ -142,55 +87,35 @@ PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
 # driver
 PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2"
 PREFERRED_VERSION_xf86-input-aiptek ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-citron ?= "2.2.1"
-PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-elographics ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-evdev ?= "1.99.4"
-PREFERRED_VERSION_xf86-input-fpit ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-hyperpen ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-joystick ?= "1.3.1"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.3.2"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1"
-PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
-PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0"
-PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-penmount ?= "1.3.0"
-PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-summa ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.0"
 PREFERRED_VERSION_xf86-input-vmmouse ?= "12.5.1"
 PREFERRED_VERSION_xf86-input-void ?= "1.1.1"
 PREFERRED_VERSION_xf86-video-apm ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-ark ?= "0.7.0"
 PREFERRED_VERSION_xf86-video-ast ?= "0.85.0"
-PREFERRED_VERSION_xf86-video-ati ?= "6.8.0"
+PREFERRED_VERSION_xf86-video-ati ?= "6.9.0"
 PREFERRED_VERSION_xf86-video-chips ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1"
-PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0"
 PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0"
-PREFERRED_VERSION_xf86-video-geode ?= "2.9.0"
-PREFERRED_VERSION_xf86-video-glide ?= "1.0.0"
-PREFERRED_VERSION_xf86-video-glint ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-i128 ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-geode ?= "2.10.1"
+PREFERRED_VERSION_xf86-video-glide ?= "1.0.1"
+PREFERRED_VERSION_xf86-video-glint ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.3.1"
 PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
-PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.2.1"
-PREFERRED_VERSION_xf86-video-mga ?= "1.4.8"
+PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.4.2"
+PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.0"
+PREFERRED_VERSION_xf86-video-mga ?= "1.4.9"
 PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1"
 PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
-PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
-PREFERRED_VERSION_xf86-video-nv ?= "2.1.9"
-PREFERRED_VERSION_xf86-video-radeonhd ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.12"
+PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.903"
+PREFERRED_VERSION_xf86-video-r128 ?= "6.8.0"
 PREFERRED_VERSION_xf86-video-rendition ?= "4.2.0"
 PREFERRED_VERSION_xf86-video-s3 ?= "0.6.0"
 PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.1"
@@ -202,20 +127,20 @@ PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.0"
-PREFERRED_VERSION_xf86-video-tga ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-tga ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-trident ?= "1.3.0"
 PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
-PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0"
-PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
-PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
-PREFERRED_VERSION_xf86-video-vmware ?= "10.16.1"
+PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
+PREFERRED_VERSION_xf86-video-vesa ?= "2.0.0"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.16.5"
 PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-wsfb ?= "0.2.1"
+PREFERRED_VERSION_xf86-video-xgi ?= "1.5.0"
 PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.3"
 
 # font
@@ -226,34 +151,35 @@ PREFERRED_VERSION_font-util ?= "1.0.1"
 PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1"
 
 # lib
-PREFERRED_VERSION_diet-x11 ?= "1.1.3"
+PREFERRED_VERSION_diet-x11 ?= "1.1.5"
+PREFERRED_VERSION_libapplewm ?= "1.0.0"
 PREFERRED_VERSION_libdmx ?= "1.0.2"
 PREFERRED_VERSION_libfs ?= "1.0.1"
-PREFERRED_VERSION_libfontenc ?= "1.0.4"
 PREFERRED_VERSION_libice ?= "1.0.4"
-PREFERRED_VERSION_liblbxutil ?= "1.0.1"
-PREFERRED_VERSION_libsm ?= "1.0.3"
-PREFERRED_VERSION_libx11 ?= "1.1.4"
+PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libsm ?= "1.1.0"
+PREFERRED_VERSION_libwindowswm ?= "1.0.0"
+PREFERRED_VERSION_libx11 ?= "1.1.5"
 PREFERRED_VERSION_libx11-native ?= "1.1.1"
-PREFERRED_VERSION_libxau ?= "1.0.3"
+PREFERRED_VERSION_libxau ?= "1.0.4"
 PREFERRED_VERSION_libxaw ?= "1.0.4"
 PREFERRED_VERSION_libxcomposite ?= "0.4.0"
 PREFERRED_VERSION_libxcursor ?= "1.1.9"
-PREFERRED_VERSION_libxdamage ?= "1.0.4"
+PREFERRED_VERSION_libxdamage ?= "1.1.1"
 PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
 PREFERRED_VERSION_libxdmcp ?= "1.0.2"
 PREFERRED_VERSION_libxevie ?= "1.0.2"
 PREFERRED_VERSION_libxext ?= "1.0.4"
 PREFERRED_VERSION_libxfixes ?= "4.0.3"
-PREFERRED_VERSION_libxfont ?= "1.3.2"
+PREFERRED_VERSION_libxfont ?= "1.3.3"
 PREFERRED_VERSION_libxfontcache ?= "1.0.4"
+PREFERRED_VERSION_libxft ?= "2.1.13"
 PREFERRED_VERSION_libxi ?= "1.1.3"
 PREFERRED_VERSION_libxinerama ?= "1.0.3"
 PREFERRED_VERSION_libxkbfile ?= "1.0.5"
-PREFERRED_VERSION_libxkbui ?= "1.0.2"
 PREFERRED_VERSION_libxmu ?= "1.0.4"
 PREFERRED_VERSION_libxpm ?= "3.5.7"
-PREFERRED_VERSION_libxrandr ?= "1.2.2"
+PREFERRED_VERSION_libxrandr ?= "1.2.3"
 PREFERRED_VERSION_libxrender ?= "0.9.4"
 PREFERRED_VERSION_libxres ?= "1.0.3"
 PREFERRED_VERSION_libxscrnsaver ?= "1.1.3"
@@ -263,24 +189,39 @@ PREFERRED_VERSION_libxv ?= "1.0.4"
 PREFERRED_VERSION_libxvmc ?= "1.0.4"
 PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
 PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
-PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
-PREFERRED_VERSION_pixman ?= "0.10.0"
-PREFERRED_VERSION_xtrans ?= "1.2"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.2"
+PREFERRED_VERSION_xtrans ?= "1.2.1"
+PREFERRED_VERSION_mesa ?= "7.2"
 
 # proto
+PREFERRED_VERSION_applewmproto ?= "1.0.3"
+PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
 PREFERRED_VERSION_compositeproto ?= "0.4"
 PREFERRED_VERSION_damageproto ?= "1.1.0"
+PREFERRED_VERSION_dmxproto ?= "2.2.2"
 PREFERRED_VERSION_fixesproto ?= "4.0"
+PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
+PREFERRED_VERSION_fontsproto ?= "2.0.2"
 PREFERRED_VERSION_glproto ?= "1.4.9"
-PREFERRED_VERSION_inputproto ?= "1.4.3"
+PREFERRED_VERSION_inputproto ?= "1.4.4"
 PREFERRED_VERSION_kbproto ?= "1.0.3"
-PREFERRED_VERSION_printproto ?= "1.0.4"
 PREFERRED_VERSION_randrproto ?= "1.2.1"
+PREFERRED_VERSION_recordproto ?= "1.13.2"
 PREFERRED_VERSION_renderproto ?= "0.9.3"
+PREFERRED_VERSION_resourceproto ?= "1.0.2"
 PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
+PREFERRED_VERSION_trapproto ?= "3.4.3"
+PREFERRED_VERSION_videoproto ?= "2.2.2"
+PREFERRED_VERSION_windowswmproto ?= "1.0.3"
+PREFERRED_VERSION_xmiscproto ?= "1.1.2"
+PREFERRED_VERSION_xextproto ?= "7.0.3"
 PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
-PREFERRED_VERSION_xproto-native ?= "7.0.12"
-PREFERRED_VERSION_xproto ?= "7.0.12"
+PREFERRED_VERSION_xf86driproto ?= "2.0.4"
+PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
+PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
+PREFERRED_VERSION_xinemaroproto ?= "1.1.2"
+PREFERRED_VERSION_xproto-native ?= "7.0.13"
+PREFERRED_VERSION_xproto ?= "7.0.13"
 
 # util
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"
@@ -292,7 +233,7 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 
 # xserver
 PREFERRED_VERSION_xserver-kdrive ?= "1.4"
-PREFERRED_VERSION_xserver-xorg ?= "1.4"
+PREFERRED_VERSION_xserver-xorg ?= "1.5.1"
 
 # Unreleased packages
 SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"