# see http://www.x.org/wiki/Releases/7.5
-# WORK IN PROGRESS, 7.5 will be released on 2009-XX-XX
+# 7.5 was released on 2009-10-26
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg"
-PREFERRED_VERSION_task-xorg ?= "X11R7.4"
+PREFERRED_VERSION_task-xorg ?= "X11R7.5"
# app
-PREFERRED_VERSION_appres ?= "1.0.1"
-PREFERRED_VERSION_bitmap ?= "1.0.3"
-PREFERRED_VERSION_iceauth ?= "1.0.2"
-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_sessreg ?= "1.0.4"
-PREFERRED_VERSION_setxkbmap ?= "1.0.4"
-PREFERRED_VERSION_smproxy ?= "1.0.2"
-PREFERRED_VERSION_x11perf ?= "1.5"
-PREFERRED_VERSION_xauth ?= "1.0.3"
-PREFERRED_VERSION_xbacklight ?= "1.1"
-PREFERRED_VERSION_xcmsdb ?= "1.0.1"
-PREFERRED_VERSION_xcursorgen ?= "1.0.2"
-PREFERRED_VERSION_xdpyinfo ?= "1.0.3"
-PREFERRED_VERSION_xdriinfo ?= "1.0.2"
-PREFERRED_VERSION_xev ?= "1.0.3"
-PREFERRED_VERSION_xgamma ?= "1.0.2"
-PREFERRED_VERSION_xhost ?= "1.0.2"
-PREFERRED_VERSION_xinput ?= "1.3.0"
-PREFERRED_VERSION_xkbcomp ?= "1.0.5"
-PREFERRED_VERSION_xkbevd ?= "1.0.2"
-PREFERRED_VERSION_xkbutils ?= "1.0.1"
-PREFERRED_VERSION_xkill ?= "1.0.1"
-PREFERRED_VERSION_xlsatoms ?= "1.0.1"
-PREFERRED_VERSION_xlsclients ?= "1.0.1"
-PREFERRED_VERSION_xmodmap ?= "1.0.3"
-PREFERRED_VERSION_xpr ?= "1.0.2"
-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_xset ?= "1.0.4"
-PREFERRED_VERSION_xsetmode ?= "1.0.0"
-PREFERRED_VERSION_xsetroot ?= "1.0.2"
-PREFERRED_VERSION_xvinfo ?= "1.0.2"
-PREFERRED_VERSION_xwd ?= "1.0.2"
-PREFERRED_VERSION_xwininfo ?= "1.0.4"
-PREFERRED_VERSION_xwud ?= "1.0.1"
+PREFERRED_VERSION_bdftopcf ?= "1.0.2"
+PREFERRED_VERSION_bdftopcf-native ?= "1.0.2"
+PREFERRED_VERSION_iceauth ?= "1.0.3"
+PREFERRED_VERSION_luit ?= "1.0.4"
+PREFERRED_VERSION_mkfontdir ?= "1.0.5"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.5"
+PREFERRED_VERSION_mkfontscale ?= "1.0.7"
+PREFERRED_VERSION_mkfontscale-native ?= "1.0.7"
+PREFERRED_VERSION_sessreg ?= "1.0.5"
+PREFERRED_VERSION_setxkbmap ?= "1.1.0"
+PREFERRED_VERSION_smproxy ?= "1.0.3"
+PREFERRED_VERSION_x11perf ?= "1.5.1"
+PREFERRED_VERSION_xauth ?= "1.0.4"
+PREFERRED_VERSION_xbacklight ?= "1.1.1"
+PREFERRED_VERSION_xcmsdb ?= "1.0.2"
+PREFERRED_VERSION_xcursorgen ?= "1.0.3"
+PREFERRED_VERSION_xcursorgen-native ?= "1.0.3"
+PREFERRED_VERSION_xdpyinfo ?= "1.1.0"
+PREFERRED_VERSION_xdriinfo ?= "1.0.3"
+PREFERRED_VERSION_xev ?= "1.0.4"
+PREFERRED_VERSION_xgamma ?= "1.0.3"
+PREFERRED_VERSION_xhost ?= "1.0.3"
+PREFERRED_VERSION_xinput ?= "1.5.0"
+PREFERRED_VERSION_xkbcomp ?= "1.1.1"
+PREFERRED_VERSION_xkbcomp-native ?= "1.1.1"
+PREFERRED_VERSION_xkbevd ?= "1.1.0"
+PREFERRED_VERSION_xkbutils ?= "1.0.2"
+PREFERRED_VERSION_xkill ?= "1.0.2"
+PREFERRED_VERSION_xlsatoms ?= "1.0.2"
+PREFERRED_VERSION_xlsclients ?= "1.0.2"
+PREFERRED_VERSION_xmodmap ?= "1.0.4"
+PREFERRED_VERSION_xpr ?= "1.0.3"
+PREFERRED_VERSION_xprop ?= "1.1.0"
+PREFERRED_VERSION_xrandr ?= "1.3.2"
+PREFERRED_VERSION_xrdb ?= "1.0.6"
+PREFERRED_VERSION_xrefresh ?= "1.0.3"
+PREFERRED_VERSION_xset ?= "1.1.0"
+PREFERRED_VERSION_xsetroot ?= "1.0.3"
+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.0.1"
-PREFERRED_VERSION_xcursor-themes ?= "1.0.1"
+PREFERRED_VERSION_xbitmaps ?= "1.1.0"
+PREFERRED_VERSION_xcursor-themes ?= "1.0.2"
# doc
-PREFERRED_VERSION_xorg-docs ?= "1.4"
-PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
+PREFERRED_VERSION_xorg-docs ?= "1.5"
+PREFERRED_VERSION_xorg-sgml-doctools ?= "1.3"
# driver
-PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-aiptek ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0"
-PREFERRED_VERSION_xf86-input-joystick ?= "1.3.2"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1"
-PREFERRED_VERSION_xf86-input-mouse ?= "1.3.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.9.0"
-PREFERRED_VERSION_xf86-video-chips ?= "1.2.0"
+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-keyboard ?= "1.4.0"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0"
+PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5"
+PREFERRED_VERSION_xf86-input-void ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-apm ?= "1.2.2"
+PREFERRED_VERSION_xf86-video-ark ?= "0.7.2"
+PREFERRED_VERSION_xf86-video-ast ?= "0.89.9"
+PREFERRED_VERSION_xf86-video-ati ?= "6.12.4"
+PREFERRED_VERSION_xf86-video-chips ?= "1.2.2"
PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2"
-PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0"
-PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0"
-PREFERRED_VERSION_xf86-video-geode ?= "2.11.4.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-impact ?= "0.2.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.6.3"
-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-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"
-PREFERRED_VERSION_xf86-video-savage ?= "2.2.1"
-PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.6.0"
-PREFERRED_VERSION_xf86-video-sis ?= "0.10.0"
-PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.0"
-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.2.0"
+PREFERRED_VERSION_xf86-video-dummy ?= "0.3.2"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.1"
+PREFERRED_VERSION_xf86-video-geode ?= "2.11.6"
+PREFERRED_VERSION_xf86-video-glint ?= "1.2.4"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3"
+PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2"
+PREFERRED_VERSION_xf86-video-intel ?= "2.9.1"
+PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2"
+PREFERRED_VERSION_xf86-video-mga ?= "1.4.11"
+PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4"
+PREFERRED_VERSION_xf86-video-newport ?= "0.2.3"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.15"
+PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904"
+PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1"
+PREFERRED_VERSION_xf86-video-rendition ?= "4.2.3"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.6.3"
+PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.4"
+PREFERRED_VERSION_xf86-video-savage ?= "2.3.1"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.7.3"
+PREFERRED_VERSION_xf86-video-sis ?= "0.10.2"
+PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.3"
+PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.1"
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.2.0"
-PREFERRED_VERSION_xf86-video-trident ?= "1.3.0"
-PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.3"
+PREFERRED_VERSION_xf86-video-tga ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-trident ?= "1.3.3"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.2.3"
PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
-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"
+PREFERRED_VERSION_xf86-video-vesa ?= "2.2.1"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.16.8"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0"
+PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1"
+PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.4"
# font
-PREFERRED_VERSION_encodings ?= "1.0.2"
-PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1"
-PREFERRED_VERSION_font-util-native ?= "1.0.1"
-PREFERRED_VERSION_font-util ?= "1.0.1"
-PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1"
+PREFERRED_VERSION_encodings ?= "1.0.3"
+PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-adobe-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-adobe-utopia-100dpi ?= "1.0.2"
+PREFERRED_VERSION_font-adobe-utopia-75dpi ?= "1.0.2"
+PREFERRED_VERSION_font-adobe-utopia-type1 ?= "1.0.2"
+PREFERRED_VERSION_font-alias ?= "1.0.2"
+PREFERRED_VERSION_font-arabic-misc ?= "1.0.1"
+PREFERRED_VERSION_font-bh-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-lucidatypewriter-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-lucidatypewriter-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bh-ttf ?= "1.0.1"
+PREFERRED_VERSION_font-bh-type1 ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-100dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-75dpi ?= "1.0.1"
+PREFERRED_VERSION_font-bitstream-type1 ?= "1.0.1"
+PREFERRED_VERSION_font-cronyx-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-cursor-misc ?= "1.0.1"
+PREFERRED_VERSION_font-daewoo-misc ?= "1.0.1"
+PREFERRED_VERSION_font-dec-misc ?= "1.0.1"
+PREFERRED_VERSION_font-ibm-type1 ?= "1.0.1"
+PREFERRED_VERSION_font-isas-misc ?= "1.0.1"
+PREFERRED_VERSION_font-jis-misc ?= "1.0.1"
+PREFERRED_VERSION_font-micro-misc ?= "1.0.1"
+PREFERRED_VERSION_font-misc-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-misc-ethiopic ?= "1.0.1"
+PREFERRED_VERSION_font-misc-meltho ?= "1.0.1"
+PREFERRED_VERSION_font-misc-misc ?= "1.1.0"
+PREFERRED_VERSION_font-mutt-misc ?= "1.0.1"
+PREFERRED_VERSION_font-schumacher-misc ?= "1.1.0"
+PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.2"
+PREFERRED_VERSION_font-sony-misc ?= "1.0.1"
+PREFERRED_VERSION_font-sun-misc ?= "1.0.1"
+PREFERRED_VERSION_font-util ?= "1.1.1"
+PREFERRED_VERSION_font-util-native ?= "1.1.1"
+PREFERRED_VERSION_font-winitzki-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.2"
# lib
-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_libice ?= "1.0.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.4"
-PREFERRED_VERSION_libxaw ?= "1.0.4"
-PREFERRED_VERSION_libxcomposite ?= "0.4.0"
-PREFERRED_VERSION_libxcursor ?= "1.1.9"
-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.3"
-PREFERRED_VERSION_libxfontcache ?= "1.0.4"
-PREFERRED_VERSION_libxft ?= "2.1.13"
-PREFERRED_VERSION_libxi ?= "1.2.0"
-PREFERRED_VERSION_libxinerama ?= "1.0.3"
-PREFERRED_VERSION_libxkbfile ?= "1.0.5"
-PREFERRED_VERSION_libxmu ?= "1.0.4"
-PREFERRED_VERSION_libxpm ?= "3.5.7"
-PREFERRED_VERSION_libxrandr ?= "1.2.3"
-PREFERRED_VERSION_libxrender ?= "0.9.4"
-PREFERRED_VERSION_libxres ?= "1.0.3"
-PREFERRED_VERSION_libxscrnsaver ?= "1.1.3"
-PREFERRED_VERSION_libxt ?= "1.0.5"
-PREFERRED_VERSION_libxtst ?= "1.0.3"
-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.2"
-PREFERRED_VERSION_xtrans ?= "1.2.1"
+PREFERRED_VERSION_libapplewm ?= "1.4.0"
+PREFERRED_VERSION_libfs ?= "1.0.2"
+PREFERRED_VERSION_libice ?= "1.0.6"
+PREFERRED_VERSION_libice-native ?= "1.0.6"
+PREFERRED_VERSION_libsm ?= "1.1.1"
+PREFERRED_VERSION_libsm-native ?= "1.1.1"
+PREFERRED_VERSION_libwindowswm ?= "1.0.1"
+PREFERRED_VERSION_libx11 ?= "1.3.2"
+PREFERRED_VERSION_libx11-native ?= "1.3.2"
+PREFERRED_VERSION_libxscrnsaver ?= "1.2.0"
+PREFERRED_VERSION_libxau ?= "1.0.5"
+PREFERRED_VERSION_libxau-native ?= "1.0.5"
+PREFERRED_VERSION_libxaw ?= "1.0.7"
+PREFERRED_VERSION_libxcomposite ?= "0.4.1"
+PREFERRED_VERSION_libxcursor ?= "1.1.10"
+PREFERRED_VERSION_libxcursor-native ?= "1.1.10"
+PREFERRED_VERSION_libxdamage ?= "1.1.2"
+PREFERRED_VERSION_libxdmcp ?= "1.0.3"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.3"
+PREFERRED_VERSION_libxext ?= "1.1.1"
+PREFERRED_VERSION_libxext-native ?= "1.1.1"
+PREFERRED_VERSION_libxfixes ?= "4.0.4"
+PREFERRED_VERSION_libxfixes-native ?= "4.0.4"
+PREFERRED_VERSION_libxfont ?= "1.4.1"
+PREFERRED_VERSION_libxfont-native ?= "1.4.1"
+PREFERRED_VERSION_libxft ?= "2.1.14"
+PREFERRED_VERSION_libxi ?= "1.3"
+PREFERRED_VERSION_libxinerama ?= "1.1"
+PREFERRED_VERSION_libxmu ?= "1.0.5"
+PREFERRED_VERSION_libxpm ?= "3.5.8"
+PREFERRED_VERSION_libxrandr ?= "1.3.0"
+PREFERRED_VERSION_libxrender ?= "0.9.5"
+PREFERRED_VERSION_libxrender-native ?= "0.9.5"
+PREFERRED_VERSION_libxres ?= "1.0.4"
+PREFERRED_VERSION_libxt ?= "1.0.7"
+PREFERRED_VERSION_libxt-native ?= "1.0.7"
+PREFERRED_VERSION_libxtst ?= "1.1.0"
+PREFERRED_VERSION_libxv ?= "1.0.5"
+PREFERRED_VERSION_libxvmc ?= "1.0.5"
+PREFERRED_VERSION_libxxf86dga ?= "1.1.1"
+PREFERRED_VERSION_libxxf86vm ?= "1.1.0"
+PREFERRED_VERSION_libdmx ?= "1.1.0"
+PREFERRED_VERSION_libfontenc ?= "1.0.5"
+PREFERRED_VERSION_libfontenc-native ?= "1.0.5"
+PREFERRED_VERSION_libpciaccess ?= "0.10.9"
+PREFERRED_VERSION_libxkbfile ?= "1.0.6"
+PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
+PREFERRED_VERSION_xtrans ?= "1.2.5"
+PREFERRED_VERSION_xtrans-native ?= "1.2.5"
# This should be here but is needed until bitbake can do
# versioned depends
PREFERRED_VERSION_mesa ?= "7.4"
# 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.5.0"
-PREFERRED_VERSION_kbproto ?= "1.0.3"
-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_dri2proto ?= "2.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_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"
+PREFERRED_VERSION_applewmproto ?= "1.4.1"
+PREFERRED_VERSION_bigreqsproto ?= "1.1.0"
+PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0"
+PREFERRED_VERSION_compositeproto ?= "0.4.1"
+PREFERRED_VERSION_damageproto ?= "1.2.0"
+PREFERRED_VERSION_dmxproto ?= "2.3"
+PREFERRED_VERSION_dri2proto ?= "2.1"
+PREFERRED_VERSION_fixesproto ?= "4.1.1"
+PREFERRED_VERSION_fixesproto-native ?= "4.1.1"
+PREFERRED_VERSION_fontsproto ?= "2.1.0"
+PREFERRED_VERSION_fontsproto-native ?= "2.1.0"
+PREFERRED_VERSION_glproto ?= "1.4.10"
+PREFERRED_VERSION_inputproto ?= "2.0"
+PREFERRED_VERSION_inputproto-native ?= "2.0"
+PREFERRED_VERSION_kbproto ?= "1.0.4"
+PREFERRED_VERSION_kbproto-native ?= "1.0.4"
+PREFERRED_VERSION_randrproto ?= "1.3.1"
+PREFERRED_VERSION_recordproto ?= "1.14"
+PREFERRED_VERSION_renderproto ?= "0.11"
+PREFERRED_VERSION_renderproto-native ?= "0.11"
+PREFERRED_VERSION_resourceproto ?= "1.1.0"
+PREFERRED_VERSION_scrnsaverproto ?= "1.2.0"
+PREFERRED_VERSION_videoproto ?= "2.3.0"
+PREFERRED_VERSION_windowswmproto ?= "1.0.4"
+PREFERRED_VERSION_xcmiscproto ?= "1.2.0"
+PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0"
+PREFERRED_VERSION_xextproto ?= "7.1.1"
+PREFERRED_VERSION_xextproto-native ?= "7.1.1"
+PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0"
+PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0"
+PREFERRED_VERSION_xf86dgaproto ?= "2.1"
+PREFERRED_VERSION_xf86driproto ?= "2.1.0"
+PREFERRED_VERSION_xf86vidmodeproto ?= "2.3"
+PREFERRED_VERSION_xineramaproto ?= "1.2"
+PREFERRED_VERSION_xproto ?= "7.0.16"
+PREFERRED_VERSION_xproto-native ?= "7.0.16"
# util
-PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-PREFERRED_VERSION_imake ?= "1.0.2"
-PREFERRED_VERSION_makedepend ?= "1.0.1"
-PREFERRED_VERSION_util-macros-native ?= "1.2.1"
-PREFERRED_VERSION_util-macros ?= "1.2.1"
-PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
+PREFERRED_VERSION_makedepend ?= "1.0.2"
+PREFERRED_VERSION_makedepend-native ?= "1.0.2"
+PREFERRED_VERSION_util-macros ?= "1.3.0"
+PREFERRED_VERSION_util-macros-native ?= "1.3.0"
# xserver
-PREFERRED_VERSION_xserver-kdrive ?= "1.4"
-PREFERRED_VERSION_xserver-xorg ?= "1.5.3"
+PREFERRED_VERSION_xserver-xorg ?= "1.7.1"
# Unreleased packages
SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
--- /dev/null
+inherit native
+require xorg-app-common.inc
+PE = "1"
+
+XORG_PN = "bdftopcf"
+
+DEPENDS = "libxfont-native"
+
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "converts BDF fonts to PCF fonts"
+
+DEPENDS += " libxfont"
+
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "a tool for manipulating ICE protocol authorization records"
+
+DEPENDS += " libice"
+
--- /dev/null
+require xorg-app-common.inc
+DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals"
+DEPENDS += " zlib zlib virtual/libx11 libfontenc"
+PE = "1"
--- /dev/null
+inherit native
+
+require mkfontdir_1.0.4.bb
+
+DEPENDS = "util-macros-native mkfontscale-native"
+
+S = "${WORKDIR}/mkfontdir-${PV}"
+XORG_PN = "mkfontdir"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "a program to create an index of X font files in a directory"
+
+PE = "1"
+
+RDEPENDS += "mkfontscale"
+
--- /dev/null
+inherit native
+require mkfontscale_${PV}.bb
+
+DEPENDS = "libx11-native libfontenc-native freetype-native"
+
+S="${WORKDIR}/mkfontscale-${PV}"
+XORG_PN="mkfontscale"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "a program to create an index of scalable font files for X"
+
+DEPENDS += " zlib libfontenc freetype virtual/libx11"
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "a simple program for managing utmp/wtmp entries"
+
+DEPENDS += " virtual/libx11"
+
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile virtual/libx11"
+
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxt libxmu"
+
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "X11 server performance test program"
+DEPENDS += "libxmu libxrender libxft libxext fontconfig"
+PE = "1"
+
+FILES_${PN} += "/usr/lib/X11/x11perfcomp/*"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "X authority file utility"
+DEPENDS += "libxau libxext libxmu"
+PE = "1"
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "adjust backlight brightness using RandR extension"
+
+DEPENDS += " virtual/libx11 libxrender libxrandr"
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11"
+
--- /dev/null
+inherit native
+require xcursorgen_${PV}.bb
+
+DEPENDS = "libx11-native libpng-native"
+
+S="${WORKDIR}/xcursorgen-${PV}"
+XORG_PN="xcursorgen"
--- /dev/null
+require xorg-app-common.inc
+DESCRIPTION = "create an X cursor file from a collection of PNG images"
+DEPENDS += " virtual/libx11 libxcursor libpng"
+PE = "1"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "X display information utility"
+LICENSE = "MIT"
+DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
+PE = "1"
+
+SRC_URI += "file://disable-xkb.patch;patch=1"
+
+EXTRA_OECONF = "--disable-xkb"
--- /dev/null
+require xorg-app-common.inc
+DESCRIPTION = "query configuration information of DRI drivers"
+DEPENDS += " virtual/libx11 glproto virtual/libgl"
+PE = "1"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "X Event Viewer"
+LICENSE = "MIT"
+PE = "1"
+
+SRC_URI += "file://diet-x11.patch;patch=1"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "Alter a monitor's gamma correction through the X server"
+DEPENDS += " virtual/libx11 libxxf86vm"
+PE = "1"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "Server access control program for X"
+LICENSE = "MIT"
+DEPENDS += "libxmu libxau"
+PE = "1"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"
--- /dev/null
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+
+SECTION = "x11/applications"
+LICENSE = "MIT-X"
+S="${WORKDIR}/xkbcomp-${PV}"
+
+DEPENDS = "libx11-native libxkbfile-native"
+
+SRC_URI = "${XORG_MIRROR}/individual/app/xkbcomp-${PV}.tar.bz2"
+
+inherit native autotools pkgconfig
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+
+DEPENDS += " virtual/libx11 libxkbfile"
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxkbfile virtual/libx11"
+
--- /dev/null
+require xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxkbfile virtual/libx11"
+
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11 libxmu"
+
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11 libxmu"
+
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11 libxmu"
+
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+LICENSE = "MIT"
+PE = "1"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "print an X window dump"
+DEPENDS += " libxmu virtual/libx11"
+PE = "1"
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "a property displayer for X"
+
+DEPENDS += " libxmu virtual/libx11"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE= "BSD-X"
+DEPENDS += "libxrandr libxrender"
+PE = "1"
+
+SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11"
+
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
+PE = "1"
+
+SRC_URI += "file://disable-xkb.patch;patch=1"
+
+CFLAGS += "-D_GNU_SOURCE"
+EXTRA_OECONF = "--disable-xkb"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
--- /dev/null
+require xorg-app-common.inc
+
+DESCRIPTION = "Print out X-Video extension adaptor information"
+DEPENDS += " libxv"
+PE = "1"
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxmu virtual/libx11"
+
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxmu libxext virtual/libx11"
+
--- /dev/null
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11"
+
--- /dev/null
+require xorg-data-common.inc
+
+DESCRIPTION = "Common X11 Bitmaps"
+LICENSE = "MIT"
+DEPENDS += "libxmu"
+
--- /dev/null
+require xorg-data-common.inc
+PE = "1"
+
+DEPENDS += " libxcursor xcursorgen-native"
+
+FILES_${PN} += "${datadir}/icons"
+
--- /dev/null
+require xorg-doc-common.inc
+
+DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
+source tree."
+
+DEPENDS += " intltool"
+
+PE = "1"
+
+FILES_${PN} += " /usr/share/X11/doc"
+
+EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
--- /dev/null
+require xorg-doc-common.inc
+PE = "1"
+
+FILES_${PN} += " /usr/share/X11/sgml"
--- /dev/null
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- AceCad input driver"
+PE = "1"
+
--- /dev/null
+require xorg-driver-input.inc
+PE = "1"
DESCRIPTION = "X.Org X server -- evdev input driver"
PE = "1"
-
-DEFAULT_PREFERENCE = "-1"
--- /dev/null
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- joystick input driver"
+PE = "1"
--- /dev/null
+require xorg-driver-input.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+
+DEPENDS += " kbproto"
--- /dev/null
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
--- /dev/null
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
--- /dev/null
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare"
+PE = "1"
+
+COMPATIBLE_HOST = 'i.86.*-linux'
--- /dev/null
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- void input driver"
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+"
+
+DEPENDS += " xf86rushproto"
+
+SRC_URI += "file://get-rid-of-host-includes.patch;patch=1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- ark display driver"
+
+SRC_URI += "file://get-rid-of-host-includes.patch;patch=1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- ATI display driver"
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- Chips display driver"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- dummy display driver"
+
+SRC_URI += "file://get-rid-of-host-includes.patch;patch=1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+COMPATIBLE_HOST = 'i.86.*-linux'
+DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Glint display driver"
+
+DEPENDS += " xf86dgaproto drm xf86driproto"
+
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- i128 display driver"
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- i740 display driver"
+
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- MGA display driver"
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+
+PE = "1"
+
+DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070"
+
+DEPENDS += " xf86dgaproto"
+
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards."
+
+#DEPENDS += " "
+
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- NV display driver"
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- openchrome display driver"
+PE = "1"
+
+do_configure_prepend() {
+ rm ${S}/acinclude.m4 || true
+}
+
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- r128 display driver"
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00."
+
+#DEPENDS += " "
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- legacy S3 display driver"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- S3 ViRGE display driver"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- Savage display driver"
+
+DEPENDS += " drm xf86driproto"
+
+EXTRA_OECONF += " \
+ ac_cv_file__usr_include_xorg_dri_h=yes \
+ ac_cv_file__usr_include_xorg_sarea_h=yes \
+ ac_cv_file__usr_include_xorg_dristruct_h=yes \
+"
--- /dev/null
+require xorg-driver-video.inc
+
+PE = "1"
+DESCRIPTION = "X.Org X server -- SiliconMotion display driver"
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- SiS display driver"
+DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
+PE = "1"
+
+EXTRA_OECONF += " \
+ ac_cv_file__usr_include_xorg_dri_h=yes \
+ ac_cv_file__usr_include_xorg_sarea_h=yes \
+ ac_cv_file__usr_include_xorg_dristruct_h=yes \
+"
--- /dev/null
+require xorg-driver-video.inc
+
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- SiS USB display driver"
+DEPENDS += " xineramaproto xf86miscproto"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto"
+
+EXTRA_OECONF += " \
+ ac_cv_file__usr_include_xorg_dri_h=yes \
+ ac_cv_file__usr_include_xorg_sarea_h=yes \
+ ac_cv_file__usr_include_xorg_dristruct_h=yes \
+"
--- /dev/null
+require xorg-driver-video.inc
+
+PE = "1"
+
+DESCRIPTION = "DEC 21030 X11 driver"
+
+DEPENDS += " xf86dgaproto"
+
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.org X server -- Trident display driver"
+DEPENDS += " xf86dgaproto"
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+SRC_URI += "file://fix-includepath.patch;patch=1 \
+ file://fix-configure-includes.patch;patch=1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+DESCRIPTION = "X11 driver for Voodoo/Voodoo2"
+
+DEPENDS += " xf86dgaproto"
--- /dev/null
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- wsfb display driver"
+PE = "1"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
--- /dev/null
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
--- /dev/null
+EXTRA_OECONF = "STAGING_LIBDIR_NATIVE=\"${STAGING_LIBDIR_NATIVE}\""
+
+require xorg-font-common.inc
+
+SRC_URI += " file://configure-mapdir.patch;patch=1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
--- /dev/null
+require xorg-lib-common.inc
+
+DEPENDS += "libxext applewmproto"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libAppleWM"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Distributed Multihead extension library"
+DEPENDS += "libxext dmxproto"
+PR = "r1"
+PE = "1"
--- /dev/null
+require libfontenc_${PV}.bb
+
+DEPENDS = "zlib-native xproto-native"
+PE = "1"
+
+XORG_PN = "libfontenc"
+
+inherit native
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 font encoding library"
+LICENSE = "BSD-X"
+DEPENDS += "zlib xproto"
+PR = "r1"
+PE = "1"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Font Services library"
+DEPENDS += "xproto fontsproto xtrans"
+PE = "1"
+
+XORG_PN = "libFS"
--- /dev/null
+require libice_${PV}.bb
+
+DEPENDS = "libx11-native xproto-native xtrans-native"
+PROVIDES = "ice-native"
+
+inherit native
+
+XORG_PN = "libICE"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Inter-Client Exchange library"
+DEPENDS += "xproto xtrans"
+PROVIDES = "ice"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libICE"
--- /dev/null
+require xorg-lib-common.inc
+
+DEPENDS += "xproto virtual/libx11"
+
+PR="r1"
--- /dev/null
+require libsm_${PV}.bb
+
+inherit native
+
+DEPENDS = "libx11-native libice-native xproto-native xtrans-native"
+
+XORG_PN = "libSM"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Session management library"
+DEPENDS += "libice xproto xtrans e2fsprogs-libs"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libSM"
--- /dev/null
+require xorg-lib-common.inc
+
+DEPENDS += "libxext windowswmproto"
+PE = "1"
+
+XORG_PN = "libWindowsWM"
--- /dev/null
+require libx11_${PV}.bb
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = ""
+
+inherit native
--- /dev/null
+diff -uNr libX11-1.2.99.901.orig/acinclude.m4 libX11-1.2.99.901/acinclude.m4
+--- libX11-1.2.99.901.orig/acinclude.m4 2009-09-05 10:57:11.000000000 +0200
++++ libX11-1.2.99.901/acinclude.m4 2009-09-05 10:59:14.000000000 +0200
+@@ -197,7 +197,7 @@
+ cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
+ #!$DOLT_BASH
+ __DOLTLIBTOOL__EOF__
+- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool
+ top_builddir_slash="${0%%doltlibtool}"
+ : ${top_builddir_slash:=./}
+ args=()
+@@ -213,7 +213,7 @@
+ if $modeok && $tagok ; then
+ . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
+ else
+- exec ${top_builddir_slash}libtool "$[]@"
++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@"
+ fi
+ __DOLTLIBTOOL__EOF__
+
--- /dev/null
+diff -uNr libX11-1.2.99.901.orig/src/util/Makefile.am libX11-1.2.99.901/src/util/Makefile.am
+--- libX11-1.2.99.901.orig/src/util/Makefile.am 2009-08-12 13:21:19.000000000 +0200
++++ libX11-1.2.99.901/src/util/Makefile.am 2009-08-12 13:22:21.000000000 +0200
+@@ -1,20 +1,3 @@
+ # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
+
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS=$(X11_CFLAGS)
+-
+-CC = @CC_FOR_BUILD@
+-
+ EXTRA_DIST = mkks.sh
+-
+-if LINT
+-# Check source code with tools like lint & sparse
+-
+-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+-
+-lint:
+- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
+-
+-endif LINT
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+ libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+PROVIDES = "virtual/libx11"
+PE = "1"
+PR = "r3"
+
+XORG_PN = "libX11"
+
+SRC_URI += "file://x11_disable_makekeys.1.6.3.patch;patch=1 \
+ file://dolt-fix.patch;patch=1 \
+ file://keysymdef_include.patch;patch=1"
+
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd src/util;
+ mv makekeys.c.orig makekeys.c || true
+ touch makekeys-makekeys.o ; gcc makekeys.c -o makekeys
+ mv to stop it getting rebuilt
+ mv makekeys.c makekeys.c.orig
+ cd ../../
+ ) || exit 1
+ oe_runmake
+}
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
--- /dev/null
+require libxau_${PV}.bb
+
+DEPENDS = "xproto-native util-macros-native"
+PROVIDES = ""
+PR = "r1"
+
+XORG_PN = "libXau"
+
+inherit native
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "A Sample Authorization Protocol for X"
+DEPENDS += " xproto"
+PROVIDES = "xau"
+PE = "1"
+
+XORG_PN = "libXau"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Athena Widget Set"
+DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PROVIDES = "xaw"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXaw"
+
+do_stage_append () {
+ ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
+ ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
+ ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
+}
+
+PACKAGES =+ "libxaw6 libxaw7 libxaw8"
+
+FILES_libxaw6 = "${libdir}/libXaw6.so.6*"
+FILES_libxaw7 = "${libdir}/libXaw7.so.7*"
+FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Composite extension library."
+LICENSE= "BSD-X"
+DEPENDS += " compositeproto virtual/libx11 libxfixes libxext"
+PROVIDES = "xcomposite"
+PE = "1"
+
+XORG_PN = "libXcomposite"
--- /dev/null
+require libxcursor_${PV}.bb
+
+DEPENDS = "libx11-native fixesproto-native libxfixes-native"
+PE = "1"
+
+inherit native
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X cursor management library"
+LICENSE= "BSD-X"
+DEPENDS += "libxrender libxfixes"
+PR = "r2"
+PE = "1"
+
+XORG_PN = "libXcursor"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 damaged region extension library"
+LICENSE= "BSD-X"
+DEPENDS += "damageproto libxfixes"
+PROVIDES = "xdamage"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXdamage"
--- /dev/null
+require libxdmcp_${PV}.bb
+
+DEPENDS = "xproto-native util-macros-native"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXdmcp"
+PROVIDES = ""
+
+inherit native
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Display Manager Control Protocol library"
+DEPENDS += "xproto"
+PROVIDES = "xdmcp"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXdmcp"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto-native libx11-native xextproto-native libxau-native util-macros-native"
+PROVIDES = "xext-native"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXext"
+
+inherit native
+
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau"
+PROVIDES = "xext"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXext"
--- /dev/null
+require libxfixes_${PV}.bb
+
+DEPENDS = "libx11-native"
+PE = "1"
+
+inherit native
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Fixes extension library."
+LICENSE= "BSD-X"
+DEPENDS += "virtual/libx11 xproto fixesproto xextproto"
+PE = "1"
+
+XORG_PN = "libXfixes"
--- /dev/null
+require libxfont_${PV}.bb
+
+DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native \
+ libfontenc-native xtrans-native freetype-native util-macros-native"
+PE = "1"
+
+# no need for patch used in libxfont
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
+
+inherit native
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 font rasterisation library"
+LICENSE= "BSD-X"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PROVIDES = "xfont"
+PE = "1"
+
+#SRC_URI += "file://no-scalable-crash.patch;patch=1"
+
+XORG_PN = "libXfont"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "FreeType-based font drawing library for X"
+DEPENDS += "libxrender freetype fontconfig"
+PROVIDES = "xft"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXft"
+
+python do_package() {
+ if bb.data.getVar('DEBIAN_NAMES', d, 1):
+ bb.data.setVar('PKG_${PN}', 'libxft2', d)
+ bb.build.exec_func('package_do_package', d)
+}
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+ ${libdir}/*.a ${libdir}/pkgconfig \
+ ${datadir}/aclocal ${bindir} ${sbindir}"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Input extension library"
+DEPENDS += "libxext inputproto"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXi"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Xinerama extension library"
+DEPENDS += "libxext xineramaproto"
+PROVIDES = "xinerama"
+PR = "r3"
+PE = "1"
+
+XORG_PN = "libXinerama"
--- /dev/null
+require libxkbfile_${PV}.bb
+
+DEPENDS = "libx11-native kbproto-native"
+PE = "1"
+
+XORG_PN = "libxkbfile"
+
+inherit native
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 keyboard file manipulation library"
+LICENSE= "GPL"
+DEPENDS += "virtual/libx11 kbproto"
+PR = "r1"
+PE = "1"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 miscellaneous utility library"
+DEPENDS += "libxt libxext"
+PROVIDES = "xmu"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXmu"
+
+LEAD_SONAME = "libXmu"
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Pixmap library"
+LICENSE = "X-BSD"
+DEPENDS += "libxext libsm libxt"
+PR = "r3"
+PE = "1"
+
+XORG_PN = "libXpm"
+
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
--- /dev/null
+require libxrender_${PV}.bb
+
+DEPENDS = "libx11-native renderproto-native"
+PE = "1"
+
+inherit native
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Rendering Extension client library"
+LICENSE = "BSD-X"
+DEPENDS += "virtual/libx11 renderproto xproto xdmcp"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXrender"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Resource extension library"
+DEPENDS += "libxext resourceproto"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXres"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Screen Saver extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext scrnsaverproto"
+PROVIDES = "libxss"
+RREPLACES = "libxss"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXScrnSaver"
--- /dev/null
+require libxt_${PV}.bb
+
+DEPENDS = "libx11-native libsm-native kbproto-native"
+PROVIDES = "xt-native"
+
+inherit native
+
+XORG_PN = "libXt"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 toolkit intrinsics library"
+DEPENDS += "libsm virtual/libx11 kbproto"
+PROVIDES = "xt"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXt"
+
+EXTRA_OECONF += "--disable-install-makestrs --disable-xkb"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR_NATIVE} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+ ) || exit 1
+ oe_runmake
+}
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Test Extension: client side library"
+DEPENDS += "libxext recordproto inputproto libxi"
+PROVIDES = "xtst"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXtst"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Video extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext videoproto"
+PR = "r1"
+
+XORG_PN = "libXv"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Video Motion Compensation extension library"
+DEPENDS += "libxext libxv videoproto"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXvMC"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Direct Graphics Access extension library"
+DEPENDS += "libxext xf86dgaproto"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXxf86dga"
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 XFree86 video mode extension library"
+DEPENDS += "libxext xf86vidmodeproto"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXxf86vm"
--- /dev/null
+require xtrans_${PV}.bb
+
+DEPENDS = "util-macros-native"
+
+inherit native
--- /dev/null
+require xorg-lib-common.inc
+
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+PR = "r0"
+
+ALLOW_EMPTY = "1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans"
+
+RDEPENDS_${PN}-dev = ""
+
+XORG_PN = "xtrans"
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
--- /dev/null
+require bigreqsproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "bigreqsproto"
+
+inherit native
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
+
+XORG_PN = "bigreqsproto"
--- /dev/null
+require xorg-proto-common.inc
+
+CONFLICTS = "compositeext"
+PE = "1"
+
+XORG_PN = "compositeproto"
--- /dev/null
+require xorg-proto-common.inc
+
+CONFLICTS = "damageext"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "damageproto"
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
--- /dev/null
+DESCRIPTION = "DRI2 extension headers"
+
+require xorg-proto-common.inc
--- /dev/null
+require fixesproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "fixesproto"
+
+inherit native
--- /dev/null
+require xorg-proto-common.inc
+
+CONFLICTS = "fixesext"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "fixesproto"
--- /dev/null
+require fontsproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "fontsproto"
+
+S = "${WORKDIR}/fontsproto-${PV}"
+
+inherit native
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
--- /dev/null
+require inputproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "inputproto"
+
+inherit native
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
+
+XORG_PN = "inputproto"
--- /dev/null
+require kbproto_${PV}.bb
+require xorg-proto-native.inc
+
+PR = "r1"
+
+XORG_PN = "kbproto"
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
+
+XORG_PN = "kbproto"
--- /dev/null
+require xorg-proto-common.inc
+
+CONFLICTS = "randrext"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "randrproto"
--- /dev/null
+require xorg-proto-common.inc
+
+CONFLICTS = "recordext"
+PR = "r1"
+PE = "1"
--- /dev/null
+require renderproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "renderproto"
+
+inherit native
--- /dev/null
+require xorg-proto-common.inc
+
+CONFLICTS = "renderext"
+PE = "1"
--- /dev/null
+require xorg-proto-common.inc
+
+CONFLICTS = "resourceext"
+PR = "r1"
+PE = "1"
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
--- /dev/null
+require xcmiscproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "xcmiscproto"
+
+inherit native
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
+
+XORG_PN = "xcmiscproto"
--- /dev/null
+require xextproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "xextproto"
+
+inherit native
--- /dev/null
+require xorg-proto-common.inc
+
+PE = "1"
--- /dev/null
+require xf86bigfontproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "xf86bigfontproto"
+
+inherit native
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
+
+XORG_PN = "xf86bigfontproto"
--- /dev/null
+require xorg-proto-common.inc
+
+CONFLICTS = "xxf86dgaext"
+PR = "r1"
+PE = "1"
--- /dev/null
+require xorg-proto-common.inc
+
+PE = "1"
--- /dev/null
+require xorg-proto-common.inc
+
+CONFLICTS = "xxf86vmext"
+PR = "r1"
+PE = "1"
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
--- /dev/null
+require xproto_${PV}.bb
+
+DEPENDS += "util-macros-native"
+
+inherit native
--- /dev/null
+require xorg-proto-common.inc
+
+PR = "r0"
+PE = "1"
+
+DEPENDS += "util-macros"
+
+XORG_PN = "xproto"
--- /dev/null
+require xorg-util-common.inc
+inherit native
+
+DESCRIPTION = "create dependencies in makefiles"
+DEPENDS = "xproto-native util-macros-native"
+PR = "r2"
+PE = "1"
+
+XORG_PN = "makedepend"
--- /dev/null
+require xorg-util-common.inc
+
+DESCRIPTION = "create dependencies in makefiles"
+DEPENDS = "xproto util-macros"
+PR = "r2"
+PE = "1"
--- /dev/null
+Index: xorg-server/m4/dolt.m4
+===================================================================
+--- xorg-server.orig/m4/dolt.m4 2009-04-14 21:14:56.000000000 +0400
++++ xorg-server/m4/dolt.m4 2009-07-15 12:38:33.796848843 +0400
+@@ -147,7 +147,7 @@
+ cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
+ #!$DOLT_BASH
+ __DOLTLIBTOOL__EOF__
+- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool
+ top_builddir_slash="${0%%doltlibtool}"
+ : ${top_builddir_slash:=./}
+ args=()
+@@ -163,7 +163,7 @@
+ if $modeok && $tagok ; then
+ . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
+ else
+- exec ${top_builddir_slash}libtool "$[]@"
++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@"
+ fi
+ __DOLTLIBTOOL__EOF__
+
--- /dev/null
+diff -Nur xorg-server-1.7.0.orig/hw/xfree86/common/xf86Xinput.c xorg-server-1.7.0/hw/xfree86/common/xf86Xinput.c
+--- xorg-server-1.7.0.orig/hw/xfree86/common/xf86Xinput.c 2009-09-24 07:12:00.000000000 +0200
++++ xorg-server-1.7.0/hw/xfree86/common/xf86Xinput.c 2009-10-08 11:45:50.000000000 +0200
+@@ -95,6 +95,8 @@
+
+ #include "os.h"
+
++#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
++
+ EventListPtr xf86Events = NULL;
+
+ /**
+@@ -1086,4 +1088,67 @@
+ EnableDevice(dev, TRUE);
+ }
+
++/* Taken from evdev-properties.h. */
++#define EVDEV_PROP_SWAP_AXES "Evdev Axes Swap"
++#define EVDEV_PROP_INVERT_AXES "Evdev Axis Inversion"
++
++/* This is a hack until we get device -> CRTC association. */
++void
++xf86InputRotationNotify(Rotation rotation)
++{
++ DeviceIntPtr dev;
++ LocalDevicePtr local;
++ int ret;
++ int swap_axes = 0;
++ CARD8 invert[2] = { 0, 0 };
++ static Atom prop_swap = 0, prop_invert = 0;
++ static int atom_generation = -1;
++
++ if (atom_generation != serverGeneration) {
++ prop_swap = 0;
++ prop_invert = 0;
++ }
++
++ switch (rotation & RR_Rotate_All) {
++ case RR_Rotate_0:
++ break;
++ case RR_Rotate_90:
++ swap_axes = 1;
++ invert[0] = 1;
++ break;
++ case RR_Rotate_180:
++ invert[0] = 1;
++ invert[1] = 1;
++ break;
++ case RR_Rotate_270:
++ swap_axes = 1;
++ invert[1] = 1;
++ break;
++ }
++
++ if (!prop_swap)
++ prop_swap = MakeAtom(EVDEV_PROP_SWAP_AXES,
++ strlen(EVDEV_PROP_SWAP_AXES), TRUE);
++ if (!prop_invert)
++ prop_invert = MakeAtom(EVDEV_PROP_INVERT_AXES,
++ strlen(EVDEV_PROP_INVERT_AXES), TRUE);
++
++ for (dev = inputInfo.devices; dev; dev = dev->next) {
++ local = dev->public.devicePrivate;
++ ret = XIChangeDeviceProperty(dev, prop_swap, XA_INTEGER, 8,
++ PropModeReplace, 1, &swap_axes, FALSE);
++ if (ret != Success) {
++ xf86Msg(X_ERROR, "Changing swap_xy property failed!\n");
++ continue;
++ }
++ ret = XIChangeDeviceProperty(dev, prop_invert, XA_INTEGER, 8,
++ PropModeReplace, 2, invert, FALSE);
++ if (ret != Success) {
++ xf86Msg(X_ERROR, "Changing invert property failed!\n");
++ continue;
++ }
++ }
++}
++
++
+ /* end of xf86Xinput.c */
+diff -Nur xorg-server-1.7.0.orig/hw/xfree86/modes/xf86Crtc.c xorg-server-1.7.0/hw/xfree86/modes/xf86Crtc.c
+--- xorg-server-1.7.0.orig/hw/xfree86/modes/xf86Crtc.c 2009-10-01 08:27:36.000000000 +0200
++++ xorg-server-1.7.0/hw/xfree86/modes/xf86Crtc.c 2009-10-08 11:28:42.000000000 +0200
+@@ -391,6 +391,12 @@
+ if (didLock)
+ crtc->funcs->unlock (crtc);
+
++ /*
++ * Rotate Touchscreen
++ */
++ xf86InputRotationNotify(crtc->rotation);
++
++
+ return ret;
+ }
+
--- /dev/null
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
+PE = "2"
+PR = "r1"
+
+SRC_URI += "file://sysroot_fix.patch;patch=1 \
+ file://dolt-fix-1.7.0.patch;patch=1 \
+ file://randr-support-1.7.0.patch;patch=1 \
+ "
+do_install_prepend() {
+ mkdir -p ${D}/${libdir}/X11/fonts
+}
+
+EXTRA_OECONF += "--disable-xephyr --disable-config-hal --disable-xinerama --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests "
+
+export LDFLAGS += " -ldl "