* [PATCH 1/9] xorg-app: move older not pinned versions to obsolete dir
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
@ 2010-08-16 15:30 ` Martin Jansa
2010-08-16 15:30 ` [PATCH 2/9] xorg-lib: " Martin Jansa
` (11 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 15:30 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb | 10 ++
.../obsolete/xorg/xorg-app/beforelight_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb | 7 +
recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb | 7 +
recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb | 7 +
recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb | 9 +
recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb | 8 +
.../obsolete/xorg/xorg-app/mkcomposecache_1.2.bb | 6 +
recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb | 10 ++
recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb | 10 ++
.../obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb | 9 +
.../obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb | 9 +
.../obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb | 9 +
recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb | 9 +
recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb | 6 +
recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb | 6 +
recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb | 6 +
recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb | 7 +
recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb | 7 +
recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb | 7 +
recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb | 13 ++
recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb | 6 +
recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb | 9 +
recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb | 9 +
recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb | 9 +
recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb | 8 +
recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb | 8 +
recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb | 8 +
recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb | 8 +
recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb | 7 +
recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb | 9 +
recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb | 9 +
recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb | 9 +
recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb | 6 +
recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb | 5 +
recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb | 11 ++
recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb | 8 +
.../obsolete/xorg/xorg-app/xmodmap/autofoo.patch | 109 ++++++++++++++
recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch | 157 ++++++++++++++++++++
recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb | 8 +
recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch | 132 ++++++++++++++++
recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb | 9 +
recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb | 9 +
recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb | 9 +
recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb | 6 +
recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xset/autofoo.patch | 109 ++++++++++++++
.../obsolete/xorg/xorg-app/xset/disable-xkb.patch | 18 +++
recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb | 14 ++
recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb | 14 ++
recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb | 14 ++
.../obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb | 7 +
recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb | 9 +
recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb | 9 +
recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb | 7 +
recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb | 6 +
recipes/xorg-app/appres_1.0.1.bb | 8 -
recipes/xorg-app/bdftopcf_1.0.1.bb | 10 --
recipes/xorg-app/beforelight_1.0.2.bb | 7 -
recipes/xorg-app/bitmap_1.0.2.bb | 7 -
recipes/xorg-app/bitmap_1.0.3.bb | 7 -
recipes/xorg-app/constype_1.0.1.bb | 8 -
recipes/xorg-app/editres_1.0.2.bb | 7 -
recipes/xorg-app/editres_1.0.3.bb | 7 -
recipes/xorg-app/fonttosfnt_1.0.3.bb | 7 -
recipes/xorg-app/fslsfonts_1.0.1.bb | 7 -
recipes/xorg-app/fstobdf_1.0.2.bb | 7 -
recipes/xorg-app/iceauth_1.0.2.bb | 8 -
recipes/xorg-app/lbxproxy_1.0.1.bb | 9 -
recipes/xorg-app/luit_1.0.2.bb | 7 -
recipes/xorg-app/luit_1.0.3.bb | 8 -
recipes/xorg-app/mkcomposecache_1.2.bb | 6 -
recipes/xorg-app/mkfontdir_1.0.3.bb | 10 --
recipes/xorg-app/mkfontdir_1.0.4.bb | 10 --
recipes/xorg-app/mkfontscale_1.0.3.bb | 9 -
recipes/xorg-app/mkfontscale_1.0.4.bb | 9 -
recipes/xorg-app/mkfontscale_1.0.5.bb | 9 -
recipes/xorg-app/rgb_1.0.1.bb | 9 -
recipes/xorg-app/rstart_1.0.2.bb | 6 -
recipes/xorg-app/sessreg_1.0.2.bb | 6 -
recipes/xorg-app/sessreg_1.0.3.bb | 6 -
recipes/xorg-app/sessreg_1.0.4.bb | 7 -
recipes/xorg-app/setxkbmap_1.0.3.bb | 7 -
recipes/xorg-app/setxkbmap_1.0.4.bb | 7 -
recipes/xorg-app/showfont_1.0.1.bb | 7 -
recipes/xorg-app/smproxy_1.0.2.bb | 7 -
recipes/xorg-app/twm_1.0.3.bb | 13 --
recipes/xorg-app/x11perf_1.4.1.bb | 8 -
recipes/xorg-app/x11perf_1.5.bb | 10 --
recipes/xorg-app/xauth_1.0.2.bb | 8 -
recipes/xorg-app/xauth_1.0.3.bb | 8 -
recipes/xorg-app/xbacklight_1.1.bb | 8 -
recipes/xorg-app/xcalc_1.0.1.bb | 7 -
recipes/xorg-app/xclipboard_1.0.1.bb | 7 -
recipes/xorg-app/xclock_1.0.2.bb | 7 -
recipes/xorg-app/xclock_1.0.3.bb | 8 -
recipes/xorg-app/xcmsdb_1.0.1.bb | 6 -
recipes/xorg-app/xconsole_1.0.2.bb | 7 -
recipes/xorg-app/xcursorgen_1.0.1.bb | 9 -
recipes/xorg-app/xcursorgen_1.0.2.bb | 10 --
recipes/xorg-app/xdm_1.1.3.bb | 10 --
recipes/xorg-app/xdm_1.1.4.bb | 10 --
recipes/xorg-app/xdm_1.1.6.bb | 12 --
recipes/xorg-app/xdm_1.1.7.bb | 12 --
recipes/xorg-app/xdm_1.1.8.bb | 12 --
recipes/xorg-app/xdpyinfo_1.0.2.bb | 12 --
recipes/xorg-app/xdpyinfo_1.0.3.bb | 12 --
recipes/xorg-app/xdriinfo_1.0.1.bb | 7 -
recipes/xorg-app/xdriinfo_1.0.2.bb | 8 -
recipes/xorg-app/xedit_1.0.2.bb | 7 -
recipes/xorg-app/xev_1.0.2.bb | 9 -
recipes/xorg-app/xev_1.0.3.bb | 9 -
recipes/xorg-app/xeyes_1.0.1.bb | 7 -
recipes/xorg-app/xfs_1.0.4.bb | 8 -
recipes/xorg-app/xfs_1.0.5.bb | 8 -
recipes/xorg-app/xfs_1.0.6.bb | 8 -
recipes/xorg-app/xfs_1.0.8.bb | 8 -
recipes/xorg-app/xfsinfo_1.0.1.bb | 7 -
recipes/xorg-app/xgamma_1.0.1.bb | 7 -
recipes/xorg-app/xgamma_1.0.2.bb | 8 -
recipes/xorg-app/xhost_1.0.2.bb | 9 -
recipes/xorg-app/xinit_1.0.3.bb | 8 -
recipes/xorg-app/xinit_1.0.4.bb | 9 -
recipes/xorg-app/xinit_1.0.5.bb | 9 -
recipes/xorg-app/xinit_1.0.7.bb | 9 -
recipes/xorg-app/xinit_1.0.8.bb | 9 -
recipes/xorg-app/xinit_1.0.9.bb | 9 -
recipes/xorg-app/xinit_1.1.0.bb | 9 -
recipes/xorg-app/xinit_1.2.0.bb | 10 --
recipes/xorg-app/xinput_1.3.0.bb | 7 -
recipes/xorg-app/xinput_1.4.2.bb | 7 -
recipes/xorg-app/xinput_1.5.1.bb | 7 -
recipes/xorg-app/xkbcomp_1.0.3.bb | 9 -
recipes/xorg-app/xkbcomp_1.0.4.bb | 9 -
recipes/xorg-app/xkbcomp_1.0.5.bb | 9 -
recipes/xorg-app/xkbevd_1.0.2.bb | 7 -
recipes/xorg-app/xkbutils_1.0.1.bb | 6 -
recipes/xorg-app/xkill_1.0.1.bb | 7 -
recipes/xorg-app/xload_1.0.1.bb | 7 -
recipes/xorg-app/xlsatoms_1.0.1.bb | 7 -
recipes/xorg-app/xlsclients_1.0.1.bb | 7 -
recipes/xorg-app/xlsfonts_1.0.1.bb | 5 -
recipes/xorg-app/xmag_1.0.1.bb | 7 -
recipes/xorg-app/xmag_1.0.2.bb | 8 -
recipes/xorg-app/xman_1.0.2.bb | 10 --
recipes/xorg-app/xman_1.0.3.bb | 11 --
recipes/xorg-app/xmessage_1.0.1.bb | 8 -
recipes/xorg-app/xmodmap/autofoo.patch | 109 --------------
recipes/xorg-app/xmodmap_1.0.2.bb | 8 -
recipes/xorg-app/xmodmap_1.0.3.bb | 8 -
recipes/xorg-app/xpr_1.0.1.bb | 7 -
recipes/xorg-app/xpr_1.0.2.bb | 8 -
recipes/xorg-app/xprop/autofoo.patch | 157 --------------------
recipes/xorg-app/xprop_1.0.2.bb | 7 -
recipes/xorg-app/xprop_1.0.4.bb | 8 -
recipes/xorg-app/xrandr_1.2.2.bb | 10 --
recipes/xorg-app/xrandr_1.2.3.bb | 10 --
recipes/xorg-app/xrdb/autofoo.patch | 132 ----------------
recipes/xorg-app/xrdb_1.0.3.bb | 9 -
recipes/xorg-app/xrdb_1.0.4.bb | 9 -
recipes/xorg-app/xrdb_1.0.5.bb | 9 -
recipes/xorg-app/xrefresh_1.0.2.bb | 6 -
recipes/xorg-app/xrx_1.0.1.bb | 7 -
recipes/xorg-app/xset/autofoo.patch | 109 --------------
recipes/xorg-app/xset/disable-xkb.patch | 18 ---
recipes/xorg-app/xset_1.0.2.bb | 14 --
recipes/xorg-app/xset_1.0.3.bb | 14 --
recipes/xorg-app/xset_1.0.4.bb | 14 --
recipes/xorg-app/xsetpointer_1.0.0.bb | 7 -
recipes/xorg-app/xsetroot_1.0.1.bb | 9 -
recipes/xorg-app/xsetroot_1.0.2.bb | 9 -
recipes/xorg-app/xvinfo_1.0.1.bb | 8 -
recipes/xorg-app/xvinfo_1.0.2.bb | 8 -
recipes/xorg-app/xwd_1.0.1.bb | 7 -
recipes/xorg-app/xwd_1.0.2.bb | 7 -
recipes/xorg-app/xwininfo_1.0.2.bb | 7 -
recipes/xorg-app/xwininfo_1.0.3.bb | 8 -
recipes/xorg-app/xwininfo_1.0.4.bb | 7 -
recipes/xorg-app/xwud_1.0.1.bb | 6 -
246 files changed, 1501 insertions(+), 1501 deletions(-)
create mode 100644 recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/beforelight_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkcomposecache_1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmodmap/autofoo.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xset/autofoo.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xset/disable-xkb.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb
delete mode 100644 recipes/xorg-app/appres_1.0.1.bb
delete mode 100644 recipes/xorg-app/bdftopcf_1.0.1.bb
delete mode 100644 recipes/xorg-app/beforelight_1.0.2.bb
delete mode 100644 recipes/xorg-app/bitmap_1.0.2.bb
delete mode 100644 recipes/xorg-app/bitmap_1.0.3.bb
delete mode 100644 recipes/xorg-app/constype_1.0.1.bb
delete mode 100644 recipes/xorg-app/editres_1.0.2.bb
delete mode 100644 recipes/xorg-app/editres_1.0.3.bb
delete mode 100644 recipes/xorg-app/fonttosfnt_1.0.3.bb
delete mode 100644 recipes/xorg-app/fslsfonts_1.0.1.bb
delete mode 100644 recipes/xorg-app/fstobdf_1.0.2.bb
delete mode 100644 recipes/xorg-app/iceauth_1.0.2.bb
delete mode 100644 recipes/xorg-app/lbxproxy_1.0.1.bb
delete mode 100644 recipes/xorg-app/luit_1.0.2.bb
delete mode 100644 recipes/xorg-app/luit_1.0.3.bb
delete mode 100644 recipes/xorg-app/mkcomposecache_1.2.bb
delete mode 100644 recipes/xorg-app/mkfontdir_1.0.3.bb
delete mode 100644 recipes/xorg-app/mkfontdir_1.0.4.bb
delete mode 100644 recipes/xorg-app/mkfontscale_1.0.3.bb
delete mode 100644 recipes/xorg-app/mkfontscale_1.0.4.bb
delete mode 100644 recipes/xorg-app/mkfontscale_1.0.5.bb
delete mode 100644 recipes/xorg-app/rgb_1.0.1.bb
delete mode 100644 recipes/xorg-app/rstart_1.0.2.bb
delete mode 100644 recipes/xorg-app/sessreg_1.0.2.bb
delete mode 100644 recipes/xorg-app/sessreg_1.0.3.bb
delete mode 100644 recipes/xorg-app/sessreg_1.0.4.bb
delete mode 100644 recipes/xorg-app/setxkbmap_1.0.3.bb
delete mode 100644 recipes/xorg-app/setxkbmap_1.0.4.bb
delete mode 100644 recipes/xorg-app/showfont_1.0.1.bb
delete mode 100644 recipes/xorg-app/smproxy_1.0.2.bb
delete mode 100644 recipes/xorg-app/twm_1.0.3.bb
delete mode 100644 recipes/xorg-app/x11perf_1.4.1.bb
delete mode 100644 recipes/xorg-app/x11perf_1.5.bb
delete mode 100644 recipes/xorg-app/xauth_1.0.2.bb
delete mode 100644 recipes/xorg-app/xauth_1.0.3.bb
delete mode 100644 recipes/xorg-app/xbacklight_1.1.bb
delete mode 100644 recipes/xorg-app/xcalc_1.0.1.bb
delete mode 100644 recipes/xorg-app/xclipboard_1.0.1.bb
delete mode 100644 recipes/xorg-app/xclock_1.0.2.bb
delete mode 100644 recipes/xorg-app/xclock_1.0.3.bb
delete mode 100644 recipes/xorg-app/xcmsdb_1.0.1.bb
delete mode 100644 recipes/xorg-app/xconsole_1.0.2.bb
delete mode 100644 recipes/xorg-app/xcursorgen_1.0.1.bb
delete mode 100644 recipes/xorg-app/xcursorgen_1.0.2.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.3.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.4.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.6.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.7.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.8.bb
delete mode 100644 recipes/xorg-app/xdpyinfo_1.0.2.bb
delete mode 100644 recipes/xorg-app/xdpyinfo_1.0.3.bb
delete mode 100644 recipes/xorg-app/xdriinfo_1.0.1.bb
delete mode 100644 recipes/xorg-app/xdriinfo_1.0.2.bb
delete mode 100644 recipes/xorg-app/xedit_1.0.2.bb
delete mode 100644 recipes/xorg-app/xev_1.0.2.bb
delete mode 100644 recipes/xorg-app/xev_1.0.3.bb
delete mode 100644 recipes/xorg-app/xeyes_1.0.1.bb
delete mode 100644 recipes/xorg-app/xfs_1.0.4.bb
delete mode 100644 recipes/xorg-app/xfs_1.0.5.bb
delete mode 100644 recipes/xorg-app/xfs_1.0.6.bb
delete mode 100644 recipes/xorg-app/xfs_1.0.8.bb
delete mode 100644 recipes/xorg-app/xfsinfo_1.0.1.bb
delete mode 100644 recipes/xorg-app/xgamma_1.0.1.bb
delete mode 100644 recipes/xorg-app/xgamma_1.0.2.bb
delete mode 100644 recipes/xorg-app/xhost_1.0.2.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.3.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.4.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.5.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.7.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.8.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.9.bb
delete mode 100644 recipes/xorg-app/xinit_1.1.0.bb
delete mode 100644 recipes/xorg-app/xinit_1.2.0.bb
delete mode 100644 recipes/xorg-app/xinput_1.3.0.bb
delete mode 100644 recipes/xorg-app/xinput_1.4.2.bb
delete mode 100644 recipes/xorg-app/xinput_1.5.1.bb
delete mode 100644 recipes/xorg-app/xkbcomp_1.0.3.bb
delete mode 100644 recipes/xorg-app/xkbcomp_1.0.4.bb
delete mode 100644 recipes/xorg-app/xkbcomp_1.0.5.bb
delete mode 100644 recipes/xorg-app/xkbevd_1.0.2.bb
delete mode 100644 recipes/xorg-app/xkbutils_1.0.1.bb
delete mode 100644 recipes/xorg-app/xkill_1.0.1.bb
delete mode 100644 recipes/xorg-app/xload_1.0.1.bb
delete mode 100644 recipes/xorg-app/xlsatoms_1.0.1.bb
delete mode 100644 recipes/xorg-app/xlsclients_1.0.1.bb
delete mode 100644 recipes/xorg-app/xlsfonts_1.0.1.bb
delete mode 100644 recipes/xorg-app/xmag_1.0.1.bb
delete mode 100644 recipes/xorg-app/xmag_1.0.2.bb
delete mode 100644 recipes/xorg-app/xman_1.0.2.bb
delete mode 100644 recipes/xorg-app/xman_1.0.3.bb
delete mode 100644 recipes/xorg-app/xmessage_1.0.1.bb
delete mode 100644 recipes/xorg-app/xmodmap/autofoo.patch
delete mode 100644 recipes/xorg-app/xmodmap_1.0.2.bb
delete mode 100644 recipes/xorg-app/xmodmap_1.0.3.bb
delete mode 100644 recipes/xorg-app/xpr_1.0.1.bb
delete mode 100644 recipes/xorg-app/xpr_1.0.2.bb
delete mode 100644 recipes/xorg-app/xprop/autofoo.patch
delete mode 100644 recipes/xorg-app/xprop_1.0.2.bb
delete mode 100644 recipes/xorg-app/xprop_1.0.4.bb
delete mode 100644 recipes/xorg-app/xrandr_1.2.2.bb
delete mode 100644 recipes/xorg-app/xrandr_1.2.3.bb
delete mode 100644 recipes/xorg-app/xrdb/autofoo.patch
delete mode 100644 recipes/xorg-app/xrdb_1.0.3.bb
delete mode 100644 recipes/xorg-app/xrdb_1.0.4.bb
delete mode 100644 recipes/xorg-app/xrdb_1.0.5.bb
delete mode 100644 recipes/xorg-app/xrefresh_1.0.2.bb
delete mode 100644 recipes/xorg-app/xrx_1.0.1.bb
delete mode 100644 recipes/xorg-app/xset/autofoo.patch
delete mode 100644 recipes/xorg-app/xset/disable-xkb.patch
delete mode 100644 recipes/xorg-app/xset_1.0.2.bb
delete mode 100644 recipes/xorg-app/xset_1.0.3.bb
delete mode 100644 recipes/xorg-app/xset_1.0.4.bb
delete mode 100644 recipes/xorg-app/xsetpointer_1.0.0.bb
delete mode 100644 recipes/xorg-app/xsetroot_1.0.1.bb
delete mode 100644 recipes/xorg-app/xsetroot_1.0.2.bb
delete mode 100644 recipes/xorg-app/xvinfo_1.0.1.bb
delete mode 100644 recipes/xorg-app/xvinfo_1.0.2.bb
delete mode 100644 recipes/xorg-app/xwd_1.0.1.bb
delete mode 100644 recipes/xorg-app/xwd_1.0.2.bb
delete mode 100644 recipes/xorg-app/xwininfo_1.0.2.bb
delete mode 100644 recipes/xorg-app/xwininfo_1.0.3.bb
delete mode 100644 recipes/xorg-app/xwininfo_1.0.4.bb
delete mode 100644 recipes/xorg-app/xwud_1.0.1.bb
diff --git a/recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb
new file mode 100644
index 0000000..698b7c4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "The appres program prints the resources seen by an application."
+DEPENDS += " libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "420e6cdf38bb771ec8b00228bf09e8ff"
+SRC_URI[archive.sha256sum] = "15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962"
diff --git a/recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb
new file mode 100644
index 0000000..d5ddd50
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "converts BDF fonts to PCF fonts"
+DEPENDS += " libxfont"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "9685fab33d39954ab8a0d22e0969d5a4"
+SRC_URI[archive.sha256sum] = "aaaa45ab361781aebda2093fdc7eb5c187f6215b4ba308dd6b9ff2b727e805d3"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/beforelight_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/beforelight_1.0.2.bb
new file mode 100644
index 0000000..09852db
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/beforelight_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxscrnsaver libxt libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8bc2e35cdcd2e6a80eab1b77c41f2a46"
+SRC_URI[archive.sha256sum] = "00e217559c93779fe04fd948017820af118a3981d6b4371ace95107cb3b047a7"
diff --git a/recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb
new file mode 100644
index 0000000..70be2aa
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu xbitmaps libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "78e8ab5c1830e2cdfbff7a952162a5a7"
+SRC_URI[archive.sha256sum] = "83719927ac4309f42e3cadde125a52cfba2e9c951115ac4c017f292f6e4c14bc"
diff --git a/recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb
new file mode 100644
index 0000000..9a83106
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu xbitmaps libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "98200c358e5401d648b980564d9ae39d"
+SRC_URI[archive.sha256sum] = "863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41"
diff --git a/recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb
new file mode 100644
index 0000000..d8a957b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "print an X window dump"
+DEPENDS += " libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9f99bee77ff3c565b4898663810fbef5"
+SRC_URI[archive.sha256sum] = "11403054cb407cdf31da48216f55d1b5943798cb442bcab69faa0a3d7d167541"
diff --git a/recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb
new file mode 100644
index 0000000..23956d3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt libxmu libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9db49742bd4c17966fff7d76ac566d31"
+SRC_URI[archive.sha256sum] = "978fbc134eef3da8a5f363c9e93494a3d7399e8f2b435ac6b1f2c63f09c167df"
diff --git a/recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb
new file mode 100644
index 0000000..56cadc1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt libxmu libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a25f931cc6c8d03daaed434f5db5df2d"
+SRC_URI[archive.sha256sum] = "a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae"
diff --git a/recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb
new file mode 100644
index 0000000..71e147c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " xproto freetype libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b0ebd86029571239b9d7b0c61191b591"
+SRC_URI[archive.sha256sum] = "9d2b0149ea49a097ab6c563801c06af9975e98f9fa4c8af1a8ac3238e4fd5243"
diff --git a/recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb
new file mode 100644
index 0000000..c1040ad
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c7b2f8a938749d41dc86db6bd1e6a4ca"
+SRC_URI[archive.sha256sum] = "3feb006a25f36856924e26249fe84b27142678f97175780960f085e1e263a62e"
diff --git a/recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb
new file mode 100644
index 0000000..6c3148c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "99144743ab3cbb9cf37090fdc9e747db"
+SRC_URI[archive.sha256sum] = "690e45b252cd96036dd9b89af8624eb423e16d4bd662b07d264a3f876ce7ac22"
diff --git a/recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb
new file mode 100644
index 0000000..bcda802
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "a tool for manipulating ICE protocol authorization records"
+DEPENDS += " libice"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7ab8b64edf0212a9d9a3c8129901a450"
+SRC_URI[archive.sha256sum] = "06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb"
diff --git a/recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb
new file mode 100644
index 0000000..7b35f1b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Applications that would like to take advantage of the Low Bandwidth \
+extension to X (LBX) must make their connections to an lbxproxy."
+DEPENDS += " xtrans libxext liblbxutil libice xproxymngproto bigreqsproto zlib"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9d5045a5c76b1fe360221b967a5aa0e9"
+SRC_URI[archive.sha256sum] = "e2e757986724a5d2ee299aa7616a3d9985af45e363021b486b7abbcac4ca01c2"
diff --git a/recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb
new file mode 100644
index 0000000..d8c3475
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " zlib zlib libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "aacda46598ce3af8ca16e2a8132db1b2"
+SRC_URI[archive.sha256sum] = "c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c"
diff --git a/recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb
new file mode 100644
index 0000000..4baac79
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals"
+DEPENDS += " zlib zlib libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b01e4f71c20fc1c79ed727759c1df40c"
+SRC_URI[archive.sha256sum] = "2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7"
diff --git a/recipes/obsolete/xorg/xorg-app/mkcomposecache_1.2.bb b/recipes/obsolete/xorg/xorg-app/mkcomposecache_1.2.bb
new file mode 100644
index 0000000..8de1fad
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkcomposecache_1.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+DESCRIPTION = "used for creating global (system-wide) Compose cache files"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c8237b4aea1ae0c15441deab6b12c5c0"
+SRC_URI[archive.sha256sum] = "8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb
new file mode 100644
index 0000000..e3d1782
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of X font files in a directory"
+RDEPENDS_${PN} += "mkfontscale"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "4d0f89a23f77e22f1671a77bf0898955"
+SRC_URI[archive.sha256sum] = "2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb
new file mode 100644
index 0000000..dbc0884
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of X font files in a directory"
+RDEPENDS_${PN} += "mkfontscale"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "35394bf3f746a57fba624dba52fdbba3"
+SRC_URI[archive.sha256sum] = "6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb
new file mode 100644
index 0000000..10d511f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of scalable font files for X"
+DEPENDS += " zlib libfontenc freetype "
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "1d608771aca9695b828cec1e34178fd1"
+SRC_URI[archive.sha256sum] = "0458a3a5525b4ab458a018648ef8575afc191f904364c00e27876a7bd53af020"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb
new file mode 100644
index 0000000..6a29088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of scalable font files for X"
+DEPENDS += " zlib libfontenc freetype "
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "e5d7373c4266973b3b13aac5d1a4655b"
+SRC_URI[archive.sha256sum] = "dc9b946cc23490c960fbca8b32e4bba4bc23ce404a8d7e1c0e916894c83b4227"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb
new file mode 100644
index 0000000..5e37e8e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of scalable font files for X"
+DEPENDS += " zlib libfontenc freetype "
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "5e6e210b70adfef1264b0212aab1f758"
+SRC_URI[archive.sha256sum] = "f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb
new file mode 100644
index 0000000..c78047f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DEPENDS += " xproto util-macros"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "255222b3ab3af671289a6b4844e9f393"
+SRC_URI[archive.sha256sum] = "f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad"
+
+FILES_${PN} += "${datadir}/X11"
diff --git a/recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb
new file mode 100644
index 0000000..2f17f8a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "99aea04a27197056368a4431f30f9cdb"
+SRC_URI[archive.sha256sum] = "02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596"
diff --git a/recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb
new file mode 100644
index 0000000..e7bede7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "bee5d87d40615e67c84ab0b0c65049ba"
+SRC_URI[archive.sha256sum] = "c23c12259854c7cec6d19bf397afff4a542a22170b14de73b321aa8cafcf3a86"
diff --git a/recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb
new file mode 100644
index 0000000..5482af9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "07665816f2623ec82e665fb7d31c6cef"
+SRC_URI[archive.sha256sum] = "7d0c145d53246ddf09fc749f91324897ed9a3da0064808f99b789c37470080dc"
diff --git a/recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb
new file mode 100644
index 0000000..9738608
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a simple program for managing utmp/wtmp entries"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "839e968d7197b9563f0fd8a5a3aac2e3"
+SRC_URI[archive.sha256sum] = "23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802"
diff --git a/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb
new file mode 100644
index 0000000..f9434d7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxkbfile "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2b53542095a35a8a5731164118643883"
+SRC_URI[archive.sha256sum] = "086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508"
diff --git a/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb
new file mode 100644
index 0000000..8a9558b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxkbfile "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6fab3bb176be9e510c5613d054ef1ca4"
+SRC_URI[archive.sha256sum] = "9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac"
diff --git a/recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb
new file mode 100644
index 0000000..a5ffa3a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "339b2faf1ca5114fda414338e15b6e21"
+SRC_URI[archive.sha256sum] = "87db3cf12914abc6b074d12b35c7f39c8fd7b5d3933b339e2c1260a51061760c"
diff --git a/recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb
new file mode 100644
index 0000000..0ef6033
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "31da204a0255ba8c6a65386e65dc1c90"
+SRC_URI[archive.sha256sum] = "76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2"
diff --git a/recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb
new file mode 100644
index 0000000..feaebdd
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb
@@ -0,0 +1,13 @@
+require xorg-app-common.inc
+DESCRIPTION = "tiny window manager"
+DEPENDS += " libxext libxt libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a56b71dc40249195b32b304633c28a3e"
+SRC_URI[archive.sha256sum] = "5b41550477a893bf2b82ab73fc7fb6c839ba52d0deac059be1a473dd7bb92a4e"
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/twm"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "1"
diff --git a/recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb b/recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb
new file mode 100644
index 0000000..7c61228
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X11 server performance test program"
+DEPENDS += "libxmu libxrender libxft libxext fontconfig"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fd06c8b8e3572a0e14af65a49e0dd7d1"
+SRC_URI[archive.sha256sum] = "c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064"
diff --git a/recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb b/recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb
new file mode 100644
index 0000000..9cff277
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X11 server performance test program"
+DEPENDS += "libxmu libxrender libxft libxext fontconfig"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "31283bfc3c78718ac1bd71e510d4e774"
+SRC_URI[archive.sha256sum] = "4729da53dde0b7e1748db4bb771f9b7aaf2e2b1e67293a3a5b96d54043ce1233"
+
+FILES_${PN} += "/usr/lib/X11/x11perfcomp/*"
diff --git a/recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb
new file mode 100644
index 0000000..bd391a2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X authority file utility"
+DEPENDS += "libxau libxext libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "31b956edaeb453ddaa640420e97b25b2"
+SRC_URI[archive.sha256sum] = "569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17"
diff --git a/recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb
new file mode 100644
index 0000000..7adb51d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X authority file utility"
+DEPENDS += "libxau libxext libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e91e10ace1df0d5f2cbc74ead256407a"
+SRC_URI[archive.sha256sum] = "1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c"
diff --git a/recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb b/recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb
new file mode 100644
index 0000000..287b2b1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "adjust backlight brightness using RandR extension"
+DEPENDS += " libxrender libxrandr"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "51b4a1c0ae2b3bd77417306fd78a3e94"
+SRC_URI[archive.sha256sum] = "c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4"
diff --git a/recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb
new file mode 100644
index 0000000..ff042f0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "07b948cf671fde88df1a59bfb0cab3b8"
+SRC_URI[archive.sha256sum] = "17484e5fec0ebe7dd8df7218fde1449c52be3f4c6377a85a9fd86e377a7f4248"
diff --git a/recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb
new file mode 100644
index 0000000..06aeda2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2c6ecedb10dc51adbb64c95f22fd99c2"
+SRC_URI[archive.sha256sum] = "3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc"
diff --git a/recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb
new file mode 100644
index 0000000..0bf6117
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6b930326f71993fb54b7203902b387cd"
+SRC_URI[archive.sha256sum] = "ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d"
diff --git a/recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb
new file mode 100644
index 0000000..73ac39c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "analog / digital clock for X"
+DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2b1a3d030d87e62a591db8ee4c0072e6"
+SRC_URI[archive.sha256sum] = "10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f"
diff --git a/recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb
new file mode 100644
index 0000000..770db7e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8579d5f50ba7f0c4a5bf16b9670fea01"
+SRC_URI[archive.sha256sum] = "e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e"
diff --git a/recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb
new file mode 100644
index 0000000..a7eacc3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8678ddd23573022d68dcd883ae239be8"
+SRC_URI[archive.sha256sum] = "45db847e810a932bb962041a4c242f97779142f7e36feec64ec5f9073bd9b377"
diff --git a/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb
new file mode 100644
index 0000000..39c6aa2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DEPENDS += " libxcursor libpng"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "39e1e62f5bd92603b0230b8b948c2fc4"
+SRC_URI[archive.sha256sum] = "18d3e0d64853089c2154f1f867df087fc15f87e03e09fabc98ee5e265d8a53ef"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb
new file mode 100644
index 0000000..a058a88
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "create an X cursor file from a collection of PNG images"
+DEPENDS += " libxcursor libpng"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "6fc90896b8c786cb1a2100b4167f7874"
+SRC_URI[archive.sha256sum] = "e009322bd2afef8d4ad91bcb6b17874e1cd00b1aaf397e7019a82cc44f3c174e"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb
new file mode 100644
index 0000000..02df29e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "619d0549c6c20ca15aa77769f2fbabe2"
+SRC_URI[archive.sha256sum] = "9e640974c132ef1faafedc77e4602d55457b2791006b677cec071ee8afbf9a74"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb
new file mode 100644
index 0000000..c0268c5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a2b4c280f3e324d081a0d9ed76a8a123"
+SRC_URI[archive.sha256sum] = "928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb
new file mode 100644
index 0000000..9a4d7d3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb
@@ -0,0 +1,12 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c89f8bc74fda4d19e5f374f59c88810f"
+SRC_URI[archive.sha256sum] = "c41ac89d9da5c3f5424e9c4871d363ff17acf0fd2a46830931c447ba0b5a8bcd"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
+
+FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb
new file mode 100644
index 0000000..844413c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb
@@ -0,0 +1,12 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "92effdb698d9ecc9113fe4f49294bd90"
+SRC_URI[archive.sha256sum] = "6a7bceccb1eb9ce3d14259be7a6cc8268bc9e1f127298480b9322ceb6f032d6d"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
+
+FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb
new file mode 100644
index 0000000..fc8fa99
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb
@@ -0,0 +1,12 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "cc1816bc62a3722ad509373b0b7f30fe"
+SRC_URI[archive.sha256sum] = "e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
+
+FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb
new file mode 100644
index 0000000..80f4bf7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb
@@ -0,0 +1,12 @@
+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"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "c9ee60ae52c97c51d4ca327e53f0cb61"
+SRC_URI[archive.sha256sum] = "c9927fc33e8a4422d74b1ebee0d19dd5a16d9ebc435e8f47f0aa546501ccfed3"
+
+EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb
new file mode 100644
index 0000000..eff9c09
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb
@@ -0,0 +1,12 @@
+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"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "b7cbab6cbcd12bf7ad65dbc12d86e104"
+SRC_URI[archive.sha256sum] = "4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962"
+
+EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb
new file mode 100644
index 0000000..8a349d9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " glproto virtual/libgl"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "be3c5a9b242a57226b5bb5f22ec341ca"
+SRC_URI[archive.sha256sum] = "f693977bdaea7eb6b095a6b6bc60b8a62110ecdef4c455211346e592f59c3772"
diff --git a/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb
new file mode 100644
index 0000000..6f27ff2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "query configuration information of DRI drivers"
+DEPENDS += " glproto virtual/libgl"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a5ec51ed9f0a55dc3462d90d52ff899c"
+SRC_URI[archive.sha256sum] = "7b03ac095b6c79688c20ad61e3576d4698e3f16c09a7f3f1e7c50826814e7265"
diff --git a/recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb
new file mode 100644
index 0000000..001cbcd
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxprintutil libxp libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c56160e93c24ddf17e69891ed50deb72"
+SRC_URI[archive.sha256sum] = "2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df"
diff --git a/recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb
new file mode 100644
index 0000000..402db0b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Event Viewer"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://diet-x11.patch"
+SRC_URI[archive.md5sum] = "e3008eb0655da3026c162a5597d70869"
+SRC_URI[archive.sha256sum] = "cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053"
diff --git a/recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb
new file mode 100644
index 0000000..a0990d2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Event Viewer"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://diet-x11.patch"
+SRC_URI[archive.md5sum] = "a9532c3d1683c99bb5df1895cb3a60b1"
+SRC_URI[archive.sha256sum] = "d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a"
diff --git a/recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb
new file mode 100644
index 0000000..6382df4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxau libxt libxext libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "033f14f7c4e30d1f4edbb22d5ef86883"
+SRC_URI[archive.sha256sum] = "530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029"
diff --git a/recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb
new file mode 100644
index 0000000..f50eaf4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f43cb64d623b748208dfd9012d17b654"
+SRC_URI[archive.sha256sum] = "452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b"
diff --git a/recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb
new file mode 100644
index 0000000..1d31d21
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3fc73b5e39a1fe8b8d96563c8144cffe"
+SRC_URI[archive.sha256sum] = "f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9"
diff --git a/recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb b/recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb
new file mode 100644
index 0000000..24028ac
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a62ea490a8b97f74b53732df8fc309d8"
+SRC_URI[archive.sha256sum] = "5a3ad18fdc67e261454740217f7c02d1b6825013abcebdcd778a4865fd823353"
diff --git a/recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb b/recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb
new file mode 100644
index 0000000..6324d81
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f10717e45535b64eb45226aac571dac2"
+SRC_URI[archive.sha256sum] = "34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482"
diff --git a/recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb
new file mode 100644
index 0000000..2df9b2a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e98b18fbce1261de30b1de819d86f48a"
+SRC_URI[archive.sha256sum] = "adc33443b3a7f334d2407de702004a0491f24708e0e1abe74cd8ae114cd60cd9"
diff --git a/recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb
new file mode 100644
index 0000000..d6245ee
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxxf86vm"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "45d8fa3c85d4bfda87251798fd605a45"
+SRC_URI[archive.sha256sum] = "085330064fdb90a152d2d44474fa20bb81ccb6c587c144f5f9c323cb9cc31eee"
diff --git a/recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb
new file mode 100644
index 0000000..2b11285
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "Alter a monitor's gamma correction through the X server"
+DEPENDS += " libxxf86vm"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f13ddedaa63a608d3b025d326f4f5b5d"
+SRC_URI[archive.sha256sum] = "5d3d5b230fc60aefae8f4865c17add133b5fb11377fd61c80897ef94fcccf41e"
diff --git a/recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb
new file mode 100644
index 0000000..1a42fb1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Server access control program for X"
+LICENSE = "MIT"
+DEPENDS += "libxmu libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f746aba36f075ae4cae313d849a94f4e"
+SRC_URI[archive.sha256sum] = "edab2cc49d230f58e54c0f7b83fd726fec5fc31356668a11589649f19ba90db6"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb
new file mode 100644
index 0000000..703f825
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f04a903cc0e18b3c338f58eb90f6caf8"
+SRC_URI[archive.sha256sum] = "c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186"
+
+FILES_${PN} += " /usr/lib/X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb
new file mode 100644
index 0000000..2ff99ce
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9df52a504dc04313a6650fae364ae04a"
+SRC_URI[archive.sha256sum] = "1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb
new file mode 100644
index 0000000..120f42f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9a2aad51042141a0e6ad066015397595"
+SRC_URI[archive.sha256sum] = "95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb
new file mode 100644
index 0000000..50c4270
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8b882d9e2deed9d85469a3beaec566a3"
+SRC_URI[archive.sha256sum] = "15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb
new file mode 100644
index 0000000..1771578
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "521574088fbd688edbf91e6bae674265"
+SRC_URI[archive.sha256sum] = "06c1049f6b63d1c368a1e03e2392097919b22ff24899e190de3577bffe6fe524"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb
new file mode 100644
index 0000000..7d8270a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "224c36057e4416205d4e421af01a2f15"
+SRC_URI[archive.sha256sum] = "b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb
new file mode 100644
index 0000000..1829819
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9144097186c3d2454beffe8ac3b53c6e"
+SRC_URI[archive.sha256sum] = "c79ec1a4d60404715a626f2832f1b62f43b9d52a1e4642b40af743ee41362590"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb
new file mode 100644
index 0000000..fc5ca59
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+DEPENDS += "util-linux-ng"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fe1696cab2fbed6fa059d0cd1c53ac13"
+SRC_URI[archive.sha256sum] = "ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb b/recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb
new file mode 100644
index 0000000..dac3150
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "977d657e8d7b59f7d82c98ebef444b28"
+SRC_URI[archive.sha256sum] = "330c3e5188abf256131c162c456060804f369349e9a0e7aa3efbc54add802e45"
diff --git a/recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb b/recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb
new file mode 100644
index 0000000..9e58205
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "58e619576cbf4b6057eebb7a97fe2ddf"
+SRC_URI[archive.sha256sum] = "3195916b6cebf109eb571b939d7cea7075ef1933782526a6d8fbbb353bc3924b"
diff --git a/recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb b/recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb
new file mode 100644
index 0000000..9b990b0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "82400f0ba63217df9b00d825532cea7d"
+SRC_URI[archive.sha256sum] = "e33c8361c2b6cb13db9a7157753d417c168c8203c8b7027e9dda2fbeef00fd33"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb
new file mode 100644
index 0000000..ebc8375
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+DEPENDS += " libxkbfile"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "2fbcae1323c266edf5b6c61751f2e343"
+SRC_URI[archive.sha256sum] = "0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb
new file mode 100644
index 0000000..64b2370
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+DEPENDS += " libxkbfile"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "d5122f1d5a91725a81c843f3bd388244"
+SRC_URI[archive.sha256sum] = "fefc574bf639d64348939edf9654306af2bb3c20447be9cff493cb06d87cb672"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb
new file mode 100644
index 0000000..bcd1455
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+DEPENDS += " libxkbfile"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "6cc96c3e4ed5d9802fe717beac008f19"
+SRC_URI[archive.sha256sum] = "204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb
new file mode 100644
index 0000000..66b6937
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxkbfile "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "68f2a143716c23b566f8509d9498f516"
+SRC_URI[archive.sha256sum] = "4b78e316ecf9a9498291f634a7e9ee712ba429d5606f300c0a27eacdaaa1f72b"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb
new file mode 100644
index 0000000..7547e96
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxkbfile "
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "84396a3dd75337caaae29d8fa5616fb1"
+SRC_URI[archive.sha256sum] = "aaad73ed8db764978a18bc6ba774d38a4c1330c86622c0b47ae3ced09c175856"
diff --git a/recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb
new file mode 100644
index 0000000..ba95dbe
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f66d76abb0f75514ca32272e23cca757"
+SRC_URI[archive.sha256sum] = "77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de"
diff --git a/recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb
new file mode 100644
index 0000000..9b72817
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ba013813f9c21eb015559466f8d02a44"
+SRC_URI[archive.sha256sum] = "8d51184d6b18eea2f64e0c5b88cd95edff8353ce6529e780f95b1f2347babbf2"
diff --git a/recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb
new file mode 100644
index 0000000..3acd54f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "69adcda848479acc3b82b3928812d191"
+SRC_URI[archive.sha256sum] = "456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a"
diff --git a/recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb
new file mode 100644
index 0000000..9b32088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "44473b880d26bfbe8b3d4d72b183cba7"
+SRC_URI[archive.sha256sum] = "988c71c6dc3519523fe5844ee3e49d91f843a83c783dd0baa20526d9d2981698"
diff --git a/recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb
new file mode 100644
index 0000000..5a88403
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ca9c6c88d0b83360b7b5092615fbf591"
+SRC_URI[archive.sha256sum] = "c8d826194299b2b8e3c6edce7070f05421465b0118ed47135a0195d12fe8a720"
diff --git a/recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb
new file mode 100644
index 0000000..c09140d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "058d168d1c7c991b8d12158433ea5f63"
+SRC_URI[archive.sha256sum] = "1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02"
diff --git a/recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb
new file mode 100644
index 0000000..2856093
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "magnify parts of the screen"
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7c6a783e42c88360ac31d259a864a19d"
+SRC_URI[archive.sha256sum] = "51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43"
diff --git a/recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb
new file mode 100644
index 0000000..1844180
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxprintutil libxp libxt"
+RDEPENDS_${PN} = " man"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "855f2dbfa2aff58b8b9cd6a1c1120fad"
+SRC_URI[archive.sha256sum] = "00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2"
+
+FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb
new file mode 100644
index 0000000..d1dcf65
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb
@@ -0,0 +1,11 @@
+require xorg-app-common.inc
+DESCRIPTION = "manual page browser for X"
+DEPENDS += " libxaw libxprintutil libxp libxt"
+RDEPENDS_${PN} = " man"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3d3a4b310a65ccce82472ef83acbbf97"
+SRC_URI[archive.sha256sum] = "38e03bfa2d3d109d55342e3539be952268e405fb458fb8c4f87739594a25394a"
+
+FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb
new file mode 100644
index 0000000..5ecfae0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "xmessage displays a message or query in a window."
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b3674c3a00a089764d86aa94e257ccec"
+SRC_URI[archive.sha256sum] = "b921aef62c2a2f5c32048502cd96630e9d42493cd39d1841fde247274f24bbda"
diff --git a/recipes/obsolete/xorg/xorg-app/xmodmap/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xmodmap/autofoo.patch
new file mode 100644
index 0000000..f309add
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmodmap/autofoo.patch
@@ -0,0 +1,109 @@
+diff -urN xmodmap.orig/Makefile.am xmodmap/Makefile.am
+--- xmodmap.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xmodmap/Makefile.am 2004-08-31 19:49:33.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XMODMAP_CFLAGS@
++
++bin_PROGRAMS = xmodmap
++
++xmodmap_SOURCES = exec.c handle.c pf.c wq.h xmodmap.c xmodmap.h
++
++xmodmap_LDADD = @XMODMAP_LIBS@
++
++man5_MANS=xmodmap.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xmodmap.orig/autogen.sh xmodmap/autogen.sh
+--- xmodmap.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xmodmap/autogen.sh 2004-08-31 19:46:14.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xmodmap.orig/configure.ac xmodmap/configure.ac
+--- xmodmap.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xmodmap/configure.ac 2004-08-31 20:27:03.000000000 +0200
+@@ -0,0 +1,41 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xmodmap],4.4.0,[],xmodmap)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XMODMAP, x11)
++
++AC_OUTPUT([Makefile])
diff --git a/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb
new file mode 100644
index 0000000..17bbc7e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ea78b3e32e27c3662f86ea68b3aec22f"
+SRC_URI[archive.sha256sum] = "4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44"
diff --git a/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb
new file mode 100644
index 0000000..ab245b3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "626731003ec22a74ecf9e44ed098bbdf"
+SRC_URI[archive.sha256sum] = "c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f"
diff --git a/recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb
new file mode 100644
index 0000000..5e70d01
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "01c0a14755fc91369e8c011c9f881d5d"
+SRC_URI[archive.sha256sum] = "b871221d23dc4fc50398e9fe0e2a6a4e951aa6c9df2c5671d069ad88f0fd6249"
diff --git a/recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb
new file mode 100644
index 0000000..f117bd8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "print an X window dump"
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6b3a6896081f628bf5a2c9129417c86f"
+SRC_URI[archive.sha256sum] = "c325a9896d1cda43a681f1c2a6a2bbb1c580ade57a882b0a8f84ffa359238adf"
diff --git a/recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch
new file mode 100644
index 0000000..2526d95
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch
@@ -0,0 +1,157 @@
+diff -urN xprop.orig/Makefile.am xprop/Makefile.am
+--- xprop.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xprop/Makefile.am 2004-08-15 18:49:43.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XPROP_CFLAGS@
++
++bin_PROGRAMS = xprop
++
++xprop_SOURCES = dsimple.c dsimple.h xprop.c
++
++xprop_LDADD = @XPROP_LIBS@
++
++man5_MANS=xprop.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xprop.orig/configure.ac xprop/configure.ac
+--- xprop.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xprop/configure.ac 2004-08-15 19:00:43.000000000 +0200
+@@ -0,0 +1,44 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xprop],4.4.0,[],xprop)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XPROP, xext xmuu x11)
++
++AC_CHECK_HEADERS([wchar.h])
++AC_CHECK_HEADERS([wctype.h])
++
++AC_OUTPUT([Makefile])
+diff -urN xprop.orig/dsimple.c xprop/dsimple.c
+--- xprop.orig/dsimple.c 2003-11-14 16:54:54.000000000 +0100
++++ xprop/dsimple.c 2004-08-15 19:19:32.000000000 +0200
+@@ -27,11 +27,16 @@
+
+ */
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ /*
+ * Other_stuff.h: Definitions of routines in other_stuff.
+ *
+@@ -69,7 +74,7 @@
+ char *Malloc(size)
+ unsigned size;
+ {
+- char *data, *malloc();
++ char *data;
+
+ if (!(data = malloc(size)))
+ Fatal_Error("Out of memory!");
+@@ -85,7 +90,7 @@
+ char *ptr;
+ int size;
+ {
+- char *new_ptr, *realloc();
++ char *new_ptr;
+
+ if (!ptr)
+ return(Malloc(size));
+diff -urN xprop.orig/xprop.c xprop/xprop.c
+--- xprop.orig/xprop.c 2004-04-23 21:55:03.000000000 +0200
++++ xprop/xprop.c 2004-08-15 19:23:13.000000000 +0200
+@@ -30,6 +30,10 @@
+ /* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */
+
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xlib.h>
+ #include <X11/Xos.h>
+ #include <X11/Xfuncs.h>
diff --git a/recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb
new file mode 100644
index 0000000..f57c8de
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5b6f02a3b1cda0cadc35f84814fe53d4"
+SRC_URI[archive.sha256sum] = "88b1e65703c68f14ac6cb735737d1a0e52751a18fdc8a39d2d1e5eaa07875ca0"
diff --git a/recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb
new file mode 100644
index 0000000..526db7b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "a property displayer for X"
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "48aa8fd78802f477dcbf9ef0dfd9f783"
+SRC_URI[archive.sha256sum] = "daa47cba7d5a919ca1bd053d8a8b6af4904f77eded4bdb055cd915aa5f5cd772"
diff --git a/recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb b/recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb
new file mode 100644
index 0000000..b09b16b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE = "BSD-X"
+DEPENDS += "libxrandr libxrender"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://resolve_symbol_clash.patch"
+SRC_URI[archive.md5sum] = "c6ec9dc42396e3b3a2da932f3feca6ec"
+SRC_URI[archive.sha256sum] = "632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303"
diff --git a/recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb b/recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb
new file mode 100644
index 0000000..6923ce3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE = "BSD-X"
+DEPENDS += "libxrandr libxrender"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://resolve_symbol_clash.patch"
+SRC_URI[archive.md5sum] = "41a9d0cc073fa6165a31fbf9e85f68a6"
+SRC_URI[archive.sha256sum] = "ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207"
diff --git a/recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch
new file mode 100644
index 0000000..b30a46b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch
@@ -0,0 +1,132 @@
+diff -urN xrdb.orig/Imakefile xrdb/Imakefile
+--- xrdb.orig/Imakefile 2004-04-23 21:55:03.000000000 +0200
++++ xrdb/Imakefile 1970-01-01 01:00:00.000000000 +0100
+@@ -1,19 +0,0 @@
+-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $
+-
+-
+-
+-
+-XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.6tsi Exp $
+-
+-#ifdef PatheticCpp
+- CPPDEFS = -DPATHETICCPP
+-#endif
+-#if HasMkstemp
+- CPPDEFS = -DHAS_MKSTEMP
+-#endif
+-XCOMM Due to ill make parsing the cpp is passed directly in source file
+- DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS)
+- DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB)
+-LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB)
+-
+-SimpleProgramTarget(xrdb)
+diff -urN xrdb.orig/Makefile.am xrdb/Makefile.am
+--- xrdb.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xrdb/Makefile.am 2004-08-14 16:05:01.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XRDB_CFLAGS@
++
++bin_PROGRAMS = xrdb
++
++xrdb_SOURCES = xrdb.c
++
++xrdb_LDADD = @XRDB_LIBS@
++
++man5_MANS=xrdb.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xrdb.orig/autogen.sh xrdb/autogen.sh
+--- xrdb.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xrdb/autogen.sh 2004-08-14 15:57:35.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xrdb.orig/configure.ac xrdb/configure.ac
+--- xrdb.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xrdb/configure.ac 2004-08-14 16:03:31.000000000 +0200
+@@ -0,0 +1,41 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xrdb],4.4.0,[],xrdb)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XRDB, xext xmuu x11)
++
++AC_OUTPUT([Makefile])
diff --git a/recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb
new file mode 100644
index 0000000..6c4d86d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "380b2ef545306354cc150834de567be7"
+SRC_URI[archive.sha256sum] = "a4a3b8cd821adc201a072f8c0214d73ee6a7e7b898de90e18f7d89a4453fb12c"
diff --git a/recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb
new file mode 100644
index 0000000..7181dc9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "34eb2311a0c5279e7b4f492e826f63d1"
+SRC_URI[archive.sha256sum] = "3f8cde77e8cbeb6d0a5f232b7a2ee51dd49b677916d52ab0986d320a5f9e8000"
diff --git a/recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb
new file mode 100644
index 0000000..d474dc8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9c30b8e1709d5367beb7706146640c07"
+SRC_URI[archive.sha256sum] = "c24d08939250f10238fd1b984707bfa0901ba9c55fa36b67d91eb12b500500aa"
diff --git a/recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb
new file mode 100644
index 0000000..a97f1af
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1228f890f86148e4e6ae22aa73118cbb"
+SRC_URI[archive.sha256sum] = "522831fd29c0b250f29735a01b02e96e311f200a675e45c8b3d187b6f86b32f5"
diff --git a/recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb
new file mode 100644
index 0000000..25f0c80
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt libxext xtrans xproxymngproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5f65e24f8a225e255beb2059e33d6b37"
+SRC_URI[archive.sha256sum] = "a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4"
diff --git a/recipes/obsolete/xorg/xorg-app/xset/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xset/autofoo.patch
new file mode 100644
index 0000000..039d131
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset/autofoo.patch
@@ -0,0 +1,109 @@
+diff -urN xset.orig/Makefile.am xset/Makefile.am
+--- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xset/Makefile.am 2004-08-14 16:32:10.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XSET_CFLAGS@
++
++bin_PROGRAMS = xset
++
++xset_SOURCES = xset.c
++
++xset_LDADD = @XSET_LIBS@
++
++man5_MANS=xset.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xset.orig/autogen.sh xset/autogen.sh
+--- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xset.orig/configure.ac xset/configure.ac
+--- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xset/configure.ac 2004-08-17 14:21:25.000000000 +0200
+@@ -0,0 +1,41 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xset],4.4.0,[],xset)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XSET, xext xextensions xmuu x11)
++
++AC_OUTPUT([Makefile])
diff --git a/recipes/obsolete/xorg/xorg-app/xset/disable-xkb.patch b/recipes/obsolete/xorg/xorg-app/xset/disable-xkb.patch
new file mode 100644
index 0000000..6060fbb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset/disable-xkb.patch
@@ -0,0 +1,18 @@
+--- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100
++++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100
+@@ -42,11 +42,15 @@
+ AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+
++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
++ XKB="$enableval", XKB="yes")
++if test "x$XKB" = "xyes" ; then
+ PKG_CHECK_MODULES(SET_XKB, x11,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
+ AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
++fi
+
+ PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb
new file mode 100644
index 0000000..35aebe5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb
@@ -0,0 +1,14 @@
+require xorg-app-common.inc
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "1b781a0802c7b8fb9619a6665607b3f0"
+SRC_URI[archive.sha256sum] = "ce1e17c513a4499526e648a59c39ba01777c99c86093433cf392f27654b795c9"
+
+EXTRA_OECONF = "--disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb
new file mode 100644
index 0000000..c37b4bb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb
@@ -0,0 +1,14 @@
+require xorg-app-common.inc
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "657bbb43ce5470c33665d187c1740566"
+SRC_URI[archive.sha256sum] = "0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11"
+
+EXTRA_OECONF = "--disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb
new file mode 100644
index 0000000..24c35e0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb
@@ -0,0 +1,14 @@
+require xorg-app-common.inc
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "2f41fd983ba4d89419204854936025e2"
+SRC_URI[archive.sha256sum] = "6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad"
+
+EXTRA_OECONF = "--disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb b/recipes/obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb
new file mode 100644
index 0000000..409ea16
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxi "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c94ea103e27e370e4e5030e50c5d5d69"
+SRC_URI[archive.sha256sum] = "7d65f450420b4f764dcf38e4ccee9d608b5a5874706e716cb861bfe2586b7d4a"
diff --git a/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb
new file mode 100644
index 0000000..c81a319
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fc7eeb7130bb54345671a9dbaab567ac"
+SRC_URI[archive.sha256sum] = "897d77acd3f4a366472386139827eaac24cc423c811ef0e65e0d5eca099a3155"
diff --git a/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb
new file mode 100644
index 0000000..dc79d52
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9af7db9f3052aef0b11636720b3101dd"
+SRC_URI[archive.sha256sum] = "4f9a751f4830d479fae8ccb68ed04896dc99612789310b7917bd15c04aa3351d"
diff --git a/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb
new file mode 100644
index 0000000..ee77b80
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "Print out X-Video extension adaptor information"
+DEPENDS += " libxv"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0a5bd8e43de6eb8ff5b5bc673204401d"
+SRC_URI[archive.sha256sum] = "439b3c7ad96fc7b1ef9156c716e10b607883a9a58b777f8dc02f03284eb33fb3"
diff --git a/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb
new file mode 100644
index 0000000..8422d34
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "Print out X-Video extension adaptor information"
+DEPENDS += " libxv"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e1e318436f49e2f0f3764593dadd9ad2"
+SRC_URI[archive.sha256sum] = "126e2a612ac723f9688904fcfa612688d62e520ce55c56eb34eb5390074cf150"
diff --git a/recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb
new file mode 100644
index 0000000..bfe181b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "911addfb7fa402217ddac63e5c1d97c7"
+SRC_URI[archive.sha256sum] = "c8bd9bcd64df439c2cd09eaa3e83a1297fbfed5c7d3dd8117342b3a25eeae131"
diff --git a/recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb
new file mode 100644
index 0000000..597aa05
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0a6ef08a2ac08ad5c4dd1522eb3788a3"
+SRC_URI[archive.sha256sum] = "ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61"
diff --git a/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb
new file mode 100644
index 0000000..288af54
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu libxext "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e5dbc8866a55958297f5f38205b6be1e"
+SRC_URI[archive.sha256sum] = "9fdfd3259b335531cdba831872ec0e32c5f6df01e14b87c3187b494be75b7b66"
diff --git a/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb
new file mode 100644
index 0000000..01f6c9b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "window information utility for X"
+DEPENDS += " libxmu libxext "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "721f84332c98c33152460bb22ba9ded6"
+SRC_URI[archive.sha256sum] = "fbe3a1aafbc6fa113e58971ff2a82605a7e106af8b810eea4b7512de58a5478a"
diff --git a/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb
new file mode 100644
index 0000000..317aa1d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu libxext "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e2a9bf5ab7f2a0866700a3b49dd8c6bf"
+SRC_URI[archive.sha256sum] = "df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4"
diff --git a/recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb
new file mode 100644
index 0000000..53d06df
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6e3c5d0297d88e890b6f5df31f73dd60"
+SRC_URI[archive.sha256sum] = "d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c"
diff --git a/recipes/xorg-app/appres_1.0.1.bb b/recipes/xorg-app/appres_1.0.1.bb
deleted file mode 100644
index 698b7c4..0000000
--- a/recipes/xorg-app/appres_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The appres program prints the resources seen by an application."
-DEPENDS += " libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "420e6cdf38bb771ec8b00228bf09e8ff"
-SRC_URI[archive.sha256sum] = "15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962"
diff --git a/recipes/xorg-app/bdftopcf_1.0.1.bb b/recipes/xorg-app/bdftopcf_1.0.1.bb
deleted file mode 100644
index d5ddd50..0000000
--- a/recipes/xorg-app/bdftopcf_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "converts BDF fonts to PCF fonts"
-DEPENDS += " libxfont"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "9685fab33d39954ab8a0d22e0969d5a4"
-SRC_URI[archive.sha256sum] = "aaaa45ab361781aebda2093fdc7eb5c187f6215b4ba308dd6b9ff2b727e805d3"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/beforelight_1.0.2.bb b/recipes/xorg-app/beforelight_1.0.2.bb
deleted file mode 100644
index 09852db..0000000
--- a/recipes/xorg-app/beforelight_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxscrnsaver libxt libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8bc2e35cdcd2e6a80eab1b77c41f2a46"
-SRC_URI[archive.sha256sum] = "00e217559c93779fe04fd948017820af118a3981d6b4371ace95107cb3b047a7"
diff --git a/recipes/xorg-app/bitmap_1.0.2.bb b/recipes/xorg-app/bitmap_1.0.2.bb
deleted file mode 100644
index 70be2aa..0000000
--- a/recipes/xorg-app/bitmap_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu xbitmaps libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "78e8ab5c1830e2cdfbff7a952162a5a7"
-SRC_URI[archive.sha256sum] = "83719927ac4309f42e3cadde125a52cfba2e9c951115ac4c017f292f6e4c14bc"
diff --git a/recipes/xorg-app/bitmap_1.0.3.bb b/recipes/xorg-app/bitmap_1.0.3.bb
deleted file mode 100644
index 9a83106..0000000
--- a/recipes/xorg-app/bitmap_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu xbitmaps libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "98200c358e5401d648b980564d9ae39d"
-SRC_URI[archive.sha256sum] = "863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41"
diff --git a/recipes/xorg-app/constype_1.0.1.bb b/recipes/xorg-app/constype_1.0.1.bb
deleted file mode 100644
index d8a957b..0000000
--- a/recipes/xorg-app/constype_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "print an X window dump"
-DEPENDS += " libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9f99bee77ff3c565b4898663810fbef5"
-SRC_URI[archive.sha256sum] = "11403054cb407cdf31da48216f55d1b5943798cb442bcab69faa0a3d7d167541"
diff --git a/recipes/xorg-app/editres_1.0.2.bb b/recipes/xorg-app/editres_1.0.2.bb
deleted file mode 100644
index 23956d3..0000000
--- a/recipes/xorg-app/editres_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt libxmu libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9db49742bd4c17966fff7d76ac566d31"
-SRC_URI[archive.sha256sum] = "978fbc134eef3da8a5f363c9e93494a3d7399e8f2b435ac6b1f2c63f09c167df"
diff --git a/recipes/xorg-app/editres_1.0.3.bb b/recipes/xorg-app/editres_1.0.3.bb
deleted file mode 100644
index 56cadc1..0000000
--- a/recipes/xorg-app/editres_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt libxmu libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a25f931cc6c8d03daaed434f5db5df2d"
-SRC_URI[archive.sha256sum] = "a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae"
diff --git a/recipes/xorg-app/fonttosfnt_1.0.3.bb b/recipes/xorg-app/fonttosfnt_1.0.3.bb
deleted file mode 100644
index 71e147c..0000000
--- a/recipes/xorg-app/fonttosfnt_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " xproto freetype libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b0ebd86029571239b9d7b0c61191b591"
-SRC_URI[archive.sha256sum] = "9d2b0149ea49a097ab6c563801c06af9975e98f9fa4c8af1a8ac3238e4fd5243"
diff --git a/recipes/xorg-app/fslsfonts_1.0.1.bb b/recipes/xorg-app/fslsfonts_1.0.1.bb
deleted file mode 100644
index c1040ad..0000000
--- a/recipes/xorg-app/fslsfonts_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libfs"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c7b2f8a938749d41dc86db6bd1e6a4ca"
-SRC_URI[archive.sha256sum] = "3feb006a25f36856924e26249fe84b27142678f97175780960f085e1e263a62e"
diff --git a/recipes/xorg-app/fstobdf_1.0.2.bb b/recipes/xorg-app/fstobdf_1.0.2.bb
deleted file mode 100644
index 6c3148c..0000000
--- a/recipes/xorg-app/fstobdf_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libfs"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "99144743ab3cbb9cf37090fdc9e747db"
-SRC_URI[archive.sha256sum] = "690e45b252cd96036dd9b89af8624eb423e16d4bd662b07d264a3f876ce7ac22"
diff --git a/recipes/xorg-app/iceauth_1.0.2.bb b/recipes/xorg-app/iceauth_1.0.2.bb
deleted file mode 100644
index bcda802..0000000
--- a/recipes/xorg-app/iceauth_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a tool for manipulating ICE protocol authorization records"
-DEPENDS += " libice"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7ab8b64edf0212a9d9a3c8129901a450"
-SRC_URI[archive.sha256sum] = "06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb"
diff --git a/recipes/xorg-app/lbxproxy_1.0.1.bb b/recipes/xorg-app/lbxproxy_1.0.1.bb
deleted file mode 100644
index 7b35f1b..0000000
--- a/recipes/xorg-app/lbxproxy_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Applications that would like to take advantage of the Low Bandwidth \
-extension to X (LBX) must make their connections to an lbxproxy."
-DEPENDS += " xtrans libxext liblbxutil libice xproxymngproto bigreqsproto zlib"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9d5045a5c76b1fe360221b967a5aa0e9"
-SRC_URI[archive.sha256sum] = "e2e757986724a5d2ee299aa7616a3d9985af45e363021b486b7abbcac4ca01c2"
diff --git a/recipes/xorg-app/luit_1.0.2.bb b/recipes/xorg-app/luit_1.0.2.bb
deleted file mode 100644
index d8c3475..0000000
--- a/recipes/xorg-app/luit_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " zlib zlib libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "aacda46598ce3af8ca16e2a8132db1b2"
-SRC_URI[archive.sha256sum] = "c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c"
diff --git a/recipes/xorg-app/luit_1.0.3.bb b/recipes/xorg-app/luit_1.0.3.bb
deleted file mode 100644
index 4baac79..0000000
--- a/recipes/xorg-app/luit_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals"
-DEPENDS += " zlib zlib libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b01e4f71c20fc1c79ed727759c1df40c"
-SRC_URI[archive.sha256sum] = "2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7"
diff --git a/recipes/xorg-app/mkcomposecache_1.2.bb b/recipes/xorg-app/mkcomposecache_1.2.bb
deleted file mode 100644
index 8de1fad..0000000
--- a/recipes/xorg-app/mkcomposecache_1.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "used for creating global (system-wide) Compose cache files"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c8237b4aea1ae0c15441deab6b12c5c0"
-SRC_URI[archive.sha256sum] = "8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb"
diff --git a/recipes/xorg-app/mkfontdir_1.0.3.bb b/recipes/xorg-app/mkfontdir_1.0.3.bb
deleted file mode 100644
index e3d1782..0000000
--- a/recipes/xorg-app/mkfontdir_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of X font files in a directory"
-RDEPENDS_${PN} += "mkfontscale"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "4d0f89a23f77e22f1671a77bf0898955"
-SRC_URI[archive.sha256sum] = "2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/mkfontdir_1.0.4.bb b/recipes/xorg-app/mkfontdir_1.0.4.bb
deleted file mode 100644
index dbc0884..0000000
--- a/recipes/xorg-app/mkfontdir_1.0.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of X font files in a directory"
-RDEPENDS_${PN} += "mkfontscale"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "35394bf3f746a57fba624dba52fdbba3"
-SRC_URI[archive.sha256sum] = "6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/mkfontscale_1.0.3.bb b/recipes/xorg-app/mkfontscale_1.0.3.bb
deleted file mode 100644
index 10d511f..0000000
--- a/recipes/xorg-app/mkfontscale_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of scalable font files for X"
-DEPENDS += " zlib libfontenc freetype "
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "1d608771aca9695b828cec1e34178fd1"
-SRC_URI[archive.sha256sum] = "0458a3a5525b4ab458a018648ef8575afc191f904364c00e27876a7bd53af020"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/mkfontscale_1.0.4.bb b/recipes/xorg-app/mkfontscale_1.0.4.bb
deleted file mode 100644
index 6a29088..0000000
--- a/recipes/xorg-app/mkfontscale_1.0.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of scalable font files for X"
-DEPENDS += " zlib libfontenc freetype "
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "e5d7373c4266973b3b13aac5d1a4655b"
-SRC_URI[archive.sha256sum] = "dc9b946cc23490c960fbca8b32e4bba4bc23ce404a8d7e1c0e916894c83b4227"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/mkfontscale_1.0.5.bb b/recipes/xorg-app/mkfontscale_1.0.5.bb
deleted file mode 100644
index 5e37e8e..0000000
--- a/recipes/xorg-app/mkfontscale_1.0.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of scalable font files for X"
-DEPENDS += " zlib libfontenc freetype "
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "5e6e210b70adfef1264b0212aab1f758"
-SRC_URI[archive.sha256sum] = "f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/rgb_1.0.1.bb b/recipes/xorg-app/rgb_1.0.1.bb
deleted file mode 100644
index c78047f..0000000
--- a/recipes/xorg-app/rgb_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " xproto util-macros"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "255222b3ab3af671289a6b4844e9f393"
-SRC_URI[archive.sha256sum] = "f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad"
-
-FILES_${PN} += "${datadir}/X11"
diff --git a/recipes/xorg-app/rstart_1.0.2.bb b/recipes/xorg-app/rstart_1.0.2.bb
deleted file mode 100644
index 2f17f8a..0000000
--- a/recipes/xorg-app/rstart_1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "99aea04a27197056368a4431f30f9cdb"
-SRC_URI[archive.sha256sum] = "02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596"
diff --git a/recipes/xorg-app/sessreg_1.0.2.bb b/recipes/xorg-app/sessreg_1.0.2.bb
deleted file mode 100644
index e7bede7..0000000
--- a/recipes/xorg-app/sessreg_1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "bee5d87d40615e67c84ab0b0c65049ba"
-SRC_URI[archive.sha256sum] = "c23c12259854c7cec6d19bf397afff4a542a22170b14de73b321aa8cafcf3a86"
diff --git a/recipes/xorg-app/sessreg_1.0.3.bb b/recipes/xorg-app/sessreg_1.0.3.bb
deleted file mode 100644
index 5482af9..0000000
--- a/recipes/xorg-app/sessreg_1.0.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "07665816f2623ec82e665fb7d31c6cef"
-SRC_URI[archive.sha256sum] = "7d0c145d53246ddf09fc749f91324897ed9a3da0064808f99b789c37470080dc"
diff --git a/recipes/xorg-app/sessreg_1.0.4.bb b/recipes/xorg-app/sessreg_1.0.4.bb
deleted file mode 100644
index 9738608..0000000
--- a/recipes/xorg-app/sessreg_1.0.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a simple program for managing utmp/wtmp entries"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "839e968d7197b9563f0fd8a5a3aac2e3"
-SRC_URI[archive.sha256sum] = "23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802"
diff --git a/recipes/xorg-app/setxkbmap_1.0.3.bb b/recipes/xorg-app/setxkbmap_1.0.3.bb
deleted file mode 100644
index f9434d7..0000000
--- a/recipes/xorg-app/setxkbmap_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxkbfile "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2b53542095a35a8a5731164118643883"
-SRC_URI[archive.sha256sum] = "086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508"
diff --git a/recipes/xorg-app/setxkbmap_1.0.4.bb b/recipes/xorg-app/setxkbmap_1.0.4.bb
deleted file mode 100644
index 8a9558b..0000000
--- a/recipes/xorg-app/setxkbmap_1.0.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxkbfile "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6fab3bb176be9e510c5613d054ef1ca4"
-SRC_URI[archive.sha256sum] = "9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac"
diff --git a/recipes/xorg-app/showfont_1.0.1.bb b/recipes/xorg-app/showfont_1.0.1.bb
deleted file mode 100644
index a5ffa3a..0000000
--- a/recipes/xorg-app/showfont_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libfs"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "339b2faf1ca5114fda414338e15b6e21"
-SRC_URI[archive.sha256sum] = "87db3cf12914abc6b074d12b35c7f39c8fd7b5d3933b339e2c1260a51061760c"
diff --git a/recipes/xorg-app/smproxy_1.0.2.bb b/recipes/xorg-app/smproxy_1.0.2.bb
deleted file mode 100644
index 0ef6033..0000000
--- a/recipes/xorg-app/smproxy_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "31da204a0255ba8c6a65386e65dc1c90"
-SRC_URI[archive.sha256sum] = "76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2"
diff --git a/recipes/xorg-app/twm_1.0.3.bb b/recipes/xorg-app/twm_1.0.3.bb
deleted file mode 100644
index feaebdd..0000000
--- a/recipes/xorg-app/twm_1.0.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "tiny window manager"
-DEPENDS += " libxext libxt libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a56b71dc40249195b32b304633c28a3e"
-SRC_URI[archive.sha256sum] = "5b41550477a893bf2b82ab73fc7fb6c839ba52d0deac059be1a473dd7bb92a4e"
-
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/twm"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "1"
diff --git a/recipes/xorg-app/x11perf_1.4.1.bb b/recipes/xorg-app/x11perf_1.4.1.bb
deleted file mode 100644
index 7c61228..0000000
--- a/recipes/xorg-app/x11perf_1.4.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X11 server performance test program"
-DEPENDS += "libxmu libxrender libxft libxext fontconfig"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fd06c8b8e3572a0e14af65a49e0dd7d1"
-SRC_URI[archive.sha256sum] = "c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064"
diff --git a/recipes/xorg-app/x11perf_1.5.bb b/recipes/xorg-app/x11perf_1.5.bb
deleted file mode 100644
index 9cff277..0000000
--- a/recipes/xorg-app/x11perf_1.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X11 server performance test program"
-DEPENDS += "libxmu libxrender libxft libxext fontconfig"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "31283bfc3c78718ac1bd71e510d4e774"
-SRC_URI[archive.sha256sum] = "4729da53dde0b7e1748db4bb771f9b7aaf2e2b1e67293a3a5b96d54043ce1233"
-
-FILES_${PN} += "/usr/lib/X11/x11perfcomp/*"
diff --git a/recipes/xorg-app/xauth_1.0.2.bb b/recipes/xorg-app/xauth_1.0.2.bb
deleted file mode 100644
index bd391a2..0000000
--- a/recipes/xorg-app/xauth_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X authority file utility"
-DEPENDS += "libxau libxext libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "31b956edaeb453ddaa640420e97b25b2"
-SRC_URI[archive.sha256sum] = "569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17"
diff --git a/recipes/xorg-app/xauth_1.0.3.bb b/recipes/xorg-app/xauth_1.0.3.bb
deleted file mode 100644
index 7adb51d..0000000
--- a/recipes/xorg-app/xauth_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X authority file utility"
-DEPENDS += "libxau libxext libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e91e10ace1df0d5f2cbc74ead256407a"
-SRC_URI[archive.sha256sum] = "1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c"
diff --git a/recipes/xorg-app/xbacklight_1.1.bb b/recipes/xorg-app/xbacklight_1.1.bb
deleted file mode 100644
index 287b2b1..0000000
--- a/recipes/xorg-app/xbacklight_1.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "adjust backlight brightness using RandR extension"
-DEPENDS += " libxrender libxrandr"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "51b4a1c0ae2b3bd77417306fd78a3e94"
-SRC_URI[archive.sha256sum] = "c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4"
diff --git a/recipes/xorg-app/xcalc_1.0.1.bb b/recipes/xorg-app/xcalc_1.0.1.bb
deleted file mode 100644
index ff042f0..0000000
--- a/recipes/xorg-app/xcalc_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "07b948cf671fde88df1a59bfb0cab3b8"
-SRC_URI[archive.sha256sum] = "17484e5fec0ebe7dd8df7218fde1449c52be3f4c6377a85a9fd86e377a7f4248"
diff --git a/recipes/xorg-app/xclipboard_1.0.1.bb b/recipes/xorg-app/xclipboard_1.0.1.bb
deleted file mode 100644
index 06aeda2..0000000
--- a/recipes/xorg-app/xclipboard_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2c6ecedb10dc51adbb64c95f22fd99c2"
-SRC_URI[archive.sha256sum] = "3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc"
diff --git a/recipes/xorg-app/xclock_1.0.2.bb b/recipes/xorg-app/xclock_1.0.2.bb
deleted file mode 100644
index 0bf6117..0000000
--- a/recipes/xorg-app/xclock_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6b930326f71993fb54b7203902b387cd"
-SRC_URI[archive.sha256sum] = "ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d"
diff --git a/recipes/xorg-app/xclock_1.0.3.bb b/recipes/xorg-app/xclock_1.0.3.bb
deleted file mode 100644
index 73ac39c..0000000
--- a/recipes/xorg-app/xclock_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "analog / digital clock for X"
-DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2b1a3d030d87e62a591db8ee4c0072e6"
-SRC_URI[archive.sha256sum] = "10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f"
diff --git a/recipes/xorg-app/xcmsdb_1.0.1.bb b/recipes/xorg-app/xcmsdb_1.0.1.bb
deleted file mode 100644
index 770db7e..0000000
--- a/recipes/xorg-app/xcmsdb_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8579d5f50ba7f0c4a5bf16b9670fea01"
-SRC_URI[archive.sha256sum] = "e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e"
diff --git a/recipes/xorg-app/xconsole_1.0.2.bb b/recipes/xorg-app/xconsole_1.0.2.bb
deleted file mode 100644
index a7eacc3..0000000
--- a/recipes/xorg-app/xconsole_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8678ddd23573022d68dcd883ae239be8"
-SRC_URI[archive.sha256sum] = "45db847e810a932bb962041a4c242f97779142f7e36feec64ec5f9073bd9b377"
diff --git a/recipes/xorg-app/xcursorgen_1.0.1.bb b/recipes/xorg-app/xcursorgen_1.0.1.bb
deleted file mode 100644
index 39c6aa2..0000000
--- a/recipes/xorg-app/xcursorgen_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxcursor libpng"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "39e1e62f5bd92603b0230b8b948c2fc4"
-SRC_URI[archive.sha256sum] = "18d3e0d64853089c2154f1f867df087fc15f87e03e09fabc98ee5e265d8a53ef"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xcursorgen_1.0.2.bb b/recipes/xorg-app/xcursorgen_1.0.2.bb
deleted file mode 100644
index a058a88..0000000
--- a/recipes/xorg-app/xcursorgen_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "create an X cursor file from a collection of PNG images"
-DEPENDS += " libxcursor libpng"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "6fc90896b8c786cb1a2100b4167f7874"
-SRC_URI[archive.sha256sum] = "e009322bd2afef8d4ad91bcb6b17874e1cd00b1aaf397e7019a82cc44f3c174e"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xdm_1.1.3.bb b/recipes/xorg-app/xdm_1.1.3.bb
deleted file mode 100644
index 02df29e..0000000
--- a/recipes/xorg-app/xdm_1.1.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "619d0549c6c20ca15aa77769f2fbabe2"
-SRC_URI[archive.sha256sum] = "9e640974c132ef1faafedc77e4602d55457b2791006b677cec071ee8afbf9a74"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/recipes/xorg-app/xdm_1.1.4.bb b/recipes/xorg-app/xdm_1.1.4.bb
deleted file mode 100644
index c0268c5..0000000
--- a/recipes/xorg-app/xdm_1.1.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a2b4c280f3e324d081a0d9ed76a8a123"
-SRC_URI[archive.sha256sum] = "928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/recipes/xorg-app/xdm_1.1.6.bb b/recipes/xorg-app/xdm_1.1.6.bb
deleted file mode 100644
index 9a4d7d3..0000000
--- a/recipes/xorg-app/xdm_1.1.6.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c89f8bc74fda4d19e5f374f59c88810f"
-SRC_URI[archive.sha256sum] = "c41ac89d9da5c3f5424e9c4871d363ff17acf0fd2a46830931c447ba0b5a8bcd"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
-
-FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/xorg-app/xdm_1.1.7.bb b/recipes/xorg-app/xdm_1.1.7.bb
deleted file mode 100644
index 844413c..0000000
--- a/recipes/xorg-app/xdm_1.1.7.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "92effdb698d9ecc9113fe4f49294bd90"
-SRC_URI[archive.sha256sum] = "6a7bceccb1eb9ce3d14259be7a6cc8268bc9e1f127298480b9322ceb6f032d6d"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
-
-FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/xorg-app/xdm_1.1.8.bb b/recipes/xorg-app/xdm_1.1.8.bb
deleted file mode 100644
index fc8fa99..0000000
--- a/recipes/xorg-app/xdm_1.1.8.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "cc1816bc62a3722ad509373b0b7f30fe"
-SRC_URI[archive.sha256sum] = "e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
-
-FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/xorg-app/xdpyinfo_1.0.2.bb b/recipes/xorg-app/xdpyinfo_1.0.2.bb
deleted file mode 100644
index 80f4bf7..0000000
--- a/recipes/xorg-app/xdpyinfo_1.0.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-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"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "c9ee60ae52c97c51d4ca327e53f0cb61"
-SRC_URI[archive.sha256sum] = "c9927fc33e8a4422d74b1ebee0d19dd5a16d9ebc435e8f47f0aa546501ccfed3"
-
-EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-app/xdpyinfo_1.0.3.bb b/recipes/xorg-app/xdpyinfo_1.0.3.bb
deleted file mode 100644
index eff9c09..0000000
--- a/recipes/xorg-app/xdpyinfo_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-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"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "b7cbab6cbcd12bf7ad65dbc12d86e104"
-SRC_URI[archive.sha256sum] = "4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962"
-
-EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-app/xdriinfo_1.0.1.bb b/recipes/xorg-app/xdriinfo_1.0.1.bb
deleted file mode 100644
index 8a349d9..0000000
--- a/recipes/xorg-app/xdriinfo_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " glproto virtual/libgl"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "be3c5a9b242a57226b5bb5f22ec341ca"
-SRC_URI[archive.sha256sum] = "f693977bdaea7eb6b095a6b6bc60b8a62110ecdef4c455211346e592f59c3772"
diff --git a/recipes/xorg-app/xdriinfo_1.0.2.bb b/recipes/xorg-app/xdriinfo_1.0.2.bb
deleted file mode 100644
index 6f27ff2..0000000
--- a/recipes/xorg-app/xdriinfo_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "query configuration information of DRI drivers"
-DEPENDS += " glproto virtual/libgl"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a5ec51ed9f0a55dc3462d90d52ff899c"
-SRC_URI[archive.sha256sum] = "7b03ac095b6c79688c20ad61e3576d4698e3f16c09a7f3f1e7c50826814e7265"
diff --git a/recipes/xorg-app/xedit_1.0.2.bb b/recipes/xorg-app/xedit_1.0.2.bb
deleted file mode 100644
index 001cbcd..0000000
--- a/recipes/xorg-app/xedit_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxprintutil libxp libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c56160e93c24ddf17e69891ed50deb72"
-SRC_URI[archive.sha256sum] = "2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df"
diff --git a/recipes/xorg-app/xev_1.0.2.bb b/recipes/xorg-app/xev_1.0.2.bb
deleted file mode 100644
index 402db0b..0000000
--- a/recipes/xorg-app/xev_1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Event Viewer"
-LICENSE = "MIT"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://diet-x11.patch"
-SRC_URI[archive.md5sum] = "e3008eb0655da3026c162a5597d70869"
-SRC_URI[archive.sha256sum] = "cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053"
diff --git a/recipes/xorg-app/xev_1.0.3.bb b/recipes/xorg-app/xev_1.0.3.bb
deleted file mode 100644
index a0990d2..0000000
--- a/recipes/xorg-app/xev_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Event Viewer"
-LICENSE = "MIT"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://diet-x11.patch"
-SRC_URI[archive.md5sum] = "a9532c3d1683c99bb5df1895cb3a60b1"
-SRC_URI[archive.sha256sum] = "d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a"
diff --git a/recipes/xorg-app/xeyes_1.0.1.bb b/recipes/xorg-app/xeyes_1.0.1.bb
deleted file mode 100644
index 6382df4..0000000
--- a/recipes/xorg-app/xeyes_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxau libxt libxext libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "033f14f7c4e30d1f4edbb22d5ef86883"
-SRC_URI[archive.sha256sum] = "530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029"
diff --git a/recipes/xorg-app/xfs_1.0.4.bb b/recipes/xorg-app/xfs_1.0.4.bb
deleted file mode 100644
index f50eaf4..0000000
--- a/recipes/xorg-app/xfs_1.0.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X fontserver"
-DEPENDS += " libfs libxfont xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f43cb64d623b748208dfd9012d17b654"
-SRC_URI[archive.sha256sum] = "452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b"
diff --git a/recipes/xorg-app/xfs_1.0.5.bb b/recipes/xorg-app/xfs_1.0.5.bb
deleted file mode 100644
index 1d31d21..0000000
--- a/recipes/xorg-app/xfs_1.0.5.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X fontserver"
-DEPENDS += " libfs libxfont xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3fc73b5e39a1fe8b8d96563c8144cffe"
-SRC_URI[archive.sha256sum] = "f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9"
diff --git a/recipes/xorg-app/xfs_1.0.6.bb b/recipes/xorg-app/xfs_1.0.6.bb
deleted file mode 100644
index 24028ac..0000000
--- a/recipes/xorg-app/xfs_1.0.6.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X fontserver"
-DEPENDS += " libfs libxfont xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a62ea490a8b97f74b53732df8fc309d8"
-SRC_URI[archive.sha256sum] = "5a3ad18fdc67e261454740217f7c02d1b6825013abcebdcd778a4865fd823353"
diff --git a/recipes/xorg-app/xfs_1.0.8.bb b/recipes/xorg-app/xfs_1.0.8.bb
deleted file mode 100644
index 6324d81..0000000
--- a/recipes/xorg-app/xfs_1.0.8.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X fontserver"
-DEPENDS += " libfs libxfont xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f10717e45535b64eb45226aac571dac2"
-SRC_URI[archive.sha256sum] = "34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482"
diff --git a/recipes/xorg-app/xfsinfo_1.0.1.bb b/recipes/xorg-app/xfsinfo_1.0.1.bb
deleted file mode 100644
index 2df9b2a..0000000
--- a/recipes/xorg-app/xfsinfo_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libfs"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e98b18fbce1261de30b1de819d86f48a"
-SRC_URI[archive.sha256sum] = "adc33443b3a7f334d2407de702004a0491f24708e0e1abe74cd8ae114cd60cd9"
diff --git a/recipes/xorg-app/xgamma_1.0.1.bb b/recipes/xorg-app/xgamma_1.0.1.bb
deleted file mode 100644
index d6245ee..0000000
--- a/recipes/xorg-app/xgamma_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxxf86vm"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "45d8fa3c85d4bfda87251798fd605a45"
-SRC_URI[archive.sha256sum] = "085330064fdb90a152d2d44474fa20bb81ccb6c587c144f5f9c323cb9cc31eee"
diff --git a/recipes/xorg-app/xgamma_1.0.2.bb b/recipes/xorg-app/xgamma_1.0.2.bb
deleted file mode 100644
index 2b11285..0000000
--- a/recipes/xorg-app/xgamma_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Alter a monitor's gamma correction through the X server"
-DEPENDS += " libxxf86vm"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f13ddedaa63a608d3b025d326f4f5b5d"
-SRC_URI[archive.sha256sum] = "5d3d5b230fc60aefae8f4865c17add133b5fb11377fd61c80897ef94fcccf41e"
diff --git a/recipes/xorg-app/xhost_1.0.2.bb b/recipes/xorg-app/xhost_1.0.2.bb
deleted file mode 100644
index 1a42fb1..0000000
--- a/recipes/xorg-app/xhost_1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Server access control program for X"
-LICENSE = "MIT"
-DEPENDS += "libxmu libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f746aba36f075ae4cae313d849a94f4e"
-SRC_URI[archive.sha256sum] = "edab2cc49d230f58e54c0f7b83fd726fec5fc31356668a11589649f19ba90db6"
diff --git a/recipes/xorg-app/xinit_1.0.3.bb b/recipes/xorg-app/xinit_1.0.3.bb
deleted file mode 100644
index 703f825..0000000
--- a/recipes/xorg-app/xinit_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f04a903cc0e18b3c338f58eb90f6caf8"
-SRC_URI[archive.sha256sum] = "c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186"
-
-FILES_${PN} += " /usr/lib/X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.4.bb b/recipes/xorg-app/xinit_1.0.4.bb
deleted file mode 100644
index 2ff99ce..0000000
--- a/recipes/xorg-app/xinit_1.0.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9df52a504dc04313a6650fae364ae04a"
-SRC_URI[archive.sha256sum] = "1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.5.bb b/recipes/xorg-app/xinit_1.0.5.bb
deleted file mode 100644
index 120f42f..0000000
--- a/recipes/xorg-app/xinit_1.0.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9a2aad51042141a0e6ad066015397595"
-SRC_URI[archive.sha256sum] = "95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.7.bb b/recipes/xorg-app/xinit_1.0.7.bb
deleted file mode 100644
index 50c4270..0000000
--- a/recipes/xorg-app/xinit_1.0.7.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8b882d9e2deed9d85469a3beaec566a3"
-SRC_URI[archive.sha256sum] = "15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.8.bb b/recipes/xorg-app/xinit_1.0.8.bb
deleted file mode 100644
index 1771578..0000000
--- a/recipes/xorg-app/xinit_1.0.8.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "521574088fbd688edbf91e6bae674265"
-SRC_URI[archive.sha256sum] = "06c1049f6b63d1c368a1e03e2392097919b22ff24899e190de3577bffe6fe524"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.9.bb b/recipes/xorg-app/xinit_1.0.9.bb
deleted file mode 100644
index 7d8270a..0000000
--- a/recipes/xorg-app/xinit_1.0.9.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "224c36057e4416205d4e421af01a2f15"
-SRC_URI[archive.sha256sum] = "b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.1.0.bb b/recipes/xorg-app/xinit_1.1.0.bb
deleted file mode 100644
index 1829819..0000000
--- a/recipes/xorg-app/xinit_1.1.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9144097186c3d2454beffe8ac3b53c6e"
-SRC_URI[archive.sha256sum] = "c79ec1a4d60404715a626f2832f1b62f43b9d52a1e4642b40af743ee41362590"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.2.0.bb b/recipes/xorg-app/xinit_1.2.0.bb
deleted file mode 100644
index fc5ca59..0000000
--- a/recipes/xorg-app/xinit_1.2.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-DEPENDS += "util-linux-ng"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fe1696cab2fbed6fa059d0cd1c53ac13"
-SRC_URI[archive.sha256sum] = "ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinput_1.3.0.bb b/recipes/xorg-app/xinput_1.3.0.bb
deleted file mode 100644
index dac3150..0000000
--- a/recipes/xorg-app/xinput_1.3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a utility to configure and test XInput devices"
-DEPENDS += " libxi"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "977d657e8d7b59f7d82c98ebef444b28"
-SRC_URI[archive.sha256sum] = "330c3e5188abf256131c162c456060804f369349e9a0e7aa3efbc54add802e45"
diff --git a/recipes/xorg-app/xinput_1.4.2.bb b/recipes/xorg-app/xinput_1.4.2.bb
deleted file mode 100644
index 9e58205..0000000
--- a/recipes/xorg-app/xinput_1.4.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a utility to configure and test XInput devices"
-DEPENDS += " libxi"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "58e619576cbf4b6057eebb7a97fe2ddf"
-SRC_URI[archive.sha256sum] = "3195916b6cebf109eb571b939d7cea7075ef1933782526a6d8fbbb353bc3924b"
diff --git a/recipes/xorg-app/xinput_1.5.1.bb b/recipes/xorg-app/xinput_1.5.1.bb
deleted file mode 100644
index 9b990b0..0000000
--- a/recipes/xorg-app/xinput_1.5.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a utility to configure and test XInput devices"
-DEPENDS += " libxi"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "82400f0ba63217df9b00d825532cea7d"
-SRC_URI[archive.sha256sum] = "e33c8361c2b6cb13db9a7157753d417c168c8203c8b7027e9dda2fbeef00fd33"
diff --git a/recipes/xorg-app/xkbcomp_1.0.3.bb b/recipes/xorg-app/xkbcomp_1.0.3.bb
deleted file mode 100644
index ebc8375..0000000
--- a/recipes/xorg-app/xkbcomp_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-DEPENDS += " libxkbfile"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "2fbcae1323c266edf5b6c61751f2e343"
-SRC_URI[archive.sha256sum] = "0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xkbcomp_1.0.4.bb b/recipes/xorg-app/xkbcomp_1.0.4.bb
deleted file mode 100644
index 64b2370..0000000
--- a/recipes/xorg-app/xkbcomp_1.0.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-DEPENDS += " libxkbfile"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "d5122f1d5a91725a81c843f3bd388244"
-SRC_URI[archive.sha256sum] = "fefc574bf639d64348939edf9654306af2bb3c20447be9cff493cb06d87cb672"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xkbcomp_1.0.5.bb b/recipes/xorg-app/xkbcomp_1.0.5.bb
deleted file mode 100644
index bcd1455..0000000
--- a/recipes/xorg-app/xkbcomp_1.0.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-DEPENDS += " libxkbfile"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "6cc96c3e4ed5d9802fe717beac008f19"
-SRC_URI[archive.sha256sum] = "204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xkbevd_1.0.2.bb b/recipes/xorg-app/xkbevd_1.0.2.bb
deleted file mode 100644
index 66b6937..0000000
--- a/recipes/xorg-app/xkbevd_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxkbfile "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "68f2a143716c23b566f8509d9498f516"
-SRC_URI[archive.sha256sum] = "4b78e316ecf9a9498291f634a7e9ee712ba429d5606f300c0a27eacdaaa1f72b"
diff --git a/recipes/xorg-app/xkbutils_1.0.1.bb b/recipes/xorg-app/xkbutils_1.0.1.bb
deleted file mode 100644
index 7547e96..0000000
--- a/recipes/xorg-app/xkbutils_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxkbfile "
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "84396a3dd75337caaae29d8fa5616fb1"
-SRC_URI[archive.sha256sum] = "aaad73ed8db764978a18bc6ba774d38a4c1330c86622c0b47ae3ced09c175856"
diff --git a/recipes/xorg-app/xkill_1.0.1.bb b/recipes/xorg-app/xkill_1.0.1.bb
deleted file mode 100644
index ba95dbe..0000000
--- a/recipes/xorg-app/xkill_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f66d76abb0f75514ca32272e23cca757"
-SRC_URI[archive.sha256sum] = "77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de"
diff --git a/recipes/xorg-app/xload_1.0.1.bb b/recipes/xorg-app/xload_1.0.1.bb
deleted file mode 100644
index 9b72817..0000000
--- a/recipes/xorg-app/xload_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ba013813f9c21eb015559466f8d02a44"
-SRC_URI[archive.sha256sum] = "8d51184d6b18eea2f64e0c5b88cd95edff8353ce6529e780f95b1f2347babbf2"
diff --git a/recipes/xorg-app/xlsatoms_1.0.1.bb b/recipes/xorg-app/xlsatoms_1.0.1.bb
deleted file mode 100644
index 3acd54f..0000000
--- a/recipes/xorg-app/xlsatoms_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "69adcda848479acc3b82b3928812d191"
-SRC_URI[archive.sha256sum] = "456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a"
diff --git a/recipes/xorg-app/xlsclients_1.0.1.bb b/recipes/xorg-app/xlsclients_1.0.1.bb
deleted file mode 100644
index 9b32088..0000000
--- a/recipes/xorg-app/xlsclients_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "44473b880d26bfbe8b3d4d72b183cba7"
-SRC_URI[archive.sha256sum] = "988c71c6dc3519523fe5844ee3e49d91f843a83c783dd0baa20526d9d2981698"
diff --git a/recipes/xorg-app/xlsfonts_1.0.1.bb b/recipes/xorg-app/xlsfonts_1.0.1.bb
deleted file mode 100644
index 5a88403..0000000
--- a/recipes/xorg-app/xlsfonts_1.0.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ca9c6c88d0b83360b7b5092615fbf591"
-SRC_URI[archive.sha256sum] = "c8d826194299b2b8e3c6edce7070f05421465b0118ed47135a0195d12fe8a720"
diff --git a/recipes/xorg-app/xmag_1.0.1.bb b/recipes/xorg-app/xmag_1.0.1.bb
deleted file mode 100644
index c09140d..0000000
--- a/recipes/xorg-app/xmag_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "058d168d1c7c991b8d12158433ea5f63"
-SRC_URI[archive.sha256sum] = "1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02"
diff --git a/recipes/xorg-app/xmag_1.0.2.bb b/recipes/xorg-app/xmag_1.0.2.bb
deleted file mode 100644
index 2856093..0000000
--- a/recipes/xorg-app/xmag_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "magnify parts of the screen"
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7c6a783e42c88360ac31d259a864a19d"
-SRC_URI[archive.sha256sum] = "51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43"
diff --git a/recipes/xorg-app/xman_1.0.2.bb b/recipes/xorg-app/xman_1.0.2.bb
deleted file mode 100644
index 1844180..0000000
--- a/recipes/xorg-app/xman_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxprintutil libxp libxt"
-RDEPENDS_${PN} = " man"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "855f2dbfa2aff58b8b9cd6a1c1120fad"
-SRC_URI[archive.sha256sum] = "00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2"
-
-FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/xorg-app/xman_1.0.3.bb b/recipes/xorg-app/xman_1.0.3.bb
deleted file mode 100644
index d1dcf65..0000000
--- a/recipes/xorg-app/xman_1.0.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "manual page browser for X"
-DEPENDS += " libxaw libxprintutil libxp libxt"
-RDEPENDS_${PN} = " man"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3d3a4b310a65ccce82472ef83acbbf97"
-SRC_URI[archive.sha256sum] = "38e03bfa2d3d109d55342e3539be952268e405fb458fb8c4f87739594a25394a"
-
-FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/xorg-app/xmessage_1.0.1.bb b/recipes/xorg-app/xmessage_1.0.1.bb
deleted file mode 100644
index 5ecfae0..0000000
--- a/recipes/xorg-app/xmessage_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "xmessage displays a message or query in a window."
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b3674c3a00a089764d86aa94e257ccec"
-SRC_URI[archive.sha256sum] = "b921aef62c2a2f5c32048502cd96630e9d42493cd39d1841fde247274f24bbda"
diff --git a/recipes/xorg-app/xmodmap/autofoo.patch b/recipes/xorg-app/xmodmap/autofoo.patch
deleted file mode 100644
index f309add..0000000
--- a/recipes/xorg-app/xmodmap/autofoo.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -urN xmodmap.orig/Makefile.am xmodmap/Makefile.am
---- xmodmap.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xmodmap/Makefile.am 2004-08-31 19:49:33.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XMODMAP_CFLAGS@
-+
-+bin_PROGRAMS = xmodmap
-+
-+xmodmap_SOURCES = exec.c handle.c pf.c wq.h xmodmap.c xmodmap.h
-+
-+xmodmap_LDADD = @XMODMAP_LIBS@
-+
-+man5_MANS=xmodmap.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xmodmap.orig/autogen.sh xmodmap/autogen.sh
---- xmodmap.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xmodmap/autogen.sh 2004-08-31 19:46:14.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xmodmap.orig/configure.ac xmodmap/configure.ac
---- xmodmap.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xmodmap/configure.ac 2004-08-31 20:27:03.000000000 +0200
-@@ -0,0 +1,41 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xmodmap],4.4.0,[],xmodmap)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XMODMAP, x11)
-+
-+AC_OUTPUT([Makefile])
diff --git a/recipes/xorg-app/xmodmap_1.0.2.bb b/recipes/xorg-app/xmodmap_1.0.2.bb
deleted file mode 100644
index 17bbc7e..0000000
--- a/recipes/xorg-app/xmodmap_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-LICENSE = "MIT"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ea78b3e32e27c3662f86ea68b3aec22f"
-SRC_URI[archive.sha256sum] = "4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44"
diff --git a/recipes/xorg-app/xmodmap_1.0.3.bb b/recipes/xorg-app/xmodmap_1.0.3.bb
deleted file mode 100644
index ab245b3..0000000
--- a/recipes/xorg-app/xmodmap_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-LICENSE = "MIT"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "626731003ec22a74ecf9e44ed098bbdf"
-SRC_URI[archive.sha256sum] = "c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f"
diff --git a/recipes/xorg-app/xpr_1.0.1.bb b/recipes/xorg-app/xpr_1.0.1.bb
deleted file mode 100644
index 5e70d01..0000000
--- a/recipes/xorg-app/xpr_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "01c0a14755fc91369e8c011c9f881d5d"
-SRC_URI[archive.sha256sum] = "b871221d23dc4fc50398e9fe0e2a6a4e951aa6c9df2c5671d069ad88f0fd6249"
diff --git a/recipes/xorg-app/xpr_1.0.2.bb b/recipes/xorg-app/xpr_1.0.2.bb
deleted file mode 100644
index f117bd8..0000000
--- a/recipes/xorg-app/xpr_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "print an X window dump"
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6b3a6896081f628bf5a2c9129417c86f"
-SRC_URI[archive.sha256sum] = "c325a9896d1cda43a681f1c2a6a2bbb1c580ade57a882b0a8f84ffa359238adf"
diff --git a/recipes/xorg-app/xprop/autofoo.patch b/recipes/xorg-app/xprop/autofoo.patch
deleted file mode 100644
index 2526d95..0000000
--- a/recipes/xorg-app/xprop/autofoo.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -urN xprop.orig/Makefile.am xprop/Makefile.am
---- xprop.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xprop/Makefile.am 2004-08-15 18:49:43.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XPROP_CFLAGS@
-+
-+bin_PROGRAMS = xprop
-+
-+xprop_SOURCES = dsimple.c dsimple.h xprop.c
-+
-+xprop_LDADD = @XPROP_LIBS@
-+
-+man5_MANS=xprop.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xprop.orig/configure.ac xprop/configure.ac
---- xprop.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xprop/configure.ac 2004-08-15 19:00:43.000000000 +0200
-@@ -0,0 +1,44 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xprop],4.4.0,[],xprop)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XPROP, xext xmuu x11)
-+
-+AC_CHECK_HEADERS([wchar.h])
-+AC_CHECK_HEADERS([wctype.h])
-+
-+AC_OUTPUT([Makefile])
-diff -urN xprop.orig/dsimple.c xprop/dsimple.c
---- xprop.orig/dsimple.c 2003-11-14 16:54:54.000000000 +0100
-+++ xprop/dsimple.c 2004-08-15 19:19:32.000000000 +0200
-@@ -27,11 +27,16 @@
-
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xos.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
- #include <stdio.h>
-+#include <stdlib.h>
- /*
- * Other_stuff.h: Definitions of routines in other_stuff.
- *
-@@ -69,7 +74,7 @@
- char *Malloc(size)
- unsigned size;
- {
-- char *data, *malloc();
-+ char *data;
-
- if (!(data = malloc(size)))
- Fatal_Error("Out of memory!");
-@@ -85,7 +90,7 @@
- char *ptr;
- int size;
- {
-- char *new_ptr, *realloc();
-+ char *new_ptr;
-
- if (!ptr)
- return(Malloc(size));
-diff -urN xprop.orig/xprop.c xprop/xprop.c
---- xprop.orig/xprop.c 2004-04-23 21:55:03.000000000 +0200
-+++ xprop/xprop.c 2004-08-15 19:23:13.000000000 +0200
-@@ -30,6 +30,10 @@
- /* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */
-
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xlib.h>
- #include <X11/Xos.h>
- #include <X11/Xfuncs.h>
diff --git a/recipes/xorg-app/xprop_1.0.2.bb b/recipes/xorg-app/xprop_1.0.2.bb
deleted file mode 100644
index f57c8de..0000000
--- a/recipes/xorg-app/xprop_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5b6f02a3b1cda0cadc35f84814fe53d4"
-SRC_URI[archive.sha256sum] = "88b1e65703c68f14ac6cb735737d1a0e52751a18fdc8a39d2d1e5eaa07875ca0"
diff --git a/recipes/xorg-app/xprop_1.0.4.bb b/recipes/xorg-app/xprop_1.0.4.bb
deleted file mode 100644
index 526db7b..0000000
--- a/recipes/xorg-app/xprop_1.0.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a property displayer for X"
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "48aa8fd78802f477dcbf9ef0dfd9f783"
-SRC_URI[archive.sha256sum] = "daa47cba7d5a919ca1bd053d8a8b6af4904f77eded4bdb055cd915aa5f5cd772"
diff --git a/recipes/xorg-app/xrandr_1.2.2.bb b/recipes/xorg-app/xrandr_1.2.2.bb
deleted file mode 100644
index b09b16b..0000000
--- a/recipes/xorg-app/xrandr_1.2.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Resize and Rotate extension command."
-LICENSE = "BSD-X"
-DEPENDS += "libxrandr libxrender"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://resolve_symbol_clash.patch"
-SRC_URI[archive.md5sum] = "c6ec9dc42396e3b3a2da932f3feca6ec"
-SRC_URI[archive.sha256sum] = "632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303"
diff --git a/recipes/xorg-app/xrandr_1.2.3.bb b/recipes/xorg-app/xrandr_1.2.3.bb
deleted file mode 100644
index 6923ce3..0000000
--- a/recipes/xorg-app/xrandr_1.2.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Resize and Rotate extension command."
-LICENSE = "BSD-X"
-DEPENDS += "libxrandr libxrender"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://resolve_symbol_clash.patch"
-SRC_URI[archive.md5sum] = "41a9d0cc073fa6165a31fbf9e85f68a6"
-SRC_URI[archive.sha256sum] = "ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207"
diff --git a/recipes/xorg-app/xrdb/autofoo.patch b/recipes/xorg-app/xrdb/autofoo.patch
deleted file mode 100644
index b30a46b..0000000
--- a/recipes/xorg-app/xrdb/autofoo.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -urN xrdb.orig/Imakefile xrdb/Imakefile
---- xrdb.orig/Imakefile 2004-04-23 21:55:03.000000000 +0200
-+++ xrdb/Imakefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,19 +0,0 @@
--XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $
--
--
--
--
--XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.6tsi Exp $
--
--#ifdef PatheticCpp
-- CPPDEFS = -DPATHETICCPP
--#endif
--#if HasMkstemp
-- CPPDEFS = -DHAS_MKSTEMP
--#endif
--XCOMM Due to ill make parsing the cpp is passed directly in source file
-- DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS)
-- DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB)
--LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB)
--
--SimpleProgramTarget(xrdb)
-diff -urN xrdb.orig/Makefile.am xrdb/Makefile.am
---- xrdb.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xrdb/Makefile.am 2004-08-14 16:05:01.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XRDB_CFLAGS@
-+
-+bin_PROGRAMS = xrdb
-+
-+xrdb_SOURCES = xrdb.c
-+
-+xrdb_LDADD = @XRDB_LIBS@
-+
-+man5_MANS=xrdb.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xrdb.orig/autogen.sh xrdb/autogen.sh
---- xrdb.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xrdb/autogen.sh 2004-08-14 15:57:35.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xrdb.orig/configure.ac xrdb/configure.ac
---- xrdb.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xrdb/configure.ac 2004-08-14 16:03:31.000000000 +0200
-@@ -0,0 +1,41 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xrdb],4.4.0,[],xrdb)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XRDB, xext xmuu x11)
-+
-+AC_OUTPUT([Makefile])
diff --git a/recipes/xorg-app/xrdb_1.0.3.bb b/recipes/xorg-app/xrdb_1.0.3.bb
deleted file mode 100644
index 6c4d86d..0000000
--- a/recipes/xorg-app/xrdb_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-DEPENDS += "libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "380b2ef545306354cc150834de567be7"
-SRC_URI[archive.sha256sum] = "a4a3b8cd821adc201a072f8c0214d73ee6a7e7b898de90e18f7d89a4453fb12c"
diff --git a/recipes/xorg-app/xrdb_1.0.4.bb b/recipes/xorg-app/xrdb_1.0.4.bb
deleted file mode 100644
index 7181dc9..0000000
--- a/recipes/xorg-app/xrdb_1.0.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-DEPENDS += "libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "34eb2311a0c5279e7b4f492e826f63d1"
-SRC_URI[archive.sha256sum] = "3f8cde77e8cbeb6d0a5f232b7a2ee51dd49b677916d52ab0986d320a5f9e8000"
diff --git a/recipes/xorg-app/xrdb_1.0.5.bb b/recipes/xorg-app/xrdb_1.0.5.bb
deleted file mode 100644
index d474dc8..0000000
--- a/recipes/xorg-app/xrdb_1.0.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-DEPENDS += "libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9c30b8e1709d5367beb7706146640c07"
-SRC_URI[archive.sha256sum] = "c24d08939250f10238fd1b984707bfa0901ba9c55fa36b67d91eb12b500500aa"
diff --git a/recipes/xorg-app/xrefresh_1.0.2.bb b/recipes/xorg-app/xrefresh_1.0.2.bb
deleted file mode 100644
index a97f1af..0000000
--- a/recipes/xorg-app/xrefresh_1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1228f890f86148e4e6ae22aa73118cbb"
-SRC_URI[archive.sha256sum] = "522831fd29c0b250f29735a01b02e96e311f200a675e45c8b3d187b6f86b32f5"
diff --git a/recipes/xorg-app/xrx_1.0.1.bb b/recipes/xorg-app/xrx_1.0.1.bb
deleted file mode 100644
index 25f0c80..0000000
--- a/recipes/xorg-app/xrx_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt libxext xtrans xproxymngproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5f65e24f8a225e255beb2059e33d6b37"
-SRC_URI[archive.sha256sum] = "a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4"
diff --git a/recipes/xorg-app/xset/autofoo.patch b/recipes/xorg-app/xset/autofoo.patch
deleted file mode 100644
index 039d131..0000000
--- a/recipes/xorg-app/xset/autofoo.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -urN xset.orig/Makefile.am xset/Makefile.am
---- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xset/Makefile.am 2004-08-14 16:32:10.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XSET_CFLAGS@
-+
-+bin_PROGRAMS = xset
-+
-+xset_SOURCES = xset.c
-+
-+xset_LDADD = @XSET_LIBS@
-+
-+man5_MANS=xset.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xset.orig/autogen.sh xset/autogen.sh
---- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xset.orig/configure.ac xset/configure.ac
---- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xset/configure.ac 2004-08-17 14:21:25.000000000 +0200
-@@ -0,0 +1,41 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xset],4.4.0,[],xset)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XSET, xext xextensions xmuu x11)
-+
-+AC_OUTPUT([Makefile])
diff --git a/recipes/xorg-app/xset/disable-xkb.patch b/recipes/xorg-app/xset/disable-xkb.patch
deleted file mode 100644
index 6060fbb..0000000
--- a/recipes/xorg-app/xset/disable-xkb.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100
-+++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100
-@@ -42,11 +42,15 @@
- AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
- CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-
-+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
-+ XKB="$enableval", XKB="yes")
-+if test "x$XKB" = "xyes" ; then
- PKG_CHECK_MODULES(SET_XKB, x11,
- [SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
- AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
- CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-+fi
-
- PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
- [SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/recipes/xorg-app/xset_1.0.2.bb b/recipes/xorg-app/xset_1.0.2.bb
deleted file mode 100644
index 35aebe5..0000000
--- a/recipes/xorg-app/xset_1.0.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "1b781a0802c7b8fb9619a6665607b3f0"
-SRC_URI[archive.sha256sum] = "ce1e17c513a4499526e648a59c39ba01777c99c86093433cf392f27654b795c9"
-
-EXTRA_OECONF = "--disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-app/xset_1.0.3.bb b/recipes/xorg-app/xset_1.0.3.bb
deleted file mode 100644
index c37b4bb..0000000
--- a/recipes/xorg-app/xset_1.0.3.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "657bbb43ce5470c33665d187c1740566"
-SRC_URI[archive.sha256sum] = "0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11"
-
-EXTRA_OECONF = "--disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-app/xset_1.0.4.bb b/recipes/xorg-app/xset_1.0.4.bb
deleted file mode 100644
index 24c35e0..0000000
--- a/recipes/xorg-app/xset_1.0.4.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "2f41fd983ba4d89419204854936025e2"
-SRC_URI[archive.sha256sum] = "6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad"
-
-EXTRA_OECONF = "--disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-app/xsetpointer_1.0.0.bb b/recipes/xorg-app/xsetpointer_1.0.0.bb
deleted file mode 100644
index 409ea16..0000000
--- a/recipes/xorg-app/xsetpointer_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxi "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c94ea103e27e370e4e5030e50c5d5d69"
-SRC_URI[archive.sha256sum] = "7d65f450420b4f764dcf38e4ccee9d608b5a5874706e716cb861bfe2586b7d4a"
diff --git a/recipes/xorg-app/xsetroot_1.0.1.bb b/recipes/xorg-app/xsetroot_1.0.1.bb
deleted file mode 100644
index c81a319..0000000
--- a/recipes/xorg-app/xsetroot_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Sets the visual appearance of the X root window"
-LICENSE = "MIT"
-DEPENDS += "libxmu xbitmaps"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fc7eeb7130bb54345671a9dbaab567ac"
-SRC_URI[archive.sha256sum] = "897d77acd3f4a366472386139827eaac24cc423c811ef0e65e0d5eca099a3155"
diff --git a/recipes/xorg-app/xsetroot_1.0.2.bb b/recipes/xorg-app/xsetroot_1.0.2.bb
deleted file mode 100644
index dc79d52..0000000
--- a/recipes/xorg-app/xsetroot_1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Sets the visual appearance of the X root window"
-LICENSE = "MIT"
-DEPENDS += "libxmu xbitmaps"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9af7db9f3052aef0b11636720b3101dd"
-SRC_URI[archive.sha256sum] = "4f9a751f4830d479fae8ccb68ed04896dc99612789310b7917bd15c04aa3351d"
diff --git a/recipes/xorg-app/xvinfo_1.0.1.bb b/recipes/xorg-app/xvinfo_1.0.1.bb
deleted file mode 100644
index ee77b80..0000000
--- a/recipes/xorg-app/xvinfo_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Print out X-Video extension adaptor information"
-DEPENDS += " libxv"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0a5bd8e43de6eb8ff5b5bc673204401d"
-SRC_URI[archive.sha256sum] = "439b3c7ad96fc7b1ef9156c716e10b607883a9a58b777f8dc02f03284eb33fb3"
diff --git a/recipes/xorg-app/xvinfo_1.0.2.bb b/recipes/xorg-app/xvinfo_1.0.2.bb
deleted file mode 100644
index 8422d34..0000000
--- a/recipes/xorg-app/xvinfo_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Print out X-Video extension adaptor information"
-DEPENDS += " libxv"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e1e318436f49e2f0f3764593dadd9ad2"
-SRC_URI[archive.sha256sum] = "126e2a612ac723f9688904fcfa612688d62e520ce55c56eb34eb5390074cf150"
diff --git a/recipes/xorg-app/xwd_1.0.1.bb b/recipes/xorg-app/xwd_1.0.1.bb
deleted file mode 100644
index bfe181b..0000000
--- a/recipes/xorg-app/xwd_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "911addfb7fa402217ddac63e5c1d97c7"
-SRC_URI[archive.sha256sum] = "c8bd9bcd64df439c2cd09eaa3e83a1297fbfed5c7d3dd8117342b3a25eeae131"
diff --git a/recipes/xorg-app/xwd_1.0.2.bb b/recipes/xorg-app/xwd_1.0.2.bb
deleted file mode 100644
index 597aa05..0000000
--- a/recipes/xorg-app/xwd_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0a6ef08a2ac08ad5c4dd1522eb3788a3"
-SRC_URI[archive.sha256sum] = "ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61"
diff --git a/recipes/xorg-app/xwininfo_1.0.2.bb b/recipes/xorg-app/xwininfo_1.0.2.bb
deleted file mode 100644
index 288af54..0000000
--- a/recipes/xorg-app/xwininfo_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu libxext "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e5dbc8866a55958297f5f38205b6be1e"
-SRC_URI[archive.sha256sum] = "9fdfd3259b335531cdba831872ec0e32c5f6df01e14b87c3187b494be75b7b66"
diff --git a/recipes/xorg-app/xwininfo_1.0.3.bb b/recipes/xorg-app/xwininfo_1.0.3.bb
deleted file mode 100644
index 01f6c9b..0000000
--- a/recipes/xorg-app/xwininfo_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "window information utility for X"
-DEPENDS += " libxmu libxext "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "721f84332c98c33152460bb22ba9ded6"
-SRC_URI[archive.sha256sum] = "fbe3a1aafbc6fa113e58971ff2a82605a7e106af8b810eea4b7512de58a5478a"
diff --git a/recipes/xorg-app/xwininfo_1.0.4.bb b/recipes/xorg-app/xwininfo_1.0.4.bb
deleted file mode 100644
index 317aa1d..0000000
--- a/recipes/xorg-app/xwininfo_1.0.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu libxext "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e2a9bf5ab7f2a0866700a3b49dd8c6bf"
-SRC_URI[archive.sha256sum] = "df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4"
diff --git a/recipes/xorg-app/xwud_1.0.1.bb b/recipes/xorg-app/xwud_1.0.1.bb
deleted file mode 100644
index 53d06df..0000000
--- a/recipes/xorg-app/xwud_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6e3c5d0297d88e890b6f5df31f73dd60"
-SRC_URI[archive.sha256sum] = "d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c"
--
1.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 2/9] xorg-lib: move older not pinned versions to obsolete dir
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
2010-08-16 15:30 ` [PATCH 1/9] xorg-app: move older not pinned versions to obsolete dir Martin Jansa
@ 2010-08-16 15:30 ` Martin Jansa
2010-08-16 15:30 ` [PATCH 3/9] xorg-data: " Martin Jansa
` (10 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 15:30 UTC (permalink / raw)
To: openembedded-devel
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 893229 bytes --]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.1.bb | 12 +
recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.2.bb | 10 +
recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.3.bb | 10 +
recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.4.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libapplewm_1.0.0.bb | 9 +
recipes/obsolete/xorg/xorg-lib/libdmx_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-lib/libfontenc_1.0.4.bb | 11 +
recipes/obsolete/xorg/xorg-lib/libfs_1.0.0.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libfs_1.0.1.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libice_1.0.3.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libice_1.0.4.bb | 12 +
.../xorg/xorg-lib/liblbxutil/mkg3states.patch | 51 +
recipes/obsolete/xorg/xorg-lib/liblbxutil_1.0.1.bb | 11 +
.../xorg-lib/libpciaccess/fix-mtrr-check.patch | 19 +
.../obsolete/xorg/xorg-lib/libpciaccess_0.10.3.bb | 7 +
.../obsolete/xorg/xorg-lib/libpciaccess_0.11.0.bb | 6 +
recipes/obsolete/xorg/xorg-lib/libsm_1.0.2.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libsm_1.0.3.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libsm_1.1.0.bb | 12 +
.../obsolete/xorg/xorg-lib/libwindowswm_1.0.0.bb | 9 +
.../xorg-lib/libx11-1.0.1/keysymdef_include.patch | 62 +
.../libx11-1.0.1/x11_disable_makekeys.patch | 15 +
.../xorg-lib/libx11-1.0.3/keysymdef_include.patch | 62 +
.../libx11-1.0.3/x11_disable_makekeys.patch | 15 +
.../xorg-lib/libx11-1.1.1/keysymdef_include.patch | 62 +
.../xorg-lib/libx11-1.1.2/keysymdef_include.patch | 62 +
.../xorg-lib/libx11-1.1.3/keysymdef_include.patch | 62 +
.../xorg-lib/libx11-1.1.4/keysymdef_include.patch | 62 +
.../xorg-lib/libx11-1.2/x11_disable_makekeys.patch | 23 +
.../xorg/xorg-lib/libx11-1.3.3+git/dolt-fix.patch | 22 +
.../libx11-1.3.3+git/keysymdef_include.patch | 29 +
.../libx11-1.3.3+git/x11_disable_makekeys.patch | 26 +
.../libx11-1.3.3/x11_disable_makekeys.patch | 23 +
.../xorg/xorg-lib/libx11-1.3.4/dolt-fix.patch | 22 +
.../xorg-lib/libx11-1.3.4/keysymdef_include.patch | 21 +
.../libx11-1.3.4/x11_disable_makekeys.patch | 29 +
recipes/obsolete/xorg/xorg-lib/libx11/ruutf8.patch | 12 +
.../obsolete/xorg/xorg-lib/libx11/xchar2b.patch | 13 +
recipes/obsolete/xorg/xorg-lib/libx11/xim.patch | 55 +
recipes/obsolete/xorg/xorg-lib/libx11_1.0.1.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libx11_1.0.3.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libx11_1.1.1.bb | 9 +
recipes/obsolete/xorg/xorg-lib/libx11_1.1.2.bb | 8 +
recipes/obsolete/xorg/xorg-lib/libx11_1.1.3.bb | 8 +
recipes/obsolete/xorg/xorg-lib/libx11_1.1.4.bb | 8 +
recipes/obsolete/xorg/xorg-lib/libx11_1.2.bb | 9 +
recipes/obsolete/xorg/xorg-lib/libx11_1.3.3.bb | 6 +
recipes/obsolete/xorg/xorg-lib/libx11_1.3.4.bb | 6 +
recipes/obsolete/xorg/xorg-lib/libx11_git.bb | 14 +
recipes/obsolete/xorg/xorg-lib/libxau_1.0.3.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxau_1.0.4.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxaw_1.0.3.bb | 22 +
recipes/obsolete/xorg/xorg-lib/libxaw_1.0.4.bb | 22 +
.../libxcomposite/change-include-order.patch | 14 +
.../obsolete/xorg/xorg-lib/libxcomposite_0.3.1.bb | 12 +
.../obsolete/xorg/xorg-lib/libxcomposite_0.4.0.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.8.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.9.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxdamage_1.0.4.bb | 11 +
recipes/obsolete/xorg/xorg-lib/libxdamage_1.1.1.bb | 11 +
recipes/obsolete/xorg/xorg-lib/libxdmcp_1.0.2.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxext_1.0.2.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxext_1.0.3.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxext_1.0.4.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxext_1.0.5.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxfixes_4.0.3.bb | 13 +
.../builtinreaddirectory-no-side-effect.patch | 188 +++
.../xorg/xorg-lib/libxfont/no-scalable-crash.patch | 22 +
recipes/obsolete/xorg/xorg-lib/libxfont_1.2.7.bb | 15 +
recipes/obsolete/xorg/xorg-lib/libxfont_1.2.8.bb | 15 +
recipes/obsolete/xorg/xorg-lib/libxfont_1.3.0.bb | 15 +
recipes/obsolete/xorg/xorg-lib/libxfont_1.3.1.bb | 14 +
recipes/obsolete/xorg/xorg-lib/libxfont_1.3.2.bb | 14 +
recipes/obsolete/xorg/xorg-lib/libxfont_1.3.3.bb | 13 +
.../obsolete/xorg/xorg-lib/libxfontcache_1.0.4.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxft_2.1.12.bb | 21 +
recipes/obsolete/xorg/xorg-lib/libxft_2.1.13.bb | 21 +
recipes/obsolete/xorg/xorg-lib/libxi_1.0.2.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxi_1.1.0.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxi_1.1.2.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxi_1.1.3.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxi_1.2.0.bb | 10 +
.../obsolete/xorg/xorg-lib/libxinerama_1.0.2.bb | 10 +
.../obsolete/xorg/xorg-lib/libxinerama_1.0.3.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.4.bb | 11 +
recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.5.bb | 11 +
recipes/obsolete/xorg/xorg-lib/libxmu_1.0.3.bb | 17 +
recipes/obsolete/xorg/xorg-lib/libxmu_1.0.4.bb | 17 +
recipes/obsolete/xorg/xorg-lib/libxpm_3.5.6.bb | 16 +
recipes/obsolete/xorg/xorg-lib/libxpm_3.5.7.bb | 16 +
recipes/obsolete/xorg/xorg-lib/libxrandr_1.1.2.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.2.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.3.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxrender_0.9.2.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxrender_0.9.3.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxrender_0.9.4.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxres_1.0.3.bb | 10 +
.../obsolete/xorg/xorg-lib/libxscrnsaver_1.1.2.bb | 13 +
.../obsolete/xorg/xorg-lib/libxscrnsaver_1.1.3.bb | 13 +
| 512 ++++++
recipes/obsolete/xorg/xorg-lib/libxt_1.0.4.bb | 24 +
recipes/obsolete/xorg/xorg-lib/libxt_1.0.5.bb | 23 +
recipes/obsolete/xorg/xorg-lib/libxtst_1.0.2.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxtst_1.0.3.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxv_1.0.3.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxv_1.0.4.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxvmc/drm.patch | 9 +
recipes/obsolete/xorg/xorg-lib/libxvmc/true.patch | 11 +
recipes/obsolete/xorg/xorg-lib/libxvmc/via.patch | 23 +
recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.4.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.5.bb | 10 +
.../obsolete/xorg/xorg-lib/libxxf86dga_1.0.1.bb | 10 +
.../obsolete/xorg/xorg-lib/libxxf86dga_1.0.2.bb | 10 +
.../obsolete/xorg/xorg-lib/libxxf86misc_1.0.1.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.1.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.2.bb | 10 +
...mplementation-of-pixman_blt-with-overlapp.patch | 114 ++
...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 ++
...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 ++
...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 ++
.../xorg/xorg-lib/pixman-0.17.8/1-composite.patch | 161 ++
.../xorg/xorg-lib/pixman-0.17.8/2-composite.patch | 102 ++
.../xorg/xorg-lib/pixman-0.17.8/3-composite.patch | 108 ++
...mplementation-of-pixman_blt-with-overlapp.patch | 114 ++
...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 ++
...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 ++
...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 ++
...EON-optimizations-for-fetch-store-r5g6b5-.patch | 169 ++
.../xorg/xorg-lib/pixman-0.18.0/565-scanline.patch | 257 +++
.../pixman-0.18.0/missing-cache-preload.diff | 28 +
.../dont-copy-unused-bits-to-alpha-channel.patch | 29 +
...mplementation-of-pixman_blt-with-overlapp.patch | 114 ++
...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 ++
...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 ++
...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 ++
...EON-optimizations-for-fetch-store-r5g6b5-.patch | 169 ++
...SIMD-Try-without-any-CFLAGS-before-forcin.patch | 53 +
recipes/obsolete/xorg/xorg-lib/pixman/calloc.patch | 23 +
.../xorg/xorg-lib/pixman/nearest-neighbour.patch | 1040 ++++++++++++
.../xorg/xorg-lib/pixman/over-n-8-0565.patch | 231 +++
.../xorg/xorg-lib/pixman/pixman-28986.patch | 32 +
.../obsolete/xorg/xorg-lib/pixman/prefetch.patch | 298 ++++
.../xorg/xorg-lib/pixman/remove-broken.patch | 826 ++++++++++
.../xorg/xorg-lib/pixman/src-8888-0565.patch | 324 ++++
recipes/obsolete/xorg/xorg-lib/pixman/tls.patch | 59 +
recipes/obsolete/xorg/xorg-lib/pixman_0.10.0.bb | 5 +
recipes/obsolete/xorg/xorg-lib/pixman_0.11.4.bb | 7 +
recipes/obsolete/xorg/xorg-lib/pixman_0.11.8.bb | 9 +
recipes/obsolete/xorg/xorg-lib/pixman_0.15.18.bb | 7 +
recipes/obsolete/xorg/xorg-lib/pixman_0.15.6.bb | 7 +
recipes/obsolete/xorg/xorg-lib/pixman_0.17.12.bb | 24 +
recipes/obsolete/xorg/xorg-lib/pixman_0.17.8.bb | 23 +
recipes/obsolete/xorg/xorg-lib/pixman_0.18.0.bb | 24 +
recipes/obsolete/xorg/xorg-lib/pixman_0.9.4.bb | 7 +
recipes/obsolete/xorg/xorg-lib/pixman_0.9.5.bb | 8 +
recipes/obsolete/xorg/xorg-lib/pixman_git.bb | 27 +
.../xorg-lib/xtrans/fix-missing-includepath.patch | 13 +
recipes/obsolete/xorg/xorg-lib/xtrans_1.0.3.bb | 15 +
recipes/obsolete/xorg/xorg-lib/xtrans_1.0.4.bb | 15 +
recipes/obsolete/xorg/xorg-lib/xtrans_1.1.bb | 15 +
recipes/obsolete/xorg/xorg-lib/xtrans_1.2.1.bb | 15 +
recipes/obsolete/xorg/xorg-lib/xtrans_1.2.3.bb | 15 +
recipes/obsolete/xorg/xorg-lib/xtrans_1.2.bb | 15 +
recipes/xorg-lib/diet-x11_1.1.1.bb | 12 -
recipes/xorg-lib/diet-x11_1.1.2.bb | 10 -
recipes/xorg-lib/diet-x11_1.1.3.bb | 10 -
recipes/xorg-lib/diet-x11_1.1.4.bb | 10 -
recipes/xorg-lib/libapplewm_1.0.0.bb | 9 -
recipes/xorg-lib/libdmx_1.0.2.bb | 8 -
recipes/xorg-lib/libfontenc_1.0.4.bb | 11 -
recipes/xorg-lib/libfs_1.0.0.bb | 10 -
recipes/xorg-lib/libfs_1.0.1.bb | 10 -
recipes/xorg-lib/libice_1.0.3.bb | 12 -
recipes/xorg-lib/libice_1.0.4.bb | 12 -
.../xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch | 55 +
recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch | 55 -
recipes/xorg-lib/liblbxutil/mkg3states.patch | 51 -
recipes/xorg-lib/liblbxutil_1.0.1.bb | 11 -
recipes/xorg-lib/libpciaccess/fix-mtrr-check.patch | 19 -
recipes/xorg-lib/libpciaccess_0.10.3.bb | 7 -
recipes/xorg-lib/libpciaccess_0.11.0.bb | 6 -
recipes/xorg-lib/libsm_1.0.2.bb | 13 -
recipes/xorg-lib/libsm_1.0.3.bb | 12 -
recipes/xorg-lib/libsm_1.1.0.bb | 12 -
recipes/xorg-lib/libwindowswm_1.0.0.bb | 9 -
.../xorg-lib/libx11-1.0.1/keysymdef_include.patch | 62 -
.../libx11-1.0.1/x11_disable_makekeys.patch | 15 -
.../xorg-lib/libx11-1.0.3/keysymdef_include.patch | 62 -
.../libx11-1.0.3/x11_disable_makekeys.patch | 15 -
.../xorg-lib/libx11-1.1.1/keysymdef_include.patch | 62 -
.../xorg-lib/libx11-1.1.2/keysymdef_include.patch | 62 -
.../xorg-lib/libx11-1.1.3/keysymdef_include.patch | 62 -
.../xorg-lib/libx11-1.1.4/keysymdef_include.patch | 62 -
recipes/xorg-lib/libx11-1.1.5/X18NCMSstubs.diff | 528 ++++++
recipes/xorg-lib/libx11-1.1.5/dolt-fix.patch | 21 +
.../xorg-lib/libx11-1.1.5/fix-disable-xlocale.diff | 14 +
.../libx11-1.1.5/fix-utf8-wrong-define.patch | 16 +
.../xorg-lib/libx11-1.1.5/keysymdef_include.patch | 29 +
.../xorg-lib/libx11-1.1.5/makekeys-update.patch | 87 +
.../libx11-1.1.5/x11_disable_makekeys.patch | 30 +
.../xorg-lib/libx11-1.2/x11_disable_makekeys.patch | 23 -
recipes/xorg-lib/libx11-1.3.2/dolt-fix.patch | 21 +
.../xorg-lib/libx11-1.3.2/keysymdef_include.patch | 29 +
recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch | 22 -
.../libx11-1.3.3+git/keysymdef_include.patch | 29 -
.../libx11-1.3.3+git/x11_disable_makekeys.patch | 26 -
.../libx11-1.3.3/x11_disable_makekeys.patch | 23 -
recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch | 22 -
.../xorg-lib/libx11-1.3.4/keysymdef_include.patch | 21 -
.../libx11-1.3.4/x11_disable_makekeys.patch | 29 -
recipes/xorg-lib/libx11/X18NCMSstubs.diff | 528 ------
recipes/xorg-lib/libx11/dolt-fix.patch | 21 -
recipes/xorg-lib/libx11/fix-disable-xlocale.diff | 14 -
.../xorg-lib/libx11/fix-utf8-wrong-define.patch | 16 -
recipes/xorg-lib/libx11/keysymdef_include.patch | 29 -
recipes/xorg-lib/libx11/makekeys-update.patch | 87 -
recipes/xorg-lib/libx11/ruutf8.patch | 12 -
recipes/xorg-lib/libx11/x11_disable_makekeys.patch | 30 -
recipes/xorg-lib/libx11/xchar2b.patch | 13 -
recipes/xorg-lib/libx11/xim.patch | 55 -
recipes/xorg-lib/libx11_1.0.1.bb | 10 -
recipes/xorg-lib/libx11_1.0.3.bb | 10 -
recipes/xorg-lib/libx11_1.1.1.bb | 9 -
recipes/xorg-lib/libx11_1.1.2.bb | 8 -
recipes/xorg-lib/libx11_1.1.3.bb | 8 -
recipes/xorg-lib/libx11_1.1.4.bb | 8 -
recipes/xorg-lib/libx11_1.2.bb | 9 -
recipes/xorg-lib/libx11_1.3.3.bb | 6 -
recipes/xorg-lib/libx11_1.3.4.bb | 6 -
recipes/xorg-lib/libx11_git.bb | 14 -
recipes/xorg-lib/libxau_1.0.3.bb | 12 -
recipes/xorg-lib/libxau_1.0.4.bb | 12 -
recipes/xorg-lib/libxaw_1.0.3.bb | 22 -
recipes/xorg-lib/libxaw_1.0.4.bb | 22 -
.../libxcomposite/change-include-order.patch | 14 -
recipes/xorg-lib/libxcomposite_0.3.1.bb | 12 -
recipes/xorg-lib/libxcomposite_0.4.0.bb | 12 -
recipes/xorg-lib/libxcursor_1.1.8.bb | 13 -
recipes/xorg-lib/libxcursor_1.1.9.bb | 13 -
recipes/xorg-lib/libxdamage_1.0.4.bb | 11 -
recipes/xorg-lib/libxdamage_1.1.1.bb | 11 -
recipes/xorg-lib/libxdmcp_1.0.2.bb | 12 -
recipes/xorg-lib/libxext_1.0.2.bb | 13 -
recipes/xorg-lib/libxext_1.0.3.bb | 12 -
recipes/xorg-lib/libxext_1.0.4.bb | 12 -
recipes/xorg-lib/libxext_1.0.5.bb | 12 -
recipes/xorg-lib/libxfixes_4.0.3.bb | 13 -
.../builtinreaddirectory-no-side-effect.patch | 188 ---
recipes/xorg-lib/libxfont/no-scalable-crash.patch | 22 -
recipes/xorg-lib/libxfont_1.2.7.bb | 15 -
recipes/xorg-lib/libxfont_1.2.8.bb | 15 -
recipes/xorg-lib/libxfont_1.3.0.bb | 15 -
recipes/xorg-lib/libxfont_1.3.1.bb | 14 -
recipes/xorg-lib/libxfont_1.3.2.bb | 14 -
recipes/xorg-lib/libxfont_1.3.3.bb | 13 -
recipes/xorg-lib/libxfontcache_1.0.4.bb | 10 -
recipes/xorg-lib/libxft_2.1.12.bb | 21 -
recipes/xorg-lib/libxft_2.1.13.bb | 21 -
recipes/xorg-lib/libxi_1.0.2.bb | 10 -
recipes/xorg-lib/libxi_1.1.0.bb | 10 -
recipes/xorg-lib/libxi_1.1.2.bb | 10 -
recipes/xorg-lib/libxi_1.1.3.bb | 10 -
recipes/xorg-lib/libxi_1.2.0.bb | 10 -
recipes/xorg-lib/libxinerama_1.0.2.bb | 10 -
recipes/xorg-lib/libxinerama_1.0.3.bb | 10 -
recipes/xorg-lib/libxkbfile_1.0.4.bb | 11 -
recipes/xorg-lib/libxkbfile_1.0.5.bb | 11 -
recipes/xorg-lib/libxmu_1.0.3.bb | 17 -
recipes/xorg-lib/libxmu_1.0.4.bb | 17 -
recipes/xorg-lib/libxpm_3.5.6.bb | 16 -
recipes/xorg-lib/libxpm_3.5.7.bb | 16 -
recipes/xorg-lib/libxrandr_1.1.2.bb | 13 -
recipes/xorg-lib/libxrandr_1.2.2.bb | 13 -
recipes/xorg-lib/libxrandr_1.2.3.bb | 13 -
recipes/xorg-lib/libxrender_0.9.2.bb | 13 -
recipes/xorg-lib/libxrender_0.9.3.bb | 13 -
recipes/xorg-lib/libxrender_0.9.4.bb | 13 -
recipes/xorg-lib/libxres_1.0.3.bb | 10 -
recipes/xorg-lib/libxscrnsaver_1.1.2.bb | 13 -
recipes/xorg-lib/libxscrnsaver_1.1.3.bb | 13 -
| 512 ------
recipes/xorg-lib/libxt_1.0.4.bb | 24 -
recipes/xorg-lib/libxt_1.0.5.bb | 23 -
recipes/xorg-lib/libxtst_1.0.2.bb | 10 -
recipes/xorg-lib/libxtst_1.0.3.bb | 10 -
recipes/xorg-lib/libxv_1.0.3.bb | 10 -
recipes/xorg-lib/libxv_1.0.4.bb | 10 -
recipes/xorg-lib/libxvmc/drm.patch | 9 -
recipes/xorg-lib/libxvmc/true.patch | 11 -
recipes/xorg-lib/libxvmc/via.patch | 23 -
recipes/xorg-lib/libxvmc_1.0.4.bb | 10 -
recipes/xorg-lib/libxvmc_1.0.5.bb | 10 -
recipes/xorg-lib/libxxf86dga_1.0.1.bb | 10 -
recipes/xorg-lib/libxxf86dga_1.0.2.bb | 10 -
recipes/xorg-lib/libxxf86misc_1.0.1.bb | 10 -
recipes/xorg-lib/libxxf86vm_1.0.1.bb | 10 -
recipes/xorg-lib/libxxf86vm_1.0.2.bb | 10 -
recipes/xorg-lib/pixman-0.12.0/pixman-arm.patch | 632 ++++++++
.../xorg-lib/pixman-0.12.0/pixman-x888-565.patch | 68 +
.../pixman-0.13.2/pixman-0.13.2-neon1.patch | 1702 ++++++++++++++++++++
...mplementation-of-pixman_blt-with-overlapp.patch | 114 --
...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 --
...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 --
...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 --
recipes/xorg-lib/pixman-0.17.8/1-composite.patch | 161 --
recipes/xorg-lib/pixman-0.17.8/2-composite.patch | 102 --
recipes/xorg-lib/pixman-0.17.8/3-composite.patch | 108 --
...mplementation-of-pixman_blt-with-overlapp.patch | 114 --
...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 --
...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 --
...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 --
...EON-optimizations-for-fetch-store-r5g6b5-.patch | 169 --
recipes/xorg-lib/pixman-0.18.0/565-scanline.patch | 257 ---
.../pixman-0.18.0/missing-cache-preload.diff | 28 -
.../dont-copy-unused-bits-to-alpha-channel.patch | 29 -
...mplementation-of-pixman_blt-with-overlapp.patch | 114 --
...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 --
...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 --
...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 --
...EON-optimizations-for-fetch-store-r5g6b5-.patch | 169 --
...SIMD-Try-without-any-CFLAGS-before-forcin.patch | 53 -
recipes/xorg-lib/pixman/calloc.patch | 23 -
recipes/xorg-lib/pixman/nearest-neighbour.patch | 1040 ------------
recipes/xorg-lib/pixman/over-n-8-0565.patch | 231 ---
recipes/xorg-lib/pixman/pixman-0.13.2-neon1.patch | 1702 --------------------
recipes/xorg-lib/pixman/pixman-28986.patch | 32 -
recipes/xorg-lib/pixman/pixman-arm.patch | 632 --------
recipes/xorg-lib/pixman/pixman-x888-565.patch | 68 -
recipes/xorg-lib/pixman/prefetch.patch | 298 ----
recipes/xorg-lib/pixman/remove-broken.patch | 826 ----------
recipes/xorg-lib/pixman/src-8888-0565.patch | 324 ----
recipes/xorg-lib/pixman/tls.patch | 59 -
recipes/xorg-lib/pixman_0.10.0.bb | 5 -
recipes/xorg-lib/pixman_0.11.4.bb | 7 -
recipes/xorg-lib/pixman_0.11.8.bb | 9 -
recipes/xorg-lib/pixman_0.15.18.bb | 7 -
recipes/xorg-lib/pixman_0.15.6.bb | 7 -
recipes/xorg-lib/pixman_0.17.12.bb | 24 -
recipes/xorg-lib/pixman_0.17.8.bb | 23 -
recipes/xorg-lib/pixman_0.18.0.bb | 24 -
recipes/xorg-lib/pixman_0.9.4.bb | 7 -
recipes/xorg-lib/pixman_0.9.5.bb | 8 -
recipes/xorg-lib/pixman_git.bb | 27 -
.../xorg-lib/xtrans/fix-missing-includepath.patch | 13 -
recipes/xorg-lib/xtrans_1.0.3.bb | 15 -
recipes/xorg-lib/xtrans_1.0.4.bb | 15 -
recipes/xorg-lib/xtrans_1.1.bb | 15 -
recipes/xorg-lib/xtrans_1.2.1.bb | 15 -
recipes/xorg-lib/xtrans_1.2.3.bb | 15 -
recipes/xorg-lib/xtrans_1.2.bb | 15 -
350 files changed, 11141 insertions(+), 11091 deletions(-)
create mode 100644 recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libapplewm_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libdmx_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libfontenc_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libfs_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libfs_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libice_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libice_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/liblbxutil/mkg3states.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/liblbxutil_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libpciaccess/fix-mtrr-check.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libpciaccess_0.10.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libpciaccess_0.11.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libsm_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libsm_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libsm_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libwindowswm_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.1.1/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.1.2/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.1.3/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.1.4/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.2/x11_disable_makekeys.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/dolt-fix.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11/ruutf8.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11/xchar2b.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11/xim.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.1.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.3.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.3.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_git.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxau_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxau_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxaw_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxaw_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxcomposite/change-include-order.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxcomposite_0.3.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxcomposite_0.4.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.9.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxdamage_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxdamage_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxdmcp_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxext_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxext_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxext_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxext_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfixes_4.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont/no-scalable-crash.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont_1.2.7.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont_1.2.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont_1.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont_1.3.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont_1.3.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont_1.3.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfontcache_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxft_2.1.12.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxft_2.1.13.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxi_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxi_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxi_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxi_1.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxi_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxmu_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxmu_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxpm_3.5.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxpm_3.5.7.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxrandr_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxrender_0.9.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxrender_0.9.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxrender_0.9.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxres_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxt/pr10970-header-fix.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxt_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxt_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxtst_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxtst_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxv_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxv_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxvmc/drm.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxvmc/true.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxvmc/via.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxxf86misc_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/1-composite.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/2-composite.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/3-composite.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/565-scanline.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/calloc.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/nearest-neighbour.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/over-n-8-0565.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/pixman-28986.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/prefetch.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/remove-broken.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/src-8888-0565.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/tls.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.10.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.11.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.11.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.15.18.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.15.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.17.12.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.17.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.18.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.9.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.9.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_git.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans/fix-missing-includepath.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans_1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans_1.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans_1.2.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans_1.2.bb
delete mode 100644 recipes/xorg-lib/diet-x11_1.1.1.bb
delete mode 100644 recipes/xorg-lib/diet-x11_1.1.2.bb
delete mode 100644 recipes/xorg-lib/diet-x11_1.1.3.bb
delete mode 100644 recipes/xorg-lib/diet-x11_1.1.4.bb
delete mode 100644 recipes/xorg-lib/libapplewm_1.0.0.bb
delete mode 100644 recipes/xorg-lib/libdmx_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libfontenc_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libfs_1.0.0.bb
delete mode 100644 recipes/xorg-lib/libfs_1.0.1.bb
delete mode 100644 recipes/xorg-lib/libice_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libice_1.0.4.bb
create mode 100644 recipes/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch
delete mode 100644 recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch
delete mode 100644 recipes/xorg-lib/liblbxutil/mkg3states.patch
delete mode 100644 recipes/xorg-lib/liblbxutil_1.0.1.bb
delete mode 100644 recipes/xorg-lib/libpciaccess/fix-mtrr-check.patch
delete mode 100644 recipes/xorg-lib/libpciaccess_0.10.3.bb
delete mode 100644 recipes/xorg-lib/libpciaccess_0.11.0.bb
delete mode 100644 recipes/xorg-lib/libsm_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libsm_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libsm_1.1.0.bb
delete mode 100644 recipes/xorg-lib/libwindowswm_1.0.0.bb
delete mode 100644 recipes/xorg-lib/libx11-1.0.1/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11-1.0.3/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11-1.1.1/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.1.2/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.1.3/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.1.4/keysymdef_include.patch
create mode 100644 recipes/xorg-lib/libx11-1.1.5/X18NCMSstubs.diff
create mode 100644 recipes/xorg-lib/libx11-1.1.5/dolt-fix.patch
create mode 100644 recipes/xorg-lib/libx11-1.1.5/fix-disable-xlocale.diff
create mode 100644 recipes/xorg-lib/libx11-1.1.5/fix-utf8-wrong-define.patch
create mode 100644 recipes/xorg-lib/libx11-1.1.5/keysymdef_include.patch
create mode 100644 recipes/xorg-lib/libx11-1.1.5/makekeys-update.patch
create mode 100644 recipes/xorg-lib/libx11-1.1.5/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch
create mode 100644 recipes/xorg-lib/libx11-1.3.2/dolt-fix.patch
create mode 100644 recipes/xorg-lib/libx11-1.3.2/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.4/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11/X18NCMSstubs.diff
delete mode 100644 recipes/xorg-lib/libx11/dolt-fix.patch
delete mode 100644 recipes/xorg-lib/libx11/fix-disable-xlocale.diff
delete mode 100644 recipes/xorg-lib/libx11/fix-utf8-wrong-define.patch
delete mode 100644 recipes/xorg-lib/libx11/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11/makekeys-update.patch
delete mode 100644 recipes/xorg-lib/libx11/ruutf8.patch
delete mode 100644 recipes/xorg-lib/libx11/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11/xchar2b.patch
delete mode 100644 recipes/xorg-lib/libx11/xim.patch
delete mode 100644 recipes/xorg-lib/libx11_1.0.1.bb
delete mode 100644 recipes/xorg-lib/libx11_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libx11_1.1.1.bb
delete mode 100644 recipes/xorg-lib/libx11_1.1.2.bb
delete mode 100644 recipes/xorg-lib/libx11_1.1.3.bb
delete mode 100644 recipes/xorg-lib/libx11_1.1.4.bb
delete mode 100644 recipes/xorg-lib/libx11_1.2.bb
delete mode 100644 recipes/xorg-lib/libx11_1.3.3.bb
delete mode 100644 recipes/xorg-lib/libx11_1.3.4.bb
delete mode 100644 recipes/xorg-lib/libx11_git.bb
delete mode 100644 recipes/xorg-lib/libxau_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxau_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxaw_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxaw_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxcomposite/change-include-order.patch
delete mode 100644 recipes/xorg-lib/libxcomposite_0.3.1.bb
delete mode 100644 recipes/xorg-lib/libxcomposite_0.4.0.bb
delete mode 100644 recipes/xorg-lib/libxcursor_1.1.8.bb
delete mode 100644 recipes/xorg-lib/libxcursor_1.1.9.bb
delete mode 100644 recipes/xorg-lib/libxdamage_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxdamage_1.1.1.bb
delete mode 100644 recipes/xorg-lib/libxdmcp_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libxext_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libxext_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxext_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxext_1.0.5.bb
delete mode 100644 recipes/xorg-lib/libxfixes_4.0.3.bb
delete mode 100644 recipes/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
delete mode 100644 recipes/xorg-lib/libxfont/no-scalable-crash.patch
delete mode 100644 recipes/xorg-lib/libxfont_1.2.7.bb
delete mode 100644 recipes/xorg-lib/libxfont_1.2.8.bb
delete mode 100644 recipes/xorg-lib/libxfont_1.3.0.bb
delete mode 100644 recipes/xorg-lib/libxfont_1.3.1.bb
delete mode 100644 recipes/xorg-lib/libxfont_1.3.2.bb
delete mode 100644 recipes/xorg-lib/libxfont_1.3.3.bb
delete mode 100644 recipes/xorg-lib/libxfontcache_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxft_2.1.12.bb
delete mode 100644 recipes/xorg-lib/libxft_2.1.13.bb
delete mode 100644 recipes/xorg-lib/libxi_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libxi_1.1.0.bb
delete mode 100644 recipes/xorg-lib/libxi_1.1.2.bb
delete mode 100644 recipes/xorg-lib/libxi_1.1.3.bb
delete mode 100644 recipes/xorg-lib/libxi_1.2.0.bb
delete mode 100644 recipes/xorg-lib/libxinerama_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libxinerama_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxkbfile_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxkbfile_1.0.5.bb
delete mode 100644 recipes/xorg-lib/libxmu_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxmu_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxpm_3.5.6.bb
delete mode 100644 recipes/xorg-lib/libxpm_3.5.7.bb
delete mode 100644 recipes/xorg-lib/libxrandr_1.1.2.bb
delete mode 100644 recipes/xorg-lib/libxrandr_1.2.2.bb
delete mode 100644 recipes/xorg-lib/libxrandr_1.2.3.bb
delete mode 100644 recipes/xorg-lib/libxrender_0.9.2.bb
delete mode 100644 recipes/xorg-lib/libxrender_0.9.3.bb
delete mode 100644 recipes/xorg-lib/libxrender_0.9.4.bb
delete mode 100644 recipes/xorg-lib/libxres_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxscrnsaver_1.1.2.bb
delete mode 100644 recipes/xorg-lib/libxscrnsaver_1.1.3.bb
delete mode 100644 recipes/xorg-lib/libxt/pr10970-header-fix.patch
delete mode 100644 recipes/xorg-lib/libxt_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxt_1.0.5.bb
delete mode 100644 recipes/xorg-lib/libxtst_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libxtst_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxv_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxv_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxvmc/drm.patch
delete mode 100644 recipes/xorg-lib/libxvmc/true.patch
delete mode 100644 recipes/xorg-lib/libxvmc/via.patch
delete mode 100644 recipes/xorg-lib/libxvmc_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxvmc_1.0.5.bb
delete mode 100644 recipes/xorg-lib/libxxf86dga_1.0.1.bb
delete mode 100644 recipes/xorg-lib/libxxf86dga_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libxxf86misc_1.0.1.bb
delete mode 100644 recipes/xorg-lib/libxxf86vm_1.0.1.bb
delete mode 100644 recipes/xorg-lib/libxxf86vm_1.0.2.bb
create mode 100644 recipes/xorg-lib/pixman-0.12.0/pixman-arm.patch
create mode 100644 recipes/xorg-lib/pixman-0.12.0/pixman-x888-565.patch
create mode 100644 recipes/xorg-lib/pixman-0.13.2/pixman-0.13.2-neon1.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/1-composite.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/2-composite.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/3-composite.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/565-scanline.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
delete mode 100644 recipes/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
delete mode 100644 recipes/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
delete mode 100644 recipes/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
delete mode 100644 recipes/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
delete mode 100644 recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
delete mode 100644 recipes/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
delete mode 100644 recipes/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch
delete mode 100644 recipes/xorg-lib/pixman/calloc.patch
delete mode 100644 recipes/xorg-lib/pixman/nearest-neighbour.patch
delete mode 100644 recipes/xorg-lib/pixman/over-n-8-0565.patch
delete mode 100644 recipes/xorg-lib/pixman/pixman-0.13.2-neon1.patch
delete mode 100644 recipes/xorg-lib/pixman/pixman-28986.patch
delete mode 100644 recipes/xorg-lib/pixman/pixman-arm.patch
delete mode 100644 recipes/xorg-lib/pixman/pixman-x888-565.patch
delete mode 100644 recipes/xorg-lib/pixman/prefetch.patch
delete mode 100644 recipes/xorg-lib/pixman/remove-broken.patch
delete mode 100644 recipes/xorg-lib/pixman/src-8888-0565.patch
delete mode 100644 recipes/xorg-lib/pixman/tls.patch
delete mode 100644 recipes/xorg-lib/pixman_0.10.0.bb
delete mode 100644 recipes/xorg-lib/pixman_0.11.4.bb
delete mode 100644 recipes/xorg-lib/pixman_0.11.8.bb
delete mode 100644 recipes/xorg-lib/pixman_0.15.18.bb
delete mode 100644 recipes/xorg-lib/pixman_0.15.6.bb
delete mode 100644 recipes/xorg-lib/pixman_0.17.12.bb
delete mode 100644 recipes/xorg-lib/pixman_0.17.8.bb
delete mode 100644 recipes/xorg-lib/pixman_0.18.0.bb
delete mode 100644 recipes/xorg-lib/pixman_0.9.4.bb
delete mode 100644 recipes/xorg-lib/pixman_0.9.5.bb
delete mode 100644 recipes/xorg-lib/pixman_git.bb
delete mode 100644 recipes/xorg-lib/xtrans/fix-missing-includepath.patch
delete mode 100644 recipes/xorg-lib/xtrans_1.0.3.bb
delete mode 100644 recipes/xorg-lib/xtrans_1.0.4.bb
delete mode 100644 recipes/xorg-lib/xtrans_1.1.bb
delete mode 100644 recipes/xorg-lib/xtrans_1.2.1.bb
delete mode 100644 recipes/xorg-lib/xtrans_1.2.3.bb
delete mode 100644 recipes/xorg-lib/xtrans_1.2.bb
diff --git a/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.1.bb b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.1.bb
new file mode 100644
index 0000000..593ba34
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.1.bb
@@ -0,0 +1,12 @@
+require libx11_${PV}.bb
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://X18NCMSstubs.diff \
+ file://fix-disable-xlocale.diff \
+ file://fix-utf8-wrong-define.patch \
+ file://xim.patch \
+ file://xchar2b.patch"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --enable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.2.bb b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.2.bb
new file mode 100644
index 0000000..f6291a9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.2.bb
@@ -0,0 +1,10 @@
+require libx11_${PV}.bb
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://X18NCMSstubs.diff \
+ file://fix-disable-xlocale.diff \
+ file://fix-utf8-wrong-define.patch"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.3.bb b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.3.bb
new file mode 100644
index 0000000..f6291a9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.3.bb
@@ -0,0 +1,10 @@
+require libx11_${PV}.bb
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://X18NCMSstubs.diff \
+ file://fix-disable-xlocale.diff \
+ file://fix-utf8-wrong-define.patch"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.4.bb b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.4.bb
new file mode 100644
index 0000000..f6291a9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.4.bb
@@ -0,0 +1,10 @@
+require libx11_${PV}.bb
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://X18NCMSstubs.diff \
+ file://fix-disable-xlocale.diff \
+ file://fix-utf8-wrong-define.patch"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-lib/libapplewm_1.0.0.bb b/recipes/obsolete/xorg/xorg-lib/libapplewm_1.0.0.bb
new file mode 100644
index 0000000..6e746b4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libapplewm_1.0.0.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DEPENDS += "libxext applewmproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "48a403c45be2206ee900729ced3a0e62"
+SRC_URI[archive.sha256sum] = "ecd2ff407a418eb4ac673f48b4d0a9c5b6860a13cef7211a32fe8f3d3db0407e"
+
+XORG_PN = "libAppleWM"
diff --git a/recipes/obsolete/xorg/xorg-lib/libdmx_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libdmx_1.0.2.bb
new file mode 100644
index 0000000..7d6e025
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libdmx_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Distributed Multihead extension library"
+DEPENDS += "libxext dmxproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4d866967210d06098fc9f302ed4c79b1"
+SRC_URI[archive.sha256sum] = "fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4"
diff --git a/recipes/obsolete/xorg/xorg-lib/libfontenc_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libfontenc_1.0.4.bb
new file mode 100644
index 0000000..f16cb77
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libfontenc_1.0.4.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 font encoding library"
+LICENSE = "BSD-X"
+DEPENDS += "zlib xproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5cd16a2e51ca7b96a3081c7486ff98b9"
+SRC_URI[archive.sha256sum] = "b993aa3d17e845a12a49160b5d96993059ce919c7ba902005b910b867b6258c8"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-lib/libfs_1.0.0.bb b/recipes/obsolete/xorg/xorg-lib/libfs_1.0.0.bb
new file mode 100644
index 0000000..7f81054
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libfs_1.0.0.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Font Services library"
+DEPENDS += "xproto fontsproto xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "dfd5de47e232db0891410bec8ee6707b"
+SRC_URI[archive.sha256sum] = "2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde"
+
+XORG_PN = "libFS"
diff --git a/recipes/obsolete/xorg/xorg-lib/libfs_1.0.1.bb b/recipes/obsolete/xorg/xorg-lib/libfs_1.0.1.bb
new file mode 100644
index 0000000..fe1f774
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libfs_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Font Services library"
+DEPENDS += "xproto fontsproto xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "81521249353fa33be7a4bb0062c2fbb9"
+SRC_URI[archive.sha256sum] = "9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5"
+
+XORG_PN = "libFS"
diff --git a/recipes/obsolete/xorg/xorg-lib/libice_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libice_1.0.3.bb
new file mode 100644
index 0000000..52c9de0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libice_1.0.3.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Inter-Client Exchange library"
+DEPENDS += "xproto xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "071f96648ac25c8e87a3de11a7de2d8a"
+SRC_URI[archive.sha256sum] = "ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libICE"
diff --git a/recipes/obsolete/xorg/xorg-lib/libice_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libice_1.0.4.bb
new file mode 100644
index 0000000..29303c1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libice_1.0.4.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Inter-Client Exchange library"
+DEPENDS += "xproto xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4ab4e67e0b8845aa201e984153087f4a"
+SRC_URI[archive.sha256sum] = "13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libICE"
diff --git a/recipes/obsolete/xorg/xorg-lib/liblbxutil/mkg3states.patch b/recipes/obsolete/xorg/xorg-lib/liblbxutil/mkg3states.patch
new file mode 100644
index 0000000..58463db
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/liblbxutil/mkg3states.patch
@@ -0,0 +1,51 @@
+--- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500
++++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500
+@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION
+
+ AC_OUTPUT([Makefile
+ src/Makefile
++ src/image/Makefile
+ lbxutil.pc])
+--- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500
++++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500
+@@ -1,9 +1,6 @@
+ lib_LTLIBRARIES = liblbxutil.la
+
+-noinst_PROGRAMS = mkg3states
+-
+-mkg3states_SOURCES = \
+- $(srcdir)/image/mkg3states.c
++SUBDIRS = image
+
+ liblbxutil_la_SOURCES = \
+ $(srcdir)/lbx_zlib/reqstats.h \
+@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@
+
+ $(srcdir)/image/dfaxg42d.c: g3states.h
+
+-g3states.h: mkg3states
+- -rm -f g3states.h
+- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
++g3states.h: image/mkg3states
++ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
+
+ liblbxutil_la_LDFLAGS = -version-number 1:0:0
+
+--- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500
++++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500
+@@ -0,0 +1,15 @@
++# evil hack
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
++
++CC=$(CC_FOR_BUILD)
++LIBTOOL = @LIBTOOL@ --tag=CC
++
++noinst_PROGRAMS = mkg3states
++
++mkg3states_SOURCES = \
++ mkg3states.c
++
++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/recipes/obsolete/xorg/xorg-lib/liblbxutil_1.0.1.bb b/recipes/obsolete/xorg/xorg-lib/liblbxutil_1.0.1.bb
new file mode 100644
index 0000000..f51d5ab
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/liblbxutil_1.0.1.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "XFIXES Extension"
+DEPENDS += " xextproto xproto zlib"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://mkg3states.patch"
+SRC_URI[archive.md5sum] = "b73cbd5bc3cd268722a624a5f1318fde"
+SRC_URI[archive.sha256sum] = "94c31c7090106d3a95e2a7c083961efca1321b970118fe103ab06e5d927b7258"
+
+export CC_FOR_BUILD = "gcc"
diff --git a/recipes/obsolete/xorg/xorg-lib/libpciaccess/fix-mtrr-check.patch b/recipes/obsolete/xorg/xorg-lib/libpciaccess/fix-mtrr-check.patch
new file mode 100644
index 0000000..e2d9f62
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libpciaccess/fix-mtrr-check.patch
@@ -0,0 +1,19 @@
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- libpciaccess-0.10.3.orig/configure.ac
++++ libpciaccess-0.10.3/configure.ac
+@@ -89,12 +89,10 @@ esac
+ AM_CONDITIONAL(LINUX, [test "x$linux" = xyes])
+ AM_CONDITIONAL(FREEBSD, [test "x$freebsd" = xyes])
+ AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
+ AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
+
+-AC_CHECK_FILE([/usr/include/asm/mtrr.h],
+- [have_mtrr_h="yes"], [have_mtrr_h="no"])
+ if test "x$have_mtrr_h" = xyes; then
+ AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
+ fi
+
+ AC_SUBST(PCIACCESS_CFLAGS)
diff --git a/recipes/obsolete/xorg/xorg-lib/libpciaccess_0.10.3.bb b/recipes/obsolete/xorg/xorg-lib/libpciaccess_0.10.3.bb
new file mode 100644
index 0000000..c594dc0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libpciaccess_0.10.3.bb
@@ -0,0 +1,7 @@
+require xorg-lib-common.inc
+DEPENDS += "xproto virtual/libx11"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-mtrr-check.patch"
+SRC_URI[archive.md5sum] = "6d5468debf76fac84576ca26c9535821"
+SRC_URI[archive.sha256sum] = "2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc"
diff --git a/recipes/obsolete/xorg/xorg-lib/libpciaccess_0.11.0.bb b/recipes/obsolete/xorg/xorg-lib/libpciaccess_0.11.0.bb
new file mode 100644
index 0000000..aca0a2f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libpciaccess_0.11.0.bb
@@ -0,0 +1,6 @@
+require xorg-lib-common.inc
+DEPENDS += "xproto virtual/libx11"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "686320dcec98daad0bdfb8894d4f2a2b"
+SRC_URI[archive.sha256sum] = "6e38be12b656c83c66a6fd8ba56c041d8188218278219c88ee635242ec1c7dab"
diff --git a/recipes/obsolete/xorg/xorg-lib/libsm_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libsm_1.0.2.bb
new file mode 100644
index 0000000..ee2ff16
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libsm_1.0.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Session management library"
+PRIORITY = "optional"
+DEPENDS += " libice xproto xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a254771550c01db372e88d1a1dc2e13a"
+SRC_URI[archive.sha256sum] = "e290614797bd626c1b92bac8f83e8954b99bd66e6ecdaa1e935e176df099eba8"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libSM"
diff --git a/recipes/obsolete/xorg/xorg-lib/libsm_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libsm_1.0.3.bb
new file mode 100644
index 0000000..8ca90fe
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libsm_1.0.3.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Session management library"
+DEPENDS += "libice xproto xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "184cbf502b3cd5d7ba5f9d1290a99606"
+SRC_URI[archive.sha256sum] = "57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libSM"
diff --git a/recipes/obsolete/xorg/xorg-lib/libsm_1.1.0.bb b/recipes/obsolete/xorg/xorg-lib/libsm_1.1.0.bb
new file mode 100644
index 0000000..1b51b89
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libsm_1.1.0.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Session management library"
+DEPENDS += "libice xproto xtrans util-linux-ng"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "05a04c2b6382fb0054f6c70494e22733"
+SRC_URI[archive.sha256sum] = "7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libSM"
diff --git a/recipes/obsolete/xorg/xorg-lib/libwindowswm_1.0.0.bb b/recipes/obsolete/xorg/xorg-lib/libwindowswm_1.0.0.bb
new file mode 100644
index 0000000..35457cb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libwindowswm_1.0.0.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DEPENDS += "libxext windowswmproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "337b379fd00a67345b083100c4e6ba95"
+SRC_URI[archive.sha256sum] = "6ad87266173d21ba7e0e4506db0c094769fd58c3f0b741b37f30c297deec166a"
+
+XORG_PN = "libWindowsWM"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/keysymdef_include.patch
new file mode 100644
index 0000000..5653088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ for flag in $XPROTO_CFLAGS -I/usr/include; do
++ case "$KEYSYMDEF" in
++ "")
++ case "$flag" in
++ *-I*)
++ dir=`echo "$flag" | sed 's/ *-I//'`
++ file="$dir/X11/keysymdef.h"
++ if test -f "$file"; then
++ KEYSYMDEF="$file"
++ fi
++ ;;
++ esac
+ ;;
+ esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+- AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
++ done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++else
++ AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AC_ARG_ENABLE(udc,
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
new file mode 100644
index 0000000..ad8b6fc
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
@@ -0,0 +1,15 @@
+Index: libX11-1.0.1/src/util/Makefile.am
+===================================================================
+--- libX11-1.0.1.old/src/util/Makefile.am
++++ libX11-1.0.1/src/util/Makefile.am
+@@ -1,10 +1 @@
+-# $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)
+-
+-#override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-
+ EXTRA_DIST = mkks.sh
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/keysymdef_include.patch
new file mode 100644
index 0000000..5653088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ for flag in $XPROTO_CFLAGS -I/usr/include; do
++ case "$KEYSYMDEF" in
++ "")
++ case "$flag" in
++ *-I*)
++ dir=`echo "$flag" | sed 's/ *-I//'`
++ file="$dir/X11/keysymdef.h"
++ if test -f "$file"; then
++ KEYSYMDEF="$file"
++ fi
++ ;;
++ esac
+ ;;
+ esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+- AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
++ done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++else
++ AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AC_ARG_ENABLE(udc,
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
new file mode 100644
index 0000000..ad8b6fc
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
@@ -0,0 +1,15 @@
+Index: libX11-1.0.1/src/util/Makefile.am
+===================================================================
+--- libX11-1.0.1.old/src/util/Makefile.am
++++ libX11-1.0.1/src/util/Makefile.am
+@@ -1,10 +1 @@
+-# $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)
+-
+-#override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-
+ EXTRA_DIST = mkks.sh
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.1.1/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.1/keysymdef_include.patch
new file mode 100644
index 0000000..5653088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.1/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ for flag in $XPROTO_CFLAGS -I/usr/include; do
++ case "$KEYSYMDEF" in
++ "")
++ case "$flag" in
++ *-I*)
++ dir=`echo "$flag" | sed 's/ *-I//'`
++ file="$dir/X11/keysymdef.h"
++ if test -f "$file"; then
++ KEYSYMDEF="$file"
++ fi
++ ;;
++ esac
+ ;;
+ esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+- AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
++ done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++else
++ AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AC_ARG_ENABLE(udc,
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.1.2/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.2/keysymdef_include.patch
new file mode 100644
index 0000000..5653088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.2/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ for flag in $XPROTO_CFLAGS -I/usr/include; do
++ case "$KEYSYMDEF" in
++ "")
++ case "$flag" in
++ *-I*)
++ dir=`echo "$flag" | sed 's/ *-I//'`
++ file="$dir/X11/keysymdef.h"
++ if test -f "$file"; then
++ KEYSYMDEF="$file"
++ fi
++ ;;
++ esac
+ ;;
+ esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+- AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
++ done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++else
++ AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AC_ARG_ENABLE(udc,
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.1.3/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.3/keysymdef_include.patch
new file mode 100644
index 0000000..5653088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.3/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ for flag in $XPROTO_CFLAGS -I/usr/include; do
++ case "$KEYSYMDEF" in
++ "")
++ case "$flag" in
++ *-I*)
++ dir=`echo "$flag" | sed 's/ *-I//'`
++ file="$dir/X11/keysymdef.h"
++ if test -f "$file"; then
++ KEYSYMDEF="$file"
++ fi
++ ;;
++ esac
+ ;;
+ esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+- AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
++ done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++else
++ AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AC_ARG_ENABLE(udc,
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.1.4/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.4/keysymdef_include.patch
new file mode 100644
index 0000000..5653088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.4/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ for flag in $XPROTO_CFLAGS -I/usr/include; do
++ case "$KEYSYMDEF" in
++ "")
++ case "$flag" in
++ *-I*)
++ dir=`echo "$flag" | sed 's/ *-I//'`
++ file="$dir/X11/keysymdef.h"
++ if test -f "$file"; then
++ KEYSYMDEF="$file"
++ fi
++ ;;
++ esac
+ ;;
+ esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+- AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
++ done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++else
++ AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AC_ARG_ENABLE(udc,
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.2/x11_disable_makekeys.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.2/x11_disable_makekeys.patch
new file mode 100644
index 0000000..9e9e75e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.2/x11_disable_makekeys.patch
@@ -0,0 +1,23 @@
+--- /tmp/Makefile.am 2009-05-27 22:19:39.000000000 +0200
++++ libX11-1.2/src/util/Makefile.am 2009-05-27 22:21:31.000000000 +0200
+@@ -1,20 +1 @@
+-# $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
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/dolt-fix.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
new file mode 100644
index 0000000..7e96075
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
@@ -0,0 +1,22 @@
+Index: libX11-1.3.4/m4/dolt.m4
+===================================================================
+--- libX11-1.3.4/m4/dolt.m4
++++ libX11-1.3.4/m4/dolt.m4
+@@ -155,7 +155,7 @@ dnl without '=', because automake does n
+ 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=()
+@@ -171,7 +171,7 @@ done
+ 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__
+
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
new file mode 100644
index 0000000..07487b6
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.1.5/configure.ac
+===================================================================
+--- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000
++++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000
+@@ -221,13 +221,21 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ dir=`pkg-config --variable=includedir xproto`
++ KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
++
+ if test -f "$KEYSYMDEF"; then
+- AC_MSG_RESULT([$KEYSYMDEF])
++ AC_MSG_RESULT([$KEYSYMDEF])
+ else
+ AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
++
+ AC_SUBST(KEYSYMDEF)
+
+ AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
new file mode 100644
index 0000000..0739632
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
@@ -0,0 +1,26 @@
+Index: git/src/util/Makefile.am
+===================================================================
+--- git.orig/src/util/Makefile.am
++++ git/src/util/Makefile.am
+@@ -1,21 +1 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS = \
+- $(X11_CFLAGS) \
+- $(CWARNFLAGS)
+-
+-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
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
new file mode 100644
index 0000000..5d0a24c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
@@ -0,0 +1,23 @@
+diff -uNr libX11-1.3.3.orig/src/util/Makefile.am libX11-1.3.3/src/util/Makefile.am
+--- libX11-1.3.3.orig/src/util/Makefile.am 2010-01-15 02:11:36.000000000 +0100
++++ libX11-1.3.3/src/util/Makefile.am 2010-01-18 14:48:27.000000000 +0100
+@@ -1,19 +1 @@
+-
+-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
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/dolt-fix.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/dolt-fix.patch
new file mode 100644
index 0000000..7e96075
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/dolt-fix.patch
@@ -0,0 +1,22 @@
+Index: libX11-1.3.4/m4/dolt.m4
+===================================================================
+--- libX11-1.3.4/m4/dolt.m4
++++ libX11-1.3.4/m4/dolt.m4
+@@ -155,7 +155,7 @@ dnl without '=', because automake does n
+ 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=()
+@@ -171,7 +171,7 @@ done
+ 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__
+
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/keysymdef_include.patch
new file mode 100644
index 0000000..0cab165
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/keysymdef_include.patch
@@ -0,0 +1,21 @@
+Index: libX11-1.3.4/configure.ac
+===================================================================
+--- libX11-1.3.4.orig/configure.ac
++++ libX11-1.3.4/configure.ac
+@@ -355,8 +355,14 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`$PKG_CONFIG --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ dir=`${PKG_CONFIG} --variable=includedir xproto`
++ KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
+ if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+ else
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
new file mode 100644
index 0000000..9763313
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.3.4/src/util/Makefile.am
+===================================================================
+--- libX11-1.3.4.orig/src/util/Makefile.am
++++ libX11-1.3.4/src/util/Makefile.am
+@@ -1,24 +1 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS = \
+- $(X11_CFLAGS) \
+- $(CWARNFLAGS)
+-
+-CC = @CC_FOR_BUILD@
+-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+-CFLAGS = @CFLAGS_FOR_BUILD@
+-LDFLAGS = @LDFLAGS_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
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11/ruutf8.patch b/recipes/obsolete/xorg/xorg-lib/libx11/ruutf8.patch
new file mode 100644
index 0000000..0822b30
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11/ruutf8.patch
@@ -0,0 +1,12 @@
+diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
+index a74ca75..ff5bc3f 100644
+--- a/nls/locale.alias.pre
++++ b/nls/locale.alias.pre
+@@ -898,6 +898,7 @@ ru_RU.cp1251: ru_RU.CP1251
+ ru_RU.microsoftcp1251: ru_RU.CP1251
+ ru_RU.microsoft-cp1251: ru_RU.CP1251
+ ru_RU.MICROSOFT-CP1251: ru_RU.CP1251
++ru_RU.utf8: ru_RU.UTF-8
+ #if defined(INCLUDE_ru_SU)
+ XCOMM ru_SU is redundant now
+ ru_SU: ru_RU.KOI8-R
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11/xchar2b.patch b/recipes/obsolete/xorg/xorg-lib/libx11/xchar2b.patch
new file mode 100644
index 0000000..31da58f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11/xchar2b.patch
@@ -0,0 +1,13 @@
+http://www.koka-in.org/~kensyu/zaurus/diary/20030618.html
+
+--- /tmp/Xlib.h 2006-12-01 14:40:27.000000000 +0100
++++ libX11-X11R7.1-1.0.1/include/X11/Xlib.h 2006-12-01 14:40:56.948254000 +0100
+@@ -1067,7 +1067,7 @@
+ typedef struct { /* normal 16 bit characters are two bytes */
+ unsigned char byte1;
+ unsigned char byte2;
+-} XChar2b;
++} __attribute__ ((packed)) XChar2b;
+
+ typedef struct {
+ XChar2b *chars; /* two byte characters */
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11/xim.patch b/recipes/obsolete/xorg/xorg-lib/libx11/xim.patch
new file mode 100644
index 0000000..0eab197
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11/xim.patch
@@ -0,0 +1,55 @@
+--- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000
++++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
+@@ -90,6 +90,52 @@
+ return;
+ }
+
++XIM
++XOpenIM (
++ Display* display,
++ struct _XrmHashBucketRec* rdb,
++ char* res_name,
++ char* res_class)
++{
++ return (XIM) NULL;
++}
++
++Status
++XCloseIM ( XIM im )
++{
++ return NULL;
++}
++
++XIC
++XCreateIC ( XIM im, ...)
++{
++ return NULL;
++}
++
++void
++XDestroyIC ( XIC ic )
++{
++ return;
++}
++
++int
++XmbLookupString (
++ XIC ic,
++ XKeyPressedEvent* ev,
++ char* buffer,
++ int nbytes,
++ KeySym* keysym,
++ Status* status)
++{
++ return XLookupNone;
++}
++
++char *
++XGetICValues( XIC ic, ...)
++{
++ return (char *) NULL;
++}
++
+ XPointer
+ _XimGetLocaleCode ( _Xconst char* encoding_name )
+ {
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.0.1.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.0.1.bb
new file mode 100644
index 0000000..734a31d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.0.1.bb
@@ -0,0 +1,10 @@
+require libx11.inc
+LICENSE = "XFree86"
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://ruutf8.patch"
+SRC_URI[archive.md5sum] = "58f0537f21183e27149cf906a1b6bef9"
+SRC_URI[archive.sha256sum] = "f99e4ce6d8e3b8833957978fe22223897b0e636c83580f2b07eff0388eb75294"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.0.3.bb
new file mode 100644
index 0000000..40cbeb5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.0.3.bb
@@ -0,0 +1,10 @@
+require libx11.inc
+LICENSE = "XFree86"
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://ruutf8.patch"
+SRC_URI[archive.md5sum] = "60b787a812c92d33f71860e4e19cb59d"
+SRC_URI[archive.sha256sum] = "fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.1.1.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.1.bb
new file mode 100644
index 0000000..368dd7b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.1.bb
@@ -0,0 +1,9 @@
+require libx11.inc
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://ruutf8.patch"
+SRC_URI[archive.md5sum] = "848b80f77b20ae1fa5c882bbfa531ebc"
+SRC_URI[archive.sha256sum] = "5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.1.2.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.2.bb
new file mode 100644
index 0000000..60093c1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.2.bb
@@ -0,0 +1,8 @@
+require libx11.inc
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "710bf38a9477a5a1b235bc94f1d0593c"
+SRC_URI[archive.sha256sum] = "b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.1.3.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.3.bb
new file mode 100644
index 0000000..d6aa199
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.3.bb
@@ -0,0 +1,8 @@
+require libx11.inc
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4d43d3e472c552d2f191ecdd4e75112c"
+SRC_URI[archive.sha256sum] = "4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.1.4.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.4.bb
new file mode 100644
index 0000000..3eeeece
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.4.bb
@@ -0,0 +1,8 @@
+require libx11.inc
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1469a5a8aa8d288dce6f4c45d2f68dc3"
+SRC_URI[archive.sha256sum] = "bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.2.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.2.bb
new file mode 100644
index 0000000..0cea5f8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.2.bb
@@ -0,0 +1,9 @@
+require libx11.inc
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://dolt-fix.patch"
+SRC_URI[archive.md5sum] = "c6265b59ea2b594fd68e33f9125b4d20"
+SRC_URI[archive.sha256sum] = "e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.3.3.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.3.3.bb
new file mode 100644
index 0000000..8c40a99
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.3.3.bb
@@ -0,0 +1,6 @@
+require libx11.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://dolt-fix.patch"
+SRC_URI[archive.md5sum] = "5d74971360f194ce33d2bd2e4d9b066c"
+SRC_URI[archive.sha256sum] = "8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.3.4.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.3.4.bb
new file mode 100644
index 0000000..e55d720
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.3.4.bb
@@ -0,0 +1,6 @@
+require libx11.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://dolt-fix.patch"
+SRC_URI[archive.md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
+SRC_URI[archive.sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_git.bb b/recipes/obsolete/xorg/xorg-lib/libx11_git.bb
new file mode 100644
index 0000000..eac68d8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_git.bb
@@ -0,0 +1,14 @@
+require libx11.inc
+PV = "1.3.3+git"
+PR = "${INC_PR}.0"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
+SRC_URI += " file://keysymdef_include.patch \
+ file://x11_disable_makekeys.patch \
+ file://dolt-fix.patch \
+"
+
+SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d"
+S = "${WORKDIR}/git"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxau_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxau_1.0.3.bb
new file mode 100644
index 0000000..cd4f79b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxau_1.0.3.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "A Sample Authorization Protocol for X"
+DEPENDS += " xproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "75a9f2b85cd1617b5ca98c9095323853"
+SRC_URI[archive.sha256sum] = "d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXau"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxau_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxau_1.0.4.bb
new file mode 100644
index 0000000..293fc63
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxau_1.0.4.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "A Sample Authorization Protocol for X"
+DEPENDS += " xproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0f2b88d857e0a3f5898e4759c541af46"
+SRC_URI[archive.sha256sum] = "10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXau"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxaw_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxaw_1.0.3.bb
new file mode 100644
index 0000000..87ec70e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxaw_1.0.3.bb
@@ -0,0 +1,22 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Athena Widget Set"
+DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ee215536ea78798268ab3a444d10135a"
+SRC_URI[archive.sha256sum] = "45ca55bdac904a07b8118618c65ddb5bf8826e626c4c927e3c2508c58e231514"
+
+do_install_append () {
+ ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
+ ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
+ ln -sf libXaw7.so.7 ${D}${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*"
+
+XORG_PN = "libXaw"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxaw_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxaw_1.0.4.bb
new file mode 100644
index 0000000..2ed715d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxaw_1.0.4.bb
@@ -0,0 +1,22 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Athena Widget Set"
+DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "73671d8f1cf36fdd81395328cc3539c9"
+SRC_URI[archive.sha256sum] = "11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9"
+
+do_install_append () {
+ ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
+ ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
+ ln -sf libXaw7.so.7 ${D}${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*"
+
+XORG_PN = "libXaw"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxcomposite/change-include-order.patch b/recipes/obsolete/xorg/xorg-lib/libxcomposite/change-include-order.patch
new file mode 100644
index 0000000..630b881
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxcomposite/change-include-order.patch
@@ -0,0 +1,14 @@
+This patch makes the build use its own Xcomposite.h over rather than an
+older Xcomposite.h that might already be installed in the staging dir.
+
+--- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100
++++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100
+@@ -21,7 +21,7 @@
+ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ # PERFORMANCE OF THIS SOFTWARE.
+
+-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
++AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+
+ lib_LTLIBRARIES = libXcomposite.la
+
diff --git a/recipes/obsolete/xorg/xorg-lib/libxcomposite_0.3.1.bb b/recipes/obsolete/xorg/xorg-lib/libxcomposite_0.3.1.bb
new file mode 100644
index 0000000..d7f8beb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxcomposite_0.3.1.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Composite extension library."
+LICENSE = "BSD-X"
+DEPENDS += " compositeproto virtual/libx11 libxfixes"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://change-include-order.patch"
+SRC_URI[archive.md5sum] = "a80650d660486ea7bb2e5fd84a83799a"
+SRC_URI[archive.sha256sum] = "d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b"
+
+XORG_PN = "libXcomposite"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxcomposite_0.4.0.bb b/recipes/obsolete/xorg/xorg-lib/libxcomposite_0.4.0.bb
new file mode 100644
index 0000000..2dff14a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxcomposite_0.4.0.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Composite extension library."
+LICENSE = "BSD-X"
+DEPENDS += " compositeproto virtual/libx11 libxfixes libxext"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://change-include-order.patch"
+SRC_URI[archive.md5sum] = "7e95395dea89be21bae929b9b7f16641"
+SRC_URI[archive.sha256sum] = "7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510"
+
+XORG_PN = "libXcomposite"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.8.bb b/recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.8.bb
new file mode 100644
index 0000000..3f175e8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.8.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X cursor management library"
+LICENSE = "BSD-X"
+DEPENDS += "libxrender libxfixes"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ec2acd10a7736a85dd1e1ed9ea5bec96"
+SRC_URI[archive.sha256sum] = "8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXcursor"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.9.bb b/recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.9.bb
new file mode 100644
index 0000000..2b363a5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.9.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X cursor management library"
+LICENSE = "BSD-X"
+DEPENDS += "libxrender libxfixes"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "99b7554037a92b260891091e81815a0a"
+SRC_URI[archive.sha256sum] = "1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXcursor"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxdamage_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxdamage_1.0.4.bb
new file mode 100644
index 0000000..452c634
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxdamage_1.0.4.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Damage extension library."
+LICENSE = "BSD-X"
+DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4d0eece7a8372a7754db1de08c2be324"
+SRC_URI[archive.sha256sum] = "5df90f0efa77e1d6f9e1768a2b0adfc896d09c7a3d8680ed0980511b3625c636"
+
+XORG_PN = "libXdamage"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxdamage_1.1.1.bb b/recipes/obsolete/xorg/xorg-lib/libxdamage_1.1.1.bb
new file mode 100644
index 0000000..cb7eca1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxdamage_1.1.1.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 damaged region extension library"
+LICENSE = "BSD-X"
+DEPENDS += "damageproto libxfixes"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ac0ce6b0063a9858c8f24ddb4c60487d"
+SRC_URI[archive.sha256sum] = "0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e"
+
+XORG_PN = "libXdamage"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxdmcp_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxdmcp_1.0.2.bb
new file mode 100644
index 0000000..1226afb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxdmcp_1.0.2.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Display Manager Control Protocol library"
+DEPENDS += "xproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "10facf2bc7cbd5e5c1a698b8a210a582"
+SRC_URI[archive.sha256sum] = "f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXdmcp"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxext_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.2.bb
new file mode 100644
index 0000000..02326de
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Server Extension library"
+PRIORITY = "optional"
+DEPENDS += " xproto virtual/libx11 xextproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "cce89c5b941a493512b534f4847c6111"
+SRC_URI[archive.sha256sum] = "368e4cf5117febd998e6fc40d096b3af19a571adccc5ed49b9d16e482b3a8f8e"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXext"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxext_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.3.bb
new file mode 100644
index 0000000..f8d76b4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.3.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1bf6fa1c26f9957d7cc0bd90b038dfa6"
+SRC_URI[archive.sha256sum] = "2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXext"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxext_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.4.bb
new file mode 100644
index 0000000..1317e5c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.4.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a91f1f722ac80c597cf0b75dcb8b48c0"
+SRC_URI[archive.sha256sum] = "2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXext"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxext_1.0.5.bb b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.5.bb
new file mode 100644
index 0000000..40dbece
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.5.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "aa11d859cc8e9a0bad3bb55e1666547b"
+SRC_URI[archive.sha256sum] = "1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXext"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfixes_4.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxfixes_4.0.3.bb
new file mode 100644
index 0000000..d574764
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfixes_4.0.3.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Fixes extension library."
+LICENSE = "BSD-X"
+DEPENDS += "virtual/libx11 xproto fixesproto xextproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1990d19725a3c7f32290037f02d3737f"
+SRC_URI[archive.sha256sum] = "547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfixes"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch b/recipes/obsolete/xorg/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
new file mode 100644
index 0000000..dd30743
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
@@ -0,0 +1,188 @@
+commit 7670d4a2720c61fbc7b989fed14c676f04ac3ad1
+Author: Dodji Seketeli <dodji@openedhand.com>
+Date: Mon Jul 16 12:24:34 2007 +0200
+
+ Remove side effects from BuiltinReadDirectory()
+
+ The first time BuiltinReadDirectory() is called,
+ save the content of builtin_dir and builtin_alias,
+ before calling FontFileAddFontFile(), because that fonction
+ will modify those.
+
+ Then, in subsequent calls to BuiltinReadDirectory(), restore
+ builtin_dir and builtin_alias so that the side effect incurred
+ by the first call disappears.
+
+diff --git a/src/builtins/dir.c b/src/builtins/dir.c
+index c272449..97f1e1e 100644
+--- a/src/builtins/dir.c
++++ b/src/builtins/dir.c
+@@ -29,6 +29,133 @@
+ #endif
+ #include "builtin.h"
+
++BuiltinDirPtr
++BuiltinDirsDup (const BuiltinDirPtr a_dirs,
++ int a_dirs_len)
++{
++ BuiltinDirPtr dirs=NULL ;
++ int i=0 ;
++
++ if (!a_dirs)
++ return NULL ;
++
++ dirs = xcalloc (a_dirs_len, sizeof (BuiltinDirRec)) ;
++ if (!dirs)
++ return NULL ;
++
++ for (i=0; i < a_dirs_len; i++) {
++ int len = strlen (a_dirs[i].file_name) ;
++ dirs[i].file_name = xcalloc (1, len) ;
++ memmove (dirs[i].file_name, a_dirs[i].file_name, len);
++ len = strlen (a_dirs[i].font_name) ;
++ dirs[i].font_name = xcalloc (1, len) ;
++ memmove (dirs[i].font_name, a_dirs[i].font_name, len);
++ }
++ return dirs ;
++}
++
++/**
++ * Copy a_save back into a_cur
++ * @param a_cur the instance of BuiltinDir to restore
++ * @param a_saved the saved instance of BuiltinDir to copy into a_cur
++ * @return 0 if went okay, 1 otherwise.
++ */
++int
++BuiltinDirRestore (BuiltinDirPtr a_cur,
++ const BuiltinDirPtr a_saved)
++{
++ if (!a_cur)
++ return 1 ;
++ if (!a_saved)
++ return 0 ;
++
++ if (a_saved->font_name)
++ memmove (a_cur->font_name, a_saved->font_name, strlen (a_saved->font_name)) ;
++ return 0 ;
++}
++
++
++int
++BuiltinDirsRestore (BuiltinDirPtr a_cur_tab,
++ const BuiltinDirPtr a_saved_tab,
++ int a_tab_len)
++{
++ int i=0 ;
++
++ if (!a_cur_tab)
++ return 1 ;
++ if (!a_saved_tab)
++ return 0 ;
++
++ for (i=0 ; i < a_tab_len; i++) {
++ if (BuiltinDirRestore (&a_cur_tab[i], &a_saved_tab[i]))
++ return 1 ;
++ }
++ return 0 ;
++}
++
++BuiltinAliasPtr
++BuiltinAliasesDup (const BuiltinAliasPtr a_aliases,
++ int a_aliases_len)
++{
++ BuiltinAliasPtr aliases=NULL ;
++ int i=0 ;
++
++ if (!a_aliases)
++ return NULL ;
++
++ aliases = xcalloc (a_aliases_len, sizeof (BuiltinAliasRec)) ;
++ if (!aliases)
++ return NULL ;
++
++ for (i=0; i < a_aliases_len; i++) {
++ int len = strlen (a_aliases[i].font_name) ;
++ aliases[i].font_name = xcalloc (1, len) ;
++ memmove (aliases[i].font_name, a_aliases[i].font_name, len);
++ }
++ return aliases ;
++}
++
++/**
++ * Copy a_save back into a_cur
++ * @param a_cur the instance of BuiltinAlias to restore
++ * @param a_saved the saved instance of BuiltinAlias to copy into a_cur
++ * @return 0 if went okay, 1 otherwise.
++ */
++int
++BuiltinAliasRestore (BuiltinAliasPtr a_cur,
++ const BuiltinAliasPtr a_save)
++{
++ if (!a_cur)
++ return 1 ;
++ if (!a_save)
++ return 0 ;
++ if (a_save->alias_name)
++ memmove (a_cur->alias_name, a_save->alias_name, strlen (a_save->alias_name)) ;
++ if (a_save->font_name)
++ memmove (a_cur->font_name, a_save->font_name, strlen (a_save->font_name)) ;
++ return 0 ;
++}
++
++int
++BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab,
++ const BuiltinAliasPtr a_saved_tab,
++ int a_tab_len)
++{
++ int i=0 ;
++
++ if (!a_cur_tab)
++ return 1 ;
++ if (!a_saved_tab)
++ return 0 ;
++
++ for (i=0 ; i < a_tab_len; i++) {
++ if (BuiltinAliasRestore (&a_cur_tab[i], &a_saved_tab[i]))
++ return 1 ;
++ }
++ return 0 ;
++}
++
+ int
+ BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
+ {
+@@ -36,6 +163,34 @@ BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
+ int i;
+
+ dir = FontFileMakeDir ("", builtin_dir_count);
++ static BuiltinDirPtr saved_builtin_dir ;
++ static BuiltinAliasPtr saved_builtin_alias ;
++
++
++ if (saved_builtin_dir)
++ {
++ BuiltinDirsRestore ((BuiltinDirPtr) builtin_dir,
++ saved_builtin_dir,
++ builtin_dir_count) ;
++ }
++ else
++ {
++ saved_builtin_dir = BuiltinDirsDup ((const BuiltinDirPtr) builtin_dir,
++ builtin_dir_count) ;
++ }
++
++ if (saved_builtin_alias)
++ {
++ BuiltinAliasesRestore ((BuiltinAliasPtr) builtin_alias,
++ saved_builtin_alias,
++ builtin_alias_count) ;
++ }
++ else
++ {
++ saved_builtin_alias = BuiltinAliasesDup ((const BuiltinAliasPtr) builtin_alias,
++ builtin_alias_count) ;
++ }
++
+ for (i = 0; i < builtin_dir_count; i++)
+ {
+ if (!FontFileAddFontFile (dir,
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont/no-scalable-crash.patch b/recipes/obsolete/xorg/xorg-lib/libxfont/no-scalable-crash.patch
new file mode 100644
index 0000000..90bded6
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont/no-scalable-crash.patch
@@ -0,0 +1,22 @@
+--- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200
++++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200
+@@ -695,6 +695,11 @@
+ */
+ if (isscale)
+ {
++ /* If the fontname says it is scalable, make sure that the
++ * renderer supports OpenScalable and GetInfoScalable.
++ */
++ if (renderer->OpenScalable && renderer->GetInfoScalable)
++ {
+ if (vals.values_supplied & SIZE_SPECIFY_MASK)
+ {
+ bzero((char *)&zeroVals, sizeof(zeroVals));
+@@ -794,6 +799,7 @@
+ bitmap->name.name);
+ }
+ }
++ }
+ }
+ return TRUE;
+ }
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont_1.2.7.bb b/recipes/obsolete/xorg/xorg-lib/libxfont_1.2.7.bb
new file mode 100644
index 0000000..b470c8b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont_1.2.7.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X font library (used by the X server)."
+PRIORITY = "optional"
+LICENSE = "BSD-X"
+DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-scalable-crash.patch"
+SRC_URI[archive.md5sum] = "2f2085310f75900044d9dcd469637d26"
+SRC_URI[archive.sha256sum] = "2f8c004c0b914d460e6fd2b48d8b425cf4778d415467fc1f1d938b200462d18b"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfont"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont_1.2.8.bb b/recipes/obsolete/xorg/xorg-lib/libxfont_1.2.8.bb
new file mode 100644
index 0000000..3794cf2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont_1.2.8.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X font library (used by the X server)."
+PRIORITY = "optional"
+LICENSE = "BSD-X"
+DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-scalable-crash.patch"
+SRC_URI[archive.md5sum] = "83b8e21f6ee22512a8f72ba51e2d74f6"
+SRC_URI[archive.sha256sum] = "374a2ca12f62a4d9f09a17a34765a5289cefa9db7f9f0913e1c3731b4088aad8"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfont"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.0.bb b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.0.bb
new file mode 100644
index 0000000..c3c9377
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.0.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 font rasterisation library"
+LICENSE = "BSD-X"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-scalable-crash.patch \
+ file://builtinreaddirectory-no-side-effect.patch"
+SRC_URI[archive.md5sum] = "d1d3fa170d74b066f1f23ca8574e7c90"
+SRC_URI[archive.sha256sum] = "07567b9880f28d1a404389c024a185419bfe81136aef3d9eda52407f34c3d3dd"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfont"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.1.bb b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.1.bb
new file mode 100644
index 0000000..671fd58
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.1.bb
@@ -0,0 +1,14 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 font rasterisation library"
+LICENSE = "BSD-X"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-scalable-crash.patch"
+SRC_URI[archive.md5sum] = "b2f396b62633819bbdd9748383876e21"
+SRC_URI[archive.sha256sum] = "dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfont"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.2.bb b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.2.bb
new file mode 100644
index 0000000..250433a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.2.bb
@@ -0,0 +1,14 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 font rasterisation library"
+LICENSE = "BSD-X"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-scalable-crash.patch"
+SRC_URI[archive.md5sum] = "64f510ebf9679f3a97a3d633cbee4f50"
+SRC_URI[archive.sha256sum] = "c167cfd529b7c67f496ee0bed3c0b43e0107de0f689d387c1c0e23ef7cf3d2f2"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfont"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.3.bb b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.3.bb
new file mode 100644
index 0000000..65b5415
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.3.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 font rasterisation library"
+LICENSE = "BSD-X"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4f174b9613f87cf00d731da428a1b194"
+SRC_URI[archive.sha256sum] = "6171e6bca4bd6333611bd9c63cccc8e8e412d876c72097f0dddc490a9df51d5a"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfont"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfontcache_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxfontcache_1.0.4.bb
new file mode 100644
index 0000000..f4a079e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfontcache_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X-TrueType font cache extension client library"
+DEPENDS += "libxext fontcacheproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1adca018aa7bf2d215f20a69c10828ad"
+SRC_URI[archive.sha256sum] = "ffe747cfbf81cdd862af1b05d021ad1ab83b623eab5b32b0a618efb4c0f3e01c"
+
+XORG_PN = "libXfontcache"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxft_2.1.12.bb b/recipes/obsolete/xorg/xorg-lib/libxft_2.1.12.bb
new file mode 100644
index 0000000..14beef39
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxft_2.1.12.bb
@@ -0,0 +1,21 @@
+require xorg-lib-common.inc
+DESCRIPTION = "FreeType-based font drawing library for X"
+DEPENDS += "libxrender freetype fontconfig"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1309301e2d979bd475dc58325cb8c056"
+SRC_URI[archive.sha256sum] = "68b46f85caaf0b30c876bd983abe144c25755bee7532e8738ab7ebe29a428986"
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+ ${libdir}/*.a ${libdir}/pkgconfig \
+ ${datadir}/aclocal ${bindir} ${sbindir}"
+
+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)
+}
+
+XORG_PN = "libXft"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxft_2.1.13.bb b/recipes/obsolete/xorg/xorg-lib/libxft_2.1.13.bb
new file mode 100644
index 0000000..a2219c9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxft_2.1.13.bb
@@ -0,0 +1,21 @@
+require xorg-lib-common.inc
+DESCRIPTION = "FreeType-based font drawing library for X"
+DEPENDS += "libxrender freetype fontconfig"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "bc8881851f3bd8dcc625fac37350a1c6"
+SRC_URI[archive.sha256sum] = "ce7688258af34c14af421bcfb306d4310245b727d2417ac968b7f6b2facfde8c"
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+ ${libdir}/*.a ${libdir}/pkgconfig \
+ ${datadir}/aclocal ${bindir} ${sbindir}"
+
+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)
+}
+
+XORG_PN = "libXft"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxi_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxi_1.0.2.bb
new file mode 100644
index 0000000..12e49f0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxi_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Input extension library."
+DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4a5207a29a6b220e5462129854689844"
+SRC_URI[archive.sha256sum] = "7e6339539d3d0a4fc95cc23ca2b13ae67dd783e011b3cc5ca76040e376bff57f"
+
+XORG_PN = "libXi"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxi_1.1.0.bb b/recipes/obsolete/xorg/xorg-lib/libxi_1.1.0.bb
new file mode 100644
index 0000000..3ad5dfc
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxi_1.1.0.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Input extension library."
+DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c25abbe604029855eb11a3a75fb1f386"
+SRC_URI[archive.sha256sum] = "0f90d7e27d8a7d6bccf9350b6283ffe122e5347fa51d4ea9055653b297339989"
+
+XORG_PN = "libXi"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxi_1.1.2.bb b/recipes/obsolete/xorg/xorg-lib/libxi_1.1.2.bb
new file mode 100644
index 0000000..bff8ba4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxi_1.1.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Input extension library"
+DEPENDS += "libxext inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9c4dd85f3e2a75bfb60bd288502bc288"
+SRC_URI[archive.sha256sum] = "4deda13613f03e4524d3cf0ac14b9e20be5044d415cb8478713ecbe47f4de862"
+
+XORG_PN = "libXi"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxi_1.1.3.bb b/recipes/obsolete/xorg/xorg-lib/libxi_1.1.3.bb
new file mode 100644
index 0000000..039bfc8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxi_1.1.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Input extension library"
+DEPENDS += "libxext inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7c510abb0cad8dc20493fb27ff7859d8"
+SRC_URI[archive.sha256sum] = "c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f"
+
+XORG_PN = "libXi"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxi_1.2.0.bb b/recipes/obsolete/xorg/xorg-lib/libxi_1.2.0.bb
new file mode 100644
index 0000000..e6b3da7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxi_1.2.0.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Input extension library"
+DEPENDS += "libxext inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4b88e07d7dd77ca1e786f09066b58c02"
+SRC_URI[archive.sha256sum] = "7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a"
+
+XORG_PN = "libXi"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.2.bb
new file mode 100644
index 0000000..786c294
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Xinerama extension library"
+DEPENDS += "libxext xineramaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f6fb08eafd3c2909d515f1a07bfca8fd"
+SRC_URI[archive.sha256sum] = "d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d"
+
+XORG_PN = "libXinerama"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.3.bb
new file mode 100644
index 0000000..4e7cc91
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Xinerama extension library"
+DEPENDS += "libxext xineramaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "cd9f7c46439ac40e0517a302d2434d2c"
+SRC_URI[archive.sha256sum] = "07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219"
+
+XORG_PN = "libXinerama"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.4.bb
new file mode 100644
index 0000000..d02cec5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.4.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 keyboard file manipulation library"
+LICENSE = "GPL"
+DEPENDS += "virtual/libx11 kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "12b4ceb5d42b520228b5fb40a96ae6c5"
+SRC_URI[archive.sha256sum] = "468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.5.bb b/recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.5.bb
new file mode 100644
index 0000000..60d3a1b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.5.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 keyboard file manipulation library"
+LICENSE = "GPL"
+DEPENDS += "virtual/libx11 kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0726a845fe5a56551de2718c9f6b0e35"
+SRC_URI[archive.sha256sum] = "0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxmu_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxmu_1.0.3.bb
new file mode 100644
index 0000000..b5bc535
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxmu_1.0.3.bb
@@ -0,0 +1,17 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 miscellaneous utility library"
+DEPENDS += "libxt libxext"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b926b95b811ece3e19cd590db85ee615"
+SRC_URI[archive.sha256sum] = "b56e308e36da8d9cb48433ddb81fd04e26b4f1c695586ac8106ac48a35466d66"
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
+
+XORG_PN = "libXmu"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxmu_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxmu_1.0.4.bb
new file mode 100644
index 0000000..7ebe4c8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxmu_1.0.4.bb
@@ -0,0 +1,17 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 miscellaneous utility library"
+DEPENDS += "libxt libxext"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fb372a5f3ab42b5ba16d7af4d833a0cb"
+SRC_URI[archive.sha256sum] = "f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0"
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
+
+XORG_PN = "libXmu"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxpm_3.5.6.bb b/recipes/obsolete/xorg/xorg-lib/libxpm_3.5.6.bb
new file mode 100644
index 0000000..977f015
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxpm_3.5.6.bb
@@ -0,0 +1,16 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Pixmap library"
+LICENSE = "X-BSD"
+DEPENDS += "libxext libsm libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "37b7d1826c6a02107269632a93b8791f"
+SRC_URI[archive.sha256sum] = "2d5c5242b8417db6aa758e5be387de33385d9960ff21c801af7d6a4730b4fd0d"
+
+PACKAGES =+ "sxpm cxpm"
+
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
+
+XORG_PN = "libXpm"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxpm_3.5.7.bb b/recipes/obsolete/xorg/xorg-lib/libxpm_3.5.7.bb
new file mode 100644
index 0000000..b8ed813
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxpm_3.5.7.bb
@@ -0,0 +1,16 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Pixmap library"
+LICENSE = "X-BSD"
+DEPENDS += "libxext libsm libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "cd15ee542d9f515538b4462a6f79d977"
+SRC_URI[archive.sha256sum] = "64701ae67ce5b0797307b75d8255bec3a0d371d0c50715ea618f5a68bcc92baa"
+
+PACKAGES =+ "sxpm cxpm"
+
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
+
+XORG_PN = "libXpm"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxrandr_1.1.2.bb b/recipes/obsolete/xorg/xorg-lib/libxrandr_1.1.2.bb
new file mode 100644
index 0000000..4fb614c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxrandr_1.1.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Resize and Rotate extension library."
+LICENSE = "BSD-X"
+DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "962946952a01650bb43206043a3c0e12"
+SRC_URI[archive.sha256sum] = "ba5adedc37da835a5c9e5a5d457dce13feead64fc364bc4719c41720ca0a3c50"
+
+BBCLASSEXTEND = "nativesdk"
+
+XORG_PN = "libXrandr"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.2.bb b/recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.2.bb
new file mode 100644
index 0000000..2038f8a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Resize and Rotate extension library"
+LICENSE = "BSD-X"
+DEPENDS += "randrproto libxrender libxext"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1b244b5d19f0ccab01d7083436cd3558"
+SRC_URI[archive.sha256sum] = "206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98"
+
+BBCLASSEXTEND = "nativesdk"
+
+XORG_PN = "libXrandr"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.3.bb b/recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.3.bb
new file mode 100644
index 0000000..22ab29d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.3.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Resize and Rotate extension library"
+LICENSE = "BSD-X"
+DEPENDS += "randrproto libxrender libxext"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5cd67cc02a50c9644ba0a1846ea3b08e"
+SRC_URI[archive.sha256sum] = "f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267"
+
+BBCLASSEXTEND = "nativesdk"
+
+XORG_PN = "libXrandr"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.2.bb b/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.2.bb
new file mode 100644
index 0000000..c67495a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Rendering Extension client library"
+LICENSE = "BSD-X"
+DEPENDS += "virtual/libx11 renderproto xproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2f1b2c6e8dcbcb6d760e59f445abd92c"
+SRC_URI[archive.sha256sum] = "0f749183ab1a0ece14d33c3299b3f70893122349c0bfa9d7bd0e66ce19d1802a"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXrender"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.3.bb b/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.3.bb
new file mode 100644
index 0000000..82b0143
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.3.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Rendering Extension client library"
+LICENSE = "BSD-X"
+DEPENDS += "virtual/libx11 renderproto xproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "307132fce2e551ad2c641bddf8480f16"
+SRC_URI[archive.sha256sum] = "9882ba2d74e9ca5cfd0c2231ac8eba14d8fc59d538c787fa639f8d77c996bbef"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXrender"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.4.bb b/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.4.bb
new file mode 100644
index 0000000..4543a9e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.4.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Rendering Extension client library"
+LICENSE = "BSD-X"
+DEPENDS += "virtual/libx11 renderproto xproto libxdmcp"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "dc266e850c51368f964e0d67bf5fb5e6"
+SRC_URI[archive.sha256sum] = "5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXrender"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxres_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxres_1.0.3.bb
new file mode 100644
index 0000000..9a1aa01
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxres_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Resource extension library"
+DEPENDS += "libxext resourceproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "de66ffb657aba64c9d6dbdeabb757f3e"
+SRC_URI[archive.sha256sum] = "a6d5ba7573f5ec0f091095f01b51d1e671dd0f14acb5b8559cdf366e398a0230"
+
+XORG_PN = "libXres"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.2.bb b/recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.2.bb
new file mode 100644
index 0000000..db164d2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Screen Saver extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext scrnsaverproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ac2d697dd02f51e5c15f7104f4be5328"
+SRC_URI[archive.sha256sum] = "6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67"
+
+RREPLACES_${PN} = "libxss"
+
+XORG_PN = "libXScrnSaver"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.3.bb b/recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.3.bb
new file mode 100644
index 0000000..2cc2c81
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.3.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Screen Saver extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext scrnsaverproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "93f84b6797f2f29cae1ce23b0355d00d"
+SRC_URI[archive.sha256sum] = "4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988"
+
+RREPLACES_${PN} = "libxss"
+
+XORG_PN = "libXScrnSaver"
--git a/recipes/obsolete/xorg/xorg-lib/libxt/pr10970-header-fix.patch b/recipes/obsolete/xorg/xorg-lib/libxt/pr10970-header-fix.patch
new file mode 100644
index 0000000..2acafb8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxt/pr10970-header-fix.patch
@@ -0,0 +1,512 @@
+diff --git a/include/X11/CallbackI.h b/include/X11/CallbackI.h
+index 4ae08ab..64e8152 100644
+--- a/include/X11/CallbackI.h
++++ b/include/X11/CallbackI.h
+@@ -58,6 +58,8 @@ typedef XrmResource **CallbackTable;
+ #define _XtCBCalling 1
+ #define _XtCBFreeAfterCalling 2
+
++_XFUNCPROTOBEGIN
++
+ typedef struct internalCallbackRec {
+ unsigned short count;
+ char is_padded; /* contains NULL padding for external form */
+@@ -115,3 +117,5 @@ extern void _XtCallConditionalCallbackList(
+ XtPointer /* call_data */,
+ _XtConditionProc /* cond_proc */
+ );
++
++_XFUNCPROTOEND
+diff --git a/include/X11/CompositeP.h b/include/X11/CompositeP.h
+index ed055b2..e93275a 100644
+--- a/include/X11/CompositeP.h
++++ b/include/X11/CompositeP.h
+@@ -52,6 +52,8 @@ SOFTWARE.
+
+ #include <X11/Composite.h>
+
++_XFUNCPROTOBEGIN
++
+ /************************************************************************
+ *
+ * Additional instance fields for widgets of (sub)class 'Composite'
+@@ -101,6 +103,8 @@ typedef struct _CompositeClassRec {
+
+ externalref CompositeClassRec compositeClassRec;
+
++_XFUNCPROTOEND
++
+ #define XtCompositeExtensionVersion 2L
+ #define XtInheritGeometryManager ((XtGeometryHandler) _XtInherit)
+ #define XtInheritChangeManaged ((XtWidgetProc) _XtInherit)
+diff --git a/include/X11/ConstrainP.h b/include/X11/ConstrainP.h
+index a90d19a..7030a34 100644
+--- a/include/X11/ConstrainP.h
++++ b/include/X11/ConstrainP.h
+@@ -52,6 +52,8 @@ SOFTWARE.
+
+ #include <X11/Constraint.h>
+
++_XFUNCPROTOBEGIN
++
+ typedef struct _ConstraintPart {
+ XtPointer mumble; /* No new fields, keep C compiler happy */
+ } ConstraintPart;
+@@ -88,6 +90,8 @@ typedef struct _ConstraintClassRec {
+
+ externalref ConstraintClassRec constraintClassRec;
+
++_XFUNCPROTOEND
++
+ #define XtConstraintExtensionVersion 1L
+
+ #endif /* _XtConstraintP_h */
+diff --git a/include/X11/Constraint.h b/include/X11/Constraint.h
+index 9bb962e..b8bd902 100644
+--- a/include/X11/Constraint.h
++++ b/include/X11/Constraint.h
+@@ -50,11 +50,15 @@ SOFTWARE.
+ #ifndef _XtConstraint_h
+ #define _XtConstraint_h
+
++_XFUNCPROTOBEGIN
++
+ typedef struct _ConstraintClassRec *ConstraintWidgetClass;
+
+ #ifndef CONSTRAINT
+ externalref WidgetClass constraintWidgetClass;
+ #endif
+
++_XFUNCPROTOEND
++
+ #endif /* _XtConstraint_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/ConvertI.h b/include/X11/ConvertI.h
+index 02c0e5c..f3f7fb0 100644
+--- a/include/X11/ConvertI.h
++++ b/include/X11/ConvertI.h
+@@ -48,6 +48,8 @@ SOFTWARE.
+ ******************************************************************/
+ /* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */
+
++_XFUNCPROTOBEGIN
++
+ /* Representation types */
+
+ extern XrmQuark _XtQString;
+@@ -94,3 +96,4 @@ extern Boolean _XtConvert(
+
+ void _XtConvertInitialize(void);
+
++_XFUNCPROTOEND
+diff --git a/include/X11/Core.h b/include/X11/Core.h
+index ff6cb75..e1a7c28 100644
+--- a/include/X11/Core.h
++++ b/include/X11/Core.h
+@@ -53,6 +53,8 @@ SOFTWARE.
+ #ifndef _XtCore_h
+ #define _XtCore_h
+
++_XFUNCPROTOBEGIN
++
+ typedef struct _WidgetClassRec *CoreWidgetClass;
+ typedef struct _WidgetRec *CoreWidget;
+ externalref WidgetClass coreWidgetClass;
+@@ -62,5 +64,7 @@ externalref WidgetClass widgetClass;
+
+ #endif
+
++_XFUNCPROTOEND
++
+ #endif /* _XtCore_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/CoreP.h b/include/X11/CoreP.h
+index e07f085..57836e6 100644
+--- a/include/X11/CoreP.h
++++ b/include/X11/CoreP.h
+@@ -55,6 +55,8 @@ SOFTWARE.
+
+ #include <X11/Core.h>
+
++_XFUNCPROTOBEGIN
++
+ externalref int _XtInheritTranslations;
+
+ #define XtInheritTranslations ((String) &_XtInheritTranslations)
+@@ -167,5 +169,7 @@ typedef struct _WidgetClassRec {
+ externalref WidgetClassRec widgetClassRec;
+ #define coreClassRec widgetClassRec
+
++_XFUNCPROTOEND
++
+ #endif /* _XtCoreP_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/CreateI.h b/include/X11/CreateI.h
+index 87abb1d..e0ca9a3 100644
+--- a/include/X11/CreateI.h
++++ b/include/X11/CreateI.h
+@@ -3,6 +3,8 @@
+ #ifndef _XtcreateI_h
+ #define _XtcreateI_h
+
++_XFUNCPROTOBEGIN
++
+ extern Widget _XtCreateWidget(String name, WidgetClass widget_class,
+ Widget parent, ArgList args, Cardinal num_args,
+ XtTypedArgList typed_args,
+@@ -18,9 +20,12 @@ extern Widget _XtAppCreateShell(String name, String class,
+ Cardinal num_typed_args);
+ extern Widget _XtCreateHookObj(Screen *screen);
+
++_XFUNCPROTOEND
+
+ #include <stdarg.h>
+
++_XFUNCPROTOBEGIN
++
+ /* VarCreate.c */
+ extern Widget _XtVaOpenApplication(XtAppContext *app_context_return,
+ _Xconst char* application_class,
+@@ -34,4 +39,6 @@ extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,
+ int *argc_in_out, String *argv_in_out,
+ String *fallback_resources, va_list var_args);
+
++_XFUNCPROTOEND
++
+ #endif /* _XtcreateI_h */
+diff --git a/include/X11/EventI.h b/include/X11/EventI.h
+index 00858e7..d2d1d0f 100644
+--- a/include/X11/EventI.h
++++ b/include/X11/EventI.h
+@@ -65,6 +65,8 @@ typedef struct _XtGrabRec *XtGrabList;
+
+ #include "PassivGraI.h"
+
++_XFUNCPROTOBEGIN
++
+ extern void _XtEventInitialize(
+ void
+ );
+@@ -131,4 +133,6 @@ extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr,
+ /* NextEvent.c */
+ extern Boolean XtAppPeekEvent_SkipTimer;
+
++_XFUNCPROTOEND
++
+ #endif /* _Event_h_ */
+diff --git a/include/X11/HookObjI.h b/include/X11/HookObjI.h
+index c9a22a2..c0858c2 100644
+--- a/include/X11/HookObjI.h
++++ b/include/X11/HookObjI.h
+@@ -29,6 +29,8 @@ in this Software without prior written authorization from The Open Group.
+ #ifndef _XtHookObjI_h
+ #define _XtHookObjI_h
+
++_XFUNCPROTOBEGIN
++
+ /* This object is implementation-dependent and private to the library. */
+
+ typedef struct _HookObjRec *HookObject;
+@@ -66,6 +68,8 @@ typedef struct _HookObjClassRec {
+
+ externalref HookObjClassRec hookObjClassRec;
+
++_XFUNCPROTOEND
++
+ #endif /* ifndef _Xt_HookObjI_h */
+
+
+diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h
+index c2fe47c..2ae9b74 100644
+--- a/include/X11/InitialI.h
++++ b/include/X11/InitialI.h
+@@ -84,6 +84,8 @@ SOFTWARE.
+ #include <X11/Xos.h>
+ #include <X11/Xpoll.h>
+
++_XFUNCPROTOBEGIN
++
+ typedef struct _TimerEventRec {
+ struct timeval te_timer_value;
+ struct _TimerEventRec *te_next;
+@@ -426,4 +428,6 @@ extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
+ String *applName, String *displayName,
+ String *language);
+
++_XFUNCPROTOEND
++
+ #endif /* _XtinitialI_h */
+diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h
+index d749867..d88166f 100644
+--- a/include/X11/IntrinsicI.h
++++ b/include/X11/IntrinsicI.h
+@@ -194,6 +194,8 @@ SOFTWARE.
+ #define ERRORDB "/usr/lib/X11/XtErrorDB"
+ #endif
+
++_XFUNCPROTOBEGIN
++
+ extern String XtCXtToolkitError;
+
+ extern void _XtAllocError(
+@@ -257,5 +259,7 @@ extern char* __XtCalloc (
+ #define __XtCalloc XtCalloc
+ #endif
+
++_XFUNCPROTOEND
++
+ #endif /* _XtintrinsicI_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/Object.h b/include/X11/Object.h
+index 96723b1..2c84aaf 100644
+--- a/include/X11/Object.h
++++ b/include/X11/Object.h
+@@ -50,11 +50,16 @@ SOFTWARE.
+ #ifndef _XtObject_h
+ #define _XtObject_h
+
++_XFUNCPROTOBEGIN
++
+ typedef struct _ObjectRec *Object;
+ typedef struct _ObjectClassRec *ObjectClass;
+
+ #ifndef OBJECT
+ externalref WidgetClass objectClass;
+ #endif
++
++_XFUNCPROTOEND
++
+ #endif /* _XtObject_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/ObjectP.h b/include/X11/ObjectP.h
+index a24564e..0f484d2 100644
+--- a/include/X11/ObjectP.h
++++ b/include/X11/ObjectP.h
+@@ -52,6 +52,8 @@ SOFTWARE.
+
+ #include <X11/Object.h>
+
++_XFUNCPROTOBEGIN
++
+ /**********************************************************
+ * Object Instance Data Structures
+ *
+@@ -132,6 +134,8 @@ typedef struct _ObjectClassRec {
+
+ externalref ObjectClassRec objectClassRec;
+
++_XFUNCPROTOEND
++
+ #define XtObjectExtensionVersion 1L
+ #define XtInheritAllocate ((XtAllocateProc) _XtInherit)
+ #define XtInheritDeallocate ((XtDeallocateProc) _XtInherit)
+diff --git a/include/X11/PassivGraI.h b/include/X11/PassivGraI.h
+index 02e2964..10591ac 100644
+--- a/include/X11/PassivGraI.h
++++ b/include/X11/PassivGraI.h
+@@ -60,6 +60,8 @@ in this Software without prior written authorization from The Open Group.
+ #define KEYBOARD TRUE
+ #define POINTER FALSE
+
++_XFUNCPROTOBEGIN
++
+ typedef enum {
+ XtNoServerGrab,
+ XtPassiveServerGrab,
+@@ -183,4 +185,6 @@ extern void _XtClearAncestorCache(
+ Widget /* widget */
+ );
+
++_XFUNCPROTOEND
++
+ #endif /* _PDI_h_ */
+diff --git a/include/X11/RectObj.h b/include/X11/RectObj.h
+index 07615fa..dced5c3 100644
+--- a/include/X11/RectObj.h
++++ b/include/X11/RectObj.h
+@@ -50,11 +50,16 @@ SOFTWARE.
+ #ifndef _XtRect_h
+ #define _XtRect_h
+
++_XFUNCPROTOBEGIN
++
+ typedef struct _RectObjRec *RectObj;
+ typedef struct _RectObjClassRec *RectObjClass;
+
+ #ifndef RECTOBJ
+ externalref WidgetClass rectObjClass;
+ #endif
++
++_XFUNCPROTOEND
++
+ #endif /* _XtRect_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/RectObjP.h b/include/X11/RectObjP.h
+index ca3b8ad..d6ffb78 100644
+--- a/include/X11/RectObjP.h
++++ b/include/X11/RectObjP.h
+@@ -53,6 +53,8 @@ SOFTWARE.
+ #include <X11/RectObj.h>
+ #include <X11/ObjectP.h>
+
++_XFUNCPROTOBEGIN
++
+ /**********************************************************
+ * Rectangle Object Instance Data Structures
+ *
+@@ -126,4 +128,6 @@ typedef struct _RectObjClassRec {
+
+ externalref RectObjClassRec rectObjClassRec;
+
++_XFUNCPROTOEND
++
+ #endif /*_Xt_RectObjP_h_*/
+diff --git a/include/X11/ResourceI.h b/include/X11/ResourceI.h
+index d6ed1df..3db97f8 100644
+--- a/include/X11/ResourceI.h
++++ b/include/X11/ResourceI.h
+@@ -61,6 +61,8 @@ SOFTWARE.
+ #define StringToName(string) XrmStringToName(string)
+ #define StringToClass(string) XrmStringToClass(string)
+
++_XFUNCPROTOBEGIN
++
+ extern void _XtDependencies(
+ XtResourceList * /* class_resp */,
+ Cardinal * /* class_num_resp */,
+@@ -96,5 +98,6 @@ extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources,
+ Cardinal num_resources);
+ extern void _XtResourceListInitialize(void);
+
++_XFUNCPROTOEND
+
+ #endif /* _XtresourceI_h */
+diff --git a/include/X11/ShellP.h b/include/X11/ShellP.h
+index 2b08c3f..7297d33 100644
+--- a/include/X11/ShellP.h
++++ b/include/X11/ShellP.h
+@@ -67,6 +67,8 @@ SOFTWARE.
+ * *****
+ */
+
++_XFUNCPROTOBEGIN
++
+ /***********************************************************************
+ *
+ * Shell Widget Private Data
+@@ -214,8 +216,12 @@ typedef struct {
+ WMShellPart wm;
+ } WMShellRec, *WMShellWidget;
+
++_XFUNCPROTOEND
++
+ #include <X11/VendorP.h>
+
++_XFUNCPROTOBEGIN
++
+ /***********************************************************************
+ *
+ * TransientShell Widget Private Data
+@@ -425,4 +431,6 @@ typedef struct {
+ SessionShellPart session;
+ } SessionShellRec, *SessionShellWidget;
+
++_XFUNCPROTOEND
++
+ #endif /* _XtShellPrivate_h */
+diff --git a/include/X11/ThreadsI.h b/include/X11/ThreadsI.h
+index 1492d77..28cbc98 100644
+--- a/include/X11/ThreadsI.h
++++ b/include/X11/ThreadsI.h
+@@ -81,6 +81,8 @@ typedef void (*ThreadAppRestoreLockProc)(
+ Boolean* /* pushed_thread */
+ );
+
++_XFUNCPROTOBEGIN
++
+ extern void (*_XtProcessLock)(
+ void
+ );
+@@ -93,6 +95,8 @@ extern void (*_XtInitAppLock)(
+ XtAppContext /* app */
+ );
+
++_XFUNCPROTOEND
++
+ #define INIT_APP_LOCK(app) if(_XtInitAppLock) (*_XtInitAppLock)(app)
+ #define FREE_APP_LOCK(app) if(app && app->free_lock)(*app->free_lock)(app)
+
+diff --git a/include/X11/TranslateI.h b/include/X11/TranslateI.h
+index 1224875..6cc3099 100644
+--- a/include/X11/TranslateI.h
++++ b/include/X11/TranslateI.h
+@@ -342,6 +342,8 @@ typedef struct _TMGlobalRec{
+ #endif /* TRACE_TM */
+ }TMGlobalRec;
+
++_XFUNCPROTOBEGIN
++
+ extern TMGlobalRec _XtGlobalTM;
+
+ #define TM_MOD_SEGMENT_SIZE 16
+@@ -604,3 +606,4 @@ extern void _XtUnmergeTranslations(
+ /* TMKey.c */
+ extern void _XtAllocTMContext(XtPerDisplay pd);
+
++_XFUNCPROTOEND
+diff --git a/include/X11/VarargsI.h b/include/X11/VarargsI.h
+index e15404a..76ce9bc 100644
+--- a/include/X11/VarargsI.h
++++ b/include/X11/VarargsI.h
+@@ -34,6 +34,8 @@ in this Software without prior written authorization from The Open Group.
+
+ /* private routines */
+
++_XFUNCPROTOBEGIN
++
+ extern void _XtCountVaList(
+ va_list /*var*/, int* /*total_count*/, int* /*typed_count*/
+ );
+@@ -62,4 +64,6 @@ extern void _XtGetSubresources(
+ Widget /*w*/, XtPointer /*base*/, const char* /*name*/, const char* /*class*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/
+ );
+
++_XFUNCPROTOEND
++
+ #endif /* _VarargsI_h_ */
+diff --git a/include/X11/Vendor.h b/include/X11/Vendor.h
+index 65e7c38..633d17a 100644
+--- a/include/X11/Vendor.h
++++ b/include/X11/Vendor.h
+@@ -65,7 +65,11 @@ SOFTWARE.
+
+ typedef struct _VendorShellClassRec *VendorShellWidgetClass;
+
++_XFUNCPROTOBEGIN
++
+ externalref WidgetClass vendorShellWidgetClass;
+
++_XFUNCPROTOEND
++
+ #endif /* _XtVendor_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/VendorP.h b/include/X11/VendorP.h
+index 08bf689..e60857d 100644
+--- a/include/X11/VendorP.h
++++ b/include/X11/VendorP.h
+@@ -72,6 +72,8 @@ SOFTWARE.
+
+ /* New fields for the VendorShell widget class record */
+
++_XFUNCPROTOBEGIN
++
+ typedef struct {
+ XtPointer extension; /* pointer to extension record */
+ } VendorShellClassPart;
+@@ -100,4 +102,6 @@ typedef struct {
+ VendorShellPart vendor;
+ } VendorShellRec, *VendorShellWidget;
+
++_XFUNCPROTOEND
++
+ #endif /* _XtVendorPrivate_h */
diff --git a/recipes/obsolete/xorg/xorg-lib/libxt_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxt_1.0.4.bb
new file mode 100644
index 0000000..7dd9863
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxt_1.0.4.bb
@@ -0,0 +1,24 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Toolkit Intrinsics"
+PRIORITY = "optional"
+DEPENDS += " libsm virtual/libx11 xproto kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://pr10970-header-fix.patch"
+SRC_URI[archive.md5sum] = "937735f342c046db239852fec0413f6c"
+SRC_URI[archive.sha256sum] = "ec7088b2ffe8f56c177525283601fb048decaf6f175d9ee5db01e12810a4d345"
+
+EXTRA_OECONF = "--enable-malloc0returnsnull --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 ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+ ) || exit 1
+ oe_runmake
+}
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXt"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxt_1.0.5.bb b/recipes/obsolete/xorg/xorg-lib/libxt_1.0.5.bb
new file mode 100644
index 0000000..7bdf252
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxt_1.0.5.bb
@@ -0,0 +1,23 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 toolkit intrinsics library"
+DEPENDS += "libsm virtual/libx11 kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://pr10970-header-fix.patch"
+SRC_URI[archive.md5sum] = "f3bdd67785ace8cd0b23249e9d8c9975"
+SRC_URI[archive.sha256sum] = "43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4"
+
+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
+}
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXt"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxtst_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxtst_1.0.2.bb
new file mode 100644
index 0000000..ff87f7c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxtst_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Test Extension: client side library"
+DEPENDS += "libxext recordproto inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "032d5c1d3914fc0224837328c88aef96"
+SRC_URI[archive.sha256sum] = "eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b"
+
+XORG_PN = "libXtst"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxtst_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxtst_1.0.3.bb
new file mode 100644
index 0000000..56dfae5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxtst_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Test Extension: client side library"
+DEPENDS += "libxext recordproto inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "090c1ad04e34982eada5cf3b1a0792fd"
+SRC_URI[archive.sha256sum] = "b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905"
+
+XORG_PN = "libXtst"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxv_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxv_1.0.3.bb
new file mode 100644
index 0000000..4f19126
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxv_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Video extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext videoproto"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f1c4109fa804aeaf7188b66c5cdd9f57"
+SRC_URI[archive.sha256sum] = "f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b"
+
+XORG_PN = "libXv"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxv_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxv_1.0.4.bb
new file mode 100644
index 0000000..be5a50c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxv_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Video extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext videoproto"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "723a0275227165383e967a1ca8899b52"
+SRC_URI[archive.sha256sum] = "4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8"
+
+XORG_PN = "libXv"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxvmc/drm.patch b/recipes/obsolete/xorg/xorg-lib/libxvmc/drm.patch
new file mode 100644
index 0000000..d48cdb3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxvmc/drm.patch
@@ -0,0 +1,9 @@
+--- XvMC/hw/via/Makefile.am.old 2005-03-06 11:25:11.000000000 +0000
++++ XvMC/hw/via/Makefile.am 2005-03-06 11:25:22.000000000 +0000
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(XVMC_CFLAGS)
+-libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm
+
+ lib_LTLIBRARIES = libviaXvMC.la
+
diff --git a/recipes/obsolete/xorg/xorg-lib/libxvmc/true.patch b/recipes/obsolete/xorg/xorg-lib/libxvmc/true.patch
new file mode 100644
index 0000000..7059295
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxvmc/true.patch
@@ -0,0 +1,11 @@
+--- XvMC/hw/via/viaXvMC.c.old 2004-10-18 20:54:49.000000000 +0100
++++ XvMC/hw/via/viaXvMC.c 2004-10-18 20:55:03.000000000 +0100
+@@ -43,6 +43,8 @@
+ #include <xf86drm.h>
+ #include <pthread.h>
+ #include "vldXvMC.h"
++
++#define TRUE 1
+
+ #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \
+ (((CARD8 *)(ctx)->sAreaAddress) + \
diff --git a/recipes/obsolete/xorg/xorg-lib/libxvmc/via.patch b/recipes/obsolete/xorg/xorg-lib/libxvmc/via.patch
new file mode 100644
index 0000000..21cdfbd
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxvmc/via.patch
@@ -0,0 +1,23 @@
+--- XvMC/configure.ac.old 2004-09-18 13:16:31.000000000 +0100
++++ XvMC/configure.ac 2004-09-18 13:16:32.000000000 +0100
+@@ -14,4 +14,5 @@
+ AC_OUTPUT([Makefile
+ hw/Makefile
+ hw/i810/Makefile
++ hw/via/Makefile
+ xvmc.pc])
+--- /dev/null 2004-06-13 02:32:19.000000000 +0100
++++ XvMC/hw/via/Makefile.am 2004-09-18 13:16:01.000000000 +0100
+@@ -0,0 +1,7 @@
++AM_CFLAGS = $(XVMC_CFLAGS)
++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
++
++lib_LTLIBRARIES = libviaXvMC.la
++
++libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \
++ viaXvMCPriv.h
+--- XvMC/hw/Makefile.am.old 2004-10-17 22:34:27.000000000 +0100
++++ XvMC/hw/Makefile.am 2004-10-17 22:34:31.000000000 +0100
+@@ -1 +1 @@
+-SUBDIRS = i810
++SUBDIRS = i810 via
diff --git a/recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.4.bb
new file mode 100644
index 0000000..003c5be
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Video Motion Compensation extension library"
+DEPENDS += "libxext libxv videoproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b54600573daf9d1a29b952e8d35b389e"
+SRC_URI[archive.sha256sum] = "1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb"
+
+XORG_PN = "libXvMC"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.5.bb b/recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.5.bb
new file mode 100644
index 0000000..cdd965a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.5.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Video Motion Compensation extension library"
+DEPENDS += "libxext libxv videoproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "16c3a11add14979beb7510e44623cac6"
+SRC_URI[archive.sha256sum] = "0644c768d28343af0efe0cb09fc9e0220b8ad755642bb498a3038cee328fde7f"
+
+XORG_PN = "libXvMC"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.1.bb b/recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.1.bb
new file mode 100644
index 0000000..6d51967
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Direct Graphics Access extension library"
+DEPENDS += "libxext xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5b0e752c71a23e9d1290cad44a7c7c75"
+SRC_URI[archive.sha256sum] = "8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9"
+
+XORG_PN = "libXxf86dga"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.2.bb
new file mode 100644
index 0000000..b311537
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Direct Graphics Access extension library"
+DEPENDS += "libxext xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6f5f621804ee652b6cc6f2025c517c78"
+SRC_URI[archive.sha256sum] = "59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25"
+
+XORG_PN = "libXxf86dga"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxxf86misc_1.0.1.bb b/recipes/obsolete/xorg/xorg-lib/libxxf86misc_1.0.1.bb
new file mode 100644
index 0000000..91a7123
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxxf86misc_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 XFree86 miscellaneous extension library"
+DEPENDS += "libxext xf86miscproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7cee0df63903cef7f7a3fb68cdd99eef"
+SRC_URI[archive.sha256sum] = "2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289"
+
+XORG_PN = "libXxf86misc"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.1.bb b/recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.1.bb
new file mode 100644
index 0000000..b13707c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 XFree86 video mode extension library"
+DEPENDS += "libxext xf86vidmodeproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8de1ca6c55aaad7d8cae19b4f0b3da32"
+SRC_URI[archive.sha256sum] = "e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a"
+
+XORG_PN = "libXxf86vm"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.2.bb
new file mode 100644
index 0000000..e693362
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 XFree86 video mode extension library"
+DEPENDS += "libxext xf86vidmodeproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "304d37bd0a10d9b58aa9b64469ad73e5"
+SRC_URI[archive.sha256sum] = "3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de"
+
+XORG_PN = "libXxf86vm"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
new file mode 100644
index 0000000..25ce7ee
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
@@ -0,0 +1,114 @@
+From c29c9fa826b7112156fd6150b5f1564227935c05 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:27:33 +0300
+Subject: [PATCH 3/6] Generic C implementation of pixman_blt with overlapping support
+
+Uses memcpy/memmove functions to copy pixels, can handle the
+case when both source and destination areas are in the same
+image (this is useful for scrolling).
+
+It is assumed that copying direction is only important when
+using the same image for both source and destination (and
+src_stride == dst_stride). Copying direction is undefined
+for the images with different source and destination stride
+which happen to be in the overlapped areas (but this is an
+unrealistic case anyway).
+---
+ pixman/pixman-general.c | 21 ++++++++++++++++++---
+ pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+), 3 deletions(-)
+
+diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
+index c96a3f9..d71a299 100644
+--- a/pixman/pixman-general.c
++++ b/pixman/pixman-general.c
+@@ -300,9 +300,24 @@ general_blt (pixman_implementation_t *imp,
+ int width,
+ int height)
+ {
+- /* We can't blit unless we have sse2 or mmx */
+-
+- return FALSE;
++ uint8_t *dst_bytes = (uint8_t *)dst_bits;
++ uint8_t *src_bytes = (uint8_t *)src_bits;
++ int bpp;
++
++ if (src_bpp != dst_bpp || src_bpp & 7)
++ return FALSE;
++
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
++ dst_bytes + dst_y * dst_stride + dst_x * bpp,
++ src_stride,
++ dst_stride,
++ width,
++ height);
++ return TRUE;
+ }
+
+ static pixman_bool_t
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index 5000f91..8c5d4fd 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -10,6 +10,7 @@
+
+ #include "pixman.h"
+ #include <time.h>
++#include <string.h>
+ #include <assert.h>
+
+ #include "pixman-compiler.h"
+@@ -794,4 +795,46 @@ void pixman_timer_register (pixman_timer_t *timer);
+
+ #endif /* PIXMAN_TIMERS */
+
++/* a helper function, can blit 8-bit images with src/dst overlapping support */
++static inline void
++pixman_blt_helper (uint8_t *src_bytes,
++ uint8_t *dst_bytes,
++ int src_stride,
++ int dst_stride,
++ int width,
++ int height)
++{
++ /*
++ * The second part of this check is not strictly needed, but it prevents
++ * unnecessary upside-down processing of areas which belong to different
++ * images. Upside-down processing can be slower with fixed-distance-ahead
++ * prefetch and perceived as having more tearing.
++ */
++ if (src_bytes < dst_bytes + width &&
++ src_bytes + src_stride * height > dst_bytes)
++ {
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++ /* Horizontal scrolling to the left needs memmove */
++ if (src_bytes + width > dst_bytes)
++ {
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return;
++ }
++ }
++ while (--height >= 0)
++ {
++ memcpy (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++}
++
+ #endif /* PIXMAN_PRIVATE_H */
+--
+1.6.2.4
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
new file mode 100644
index 0000000..74c7b45
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
@@ -0,0 +1,91 @@
+From 7ca32542c957ff308a6ca7e3715e6552a65ae395 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:47 +0300
+Subject: [PATCH 4/6] Support of overlapping src/dst for pixman_blt_mmx
+
+---
+ pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++---------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
+index 819e3a0..dcccadb 100644
+--- a/pixman/pixman-mmx.c
++++ b/pixman/pixman-mmx.c
+@@ -3002,34 +3002,43 @@ pixman_blt_mmx (uint32_t *src_bits,
+ {
+ uint8_t * src_bytes;
+ uint8_t * dst_bytes;
+- int byte_width;
++ int bpp;
+
+- if (src_bpp != dst_bpp)
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
+- if (src_bpp == 16)
+- {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 2 * width;
+- src_stride *= 2;
+- dst_stride *= 2;
+- }
+- else if (src_bpp == 32)
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
+ {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 4 * width;
+- src_stride *= 4;
+- dst_stride *= 4;
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
+ }
+- else
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+ {
+- return FALSE;
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using MMX */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
+ }
+
+ while (height--)
+@@ -3039,7 +3048,7 @@ pixman_blt_mmx (uint32_t *src_bits,
+ uint8_t *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+- w = byte_width;
++ w = width;
+
+ while (w >= 2 && ((unsigned long)d & 3))
+ {
+--
+1.6.2.4
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
new file mode 100644
index 0000000..3704fbf
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
@@ -0,0 +1,91 @@
+From edc80b41c6480b7c80ec5f7c835c92b2debb3774 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:54 +0300
+Subject: [PATCH 5/6] Support of overlapping src/dst for pixman_blt_sse2
+
+---
+ pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++--------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
+index 78b0ad1..b84636b 100644
+--- a/pixman/pixman-sse2.c
++++ b/pixman/pixman-sse2.c
+@@ -5300,34 +5300,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ {
+ uint8_t * src_bytes;
+ uint8_t * dst_bytes;
+- int byte_width;
++ int bpp;
+
+- if (src_bpp != dst_bpp)
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
+- if (src_bpp == 16)
+- {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 2 * width;
+- src_stride *= 2;
+- dst_stride *= 2;
+- }
+- else if (src_bpp == 32)
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
+ {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 4 * width;
+- src_stride *= 4;
+- dst_stride *= 4;
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
+ }
+- else
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+ {
+- return FALSE;
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using SSE2 */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
+ }
+
+ cache_prefetch ((__m128i*)src_bytes);
+@@ -5340,7 +5349,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ uint8_t *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+- w = byte_width;
++ w = width;
+
+ cache_prefetch_next ((__m128i*)s);
+ cache_prefetch_next ((__m128i*)d);
+--
+1.6.2.4
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
new file mode 100644
index 0000000..7c22483
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
@@ -0,0 +1,94 @@
+From 86870ff530b5e435034bd80207e5758466d96cff Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Wed, 18 Nov 2009 06:08:48 +0200
+Subject: [PATCH 6/6] Support of overlapping src/dst for pixman_blt_neon
+
+---
+ pixman/pixman-arm-neon.c | 63 ++++++++++++++++++++++++++++++++++++++-------
+ 1 files changed, 53 insertions(+), 10 deletions(-)
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 495fda4..c632ff5 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -357,26 +357,66 @@
+ int width,
+ int height)
+ {
+- if (src_bpp != dst_bpp)
++ uint8_t * src_bytes;
++ uint8_t * dst_bytes;
++ int bpp;
++
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
++ {
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
++ }
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
++ {
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using NEON */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
++ }
++
+ switch (src_bpp)
+ {
+ case 16:
+ pixman_composite_src_0565_0565_asm_neon (
+- width, height,
+- (uint16_t *)(((char *) dst_bits) +
+- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
+- (uint16_t *)(((char *) src_bits) +
+- src_y * src_stride * 4 + src_x * 2), src_stride * 2);
++ width >> 1,
++ height,
++ (uint16_t *) dst_bytes,
++ dst_stride >> 1,
++ (uint16_t *) src_bytes,
++ src_stride >> 1);
+ return TRUE;
+ case 32:
+ pixman_composite_src_8888_8888_asm_neon (
+- width, height,
+- (uint32_t *)(((char *) dst_bits) +
+- dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
+- (uint32_t *)(((char *) src_bits) +
+- src_y * src_stride * 4 + src_x * 4), src_stride);
++ width >> 2,
++ height,
++ (uint32_t *) dst_bytes,
++ dst_stride >> 2,
++ (uint32_t *) src_bytes,
++ src_stride >> 2);
+ return TRUE;
+ default:
+ return FALSE;
+--
+1.6.2.4
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/1-composite.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/1-composite.patch
new file mode 100644
index 0000000..31bfa39
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/1-composite.patch
@@ -0,0 +1,161 @@
+From 78652135f48c6a304fc2e75bc0e440b8b2034a4d Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Tue, 23 Feb 2010 23:44:00 +0000
+Subject: ARM: added 'neon_composite_over_n_8888_8888_ca' fast path
+
+This fast path function improves performance of 'firefox-talos-gfx'
+cairo-perf trace.
+
+Benchmark from ARM Cortex-A8 @720MHz
+
+before:
+
+[ # ] backend test min(s) median(s) stddev. count
+[ 0] image firefox-talos-gfx 139.969 141.176 0.35% 6/6
+
+after:
+
+[ # ] backend test min(s) median(s) stddev. count
+[ 0] image firefox-talos-gfx 111.810 112.196 0.23% 6/6
+---
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index 2986884..e90d662 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -1026,6 +1026,111 @@ generate_composite_function \
+
+ /******************************************************************************/
+
++.macro pixman_composite_over_n_8888_8888_ca_process_pixblock_head
++ /*
++ * 'combine_mask_ca' replacement
++ *
++ * input: solid src (n) in {d8, d9, d10, d11}
++ * dest in {d4, d5, d6, d7 }
++ * mask in {d24, d25, d26, d27}
++ * output: updated src in {d0, d1, d2, d3 }
++ * updated mask in {d24, d25, d26, d3 }
++ */
++ vmull.u8 q0, d24, d8
++ vmull.u8 q1, d25, d9
++ vmull.u8 q6, d26, d10
++ vmull.u8 q7, d27, d11
++ vmull.u8 q9, d11, d25
++ vmull.u8 q12, d11, d24
++ vmull.u8 q13, d11, d26
++ vrshr.u16 q8, q0, #8
++ vrshr.u16 q10, q1, #8
++ vrshr.u16 q11, q6, #8
++ vraddhn.u16 d0, q0, q8
++ vraddhn.u16 d1, q1, q10
++ vraddhn.u16 d2, q6, q11
++ vrshr.u16 q11, q12, #8
++ vrshr.u16 q8, q9, #8
++ vrshr.u16 q6, q13, #8
++ vrshr.u16 q10, q7, #8
++ vraddhn.u16 d24, q12, q11
++ vraddhn.u16 d25, q9, q8
++ vraddhn.u16 d26, q13, q6
++ vraddhn.u16 d3, q7, q10
++ /*
++ * 'combine_over_ca' replacement
++ *
++ * output: updated dest in {d28, d29, d30, d31}
++ */
++ vmvn.8 d24, d24
++ vmvn.8 d25, d25
++ vmull.u8 q8, d24, d4
++ vmull.u8 q9, d25, d5
++ vmvn.8 d26, d26
++ vmvn.8 d27, d3
++ vmull.u8 q10, d26, d6
++ vmull.u8 q11, d27, d7
++.endm
++
++.macro pixman_composite_over_n_8888_8888_ca_process_pixblock_tail
++ /* ... continue 'combine_over_ca' replacement */
++ vrshr.u16 q14, q8, #8
++ vrshr.u16 q15, q9, #8
++ vrshr.u16 q6, q10, #8
++ vrshr.u16 q7, q11, #8
++ vraddhn.u16 d28, q14, q8
++ vraddhn.u16 d29, q15, q9
++ vraddhn.u16 d30, q6, q10
++ vraddhn.u16 d31, q7, q11
++ vqadd.u8 q14, q0, q14
++ vqadd.u8 q15, q1, q15
++.endm
++
++.macro pixman_composite_over_n_8888_8888_ca_process_pixblock_tail_head
++ vrshr.u16 q14, q8, #8
++ vrshr.u16 q15, q9, #8
++ vld4.8 {d4, d5, d6, d7}, [DST_R, :128]!
++ vrshr.u16 q6, q10, #8
++ vrshr.u16 q7, q11, #8
++ vraddhn.u16 d28, q14, q8
++ vraddhn.u16 d29, q15, q9
++ vraddhn.u16 d30, q6, q10
++ vraddhn.u16 d31, q7, q11
++ vld4.8 {d24, d25, d26, d27}, [MASK]!
++ vqadd.u8 q14, q0, q14
++ vqadd.u8 q15, q1, q15
++ cache_preload 8, 8
++ pixman_composite_over_n_8888_8888_ca_process_pixblock_head
++ vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
++.endm
++
++.macro pixman_composite_over_n_8888_8888_ca_init
++ add DUMMY, sp, #ARGS_STACK_OFFSET
++ vpush {d8-d15}
++ vld1.32 {d11[0]}, [DUMMY]
++ vdup.8 d8, d11[0]
++ vdup.8 d9, d11[1]
++ vdup.8 d10, d11[2]
++ vdup.8 d11, d11[3]
++.endm
++
++.macro pixman_composite_over_n_8888_8888_ca_cleanup
++ vpop {d8-d15}
++.endm
++
++generate_composite_function \
++ pixman_composite_over_n_8888_8888_ca_asm_neon, 0, 32, 32, \
++ FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \
++ 8, /* number of pixels, processed in a single block */ \
++ 5, /* prefetch distance */ \
++ pixman_composite_over_n_8888_8888_ca_init, \
++ pixman_composite_over_n_8888_8888_ca_cleanup, \
++ pixman_composite_over_n_8888_8888_ca_process_pixblock_head, \
++ pixman_composite_over_n_8888_8888_ca_process_pixblock_tail, \
++ pixman_composite_over_n_8888_8888_ca_process_pixblock_tail_head
++
++/******************************************************************************/
++
+ .macro pixman_composite_add_n_8_8_process_pixblock_head
+ /* expecting source data in {d8, d9, d10, d11} */
+ /* d8 - blue, d9 - green, d10 - red, d11 - alpha */
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 557301e..3f0e18e 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -269,6 +269,7 @@ BIND_SRC_NULL_DST(over_8888_8888, uint32_t, 1, uint32_t, 1)
+
+ BIND_N_MASK_DST(over_n_8_0565, uint8_t, 1, uint16_t, 1)
+ BIND_N_MASK_DST(over_n_8_8888, uint8_t, 1, uint32_t, 1)
++BIND_N_MASK_DST(over_n_8888_8888_ca, uint32_t, 1, uint32_t, 1)
+ BIND_N_MASK_DST(add_n_8_8, uint8_t, 1, uint8_t, 1)
+
+ BIND_SRC_N_DST(over_8888_n_8888, uint32_t, 1, uint32_t, 1)
+@@ -412,6 +413,10 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
+ PIXMAN_STD_FAST_PATH (OVER, solid, null, r5g6b5, neon_composite_over_n_0565),
+ PIXMAN_STD_FAST_PATH (OVER, solid, null, a8r8g8b8, neon_composite_over_n_8888),
+ PIXMAN_STD_FAST_PATH (OVER, solid, null, x8r8g8b8, neon_composite_over_n_8888),
++ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, a8r8g8b8, neon_composite_over_n_8888_8888_ca),
++ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, x8r8g8b8, neon_composite_over_n_8888_8888_ca),
++ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, a8b8g8r8, neon_composite_over_n_8888_8888_ca),
++ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, x8b8g8r8, neon_composite_over_n_8888_8888_ca),
+ PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, a8r8g8b8, neon_composite_over_8888_n_8888),
+ PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, x8r8g8b8, neon_composite_over_8888_n_8888),
+ PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, a8, a8r8g8b8, neon_composite_over_8888_8_8888),
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/2-composite.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/2-composite.patch
new file mode 100644
index 0000000..84d4d9c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/2-composite.patch
@@ -0,0 +1,102 @@
+From 6e0df74dbfca26f92a18d968e1bf410bae134c8a Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Wed, 24 Feb 2010 00:26:57 +0000
+Subject: ARM: added 'neon_composite_src_x888_8888' fast path
+
+This fast path function improves performance of 'gnome-system-monitor'
+cairo-perf trace.
+
+Benchmark from ARM Cortex-A8 @720MHz
+
+before:
+
+[ # ] backend test min(s) median(s) stddev. count
+[ 0] image gnome-system-monitor 68.838 68.899 0.05% 5/6
+
+after:
+
+[ # ] backend test min(s) median(s) stddev. count
+[ 0] image gnome-system-monitor 53.336 53.384 0.09% 6/6
+---
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index e90d662..f2643de 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -947,6 +947,44 @@ generate_composite_function \
+
+ /******************************************************************************/
+
++.macro pixman_composite_src_x888_8888_process_pixblock_head
++ vorr q0, q0, q2
++ vorr q1, q1, q2
++.endm
++
++.macro pixman_composite_src_x888_8888_process_pixblock_tail
++.endm
++
++.macro pixman_composite_src_x888_8888_process_pixblock_tail_head
++ vst1.32 {d0, d1, d2, d3}, [DST_W, :128]!
++ vld1.32 {d0, d1, d2, d3}, [SRC]!
++ vorr q0, q0, q2
++ vorr q1, q1, q2
++ cache_preload 8, 8
++.endm
++
++.macro pixman_composite_src_x888_8888_init
++ vmov.u8 q2, #0xFF
++ vshl.u32 q2, q2, #24
++.endm
++
++generate_composite_function \
++ pixman_composite_src_x888_8888_asm_neon, 32, 0, 32, \
++ FLAG_DST_WRITEONLY, \
++ 8, /* number of pixels, processed in a single block */ \
++ 10, /* prefetch distance */ \
++ pixman_composite_src_x888_8888_init, \
++ default_cleanup, \
++ pixman_composite_src_x888_8888_process_pixblock_head, \
++ pixman_composite_src_x888_8888_process_pixblock_tail, \
++ pixman_composite_src_x888_8888_process_pixblock_tail_head, \
++ 0, /* dst_w_basereg */ \
++ 0, /* dst_r_basereg */ \
++ 0, /* src_basereg */ \
++ 0 /* mask_basereg */
++
++/******************************************************************************/
++
+ .macro pixman_composite_over_n_8_8888_process_pixblock_head
+ /* expecting deinterleaved source data in {d8, d9, d10, d11} */
+ /* d8 - blue, d9 - green, d10 - red, d11 - alpha */
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 3f0e18e..0a7ac31 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -251,6 +251,7 @@ neon_composite_##name (pixman_implementation_t *imp, \
+
+
+ BIND_SRC_NULL_DST(src_8888_8888, uint32_t, 1, uint32_t, 1)
++BIND_SRC_NULL_DST(src_x888_8888, uint32_t, 1, uint32_t, 1)
+ BIND_SRC_NULL_DST(src_0565_0565, uint16_t, 1, uint16_t, 1)
+ BIND_SRC_NULL_DST(src_0888_0888, uint8_t, 3, uint8_t, 3)
+ BIND_SRC_NULL_DST(src_8888_0565, uint32_t, 1, uint16_t, 1)
+@@ -400,6 +401,10 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
+ PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, x8r8g8b8, neon_composite_src_8888_8888),
+ PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, x8b8g8r8, neon_composite_src_8888_8888),
+ PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, x8b8g8r8, neon_composite_src_8888_8888),
++ PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, a8r8g8b8, neon_composite_src_8888_8888),
++ PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, a8b8g8r8, neon_composite_src_8888_8888),
++ PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, a8r8g8b8, neon_composite_src_x888_8888),
++ PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, a8b8g8r8, neon_composite_src_x888_8888),
+ PIXMAN_STD_FAST_PATH (SRC, r8g8b8, null, r8g8b8, neon_composite_src_0888_0888),
+ PIXMAN_STD_FAST_PATH (SRC, b8g8r8, null, x8r8g8b8, neon_composite_src_0888_8888_rev),
+ PIXMAN_STD_FAST_PATH (SRC, b8g8r8, null, r5g6b5, neon_composite_src_0888_0565_rev),
+@@ -430,6 +435,7 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
+ PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, x8r8g8b8, neon_composite_over_8888_8888),
+ PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, a8b8g8r8, neon_composite_over_8888_8888),
+ PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, x8b8g8r8, neon_composite_over_8888_8888),
++ PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, null, a8r8g8b8, neon_composite_src_x888_8888),
+ PIXMAN_STD_FAST_PATH (ADD, solid, a8, a8, neon_composite_add_n_8_8),
+ PIXMAN_STD_FAST_PATH (ADD, a8, a8, a8, neon_composite_add_8_8_8),
+ PIXMAN_STD_FAST_PATH (ADD, a8r8g8b8, a8r8g8b8, a8r8g8b8, neon_composite_add_8888_8888_8888),
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/3-composite.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/3-composite.patch
new file mode 100644
index 0000000..06e40fe
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/3-composite.patch
@@ -0,0 +1,108 @@
+From 19fc0c4c8d28796f0fbc2c8f47edc130851ae3a5 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Wed, 24 Feb 2010 02:14:45 +0000
+Subject: ARM: added 'neon_composite_over_reverse_n_8888' fast path
+
+This fast path function improves performance of 'poppler' cairo-perf trace.
+
+Benchmark from ARM Cortex-A8 @720MHz
+
+before:
+
+[ # ] backend test min(s) median(s) stddev. count
+[ 0] image poppler 38.986 39.158 0.23% 6/6
+
+after:
+
+[ # ] backend test min(s) median(s) stddev. count
+[ 0] image poppler 24.981 25.136 0.28% 6/6
+---
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index f2643de..eb8cc4c 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -680,6 +680,61 @@ generate_composite_function \
+
+ /******************************************************************************/
+
++.macro pixman_composite_over_reverse_n_8888_process_pixblock_tail_head
++ vrshr.u16 q14, q8, #8
++ PF add PF_X, PF_X, #8
++ PF tst PF_CTL, #0xF
++ vrshr.u16 q15, q9, #8
++ vrshr.u16 q12, q10, #8
++ vrshr.u16 q13, q11, #8
++ PF addne PF_X, PF_X, #8
++ PF subne PF_CTL, PF_CTL, #1
++ vraddhn.u16 d28, q14, q8
++ vraddhn.u16 d29, q15, q9
++ PF cmp PF_X, ORIG_W
++ vraddhn.u16 d30, q12, q10
++ vraddhn.u16 d31, q13, q11
++ vqadd.u8 q14, q0, q14
++ vqadd.u8 q15, q1, q15
++ vld4.8 {d0, d1, d2, d3}, [DST_R, :128]!
++ vmvn.8 d22, d3
++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
++ vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
++ PF subge PF_X, PF_X, ORIG_W
++ vmull.u8 q8, d22, d4
++ PF subges PF_CTL, PF_CTL, #0x10
++ vmull.u8 q9, d22, d5
++ vmull.u8 q10, d22, d6
++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
++ vmull.u8 q11, d22, d7
++.endm
++
++.macro pixman_composite_over_reverse_n_8888_init
++ add DUMMY, sp, #ARGS_STACK_OFFSET
++ vld1.32 {d7[0]}, [DUMMY]
++ vdup.8 d4, d7[0]
++ vdup.8 d5, d7[1]
++ vdup.8 d6, d7[2]
++ vdup.8 d7, d7[3]
++.endm
++
++generate_composite_function \
++ pixman_composite_over_reverse_n_8888_asm_neon, 0, 0, 32, \
++ FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \
++ 8, /* number of pixels, processed in a single block */ \
++ 5, /* prefetch distance */ \
++ pixman_composite_over_reverse_n_8888_init, \
++ default_cleanup, \
++ pixman_composite_over_8888_8888_process_pixblock_head, \
++ pixman_composite_over_8888_8888_process_pixblock_tail, \
++ pixman_composite_over_reverse_n_8888_process_pixblock_tail_head, \
++ 28, /* dst_w_basereg */ \
++ 0, /* dst_r_basereg */ \
++ 4, /* src_basereg */ \
++ 24 /* mask_basereg */
++
++/******************************************************************************/
++
+ .macro pixman_composite_over_n_8_0565_process_pixblock_head
+ /* in */
+ vmull.u8 q0, d24, d8
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 0a7ac31..30c5056 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -264,6 +264,7 @@ BIND_SRC_NULL_DST(add_8888_8888, uint32_t, 1, uint32_t, 1)
+
+ BIND_N_NULL_DST(over_n_0565, uint16_t, 1)
+ BIND_N_NULL_DST(over_n_8888, uint32_t, 1)
++BIND_N_NULL_DST(over_reverse_n_8888, uint32_t, 1)
+
+ BIND_SRC_NULL_DST(over_8888_0565, uint32_t, 1, uint16_t, 1)
+ BIND_SRC_NULL_DST(over_8888_8888, uint32_t, 1, uint32_t, 1)
+@@ -442,6 +443,8 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
+ PIXMAN_STD_FAST_PATH (ADD, a8, null, a8, neon_composite_add_8000_8000),
+ PIXMAN_STD_FAST_PATH (ADD, a8r8g8b8, null, a8r8g8b8, neon_composite_add_8888_8888),
+ PIXMAN_STD_FAST_PATH (ADD, a8b8g8r8, null, a8b8g8r8, neon_composite_add_8888_8888),
++ PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8r8g8b8, neon_composite_over_reverse_n_8888),
++ PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8b8g8r8, neon_composite_over_reverse_n_8888),
+
+ { PIXMAN_OP_NONE },
+ };
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
new file mode 100644
index 0000000..06b07a3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
@@ -0,0 +1,114 @@
+From 5234e3c2c161ed5fc92caa336ae78f89112c7d77 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Tue, 16 Mar 2010 16:55:28 +0100
+Subject: [PATCH 1/5] Generic C implementation of pixman_blt with overlapping support
+
+Uses memcpy/memmove functions to copy pixels, can handle the
+case when both source and destination areas are in the same
+image (this is useful for scrolling).
+
+It is assumed that copying direction is only important when
+using the same image for both source and destination (and
+src_stride == dst_stride). Copying direction is undefined
+for the images with different source and destination stride
+which happen to be in the overlapped areas (but this is an
+unrealistic case anyway).
+---
+ pixman/pixman-general.c | 21 ++++++++++++++++++---
+ pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+), 3 deletions(-)
+
+diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
+index bddf79a..f525744 100644
+--- a/pixman/pixman-general.c
++++ b/pixman/pixman-general.c
+@@ -285,9 +285,24 @@ general_blt (pixman_implementation_t *imp,
+ int width,
+ int height)
+ {
+- /* We can't blit unless we have sse2 or mmx */
+-
+- return FALSE;
++ uint8_t *dst_bytes = (uint8_t *)dst_bits;
++ uint8_t *src_bytes = (uint8_t *)src_bits;
++ int bpp;
++
++ if (src_bpp != dst_bpp || src_bpp & 7)
++ return FALSE;
++
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
++ dst_bytes + dst_y * dst_stride + dst_x * bpp,
++ src_stride,
++ dst_stride,
++ width,
++ height);
++ return TRUE;
+ }
+
+ static pixman_bool_t
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index d5767af..eeb677d 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -10,6 +10,7 @@
+
+ #include "pixman.h"
+ #include <time.h>
++#include <string.h>
+ #include <assert.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -867,4 +868,46 @@ void pixman_timer_register (pixman_timer_t *timer);
+
+ #endif /* PIXMAN_TIMERS */
+
++/* a helper function, can blit 8-bit images with src/dst overlapping support */
++static inline void
++pixman_blt_helper (uint8_t *src_bytes,
++ uint8_t *dst_bytes,
++ int src_stride,
++ int dst_stride,
++ int width,
++ int height)
++{
++ /*
++ * The second part of this check is not strictly needed, but it prevents
++ * unnecessary upside-down processing of areas which belong to different
++ * images. Upside-down processing can be slower with fixed-distance-ahead
++ * prefetch and perceived as having more tearing.
++ */
++ if (src_bytes < dst_bytes + width &&
++ src_bytes + src_stride * height > dst_bytes)
++ {
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++ /* Horizontal scrolling to the left needs memmove */
++ if (src_bytes + width > dst_bytes)
++ {
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return;
++ }
++ }
++ while (--height >= 0)
++ {
++ memcpy (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++}
++
+ #endif /* PIXMAN_PRIVATE_H */
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
new file mode 100644
index 0000000..bf6e58c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
@@ -0,0 +1,91 @@
+From f607cd0250d398077b0c51201258775e372cb3c3 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:47 +0300
+Subject: [PATCH 2/5] Support of overlapping src/dst for pixman_blt_mmx
+
+---
+ pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++---------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
+index e084e7f..6212b31 100644
+--- a/pixman/pixman-mmx.c
++++ b/pixman/pixman-mmx.c
+@@ -2994,34 +2994,43 @@ pixman_blt_mmx (uint32_t *src_bits,
+ {
+ uint8_t * src_bytes;
+ uint8_t * dst_bytes;
+- int byte_width;
++ int bpp;
+
+- if (src_bpp != dst_bpp)
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
+- if (src_bpp == 16)
+- {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 2 * width;
+- src_stride *= 2;
+- dst_stride *= 2;
+- }
+- else if (src_bpp == 32)
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
+ {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 4 * width;
+- src_stride *= 4;
+- dst_stride *= 4;
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
+ }
+- else
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+ {
+- return FALSE;
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using MMX */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
+ }
+
+ while (height--)
+@@ -3031,7 +3040,7 @@ pixman_blt_mmx (uint32_t *src_bits,
+ uint8_t *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+- w = byte_width;
++ w = width;
+
+ while (w >= 2 && ((unsigned long)d & 3))
+ {
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
new file mode 100644
index 0000000..c1f3b2e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
@@ -0,0 +1,91 @@
+From 45a9a537f94a7feab47bd82171c7d620f0d34e3f Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:54 +0300
+Subject: [PATCH 3/5] Support of overlapping src/dst for pixman_blt_sse2
+
+---
+ pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++--------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
+index 946e7ba..66053ae 100644
+--- a/pixman/pixman-sse2.c
++++ b/pixman/pixman-sse2.c
+@@ -5299,34 +5299,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ {
+ uint8_t * src_bytes;
+ uint8_t * dst_bytes;
+- int byte_width;
++ int bpp;
+
+- if (src_bpp != dst_bpp)
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
+- if (src_bpp == 16)
+- {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 2 * width;
+- src_stride *= 2;
+- dst_stride *= 2;
+- }
+- else if (src_bpp == 32)
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
+ {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 4 * width;
+- src_stride *= 4;
+- dst_stride *= 4;
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
+ }
+- else
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+ {
+- return FALSE;
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using SSE2 */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
+ }
+
+ cache_prefetch ((__m128i*)src_bytes);
+@@ -5339,7 +5348,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ uint8_t *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+- w = byte_width;
++ w = width;
+
+ cache_prefetch_next ((__m128i*)s);
+ cache_prefetch_next ((__m128i*)d);
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
new file mode 100644
index 0000000..c37673e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
@@ -0,0 +1,94 @@
+From 4cf5bfc72a724fb653c48338b93e91dccea238af Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Wed, 18 Nov 2009 06:08:48 +0200
+Subject: [PATCH 4/5] Support of overlapping src/dst for pixman_blt_neon
+
+---
+ pixman/pixman-arm-neon.c | 62 +++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 51 insertions(+), 11 deletions(-)
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 6808b36..7feee1d 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -168,26 +168,66 @@ pixman_blt_neon (uint32_t *src_bits,
+ int width,
+ int height)
+ {
+- if (src_bpp != dst_bpp)
++ uint8_t * src_bytes;
++ uint8_t * dst_bytes;
++ int bpp;
++
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
++ {
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
++ }
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
++ {
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using NEON */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
++ }
++
+ switch (src_bpp)
+ {
+ case 16:
+ pixman_composite_src_0565_0565_asm_neon (
+- width, height,
+- (uint16_t *)(((char *) dst_bits) +
+- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
+- (uint16_t *)(((char *) src_bits) +
+- src_y * src_stride * 4 + src_x * 2), src_stride * 2);
++ width >> 1,
++ height,
++ (uint16_t *) dst_bytes,
++ dst_stride >> 1,
++ (uint16_t *) src_bytes,
++ src_stride >> 1);
+ return TRUE;
+ case 32:
+ pixman_composite_src_8888_8888_asm_neon (
+- width, height,
+- (uint32_t *)(((char *) dst_bits) +
+- dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
+- (uint32_t *)(((char *) src_bits) +
+- src_y * src_stride * 4 + src_x * 4), src_stride);
++ width >> 2,
++ height,
++ (uint32_t *) dst_bytes,
++ dst_stride >> 2,
++ (uint32_t *) src_bytes,
++ src_stride >> 2);
+ return TRUE;
+ default:
+ return FALSE;
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
new file mode 100644
index 0000000..d776574
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
@@ -0,0 +1,169 @@
+From d1410558827fce8aac354274a7150fa915881c50 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 10 Dec 2009 00:51:50 +0200
+Subject: [PATCH 5/5] ARM: added NEON optimizations for fetch/store r5g6b5 scanline
+
+---
+ pixman/pixman-access.c | 23 ++++++++++++++++++++++-
+ pixman/pixman-arm-neon-asm.S | 20 ++++++++++++++++++++
+ pixman/pixman-arm-neon.c | 41 +++++++++++++++++++++++++++++++++++++++++
+ pixman/pixman-private.h | 5 +++++
+ 4 files changed, 88 insertions(+), 1 deletions(-)
+
+diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
+index fa0a267..5bb3e09 100644
+--- a/pixman/pixman-access.c
++++ b/pixman/pixman-access.c
+@@ -2748,7 +2748,7 @@ typedef struct
+ store_scanline_ ## format, store_scanline_generic_64 \
+ }
+
+-static const format_info_t accessors[] =
++static format_info_t accessors[] =
+ {
+ /* 32 bpp formats */
+ FORMAT_INFO (a8r8g8b8),
+@@ -2891,6 +2891,27 @@ _pixman_bits_image_setup_raw_accessors (bits_image_t *image)
+ setup_accessors (image);
+ }
+
++void
++_pixman_bits_override_accessors (pixman_format_code_t format,
++ fetch_scanline_t fetch_func,
++ store_scanline_t store_func)
++{
++ format_info_t *info = accessors;
++
++ while (info->format != PIXMAN_null)
++ {
++ if (info->format == format)
++ {
++ if (fetch_func)
++ info->fetch_scanline_raw_32 = fetch_func;
++ if (store_func)
++ info->store_scanline_raw_32 = store_func;
++ return;
++ }
++ info++;
++ }
++}
++
+ #else
+
+ void
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index 51bc347..f30869e 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -458,6 +458,16 @@ generate_composite_function \
+ pixman_composite_src_8888_0565_process_pixblock_tail, \
+ pixman_composite_src_8888_0565_process_pixblock_tail_head
+
++generate_composite_function_single_scanline \
++ pixman_store_scanline_r5g6b5_asm_neon, 32, 0, 16, \
++ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
++ 8, /* number of pixels, processed in a single block */ \
++ default_init, \
++ default_cleanup, \
++ pixman_composite_src_8888_0565_process_pixblock_head, \
++ pixman_composite_src_8888_0565_process_pixblock_tail, \
++ pixman_composite_src_8888_0565_process_pixblock_tail_head
++
+ /******************************************************************************/
+
+ .macro pixman_composite_src_0565_8888_process_pixblock_head
+@@ -493,6 +503,16 @@ generate_composite_function \
+ pixman_composite_src_0565_8888_process_pixblock_tail, \
+ pixman_composite_src_0565_8888_process_pixblock_tail_head
+
++generate_composite_function_single_scanline \
++ pixman_fetch_scanline_r5g6b5_asm_neon, 16, 0, 32, \
++ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
++ 8, /* number of pixels, processed in a single block */ \
++ default_init, \
++ default_cleanup, \
++ pixman_composite_src_0565_8888_process_pixblock_head, \
++ pixman_composite_src_0565_8888_process_pixblock_tail, \
++ pixman_composite_src_0565_8888_process_pixblock_tail_head
++
+ /******************************************************************************/
+
+ .macro pixman_composite_add_8000_8000_process_pixblock_head
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 7feee1d..fda7a09 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -375,6 +375,43 @@ neon_combine_##name##_u (pixman_implementation_t *imp, \
+ BIND_COMBINE_U (over)
+ BIND_COMBINE_U (add)
+
++void
++pixman_fetch_scanline_r5g6b5_asm_neon (int width,
++ uint32_t *buffer,
++ const uint16_t *pixel);
++void
++pixman_store_scanline_r5g6b5_asm_neon (int width,
++ uint16_t *pixel,
++ const uint32_t *values);
++
++static void
++neon_fetch_scanline_r5g6b5 (pixman_image_t *image,
++ int x,
++ int y,
++ int width,
++ uint32_t * buffer,
++ const uint32_t *mask,
++ uint32_t mask_bits)
++{
++ const uint32_t *bits = image->bits.bits + y * image->bits.rowstride;
++ const uint16_t *pixel = (const uint16_t *)bits + x;
++
++ pixman_fetch_scanline_r5g6b5_asm_neon (width, buffer, pixel);
++}
++
++static void
++neon_store_scanline_r5g6b5 (bits_image_t * image,
++ int x,
++ int y,
++ int width,
++ const uint32_t *values)
++{
++ uint32_t *bits = image->bits + image->rowstride * y;
++ uint16_t *pixel = ((uint16_t *) bits) + x;
++
++ pixman_store_scanline_r5g6b5_asm_neon (width, pixel, values);
++}
++
+ pixman_implementation_t *
+ _pixman_implementation_create_arm_neon (void)
+ {
+@@ -385,6 +422,10 @@ _pixman_implementation_create_arm_neon (void)
+ imp->combine_32[PIXMAN_OP_OVER] = neon_combine_over_u;
+ imp->combine_32[PIXMAN_OP_ADD] = neon_combine_add_u;
+
++ _pixman_bits_override_accessors (PIXMAN_r5g6b5,
++ neon_fetch_scanline_r5g6b5,
++ neon_store_scanline_r5g6b5);
++
+ imp->blt = arm_neon_blt;
+ imp->fill = arm_neon_fill;
+
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index eeb677d..ba2d401 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -220,6 +220,11 @@ void
+ _pixman_bits_image_setup_raw_accessors (bits_image_t *image);
+
+ void
++_pixman_bits_override_accessors (pixman_format_code_t format,
++ fetch_scanline_t fetch_func,
++ store_scanline_t store_func);
++
++void
+ _pixman_image_get_scanline_generic_64 (pixman_image_t *image,
+ int x,
+ int y,
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/565-scanline.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/565-scanline.patch
new file mode 100644
index 0000000..8461a46
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/565-scanline.patch
@@ -0,0 +1,257 @@
+From deef1daf5896062f47fa61b94e1e77c7c0041820 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 04 Dec 2009 16:49:19 +0000
+Subject: A copy-paste version of 16bpp bilinear scanline fetcher
+
+---
+diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
+index 3d78ff0..1656975 100644
+--- a/pixman/pixman-bits-image.c
++++ b/pixman/pixman-bits-image.c
+@@ -535,6 +535,212 @@ bits_image_fetch_bilinear_no_repeat_8888 (pixman_image_t * ima,
+ *buffer++ = 0;
+ }
+
++static void
++bits_image_fetch_bilinear_no_repeat_0565 (pixman_image_t * ima,
++ int offset,
++ int line,
++ int width,
++ uint32_t * buffer,
++ const uint32_t * mask,
++ uint32_t mask_bits)
++{
++ bits_image_t *bits = &ima->bits;
++ pixman_fixed_t x_top, x_bottom, x;
++ pixman_fixed_t ux_top, ux_bottom, ux;
++ pixman_vector_t v;
++ uint32_t top_mask, bottom_mask;
++ uint16_t *top_row;
++ uint16_t *bottom_row;
++ uint32_t *end;
++ uint16_t zero[2] = { 0, 0 };
++ int y, y1, y2;
++ int disty;
++ int mask_inc;
++ int w;
++
++ /* reference point is the center of the pixel */
++ v.vector[0] = pixman_int_to_fixed (offset) + pixman_fixed_1 / 2;
++ v.vector[1] = pixman_int_to_fixed (line) + pixman_fixed_1 / 2;
++ v.vector[2] = pixman_fixed_1;
++
++ if (!pixman_transform_point_3d (bits->common.transform, &v))
++ return;
++
++ ux = ux_top = ux_bottom = bits->common.transform->matrix[0][0];
++ x = x_top = x_bottom = v.vector[0] - pixman_fixed_1/2;
++
++ y = v.vector[1] - pixman_fixed_1/2;
++ disty = (y >> 8) & 0xff;
++
++ /* Load the pointers to the first and second lines from the source
++ * image that bilinear code must read.
++ *
++ * The main trick in this code is about the check if any line are
++ * outside of the image;
++ *
++ * When I realize that a line (any one) is outside, I change
++ * the pointer to a dummy area with zeros. Once I change this, I
++ * must be sure the pointer will not change, so I set the
++ * variables to each pointer increments inside the loop.
++ */
++ y1 = pixman_fixed_to_int (y);
++ y2 = y1 + 1;
++
++ if (y1 < 0 || y1 >= bits->height)
++ {
++ top_row = zero;
++ x_top = 0;
++ ux_top = 0;
++ }
++ else
++ {
++ top_row = bits->bits + y1 * bits->rowstride;
++ x_top = x;
++ ux_top = ux;
++ }
++
++ if (y2 < 0 || y2 >= bits->height)
++ {
++ bottom_row = zero;
++ x_bottom = 0;
++ ux_bottom = 0;
++ }
++ else
++ {
++ bottom_row = bits->bits + y2 * bits->rowstride;
++ x_bottom = x;
++ ux_bottom = ux;
++ }
++
++ /* Instead of checking whether the operation uses the mast in
++ * each loop iteration, verify this only once and prepare the
++ * variables to make the code smaller inside the loop.
++ */
++ if (!mask)
++ {
++ mask_inc = 0;
++ mask_bits = 1;
++ mask = &mask_bits;
++ }
++ else
++ {
++ /* If have a mask, prepare the variables to check it */
++ mask_inc = 1;
++ }
++
++ /* If both are zero, then the whole thing is zero */
++ if (top_row == zero && bottom_row == zero)
++ {
++ memset (buffer, 0, width * sizeof (uint32_t));
++ return;
++ }
++ else
++ {
++ if (top_row == zero)
++ {
++ top_mask = 0;
++ bottom_mask = 0xff000000;
++ }
++ else if (bottom_row == zero)
++ {
++ top_mask = 0xff000000;
++ bottom_mask = 0;
++ }
++ else
++ {
++ top_mask = 0xff000000;
++ bottom_mask = 0xff000000;
++ }
++ }
++
++ end = buffer + width;
++
++ /* Zero fill to the left of the image */
++ while (buffer < end && x < pixman_fixed_minus_1)
++ {
++ *buffer++ = 0;
++ x += ux;
++ x_top += ux_top;
++ x_bottom += ux_bottom;
++ mask += mask_inc;
++ }
++
++ /* Left edge
++ */
++ while (buffer < end && x < 0)
++ {
++ uint32_t tr, br;
++ int32_t distx;
++
++ tr = CONVERT_0565_TO_0888 (top_row[pixman_fixed_to_int (x_top) + 1]) | top_mask;
++ br = CONVERT_0565_TO_0888 (bottom_row[pixman_fixed_to_int (x_bottom) + 1]) | bottom_mask;
++
++ distx = (x >> 8) & 0xff;
++
++ *buffer++ = bilinear_interpolation (0, tr, 0, br, distx, disty);
++
++ x += ux;
++ x_top += ux_top;
++ x_bottom += ux_bottom;
++ mask += mask_inc;
++ }
++
++ /* Main part */
++ w = pixman_int_to_fixed (bits->width - 1);
++
++ while (buffer < end && x < w)
++ {
++ if (*mask)
++ {
++ uint32_t tl, tr, bl, br;
++ int32_t distx;
++
++ tl = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top)]) | top_mask;
++ tr = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top) + 1]) | top_mask;
++ bl = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom)]) | bottom_mask;
++ br = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom) + 1]) | bottom_mask;
++
++ distx = (x >> 8) & 0xff;
++
++ *buffer = bilinear_interpolation (tl, tr, bl, br, distx, disty);
++ }
++
++ buffer++;
++ x += ux;
++ x_top += ux_top;
++ x_bottom += ux_bottom;
++ mask += mask_inc;
++ }
++
++ /* Right Edge */
++ w = pixman_int_to_fixed (bits->width);
++ while (buffer < end && x < w)
++ {
++ if (*mask)
++ {
++ uint32_t tl, bl;
++ int32_t distx;
++
++ tl = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top)]) | top_mask;
++ bl = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom)]) | bottom_mask;
++
++ distx = (x >> 8) & 0xff;
++
++ *buffer = bilinear_interpolation (tl, 0, bl, 0, distx, disty);
++ }
++
++ buffer++;
++ x += ux;
++ x_top += ux_top;
++ x_bottom += ux_bottom;
++ mask += mask_inc;
++ }
++
++ /* Zero fill to the left of the image */
++ while (buffer < end)
++ *buffer++ = 0;
++}
++
+ static force_inline uint32_t
+ bits_image_fetch_pixel_convolution (bits_image_t *image,
+ pixman_fixed_t x,
+@@ -917,14 +1123,26 @@ bits_image_property_changed (pixman_image_t *image)
+ (bits->common.filter == PIXMAN_FILTER_BILINEAR ||
+ bits->common.filter == PIXMAN_FILTER_GOOD ||
+ bits->common.filter == PIXMAN_FILTER_BEST) &&
+- bits->common.repeat == PIXMAN_REPEAT_NONE &&
+- (bits->format == PIXMAN_a8r8g8b8 ||
+- bits->format == PIXMAN_x8r8g8b8))
++ bits->common.repeat == PIXMAN_REPEAT_NONE)
+ {
+ image->common.get_scanline_64 =
+ _pixman_image_get_scanline_generic_64;
+- image->common.get_scanline_32 =
+- bits_image_fetch_bilinear_no_repeat_8888;
++
++ if (bits->format == PIXMAN_a8r8g8b8 || bits->format == PIXMAN_x8r8g8b8)
++ {
++ image->common.get_scanline_32 =
++ bits_image_fetch_bilinear_no_repeat_8888;
++ }
++ else if (bits->format == PIXMAN_r5g6b5)
++ {
++ image->common.get_scanline_32 =
++ bits_image_fetch_bilinear_no_repeat_0565;
++ }
++ else
++ {
++ image->common.get_scanline_32 =
++ bits_image_fetch_transformed;
++ }
+ }
+ else
+ {
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/missing-cache-preload.diff b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
new file mode 100644
index 0000000..475bb35
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
@@ -0,0 +1,28 @@
+From 4f45c7688e6b767a5f7b7f5cced51b4797a3c288 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 21 May 2010 13:31:03 +0000
+Subject: ARM: added missing cache preload
+
+---
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index 51bc347..a99555a 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -388,6 +388,7 @@ generate_composite_function \
+ vld1.16 {d4, d5}, [DST_R, :128]!
+ vst1.16 {d28, d29}, [DST_W, :128]!
+ pixman_composite_over_n_0565_process_pixblock_head
++ cache_preload 8, 8
+ .endm
+
+ .macro pixman_composite_over_n_0565_init
+@@ -660,6 +661,7 @@ generate_composite_function_single_scanline \
+ vld4.8 {d4, d5, d6, d7}, [DST_R, :128]!
+ vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
+ pixman_composite_over_8888_8888_process_pixblock_head
++ cache_preload 8, 8
+ .endm
+
+ .macro pixman_composite_over_n_8888_init
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
new file mode 100644
index 0000000..05fe829
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
@@ -0,0 +1,29 @@
+From: Carl Worth <cworth@cworth.org>
+
+Don't copy unused bits to an alpha channel
+
+This bug was identified by cairo's rgb24-ignore-alpha test which
+blends RGB24 over ARGB32 and notices that "alpha" values are
+making it from the source to the destination.
+
+Index: a/pixman/pixman-pict.c
+===================================================================
+--- a/pixman/pixman-pict.c b8b7b767b3ed1fc57ba177c38187e1eb3daf4de8
++++ b/pixman/pixman-pict.c c7d73fc532c2da313041906ac0f48dba1b10d3bc
+@@ -1778,7 +1778,6 @@ pixman_image_composite (pixman_op_t
+ break;
+ case PIXMAN_x8r8g8b8:
+ switch (pDst->bits.format) {
+- case PIXMAN_a8r8g8b8:
+ case PIXMAN_x8r8g8b8:
+ #ifdef USE_MMX
+ if (pixman_have_mmx())
+@@ -1790,7 +1789,6 @@ pixman_image_composite (pixman_op_t
+ }
+ case PIXMAN_x8b8g8r8:
+ switch (pDst->bits.format) {
+- case PIXMAN_a8b8g8r8:
+ case PIXMAN_x8b8g8r8:
+ #ifdef USE_MMX
+ if (pixman_have_mmx())
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/obsolete/xorg/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
new file mode 100644
index 0000000..a2cda24
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
@@ -0,0 +1,114 @@
+From 8ea1a333de202018a862a7b04b94479d3109274b Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Tue, 16 Mar 2010 16:55:28 +0100
+Subject: [PATCH 1/5] Generic C implementation of pixman_blt with overlapping support
+
+Uses memcpy/memmove functions to copy pixels, can handle the
+case when both source and destination areas are in the same
+image (this is useful for scrolling).
+
+It is assumed that copying direction is only important when
+using the same image for both source and destination (and
+src_stride == dst_stride). Copying direction is undefined
+for the images with different source and destination stride
+which happen to be in the overlapped areas (but this is an
+unrealistic case anyway).
+---
+ pixman/pixman-general.c | 21 ++++++++++++++++++---
+ pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+), 3 deletions(-)
+
+diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
+index bddf79a..f525744 100644
+--- a/pixman/pixman-general.c
++++ b/pixman/pixman-general.c
+@@ -285,9 +285,24 @@ general_blt (pixman_implementation_t *imp,
+ int width,
+ int height)
+ {
+- /* We can't blit unless we have sse2 or mmx */
+-
+- return FALSE;
++ uint8_t *dst_bytes = (uint8_t *)dst_bits;
++ uint8_t *src_bytes = (uint8_t *)src_bits;
++ int bpp;
++
++ if (src_bpp != dst_bpp || src_bpp & 7)
++ return FALSE;
++
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
++ dst_bytes + dst_y * dst_stride + dst_x * bpp,
++ src_stride,
++ dst_stride,
++ width,
++ height);
++ return TRUE;
+ }
+
+ static pixman_bool_t
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index d5767af..eeb677d 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -10,6 +10,7 @@
+
+ #include "pixman.h"
+ #include <time.h>
++#include <string.h>
+ #include <assert.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -867,4 +868,46 @@ void pixman_timer_register (pixman_timer_t *timer);
+
+ #endif /* PIXMAN_TIMERS */
+
++/* a helper function, can blit 8-bit images with src/dst overlapping support */
++static inline void
++pixman_blt_helper (uint8_t *src_bytes,
++ uint8_t *dst_bytes,
++ int src_stride,
++ int dst_stride,
++ int width,
++ int height)
++{
++ /*
++ * The second part of this check is not strictly needed, but it prevents
++ * unnecessary upside-down processing of areas which belong to different
++ * images. Upside-down processing can be slower with fixed-distance-ahead
++ * prefetch and perceived as having more tearing.
++ */
++ if (src_bytes < dst_bytes + width &&
++ src_bytes + src_stride * height > dst_bytes)
++ {
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++ /* Horizontal scrolling to the left needs memmove */
++ if (src_bytes + width > dst_bytes)
++ {
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return;
++ }
++ }
++ while (--height >= 0)
++ {
++ memcpy (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++}
++
+ #endif /* PIXMAN_PRIVATE_H */
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/obsolete/xorg/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
new file mode 100644
index 0000000..003337f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
@@ -0,0 +1,91 @@
+From 3170d9f5e927681a2516bcec52b317d1d4785e25 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:47 +0300
+Subject: [PATCH 2/5] Support of overlapping src/dst for pixman_blt_mmx
+
+---
+ pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++---------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
+index e084e7f..6212b31 100644
+--- a/pixman/pixman-mmx.c
++++ b/pixman/pixman-mmx.c
+@@ -2994,34 +2994,43 @@ pixman_blt_mmx (uint32_t *src_bits,
+ {
+ uint8_t * src_bytes;
+ uint8_t * dst_bytes;
+- int byte_width;
++ int bpp;
+
+- if (src_bpp != dst_bpp)
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
+- if (src_bpp == 16)
+- {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 2 * width;
+- src_stride *= 2;
+- dst_stride *= 2;
+- }
+- else if (src_bpp == 32)
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
+ {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 4 * width;
+- src_stride *= 4;
+- dst_stride *= 4;
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
+ }
+- else
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+ {
+- return FALSE;
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using MMX */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
+ }
+
+ while (height--)
+@@ -3031,7 +3040,7 @@ pixman_blt_mmx (uint32_t *src_bits,
+ uint8_t *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+- w = byte_width;
++ w = width;
+
+ while (w >= 2 && ((unsigned long)d & 3))
+ {
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/obsolete/xorg/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
new file mode 100644
index 0000000..7e8f34f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
@@ -0,0 +1,91 @@
+From f07cd58c643b490dcb1ef7be2642926cfeca1e69 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:54 +0300
+Subject: [PATCH 3/5] Support of overlapping src/dst for pixman_blt_sse2
+
+---
+ pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++--------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
+index 946e7ba..66053ae 100644
+--- a/pixman/pixman-sse2.c
++++ b/pixman/pixman-sse2.c
+@@ -5299,34 +5299,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ {
+ uint8_t * src_bytes;
+ uint8_t * dst_bytes;
+- int byte_width;
++ int bpp;
+
+- if (src_bpp != dst_bpp)
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
+- if (src_bpp == 16)
+- {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 2 * width;
+- src_stride *= 2;
+- dst_stride *= 2;
+- }
+- else if (src_bpp == 32)
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
+ {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 4 * width;
+- src_stride *= 4;
+- dst_stride *= 4;
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
+ }
+- else
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+ {
+- return FALSE;
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using SSE2 */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
+ }
+
+ cache_prefetch ((__m128i*)src_bytes);
+@@ -5339,7 +5348,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ uint8_t *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+- w = byte_width;
++ w = width;
+
+ cache_prefetch_next ((__m128i*)s);
+ cache_prefetch_next ((__m128i*)d);
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/obsolete/xorg/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
new file mode 100644
index 0000000..0ba5b84
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
@@ -0,0 +1,94 @@
+From e0542866c466ad512d69292df098d4b880e35e52 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Wed, 18 Nov 2009 06:08:48 +0200
+Subject: [PATCH 4/5] Support of overlapping src/dst for pixman_blt_neon
+
+---
+ pixman/pixman-arm-neon.c | 62 +++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 51 insertions(+), 11 deletions(-)
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 24ceeeb..134493d 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -360,26 +360,66 @@ pixman_blt_neon (uint32_t *src_bits,
+ int width,
+ int height)
+ {
+- if (src_bpp != dst_bpp)
++ uint8_t * src_bytes;
++ uint8_t * dst_bytes;
++ int bpp;
++
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
++ {
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
++ }
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
++ {
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using NEON */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
++ }
++
+ switch (src_bpp)
+ {
+ case 16:
+ pixman_composite_src_0565_0565_asm_neon (
+- width, height,
+- (uint16_t *)(((char *) dst_bits) +
+- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
+- (uint16_t *)(((char *) src_bits) +
+- src_y * src_stride * 4 + src_x * 2), src_stride * 2);
++ width >> 1,
++ height,
++ (uint16_t *) dst_bytes,
++ dst_stride >> 1,
++ (uint16_t *) src_bytes,
++ src_stride >> 1);
+ return TRUE;
+ case 32:
+ pixman_composite_src_8888_8888_asm_neon (
+- width, height,
+- (uint32_t *)(((char *) dst_bits) +
+- dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
+- (uint32_t *)(((char *) src_bits) +
+- src_y * src_stride * 4 + src_x * 4), src_stride);
++ width >> 2,
++ height,
++ (uint32_t *) dst_bytes,
++ dst_stride >> 2,
++ (uint32_t *) src_bytes,
++ src_stride >> 2);
+ return TRUE;
+ default:
+ return FALSE;
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch b/recipes/obsolete/xorg/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
new file mode 100644
index 0000000..769ed2e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
@@ -0,0 +1,169 @@
+From d51b10a2750d99543a0c92ca44802aa7a4d70e54 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 10 Dec 2009 00:51:50 +0200
+Subject: [PATCH 5/5] ARM: added NEON optimizations for fetch/store r5g6b5 scanline
+
+---
+ pixman/pixman-access.c | 23 ++++++++++++++++++++++-
+ pixman/pixman-arm-neon-asm.S | 20 ++++++++++++++++++++
+ pixman/pixman-arm-neon.c | 41 +++++++++++++++++++++++++++++++++++++++++
+ pixman/pixman-private.h | 5 +++++
+ 4 files changed, 88 insertions(+), 1 deletions(-)
+
+diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
+index fa0a267..5bb3e09 100644
+--- a/pixman/pixman-access.c
++++ b/pixman/pixman-access.c
+@@ -2748,7 +2748,7 @@ typedef struct
+ store_scanline_ ## format, store_scanline_generic_64 \
+ }
+
+-static const format_info_t accessors[] =
++static format_info_t accessors[] =
+ {
+ /* 32 bpp formats */
+ FORMAT_INFO (a8r8g8b8),
+@@ -2891,6 +2891,27 @@ _pixman_bits_image_setup_raw_accessors (bits_image_t *image)
+ setup_accessors (image);
+ }
+
++void
++_pixman_bits_override_accessors (pixman_format_code_t format,
++ fetch_scanline_t fetch_func,
++ store_scanline_t store_func)
++{
++ format_info_t *info = accessors;
++
++ while (info->format != PIXMAN_null)
++ {
++ if (info->format == format)
++ {
++ if (fetch_func)
++ info->fetch_scanline_raw_32 = fetch_func;
++ if (store_func)
++ info->store_scanline_raw_32 = store_func;
++ return;
++ }
++ info++;
++ }
++}
++
+ #else
+
+ void
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index eb8cc4c..6ab3301 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -454,6 +454,16 @@ generate_composite_function \
+ pixman_composite_src_8888_0565_process_pixblock_tail, \
+ pixman_composite_src_8888_0565_process_pixblock_tail_head
+
++generate_composite_function_single_scanline \
++ pixman_store_scanline_r5g6b5_asm_neon, 32, 0, 16, \
++ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
++ 8, /* number of pixels, processed in a single block */ \
++ default_init, \
++ default_cleanup, \
++ pixman_composite_src_8888_0565_process_pixblock_head, \
++ pixman_composite_src_8888_0565_process_pixblock_tail, \
++ pixman_composite_src_8888_0565_process_pixblock_tail_head
++
+ /******************************************************************************/
+
+ .macro pixman_composite_src_0565_8888_process_pixblock_head
+@@ -489,6 +499,16 @@ generate_composite_function \
+ pixman_composite_src_0565_8888_process_pixblock_tail, \
+ pixman_composite_src_0565_8888_process_pixblock_tail_head
+
++generate_composite_function_single_scanline \
++ pixman_fetch_scanline_r5g6b5_asm_neon, 16, 0, 32, \
++ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
++ 8, /* number of pixels, processed in a single block */ \
++ default_init, \
++ default_cleanup, \
++ pixman_composite_src_0565_8888_process_pixblock_head, \
++ pixman_composite_src_0565_8888_process_pixblock_tail, \
++ pixman_composite_src_0565_8888_process_pixblock_tail_head
++
+ /******************************************************************************/
+
+ .macro pixman_composite_add_8000_8000_process_pixblock_head
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 134493d..2245b52 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -567,6 +567,43 @@ neon_combine_##name##_u (pixman_implementation_t *imp, \
+ BIND_COMBINE_U (over)
+ BIND_COMBINE_U (add)
+
++void
++pixman_fetch_scanline_r5g6b5_asm_neon (int width,
++ uint32_t *buffer,
++ const uint16_t *pixel);
++void
++pixman_store_scanline_r5g6b5_asm_neon (int width,
++ uint16_t *pixel,
++ const uint32_t *values);
++
++static void
++neon_fetch_scanline_r5g6b5 (pixman_image_t *image,
++ int x,
++ int y,
++ int width,
++ uint32_t * buffer,
++ const uint32_t *mask,
++ uint32_t mask_bits)
++{
++ const uint32_t *bits = image->bits.bits + y * image->bits.rowstride;
++ const uint16_t *pixel = (const uint16_t *)bits + x;
++
++ pixman_fetch_scanline_r5g6b5_asm_neon (width, buffer, pixel);
++}
++
++static void
++neon_store_scanline_r5g6b5 (bits_image_t * image,
++ int x,
++ int y,
++ int width,
++ const uint32_t *values)
++{
++ uint32_t *bits = image->bits + image->rowstride * y;
++ uint16_t *pixel = ((uint16_t *) bits) + x;
++
++ pixman_store_scanline_r5g6b5_asm_neon (width, pixel, values);
++}
++
+ pixman_implementation_t *
+ _pixman_implementation_create_arm_neon (void)
+ {
+@@ -577,6 +614,10 @@ _pixman_implementation_create_arm_neon (void)
+ imp->combine_32[PIXMAN_OP_OVER] = neon_combine_over_u;
+ imp->combine_32[PIXMAN_OP_ADD] = neon_combine_add_u;
+
++ _pixman_bits_override_accessors (PIXMAN_r5g6b5,
++ neon_fetch_scanline_r5g6b5,
++ neon_store_scanline_r5g6b5);
++
+ imp->blt = arm_neon_blt;
+ imp->fill = arm_neon_fill;
+
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index eeb677d..ba2d401 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -220,6 +220,11 @@ void
+ _pixman_bits_image_setup_raw_accessors (bits_image_t *image);
+
+ void
++_pixman_bits_override_accessors (pixman_format_code_t format,
++ fetch_scanline_t fetch_func,
++ store_scanline_t store_func);
++
++void
+ _pixman_image_get_scanline_generic_64 (pixman_image_t *image,
+ int x,
+ int y,
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch b/recipes/obsolete/xorg/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch
new file mode 100644
index 0000000..3d8d4e8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch
@@ -0,0 +1,53 @@
+From 7f0adaef68c5b0bb1c5eb9f5db5792b71b8b8beb Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 19 Mar 2010 10:44:09 +0100
+Subject: [PATCH 6/6] Revert "ARM: SIMD: Try without any CFLAGS before forcing -mcpu="
+
+This forces -marm that results in runtime SIGILL on thumb userspace
+
+This reverts commit 18f0de452dc7e12e4cb544d761a626d5c6031663.
+---
+ configure.ac | 20 +++++---------------
+ 1 files changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fc3ee24..f84a4dc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -363,28 +363,18 @@ AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
+
+ dnl ===========================================================================
+ dnl Check for ARM SIMD instructions
+-ARM_SIMD_CFLAGS=""
++ARM_SIMD_CFLAGS="-mcpu=arm1136j-s"
+
+ have_arm_simd=no
+ AC_MSG_CHECKING(whether to use ARM SIMD assembler)
+-# check with default CFLAGS in case the toolchain turns on a sufficiently recent -mcpu=
++xserver_save_CFLAGS=$CFLAGS
++CFLAGS="$ARM_SIMD_CFLAGS $CFLAGS"
+ AC_COMPILE_IFELSE([
+ int main () {
+ asm("uqadd8 r1, r1, r2");
+ return 0;
+-}], have_arm_simd=yes,
+- # check again with an explicit -mcpu= in case the toolchain defaults to an
+- # older one; note that uqadd8 isn't available in Thumb mode on arm1136j-s
+- # so we force ARM mode
+- ARM_SIMD_CFLAGS="-mcpu=arm1136j-s -marm"
+- xserver_save_CFLAGS=$CFLAGS
+- CFLAGS="$ARM_SIMD_CFLAGS $CFLAGS"
+- AC_COMPILE_IFELSE([
+- int main () {
+- asm("uqadd8 r1, r1, r2");
+- return 0;
+- }], have_arm_simd=yes)
+- CFLAGS=$xserver_save_CFLAGS)
++}], have_arm_simd=yes)
++CFLAGS=$xserver_save_CFLAGS
+
+ AC_ARG_ENABLE(arm-simd,
+ [AC_HELP_STRING([--disable-arm-simd],
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/calloc.patch b/recipes/obsolete/xorg/xorg-lib/pixman/calloc.patch
new file mode 100644
index 0000000..4a60d7e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/calloc.patch
@@ -0,0 +1,23 @@
+From 634ba33b5b1fcfd5a0e7910f9991b4ed4f674549 Mon Sep 17 00:00:00 2001
+From: Søren Sandmann Pedersen <ssp@redhat.com>
+Date: Wed, 07 Apr 2010 05:39:14 +0000
+Subject: Fix uninitialized cache when pthreads are used
+
+The thread local cache is allocated with malloc(), but we rely on it
+being initialized to zero, so allocate it with calloc() instead.
+---
+diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
+index a4e3f88..cdac0d8 100644
+--- a/pixman/pixman-compiler.h
++++ b/pixman/pixman-compiler.h
+@@ -101,7 +101,7 @@
+ static type * \
+ tls_ ## name ## _alloc (key) \
+ { \
+- type *value = malloc (sizeof (type)); \
++ type *value = calloc (1, sizeof (type)); \
+ if (value) \
+ pthread_setspecific (key, value); \
+ return value; \
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/nearest-neighbour.patch b/recipes/obsolete/xorg/xorg-lib/pixman/nearest-neighbour.patch
new file mode 100644
index 0000000..29b140f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/nearest-neighbour.patch
@@ -0,0 +1,1040 @@
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 17 Jul 2009 10:22:23 +0000 (+0300)
+Subject: Fastpath for nearest neighbour scaled compositing operations.
+X-Git-Url: http://siarhei.siamashka.name/gitweb/?p=pixman.git;a=commitdiff_plain;h=247531c6978725a88fd3706129b9d3e339026f54
+
+Fastpath for nearest neighbour scaled compositing operations.
+
+OVER 8888x8888, OVER 8888x0565, SRC 8888x8888, SRC 8888x0565
+and SRC 0565x0565 cases are supported.
+---
+
+diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
+index 7f80578..7f3a6ad 100644
+--- a/pixman/pixman-fast-path.c
++++ b/pixman/pixman-fast-path.c
+@@ -1261,6 +1261,993 @@ fast_composite_src_scale_nearest (pixman_implementation_t *imp,
+ }
+ }
+
++/*
++ * Functions, which implement the core inner loops for the nearest neighbour
++ * scaled fastpath compositing operations. The do not need to do clipping
++ * checks, also the loops are unrolled to process two pixels per iteration
++ * for better performance on most CPU architectures (superscalar processors
++ * can issue several operations simultaneously, other processors can hide
++ * instructions latencies by pipelining operations). Unrolling more
++ * does not make much sense because the compiler will start running out
++ * of spare registers soon.
++ */
++
++#undef READ
++#undef WRITE
++#define READ(img,x) (*(x))
++#define WRITE(img,ptr,v) ((*(ptr)) = (v))
++
++#define UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(x, a, y) do { \
++ UN8x4_MUL_UN8_ADD_UN8x4(x, a, y); \
++ x = CONVERT_8888_TO_0565(x); \
++ } while (0)
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x0565 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint16_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t d;
++ uint32_t s1, s2;
++ uint8_t a1, a2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++
++ uint32_t *src;
++ uint16_t *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++
++ if ((y < 0) || (y >= pSrc->bits.height)) {
++ continue;
++ }
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ s2 = READ(pSrc, src + x2);
++
++ a1 = s1 >> 24;
++ a2 = s2 >> 24;
++
++ if (a1 == 0xff)
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ else if (s1) {
++ d = CONVERT_0565_TO_0888(READ(pDst, dst));
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++
++ if (a2 == 0xff)
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
++ else if (s2) {
++ d = CONVERT_0565_TO_0888(READ(pDst, dst));
++ a2 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a2, s2);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ a1 = s1 >> 24;
++ if (a1 == 0xff)
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ else if (s1) {
++ d = CONVERT_0565_TO_0888(READ(pDst, dst));
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x0565 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint16_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t d;
++ uint32_t s1, s2;
++ uint8_t a1, a2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++ int32_t max_vx, max_vy;
++
++ uint32_t *src;
++ uint16_t *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ max_vx = pSrc->bits.width << 16;
++ max_vy = pSrc->bits.height << 16;
++
++ while (orig_vx < 0) orig_vx += max_vx;
++ while (vy < 0) vy += max_vy;
++ while (orig_vx >= max_vx) orig_vx -= max_vx;
++ while (vy >= max_vy) vy -= max_vy;
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++ while (vy >= max_vy) vy -= max_vy;
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s2 = READ(pSrc, src + x2);
++
++ a1 = s1 >> 24;
++ a2 = s2 >> 24;
++
++ if (a1 == 0xff)
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ else if (s1) {
++ d = CONVERT_0565_TO_0888(READ(pDst, dst));
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++
++ if (a2 == 0xff)
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
++ else if (s2) {
++ d = CONVERT_0565_TO_0888(READ(pDst, dst));
++ a2 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a2, s2);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ a1 = s1 >> 24;
++ if (a1 == 0xff)
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ else if (s1) {
++ d = CONVERT_0565_TO_0888(READ(pDst, dst));
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x8888 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint32_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t d;
++ uint32_t s1, s2;
++ uint8_t a1, a2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++
++ uint32_t *src, *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++
++ if ((y < 0) || (y >= pSrc->bits.height)) {
++ continue;
++ }
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ s2 = READ(pSrc, src + x2);
++
++ a1 = s1 >> 24;
++ a2 = s2 >> 24;
++
++ if (a1 == 0xff)
++ WRITE(pDst, dst, s1);
++ else if (s1) {
++ d = READ(pDst, dst);
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++
++ if (a2 == 0xff)
++ WRITE(pDst, dst, s2);
++ else if (s2) {
++ d = READ(pDst, dst);
++ a2 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4(d, a2, s2);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ a1 = s1 >> 24;
++ if (a1 == 0xff)
++ WRITE(pDst, dst, s1);
++ else if (s1) {
++ d = READ(pDst, dst);
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x8888 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint32_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t d;
++ uint32_t s1, s2;
++ uint8_t a1, a2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++ int32_t max_vx, max_vy;
++
++ uint32_t *src, *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ max_vx = pSrc->bits.width << 16;
++ max_vy = pSrc->bits.height << 16;
++
++ while (orig_vx < 0) orig_vx += max_vx;
++ while (vy < 0) vy += max_vy;
++ while (orig_vx >= max_vx) orig_vx -= max_vx;
++ while (vy >= max_vy) vy -= max_vy;
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++ while (vy >= max_vy) vy -= max_vy;
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s2 = READ(pSrc, src + x2);
++
++ a1 = s1 >> 24;
++ a2 = s2 >> 24;
++
++ if (a1 == 0xff)
++ WRITE(pDst, dst, s1);
++ else if (s1) {
++ d = READ(pDst, dst);
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++
++ if (a2 == 0xff)
++ WRITE(pDst, dst, s2);
++ else if (s2) {
++ d = READ(pDst, dst);
++ a2 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4(d, a2, s2);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ a1 = s1 >> 24;
++ if (a1 == 0xff)
++ WRITE(pDst, dst, s1);
++ else if (s1) {
++ d = READ(pDst, dst);
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x8888 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint32_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t s1, s2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++
++ uint32_t *src, *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++
++ if ((y < 0) || (y >= pSrc->bits.height)) {
++ memset(dst, 0, width * sizeof(*dst));
++ continue;
++ }
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ s2 = READ(pSrc, src + x2);
++
++ WRITE(pDst, dst, s1);
++ dst++;
++ WRITE(pDst, dst, s2);
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++ WRITE(pDst, dst, s1);
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x8888 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint32_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t s1, s2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++ int32_t max_vx, max_vy;
++
++ uint32_t *src, *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ max_vx = pSrc->bits.width << 16;
++ max_vy = pSrc->bits.height << 16;
++
++ while (orig_vx < 0) orig_vx += max_vx;
++ while (vy < 0) vy += max_vy;
++ while (orig_vx >= max_vx) orig_vx -= max_vx;
++ while (vy >= max_vy) vy -= max_vy;
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++ while (vy >= max_vy) vy -= max_vy;
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s2 = READ(pSrc, src + x2);
++
++ WRITE(pDst, dst, s1);
++ dst++;
++ WRITE(pDst, dst, s2);
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ WRITE(pDst, dst, s1);
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_0565x0565 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint16_t *dstLine;
++ uint16_t *srcFirstLine;
++ uint16_t s1, s2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++
++ uint16_t *src, *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint16_t, srcStride, srcFirstLine, 1);
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++
++ if ((y < 0) || (y >= pSrc->bits.height)) {
++ memset(dst, 0, width * sizeof(*dst));
++ continue;
++ }
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ s2 = READ(pSrc, src + x2);
++
++ WRITE(pDst, dst, s1);
++ dst++;
++ WRITE(pDst, dst, s2);
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++ WRITE(pDst, dst, s1);
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_0565x0565 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint16_t *dstLine;
++ uint16_t *srcFirstLine;
++ uint16_t s1, s2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++ int32_t max_vx, max_vy;
++
++ uint16_t *src, *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint16_t, srcStride, srcFirstLine, 1);
++
++ max_vx = pSrc->bits.width << 16;
++ max_vy = pSrc->bits.height << 16;
++
++ while (orig_vx < 0) orig_vx += max_vx;
++ while (vy < 0) vy += max_vy;
++ while (orig_vx >= max_vx) orig_vx -= max_vx;
++ while (vy >= max_vy) vy -= max_vy;
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++ while (vy >= max_vy) vy -= max_vy;
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s2 = READ(pSrc, src + x2);
++
++ WRITE(pDst, dst, s1);
++ dst++;
++ WRITE(pDst, dst, s2);
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ WRITE(pDst, dst, s1);
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x0565 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint16_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t s1, s2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++
++ uint32_t *src;
++ uint16_t *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++
++ if ((y < 0) || (y >= pSrc->bits.height)) {
++ memset(dst, 0, width * sizeof(*dst));
++ continue;
++ }
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ s2 = READ(pSrc, src + x2);
++
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ dst++;
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x0565 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint16_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t s1, s2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++ int32_t max_vx, max_vy;
++
++ uint32_t *src;
++ uint16_t *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ max_vx = pSrc->bits.width << 16;
++ max_vy = pSrc->bits.height << 16;
++
++ while (orig_vx < 0) orig_vx += max_vx;
++ while (vy < 0) vy += max_vy;
++ while (orig_vx >= max_vx) orig_vx -= max_vx;
++ while (vy >= max_vy) vy -= max_vy;
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++ while (vy >= max_vy) vy -= max_vy;
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s2 = READ(pSrc, src + x2);
++
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ dst++;
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ dst++;
++ }
++ }
++}
++
++/*
++ * Check if the clipping boundary is crossed on horizontal scaling
++ */
++static inline pixman_bool_t
++fbTransformVerifyHorizontalClipping(pixman_image_t *pict, int width, int32_t vx, int32_t unit_x)
++{
++ while (--width >= 0) {
++ int x = vx >> 16;
++ if ((x < 0) || (x >= pict->bits.width)) return 1;
++ vx += unit_x;
++ }
++ return 0;
++}
++
++/*
++ * Check if the clipping boundary is crossed on vertical scaling
++ */
++static inline pixman_bool_t
++fbTransformVerifyVerticalClipping(pixman_image_t *pict, int height, int32_t vy, int32_t unit_y)
++{
++ while (--height >= 0) {
++ int y = vy >> 16;
++ if ((y < 0) || (y >= pict->bits.height)) return 1;
++ vy += unit_y;
++ }
++ return 0;
++}
++
++/*
++ * Easy case of transform without rotation or complex clipping
++ * Returns 1 in the case if it was able to handle this operation and 0 otherwise
++ */
++static pixman_bool_t
++fbCompositeTransformNonrotatedAffineTrivialclip (
++ pixman_op_t op,
++ pixman_image_t *pSrc,
++ pixman_image_t *pMask,
++ pixman_image_t *pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ pixman_vector_t v, unit;
++ int skipdst_x = 0, skipdst_y = 0;
++
++ /* Handle destination clipping */
++ if (xDst < pDst->common.clip_region.extents.x1) {
++ skipdst_x = pDst->common.clip_region.extents.x1 - xDst;
++ if (skipdst_x >= (int)width)
++ return 1;
++ xDst = pDst->common.clip_region.extents.x1;
++ width -= skipdst_x;
++ }
++
++ if (yDst < pDst->common.clip_region.extents.y1) {
++ skipdst_y = pDst->common.clip_region.extents.y1 - yDst;
++ if (skipdst_y >= (int)height)
++ return 1;
++ yDst = pDst->common.clip_region.extents.y1;
++ height -= skipdst_y;
++ }
++
++ if (xDst >= pDst->common.clip_region.extents.x2 ||
++ yDst >= pDst->common.clip_region.extents.y2)
++ {
++ return 1;
++ }
++
++ if (xDst + width > pDst->common.clip_region.extents.x2)
++ width = pDst->common.clip_region.extents.x2 - xDst;
++ if (yDst + height > pDst->common.clip_region.extents.y2)
++ height = pDst->common.clip_region.extents.y2 - yDst;
++
++ /* reference point is the center of the pixel */
++ v.vector[0] = pixman_int_to_fixed(xSrc) + pixman_fixed_1 / 2;
++ v.vector[1] = pixman_int_to_fixed(ySrc) + pixman_fixed_1 / 2;
++ v.vector[2] = pixman_fixed_1;
++
++ if (!pixman_transform_point_3d (pSrc->common.transform, &v))
++ return 0;
++
++ /* Round down to closest integer, ensuring that 0.5 rounds to 0, not 1 */
++ v.vector[0] -= pixman_fixed_e;
++ v.vector[1] -= pixman_fixed_e;
++
++ unit.vector[0] = pSrc->common.transform->matrix[0][0];
++ unit.vector[1] = pSrc->common.transform->matrix[1][1];
++
++ v.vector[0] += unit.vector[0] * skipdst_x;
++ v.vector[1] += unit.vector[1] * skipdst_y;
++
++ /* Check for possible fixed point arithmetics problems/overflows */
++ if (unit.vector[0] <= 0 || unit.vector[1] <= 0)
++ return 0;
++ if (width == 0 || height == 0)
++ return 0;
++ if ((uint32_t)width + (unit.vector[0] >> 16) >= 0x7FFF)
++ return 0;
++ if ((uint32_t)height + (unit.vector[1] >> 16) >= 0x7FFF)
++ return 0;
++
++ /* Horizontal source clipping is only supported for NORMAL repeat */
++ if (pSrc->common.repeat != PIXMAN_REPEAT_NORMAL
++ && fbTransformVerifyHorizontalClipping(pSrc, width, v.vector[0], unit.vector[0])) {
++ return 0;
++ }
++
++ /* Vertical source clipping is only supported for NONE and NORMAL repeat */
++ if (pSrc->common.repeat != PIXMAN_REPEAT_NONE && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL
++ && fbTransformVerifyVerticalClipping(pSrc, height, v.vector[1], unit.vector[1])) {
++ return 0;
++ }
++
++ if (op == PIXMAN_OP_OVER && pSrc->bits.format == PIXMAN_a8r8g8b8
++ && (pDst->bits.format == PIXMAN_x8r8g8b8 || pDst->bits.format == PIXMAN_a8r8g8b8))
++ {
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x8888(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x8888(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ }
++
++ if (op == PIXMAN_OP_SRC && (pSrc->bits.format == PIXMAN_x8r8g8b8 || pSrc->bits.format == PIXMAN_a8r8g8b8)
++ && (pDst->bits.format == PIXMAN_x8r8g8b8 || pDst->bits.format == pSrc->bits.format))
++ {
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x8888(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x8888(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ }
++
++ if (op == PIXMAN_OP_OVER && pSrc->bits.format == PIXMAN_a8r8g8b8 && pDst->bits.format == PIXMAN_r5g6b5)
++ {
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x0565(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x0565(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ }
++
++ if (op == PIXMAN_OP_SRC && pSrc->bits.format == PIXMAN_r5g6b5 && pDst->bits.format == PIXMAN_r5g6b5)
++ {
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_0565x0565(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_0565x0565(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ }
++
++ if (op == PIXMAN_OP_SRC && (pSrc->bits.format == PIXMAN_x8r8g8b8 || pSrc->bits.format == PIXMAN_a8r8g8b8)
++ && pDst->bits.format == PIXMAN_r5g6b5)
++ {
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x0565(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x0565(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ }
++
++ /* No fastpath scaling implemented for this case */
++ return 0;
++}
++
+ static void
+ fast_path_composite (pixman_implementation_t *imp,
+ pixman_op_t op,
+@@ -1279,6 +2266,30 @@ fast_path_composite (pixman_implementation_t *imp,
+ if (src->type == BITS
+ && src->common.transform
+ && !mask
++ && !src->common.alpha_map && !dest->common.alpha_map
++ && (src->common.filter == PIXMAN_FILTER_NEAREST)
++ && !src->bits.read_func && !src->bits.write_func
++ && !dest->bits.read_func && !dest->bits.write_func)
++ {
++ /* ensure that the transform matrix only has a scale */
++ if (src->common.transform->matrix[0][1] == 0 &&
++ src->common.transform->matrix[1][0] == 0 &&
++ src->common.transform->matrix[2][0] == 0 &&
++ src->common.transform->matrix[2][1] == 0 &&
++ src->common.transform->matrix[2][2] == pixman_fixed_1 &&
++ dest->common.clip_region.data == NULL)
++ {
++ if (fbCompositeTransformNonrotatedAffineTrivialclip (op, src, mask, dest,
++ src_x, src_y, mask_x, mask_y, dest_x, dest_y, width, height))
++ {
++ return;
++ }
++ }
++ }
++
++ if (src->type == BITS
++ && src->common.transform
++ && !mask
+ && op == PIXMAN_OP_SRC
+ && !src->common.alpha_map && !dest->common.alpha_map
+ && (src->common.filter == PIXMAN_FILTER_NEAREST)
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/over-n-8-0565.patch b/recipes/obsolete/xorg/xorg-lib/pixman/over-n-8-0565.patch
new file mode 100644
index 0000000..3911068
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/over-n-8-0565.patch
@@ -0,0 +1,231 @@
+From de2221a32d0b6628116565563f7b4ccd0a44e8b6 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 04 Mar 2010 23:20:25 +0000
+Subject: ARM: added 'armv6_composite_over_n_8_0565' fast path
+
+Provides ~3x performance improvement when working with
+data in L1 cache and memory. This fast path is important
+for fonts rendering when using 16bpp desktop.
+
+Microbenchmark from N800 (ARM11 @ 400MHz), measured in MPix/s:
+
+before:
+
+ over_n_8_0565 = L1: 2.99 M: 2.86
+
+after:
+
+ over_n_8_0565 = L1: 9.07 M: 8.05
+---
+diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
+index 09a2888..c375c01 100644
+--- a/pixman/pixman-arm-simd.c
++++ b/pixman/pixman-arm-simd.c
+@@ -419,6 +419,193 @@ arm_composite_over_n_8_8888 (pixman_implementation_t * impl,
+ }
+ }
+
++#if defined(__ARM_EABI__) && defined(__linux__)
++/*
++ * ARMv6 assembly optimized version of 'composite_over_n_8_0565'. It is
++ * a bare metal 'naked' function which uses all the available CPU registers
++ * and is compatible with ARM EABI. It might (or might not) break when used
++ * with a different ABI, anyway it is better to be safe than sorry.
++ */
++static void __attribute__((naked)) armv6_composite_over_n_8_0565_asm (
++ uint16_t *dst, uint8_t *mask, uint32_t src, int w,
++ int dst_stride_delta, int mask_stride_delta, int h)
++{
++ asm volatile (
++ ".macro composite_internal_armv6_asm opaque_flag\n"
++ /* save all registers (8 words) to stack */
++ "stmdb sp!, {r4-r11, ip, lr}\n"
++ /* some register aliases for better readability */
++ "DST .req r0\n"
++ "MASK .req r1\n"
++ "S .req r2\n"
++ "W .req r3\n"
++ "A .req r8\n"
++ "D .req r10\n"
++ "C0000FF .req r11\n"
++ "C00001F .req r9\n"
++ "C800080 .req ip\n"
++ "CE000E0 .req lr\n"
++ /* precalculate some stuff and put it on stack */
++ "mov r6, #0xF8\n"
++ "mov r7, #0xFC\n"
++
++ "str W, [sp, #-8]!\n"
++
++ ".if \\opaque_flag\n"
++ /* precalculate and save it to stack for later use:
++ * ((src >> 3) & 0x001F) |
++ * ((src >> 5) & 0x07E0) |
++ * ((src >> 8) & 0xF800)
++ */
++ "mov A, #0x1F\n"
++ "and D, A, S, lsr #3\n"
++ "and r4, S, #0xF80000\n"
++ "and r5, S, #0xFC00\n"
++ "orr D, r4, lsr #8\n"
++ "orr D, r5, lsr #5\n"
++ "str D, [sp, #4]\n"
++ ".endif\n"
++
++ "ldr D, [sp, #(8 + 10*4 + 8)]\n" /* h */
++ "ldr A, =0xFF00FF\n"
++ "ldr C800080, =0x800080\n"
++ "ldr CE000E0, =0xE000E0\n"
++ "ldr C0000FF, =0xFF\n"
++ "ldr C00001F, =0x1F\n"
++ "and r4, A, S\n" /* r4 = src & 0x00FF00FF */
++ "and r5, A, S, lsr #8\n" /* r5 = (src >> 8) & 0x00FF00FF */
++ "stmdb sp!, {r4, r5, r6, r7}\n"
++ "0:\n"
++ "subs D, D, #1\n"
++ "blt 6f\n"
++ "1:\n"
++ "subs W, W, #1\n"
++ "blt 5f\n"
++ "2:\n"
++ "ldrb A, [MASK], #1\n"
++ "ldmia sp, {r4, r5, r6, r7}\n" /* load constants from stack */
++ "add DST, DST, #2\n"
++ "cmp A, #0\n"
++ "beq 1b\n"
++
++ ".if \\opaque_flag\n"
++ "cmp A, #0xFF\n"
++ "bne 3f\n"
++ "ldr D, [sp, #(4*4 + 4)]\n" /* load precalculated value */
++ "subs W, #1\n"
++ "strh D, [DST, #-2]\n"
++ "bge 2b\n"
++ ".endif\n"
++
++ "3:\n"
++ "ldrh D, [DST, #-2]\n"
++ "mla r4, A, r4, C800080\n"
++ "mla r5, A, r5, C800080\n"
++ "and r6, r6, D, lsl #3\n" /* & 0xF8 */
++ "and r7, r7, D, lsr #3\n" /* & 0xFC */
++ "and D, D, #0xF800\n"
++ "bic S, r4, #0xFF0000\n"
++ "bic A, r5, #0xFF0000\n"
++ "add r4, r4, S, lsr #8\n"
++ "add r5, r5, A, lsr #8\n"
++
++ "and S, r7, #0xC0\n"
++ "orr r6, r6, D, lsl #8\n"
++ "and D, r6, CE000E0\n"
++ "eor A, C0000FF, r5, lsr #24\n"
++ "orr r6, D, lsr #5\n"
++ "orr r7, S, lsr #6\n"
++
++ "mla r6, A, r6, C800080\n"
++ "mla r7, A, r7, C800080\n"
++ "subs W, #1\n"
++ "bic D, r6, #0xFF0000\n"
++ "bic A, r7, #0xFF0000\n"
++ "add r6, r6, D, lsr #8\n"
++ "uqadd8 r4, r4, r6\n"
++ "add r7, r7, A, lsr #8\n"
++ "uqadd8 r5, r5, r7\n"
++ "and D, C00001F, r4, lsr #11\n"
++ "and r4, r4, #0xF8000000\n"
++ "and r5, r5, #0xFC00\n"
++ "orr D, r4, lsr #16\n"
++ "orr D, r5, lsr #5\n"
++ "strh D, [DST, #-2]\n"
++ "bge 2b\n"
++ "5:\n"
++ "ldr r6, [sp, #(4*4 + 8 + 10*4 + 8)]\n" /* h */
++ "ldr r4, [sp, #(4*4 + 8 + 10*4 + 4)]\n" /* mask stride */
++ "ldr r5, [sp, #(4*4 + 8 + 10*4 + 0)]\n" /* dst stride */
++ "ldr W, [sp, #(4*4)]\n"
++ "subs r6, r6, #1\n" /* h */
++ "str r6, [sp, #(4*4 + 8 + 10*4 + 8)]\n" /* h */
++ "add MASK, MASK, r4\n"
++ "add DST, DST, r5, lsl #1\n"
++ "bgt 1b\n"
++ "6:\n"
++ "add sp, sp, #(4*4 + 8)\n"
++ /* restore all registers and return */
++ "ldmia sp!, {r4-r11, ip, pc}\n"
++ ".unreq DST\n"
++ ".unreq MASK\n"
++ ".unreq S\n"
++ ".unreq W\n"
++ ".unreq A\n"
++ ".unreq D\n"
++ ".unreq C0000FF\n"
++ ".unreq C00001F\n"
++ ".unreq C800080\n"
++ ".unreq CE000E0\n"
++ ".endm\n"
++
++ "mov ip, r2, lsr #24\n"
++ "cmp ip, #0xFF\n"
++ "beq 9f\n"
++ "composite_internal_armv6_asm 0\n"
++ "9:\n"
++ "composite_internal_armv6_asm 1\n"
++ ".ltorg\n"
++ ".purgem composite_internal_armv6_asm\n"
++ );
++}
++
++static void
++armv6_composite_over_n_8_0565 (pixman_implementation_t * impl,
++ pixman_op_t op,
++ pixman_image_t * src_image,
++ pixman_image_t * mask_image,
++ pixman_image_t * dst_image,
++ int32_t src_x,
++ int32_t src_y,
++ int32_t mask_x,
++ int32_t mask_y,
++ int32_t dest_x,
++ int32_t dest_y,
++ int32_t width,
++ int32_t height)
++{
++ uint32_t src;
++ uint16_t *dst;
++ uint8_t *mask;
++ int dst_stride, mask_stride;
++
++ src = _pixman_image_get_solid (src_image, dst_image->bits.format);
++
++ /* bail out if fully transparent */
++ if (src == 0)
++ return;
++
++ PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t,
++ dst_stride, dst, 1);
++ PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t,
++ mask_stride, mask, 1);
++
++ armv6_composite_over_n_8_0565_asm (dst, mask, src, width,
++ dst_stride - width, mask_stride - width, height);
++}
++
++#endif
++
+ static const pixman_fast_path_t arm_simd_fast_paths[] =
+ {
+ PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, a8r8g8b8, arm_composite_over_8888_8888),
+@@ -434,7 +621,10 @@ static const pixman_fast_path_t arm_simd_fast_paths[] =
+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8r8g8b8, arm_composite_over_n_8_8888),
+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, a8b8g8r8, arm_composite_over_n_8_8888),
+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8b8g8r8, arm_composite_over_n_8_8888),
+-
++#if defined(__ARM_EABI__) && defined(__linux__)
++ PIXMAN_STD_FAST_PATH (OVER, solid, a8, r5g6b5, armv6_composite_over_n_8_0565),
++ PIXMAN_STD_FAST_PATH (OVER, solid, a8, b5g6r5, armv6_composite_over_n_8_0565),
++#endif
+ { PIXMAN_OP_NONE },
+ };
+
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/pixman-28986.patch b/recipes/obsolete/xorg/xorg-lib/pixman/pixman-28986.patch
new file mode 100644
index 0000000..f5ba4c3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/pixman-28986.patch
@@ -0,0 +1,32 @@
+From 7b7860d61fb1526acdf010dd8fd644bbf1396b9e Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 28 Aug 2009 22:34:21 +0300
+Subject: [PATCH] ARM: workaround for gcc bug in vshll_n_u8 intrinsic
+
+Some versions of gcc (cs2009q1, 4.4.1) incorrectly reject
+shift operand having value >= 8, claiming that it is out of
+range. So inline assembly is used as a workaround.
+---
+ pixman/pixman-arm-neon.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 4125d1b..3e7f566 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -64,6 +64,12 @@ unpack0565 (uint16x8_t rgb)
+ return res;
+ }
+
++#ifdef USE_GCC_INLINE_ASM
++/* Some versions of gcc have problems with vshll_n_u8 intrinsic (Bug 23576) */
++#define vshll_n_u8(a, n) ({ uint16x8_t r; \
++ asm ("vshll.u8 %q0, %P1, %2\n" : "=w" (r) : "w" (a), "i" (n)); r; })
++#endif
++
+ static force_inline uint16x8_t
+ pack0565 (uint8x8x4_t s)
+ {
+--
+1.5.4.3
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/prefetch.patch b/recipes/obsolete/xorg/xorg-lib/pixman/prefetch.patch
new file mode 100644
index 0000000..c2e856e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/prefetch.patch
@@ -0,0 +1,298 @@
+From d0044bfbd596f22ed1560579ea6537b39f3dc1af Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 29 Oct 2009 19:06:42 +0000
+Subject: ARM: Don't emit prefetch code if prefetch distance is set to 0
+
+Also it is now possible to disable prefetch globally with
+a configuration macro
+---
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index bca499a..35e6a7e 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -219,33 +219,33 @@
+ vshrn.u16 d7, q2, #3
+ vsli.u16 q2, q2, #5
+ vshll.u8 q14, d16, #8
+- add PF_X, PF_X, #8
++ PF add PF_X, PF_X, #8
+ vshll.u8 q8, d19, #8
+- tst PF_CTL, #0xF
++ PF tst PF_CTL, #0xF
+ vsri.u8 d6, d6, #5
+- addne PF_X, PF_X, #8
++ PF addne PF_X, PF_X, #8
+ vmvn.8 d3, d3
+- subne PF_CTL, PF_CTL, #1
++ PF subne PF_CTL, PF_CTL, #1
+ vsri.u8 d7, d7, #6
+ vshrn.u16 d30, q2, #2
+ vmull.u8 q10, d3, d6
+- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
+ vmull.u8 q11, d3, d7
+ vmull.u8 q12, d3, d30
+- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
+ vsri.u16 q14, q8, #5
+- cmp PF_X, ORIG_W
++ PF cmp PF_X, ORIG_W
+ vshll.u8 q9, d18, #8
+ vrshr.u16 q13, q10, #8
+- subge PF_X, PF_X, ORIG_W
++ PF subge PF_X, PF_X, ORIG_W
+ vrshr.u16 q3, q11, #8
+ vrshr.u16 q15, q12, #8
+- subges PF_CTL, PF_CTL, #0x10
++ PF subges PF_CTL, PF_CTL, #0x10
+ vsri.u16 q14, q9, #11
+- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
+ vraddhn.u16 d20, q10, q13
+ vraddhn.u16 d23, q11, q3
+- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
+ vraddhn.u16 d22, q12, q15
+ vst1.16 {d28, d29}, [DST_W, :128]!
+ .endm
+@@ -323,20 +323,20 @@ generate_composite_function \
+
+ .macro pixman_composite_src_8888_0565_process_pixblock_tail_head
+ vsri.u16 q14, q8, #5
+- add PF_X, PF_X, #8
+- tst PF_CTL, #0xF
++ PF add PF_X, PF_X, #8
++ PF tst PF_CTL, #0xF
+ vld4.8 {d0, d1, d2, d3}, [SRC]!
+- addne PF_X, PF_X, #8
+- subne PF_CTL, PF_CTL, #1
++ PF addne PF_X, PF_X, #8
++ PF subne PF_CTL, PF_CTL, #1
+ vsri.u16 q14, q9, #11
+- cmp PF_X, ORIG_W
+- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
++ PF cmp PF_X, ORIG_W
++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
+ vshll.u8 q8, d1, #8
+ vst1.16 {d28, d29}, [DST_W, :128]!
+- subge PF_X, PF_X, ORIG_W
+- subges PF_CTL, PF_CTL, #0x10
++ PF subge PF_X, PF_X, ORIG_W
++ PF subges PF_CTL, PF_CTL, #0x10
+ vshll.u8 q14, d2, #8
+- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
+ vshll.u8 q9, d0, #8
+ .endm
+
+@@ -363,20 +363,20 @@ generate_composite_function \
+
+ .macro pixman_composite_add_8000_8000_process_pixblock_tail_head
+ vld1.8 {d0, d1, d2, d3}, [SRC]!
+- add PF_X, PF_X, #32
+- tst PF_CTL, #0xF
++ PF add PF_X, PF_X, #32
++ PF tst PF_CTL, #0xF
+ vld1.8 {d4, d5, d6, d7}, [DST_R, :128]!
+- addne PF_X, PF_X, #32
+- subne PF_CTL, PF_CTL, #1
++ PF addne PF_X, PF_X, #32
++ PF subne PF_CTL, PF_CTL, #1
+ vst1.8 {d28, d29, d30, d31}, [DST_W, :128]!
+- cmp PF_X, ORIG_W
+- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
+- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
+- subge PF_X, PF_X, ORIG_W
+- subges PF_CTL, PF_CTL, #0x10
++ PF cmp PF_X, ORIG_W
++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
++ PF subge PF_X, PF_X, ORIG_W
++ PF subges PF_CTL, PF_CTL, #0x10
+ vqadd.u8 q14, q0, q2
+- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
+- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
+ vqadd.u8 q15, q1, q3
+ .endm
+
+@@ -418,32 +418,32 @@ generate_composite_function \
+ .macro pixman_composite_over_8888_8888_process_pixblock_tail_head
+ vld4.8 {d4, d5, d6, d7}, [DST_R, :128]!
+ vrshr.u16 q14, q8, #8
+- add PF_X, PF_X, #8
+- tst PF_CTL, #0xF
++ PF add PF_X, PF_X, #8
++ PF tst PF_CTL, #0xF
+ vrshr.u16 q15, q9, #8
+ vrshr.u16 q12, q10, #8
+ vrshr.u16 q13, q11, #8
+- addne PF_X, PF_X, #8
+- subne PF_CTL, PF_CTL, #1
++ PF addne PF_X, PF_X, #8
++ PF subne PF_CTL, PF_CTL, #1
+ vraddhn.u16 d28, q14, q8
+ vraddhn.u16 d29, q15, q9
+- cmp PF_X, ORIG_W
++ PF cmp PF_X, ORIG_W
+ vraddhn.u16 d30, q12, q10
+ vraddhn.u16 d31, q13, q11
+ vqadd.u8 q14, q0, q14
+ vqadd.u8 q15, q1, q15
+ vld4.8 {d0, d1, d2, d3}, [SRC]!
+- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
+ vmvn.8 d22, d3
+- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
+ vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
+- subge PF_X, PF_X, ORIG_W
++ PF subge PF_X, PF_X, ORIG_W
+ vmull.u8 q8, d22, d4
+- subges PF_CTL, PF_CTL, #0x10
++ PF subges PF_CTL, PF_CTL, #0x10
+ vmull.u8 q9, d22, d5
+- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
+ vmull.u8 q10, d22, d6
+- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
+ vmull.u8 q11, d22, d7
+ .endm
+
+diff --git a/pixman/pixman-arm-neon-asm.h b/pixman/pixman-arm-neon-asm.h
+index d276ab9..a2941ae 100644
+--- a/pixman/pixman-arm-neon-asm.h
++++ b/pixman/pixman-arm-neon-asm.h
+@@ -58,6 +58,11 @@
+ #define RESPECT_STRICT_ALIGNMENT 1
+
+ /*
++ * If set to nonzero value, prefetch is globally disabled
++ */
++#define PREFETCH_GLOBALLY_DISABLED 0
++
++/*
+ * Definitions of supplementary pixld/pixst macros (for partial load/store of
+ * pixel data)
+ */
+@@ -218,37 +223,43 @@
+ * pixels processing like simple copy. Anyway, having prefetch is a must
+ * when working with graphics data.
+ */
++.macro PF a, x:vararg
++.if (ADVANCED_PREFETCH_ENABLED != 0) && (PREFETCH_GLOBALLY_DISABLED == 0)
++ a x
++.endif
++.endm
++
+ .macro cache_preload std_increment, boost_increment
+ .if (src_bpp_shift >= 0) || (dst_r_bpp != 0) || (mask_bpp_shift >= 0)
+ .if regs_shortage
+- ldr ORIG_W, [sp] /* If we are short on regs, ORIG_W is kept on stack */
++ PF ldr ORIG_W, [sp] /* If we are short on regs, ORIG_W is kept on stack */
+ .endif
+ .if std_increment != 0
+- add PF_X, PF_X, #std_increment
++ PF add PF_X, PF_X, #std_increment
+ .endif
+- tst PF_CTL, #0xF
+- addne PF_X, PF_X, #boost_increment
+- subne PF_CTL, PF_CTL, #1
+- cmp PF_X, ORIG_W
++ PF tst PF_CTL, #0xF
++ PF addne PF_X, PF_X, #boost_increment
++ PF subne PF_CTL, PF_CTL, #1
++ PF cmp PF_X, ORIG_W
+ .if src_bpp_shift >= 0
+- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
+ .endif
+ .if dst_r_bpp != 0
+- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
+ .endif
+ .if mask_bpp_shift >= 0
+- pld [PF_MASK, PF_X, lsl #mask_bpp_shift]
++ PF pld, [PF_MASK, PF_X, lsl #mask_bpp_shift]
+ .endif
+- subge PF_X, PF_X, ORIG_W
+- subges PF_CTL, PF_CTL, #0x10
++ PF subge PF_X, PF_X, ORIG_W
++ PF subges PF_CTL, PF_CTL, #0x10
+ .if src_bpp_shift >= 0
+- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
+ .endif
+ .if dst_r_bpp != 0
+- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
+ .endif
+ .if mask_bpp_shift >= 0
+- ldrgeb DUMMY, [PF_MASK, MASK_STRIDE, lsl #mask_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_MASK, MASK_STRIDE, lsl #mask_bpp_shift]!
+ .endif
+ .endif
+ .endm
+@@ -297,6 +308,12 @@ fname:
+ PF_DST .req r12
+ PF_MASK .req r14
+
++.if prefetch_distance == 0
++ .set ADVANCED_PREFETCH_ENABLED, 0
++.else
++ .set ADVANCED_PREFETCH_ENABLED, 1
++.endif
++
+ .if mask_bpp == 0
+ ORIG_W .req r7 /* saved original width */
+ DUMMY .req r8 /* temporary register */
+@@ -374,12 +391,12 @@ fname:
+ ldr MASK_STRIDE, [sp, #52]
+ .endif
+ mov DST_R, DST_W
+- mov PF_SRC, SRC
+- mov PF_DST, DST_R
+- mov PF_MASK, MASK
+- mov PF_CTL, H, lsl #4
+- /* pf_ctl = 10 | ((h - 1) << 4) */
+- add PF_CTL, #(prefetch_distance - 0x10)
++ PF mov PF_SRC, SRC
++ PF mov PF_DST, DST_R
++ PF mov PF_MASK, MASK
++ /* PF_CTL = prefetch_distance | ((h - 1) << 4) */
++ PF mov PF_CTL, H, lsl #4
++ PF add PF_CTL, #(prefetch_distance - 0x10)
+
+ init
+ .if regs_shortage
+@@ -412,7 +429,7 @@ fname:
+ .else
+ add DST_R, DST_R, #lowbit
+ .endif
+- add PF_X, PF_X, #(lowbit * 8 / dst_w_bpp)
++ PF add PF_X, PF_X, #(lowbit * 8 / dst_w_bpp)
+ sub W, W, #(lowbit * 8 / dst_w_bpp)
+ 1:
+ .endif
+@@ -444,7 +461,7 @@ fname:
+ (src_basereg - pixblock_size * src_bpp / 64), SRC
+ pixld pixblock_size, mask_bpp, \
+ (mask_basereg - pixblock_size * mask_bpp / 64), MASK
+- add PF_X, PF_X, #pixblock_size
++ PF add PF_X, PF_X, #pixblock_size
+ process_pixblock_head
+ cache_preload 0, pixblock_size
+ subs W, W, #(pixblock_size * 2)
+@@ -468,7 +485,7 @@ fname:
+ pixld chunk_size, src_bpp, src_basereg, SRC
+ pixld chunk_size, mask_bpp, mask_basereg, MASK
+ pixld_a chunk_size, dst_r_bpp, dst_r_basereg, DST_R
+- add PF_X, PF_X, #chunk_size
++ PF add PF_X, PF_X, #chunk_size
+ 1:
+ .endif
+ .endr
+--
+cgit v0.8.2
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/remove-broken.patch b/recipes/obsolete/xorg/xorg-lib/pixman/remove-broken.patch
new file mode 100644
index 0000000..fd025b4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/remove-broken.patch
@@ -0,0 +1,826 @@
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Sun, 26 Jul 2009 22:21:26 +0000 (+0300)
+Subject: ARM: Removal of unused/broken NEON code
+X-Git-Url: http://siarhei.siamashka.name/gitweb/?p=pixman.git;a=commitdiff_plain;h=7ef2322eefcccc28a2d45c0da22c0fee88b8f464
+
+ARM: Removal of unused/broken NEON code
+---
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 4125d1b..9404c70 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -1895,710 +1895,6 @@ pixman_fill_neon (uint32_t *bits,
+ #endif
+ }
+
+-/* TODO: is there a more generic way of doing this being introduced? */
+-#define NEON_SCANLINE_BUFFER_PIXELS (1024)
+-
+-static inline void
+-neon_quadword_copy (void * dst,
+- void * src,
+- uint32_t count, /* of quadwords */
+- uint32_t trailer_count /* of bytes */)
+-{
+- uint8_t *t_dst = dst, *t_src = src;
+-
+- /* Uses aligned multi-register loads to maximise read bandwidth
+- * on uncached memory such as framebuffers
+- * The accesses do not have the aligned qualifiers, so that the copy
+- * may convert between aligned-uncached and unaligned-cached memory.
+- * It is assumed that the CPU can infer alignedness from the address.
+- */
+-
+-#ifdef USE_GCC_INLINE_ASM
+-
+- asm volatile (
+- " cmp %[count], #8 \n"
+- " blt 1f @ skip oversized fragments \n"
+- "0: @ start with eight quadwords at a time \n"
+- " sub %[count], %[count], #8 \n"
+- " vld1.8 {d16, d17, d18, d19}, [%[src]]! \n"
+- " vld1.8 {d20, d21, d22, d23}, [%[src]]! \n"
+- " vld1.8 {d24, d25, d26, d27}, [%[src]]! \n"
+- " vld1.8 {d28, d29, d30, d31}, [%[src]]! \n"
+- " cmp %[count], #8 \n"
+- " vst1.8 {d16, d17, d18, d19}, [%[dst]]! \n"
+- " vst1.8 {d20, d21, d22, d23}, [%[dst]]! \n"
+- " vst1.8 {d24, d25, d26, d27}, [%[dst]]! \n"
+- " vst1.8 {d28, d29, d30, d31}, [%[dst]]! \n"
+- " bge 0b \n"
+- "1: @ four quadwords \n"
+- " tst %[count], #4 \n"
+- " beq 2f @ skip oversized fragment \n"
+- " vld1.8 {d16, d17, d18, d19}, [%[src]]! \n"
+- " vld1.8 {d20, d21, d22, d23}, [%[src]]! \n"
+- " vst1.8 {d16, d17, d18, d19}, [%[dst]]! \n"
+- " vst1.8 {d20, d21, d22, d23}, [%[dst]]! \n"
+- "2: @ two quadwords \n"
+- " tst %[count], #2 \n"
+- " beq 3f @ skip oversized fragment \n"
+- " vld1.8 {d16, d17, d18, d19}, [%[src]]! \n"
+- " vst1.8 {d16, d17, d18, d19}, [%[dst]]! \n"
+- "3: @ one quadword \n"
+- " tst %[count], #1 \n"
+- " beq 4f @ skip oversized fragment \n"
+- " vld1.8 {d16, d17}, [%[src]]! \n"
+- " vst1.8 {d16, d17}, [%[dst]]! \n"
+- "4: @ end \n"
+-
+- /* Clobbered input registers marked as input/outputs */
+- : [dst] "+r" (t_dst), [src] "+r" (t_src), [count] "+r" (count)
+-
+- /* No unclobbered inputs */
+- :
+-
+- /* Clobbered vector registers */
+- : "d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23", "d24", "d25",
+- "d26", "d27", "d28", "d29", "d30", "d31", "cc", "memory");
+-
+-#else
+-
+- while (count >= 8)
+- {
+- uint8x16x4_t t1 = vld4q_u8 (t_src);
+- uint8x16x4_t t2 = vld4q_u8 (t_src + sizeof(uint8x16x4_t));
+-
+- t_src += sizeof(uint8x16x4_t) * 2;
+- vst4q_u8 (t_dst, t1);
+- vst4q_u8 (t_dst + sizeof(uint8x16x4_t), t2);
+- t_dst += sizeof(uint8x16x4_t) * 2;
+- count -= 8;
+- }
+-
+- if (count & 4)
+- {
+- uint8x16x4_t t1 = vld4q_u8 (t_src);
+-
+- t_src += sizeof(uint8x16x4_t);
+- vst4q_u8 (t_dst, t1);
+- t_dst += sizeof(uint8x16x4_t);
+- }
+-
+- if (count & 2)
+- {
+- uint8x8x4_t t1 = vld4_u8 (t_src);
+-
+- t_src += sizeof(uint8x8x4_t);
+- vst4_u8 (t_dst, t1);
+- t_dst += sizeof(uint8x8x4_t);
+- }
+-
+- if (count & 1)
+- {
+- uint8x16_t t1 = vld1q_u8 (t_src);
+-
+- t_src += sizeof(uint8x16_t);
+- vst1q_u8 (t_dst, t1);
+- t_dst += sizeof(uint8x16_t);
+- }
+-
+-#endif /* !USE_GCC_INLINE_ASM */
+-
+- if (trailer_count)
+- {
+- if (trailer_count & 8)
+- {
+- uint8x8_t t1 = vld1_u8 (t_src);
+-
+- t_src += sizeof(uint8x8_t);
+- vst1_u8 (t_dst, t1);
+- t_dst += sizeof(uint8x8_t);
+- }
+-
+- if (trailer_count & 4)
+- {
+- *((uint32_t*) t_dst) = *((uint32_t*) t_src);
+-
+- t_dst += 4;
+- t_src += 4;
+- }
+-
+- if (trailer_count & 2)
+- {
+- *((uint16_t*) t_dst) = *((uint16_t*) t_src);
+-
+- t_dst += 2;
+- t_src += 2;
+- }
+-
+- if (trailer_count & 1)
+- {
+- *t_dst++ = *t_src++;
+- }
+- }
+-}
+-
+-static inline void
+-solid_over_565_8_pix_neon (uint32_t glyph_colour,
+- uint16_t *dest,
+- uint8_t * in_mask,
+- uint32_t dest_stride, /* bytes, not elements */
+- uint32_t mask_stride,
+- uint32_t count /* 8-pixel groups */)
+-{
+- /* Inner loop of glyph blitter (solid colour, alpha mask) */
+-
+-#ifdef USE_GCC_INLINE_ASM
+-
+- asm volatile (
+- " vld4.8 {d20[], d21[], d22[], d23[]}, [%[glyph_colour]] @ splat solid colour components \n"
+- "0: @ loop \n"
+- " vld1.16 {d0, d1}, [%[dest]] @ load first pixels from framebuffer \n"
+- " vld1.8 {d17}, [%[in_mask]] @ load alpha mask of glyph \n"
+- " vmull.u8 q9, d17, d23 @ apply glyph colour alpha to mask \n"
+- " vshrn.u16 d17, q9, #8 @ reformat it to match original mask \n"
+- " vmvn d18, d17 @ we need the inverse mask for the background \n"
+- " vsli.u16 q3, q0, #5 @ duplicate framebuffer blue bits \n"
+- " vshrn.u16 d2, q0, #8 @ unpack red from framebuffer pixels \n"
+- " vshrn.u16 d4, q0, #3 @ unpack green \n"
+- " vsri.u8 d2, d2, #5 @ duplicate red bits (extend 5 to 8) \n"
+- " vshrn.u16 d6, q3, #2 @ unpack extended blue (truncate 10 to 8) \n"
+- " vsri.u8 d4, d4, #6 @ duplicate green bits (extend 6 to 8) \n"
+- " vmull.u8 q1, d2, d18 @ apply inverse mask to background red... \n"
+- " vmull.u8 q2, d4, d18 @ ...green... \n"
+- " vmull.u8 q3, d6, d18 @ ...blue \n"
+- " subs %[count], %[count], #1 @ decrement/test loop counter \n"
+- " vmlal.u8 q1, d17, d22 @ add masked foreground red... \n"
+- " vmlal.u8 q2, d17, d21 @ ...green... \n"
+- " vmlal.u8 q3, d17, d20 @ ...blue \n"
+- " add %[in_mask], %[in_mask], %[mask_stride] @ advance mask pointer, while we wait \n"
+- " vsri.16 q1, q2, #5 @ pack green behind red \n"
+- " vsri.16 q1, q3, #11 @ pack blue into pixels \n"
+- " vst1.16 {d2, d3}, [%[dest]] @ store composited pixels \n"
+- " add %[dest], %[dest], %[dest_stride] @ advance framebuffer pointer \n"
+- " bne 0b @ next please \n"
+-
+- /* Clobbered registers marked as input/outputs */
+- : [dest] "+r" (dest), [in_mask] "+r" (in_mask), [count] "+r" (count)
+-
+- /* Inputs */
+- : [dest_stride] "r" (dest_stride), [mask_stride] "r" (mask_stride), [glyph_colour] "r" (&glyph_colour)
+-
+- /* Clobbers, including the inputs we modify, and potentially lots of memory */
+- : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d17", "d18", "d19",
+- "d20", "d21", "d22", "d23", "d24", "d25", "cc", "memory"
+- );
+-
+-#else
+-
+- uint8x8x4_t solid_colour = vld4_dup_u8 ((uint8_t*) &glyph_colour);
+-
+- while (count--)
+- {
+- uint16x8_t pixels = vld1q_u16 (dest);
+- uint8x8_t mask = vshrn_n_u16 (vmull_u8 (solid_colour.val[3], vld1_u8 (in_mask)), 8);
+- uint8x8_t mask_image = vmvn_u8 (mask);
+-
+- uint8x8_t t_red = vshrn_n_u16 (pixels, 8);
+- uint8x8_t t_green = vshrn_n_u16 (pixels, 3);
+- uint8x8_t t_blue = vshrn_n_u16 (vsli_n_u8 (pixels, pixels, 5), 2);
+-
+- uint16x8_t s_red = vmull_u8 (vsri_n_u8 (t_red, t_red, 5), mask_image);
+- uint16x8_t s_green = vmull_u8 (vsri_n_u8 (t_green, t_green, 6), mask_image);
+- uint16x8_t s_blue = vmull_u8 (t_blue, mask_image);
+-
+- s_red = vmlal (s_red, mask, solid_colour.val[2]);
+- s_green = vmlal (s_green, mask, solid_colour.val[1]);
+- s_blue = vmlal (s_blue, mask, solid_colour.val[0]);
+-
+- pixels = vsri_n_u16 (s_red, s_green, 5);
+- pixels = vsri_n_u16 (pixels, s_blue, 11);
+- vst1q_u16 (dest, pixels);
+-
+- dest += dest_stride;
+- mask += mask_stride;
+- }
+-
+-#endif
+-}
+-
+-#if 0 /* this is broken currently */
+-static void
+-neon_composite_over_n_8_0565 (pixman_implementation_t * impl,
+- pixman_op_t op,
+- pixman_image_t * src_image,
+- pixman_image_t * mask_image,
+- pixman_image_t * dst_image,
+- int32_t src_x,
+- int32_t src_y,
+- int32_t mask_x,
+- int32_t mask_y,
+- int32_t dest_x,
+- int32_t dest_y,
+- int32_t width,
+- int32_t height)
+-{
+- uint32_t src, srca;
+- uint16_t *dst_line, *aligned_line;
+- uint8_t *mask_line;
+- uint32_t dst_stride, mask_stride;
+- uint32_t kernel_count, copy_count, copy_tail;
+- uint8_t kernel_offset, copy_offset;
+-
+- src = _pixman_image_get_solid (src_image, dst_image->bits.format);
+-
+- /* bail out if fully transparent or degenerate */
+- srca = src >> 24;
+- if (src == 0)
+- return;
+-
+- if (width == 0 || height == 0)
+- return;
+-
+- if (width > NEON_SCANLINE_BUFFER_PIXELS)
+- {
+- /* split the blit, so we can use a fixed-size scanline buffer
+- * TODO: there must be a more elegant way of doing this.
+- */
+- int x;
+- for (x = 0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS)
+- {
+- neon_composite_over_n_8_0565 (
+- impl, op,
+- src_image, mask_image, dst_image,
+- src_x + x, src_y, mask_x + x, mask_y, dest_x + x, dest_y,
+- (x + NEON_SCANLINE_BUFFER_PIXELS > width) ? width - x : NEON_SCANLINE_BUFFER_PIXELS, height);
+- }
+-
+- return;
+- }
+-
+- PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
+- PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
+-
+- /* keep within minimum number of aligned quadwords on width
+- * while also keeping the minimum number of columns to process
+- */
+- {
+- unsigned long aligned_left = (unsigned long)(dst_line) & ~0xF;
+- unsigned long aligned_right = (((unsigned long)(dst_line + width)) + 0xF) & ~0xF;
+- unsigned long ceiling_length = (((unsigned long) width) * sizeof(*dst_line) + 0xF) & ~0xF;
+-
+- /* the fast copy should be quadword aligned */
+- copy_offset = dst_line - ((uint16_t*) aligned_left);
+- aligned_line = dst_line - copy_offset;
+- copy_count = (uint32_t) ((aligned_right - aligned_left) >> 4);
+- copy_tail = 0;
+-
+- if (aligned_right - aligned_left > ceiling_length)
+- {
+- /* unaligned routine is tightest */
+- kernel_count = (uint32_t) (ceiling_length >> 4);
+- kernel_offset = copy_offset;
+- }
+- else
+- {
+- /* aligned routine is equally tight, so it is safer to align */
+- kernel_count = copy_count;
+- kernel_offset = 0;
+- }
+-
+- /* We should avoid reading beyond scanline ends for safety */
+- if (aligned_line < (dst_line - dest_x) ||
+- (aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
+- {
+- /* switch to precise read */
+- copy_offset = kernel_offset = 0;
+- aligned_line = dst_line;
+- kernel_count = (uint32_t) (ceiling_length >> 4);
+- copy_count = (width * sizeof(*dst_line)) >> 4;
+- copy_tail = (width * sizeof(*dst_line)) & 0xF;
+- }
+- }
+-
+- {
+- uint16_t scan_line[NEON_SCANLINE_BUFFER_PIXELS + 8]; /* deliberately not initialised */
+- uint8_t glyph_line[NEON_SCANLINE_BUFFER_PIXELS + 8];
+- int y = height;
+-
+- /* row-major order */
+- /* left edge, middle block, right edge */
+- for ( ; y--; mask_line += mask_stride, aligned_line += dst_stride, dst_line += dst_stride)
+- {
+- /* We don't want to overrun the edges of the glyph,
+- * so realign the edge data into known buffers
+- */
+- neon_quadword_copy (glyph_line + copy_offset, mask_line, width >> 4, width & 0xF);
+-
+- /* Uncached framebuffer access is really, really slow
+- * if we do it piecemeal. It should be much faster if we
+- * grab it all at once. One scanline should easily fit in
+- * L1 cache, so this should not waste RAM bandwidth.
+- */
+- neon_quadword_copy (scan_line, aligned_line, copy_count, copy_tail);
+-
+- /* Apply the actual filter */
+- solid_over_565_8_pix_neon (
+- src, scan_line + kernel_offset,
+- glyph_line + kernel_offset, 8 * sizeof(*dst_line),
+- 8, kernel_count);
+-
+- /* Copy the modified scanline back */
+- neon_quadword_copy (dst_line, scan_line + copy_offset,
+- width >> 3, (width & 7) * 2);
+- }
+- }
+-}
+-#endif
+-
+-#ifdef USE_GCC_INLINE_ASM
+-
+-static inline void
+-plain_over_565_8_pix_neon (uint32_t colour,
+- uint16_t *dest,
+- uint32_t dest_stride, /* bytes, not elements */
+- uint32_t count /* 8-pixel groups */)
+-{
+- /* Inner loop for plain translucent rects
+- * (solid colour without alpha mask)
+- */
+- asm volatile (
+- " vld4.8 {d20[], d21[], d22[], d23[]}, [%[colour]] @ solid colour load/splat \n"
+- " vmull.u8 q12, d23, d22 @ premultiply alpha red \n"
+- " vmull.u8 q13, d23, d21 @ premultiply alpha green \n"
+- " vmull.u8 q14, d23, d20 @ premultiply alpha blue \n"
+- " vmvn d18, d23 @ inverse alpha for background \n"
+- "0: @ loop\n"
+- " vld1.16 {d0, d1}, [%[dest]] @ load first pixels from framebuffer \n"
+- " vshrn.u16 d2, q0, #8 @ unpack red from framebuffer pixels \n"
+- " vshrn.u16 d4, q0, #3 @ unpack green \n"
+- " vsli.u16 q3, q0, #5 @ duplicate framebuffer blue bits \n"
+- " vsri.u8 d2, d2, #5 @ duplicate red bits (extend 5 to 8) \n"
+- " vsri.u8 d4, d4, #6 @ duplicate green bits (extend 6 to 8) \n"
+- " vshrn.u16 d6, q3, #2 @ unpack extended blue (truncate 10 to 8) \n"
+- " vmov q0, q12 @ retrieve foreground red \n"
+- " vmlal.u8 q0, d2, d18 @ blend red - my kingdom for a four-operand MLA \n"
+- " vmov q1, q13 @ retrieve foreground green \n"
+- " vmlal.u8 q1, d4, d18 @ blend green \n"
+- " vmov q2, q14 @ retrieve foreground blue \n"
+- " vmlal.u8 q2, d6, d18 @ blend blue \n"
+- " subs %[count], %[count], #1 @ decrement/test loop counter \n"
+- " vsri.16 q0, q1, #5 @ pack green behind red \n"
+- " vsri.16 q0, q2, #11 @ pack blue into pixels \n"
+- " vst1.16 {d0, d1}, [%[dest]] @ store composited pixels \n"
+- " add %[dest], %[dest], %[dest_stride] @ advance framebuffer pointer \n"
+- " bne 0b @ next please \n"
+-
+- /* Clobbered registers marked as input/outputs */
+- : [dest] "+r" (dest), [count] "+r" (count)
+-
+- /* Inputs */
+- : [dest_stride] "r" (dest_stride), [colour] "r" (&colour)
+-
+- /* Clobbers, including the inputs we modify, and
+- * potentially lots of memory
+- */
+- : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d18", "d19",
+- "d20", "d21", "d22", "d23", "d24", "d25", "d26", "d27", "d28", "d29",
+- "cc", "memory"
+- );
+-}
+-
+-static void
+-neon_composite_over_n_0565 (pixman_implementation_t * impl,
+- pixman_op_t op,
+- pixman_image_t * src_image,
+- pixman_image_t * mask_image,
+- pixman_image_t * dst_image,
+- int32_t src_x,
+- int32_t src_y,
+- int32_t mask_x,
+- int32_t mask_y,
+- int32_t dest_x,
+- int32_t dest_y,
+- int32_t width,
+- int32_t height)
+-{
+- uint32_t src, srca;
+- uint16_t *dst_line, *aligned_line;
+- uint32_t dst_stride;
+- uint32_t kernel_count, copy_count, copy_tail;
+- uint8_t kernel_offset, copy_offset;
+-
+- src = _pixman_image_get_solid (src_image, dst_image->bits.format);
+-
+- /* bail out if fully transparent */
+- srca = src >> 24;
+- if (src == 0)
+- return;
+-
+- if (width == 0 || height == 0)
+- return;
+-
+- if (width > NEON_SCANLINE_BUFFER_PIXELS)
+- {
+- /* split the blit, so we can use a fixed-size scanline buffer *
+- * TODO: there must be a more elegant way of doing this.
+- */
+- int x;
+-
+- for (x = 0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS)
+- {
+- neon_composite_over_n_0565 (
+- impl, op,
+- src_image, mask_image, dst_image,
+- src_x + x, src_y, mask_x + x, mask_y, dest_x + x, dest_y,
+- (x + NEON_SCANLINE_BUFFER_PIXELS > width) ? width - x : NEON_SCANLINE_BUFFER_PIXELS, height);
+- }
+- return;
+- }
+-
+- PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
+-
+- /* keep within minimum number of aligned quadwords on width
+- * while also keeping the minimum number of columns to process
+- */
+- {
+- unsigned long aligned_left = (unsigned long)(dst_line) & ~0xF;
+- unsigned long aligned_right = (((unsigned long)(dst_line + width)) + 0xF) & ~0xF;
+- unsigned long ceiling_length = (((unsigned long) width) * sizeof(*dst_line) + 0xF) & ~0xF;
+-
+- /* the fast copy should be quadword aligned */
+- copy_offset = dst_line - ((uint16_t*) aligned_left);
+- aligned_line = dst_line - copy_offset;
+- copy_count = (uint32_t) ((aligned_right - aligned_left) >> 4);
+- copy_tail = 0;
+-
+- if (aligned_right - aligned_left > ceiling_length)
+- {
+- /* unaligned routine is tightest */
+- kernel_count = (uint32_t) (ceiling_length >> 4);
+- kernel_offset = copy_offset;
+- }
+- else
+- {
+- /* aligned routine is equally tight, so it is safer to align */
+- kernel_count = copy_count;
+- kernel_offset = 0;
+- }
+-
+- /* We should avoid reading beyond scanline ends for safety */
+- if (aligned_line < (dst_line - dest_x) ||
+- (aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
+- {
+- /* switch to precise read */
+- copy_offset = kernel_offset = 0;
+- aligned_line = dst_line;
+- kernel_count = (uint32_t) (ceiling_length >> 4);
+- copy_count = (width * sizeof(*dst_line)) >> 4;
+- copy_tail = (width * sizeof(*dst_line)) & 0xF;
+- }
+- }
+-
+- {
+- uint16_t scan_line[NEON_SCANLINE_BUFFER_PIXELS + 8]; /* deliberately not initialised */
+-
+- /* row-major order */
+- /* left edge, middle block, right edge */
+- for ( ; height--; aligned_line += dst_stride, dst_line += dst_stride)
+- {
+- /* Uncached framebuffer access is really, really slow if we do it piecemeal.
+- * It should be much faster if we grab it all at once.
+- * One scanline should easily fit in L1 cache, so this should
+- * not waste RAM bandwidth.
+- */
+- neon_quadword_copy (scan_line, aligned_line, copy_count, copy_tail);
+-
+- /* Apply the actual filter */
+- plain_over_565_8_pix_neon (
+- src, scan_line + kernel_offset, 8 * sizeof(*dst_line), kernel_count);
+-
+- /* Copy the modified scanline back */
+- neon_quadword_copy (
+- dst_line, scan_line + copy_offset, width >> 3, (width & 7) * 2);
+- }
+- }
+-}
+-
+-static inline void
+-ARGB8_over_565_8_pix_neon (uint32_t *src,
+- uint16_t *dest,
+- uint32_t src_stride, /* bytes, not elements */
+- uint32_t count /* 8-pixel groups */)
+-{
+- asm volatile (
+- "0: @ loop\n"
+- " pld [%[src], %[src_stride]] @ preload from next scanline \n"
+- " vld1.16 {d0, d1}, [%[dest]] @ load pixels from framebuffer \n"
+- " vld4.8 {d20, d21, d22, d23},[%[src]]! @ load source image pixels \n"
+- " vsli.u16 q3, q0, #5 @ duplicate framebuffer blue bits \n"
+- " vshrn.u16 d2, q0, #8 @ unpack red from framebuffer pixels \n"
+- " vshrn.u16 d4, q0, #3 @ unpack green \n"
+- " vmvn d18, d23 @ we need the inverse alpha for the background \n"
+- " vsri.u8 d2, d2, #5 @ duplicate red bits (extend 5 to 8) \n"
+- " vshrn.u16 d6, q3, #2 @ unpack extended blue (truncate 10 to 8) \n"
+- " vsri.u8 d4, d4, #6 @ duplicate green bits (extend 6 to 8) \n"
+- " vmull.u8 q1, d2, d18 @ apply inverse alpha to background red... \n"
+- " vmull.u8 q2, d4, d18 @ ...green... \n"
+- " vmull.u8 q3, d6, d18 @ ...blue \n"
+- " subs %[count], %[count], #1 @ decrement/test loop counter \n"
+- " vmlal.u8 q1, d23, d22 @ add blended foreground red... \n"
+- " vmlal.u8 q2, d23, d21 @ ...green... \n"
+- " vmlal.u8 q3, d23, d20 @ ...blue \n"
+- " vsri.16 q1, q2, #5 @ pack green behind red \n"
+- " vsri.16 q1, q3, #11 @ pack blue into pixels \n"
+- " vst1.16 {d2, d3}, [%[dest]]! @ store composited pixels \n"
+- " bne 0b @ next please \n"
+-
+- /* Clobbered registers marked as input/outputs */
+- : [dest] "+r" (dest), [src] "+r" (src), [count] "+r" (count)
+-
+- /* Inputs */
+- : [src_stride] "r" (src_stride)
+-
+- /* Clobbers, including the inputs we modify, and potentially lots of memory */
+- : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d17", "d18", "d20",
+- "d21", "d22", "d23", "cc", "memory"
+- );
+-}
+-
+-static void
+-neon_composite_over_8888_0565 (pixman_implementation_t * impl,
+- pixman_op_t op,
+- pixman_image_t * src_image,
+- pixman_image_t * mask_image,
+- pixman_image_t * dst_image,
+- int32_t src_x,
+- int32_t src_y,
+- int32_t mask_x,
+- int32_t mask_y,
+- int32_t dest_x,
+- int32_t dest_y,
+- int32_t width,
+- int32_t height)
+-{
+- uint32_t *src_line;
+- uint16_t *dst_line, *aligned_line;
+- uint32_t dst_stride, src_stride;
+- uint32_t kernel_count, copy_count, copy_tail;
+- uint8_t kernel_offset, copy_offset;
+-
+- /* we assume mask is opaque
+- * so the only alpha to deal with is embedded in src
+- */
+- if (width > NEON_SCANLINE_BUFFER_PIXELS)
+- {
+- /* split the blit, so we can use a fixed-size scanline buffer */
+- int x;
+- for (x = 0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS)
+- {
+- neon_composite_over_8888_0565 (
+- impl, op,
+- src_image, mask_image, dst_image,
+- src_x + x, src_y, mask_x + x, mask_y, dest_x + x, dest_y,
+- (x + NEON_SCANLINE_BUFFER_PIXELS > width) ? width - x : NEON_SCANLINE_BUFFER_PIXELS, height);
+- }
+- return;
+- }
+-
+- PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
+- PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+-
+- /* keep within minimum number of aligned quadwords on width
+- * while also keeping the minimum number of columns to process
+- */
+- {
+- unsigned long aligned_left = (unsigned long)(dst_line) & ~0xF;
+- unsigned long aligned_right = (((unsigned long)(dst_line + width)) + 0xF) & ~0xF;
+- unsigned long ceiling_length = (((unsigned long) width) * sizeof(*dst_line) + 0xF) & ~0xF;
+-
+- /* the fast copy should be quadword aligned */
+- copy_offset = dst_line - ((uint16_t*) aligned_left);
+- aligned_line = dst_line - copy_offset;
+- copy_count = (uint32_t) ((aligned_right - aligned_left) >> 4);
+- copy_tail = 0;
+-
+- if (aligned_right - aligned_left > ceiling_length)
+- {
+- /* unaligned routine is tightest */
+- kernel_count = (uint32_t) (ceiling_length >> 4);
+- kernel_offset = copy_offset;
+- }
+- else
+- {
+- /* aligned routine is equally tight, so it is safer to align */
+- kernel_count = copy_count;
+- kernel_offset = 0;
+- }
+-
+- /* We should avoid reading beyond scanline ends for safety */
+- if (aligned_line < (dst_line - dest_x) ||
+- (aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
+- {
+- /* switch to precise read */
+- copy_offset = kernel_offset = 0;
+- aligned_line = dst_line;
+- kernel_count = (uint32_t) (ceiling_length >> 4);
+- copy_count = (width * sizeof(*dst_line)) >> 4;
+- copy_tail = (width * sizeof(*dst_line)) & 0xF;
+- }
+- }
+-
+- /* Preload the first input scanline */
+- {
+- uint8_t *src_ptr = (uint8_t*) src_line;
+- uint32_t count = (width + 15) / 16;
+-
+-#ifdef USE_GCC_INLINE_ASM
+- asm volatile (
+- "0: @ loop \n"
+- " subs %[count], %[count], #1 \n"
+- " pld [%[src]] \n"
+- " add %[src], %[src], #64 \n"
+- " bgt 0b \n"
+-
+- /* Clobbered input registers marked as input/outputs */
+- : [src] "+r" (src_ptr), [count] "+r" (count)
+- : /* no unclobbered inputs */
+- : "cc"
+- );
+-#else
+- do
+- {
+- __pld (src_ptr);
+- src_ptr += 64;
+- }
+- while (--count);
+-#endif
+- }
+-
+- {
+- uint16_t scan_line[NEON_SCANLINE_BUFFER_PIXELS + 8]; /* deliberately not initialised */
+-
+- /* row-major order */
+- /* left edge, middle block, right edge */
+- for ( ; height--; src_line += src_stride, aligned_line += dst_stride)
+- {
+- /* Uncached framebuffer access is really, really slow if we do
+- * it piecemeal. It should be much faster if we grab it all at
+- * once. One scanline should easily fit in L1 cache, so this
+- * should not waste RAM bandwidth.
+- */
+- neon_quadword_copy (scan_line, aligned_line, copy_count, copy_tail);
+-
+- /* Apply the actual filter */
+- ARGB8_over_565_8_pix_neon (
+- src_line, scan_line + kernel_offset,
+- src_stride * sizeof(*src_line), kernel_count);
+-
+- /* Copy the modified scanline back */
+- neon_quadword_copy (dst_line,
+- scan_line + copy_offset,
+- width >> 3, (width & 7) * 2);
+- }
+- }
+-}
+-
+-#endif /* USE_GCC_INLINE_ASM */
+-
+ static const pixman_fast_path_t arm_neon_fast_path_array[] =
+ {
+ { PIXMAN_OP_ADD, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, neon_composite_add_8888_8_8, 0 },
+@@ -2612,12 +1908,6 @@ static const pixman_fast_path_t arm_neon_fast_path_array[] =
+ #ifdef USE_GCC_INLINE_ASM
+ { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_src_16_16, 0 },
+ { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_src_16_16, 0 },
+-#if 0 /* this code has some bugs */
+- { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_over_n_0565, 0 },
+- { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_over_n_0565, 0 },
+- { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_over_8888_0565, 0 },
+- { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_over_8888_0565, 0 },
+-#endif
+ #endif
+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, neon_composite_over_8888_8888, 0 },
+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, neon_composite_over_8888_8888, 0 },
+@@ -2668,79 +1958,6 @@ arm_neon_composite (pixman_implementation_t *imp,
+ }
+
+ static pixman_bool_t
+-pixman_blt_neon (void *src_bits,
+- void *dst_bits,
+- int src_stride,
+- int dst_stride,
+- int src_bpp,
+- int dst_bpp,
+- int src_x,
+- int src_y,
+- int dst_x,
+- int dst_y,
+- int width,
+- int height)
+-{
+- if (!width || !height)
+- return TRUE;
+-
+- /* accelerate only straight copies involving complete bytes */
+- if (src_bpp != dst_bpp || (src_bpp & 7))
+- return FALSE;
+-
+- {
+- uint32_t bytes_per_pixel = src_bpp >> 3;
+- uint32_t byte_width = width * bytes_per_pixel;
+- /* parameter is in words for some reason */
+- int32_t src_stride_bytes = src_stride * 4;
+- int32_t dst_stride_bytes = dst_stride * 4;
+- uint8_t *src_bytes = ((uint8_t*) src_bits) +
+- src_y * src_stride_bytes + src_x * bytes_per_pixel;
+- uint8_t *dst_bytes = ((uint8_t*) dst_bits) +
+- dst_y * dst_stride_bytes + dst_x * bytes_per_pixel;
+- uint32_t quadword_count = byte_width / 16;
+- uint32_t offset = byte_width % 16;
+-
+- while (height--)
+- {
+- neon_quadword_copy (dst_bytes, src_bytes, quadword_count, offset);
+- src_bytes += src_stride_bytes;
+- dst_bytes += dst_stride_bytes;
+- }
+- }
+-
+- return TRUE;
+-}
+-
+-static pixman_bool_t
+-arm_neon_blt (pixman_implementation_t *imp,
+- uint32_t * src_bits,
+- uint32_t * dst_bits,
+- int src_stride,
+- int dst_stride,
+- int src_bpp,
+- int dst_bpp,
+- int src_x,
+- int src_y,
+- int dst_x,
+- int dst_y,
+- int width,
+- int height)
+-{
+- if (pixman_blt_neon (
+- src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
+- src_x, src_y, dst_x, dst_y, width, height))
+- {
+- return TRUE;
+- }
+-
+- return _pixman_implementation_blt (
+- imp->delegate,
+- src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
+- src_x, src_y, dst_x, dst_y, width, height);
+-}
+-
+-static pixman_bool_t
+ arm_neon_fill (pixman_implementation_t *imp,
+ uint32_t * bits,
+ int stride,
+@@ -2765,9 +1982,6 @@ _pixman_implementation_create_arm_neon (void)
+ pixman_implementation_t *imp = _pixman_implementation_create (simd);
+
+ imp->composite = arm_neon_composite;
+-#if 0 /* this code has some bugs */
+- imp->blt = arm_neon_blt;
+-#endif
+ imp->fill = arm_neon_fill;
+
+ return imp;
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/src-8888-0565.patch b/recipes/obsolete/xorg/xorg-lib/pixman/src-8888-0565.patch
new file mode 100644
index 0000000..c544225
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/src-8888-0565.patch
@@ -0,0 +1,324 @@
+From 6494f9ae8820078d0e6109bf8f294156f7a5da4c Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 05 Mar 2010 00:40:34 +0000
+Subject: ARM: added 'armv6_composite_src_8888_0565' fast path
+
+Provides ~3x performance improvement when working with
+data in L1 cache, and ~80% performace improvement when working
+with memory. This fast path is important for 32bpp -> 16bpp
+color format conversion and is commonly used with 16bpp desktop.
+
+Microbenchmark from N800 (ARM11 @ 400MHz), measured in MPix/s:
+
+before:
+
+ src_8888_0565 = L1: 21.54 M: 15.62
+
+after (armv4):
+
+ src_8888_0565 = L1: 45.26 M: 23.29
+
+after (armv6):
+
+ src_8888_0565 = L1: 60.62 M: 28.37
+---
+diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
+index c375c01..69243c1 100644
+--- a/pixman/pixman-arm-simd.c
++++ b/pixman/pixman-arm-simd.c
+@@ -604,6 +604,282 @@ armv6_composite_over_n_8_0565 (pixman_implementation_t * impl,
+ dst_stride - width, mask_stride - width, height);
+ }
+
++static inline void
++armv4_composite_src_8888_0565_asm (
++ uint16_t *dst, uint32_t *src, int w, int dst_stride,
++ int src_stride, int h)
++{
++ uint32_t a, x, y, c1F001F = 0x1F001F, cFFFF = 0xFFFF;
++ int backup_w = w;
++ while (h--)
++ {
++ w = backup_w;
++ if (w > 0 && (uintptr_t)dst & 2)
++ {
++ x = *src++;
++
++ a = (x >> 3) & c1F001F;
++ x &= 0xFC00;
++ a |= a >> 5;
++ a |= x >> 5;
++
++ *dst++ = a;
++ w--;
++ }
++
++ asm volatile(
++ "subs %[w], %[w], #2\n"
++ "blt 2f\n"
++ "1:\n"
++ "ldr %[x], [%[src]], #4\n"
++ "ldr %[y], [%[src]], #4\n"
++ "subs %[w], %[w], #2\n"
++
++ "and %[a], %[c1F001F], %[x], lsr #3\n"
++ "and %[x], %[x], #0xFC00\n\n"
++ "orr %[a], %[a], %[a], lsr #5\n"
++ "orr %[x], %[a], %[x], lsr #5\n"
++
++ "and %[a], %[c1F001F], %[y], lsr #3\n"
++ "and %[y], %[y], #0xFC00\n\n"
++ "orr %[a], %[a], %[a], lsr #5\n"
++ "orr %[y], %[a], %[y], lsr #5\n"
++ /*
++ * Writing single 32-bit value is much faster than two
++ * separate 16-bit values for older CPUs without (efficient)
++ * write combining, even though it costs an extra instruction.
++ */
++ "and %[x], %[x], %[cFFFF]\n"
++ "orr %[x], %[x], %[y], lsl #16\n"
++ "str %[x], [%[dst]], #4\n"
++ "bge 1b\n"
++ "2:\n"
++ : [c1F001F] "+&r" (c1F001F), [cFFFF] "+&r" (cFFFF),
++ [src] "+&r" (src), [dst] "+&r" (dst), [a] "=&r" (a),
++ [x] "=&r" (x), [y] "=&r" (y), [w] "+&r" (w)
++ );
++
++ if (w & 1)
++ {
++ x = *src++;
++
++ a = (x >> 3) & c1F001F;
++ x = x & 0xFC00;
++ a |= a >> 5;
++ a |= x >> 5;
++
++ *dst++ = a;
++ }
++
++ src += src_stride - backup_w;
++ dst += dst_stride - backup_w;
++ }
++}
++
++/*
++ * Conversion x8r8g8b8 -> r5g6b5
++ *
++ * Note: 'w' must be >= 7 here
++ */
++static void __attribute__((naked))
++armv6_composite_src_8888_0565_asm (
++ uint16_t *dst, uint32_t *src, int w, int dst_stride,
++ int src_stride, int h)
++{
++ asm volatile(
++ /* define supplementary macros */
++ ".macro cvt8888to565 PIX\n"
++ "and A, C1F001F, \\PIX, lsr #3\n"
++ "and \\PIX, \\PIX, #0xFC00\n\n"
++ "orr A, A, A, lsr #5\n"
++ "orr \\PIX, A, \\PIX, lsr #5\n"
++ ".endm\n"
++
++ ".macro combine_pixels_pair PIX1, PIX2\n"
++ /* Note: assume little endian byte order */
++ "pkhbt \\PIX1, \\PIX1, \\PIX2, lsl #16\n"
++ ".endm\n"
++
++ /* function entry, save all registers (10 words) to stack */
++ "stmdb sp!, {r4-r11, ip, lr}\n"
++
++ /* define some aliases */
++ "DST .req r0\n"
++ "SRC .req r1\n"
++ "W .req r2\n"
++ "H .req r3\n"
++
++ "TMP1 .req r4\n"
++ "TMP2 .req r5\n"
++ "TMP3 .req r6\n"
++ "TMP4 .req r7\n"
++ "TMP5 .req r8\n"
++ "TMP6 .req r9\n"
++ "TMP7 .req r10\n"
++ "TMP8 .req r11\n"
++
++ "C1F001F .req ip\n"
++ "A .req lr\n"
++
++ "ldr TMP1, [sp, #(10*4+0)]\n" /* load src_stride */
++ "ldr C1F001F, =0x1F001F\n"
++ "sub r3, r3, W\n"
++ "str r3, [sp, #(10*4+0)]\n" /* store (dst_stride-w) */
++ "ldr r3, [sp, #(10*4+4)]\n" /* load h */
++ "sub TMP1, TMP1, W\n"
++ "str TMP1, [sp, #(10*4+4)]\n" /* store (src_stride-w) */
++
++ "str W, [sp, #(8*4)]\n" /* saved ip = W */
++
++ "0:\n"
++ "subs H, H, #1\n"
++ "blt 6f\n"
++ "1:\n"
++ /* align DST at 4 byte boundary */
++ "tst DST, #2\n"
++ "beq 2f\n"
++ "ldr TMP1, [SRC], #4\n"
++ "sub W, W, #1\n"
++ "cvt8888to565 TMP1\n"
++ "strh TMP1, [DST], #2\n"
++ "2:"
++ /* align DST at 8 byte boundary */
++ "tst DST, #4\n"
++ "beq 2f\n"
++ "ldmia SRC!, {TMP1, TMP2}\n"
++ "sub W, W, #2\n"
++ "cvt8888to565 TMP1\n"
++ "cvt8888to565 TMP2\n"
++ "combine_pixels_pair TMP1, TMP2\n"
++ "str TMP1, [DST], #4\n"
++ "2:"
++ /* align DST at 16 byte boundary */
++ "tst DST, #8\n"
++ "beq 2f\n"
++ "ldmia SRC!, {TMP1, TMP2, TMP3, TMP4}\n"
++ "sub W, W, #4\n"
++ "cvt8888to565 TMP1\n"
++ "cvt8888to565 TMP2\n"
++ "cvt8888to565 TMP3\n"
++ "cvt8888to565 TMP4\n"
++ "combine_pixels_pair TMP1, TMP2\n"
++ "combine_pixels_pair TMP3, TMP4\n"
++ "stmia DST!, {TMP1, TMP3}\n"
++ "2:"
++ /* inner loop, process 8 pixels per iteration */
++ "subs W, W, #8\n"
++ "blt 4f\n"
++ "3:\n"
++ "ldmia SRC!, {TMP1, TMP2, TMP3, TMP4, TMP5, TMP6, TMP7, TMP8}\n"
++ "subs W, W, #8\n"
++ "cvt8888to565 TMP1\n"
++ "cvt8888to565 TMP2\n"
++ "cvt8888to565 TMP3\n"
++ "cvt8888to565 TMP4\n"
++ "cvt8888to565 TMP5\n"
++ "cvt8888to565 TMP6\n"
++ "cvt8888to565 TMP7\n"
++ "cvt8888to565 TMP8\n"
++ "combine_pixels_pair TMP1, TMP2\n"
++ "combine_pixels_pair TMP3, TMP4\n"
++ "combine_pixels_pair TMP5, TMP6\n"
++ "combine_pixels_pair TMP7, TMP8\n"
++ "stmia DST!, {TMP1, TMP3, TMP5, TMP7}\n"
++ "bge 3b\n"
++ "4:\n"
++
++ /* process the remaining pixels */
++ "tst W, #4\n"
++ "beq 4f\n"
++ "ldmia SRC!, {TMP1, TMP2, TMP3, TMP4}\n"
++ "cvt8888to565 TMP1\n"
++ "cvt8888to565 TMP2\n"
++ "cvt8888to565 TMP3\n"
++ "cvt8888to565 TMP4\n"
++ "combine_pixels_pair TMP1, TMP2\n"
++ "combine_pixels_pair TMP3, TMP4\n"
++ "stmia DST!, {TMP1, TMP3}\n"
++ "4:\n"
++ "tst W, #2\n"
++ "beq 4f\n"
++ "ldmia SRC!, {TMP1, TMP2}\n"
++ "cvt8888to565 TMP1\n"
++ "cvt8888to565 TMP2\n"
++ "combine_pixels_pair TMP1, TMP2\n"
++ "str TMP1, [DST], #4\n"
++ "4:\n"
++ "tst W, #1\n"
++ "beq 4f\n"
++ "ldr TMP1, [SRC], #4\n"
++ "cvt8888to565 TMP1\n"
++ "strh TMP1, [DST], #2\n"
++ "4:\n"
++ "ldr TMP1, [sp, #(10*4+0)]\n" /* (dst_stride-w) */
++ "ldr TMP2, [sp, #(10*4+4)]\n" /* (src_stride-w) */
++ "ldr W, [sp, #(8*4)]\n"
++ "subs H, H, #1\n"
++ "add DST, DST, TMP1, lsl #1\n"
++ "add SRC, SRC, TMP2, lsl #2\n"
++ "bge 1b\n"
++ "6:\n"
++ /* restore all registers and return */
++ "ldmia sp!, {r4-r11, ip, pc}\n"
++ ".ltorg\n"
++
++ ".unreq DST\n"
++ ".unreq SRC\n"
++ ".unreq W\n"
++ ".unreq H\n"
++
++ ".unreq TMP1\n"
++ ".unreq TMP2\n"
++ ".unreq TMP3\n"
++ ".unreq TMP4\n"
++ ".unreq TMP5\n"
++ ".unreq TMP6\n"
++ ".unreq TMP7\n"
++ ".unreq TMP8\n"
++
++ ".unreq C1F001F\n"
++ ".unreq A\n"
++
++ ".purgem cvt8888to565\n"
++ ".purgem combine_pixels_pair\n"
++ );
++}
++
++static void
++armv6_composite_src_8888_0565 (pixman_implementation_t * impl,
++ pixman_op_t op,
++ pixman_image_t * src_image,
++ pixman_image_t * mask_image,
++ pixman_image_t * dst_image,
++ int32_t src_x,
++ int32_t src_y,
++ int32_t mask_x,
++ int32_t mask_y,
++ int32_t dest_x,
++ int32_t dest_y,
++ int32_t width,
++ int32_t height)
++{
++ uint32_t *src;
++ uint16_t *dst;
++ int src_stride, dst_stride;
++
++ PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t,
++ dst_stride, dst, 1);
++ PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t,
++ src_stride, src, 1);
++
++ if (width < 7)
++ armv4_composite_src_8888_0565_asm (dst, src, width,
++ dst_stride, src_stride, height);
++ else
++ armv6_composite_src_8888_0565_asm (dst, src, width,
++ dst_stride, src_stride, height);
++}
++
+ #endif
+
+ static const pixman_fast_path_t arm_simd_fast_paths[] =
+@@ -624,6 +900,10 @@ static const pixman_fast_path_t arm_simd_fast_paths[] =
+ #if defined(__ARM_EABI__) && defined(__linux__)
+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, r5g6b5, armv6_composite_over_n_8_0565),
+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, b5g6r5, armv6_composite_over_n_8_0565),
++ PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, r5g6b5, armv6_composite_src_8888_0565),
++ PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, r5g6b5, armv6_composite_src_8888_0565),
++ PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, b5g6r5, armv6_composite_src_8888_0565),
++ PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, b5g6r5, armv6_composite_src_8888_0565),
+ #endif
+ { PIXMAN_OP_NONE },
+ };
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/tls.patch b/recipes/obsolete/xorg/xorg-lib/pixman/tls.patch
new file mode 100644
index 0000000..316caed
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/tls.patch
@@ -0,0 +1,59 @@
+From 714559dccda3165a72f0a9935c1edc3aef535f30 Mon Sep 17 00:00:00 2001
+From: Søren Sandmann Pedersen <ssp@redhat.com>
+Date: Wed, 07 Apr 2010 05:44:12 +0000
+Subject: Fixes for pthread thread local storage.
+
+The tls_name_key variable is passed to tls_name_get(), and the first
+time this happens it isn't initialized. tls_name_get() then passes it
+on to tls_name_alloc() which passes it on to pthread_setspecific()
+leading to undefined behavior.
+
+None of this is actually necessary at all because there is only one
+such variable per thread local variable, so it doesn't need to passed
+as a parameter at all.
+
+All of this was pointed out by Tor Lillqvist on the cairo mailing
+list.
+---
+diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
+index cdac0d8..531c8c9 100644
+--- a/pixman/pixman-compiler.h
++++ b/pixman/pixman-compiler.h
+@@ -99,16 +99,16 @@
+ } \
+ \
+ static type * \
+- tls_ ## name ## _alloc (key) \
++ tls_ ## name ## _alloc (void) \
+ { \
+ type *value = calloc (1, sizeof (type)); \
+ if (value) \
+- pthread_setspecific (key, value); \
++ pthread_setspecific (tls_ ## name ## _key, value); \
+ return value; \
+ } \
+ \
+ static force_inline type * \
+- tls_ ## name ## _get (key) \
++ tls_ ## name ## _get (void) \
+ { \
+ type *value = NULL; \
+ if (pthread_once (&tls_ ## name ## _once_control, \
+@@ -116,13 +116,13 @@
+ { \
+ value = pthread_getspecific (tls_ ## name ## _key); \
+ if (!value) \
+- value = tls_ ## name ## _alloc (key); \
++ value = tls_ ## name ## _alloc (); \
+ } \
+ return value; \
+ }
+
+ # define PIXMAN_GET_THREAD_LOCAL(name) \
+- tls_ ## name ## _get (tls_ ## name ## _key)
++ tls_ ## name ## _get ()
+
+ #else
+
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.10.0.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.10.0.bb
new file mode 100644
index 0000000..8690818
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.10.0.bb
@@ -0,0 +1,5 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "41804ac38025102dcc9891dfd4a3d105"
+SRC_URI[archive.sha256sum] = "48625f6b5ce130672942503c683d306d957ee40f59f8e59be6ca30a245ad47d0"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.11.4.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.11.4.bb
new file mode 100644
index 0000000..b058104
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.11.4.bb
@@ -0,0 +1,7 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8c8afc259af61d42aa9b3d8ec5a9a03b"
+SRC_URI[archive.sha256sum] = "d034f4afb4329c38e8789a5a7a384194c7402094b4c2b7600d2d86d8589e8571"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.11.8.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.11.8.bb
new file mode 100644
index 0000000..d7c6717
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.11.8.bb
@@ -0,0 +1,9 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += " \
+ file://pixman-arm.patch \
+ file://pixman-x888-565.patch \
+ "
+SRC_URI[archive.md5sum] = "7b5db768c51337b5e5e954fc9c961cd3"
+SRC_URI[archive.sha256sum] = "720db5ef6ed0e744b9bac5360ade9a7c024f9fb3fab05c83a90ee28b08e66e01"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.15.18.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.15.18.bb
new file mode 100644
index 0000000..4811a01
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.15.18.bb
@@ -0,0 +1,7 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9b60fe7623621b546b76777b8b7d2490"
+SRC_URI[archive.sha256sum] = "3a5003cf6c7d5b03ed5977c108ee11410cfd7849eea370eb4feae98f2822c795"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.15.6.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.15.6.bb
new file mode 100644
index 0000000..a09de4e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.15.6.bb
@@ -0,0 +1,7 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fe922698df46b21d7e19f28ded4ca100"
+SRC_URI[archive.sha256sum] = "3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.17.12.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.17.12.bb
new file mode 100644
index 0000000..b476aaa
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.17.12.bb
@@ -0,0 +1,24 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += "\
+ file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+ file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+ file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+ file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+ file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
+ file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch \
+ file://over-n-8-0565.patch \
+ file://src-8888-0565.patch \
+"
+SRC_URI[archive.md5sum] = "331415d7a110145cf27aa00e11d0a683"
+SRC_URI[archive.sha256sum] = "8cce103af1b4200a13bedca5b763f74c9bc99a55985ab44ca92ba532dac6b57f"
+
+NEON = " --disable-arm-neon "
+NEON_armv7a = " "
+
+EXTRA_OECONF = "${NEON} --disable-gtk"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "2"
+DEFAULT_PREFERENCE_shr = "2"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.17.8.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.17.8.bb
new file mode 100644
index 0000000..55c70c8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.17.8.bb
@@ -0,0 +1,23 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += " \
+ file://0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+ file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+ file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+ file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+ file://1-composite.patch \
+ file://2-composite.patch \
+ file://3-composite.patch \
+ "
+SRC_URI[archive.md5sum] = "a7deb2ff6b286b676d67aa6ae91317ae"
+SRC_URI[archive.sha256sum] = "ea24e9003455a0881bd43bf7e4169f2b34c90c8521405103e3490553876a81b4"
+
+NEON = " --disable-arm-neon "
+NEON_armv7a = " "
+
+EXTRA_OECONF = "${NEON} --disable-gtk"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "2"
+DEFAULT_PREFERENCE_shr = "2"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.18.0.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.18.0.bb
new file mode 100644
index 0000000..c099b77
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.18.0.bb
@@ -0,0 +1,24 @@
+require pixman.inc
+PR = "${INC_PR}.3"
+
+SRC_URI += "\
+ file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+ file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+ file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+ file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+ file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
+ file://calloc.patch \
+ file://tls.patch \
+ file://565-scanline.patch \
+ file://missing-cache-preload.diff \
+"
+SRC_URI[archive.md5sum] = "a4fb870fc325be258089f1683642e976"
+SRC_URI[archive.sha256sum] = "b305291bba3d9271a4481e5eedf901025ac8ba4ec8f7b76ccafc5094610cd4ff"
+
+NEON = " --disable-arm-neon "
+NEON_armv7a = " "
+
+EXTRA_OECONF = "${NEON} --disable-gtk"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_shr = "2"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.9.4.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.9.4.bb
new file mode 100644
index 0000000..254bf61
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.9.4.bb
@@ -0,0 +1,7 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Library for lowlevel pixel operations"
+DEPENDS = "virtual/libx11"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c354ab5b0da10227226d3ef604254875"
+SRC_URI[archive.sha256sum] = "261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.9.5.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.9.5.bb
new file mode 100644
index 0000000..6259dea
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.9.5.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Library for lowlevel pixel operations"
+DEPENDS = "virtual/libx11"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://dont-copy-unused-bits-to-alpha-channel.patch"
+SRC_URI[archive.md5sum] = "f9fea77e46ec7a3a16e925e137f146e7"
+SRC_URI[archive.sha256sum] = "a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_git.bb b/recipes/obsolete/xorg/xorg-lib/pixman_git.bb
new file mode 100644
index 0000000..12140c1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_git.bb
@@ -0,0 +1,27 @@
+require pixman.inc
+PV = "0.17.13"
+PR = "${INC_PR}.2"
+PR_append = "+gitr${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/pixman;protocol=git;branch=master \
+ file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+ file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+ file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+ file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+ file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
+ file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch \
+ file://over-n-8-0565.patch \
+ file://src-8888-0565.patch \
+ file://calloc.patch \
+ file://tls.patch \
+"
+
+SRCREV = "69f1ec9a7827aeb522fcae99846237ef0f896e7b"
+S = "${WORKDIR}/git"
+
+NEON = " --disable-arm-neon "
+NEON_armv7a = " "
+
+EXTRA_OECONF = "${NEON} --disable-gtk"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans/fix-missing-includepath.patch b/recipes/obsolete/xorg/xorg-lib/xtrans/fix-missing-includepath.patch
new file mode 100644
index 0000000..043d14f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans/fix-missing-includepath.patch
@@ -0,0 +1,13 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- xtrans-X11R7.0-1.0.0/xtrans.pc.in~fix-missing-includepath 2005-07-02 20:00:50.000000000 +0200
++++ xtrans-X11R7.0-1.0.0/xtrans.pc.in 2006-08-11 19:27:58.000000000 +0200
+@@ -6,4 +6,4 @@
+ Name: XTrans
+ Description: Abstract network code for X
+ Version: @PACKAGE_VERSION@
+-Cflags: -I${includedir} -D_BSD_SOURCE @fchown_define@ @sticky_bit_define@
++Cflags: -I${includedir} -I${includedir}/X11/Xtrans -D_BSD_SOURCE @fchown_define@ @sticky_bit_define@
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/xtrans_1.0.3.bb
new file mode 100644
index 0000000..19a56fa
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans_1.0.3.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-missing-includepath.patch"
+SRC_URI[archive.md5sum] = "bb196907ea1e182dcb396eb22f7d2c1a"
+SRC_URI[archive.sha256sum] = "e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085"
+
+FILESPATHPKG .= ":xtrans-${PV}:xtrans"
+
+ALLOW_EMPTY = "1"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/xtrans_1.0.4.bb
new file mode 100644
index 0000000..d19a6c0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans_1.0.4.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-missing-includepath.patch"
+SRC_URI[archive.md5sum] = "8b36cdf08df12be96615e3d550236626"
+SRC_URI[archive.sha256sum] = "765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c"
+
+FILESPATHPKG .= ":xtrans-${PV}:xtrans"
+
+ALLOW_EMPTY = "1"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans_1.1.bb b/recipes/obsolete/xorg/xorg-lib/xtrans_1.1.bb
new file mode 100644
index 0000000..1f3fcb4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans_1.1.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-missing-includepath.patch"
+SRC_URI[archive.md5sum] = "8546e3a060aefb42c889eaa4b5db33af"
+SRC_URI[archive.sha256sum] = "16bc4646f105efd3d0dd105899ac19035d67acf50950ca8c70cf68772508272d"
+
+FILESPATHPKG .= ":xtrans-${PV}:xtrans"
+
+ALLOW_EMPTY = "1"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.1.bb b/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.1.bb
new file mode 100644
index 0000000..e695e35
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.1.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+RDEPENDS_${PN}-dev = ""
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "96e142331edd498a9364887b2548f1bb"
+SRC_URI[archive.sha256sum] = "9ff21a8d9ea524ca9b7cb6d6b4d522b4cb20b1c35edeb8995a9e9265a0df64bd"
+
+FILESPATHPKG .= ":xtrans-${PV}:xtrans"
+
+ALLOW_EMPTY = "1"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.3.bb b/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.3.bb
new file mode 100644
index 0000000..1f0ec39
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.3.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+RDEPENDS_${PN}-dev = ""
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f9cf791dfad59cf044e276aab3a71e1d"
+SRC_URI[archive.sha256sum] = "a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0"
+
+FILESPATHPKG .= ":xtrans-${PV}:xtrans"
+
+ALLOW_EMPTY = "1"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.bb b/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.bb
new file mode 100644
index 0000000..8a4ddca
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-missing-includepath.patch"
+SRC_URI[archive.md5sum] = "a91fef8b932b21992af7dfff7b2643f3"
+SRC_URI[archive.sha256sum] = "d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4"
+
+FILESPATHPKG .= ":xtrans-${PV}:xtrans"
+
+ALLOW_EMPTY = "1"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/xorg-lib/diet-x11_1.1.1.bb b/recipes/xorg-lib/diet-x11_1.1.1.bb
deleted file mode 100644
index 593ba34..0000000
--- a/recipes/xorg-lib/diet-x11_1.1.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require libx11_${PV}.bb
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://X18NCMSstubs.diff \
- file://fix-disable-xlocale.diff \
- file://fix-utf8-wrong-define.patch \
- file://xim.patch \
- file://xchar2b.patch"
-
-EXTRA_OECONF += "--without-xcb --disable-udc --enable-xcms --disable-xlocale --disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/diet-x11_1.1.2.bb b/recipes/xorg-lib/diet-x11_1.1.2.bb
deleted file mode 100644
index f6291a9..0000000
--- a/recipes/xorg-lib/diet-x11_1.1.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11_${PV}.bb
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://X18NCMSstubs.diff \
- file://fix-disable-xlocale.diff \
- file://fix-utf8-wrong-define.patch"
-
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/diet-x11_1.1.3.bb b/recipes/xorg-lib/diet-x11_1.1.3.bb
deleted file mode 100644
index f6291a9..0000000
--- a/recipes/xorg-lib/diet-x11_1.1.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11_${PV}.bb
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://X18NCMSstubs.diff \
- file://fix-disable-xlocale.diff \
- file://fix-utf8-wrong-define.patch"
-
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/diet-x11_1.1.4.bb b/recipes/xorg-lib/diet-x11_1.1.4.bb
deleted file mode 100644
index f6291a9..0000000
--- a/recipes/xorg-lib/diet-x11_1.1.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11_${PV}.bb
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://X18NCMSstubs.diff \
- file://fix-disable-xlocale.diff \
- file://fix-utf8-wrong-define.patch"
-
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/libapplewm_1.0.0.bb b/recipes/xorg-lib/libapplewm_1.0.0.bb
deleted file mode 100644
index 6e746b4..0000000
--- a/recipes/xorg-lib/libapplewm_1.0.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-DEPENDS += "libxext applewmproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "48a403c45be2206ee900729ced3a0e62"
-SRC_URI[archive.sha256sum] = "ecd2ff407a418eb4ac673f48b4d0a9c5b6860a13cef7211a32fe8f3d3db0407e"
-
-XORG_PN = "libAppleWM"
diff --git a/recipes/xorg-lib/libdmx_1.0.2.bb b/recipes/xorg-lib/libdmx_1.0.2.bb
deleted file mode 100644
index 7d6e025..0000000
--- a/recipes/xorg-lib/libdmx_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Distributed Multihead extension library"
-DEPENDS += "libxext dmxproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4d866967210d06098fc9f302ed4c79b1"
-SRC_URI[archive.sha256sum] = "fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4"
diff --git a/recipes/xorg-lib/libfontenc_1.0.4.bb b/recipes/xorg-lib/libfontenc_1.0.4.bb
deleted file mode 100644
index f16cb77..0000000
--- a/recipes/xorg-lib/libfontenc_1.0.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 font encoding library"
-LICENSE = "BSD-X"
-DEPENDS += "zlib xproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5cd16a2e51ca7b96a3081c7486ff98b9"
-SRC_URI[archive.sha256sum] = "b993aa3d17e845a12a49160b5d96993059ce919c7ba902005b910b867b6258c8"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-lib/libfs_1.0.0.bb b/recipes/xorg-lib/libfs_1.0.0.bb
deleted file mode 100644
index 7f81054..0000000
--- a/recipes/xorg-lib/libfs_1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Font Services library"
-DEPENDS += "xproto fontsproto xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "dfd5de47e232db0891410bec8ee6707b"
-SRC_URI[archive.sha256sum] = "2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde"
-
-XORG_PN = "libFS"
diff --git a/recipes/xorg-lib/libfs_1.0.1.bb b/recipes/xorg-lib/libfs_1.0.1.bb
deleted file mode 100644
index fe1f774..0000000
--- a/recipes/xorg-lib/libfs_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Font Services library"
-DEPENDS += "xproto fontsproto xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "81521249353fa33be7a4bb0062c2fbb9"
-SRC_URI[archive.sha256sum] = "9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5"
-
-XORG_PN = "libFS"
diff --git a/recipes/xorg-lib/libice_1.0.3.bb b/recipes/xorg-lib/libice_1.0.3.bb
deleted file mode 100644
index 52c9de0..0000000
--- a/recipes/xorg-lib/libice_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Inter-Client Exchange library"
-DEPENDS += "xproto xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "071f96648ac25c8e87a3de11a7de2d8a"
-SRC_URI[archive.sha256sum] = "ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libICE"
diff --git a/recipes/xorg-lib/libice_1.0.4.bb b/recipes/xorg-lib/libice_1.0.4.bb
deleted file mode 100644
index 29303c1..0000000
--- a/recipes/xorg-lib/libice_1.0.4.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Inter-Client Exchange library"
-DEPENDS += "xproto xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4ab4e67e0b8845aa201e984153087f4a"
-SRC_URI[archive.sha256sum] = "13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libICE"
diff --git a/recipes/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch b/recipes/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch
new file mode 100644
index 0000000..f9f4a63
--- /dev/null
+++ b/recipes/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch
@@ -0,0 +1,55 @@
+diff -uNr liblbxutil-1.1.0.orig/configure.ac liblbxutil-1.1.0/configure.ac
+--- liblbxutil-1.1.0.orig/configure.ac 2009-12-04 23:52:04.000000000 +0100
++++ liblbxutil-1.1.0/configure.ac 2009-12-16 10:45:00.000000000 +0100
+@@ -50,4 +50,5 @@
+
+ AC_OUTPUT([Makefile
+ src/Makefile
++ src/image/Makefile
+ lbxutil.pc])
+diff -uNr liblbxutil-1.1.0.orig/src/image/Makefile.am liblbxutil-1.1.0/src/image/Makefile.am
+--- liblbxutil-1.1.0.orig/src/image/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ liblbxutil-1.1.0/src/image/Makefile.am 2009-12-16 10:45:00.000000000 +0100
+@@ -0,0 +1,15 @@
++# evil hack
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
++
++CC=$(CC_FOR_BUILD)
++LIBTOOL = @LIBTOOL@ --tag=CC
++
++noinst_PROGRAMS = mkg3states
++
++mkg3states_SOURCES = \
++ mkg3states.c
++
++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+diff -uNr liblbxutil-1.1.0.orig/src/Makefile.am liblbxutil-1.1.0/src/Makefile.am
+--- liblbxutil-1.1.0.orig/src/Makefile.am 2009-12-16 10:48:11.000000000 +0100
++++ liblbxutil-1.1.0/src/Makefile.am 2009-12-16 10:46:47.000000000 +0100
+@@ -3,10 +3,7 @@
+ AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS)
+ INCLUDES = -I$(top_srcdir)/include
+
+-noinst_PROGRAMS = mkg3states
+-
+-mkg3states_SOURCES = \
+- $(srcdir)/image/mkg3states.c
++SUBDIRS = image
+
+ liblbxutil_la_SOURCES = \
+ $(srcdir)/lbx_zlib/reqstats.h \
+@@ -38,9 +35,8 @@
+
+ $(srcdir)/image/dfaxg42d.c: g3states.h
+
+-g3states.h: mkg3states
+- -rm -f g3states.h
+- $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
++g3states.h: image/mkg3states
++ $(AM_V_GEN) ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
+
+ liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+
diff --git a/recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch b/recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch
deleted file mode 100644
index f9f4a63..0000000
--- a/recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -uNr liblbxutil-1.1.0.orig/configure.ac liblbxutil-1.1.0/configure.ac
---- liblbxutil-1.1.0.orig/configure.ac 2009-12-04 23:52:04.000000000 +0100
-+++ liblbxutil-1.1.0/configure.ac 2009-12-16 10:45:00.000000000 +0100
-@@ -50,4 +50,5 @@
-
- AC_OUTPUT([Makefile
- src/Makefile
-+ src/image/Makefile
- lbxutil.pc])
-diff -uNr liblbxutil-1.1.0.orig/src/image/Makefile.am liblbxutil-1.1.0/src/image/Makefile.am
---- liblbxutil-1.1.0.orig/src/image/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ liblbxutil-1.1.0/src/image/Makefile.am 2009-12-16 10:45:00.000000000 +0100
-@@ -0,0 +1,15 @@
-+# evil hack
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-+
-+CC=$(CC_FOR_BUILD)
-+LIBTOOL = @LIBTOOL@ --tag=CC
-+
-+noinst_PROGRAMS = mkg3states
-+
-+mkg3states_SOURCES = \
-+ mkg3states.c
-+
-+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
-+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-diff -uNr liblbxutil-1.1.0.orig/src/Makefile.am liblbxutil-1.1.0/src/Makefile.am
---- liblbxutil-1.1.0.orig/src/Makefile.am 2009-12-16 10:48:11.000000000 +0100
-+++ liblbxutil-1.1.0/src/Makefile.am 2009-12-16 10:46:47.000000000 +0100
-@@ -3,10 +3,7 @@
- AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS)
- INCLUDES = -I$(top_srcdir)/include
-
--noinst_PROGRAMS = mkg3states
--
--mkg3states_SOURCES = \
-- $(srcdir)/image/mkg3states.c
-+SUBDIRS = image
-
- liblbxutil_la_SOURCES = \
- $(srcdir)/lbx_zlib/reqstats.h \
-@@ -38,9 +35,8 @@
-
- $(srcdir)/image/dfaxg42d.c: g3states.h
-
--g3states.h: mkg3states
-- -rm -f g3states.h
-- $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
-+g3states.h: image/mkg3states
-+ $(AM_V_GEN) ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
-
- liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-
diff --git a/recipes/xorg-lib/liblbxutil/mkg3states.patch b/recipes/xorg-lib/liblbxutil/mkg3states.patch
deleted file mode 100644
index 58463db..0000000
--- a/recipes/xorg-lib/liblbxutil/mkg3states.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500
-+++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500
-@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION
-
- AC_OUTPUT([Makefile
- src/Makefile
-+ src/image/Makefile
- lbxutil.pc])
---- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500
-+++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500
-@@ -1,9 +1,6 @@
- lib_LTLIBRARIES = liblbxutil.la
-
--noinst_PROGRAMS = mkg3states
--
--mkg3states_SOURCES = \
-- $(srcdir)/image/mkg3states.c
-+SUBDIRS = image
-
- liblbxutil_la_SOURCES = \
- $(srcdir)/lbx_zlib/reqstats.h \
-@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@
-
- $(srcdir)/image/dfaxg42d.c: g3states.h
-
--g3states.h: mkg3states
-- -rm -f g3states.h
-- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
-+g3states.h: image/mkg3states
-+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
-
- liblbxutil_la_LDFLAGS = -version-number 1:0:0
-
---- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500
-+++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500
-@@ -0,0 +1,15 @@
-+# evil hack
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-+
-+CC=$(CC_FOR_BUILD)
-+LIBTOOL = @LIBTOOL@ --tag=CC
-+
-+noinst_PROGRAMS = mkg3states
-+
-+mkg3states_SOURCES = \
-+ mkg3states.c
-+
-+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
-+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/recipes/xorg-lib/liblbxutil_1.0.1.bb b/recipes/xorg-lib/liblbxutil_1.0.1.bb
deleted file mode 100644
index f51d5ab..0000000
--- a/recipes/xorg-lib/liblbxutil_1.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "XFIXES Extension"
-DEPENDS += " xextproto xproto zlib"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://mkg3states.patch"
-SRC_URI[archive.md5sum] = "b73cbd5bc3cd268722a624a5f1318fde"
-SRC_URI[archive.sha256sum] = "94c31c7090106d3a95e2a7c083961efca1321b970118fe103ab06e5d927b7258"
-
-export CC_FOR_BUILD = "gcc"
diff --git a/recipes/xorg-lib/libpciaccess/fix-mtrr-check.patch b/recipes/xorg-lib/libpciaccess/fix-mtrr-check.patch
deleted file mode 100644
index e2d9f62..0000000
--- a/recipes/xorg-lib/libpciaccess/fix-mtrr-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
---- libpciaccess-0.10.3.orig/configure.ac
-+++ libpciaccess-0.10.3/configure.ac
-@@ -89,12 +89,10 @@ esac
- AM_CONDITIONAL(LINUX, [test "x$linux" = xyes])
- AM_CONDITIONAL(FREEBSD, [test "x$freebsd" = xyes])
- AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
- AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
-
--AC_CHECK_FILE([/usr/include/asm/mtrr.h],
-- [have_mtrr_h="yes"], [have_mtrr_h="no"])
- if test "x$have_mtrr_h" = xyes; then
- AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
- fi
-
- AC_SUBST(PCIACCESS_CFLAGS)
diff --git a/recipes/xorg-lib/libpciaccess_0.10.3.bb b/recipes/xorg-lib/libpciaccess_0.10.3.bb
deleted file mode 100644
index c594dc0..0000000
--- a/recipes/xorg-lib/libpciaccess_0.10.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-lib-common.inc
-DEPENDS += "xproto virtual/libx11"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-mtrr-check.patch"
-SRC_URI[archive.md5sum] = "6d5468debf76fac84576ca26c9535821"
-SRC_URI[archive.sha256sum] = "2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc"
diff --git a/recipes/xorg-lib/libpciaccess_0.11.0.bb b/recipes/xorg-lib/libpciaccess_0.11.0.bb
deleted file mode 100644
index aca0a2f..0000000
--- a/recipes/xorg-lib/libpciaccess_0.11.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-lib-common.inc
-DEPENDS += "xproto virtual/libx11"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "686320dcec98daad0bdfb8894d4f2a2b"
-SRC_URI[archive.sha256sum] = "6e38be12b656c83c66a6fd8ba56c041d8188218278219c88ee635242ec1c7dab"
diff --git a/recipes/xorg-lib/libsm_1.0.2.bb b/recipes/xorg-lib/libsm_1.0.2.bb
deleted file mode 100644
index ee2ff16..0000000
--- a/recipes/xorg-lib/libsm_1.0.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "Session management library"
-PRIORITY = "optional"
-DEPENDS += " libice xproto xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a254771550c01db372e88d1a1dc2e13a"
-SRC_URI[archive.sha256sum] = "e290614797bd626c1b92bac8f83e8954b99bd66e6ecdaa1e935e176df099eba8"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libSM"
diff --git a/recipes/xorg-lib/libsm_1.0.3.bb b/recipes/xorg-lib/libsm_1.0.3.bb
deleted file mode 100644
index 8ca90fe..0000000
--- a/recipes/xorg-lib/libsm_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Session management library"
-DEPENDS += "libice xproto xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "184cbf502b3cd5d7ba5f9d1290a99606"
-SRC_URI[archive.sha256sum] = "57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libSM"
diff --git a/recipes/xorg-lib/libsm_1.1.0.bb b/recipes/xorg-lib/libsm_1.1.0.bb
deleted file mode 100644
index 1b51b89..0000000
--- a/recipes/xorg-lib/libsm_1.1.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Session management library"
-DEPENDS += "libice xproto xtrans util-linux-ng"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "05a04c2b6382fb0054f6c70494e22733"
-SRC_URI[archive.sha256sum] = "7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libSM"
diff --git a/recipes/xorg-lib/libwindowswm_1.0.0.bb b/recipes/xorg-lib/libwindowswm_1.0.0.bb
deleted file mode 100644
index 35457cb..0000000
--- a/recipes/xorg-lib/libwindowswm_1.0.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-DEPENDS += "libxext windowswmproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "337b379fd00a67345b083100c4e6ba95"
-SRC_URI[archive.sha256sum] = "6ad87266173d21ba7e0e4506db0c094769fd58c3f0b741b37f30c297deec166a"
-
-XORG_PN = "libWindowsWM"
diff --git a/recipes/xorg-lib/libx11-1.0.1/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.0.1/keysymdef_include.patch
deleted file mode 100644
index 5653088..0000000
--- a/recipes/xorg-lib/libx11-1.0.1/keysymdef_include.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
diff --git a/recipes/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
deleted file mode 100644
index ad8b6fc..0000000
--- a/recipes/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libX11-1.0.1/src/util/Makefile.am
-===================================================================
---- libX11-1.0.1.old/src/util/Makefile.am
-+++ libX11-1.0.1/src/util/Makefile.am
-@@ -1,10 +1 @@
--# $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)
--
--#override CC = gcc
--LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--
- EXTRA_DIST = mkks.sh
diff --git a/recipes/xorg-lib/libx11-1.0.3/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.0.3/keysymdef_include.patch
deleted file mode 100644
index 5653088..0000000
--- a/recipes/xorg-lib/libx11-1.0.3/keysymdef_include.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
diff --git a/recipes/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
deleted file mode 100644
index ad8b6fc..0000000
--- a/recipes/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libX11-1.0.1/src/util/Makefile.am
-===================================================================
---- libX11-1.0.1.old/src/util/Makefile.am
-+++ libX11-1.0.1/src/util/Makefile.am
-@@ -1,10 +1 @@
--# $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)
--
--#override CC = gcc
--LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--
- EXTRA_DIST = mkks.sh
diff --git a/recipes/xorg-lib/libx11-1.1.1/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.1/keysymdef_include.patch
deleted file mode 100644
index 5653088..0000000
--- a/recipes/xorg-lib/libx11-1.1.1/keysymdef_include.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
diff --git a/recipes/xorg-lib/libx11-1.1.2/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.2/keysymdef_include.patch
deleted file mode 100644
index 5653088..0000000
--- a/recipes/xorg-lib/libx11-1.1.2/keysymdef_include.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
diff --git a/recipes/xorg-lib/libx11-1.1.3/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.3/keysymdef_include.patch
deleted file mode 100644
index 5653088..0000000
--- a/recipes/xorg-lib/libx11-1.1.3/keysymdef_include.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
diff --git a/recipes/xorg-lib/libx11-1.1.4/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.4/keysymdef_include.patch
deleted file mode 100644
index 5653088..0000000
--- a/recipes/xorg-lib/libx11-1.1.4/keysymdef_include.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
diff --git a/recipes/xorg-lib/libx11-1.1.5/X18NCMSstubs.diff b/recipes/xorg-lib/libx11-1.1.5/X18NCMSstubs.diff
new file mode 100644
index 0000000..54b1727
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/X18NCMSstubs.diff
@@ -0,0 +1,528 @@
+--- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100
+@@ -83,6 +83,7 @@
+ * from UCS char to specified charset char.
+ * This converter is needed for _XimGetCharCode subroutine.
+ */
++#ifdef XLOCALE
+ XPointer
+ _XimGetLocaleCode (
+ _Xconst char* encoding_name)
+@@ -96,6 +97,7 @@
+ }
+ return cvt;
+ }
++#endif
+
+ /*
+ * Returns the locale dependent representation of a keysym.
+@@ -107,6 +109,7 @@
+ * locale
+ */
+ /*ARGSUSED*/
++#ifdef XLOCALE
+ int
+ _XimGetCharCode (
+ XPointer ucs_conv,
+@@ -135,6 +138,7 @@
+ buf[count]= '\0';
+ return count;
+ }
++#endif
+
+ #ifdef XKB
+ static int lookup_string(
+--- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100
+@@ -0,0 +1,428 @@
++/*
++ * X18NCMSstubs.c
++ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
++ *
++ * Copyright © 2003 Matthew Allum
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Matthew Allum not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Keith Packard and Compaq makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
++ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include <stdlib.h>
++#include "Xlibint.h"
++#include "Xlcint.h"
++#include <X11/Xlocale.h>
++#include <X11/Xos.h>
++#ifdef WIN32
++#undef close
++#endif
++#include <X11/Xutil.h>
++#include "XlcPubI.h"
++
++#include "Xcmsint.h" /* for XcmsCCC type */
++#include "XlcPubI.h" /* for XLCd type */
++#include "config.h"
++
++#if ! XLOCALE
++
++Bool
++XSupportsLocale()
++{
++ return False;
++}
++
++char *
++XSetLocaleModifiers(
++ const char *modifiers)
++{
++ return NULL;
++}
++
++XLCd
++_XOpenLC(
++ char *name)
++{
++ return NULL;
++}
++
++XLCd
++_XlcCurrentLC()
++{
++ return NULL;
++}
++
++void
++_XlcVaToArgList(
++ va_list var,
++ int count,
++ XlcArgList *args_ret)
++{
++ return;
++}
++
++void
++_XlcCountVaList(
++ va_list var,
++ int *count_ret)
++{
++ return;
++}
++
++void
++_XCloseLC(
++ XLCd lcd)
++{
++ return;
++}
++
++int
++_XlcConvert(
++ XlcConv conv,
++ XPointer *from,
++ int *from_left,
++ XPointer *to,
++ int *to_left,
++ XPointer *args,
++ int num_args)
++{
++ return 0;
++}
++
++/* XIM Stubs */
++
++XPointer
++_XimGetLocaleCode ( _Xconst char* encoding_name )
++{
++ return NULL;
++}
++
++int
++_XimGetCharCode (
++ XPointer ucs_conv,
++ KeySym keysym,
++ unsigned char* buf,
++ int nbytes)
++{
++ return 0;
++}
++
++/* Xrm Stubs */
++
++XrmMethods
++_XrmInitParseInfo(
++ XPointer *state)
++{
++ return (XrmMethods) NULL;
++}
++
++/* Xwc Stubs */
++
++int
++XwcTextExtents(
++ XFontSet font_set,
++ _Xconst wchar_t *text,
++ int text_len,
++ XRectangle *overall_ink_extents,
++ XRectangle *overall_logical_extents)
++{
++ return 0;
++}
++
++void
++XwcDrawString(Display *display,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x, int y,
++ _Xconst wchar_t *string,
++ int num_wchars)
++{
++ ;
++}
++
++void
++XwcDrawText(
++ Display *dpy,
++ Drawable d,
++ GC gc,
++ int x,
++ int y,
++ XwcTextItem *text_items,
++ int nitems)
++{
++ ;
++}
++
++void
++XwcDrawImageString(
++ Display *dpy,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x,
++ int y,
++ _Xconst wchar_t *text,
++ int text_len)
++{
++ ;
++}
++
++int
++XwcTextEscapement(
++ XFontSet font_set,
++ _Xconst wchar_t *text,
++ int text_len)
++{
++ return 0;
++}
++
++Status
++XwcTextPerCharExtents(
++ XFontSet font_set,
++ _Xconst wchar_t *text,
++ int text_len,
++ XRectangle *ink_extents_buffer,
++ XRectangle *logical_extents_buffer,
++ int buffer_size,
++ int *num_chars,
++ XRectangle *max_ink_extents,
++ XRectangle *max_logical_extents)
++{
++ ;
++}
++
++int
++XwcTextPropertyToTextList(
++ Display *dpy,
++ const XTextProperty *text_prop,
++ wchar_t ***list_ret,
++ int *count_ret)
++{
++ return 0;
++}
++
++int
++XwcTextListToTextProperty(
++ Display *dpy,
++ wchar_t **list,
++ int count,
++ XICCEncodingStyle style,
++ XTextProperty *text_prop)
++{
++ return 0;
++}
++
++void
++XwcFreeStringList(wchar_t **list)
++{
++ return;
++}
++
++
++void XmbSetWMProperties ( /* Actually from mbWMProps.c */
++ Display *dpy,
++ Window w,
++ _Xconst char *windowName,
++ _Xconst char *iconName,
++ char **argv,
++ int argc,
++ XSizeHints *sizeHints,
++ XWMHints *wmHints,
++ XClassHint *classHints)
++{
++ return;
++}
++
++int
++XmbTextPropertyToTextList(
++ Display *dpy,
++ const XTextProperty *text_prop,
++ char ***list_ret,
++ int *count_ret)
++{
++ return XLocaleNotSupported;
++}
++
++int
++XmbTextListToTextProperty(
++ Display *dpy,
++ char **list,
++ int count,
++ XICCEncodingStyle style,
++ XTextProperty *text_prop)
++{
++ return XLocaleNotSupported;
++}
++
++int
++XmbTextExtents(
++ XFontSet font_set,
++ _Xconst char *text,
++ int text_len,
++ XRectangle *overall_ink_extents,
++ XRectangle *overall_logical_extents)
++{
++ return 0;
++}
++
++void
++XmbDrawText(
++ Display *dpy,
++ Drawable d,
++ GC gc,
++ int x,
++ int y,
++ XmbTextItem *text_items,
++ int nitems)
++{
++ ;
++}
++
++void
++XmbDrawString(
++ Display *dpy,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x,
++ int y,
++ _Xconst char *text,
++ int text_len)
++{
++ ;
++}
++
++void
++XmbDrawImageString(
++ Display *dpy,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x,
++ int y,
++ _Xconst char *text,
++ int text_len)
++{
++ ;
++}
++
++int
++XmbTextEscapement(
++ XFontSet font_set,
++ _Xconst char *text,
++ int text_len)
++{
++ return 0;
++}
++
++Status
++XmbTextPerCharExtents(
++ XFontSet font_set,
++ _Xconst char *text,
++ int text_len,
++ XRectangle *ink_extents_buffer,
++ XRectangle *logical_extents_buffer,
++ int buffer_size,
++ int *num_chars,
++ XRectangle *max_ink_extents,
++ XRectangle *max_logical_extents)
++{
++ return 0;
++}
++
++unsigned int
++KeySymToUcs4(KeySym keysym)
++{
++ return 0;
++}
++
++#endif
++
++#if ! XCMS
++
++XcmsCCC
++XcmsCCCOfColormap(dpy, cmap)
++ Display *dpy;
++ Colormap cmap;
++{
++ return NULL;
++}
++
++Status
++_XcmsResolveColorString (
++ XcmsCCC ccc,
++ const char **color_string,
++ XcmsColor *pColor_exact_return,
++ XcmsColorFormat result_format)
++{
++ return(XcmsFailure);
++}
++
++void
++_XcmsUnresolveColor(
++ XcmsCCC ccc,
++ XcmsColor *pColor)
++{
++ return;
++}
++
++void
++_XUnresolveColor(
++ XcmsCCC ccc,
++ XColor *pXColor)
++{
++ return;
++}
++
++XcmsCmapRec *
++_XcmsAddCmapRec(dpy, cmap, windowID, visual)
++ Display *dpy;
++ Colormap cmap;
++ Window windowID;
++ Visual *visual;
++{
++ return NULL;
++}
++
++void
++_XcmsRGB_to_XColor(
++ XcmsColor *pColors,
++ XColor *pXColors,
++ unsigned int nColors)
++{
++ return;
++}
++
++XcmsCmapRec *
++_XcmsCopyCmapRecAndFree(
++ Display *dpy,
++ Colormap src_cmap,
++ Colormap copy_cmap)
++{
++ return NULL;
++}
++
++void
++_XcmsDeleteCmapRec(
++ Display *dpy,
++ Colormap cmap)
++{
++ return;
++}
++
++#endif
+--- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100
+@@ -331,6 +331,8 @@
+ libX11_la_SOURCES+=UIThrStubs.c
+ endif
+
++libX11_la_SOURCES+=X18NCMSstubs.c
++
+ x11datadir = @X11_DATADIR@
+ x11data_DATA = XKeysymDB XErrorDB
+
+@@ -338,7 +340,8 @@
+ $(x11data_DATA) \
+ os2Stubs.c \
+ udcInf.c \
+- UIThrStubs.c
++ UIThrStubs.c \
++ X18NCMSstubs.c
+
+ #
+ # Figure out which sub-libraries to link into Xlib
+--- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100
+@@ -55,7 +55,9 @@
+ #define NUM_FREE_CVLS 4
+
+ /* in lcWrap.c */
++#ifdef XLOCALE
+ extern LockInfoPtr _Xi18n_lock;
++#endif
+
+ #ifdef WIN32
+ static DWORD _X_TlsIndex = (DWORD)-1;
+@@ -625,9 +627,11 @@
+ _Xglobal_lock = &global_lock;
+ xmutex_init(_Xglobal_lock->lock);
+ xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
++#ifdef XLOCALE
+ _Xi18n_lock = &i18n_lock;
+ xmutex_init(_Xi18n_lock->lock);
+ xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
++#endif
+ _XLockMutex_fn = _XLockMutex;
+ _XUnlockMutex_fn = _XUnlockMutex;
+ _XCreateMutex_fn = _XCreateMutex;
+--- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100
++++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100
+@@ -215,7 +215,14 @@
+ esac
+ AC_SUBST(KEYSYMDEF)
+
+-AM_CONDITIONAL(UDC, test xfalse = xtrue)
++AC_ARG_ENABLE(udc,
++ AC_HELP_STRING([--disable-udc],
++ [Disable Xlib support for UDC *EXPERIMENTAL*]),
++ [UDC=$enableval],[UDC=yes])
++AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
++if test x"$UDC" = "xyes"; then
++ AC_DEFINE(UDC,1,[Include support for UDC])
++fi
+
+ AC_ARG_ENABLE(xcms,
+ AC_HELP_STRING([--disable-xcms],
diff --git a/recipes/xorg-lib/libx11-1.1.5/dolt-fix.patch b/recipes/xorg-lib/libx11-1.1.5/dolt-fix.patch
new file mode 100644
index 0000000..ea1a8bd
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/dolt-fix.patch
@@ -0,0 +1,21 @@
+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__
+
diff --git a/recipes/xorg-lib/libx11-1.1.5/fix-disable-xlocale.diff b/recipes/xorg-lib/libx11-1.1.5/fix-disable-xlocale.diff
new file mode 100644
index 0000000..9dbf6da
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/fix-disable-xlocale.diff
@@ -0,0 +1,14 @@
+--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
+@@ -701,7 +701,11 @@
+ }
+ if (l - 2 - (p - charset) < 0)
+ return 0;
++#ifdef XLOCALE
+ if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
++#else
++ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
++#endif
+ return 0;
+ if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
+ return 0;
diff --git a/recipes/xorg-lib/libx11-1.1.5/fix-utf8-wrong-define.patch b/recipes/xorg-lib/libx11-1.1.5/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000..a098db1
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/fix-utf8-wrong-define.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
++++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
+@@ -103,7 +103,7 @@
+
+ /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
+ November 2000. Its presence is indicated through the following macro. */
+-#define X_HAVE_UTF8_STRING 1
++#undef X_HAVE_UTF8_STRING
+
+ typedef char *XPointer;
+
diff --git a/recipes/xorg-lib/libx11-1.1.5/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.5/keysymdef_include.patch
new file mode 100644
index 0000000..07487b6
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/keysymdef_include.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.1.5/configure.ac
+===================================================================
+--- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000
++++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000
+@@ -221,13 +221,21 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ dir=`pkg-config --variable=includedir xproto`
++ KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
++
+ if test -f "$KEYSYMDEF"; then
+- AC_MSG_RESULT([$KEYSYMDEF])
++ AC_MSG_RESULT([$KEYSYMDEF])
+ else
+ AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
++
+ AC_SUBST(KEYSYMDEF)
+
+ AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/recipes/xorg-lib/libx11-1.1.5/makekeys-update.patch b/recipes/xorg-lib/libx11-1.1.5/makekeys-update.patch
new file mode 100644
index 0000000..323dbbb
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/makekeys-update.patch
@@ -0,0 +1,87 @@
+From f8613deafdc7c6f3be49c3448e011426bcfdf78e Mon Sep 17 00:00:00 2001
+From: Holger Hans Peter Freyther <zecke@selfish.org>
+Date: Tue, 28 Jul 2009 03:20:20 +0200
+Subject: [PATCH] makekeys.c: Replace with the latest version to fix a segfault
+
+Fix a crash..
+---
+ src/util/makekeys.c | 28 +++++++++++++++++-----------
+ 1 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index 214ea5c..3fe8a96 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -36,13 +36,10 @@ from The Open Group.
+ #include <X11/keysymdef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */
+-char *malloc();
+-#endif /* macII */
+
+ typedef unsigned long Signature;
+
+-#define KTNUM 3000
++#define KTNUM 4000
+
+ static struct info {
+ char *name;
+@@ -52,11 +49,11 @@ static struct info {
+ #define MIN_REHASH 15
+ #define MATCHES 10
+
+-char tab[KTNUM];
+-unsigned short offsets[KTNUM];
+-unsigned short indexes[KTNUM];
+-KeySym values[KTNUM];
+-char buf[1024];
++static char tab[KTNUM];
++static unsigned short offsets[KTNUM];
++static unsigned short indexes[KTNUM];
++static KeySym values[KTNUM];
++static char buf[1024];
+
+ int
+ main(int argc, char *argv[])
+@@ -103,12 +100,11 @@ main(int argc, char *argv[])
+ key);
+ continue;
+ }
+- name = malloc((unsigned)strlen(key)+1);
++ name = strdup(key);
+ if (!name) {
+ fprintf(stderr, "makekeys: out of memory!\n");
+ exit(1);
+ }
+- (void)strcpy(name, key);
+ info[ksnum].name = name;
+ ksnum++;
+ if (ksnum == KTNUM) {
+@@ -157,6 +153,11 @@ next1: ;
+ }
+
+ z = best_z;
++ if (z == 0) {
++ fprintf(stderr, "makekeys: failed to find small enough hash!\n"
++ "Try increasing KTNUM in makekeys.c\n");
++ exit(1);
++ }
+ printf("#ifdef NEEDKTABLE\n");
+ printf("const unsigned char _XkeyTable[] = {\n");
+ printf("0,\n");
+@@ -237,6 +238,11 @@ next2: ;
+ }
+
+ z = best_z;
++ if (z == 0) {
++ fprintf(stderr, "makekeys: failed to find small enough hash!\n"
++ "Try increasing KTNUM in makekeys.c\n");
++ exit(1);
++ }
+ for (i = z; --i >= 0;)
+ offsets[i] = 0;
+ for (i = 0; i < ksnum; i++) {
+--
+1.6.3.3
+
diff --git a/recipes/xorg-lib/libx11-1.1.5/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.1.5/x11_disable_makekeys.patch
new file mode 100644
index 0000000..2a8a55c
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/x11_disable_makekeys.patch
@@ -0,0 +1,30 @@
+---
+ src/util/Makefile.am | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+Index: libX11-1.1.2/src/util/Makefile.am
+===================================================================
+--- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100
++++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100
+@@ -1,21 +1,4 @@
+ # $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)
+-
+-#override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-
+ 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
diff --git a/recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch
deleted file mode 100644
index 9e9e75e..0000000
--- a/recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- /tmp/Makefile.am 2009-05-27 22:19:39.000000000 +0200
-+++ libX11-1.2/src/util/Makefile.am 2009-05-27 22:21:31.000000000 +0200
-@@ -1,20 +1 @@
--# $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
diff --git a/recipes/xorg-lib/libx11-1.3.2/dolt-fix.patch b/recipes/xorg-lib/libx11-1.3.2/dolt-fix.patch
new file mode 100644
index 0000000..ea1a8bd
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.2/dolt-fix.patch
@@ -0,0 +1,21 @@
+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__
+
diff --git a/recipes/xorg-lib/libx11-1.3.2/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.2/keysymdef_include.patch
new file mode 100644
index 0000000..07487b6
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.2/keysymdef_include.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.1.5/configure.ac
+===================================================================
+--- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000
++++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000
+@@ -221,13 +221,21 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ dir=`pkg-config --variable=includedir xproto`
++ KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
++
+ if test -f "$KEYSYMDEF"; then
+- AC_MSG_RESULT([$KEYSYMDEF])
++ AC_MSG_RESULT([$KEYSYMDEF])
+ else
+ AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
++
+ AC_SUBST(KEYSYMDEF)
+
+ AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch b/recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
deleted file mode 100644
index 7e96075..0000000
--- a/recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: libX11-1.3.4/m4/dolt.m4
-===================================================================
---- libX11-1.3.4/m4/dolt.m4
-+++ libX11-1.3.4/m4/dolt.m4
-@@ -155,7 +155,7 @@ dnl without '=', because automake does n
- 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=()
-@@ -171,7 +171,7 @@ done
- 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__
-
diff --git a/recipes/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
deleted file mode 100644
index 07487b6..0000000
--- a/recipes/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: libX11-1.1.5/configure.ac
-===================================================================
---- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000
-+++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000
-@@ -221,13 +221,21 @@
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysymdef.h])
--dir=`pkg-config --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ dir=`pkg-config --variable=includedir xproto`
-+ KEYSYMDEF="$dir/X11/keysymdef.h"
-+fi
-+
- if test -f "$KEYSYMDEF"; then
-- AC_MSG_RESULT([$KEYSYMDEF])
-+ AC_MSG_RESULT([$KEYSYMDEF])
- else
- AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
-+
- AC_SUBST(KEYSYMDEF)
-
- AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/recipes/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
deleted file mode 100644
index 0739632..0000000
--- a/recipes/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: git/src/util/Makefile.am
-===================================================================
---- git.orig/src/util/Makefile.am
-+++ git/src/util/Makefile.am
-@@ -1,21 +1 @@
--
--noinst_PROGRAMS=makekeys
--
--makekeys_CFLAGS = \
-- $(X11_CFLAGS) \
-- $(CWARNFLAGS)
--
--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
diff --git a/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
deleted file mode 100644
index 5d0a24c..0000000
--- a/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uNr libX11-1.3.3.orig/src/util/Makefile.am libX11-1.3.3/src/util/Makefile.am
---- libX11-1.3.3.orig/src/util/Makefile.am 2010-01-15 02:11:36.000000000 +0100
-+++ libX11-1.3.3/src/util/Makefile.am 2010-01-18 14:48:27.000000000 +0100
-@@ -1,19 +1 @@
--
--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
diff --git a/recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch b/recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch
deleted file mode 100644
index 7e96075..0000000
--- a/recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: libX11-1.3.4/m4/dolt.m4
-===================================================================
---- libX11-1.3.4/m4/dolt.m4
-+++ libX11-1.3.4/m4/dolt.m4
-@@ -155,7 +155,7 @@ dnl without '=', because automake does n
- 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=()
-@@ -171,7 +171,7 @@ done
- 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__
-
diff --git a/recipes/xorg-lib/libx11-1.3.4/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.4/keysymdef_include.patch
deleted file mode 100644
index 0cab165..0000000
--- a/recipes/xorg-lib/libx11-1.3.4/keysymdef_include.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: libX11-1.3.4/configure.ac
-===================================================================
---- libX11-1.3.4.orig/configure.ac
-+++ libX11-1.3.4/configure.ac
-@@ -355,8 +355,14 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysymdef.h])
--dir=`$PKG_CONFIG --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ dir=`${PKG_CONFIG} --variable=includedir xproto`
-+ KEYSYMDEF="$dir/X11/keysymdef.h"
-+fi
- if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
- else
diff --git a/recipes/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
deleted file mode 100644
index 9763313..0000000
--- a/recipes/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: libX11-1.3.4/src/util/Makefile.am
-===================================================================
---- libX11-1.3.4.orig/src/util/Makefile.am
-+++ libX11-1.3.4/src/util/Makefile.am
-@@ -1,24 +1 @@
--
--noinst_PROGRAMS=makekeys
--
--makekeys_CFLAGS = \
-- $(X11_CFLAGS) \
-- $(CWARNFLAGS)
--
--CC = @CC_FOR_BUILD@
--CPPFLAGS = @CPPFLAGS_FOR_BUILD@
--CFLAGS = @CFLAGS_FOR_BUILD@
--LDFLAGS = @LDFLAGS_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
diff --git a/recipes/xorg-lib/libx11/X18NCMSstubs.diff b/recipes/xorg-lib/libx11/X18NCMSstubs.diff
deleted file mode 100644
index 54b1727..0000000
--- a/recipes/xorg-lib/libx11/X18NCMSstubs.diff
+++ /dev/null
@@ -1,528 +0,0 @@
---- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100
-@@ -83,6 +83,7 @@
- * from UCS char to specified charset char.
- * This converter is needed for _XimGetCharCode subroutine.
- */
-+#ifdef XLOCALE
- XPointer
- _XimGetLocaleCode (
- _Xconst char* encoding_name)
-@@ -96,6 +97,7 @@
- }
- return cvt;
- }
-+#endif
-
- /*
- * Returns the locale dependent representation of a keysym.
-@@ -107,6 +109,7 @@
- * locale
- */
- /*ARGSUSED*/
-+#ifdef XLOCALE
- int
- _XimGetCharCode (
- XPointer ucs_conv,
-@@ -135,6 +138,7 @@
- buf[count]= '\0';
- return count;
- }
-+#endif
-
- #ifdef XKB
- static int lookup_string(
---- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100
-@@ -0,0 +1,428 @@
-+/*
-+ * X18NCMSstubs.c
-+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
-+ *
-+ * Copyright © 2003 Matthew Allum
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Matthew Allum not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Keith Packard and Compaq makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <stdlib.h>
-+#include "Xlibint.h"
-+#include "Xlcint.h"
-+#include <X11/Xlocale.h>
-+#include <X11/Xos.h>
-+#ifdef WIN32
-+#undef close
-+#endif
-+#include <X11/Xutil.h>
-+#include "XlcPubI.h"
-+
-+#include "Xcmsint.h" /* for XcmsCCC type */
-+#include "XlcPubI.h" /* for XLCd type */
-+#include "config.h"
-+
-+#if ! XLOCALE
-+
-+Bool
-+XSupportsLocale()
-+{
-+ return False;
-+}
-+
-+char *
-+XSetLocaleModifiers(
-+ const char *modifiers)
-+{
-+ return NULL;
-+}
-+
-+XLCd
-+_XOpenLC(
-+ char *name)
-+{
-+ return NULL;
-+}
-+
-+XLCd
-+_XlcCurrentLC()
-+{
-+ return NULL;
-+}
-+
-+void
-+_XlcVaToArgList(
-+ va_list var,
-+ int count,
-+ XlcArgList *args_ret)
-+{
-+ return;
-+}
-+
-+void
-+_XlcCountVaList(
-+ va_list var,
-+ int *count_ret)
-+{
-+ return;
-+}
-+
-+void
-+_XCloseLC(
-+ XLCd lcd)
-+{
-+ return;
-+}
-+
-+int
-+_XlcConvert(
-+ XlcConv conv,
-+ XPointer *from,
-+ int *from_left,
-+ XPointer *to,
-+ int *to_left,
-+ XPointer *args,
-+ int num_args)
-+{
-+ return 0;
-+}
-+
-+/* XIM Stubs */
-+
-+XPointer
-+_XimGetLocaleCode ( _Xconst char* encoding_name )
-+{
-+ return NULL;
-+}
-+
-+int
-+_XimGetCharCode (
-+ XPointer ucs_conv,
-+ KeySym keysym,
-+ unsigned char* buf,
-+ int nbytes)
-+{
-+ return 0;
-+}
-+
-+/* Xrm Stubs */
-+
-+XrmMethods
-+_XrmInitParseInfo(
-+ XPointer *state)
-+{
-+ return (XrmMethods) NULL;
-+}
-+
-+/* Xwc Stubs */
-+
-+int
-+XwcTextExtents(
-+ XFontSet font_set,
-+ _Xconst wchar_t *text,
-+ int text_len,
-+ XRectangle *overall_ink_extents,
-+ XRectangle *overall_logical_extents)
-+{
-+ return 0;
-+}
-+
-+void
-+XwcDrawString(Display *display,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x, int y,
-+ _Xconst wchar_t *string,
-+ int num_wchars)
-+{
-+ ;
-+}
-+
-+void
-+XwcDrawText(
-+ Display *dpy,
-+ Drawable d,
-+ GC gc,
-+ int x,
-+ int y,
-+ XwcTextItem *text_items,
-+ int nitems)
-+{
-+ ;
-+}
-+
-+void
-+XwcDrawImageString(
-+ Display *dpy,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x,
-+ int y,
-+ _Xconst wchar_t *text,
-+ int text_len)
-+{
-+ ;
-+}
-+
-+int
-+XwcTextEscapement(
-+ XFontSet font_set,
-+ _Xconst wchar_t *text,
-+ int text_len)
-+{
-+ return 0;
-+}
-+
-+Status
-+XwcTextPerCharExtents(
-+ XFontSet font_set,
-+ _Xconst wchar_t *text,
-+ int text_len,
-+ XRectangle *ink_extents_buffer,
-+ XRectangle *logical_extents_buffer,
-+ int buffer_size,
-+ int *num_chars,
-+ XRectangle *max_ink_extents,
-+ XRectangle *max_logical_extents)
-+{
-+ ;
-+}
-+
-+int
-+XwcTextPropertyToTextList(
-+ Display *dpy,
-+ const XTextProperty *text_prop,
-+ wchar_t ***list_ret,
-+ int *count_ret)
-+{
-+ return 0;
-+}
-+
-+int
-+XwcTextListToTextProperty(
-+ Display *dpy,
-+ wchar_t **list,
-+ int count,
-+ XICCEncodingStyle style,
-+ XTextProperty *text_prop)
-+{
-+ return 0;
-+}
-+
-+void
-+XwcFreeStringList(wchar_t **list)
-+{
-+ return;
-+}
-+
-+
-+void XmbSetWMProperties ( /* Actually from mbWMProps.c */
-+ Display *dpy,
-+ Window w,
-+ _Xconst char *windowName,
-+ _Xconst char *iconName,
-+ char **argv,
-+ int argc,
-+ XSizeHints *sizeHints,
-+ XWMHints *wmHints,
-+ XClassHint *classHints)
-+{
-+ return;
-+}
-+
-+int
-+XmbTextPropertyToTextList(
-+ Display *dpy,
-+ const XTextProperty *text_prop,
-+ char ***list_ret,
-+ int *count_ret)
-+{
-+ return XLocaleNotSupported;
-+}
-+
-+int
-+XmbTextListToTextProperty(
-+ Display *dpy,
-+ char **list,
-+ int count,
-+ XICCEncodingStyle style,
-+ XTextProperty *text_prop)
-+{
-+ return XLocaleNotSupported;
-+}
-+
-+int
-+XmbTextExtents(
-+ XFontSet font_set,
-+ _Xconst char *text,
-+ int text_len,
-+ XRectangle *overall_ink_extents,
-+ XRectangle *overall_logical_extents)
-+{
-+ return 0;
-+}
-+
-+void
-+XmbDrawText(
-+ Display *dpy,
-+ Drawable d,
-+ GC gc,
-+ int x,
-+ int y,
-+ XmbTextItem *text_items,
-+ int nitems)
-+{
-+ ;
-+}
-+
-+void
-+XmbDrawString(
-+ Display *dpy,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x,
-+ int y,
-+ _Xconst char *text,
-+ int text_len)
-+{
-+ ;
-+}
-+
-+void
-+XmbDrawImageString(
-+ Display *dpy,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x,
-+ int y,
-+ _Xconst char *text,
-+ int text_len)
-+{
-+ ;
-+}
-+
-+int
-+XmbTextEscapement(
-+ XFontSet font_set,
-+ _Xconst char *text,
-+ int text_len)
-+{
-+ return 0;
-+}
-+
-+Status
-+XmbTextPerCharExtents(
-+ XFontSet font_set,
-+ _Xconst char *text,
-+ int text_len,
-+ XRectangle *ink_extents_buffer,
-+ XRectangle *logical_extents_buffer,
-+ int buffer_size,
-+ int *num_chars,
-+ XRectangle *max_ink_extents,
-+ XRectangle *max_logical_extents)
-+{
-+ return 0;
-+}
-+
-+unsigned int
-+KeySymToUcs4(KeySym keysym)
-+{
-+ return 0;
-+}
-+
-+#endif
-+
-+#if ! XCMS
-+
-+XcmsCCC
-+XcmsCCCOfColormap(dpy, cmap)
-+ Display *dpy;
-+ Colormap cmap;
-+{
-+ return NULL;
-+}
-+
-+Status
-+_XcmsResolveColorString (
-+ XcmsCCC ccc,
-+ const char **color_string,
-+ XcmsColor *pColor_exact_return,
-+ XcmsColorFormat result_format)
-+{
-+ return(XcmsFailure);
-+}
-+
-+void
-+_XcmsUnresolveColor(
-+ XcmsCCC ccc,
-+ XcmsColor *pColor)
-+{
-+ return;
-+}
-+
-+void
-+_XUnresolveColor(
-+ XcmsCCC ccc,
-+ XColor *pXColor)
-+{
-+ return;
-+}
-+
-+XcmsCmapRec *
-+_XcmsAddCmapRec(dpy, cmap, windowID, visual)
-+ Display *dpy;
-+ Colormap cmap;
-+ Window windowID;
-+ Visual *visual;
-+{
-+ return NULL;
-+}
-+
-+void
-+_XcmsRGB_to_XColor(
-+ XcmsColor *pColors,
-+ XColor *pXColors,
-+ unsigned int nColors)
-+{
-+ return;
-+}
-+
-+XcmsCmapRec *
-+_XcmsCopyCmapRecAndFree(
-+ Display *dpy,
-+ Colormap src_cmap,
-+ Colormap copy_cmap)
-+{
-+ return NULL;
-+}
-+
-+void
-+_XcmsDeleteCmapRec(
-+ Display *dpy,
-+ Colormap cmap)
-+{
-+ return;
-+}
-+
-+#endif
---- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100
-@@ -331,6 +331,8 @@
- libX11_la_SOURCES+=UIThrStubs.c
- endif
-
-+libX11_la_SOURCES+=X18NCMSstubs.c
-+
- x11datadir = @X11_DATADIR@
- x11data_DATA = XKeysymDB XErrorDB
-
-@@ -338,7 +340,8 @@
- $(x11data_DATA) \
- os2Stubs.c \
- udcInf.c \
-- UIThrStubs.c
-+ UIThrStubs.c \
-+ X18NCMSstubs.c
-
- #
- # Figure out which sub-libraries to link into Xlib
---- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100
-@@ -55,7 +55,9 @@
- #define NUM_FREE_CVLS 4
-
- /* in lcWrap.c */
-+#ifdef XLOCALE
- extern LockInfoPtr _Xi18n_lock;
-+#endif
-
- #ifdef WIN32
- static DWORD _X_TlsIndex = (DWORD)-1;
-@@ -625,9 +627,11 @@
- _Xglobal_lock = &global_lock;
- xmutex_init(_Xglobal_lock->lock);
- xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
-+#ifdef XLOCALE
- _Xi18n_lock = &i18n_lock;
- xmutex_init(_Xi18n_lock->lock);
- xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
-+#endif
- _XLockMutex_fn = _XLockMutex;
- _XUnlockMutex_fn = _XUnlockMutex;
- _XCreateMutex_fn = _XCreateMutex;
---- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100
-@@ -215,7 +215,14 @@
- esac
- AC_SUBST(KEYSYMDEF)
-
--AM_CONDITIONAL(UDC, test xfalse = xtrue)
-+AC_ARG_ENABLE(udc,
-+ AC_HELP_STRING([--disable-udc],
-+ [Disable Xlib support for UDC *EXPERIMENTAL*]),
-+ [UDC=$enableval],[UDC=yes])
-+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
-+if test x"$UDC" = "xyes"; then
-+ AC_DEFINE(UDC,1,[Include support for UDC])
-+fi
-
- AC_ARG_ENABLE(xcms,
- AC_HELP_STRING([--disable-xcms],
diff --git a/recipes/xorg-lib/libx11/dolt-fix.patch b/recipes/xorg-lib/libx11/dolt-fix.patch
deleted file mode 100644
index ea1a8bd..0000000
--- a/recipes/xorg-lib/libx11/dolt-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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__
-
diff --git a/recipes/xorg-lib/libx11/fix-disable-xlocale.diff b/recipes/xorg-lib/libx11/fix-disable-xlocale.diff
deleted file mode 100644
index 9dbf6da..0000000
--- a/recipes/xorg-lib/libx11/fix-disable-xlocale.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
-@@ -701,7 +701,11 @@
- }
- if (l - 2 - (p - charset) < 0)
- return 0;
-+#ifdef XLOCALE
- if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
-+#else
-+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
-+#endif
- return 0;
- if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
- return 0;
diff --git a/recipes/xorg-lib/libx11/fix-utf8-wrong-define.patch b/recipes/xorg-lib/libx11/fix-utf8-wrong-define.patch
deleted file mode 100644
index a098db1..0000000
--- a/recipes/xorg-lib/libx11/fix-utf8-wrong-define.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
-+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
-@@ -103,7 +103,7 @@
-
- /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
- November 2000. Its presence is indicated through the following macro. */
--#define X_HAVE_UTF8_STRING 1
-+#undef X_HAVE_UTF8_STRING
-
- typedef char *XPointer;
-
diff --git a/recipes/xorg-lib/libx11/keysymdef_include.patch b/recipes/xorg-lib/libx11/keysymdef_include.patch
deleted file mode 100644
index 07487b6..0000000
--- a/recipes/xorg-lib/libx11/keysymdef_include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: libX11-1.1.5/configure.ac
-===================================================================
---- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000
-+++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000
-@@ -221,13 +221,21 @@
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysymdef.h])
--dir=`pkg-config --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ dir=`pkg-config --variable=includedir xproto`
-+ KEYSYMDEF="$dir/X11/keysymdef.h"
-+fi
-+
- if test -f "$KEYSYMDEF"; then
-- AC_MSG_RESULT([$KEYSYMDEF])
-+ AC_MSG_RESULT([$KEYSYMDEF])
- else
- AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
-+
- AC_SUBST(KEYSYMDEF)
-
- AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/recipes/xorg-lib/libx11/makekeys-update.patch b/recipes/xorg-lib/libx11/makekeys-update.patch
deleted file mode 100644
index 323dbbb..0000000
--- a/recipes/xorg-lib/libx11/makekeys-update.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From f8613deafdc7c6f3be49c3448e011426bcfdf78e Mon Sep 17 00:00:00 2001
-From: Holger Hans Peter Freyther <zecke@selfish.org>
-Date: Tue, 28 Jul 2009 03:20:20 +0200
-Subject: [PATCH] makekeys.c: Replace with the latest version to fix a segfault
-
-Fix a crash..
----
- src/util/makekeys.c | 28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index 214ea5c..3fe8a96 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -36,13 +36,10 @@ from The Open Group.
- #include <X11/keysymdef.h>
- #include <stdio.h>
- #include <stdlib.h>
--#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */
--char *malloc();
--#endif /* macII */
-
- typedef unsigned long Signature;
-
--#define KTNUM 3000
-+#define KTNUM 4000
-
- static struct info {
- char *name;
-@@ -52,11 +49,11 @@ static struct info {
- #define MIN_REHASH 15
- #define MATCHES 10
-
--char tab[KTNUM];
--unsigned short offsets[KTNUM];
--unsigned short indexes[KTNUM];
--KeySym values[KTNUM];
--char buf[1024];
-+static char tab[KTNUM];
-+static unsigned short offsets[KTNUM];
-+static unsigned short indexes[KTNUM];
-+static KeySym values[KTNUM];
-+static char buf[1024];
-
- int
- main(int argc, char *argv[])
-@@ -103,12 +100,11 @@ main(int argc, char *argv[])
- key);
- continue;
- }
-- name = malloc((unsigned)strlen(key)+1);
-+ name = strdup(key);
- if (!name) {
- fprintf(stderr, "makekeys: out of memory!\n");
- exit(1);
- }
-- (void)strcpy(name, key);
- info[ksnum].name = name;
- ksnum++;
- if (ksnum == KTNUM) {
-@@ -157,6 +153,11 @@ next1: ;
- }
-
- z = best_z;
-+ if (z == 0) {
-+ fprintf(stderr, "makekeys: failed to find small enough hash!\n"
-+ "Try increasing KTNUM in makekeys.c\n");
-+ exit(1);
-+ }
- printf("#ifdef NEEDKTABLE\n");
- printf("const unsigned char _XkeyTable[] = {\n");
- printf("0,\n");
-@@ -237,6 +238,11 @@ next2: ;
- }
-
- z = best_z;
-+ if (z == 0) {
-+ fprintf(stderr, "makekeys: failed to find small enough hash!\n"
-+ "Try increasing KTNUM in makekeys.c\n");
-+ exit(1);
-+ }
- for (i = z; --i >= 0;)
- offsets[i] = 0;
- for (i = 0; i < ksnum; i++) {
---
-1.6.3.3
-
diff --git a/recipes/xorg-lib/libx11/ruutf8.patch b/recipes/xorg-lib/libx11/ruutf8.patch
deleted file mode 100644
index 0822b30..0000000
--- a/recipes/xorg-lib/libx11/ruutf8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
-index a74ca75..ff5bc3f 100644
---- a/nls/locale.alias.pre
-+++ b/nls/locale.alias.pre
-@@ -898,6 +898,7 @@ ru_RU.cp1251: ru_RU.CP1251
- ru_RU.microsoftcp1251: ru_RU.CP1251
- ru_RU.microsoft-cp1251: ru_RU.CP1251
- ru_RU.MICROSOFT-CP1251: ru_RU.CP1251
-+ru_RU.utf8: ru_RU.UTF-8
- #if defined(INCLUDE_ru_SU)
- XCOMM ru_SU is redundant now
- ru_SU: ru_RU.KOI8-R
diff --git a/recipes/xorg-lib/libx11/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11/x11_disable_makekeys.patch
deleted file mode 100644
index 2a8a55c..0000000
--- a/recipes/xorg-lib/libx11/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,30 +0,0 @@
----
- src/util/Makefile.am | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-Index: libX11-1.1.2/src/util/Makefile.am
-===================================================================
---- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100
-+++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100
-@@ -1,21 +1,4 @@
- # $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)
--
--#override CC = gcc
--LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--
- 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
diff --git a/recipes/xorg-lib/libx11/xchar2b.patch b/recipes/xorg-lib/libx11/xchar2b.patch
deleted file mode 100644
index 31da58f..0000000
--- a/recipes/xorg-lib/libx11/xchar2b.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://www.koka-in.org/~kensyu/zaurus/diary/20030618.html
-
---- /tmp/Xlib.h 2006-12-01 14:40:27.000000000 +0100
-+++ libX11-X11R7.1-1.0.1/include/X11/Xlib.h 2006-12-01 14:40:56.948254000 +0100
-@@ -1067,7 +1067,7 @@
- typedef struct { /* normal 16 bit characters are two bytes */
- unsigned char byte1;
- unsigned char byte2;
--} XChar2b;
-+} __attribute__ ((packed)) XChar2b;
-
- typedef struct {
- XChar2b *chars; /* two byte characters */
diff --git a/recipes/xorg-lib/libx11/xim.patch b/recipes/xorg-lib/libx11/xim.patch
deleted file mode 100644
index 0eab197..0000000
--- a/recipes/xorg-lib/libx11/xim.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000
-+++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
-@@ -90,6 +90,52 @@
- return;
- }
-
-+XIM
-+XOpenIM (
-+ Display* display,
-+ struct _XrmHashBucketRec* rdb,
-+ char* res_name,
-+ char* res_class)
-+{
-+ return (XIM) NULL;
-+}
-+
-+Status
-+XCloseIM ( XIM im )
-+{
-+ return NULL;
-+}
-+
-+XIC
-+XCreateIC ( XIM im, ...)
-+{
-+ return NULL;
-+}
-+
-+void
-+XDestroyIC ( XIC ic )
-+{
-+ return;
-+}
-+
-+int
-+XmbLookupString (
-+ XIC ic,
-+ XKeyPressedEvent* ev,
-+ char* buffer,
-+ int nbytes,
-+ KeySym* keysym,
-+ Status* status)
-+{
-+ return XLookupNone;
-+}
-+
-+char *
-+XGetICValues( XIC ic, ...)
-+{
-+ return (char *) NULL;
-+}
-+
- XPointer
- _XimGetLocaleCode ( _Xconst char* encoding_name )
- {
diff --git a/recipes/xorg-lib/libx11_1.0.1.bb b/recipes/xorg-lib/libx11_1.0.1.bb
deleted file mode 100644
index 734a31d..0000000
--- a/recipes/xorg-lib/libx11_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11.inc
-LICENSE = "XFree86"
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://ruutf8.patch"
-SRC_URI[archive.md5sum] = "58f0537f21183e27149cf906a1b6bef9"
-SRC_URI[archive.sha256sum] = "f99e4ce6d8e3b8833957978fe22223897b0e636c83580f2b07eff0388eb75294"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.0.3.bb b/recipes/xorg-lib/libx11_1.0.3.bb
deleted file mode 100644
index 40cbeb5..0000000
--- a/recipes/xorg-lib/libx11_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11.inc
-LICENSE = "XFree86"
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://ruutf8.patch"
-SRC_URI[archive.md5sum] = "60b787a812c92d33f71860e4e19cb59d"
-SRC_URI[archive.sha256sum] = "fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.1.bb b/recipes/xorg-lib/libx11_1.1.1.bb
deleted file mode 100644
index 368dd7b..0000000
--- a/recipes/xorg-lib/libx11_1.1.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require libx11.inc
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://ruutf8.patch"
-SRC_URI[archive.md5sum] = "848b80f77b20ae1fa5c882bbfa531ebc"
-SRC_URI[archive.sha256sum] = "5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.2.bb b/recipes/xorg-lib/libx11_1.1.2.bb
deleted file mode 100644
index 60093c1..0000000
--- a/recipes/xorg-lib/libx11_1.1.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libx11.inc
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "710bf38a9477a5a1b235bc94f1d0593c"
-SRC_URI[archive.sha256sum] = "b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.3.bb b/recipes/xorg-lib/libx11_1.1.3.bb
deleted file mode 100644
index d6aa199..0000000
--- a/recipes/xorg-lib/libx11_1.1.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libx11.inc
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4d43d3e472c552d2f191ecdd4e75112c"
-SRC_URI[archive.sha256sum] = "4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.4.bb b/recipes/xorg-lib/libx11_1.1.4.bb
deleted file mode 100644
index 3eeeece..0000000
--- a/recipes/xorg-lib/libx11_1.1.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libx11.inc
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1469a5a8aa8d288dce6f4c45d2f68dc3"
-SRC_URI[archive.sha256sum] = "bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.2.bb b/recipes/xorg-lib/libx11_1.2.bb
deleted file mode 100644
index 0cea5f8..0000000
--- a/recipes/xorg-lib/libx11_1.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require libx11.inc
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://dolt-fix.patch"
-SRC_URI[archive.md5sum] = "c6265b59ea2b594fd68e33f9125b4d20"
-SRC_URI[archive.sha256sum] = "e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb
deleted file mode 100644
index 8c40a99..0000000
--- a/recipes/xorg-lib/libx11_1.3.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libx11.inc
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://dolt-fix.patch"
-SRC_URI[archive.md5sum] = "5d74971360f194ce33d2bd2e4d9b066c"
-SRC_URI[archive.sha256sum] = "8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac"
diff --git a/recipes/xorg-lib/libx11_1.3.4.bb b/recipes/xorg-lib/libx11_1.3.4.bb
deleted file mode 100644
index e55d720..0000000
--- a/recipes/xorg-lib/libx11_1.3.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libx11.inc
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://dolt-fix.patch"
-SRC_URI[archive.md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
-SRC_URI[archive.sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
diff --git a/recipes/xorg-lib/libx11_git.bb b/recipes/xorg-lib/libx11_git.bb
deleted file mode 100644
index eac68d8..0000000
--- a/recipes/xorg-lib/libx11_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require libx11.inc
-PV = "1.3.3+git"
-PR = "${INC_PR}.0"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
-SRC_URI += " file://keysymdef_include.patch \
- file://x11_disable_makekeys.patch \
- file://dolt-fix.patch \
-"
-
-SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d"
-S = "${WORKDIR}/git"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/xorg-lib/libxau_1.0.3.bb b/recipes/xorg-lib/libxau_1.0.3.bb
deleted file mode 100644
index cd4f79b..0000000
--- a/recipes/xorg-lib/libxau_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "A Sample Authorization Protocol for X"
-DEPENDS += " xproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "75a9f2b85cd1617b5ca98c9095323853"
-SRC_URI[archive.sha256sum] = "d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXau"
diff --git a/recipes/xorg-lib/libxau_1.0.4.bb b/recipes/xorg-lib/libxau_1.0.4.bb
deleted file mode 100644
index 293fc63..0000000
--- a/recipes/xorg-lib/libxau_1.0.4.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "A Sample Authorization Protocol for X"
-DEPENDS += " xproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0f2b88d857e0a3f5898e4759c541af46"
-SRC_URI[archive.sha256sum] = "10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXau"
diff --git a/recipes/xorg-lib/libxaw_1.0.3.bb b/recipes/xorg-lib/libxaw_1.0.3.bb
deleted file mode 100644
index 87ec70e..0000000
--- a/recipes/xorg-lib/libxaw_1.0.3.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Athena Widget Set"
-DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ee215536ea78798268ab3a444d10135a"
-SRC_URI[archive.sha256sum] = "45ca55bdac904a07b8118618c65ddb5bf8826e626c4c927e3c2508c58e231514"
-
-do_install_append () {
- ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
- ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
- ln -sf libXaw7.so.7 ${D}${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*"
-
-XORG_PN = "libXaw"
diff --git a/recipes/xorg-lib/libxaw_1.0.4.bb b/recipes/xorg-lib/libxaw_1.0.4.bb
deleted file mode 100644
index 2ed715d..0000000
--- a/recipes/xorg-lib/libxaw_1.0.4.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Athena Widget Set"
-DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "73671d8f1cf36fdd81395328cc3539c9"
-SRC_URI[archive.sha256sum] = "11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9"
-
-do_install_append () {
- ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
- ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
- ln -sf libXaw7.so.7 ${D}${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*"
-
-XORG_PN = "libXaw"
diff --git a/recipes/xorg-lib/libxcomposite/change-include-order.patch b/recipes/xorg-lib/libxcomposite/change-include-order.patch
deleted file mode 100644
index 630b881..0000000
--- a/recipes/xorg-lib/libxcomposite/change-include-order.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch makes the build use its own Xcomposite.h over rather than an
-older Xcomposite.h that might already be installed in the staging dir.
-
---- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100
-+++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100
-@@ -21,7 +21,7 @@
- # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- # PERFORMANCE OF THIS SOFTWARE.
-
--AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
-+AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
-
- lib_LTLIBRARIES = libXcomposite.la
-
diff --git a/recipes/xorg-lib/libxcomposite_0.3.1.bb b/recipes/xorg-lib/libxcomposite_0.3.1.bb
deleted file mode 100644
index d7f8beb..0000000
--- a/recipes/xorg-lib/libxcomposite_0.3.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Composite extension library."
-LICENSE = "BSD-X"
-DEPENDS += " compositeproto virtual/libx11 libxfixes"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://change-include-order.patch"
-SRC_URI[archive.md5sum] = "a80650d660486ea7bb2e5fd84a83799a"
-SRC_URI[archive.sha256sum] = "d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b"
-
-XORG_PN = "libXcomposite"
diff --git a/recipes/xorg-lib/libxcomposite_0.4.0.bb b/recipes/xorg-lib/libxcomposite_0.4.0.bb
deleted file mode 100644
index 2dff14a..0000000
--- a/recipes/xorg-lib/libxcomposite_0.4.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Composite extension library."
-LICENSE = "BSD-X"
-DEPENDS += " compositeproto virtual/libx11 libxfixes libxext"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://change-include-order.patch"
-SRC_URI[archive.md5sum] = "7e95395dea89be21bae929b9b7f16641"
-SRC_URI[archive.sha256sum] = "7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510"
-
-XORG_PN = "libXcomposite"
diff --git a/recipes/xorg-lib/libxcursor_1.1.8.bb b/recipes/xorg-lib/libxcursor_1.1.8.bb
deleted file mode 100644
index 3f175e8..0000000
--- a/recipes/xorg-lib/libxcursor_1.1.8.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X cursor management library"
-LICENSE = "BSD-X"
-DEPENDS += "libxrender libxfixes"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ec2acd10a7736a85dd1e1ed9ea5bec96"
-SRC_URI[archive.sha256sum] = "8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXcursor"
diff --git a/recipes/xorg-lib/libxcursor_1.1.9.bb b/recipes/xorg-lib/libxcursor_1.1.9.bb
deleted file mode 100644
index 2b363a5..0000000
--- a/recipes/xorg-lib/libxcursor_1.1.9.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X cursor management library"
-LICENSE = "BSD-X"
-DEPENDS += "libxrender libxfixes"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "99b7554037a92b260891091e81815a0a"
-SRC_URI[archive.sha256sum] = "1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXcursor"
diff --git a/recipes/xorg-lib/libxdamage_1.0.4.bb b/recipes/xorg-lib/libxdamage_1.0.4.bb
deleted file mode 100644
index 452c634..0000000
--- a/recipes/xorg-lib/libxdamage_1.0.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Damage extension library."
-LICENSE = "BSD-X"
-DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4d0eece7a8372a7754db1de08c2be324"
-SRC_URI[archive.sha256sum] = "5df90f0efa77e1d6f9e1768a2b0adfc896d09c7a3d8680ed0980511b3625c636"
-
-XORG_PN = "libXdamage"
diff --git a/recipes/xorg-lib/libxdamage_1.1.1.bb b/recipes/xorg-lib/libxdamage_1.1.1.bb
deleted file mode 100644
index cb7eca1..0000000
--- a/recipes/xorg-lib/libxdamage_1.1.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 damaged region extension library"
-LICENSE = "BSD-X"
-DEPENDS += "damageproto libxfixes"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ac0ce6b0063a9858c8f24ddb4c60487d"
-SRC_URI[archive.sha256sum] = "0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e"
-
-XORG_PN = "libXdamage"
diff --git a/recipes/xorg-lib/libxdmcp_1.0.2.bb b/recipes/xorg-lib/libxdmcp_1.0.2.bb
deleted file mode 100644
index 1226afb..0000000
--- a/recipes/xorg-lib/libxdmcp_1.0.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Display Manager Control Protocol library"
-DEPENDS += "xproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "10facf2bc7cbd5e5c1a698b8a210a582"
-SRC_URI[archive.sha256sum] = "f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXdmcp"
diff --git a/recipes/xorg-lib/libxext_1.0.2.bb b/recipes/xorg-lib/libxext_1.0.2.bb
deleted file mode 100644
index 02326de..0000000
--- a/recipes/xorg-lib/libxext_1.0.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Server Extension library"
-PRIORITY = "optional"
-DEPENDS += " xproto virtual/libx11 xextproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "cce89c5b941a493512b534f4847c6111"
-SRC_URI[archive.sha256sum] = "368e4cf5117febd998e6fc40d096b3af19a571adccc5ed49b9d16e482b3a8f8e"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXext"
diff --git a/recipes/xorg-lib/libxext_1.0.3.bb b/recipes/xorg-lib/libxext_1.0.3.bb
deleted file mode 100644
index f8d76b4..0000000
--- a/recipes/xorg-lib/libxext_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 miscellaneous extension library"
-DEPENDS += "xproto virtual/libx11 xextproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1bf6fa1c26f9957d7cc0bd90b038dfa6"
-SRC_URI[archive.sha256sum] = "2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXext"
diff --git a/recipes/xorg-lib/libxext_1.0.4.bb b/recipes/xorg-lib/libxext_1.0.4.bb
deleted file mode 100644
index 1317e5c..0000000
--- a/recipes/xorg-lib/libxext_1.0.4.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 miscellaneous extension library"
-DEPENDS += "xproto virtual/libx11 xextproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a91f1f722ac80c597cf0b75dcb8b48c0"
-SRC_URI[archive.sha256sum] = "2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXext"
diff --git a/recipes/xorg-lib/libxext_1.0.5.bb b/recipes/xorg-lib/libxext_1.0.5.bb
deleted file mode 100644
index 40dbece..0000000
--- a/recipes/xorg-lib/libxext_1.0.5.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 miscellaneous extension library"
-DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "aa11d859cc8e9a0bad3bb55e1666547b"
-SRC_URI[archive.sha256sum] = "1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXext"
diff --git a/recipes/xorg-lib/libxfixes_4.0.3.bb b/recipes/xorg-lib/libxfixes_4.0.3.bb
deleted file mode 100644
index d574764..0000000
--- a/recipes/xorg-lib/libxfixes_4.0.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Fixes extension library."
-LICENSE = "BSD-X"
-DEPENDS += "virtual/libx11 xproto fixesproto xextproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1990d19725a3c7f32290037f02d3737f"
-SRC_URI[archive.sha256sum] = "547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfixes"
diff --git a/recipes/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch b/recipes/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
deleted file mode 100644
index dd30743..0000000
--- a/recipes/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-commit 7670d4a2720c61fbc7b989fed14c676f04ac3ad1
-Author: Dodji Seketeli <dodji@openedhand.com>
-Date: Mon Jul 16 12:24:34 2007 +0200
-
- Remove side effects from BuiltinReadDirectory()
-
- The first time BuiltinReadDirectory() is called,
- save the content of builtin_dir and builtin_alias,
- before calling FontFileAddFontFile(), because that fonction
- will modify those.
-
- Then, in subsequent calls to BuiltinReadDirectory(), restore
- builtin_dir and builtin_alias so that the side effect incurred
- by the first call disappears.
-
-diff --git a/src/builtins/dir.c b/src/builtins/dir.c
-index c272449..97f1e1e 100644
---- a/src/builtins/dir.c
-+++ b/src/builtins/dir.c
-@@ -29,6 +29,133 @@
- #endif
- #include "builtin.h"
-
-+BuiltinDirPtr
-+BuiltinDirsDup (const BuiltinDirPtr a_dirs,
-+ int a_dirs_len)
-+{
-+ BuiltinDirPtr dirs=NULL ;
-+ int i=0 ;
-+
-+ if (!a_dirs)
-+ return NULL ;
-+
-+ dirs = xcalloc (a_dirs_len, sizeof (BuiltinDirRec)) ;
-+ if (!dirs)
-+ return NULL ;
-+
-+ for (i=0; i < a_dirs_len; i++) {
-+ int len = strlen (a_dirs[i].file_name) ;
-+ dirs[i].file_name = xcalloc (1, len) ;
-+ memmove (dirs[i].file_name, a_dirs[i].file_name, len);
-+ len = strlen (a_dirs[i].font_name) ;
-+ dirs[i].font_name = xcalloc (1, len) ;
-+ memmove (dirs[i].font_name, a_dirs[i].font_name, len);
-+ }
-+ return dirs ;
-+}
-+
-+/**
-+ * Copy a_save back into a_cur
-+ * @param a_cur the instance of BuiltinDir to restore
-+ * @param a_saved the saved instance of BuiltinDir to copy into a_cur
-+ * @return 0 if went okay, 1 otherwise.
-+ */
-+int
-+BuiltinDirRestore (BuiltinDirPtr a_cur,
-+ const BuiltinDirPtr a_saved)
-+{
-+ if (!a_cur)
-+ return 1 ;
-+ if (!a_saved)
-+ return 0 ;
-+
-+ if (a_saved->font_name)
-+ memmove (a_cur->font_name, a_saved->font_name, strlen (a_saved->font_name)) ;
-+ return 0 ;
-+}
-+
-+
-+int
-+BuiltinDirsRestore (BuiltinDirPtr a_cur_tab,
-+ const BuiltinDirPtr a_saved_tab,
-+ int a_tab_len)
-+{
-+ int i=0 ;
-+
-+ if (!a_cur_tab)
-+ return 1 ;
-+ if (!a_saved_tab)
-+ return 0 ;
-+
-+ for (i=0 ; i < a_tab_len; i++) {
-+ if (BuiltinDirRestore (&a_cur_tab[i], &a_saved_tab[i]))
-+ return 1 ;
-+ }
-+ return 0 ;
-+}
-+
-+BuiltinAliasPtr
-+BuiltinAliasesDup (const BuiltinAliasPtr a_aliases,
-+ int a_aliases_len)
-+{
-+ BuiltinAliasPtr aliases=NULL ;
-+ int i=0 ;
-+
-+ if (!a_aliases)
-+ return NULL ;
-+
-+ aliases = xcalloc (a_aliases_len, sizeof (BuiltinAliasRec)) ;
-+ if (!aliases)
-+ return NULL ;
-+
-+ for (i=0; i < a_aliases_len; i++) {
-+ int len = strlen (a_aliases[i].font_name) ;
-+ aliases[i].font_name = xcalloc (1, len) ;
-+ memmove (aliases[i].font_name, a_aliases[i].font_name, len);
-+ }
-+ return aliases ;
-+}
-+
-+/**
-+ * Copy a_save back into a_cur
-+ * @param a_cur the instance of BuiltinAlias to restore
-+ * @param a_saved the saved instance of BuiltinAlias to copy into a_cur
-+ * @return 0 if went okay, 1 otherwise.
-+ */
-+int
-+BuiltinAliasRestore (BuiltinAliasPtr a_cur,
-+ const BuiltinAliasPtr a_save)
-+{
-+ if (!a_cur)
-+ return 1 ;
-+ if (!a_save)
-+ return 0 ;
-+ if (a_save->alias_name)
-+ memmove (a_cur->alias_name, a_save->alias_name, strlen (a_save->alias_name)) ;
-+ if (a_save->font_name)
-+ memmove (a_cur->font_name, a_save->font_name, strlen (a_save->font_name)) ;
-+ return 0 ;
-+}
-+
-+int
-+BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab,
-+ const BuiltinAliasPtr a_saved_tab,
-+ int a_tab_len)
-+{
-+ int i=0 ;
-+
-+ if (!a_cur_tab)
-+ return 1 ;
-+ if (!a_saved_tab)
-+ return 0 ;
-+
-+ for (i=0 ; i < a_tab_len; i++) {
-+ if (BuiltinAliasRestore (&a_cur_tab[i], &a_saved_tab[i]))
-+ return 1 ;
-+ }
-+ return 0 ;
-+}
-+
- int
- BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
- {
-@@ -36,6 +163,34 @@ BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
- int i;
-
- dir = FontFileMakeDir ("", builtin_dir_count);
-+ static BuiltinDirPtr saved_builtin_dir ;
-+ static BuiltinAliasPtr saved_builtin_alias ;
-+
-+
-+ if (saved_builtin_dir)
-+ {
-+ BuiltinDirsRestore ((BuiltinDirPtr) builtin_dir,
-+ saved_builtin_dir,
-+ builtin_dir_count) ;
-+ }
-+ else
-+ {
-+ saved_builtin_dir = BuiltinDirsDup ((const BuiltinDirPtr) builtin_dir,
-+ builtin_dir_count) ;
-+ }
-+
-+ if (saved_builtin_alias)
-+ {
-+ BuiltinAliasesRestore ((BuiltinAliasPtr) builtin_alias,
-+ saved_builtin_alias,
-+ builtin_alias_count) ;
-+ }
-+ else
-+ {
-+ saved_builtin_alias = BuiltinAliasesDup ((const BuiltinAliasPtr) builtin_alias,
-+ builtin_alias_count) ;
-+ }
-+
- for (i = 0; i < builtin_dir_count; i++)
- {
- if (!FontFileAddFontFile (dir,
diff --git a/recipes/xorg-lib/libxfont/no-scalable-crash.patch b/recipes/xorg-lib/libxfont/no-scalable-crash.patch
deleted file mode 100644
index 90bded6..0000000
--- a/recipes/xorg-lib/libxfont/no-scalable-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200
-+++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200
-@@ -695,6 +695,11 @@
- */
- if (isscale)
- {
-+ /* If the fontname says it is scalable, make sure that the
-+ * renderer supports OpenScalable and GetInfoScalable.
-+ */
-+ if (renderer->OpenScalable && renderer->GetInfoScalable)
-+ {
- if (vals.values_supplied & SIZE_SPECIFY_MASK)
- {
- bzero((char *)&zeroVals, sizeof(zeroVals));
-@@ -794,6 +799,7 @@
- bitmap->name.name);
- }
- }
-+ }
- }
- return TRUE;
- }
diff --git a/recipes/xorg-lib/libxfont_1.2.7.bb b/recipes/xorg-lib/libxfont_1.2.7.bb
deleted file mode 100644
index b470c8b..0000000
--- a/recipes/xorg-lib/libxfont_1.2.7.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X font library (used by the X server)."
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://no-scalable-crash.patch"
-SRC_URI[archive.md5sum] = "2f2085310f75900044d9dcd469637d26"
-SRC_URI[archive.sha256sum] = "2f8c004c0b914d460e6fd2b48d8b425cf4778d415467fc1f1d938b200462d18b"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfont"
diff --git a/recipes/xorg-lib/libxfont_1.2.8.bb b/recipes/xorg-lib/libxfont_1.2.8.bb
deleted file mode 100644
index 3794cf2..0000000
--- a/recipes/xorg-lib/libxfont_1.2.8.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X font library (used by the X server)."
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://no-scalable-crash.patch"
-SRC_URI[archive.md5sum] = "83b8e21f6ee22512a8f72ba51e2d74f6"
-SRC_URI[archive.sha256sum] = "374a2ca12f62a4d9f09a17a34765a5289cefa9db7f9f0913e1c3731b4088aad8"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfont"
diff --git a/recipes/xorg-lib/libxfont_1.3.0.bb b/recipes/xorg-lib/libxfont_1.3.0.bb
deleted file mode 100644
index c3c9377..0000000
--- a/recipes/xorg-lib/libxfont_1.3.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 font rasterisation library"
-LICENSE = "BSD-X"
-DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://no-scalable-crash.patch \
- file://builtinreaddirectory-no-side-effect.patch"
-SRC_URI[archive.md5sum] = "d1d3fa170d74b066f1f23ca8574e7c90"
-SRC_URI[archive.sha256sum] = "07567b9880f28d1a404389c024a185419bfe81136aef3d9eda52407f34c3d3dd"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfont"
diff --git a/recipes/xorg-lib/libxfont_1.3.1.bb b/recipes/xorg-lib/libxfont_1.3.1.bb
deleted file mode 100644
index 671fd58..0000000
--- a/recipes/xorg-lib/libxfont_1.3.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 font rasterisation library"
-LICENSE = "BSD-X"
-DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://no-scalable-crash.patch"
-SRC_URI[archive.md5sum] = "b2f396b62633819bbdd9748383876e21"
-SRC_URI[archive.sha256sum] = "dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfont"
diff --git a/recipes/xorg-lib/libxfont_1.3.2.bb b/recipes/xorg-lib/libxfont_1.3.2.bb
deleted file mode 100644
index 250433a..0000000
--- a/recipes/xorg-lib/libxfont_1.3.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 font rasterisation library"
-LICENSE = "BSD-X"
-DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://no-scalable-crash.patch"
-SRC_URI[archive.md5sum] = "64f510ebf9679f3a97a3d633cbee4f50"
-SRC_URI[archive.sha256sum] = "c167cfd529b7c67f496ee0bed3c0b43e0107de0f689d387c1c0e23ef7cf3d2f2"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfont"
diff --git a/recipes/xorg-lib/libxfont_1.3.3.bb b/recipes/xorg-lib/libxfont_1.3.3.bb
deleted file mode 100644
index 65b5415..0000000
--- a/recipes/xorg-lib/libxfont_1.3.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 font rasterisation library"
-LICENSE = "BSD-X"
-DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4f174b9613f87cf00d731da428a1b194"
-SRC_URI[archive.sha256sum] = "6171e6bca4bd6333611bd9c63cccc8e8e412d876c72097f0dddc490a9df51d5a"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfont"
diff --git a/recipes/xorg-lib/libxfontcache_1.0.4.bb b/recipes/xorg-lib/libxfontcache_1.0.4.bb
deleted file mode 100644
index f4a079e..0000000
--- a/recipes/xorg-lib/libxfontcache_1.0.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X-TrueType font cache extension client library"
-DEPENDS += "libxext fontcacheproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1adca018aa7bf2d215f20a69c10828ad"
-SRC_URI[archive.sha256sum] = "ffe747cfbf81cdd862af1b05d021ad1ab83b623eab5b32b0a618efb4c0f3e01c"
-
-XORG_PN = "libXfontcache"
diff --git a/recipes/xorg-lib/libxft_2.1.12.bb b/recipes/xorg-lib/libxft_2.1.12.bb
deleted file mode 100644
index 14beef39..0000000
--- a/recipes/xorg-lib/libxft_2.1.12.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "FreeType-based font drawing library for X"
-DEPENDS += "libxrender freetype fontconfig"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1309301e2d979bd475dc58325cb8c056"
-SRC_URI[archive.sha256sum] = "68b46f85caaf0b30c876bd983abe144c25755bee7532e8738ab7ebe29a428986"
-
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/pkgconfig \
- ${datadir}/aclocal ${bindir} ${sbindir}"
-
-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)
-}
-
-XORG_PN = "libXft"
diff --git a/recipes/xorg-lib/libxft_2.1.13.bb b/recipes/xorg-lib/libxft_2.1.13.bb
deleted file mode 100644
index a2219c9..0000000
--- a/recipes/xorg-lib/libxft_2.1.13.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "FreeType-based font drawing library for X"
-DEPENDS += "libxrender freetype fontconfig"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "bc8881851f3bd8dcc625fac37350a1c6"
-SRC_URI[archive.sha256sum] = "ce7688258af34c14af421bcfb306d4310245b727d2417ac968b7f6b2facfde8c"
-
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/pkgconfig \
- ${datadir}/aclocal ${bindir} ${sbindir}"
-
-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)
-}
-
-XORG_PN = "libXft"
diff --git a/recipes/xorg-lib/libxi_1.0.2.bb b/recipes/xorg-lib/libxi_1.0.2.bb
deleted file mode 100644
index 12e49f0..0000000
--- a/recipes/xorg-lib/libxi_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Input extension library."
-DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4a5207a29a6b220e5462129854689844"
-SRC_URI[archive.sha256sum] = "7e6339539d3d0a4fc95cc23ca2b13ae67dd783e011b3cc5ca76040e376bff57f"
-
-XORG_PN = "libXi"
diff --git a/recipes/xorg-lib/libxi_1.1.0.bb b/recipes/xorg-lib/libxi_1.1.0.bb
deleted file mode 100644
index 3ad5dfc..0000000
--- a/recipes/xorg-lib/libxi_1.1.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Input extension library."
-DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c25abbe604029855eb11a3a75fb1f386"
-SRC_URI[archive.sha256sum] = "0f90d7e27d8a7d6bccf9350b6283ffe122e5347fa51d4ea9055653b297339989"
-
-XORG_PN = "libXi"
diff --git a/recipes/xorg-lib/libxi_1.1.2.bb b/recipes/xorg-lib/libxi_1.1.2.bb
deleted file mode 100644
index bff8ba4..0000000
--- a/recipes/xorg-lib/libxi_1.1.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Input extension library"
-DEPENDS += "libxext inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9c4dd85f3e2a75bfb60bd288502bc288"
-SRC_URI[archive.sha256sum] = "4deda13613f03e4524d3cf0ac14b9e20be5044d415cb8478713ecbe47f4de862"
-
-XORG_PN = "libXi"
diff --git a/recipes/xorg-lib/libxi_1.1.3.bb b/recipes/xorg-lib/libxi_1.1.3.bb
deleted file mode 100644
index 039bfc8..0000000
--- a/recipes/xorg-lib/libxi_1.1.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Input extension library"
-DEPENDS += "libxext inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7c510abb0cad8dc20493fb27ff7859d8"
-SRC_URI[archive.sha256sum] = "c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f"
-
-XORG_PN = "libXi"
diff --git a/recipes/xorg-lib/libxi_1.2.0.bb b/recipes/xorg-lib/libxi_1.2.0.bb
deleted file mode 100644
index e6b3da7..0000000
--- a/recipes/xorg-lib/libxi_1.2.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Input extension library"
-DEPENDS += "libxext inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4b88e07d7dd77ca1e786f09066b58c02"
-SRC_URI[archive.sha256sum] = "7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a"
-
-XORG_PN = "libXi"
diff --git a/recipes/xorg-lib/libxinerama_1.0.2.bb b/recipes/xorg-lib/libxinerama_1.0.2.bb
deleted file mode 100644
index 786c294..0000000
--- a/recipes/xorg-lib/libxinerama_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Xinerama extension library"
-DEPENDS += "libxext xineramaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f6fb08eafd3c2909d515f1a07bfca8fd"
-SRC_URI[archive.sha256sum] = "d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d"
-
-XORG_PN = "libXinerama"
diff --git a/recipes/xorg-lib/libxinerama_1.0.3.bb b/recipes/xorg-lib/libxinerama_1.0.3.bb
deleted file mode 100644
index 4e7cc91..0000000
--- a/recipes/xorg-lib/libxinerama_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Xinerama extension library"
-DEPENDS += "libxext xineramaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "cd9f7c46439ac40e0517a302d2434d2c"
-SRC_URI[archive.sha256sum] = "07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219"
-
-XORG_PN = "libXinerama"
diff --git a/recipes/xorg-lib/libxkbfile_1.0.4.bb b/recipes/xorg-lib/libxkbfile_1.0.4.bb
deleted file mode 100644
index d02cec5..0000000
--- a/recipes/xorg-lib/libxkbfile_1.0.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 keyboard file manipulation library"
-LICENSE = "GPL"
-DEPENDS += "virtual/libx11 kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "12b4ceb5d42b520228b5fb40a96ae6c5"
-SRC_URI[archive.sha256sum] = "468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-lib/libxkbfile_1.0.5.bb b/recipes/xorg-lib/libxkbfile_1.0.5.bb
deleted file mode 100644
index 60d3a1b..0000000
--- a/recipes/xorg-lib/libxkbfile_1.0.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 keyboard file manipulation library"
-LICENSE = "GPL"
-DEPENDS += "virtual/libx11 kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0726a845fe5a56551de2718c9f6b0e35"
-SRC_URI[archive.sha256sum] = "0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-lib/libxmu_1.0.3.bb b/recipes/xorg-lib/libxmu_1.0.3.bb
deleted file mode 100644
index b5bc535..0000000
--- a/recipes/xorg-lib/libxmu_1.0.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 miscellaneous utility library"
-DEPENDS += "libxt libxext"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b926b95b811ece3e19cd590db85ee615"
-SRC_URI[archive.sha256sum] = "b56e308e36da8d9cb48433ddb81fd04e26b4f1c695586ac8106ac48a35466d66"
-
-PACKAGES =+ "libxmuu libxmuu-dev"
-
-FILES_libxmuu = "${libdir}/libXmuu.so.*"
-FILES_libxmuu-dev = "${libdir}/libXmuu.so"
-
-LEAD_SONAME = "libXmu"
-
-XORG_PN = "libXmu"
diff --git a/recipes/xorg-lib/libxmu_1.0.4.bb b/recipes/xorg-lib/libxmu_1.0.4.bb
deleted file mode 100644
index 7ebe4c8..0000000
--- a/recipes/xorg-lib/libxmu_1.0.4.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 miscellaneous utility library"
-DEPENDS += "libxt libxext"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fb372a5f3ab42b5ba16d7af4d833a0cb"
-SRC_URI[archive.sha256sum] = "f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0"
-
-PACKAGES =+ "libxmuu libxmuu-dev"
-
-FILES_libxmuu = "${libdir}/libXmuu.so.*"
-FILES_libxmuu-dev = "${libdir}/libXmuu.so"
-
-LEAD_SONAME = "libXmu"
-
-XORG_PN = "libXmu"
diff --git a/recipes/xorg-lib/libxpm_3.5.6.bb b/recipes/xorg-lib/libxpm_3.5.6.bb
deleted file mode 100644
index 977f015..0000000
--- a/recipes/xorg-lib/libxpm_3.5.6.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Pixmap library"
-LICENSE = "X-BSD"
-DEPENDS += "libxext libsm libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "37b7d1826c6a02107269632a93b8791f"
-SRC_URI[archive.sha256sum] = "2d5c5242b8417db6aa758e5be387de33385d9960ff21c801af7d6a4730b4fd0d"
-
-PACKAGES =+ "sxpm cxpm"
-
-FILES_cxpm = "${bindir}/cxpm"
-FILES_sxpm = "${bindir}/sxpm"
-
-XORG_PN = "libXpm"
diff --git a/recipes/xorg-lib/libxpm_3.5.7.bb b/recipes/xorg-lib/libxpm_3.5.7.bb
deleted file mode 100644
index b8ed813..0000000
--- a/recipes/xorg-lib/libxpm_3.5.7.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Pixmap library"
-LICENSE = "X-BSD"
-DEPENDS += "libxext libsm libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "cd15ee542d9f515538b4462a6f79d977"
-SRC_URI[archive.sha256sum] = "64701ae67ce5b0797307b75d8255bec3a0d371d0c50715ea618f5a68bcc92baa"
-
-PACKAGES =+ "sxpm cxpm"
-
-FILES_cxpm = "${bindir}/cxpm"
-FILES_sxpm = "${bindir}/sxpm"
-
-XORG_PN = "libXpm"
diff --git a/recipes/xorg-lib/libxrandr_1.1.2.bb b/recipes/xorg-lib/libxrandr_1.1.2.bb
deleted file mode 100644
index 4fb614c..0000000
--- a/recipes/xorg-lib/libxrandr_1.1.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Resize and Rotate extension library."
-LICENSE = "BSD-X"
-DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "962946952a01650bb43206043a3c0e12"
-SRC_URI[archive.sha256sum] = "ba5adedc37da835a5c9e5a5d457dce13feead64fc364bc4719c41720ca0a3c50"
-
-BBCLASSEXTEND = "nativesdk"
-
-XORG_PN = "libXrandr"
diff --git a/recipes/xorg-lib/libxrandr_1.2.2.bb b/recipes/xorg-lib/libxrandr_1.2.2.bb
deleted file mode 100644
index 2038f8a..0000000
--- a/recipes/xorg-lib/libxrandr_1.2.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Resize and Rotate extension library"
-LICENSE = "BSD-X"
-DEPENDS += "randrproto libxrender libxext"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1b244b5d19f0ccab01d7083436cd3558"
-SRC_URI[archive.sha256sum] = "206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98"
-
-BBCLASSEXTEND = "nativesdk"
-
-XORG_PN = "libXrandr"
diff --git a/recipes/xorg-lib/libxrandr_1.2.3.bb b/recipes/xorg-lib/libxrandr_1.2.3.bb
deleted file mode 100644
index 22ab29d..0000000
--- a/recipes/xorg-lib/libxrandr_1.2.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Resize and Rotate extension library"
-LICENSE = "BSD-X"
-DEPENDS += "randrproto libxrender libxext"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5cd67cc02a50c9644ba0a1846ea3b08e"
-SRC_URI[archive.sha256sum] = "f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267"
-
-BBCLASSEXTEND = "nativesdk"
-
-XORG_PN = "libXrandr"
diff --git a/recipes/xorg-lib/libxrender_0.9.2.bb b/recipes/xorg-lib/libxrender_0.9.2.bb
deleted file mode 100644
index c67495a..0000000
--- a/recipes/xorg-lib/libxrender_0.9.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Rendering Extension client library"
-LICENSE = "BSD-X"
-DEPENDS += "virtual/libx11 renderproto xproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2f1b2c6e8dcbcb6d760e59f445abd92c"
-SRC_URI[archive.sha256sum] = "0f749183ab1a0ece14d33c3299b3f70893122349c0bfa9d7bd0e66ce19d1802a"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXrender"
diff --git a/recipes/xorg-lib/libxrender_0.9.3.bb b/recipes/xorg-lib/libxrender_0.9.3.bb
deleted file mode 100644
index 82b0143..0000000
--- a/recipes/xorg-lib/libxrender_0.9.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Rendering Extension client library"
-LICENSE = "BSD-X"
-DEPENDS += "virtual/libx11 renderproto xproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "307132fce2e551ad2c641bddf8480f16"
-SRC_URI[archive.sha256sum] = "9882ba2d74e9ca5cfd0c2231ac8eba14d8fc59d538c787fa639f8d77c996bbef"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXrender"
diff --git a/recipes/xorg-lib/libxrender_0.9.4.bb b/recipes/xorg-lib/libxrender_0.9.4.bb
deleted file mode 100644
index 4543a9e..0000000
--- a/recipes/xorg-lib/libxrender_0.9.4.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Rendering Extension client library"
-LICENSE = "BSD-X"
-DEPENDS += "virtual/libx11 renderproto xproto libxdmcp"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "dc266e850c51368f964e0d67bf5fb5e6"
-SRC_URI[archive.sha256sum] = "5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXrender"
diff --git a/recipes/xorg-lib/libxres_1.0.3.bb b/recipes/xorg-lib/libxres_1.0.3.bb
deleted file mode 100644
index 9a1aa01..0000000
--- a/recipes/xorg-lib/libxres_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Resource extension library"
-DEPENDS += "libxext resourceproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "de66ffb657aba64c9d6dbdeabb757f3e"
-SRC_URI[archive.sha256sum] = "a6d5ba7573f5ec0f091095f01b51d1e671dd0f14acb5b8559cdf366e398a0230"
-
-XORG_PN = "libXres"
diff --git a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb b/recipes/xorg-lib/libxscrnsaver_1.1.2.bb
deleted file mode 100644
index db164d2..0000000
--- a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Screen Saver extension library"
-LICENSE = "GPL"
-DEPENDS += "libxext scrnsaverproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ac2d697dd02f51e5c15f7104f4be5328"
-SRC_URI[archive.sha256sum] = "6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67"
-
-RREPLACES_${PN} = "libxss"
-
-XORG_PN = "libXScrnSaver"
diff --git a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb b/recipes/xorg-lib/libxscrnsaver_1.1.3.bb
deleted file mode 100644
index 2cc2c81..0000000
--- a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Screen Saver extension library"
-LICENSE = "GPL"
-DEPENDS += "libxext scrnsaverproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "93f84b6797f2f29cae1ce23b0355d00d"
-SRC_URI[archive.sha256sum] = "4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988"
-
-RREPLACES_${PN} = "libxss"
-
-XORG_PN = "libXScrnSaver"
diff --git a/recipes/xorg-lib/libxt/pr10970-header-fix.patch b/recipes/xorg-lib/libxt/pr10970-header-fix.patch
deleted file mode 100644
index 2acafb8..0000000
--- a/recipes/xorg-lib/libxt/pr10970-header-fix.patch
+++ /dev/null
@@ -1,512 +0,0 @@
-diff --git a/include/X11/CallbackI.h b/include/X11/CallbackI.h
-index 4ae08ab..64e8152 100644
---- a/include/X11/CallbackI.h
-+++ b/include/X11/CallbackI.h
-@@ -58,6 +58,8 @@ typedef XrmResource **CallbackTable;
- #define _XtCBCalling 1
- #define _XtCBFreeAfterCalling 2
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct internalCallbackRec {
- unsigned short count;
- char is_padded; /* contains NULL padding for external form */
-@@ -115,3 +117,5 @@ extern void _XtCallConditionalCallbackList(
- XtPointer /* call_data */,
- _XtConditionProc /* cond_proc */
- );
-+
-+_XFUNCPROTOEND
-diff --git a/include/X11/CompositeP.h b/include/X11/CompositeP.h
-index ed055b2..e93275a 100644
---- a/include/X11/CompositeP.h
-+++ b/include/X11/CompositeP.h
-@@ -52,6 +52,8 @@ SOFTWARE.
-
- #include <X11/Composite.h>
-
-+_XFUNCPROTOBEGIN
-+
- /************************************************************************
- *
- * Additional instance fields for widgets of (sub)class 'Composite'
-@@ -101,6 +103,8 @@ typedef struct _CompositeClassRec {
-
- externalref CompositeClassRec compositeClassRec;
-
-+_XFUNCPROTOEND
-+
- #define XtCompositeExtensionVersion 2L
- #define XtInheritGeometryManager ((XtGeometryHandler) _XtInherit)
- #define XtInheritChangeManaged ((XtWidgetProc) _XtInherit)
-diff --git a/include/X11/ConstrainP.h b/include/X11/ConstrainP.h
-index a90d19a..7030a34 100644
---- a/include/X11/ConstrainP.h
-+++ b/include/X11/ConstrainP.h
-@@ -52,6 +52,8 @@ SOFTWARE.
-
- #include <X11/Constraint.h>
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct _ConstraintPart {
- XtPointer mumble; /* No new fields, keep C compiler happy */
- } ConstraintPart;
-@@ -88,6 +90,8 @@ typedef struct _ConstraintClassRec {
-
- externalref ConstraintClassRec constraintClassRec;
-
-+_XFUNCPROTOEND
-+
- #define XtConstraintExtensionVersion 1L
-
- #endif /* _XtConstraintP_h */
-diff --git a/include/X11/Constraint.h b/include/X11/Constraint.h
-index 9bb962e..b8bd902 100644
---- a/include/X11/Constraint.h
-+++ b/include/X11/Constraint.h
-@@ -50,11 +50,15 @@ SOFTWARE.
- #ifndef _XtConstraint_h
- #define _XtConstraint_h
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct _ConstraintClassRec *ConstraintWidgetClass;
-
- #ifndef CONSTRAINT
- externalref WidgetClass constraintWidgetClass;
- #endif
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtConstraint_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/ConvertI.h b/include/X11/ConvertI.h
-index 02c0e5c..f3f7fb0 100644
---- a/include/X11/ConvertI.h
-+++ b/include/X11/ConvertI.h
-@@ -48,6 +48,8 @@ SOFTWARE.
- ******************************************************************/
- /* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */
-
-+_XFUNCPROTOBEGIN
-+
- /* Representation types */
-
- extern XrmQuark _XtQString;
-@@ -94,3 +96,4 @@ extern Boolean _XtConvert(
-
- void _XtConvertInitialize(void);
-
-+_XFUNCPROTOEND
-diff --git a/include/X11/Core.h b/include/X11/Core.h
-index ff6cb75..e1a7c28 100644
---- a/include/X11/Core.h
-+++ b/include/X11/Core.h
-@@ -53,6 +53,8 @@ SOFTWARE.
- #ifndef _XtCore_h
- #define _XtCore_h
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct _WidgetClassRec *CoreWidgetClass;
- typedef struct _WidgetRec *CoreWidget;
- externalref WidgetClass coreWidgetClass;
-@@ -62,5 +64,7 @@ externalref WidgetClass widgetClass;
-
- #endif
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtCore_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/CoreP.h b/include/X11/CoreP.h
-index e07f085..57836e6 100644
---- a/include/X11/CoreP.h
-+++ b/include/X11/CoreP.h
-@@ -55,6 +55,8 @@ SOFTWARE.
-
- #include <X11/Core.h>
-
-+_XFUNCPROTOBEGIN
-+
- externalref int _XtInheritTranslations;
-
- #define XtInheritTranslations ((String) &_XtInheritTranslations)
-@@ -167,5 +169,7 @@ typedef struct _WidgetClassRec {
- externalref WidgetClassRec widgetClassRec;
- #define coreClassRec widgetClassRec
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtCoreP_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/CreateI.h b/include/X11/CreateI.h
-index 87abb1d..e0ca9a3 100644
---- a/include/X11/CreateI.h
-+++ b/include/X11/CreateI.h
-@@ -3,6 +3,8 @@
- #ifndef _XtcreateI_h
- #define _XtcreateI_h
-
-+_XFUNCPROTOBEGIN
-+
- extern Widget _XtCreateWidget(String name, WidgetClass widget_class,
- Widget parent, ArgList args, Cardinal num_args,
- XtTypedArgList typed_args,
-@@ -18,9 +20,12 @@ extern Widget _XtAppCreateShell(String name, String class,
- Cardinal num_typed_args);
- extern Widget _XtCreateHookObj(Screen *screen);
-
-+_XFUNCPROTOEND
-
- #include <stdarg.h>
-
-+_XFUNCPROTOBEGIN
-+
- /* VarCreate.c */
- extern Widget _XtVaOpenApplication(XtAppContext *app_context_return,
- _Xconst char* application_class,
-@@ -34,4 +39,6 @@ extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,
- int *argc_in_out, String *argv_in_out,
- String *fallback_resources, va_list var_args);
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtcreateI_h */
-diff --git a/include/X11/EventI.h b/include/X11/EventI.h
-index 00858e7..d2d1d0f 100644
---- a/include/X11/EventI.h
-+++ b/include/X11/EventI.h
-@@ -65,6 +65,8 @@ typedef struct _XtGrabRec *XtGrabList;
-
- #include "PassivGraI.h"
-
-+_XFUNCPROTOBEGIN
-+
- extern void _XtEventInitialize(
- void
- );
-@@ -131,4 +133,6 @@ extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr,
- /* NextEvent.c */
- extern Boolean XtAppPeekEvent_SkipTimer;
-
-+_XFUNCPROTOEND
-+
- #endif /* _Event_h_ */
-diff --git a/include/X11/HookObjI.h b/include/X11/HookObjI.h
-index c9a22a2..c0858c2 100644
---- a/include/X11/HookObjI.h
-+++ b/include/X11/HookObjI.h
-@@ -29,6 +29,8 @@ in this Software without prior written authorization from The Open Group.
- #ifndef _XtHookObjI_h
- #define _XtHookObjI_h
-
-+_XFUNCPROTOBEGIN
-+
- /* This object is implementation-dependent and private to the library. */
-
- typedef struct _HookObjRec *HookObject;
-@@ -66,6 +68,8 @@ typedef struct _HookObjClassRec {
-
- externalref HookObjClassRec hookObjClassRec;
-
-+_XFUNCPROTOEND
-+
- #endif /* ifndef _Xt_HookObjI_h */
-
-
-diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h
-index c2fe47c..2ae9b74 100644
---- a/include/X11/InitialI.h
-+++ b/include/X11/InitialI.h
-@@ -84,6 +84,8 @@ SOFTWARE.
- #include <X11/Xos.h>
- #include <X11/Xpoll.h>
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct _TimerEventRec {
- struct timeval te_timer_value;
- struct _TimerEventRec *te_next;
-@@ -426,4 +428,6 @@ extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
- String *applName, String *displayName,
- String *language);
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtinitialI_h */
-diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h
-index d749867..d88166f 100644
---- a/include/X11/IntrinsicI.h
-+++ b/include/X11/IntrinsicI.h
-@@ -194,6 +194,8 @@ SOFTWARE.
- #define ERRORDB "/usr/lib/X11/XtErrorDB"
- #endif
-
-+_XFUNCPROTOBEGIN
-+
- extern String XtCXtToolkitError;
-
- extern void _XtAllocError(
-@@ -257,5 +259,7 @@ extern char* __XtCalloc (
- #define __XtCalloc XtCalloc
- #endif
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtintrinsicI_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/Object.h b/include/X11/Object.h
-index 96723b1..2c84aaf 100644
---- a/include/X11/Object.h
-+++ b/include/X11/Object.h
-@@ -50,11 +50,16 @@ SOFTWARE.
- #ifndef _XtObject_h
- #define _XtObject_h
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct _ObjectRec *Object;
- typedef struct _ObjectClassRec *ObjectClass;
-
- #ifndef OBJECT
- externalref WidgetClass objectClass;
- #endif
-+
-+_XFUNCPROTOEND
-+
- #endif /* _XtObject_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/ObjectP.h b/include/X11/ObjectP.h
-index a24564e..0f484d2 100644
---- a/include/X11/ObjectP.h
-+++ b/include/X11/ObjectP.h
-@@ -52,6 +52,8 @@ SOFTWARE.
-
- #include <X11/Object.h>
-
-+_XFUNCPROTOBEGIN
-+
- /**********************************************************
- * Object Instance Data Structures
- *
-@@ -132,6 +134,8 @@ typedef struct _ObjectClassRec {
-
- externalref ObjectClassRec objectClassRec;
-
-+_XFUNCPROTOEND
-+
- #define XtObjectExtensionVersion 1L
- #define XtInheritAllocate ((XtAllocateProc) _XtInherit)
- #define XtInheritDeallocate ((XtDeallocateProc) _XtInherit)
-diff --git a/include/X11/PassivGraI.h b/include/X11/PassivGraI.h
-index 02e2964..10591ac 100644
---- a/include/X11/PassivGraI.h
-+++ b/include/X11/PassivGraI.h
-@@ -60,6 +60,8 @@ in this Software without prior written authorization from The Open Group.
- #define KEYBOARD TRUE
- #define POINTER FALSE
-
-+_XFUNCPROTOBEGIN
-+
- typedef enum {
- XtNoServerGrab,
- XtPassiveServerGrab,
-@@ -183,4 +185,6 @@ extern void _XtClearAncestorCache(
- Widget /* widget */
- );
-
-+_XFUNCPROTOEND
-+
- #endif /* _PDI_h_ */
-diff --git a/include/X11/RectObj.h b/include/X11/RectObj.h
-index 07615fa..dced5c3 100644
---- a/include/X11/RectObj.h
-+++ b/include/X11/RectObj.h
-@@ -50,11 +50,16 @@ SOFTWARE.
- #ifndef _XtRect_h
- #define _XtRect_h
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct _RectObjRec *RectObj;
- typedef struct _RectObjClassRec *RectObjClass;
-
- #ifndef RECTOBJ
- externalref WidgetClass rectObjClass;
- #endif
-+
-+_XFUNCPROTOEND
-+
- #endif /* _XtRect_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/RectObjP.h b/include/X11/RectObjP.h
-index ca3b8ad..d6ffb78 100644
---- a/include/X11/RectObjP.h
-+++ b/include/X11/RectObjP.h
-@@ -53,6 +53,8 @@ SOFTWARE.
- #include <X11/RectObj.h>
- #include <X11/ObjectP.h>
-
-+_XFUNCPROTOBEGIN
-+
- /**********************************************************
- * Rectangle Object Instance Data Structures
- *
-@@ -126,4 +128,6 @@ typedef struct _RectObjClassRec {
-
- externalref RectObjClassRec rectObjClassRec;
-
-+_XFUNCPROTOEND
-+
- #endif /*_Xt_RectObjP_h_*/
-diff --git a/include/X11/ResourceI.h b/include/X11/ResourceI.h
-index d6ed1df..3db97f8 100644
---- a/include/X11/ResourceI.h
-+++ b/include/X11/ResourceI.h
-@@ -61,6 +61,8 @@ SOFTWARE.
- #define StringToName(string) XrmStringToName(string)
- #define StringToClass(string) XrmStringToClass(string)
-
-+_XFUNCPROTOBEGIN
-+
- extern void _XtDependencies(
- XtResourceList * /* class_resp */,
- Cardinal * /* class_num_resp */,
-@@ -96,5 +98,6 @@ extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources,
- Cardinal num_resources);
- extern void _XtResourceListInitialize(void);
-
-+_XFUNCPROTOEND
-
- #endif /* _XtresourceI_h */
-diff --git a/include/X11/ShellP.h b/include/X11/ShellP.h
-index 2b08c3f..7297d33 100644
---- a/include/X11/ShellP.h
-+++ b/include/X11/ShellP.h
-@@ -67,6 +67,8 @@ SOFTWARE.
- * *****
- */
-
-+_XFUNCPROTOBEGIN
-+
- /***********************************************************************
- *
- * Shell Widget Private Data
-@@ -214,8 +216,12 @@ typedef struct {
- WMShellPart wm;
- } WMShellRec, *WMShellWidget;
-
-+_XFUNCPROTOEND
-+
- #include <X11/VendorP.h>
-
-+_XFUNCPROTOBEGIN
-+
- /***********************************************************************
- *
- * TransientShell Widget Private Data
-@@ -425,4 +431,6 @@ typedef struct {
- SessionShellPart session;
- } SessionShellRec, *SessionShellWidget;
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtShellPrivate_h */
-diff --git a/include/X11/ThreadsI.h b/include/X11/ThreadsI.h
-index 1492d77..28cbc98 100644
---- a/include/X11/ThreadsI.h
-+++ b/include/X11/ThreadsI.h
-@@ -81,6 +81,8 @@ typedef void (*ThreadAppRestoreLockProc)(
- Boolean* /* pushed_thread */
- );
-
-+_XFUNCPROTOBEGIN
-+
- extern void (*_XtProcessLock)(
- void
- );
-@@ -93,6 +95,8 @@ extern void (*_XtInitAppLock)(
- XtAppContext /* app */
- );
-
-+_XFUNCPROTOEND
-+
- #define INIT_APP_LOCK(app) if(_XtInitAppLock) (*_XtInitAppLock)(app)
- #define FREE_APP_LOCK(app) if(app && app->free_lock)(*app->free_lock)(app)
-
-diff --git a/include/X11/TranslateI.h b/include/X11/TranslateI.h
-index 1224875..6cc3099 100644
---- a/include/X11/TranslateI.h
-+++ b/include/X11/TranslateI.h
-@@ -342,6 +342,8 @@ typedef struct _TMGlobalRec{
- #endif /* TRACE_TM */
- }TMGlobalRec;
-
-+_XFUNCPROTOBEGIN
-+
- extern TMGlobalRec _XtGlobalTM;
-
- #define TM_MOD_SEGMENT_SIZE 16
-@@ -604,3 +606,4 @@ extern void _XtUnmergeTranslations(
- /* TMKey.c */
- extern void _XtAllocTMContext(XtPerDisplay pd);
-
-+_XFUNCPROTOEND
-diff --git a/include/X11/VarargsI.h b/include/X11/VarargsI.h
-index e15404a..76ce9bc 100644
---- a/include/X11/VarargsI.h
-+++ b/include/X11/VarargsI.h
-@@ -34,6 +34,8 @@ in this Software without prior written authorization from The Open Group.
-
- /* private routines */
-
-+_XFUNCPROTOBEGIN
-+
- extern void _XtCountVaList(
- va_list /*var*/, int* /*total_count*/, int* /*typed_count*/
- );
-@@ -62,4 +64,6 @@ extern void _XtGetSubresources(
- Widget /*w*/, XtPointer /*base*/, const char* /*name*/, const char* /*class*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/
- );
-
-+_XFUNCPROTOEND
-+
- #endif /* _VarargsI_h_ */
-diff --git a/include/X11/Vendor.h b/include/X11/Vendor.h
-index 65e7c38..633d17a 100644
---- a/include/X11/Vendor.h
-+++ b/include/X11/Vendor.h
-@@ -65,7 +65,11 @@ SOFTWARE.
-
- typedef struct _VendorShellClassRec *VendorShellWidgetClass;
-
-+_XFUNCPROTOBEGIN
-+
- externalref WidgetClass vendorShellWidgetClass;
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtVendor_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/VendorP.h b/include/X11/VendorP.h
-index 08bf689..e60857d 100644
---- a/include/X11/VendorP.h
-+++ b/include/X11/VendorP.h
-@@ -72,6 +72,8 @@ SOFTWARE.
-
- /* New fields for the VendorShell widget class record */
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct {
- XtPointer extension; /* pointer to extension record */
- } VendorShellClassPart;
-@@ -100,4 +102,6 @@ typedef struct {
- VendorShellPart vendor;
- } VendorShellRec, *VendorShellWidget;
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtVendorPrivate_h */
diff --git a/recipes/xorg-lib/libxt_1.0.4.bb b/recipes/xorg-lib/libxt_1.0.4.bb
deleted file mode 100644
index 7dd9863..0000000
--- a/recipes/xorg-lib/libxt_1.0.4.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Toolkit Intrinsics"
-PRIORITY = "optional"
-DEPENDS += " libsm virtual/libx11 xproto kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://pr10970-header-fix.patch"
-SRC_URI[archive.md5sum] = "937735f342c046db239852fec0413f6c"
-SRC_URI[archive.sha256sum] = "ec7088b2ffe8f56c177525283601fb048decaf6f175d9ee5db01e12810a4d345"
-
-EXTRA_OECONF = "--enable-malloc0returnsnull --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 ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
- ) || exit 1
- oe_runmake
-}
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXt"
diff --git a/recipes/xorg-lib/libxt_1.0.5.bb b/recipes/xorg-lib/libxt_1.0.5.bb
deleted file mode 100644
index 7bdf252..0000000
--- a/recipes/xorg-lib/libxt_1.0.5.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 toolkit intrinsics library"
-DEPENDS += "libsm virtual/libx11 kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://pr10970-header-fix.patch"
-SRC_URI[archive.md5sum] = "f3bdd67785ace8cd0b23249e9d8c9975"
-SRC_URI[archive.sha256sum] = "43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4"
-
-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
-}
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXt"
diff --git a/recipes/xorg-lib/libxtst_1.0.2.bb b/recipes/xorg-lib/libxtst_1.0.2.bb
deleted file mode 100644
index ff87f7c..0000000
--- a/recipes/xorg-lib/libxtst_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Test Extension: client side library"
-DEPENDS += "libxext recordproto inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "032d5c1d3914fc0224837328c88aef96"
-SRC_URI[archive.sha256sum] = "eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b"
-
-XORG_PN = "libXtst"
diff --git a/recipes/xorg-lib/libxtst_1.0.3.bb b/recipes/xorg-lib/libxtst_1.0.3.bb
deleted file mode 100644
index 56dfae5..0000000
--- a/recipes/xorg-lib/libxtst_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Test Extension: client side library"
-DEPENDS += "libxext recordproto inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "090c1ad04e34982eada5cf3b1a0792fd"
-SRC_URI[archive.sha256sum] = "b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905"
-
-XORG_PN = "libXtst"
diff --git a/recipes/xorg-lib/libxv_1.0.3.bb b/recipes/xorg-lib/libxv_1.0.3.bb
deleted file mode 100644
index 4f19126..0000000
--- a/recipes/xorg-lib/libxv_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Video extension library"
-LICENSE = "GPL"
-DEPENDS += "libxext videoproto"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f1c4109fa804aeaf7188b66c5cdd9f57"
-SRC_URI[archive.sha256sum] = "f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b"
-
-XORG_PN = "libXv"
diff --git a/recipes/xorg-lib/libxv_1.0.4.bb b/recipes/xorg-lib/libxv_1.0.4.bb
deleted file mode 100644
index be5a50c..0000000
--- a/recipes/xorg-lib/libxv_1.0.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Video extension library"
-LICENSE = "GPL"
-DEPENDS += "libxext videoproto"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "723a0275227165383e967a1ca8899b52"
-SRC_URI[archive.sha256sum] = "4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8"
-
-XORG_PN = "libXv"
diff --git a/recipes/xorg-lib/libxvmc/drm.patch b/recipes/xorg-lib/libxvmc/drm.patch
deleted file mode 100644
index d48cdb3..0000000
--- a/recipes/xorg-lib/libxvmc/drm.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- XvMC/hw/via/Makefile.am.old 2005-03-06 11:25:11.000000000 +0000
-+++ XvMC/hw/via/Makefile.am 2005-03-06 11:25:22.000000000 +0000
-@@ -1,5 +1,5 @@
- AM_CFLAGS = $(XVMC_CFLAGS)
--libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
-+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm
-
- lib_LTLIBRARIES = libviaXvMC.la
-
diff --git a/recipes/xorg-lib/libxvmc/true.patch b/recipes/xorg-lib/libxvmc/true.patch
deleted file mode 100644
index 7059295..0000000
--- a/recipes/xorg-lib/libxvmc/true.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- XvMC/hw/via/viaXvMC.c.old 2004-10-18 20:54:49.000000000 +0100
-+++ XvMC/hw/via/viaXvMC.c 2004-10-18 20:55:03.000000000 +0100
-@@ -43,6 +43,8 @@
- #include <xf86drm.h>
- #include <pthread.h>
- #include "vldXvMC.h"
-+
-+#define TRUE 1
-
- #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \
- (((CARD8 *)(ctx)->sAreaAddress) + \
diff --git a/recipes/xorg-lib/libxvmc/via.patch b/recipes/xorg-lib/libxvmc/via.patch
deleted file mode 100644
index 21cdfbd..0000000
--- a/recipes/xorg-lib/libxvmc/via.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- XvMC/configure.ac.old 2004-09-18 13:16:31.000000000 +0100
-+++ XvMC/configure.ac 2004-09-18 13:16:32.000000000 +0100
-@@ -14,4 +14,5 @@
- AC_OUTPUT([Makefile
- hw/Makefile
- hw/i810/Makefile
-+ hw/via/Makefile
- xvmc.pc])
---- /dev/null 2004-06-13 02:32:19.000000000 +0100
-+++ XvMC/hw/via/Makefile.am 2004-09-18 13:16:01.000000000 +0100
-@@ -0,0 +1,7 @@
-+AM_CFLAGS = $(XVMC_CFLAGS)
-+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
-+
-+lib_LTLIBRARIES = libviaXvMC.la
-+
-+libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \
-+ viaXvMCPriv.h
---- XvMC/hw/Makefile.am.old 2004-10-17 22:34:27.000000000 +0100
-+++ XvMC/hw/Makefile.am 2004-10-17 22:34:31.000000000 +0100
-@@ -1 +1 @@
--SUBDIRS = i810
-+SUBDIRS = i810 via
diff --git a/recipes/xorg-lib/libxvmc_1.0.4.bb b/recipes/xorg-lib/libxvmc_1.0.4.bb
deleted file mode 100644
index 003c5be..0000000
--- a/recipes/xorg-lib/libxvmc_1.0.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Video Motion Compensation extension library"
-DEPENDS += "libxext libxv videoproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b54600573daf9d1a29b952e8d35b389e"
-SRC_URI[archive.sha256sum] = "1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb"
-
-XORG_PN = "libXvMC"
diff --git a/recipes/xorg-lib/libxvmc_1.0.5.bb b/recipes/xorg-lib/libxvmc_1.0.5.bb
deleted file mode 100644
index cdd965a..0000000
--- a/recipes/xorg-lib/libxvmc_1.0.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Video Motion Compensation extension library"
-DEPENDS += "libxext libxv videoproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "16c3a11add14979beb7510e44623cac6"
-SRC_URI[archive.sha256sum] = "0644c768d28343af0efe0cb09fc9e0220b8ad755642bb498a3038cee328fde7f"
-
-XORG_PN = "libXvMC"
diff --git a/recipes/xorg-lib/libxxf86dga_1.0.1.bb b/recipes/xorg-lib/libxxf86dga_1.0.1.bb
deleted file mode 100644
index 6d51967..0000000
--- a/recipes/xorg-lib/libxxf86dga_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Direct Graphics Access extension library"
-DEPENDS += "libxext xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5b0e752c71a23e9d1290cad44a7c7c75"
-SRC_URI[archive.sha256sum] = "8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9"
-
-XORG_PN = "libXxf86dga"
diff --git a/recipes/xorg-lib/libxxf86dga_1.0.2.bb b/recipes/xorg-lib/libxxf86dga_1.0.2.bb
deleted file mode 100644
index b311537..0000000
--- a/recipes/xorg-lib/libxxf86dga_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Direct Graphics Access extension library"
-DEPENDS += "libxext xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6f5f621804ee652b6cc6f2025c517c78"
-SRC_URI[archive.sha256sum] = "59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25"
-
-XORG_PN = "libXxf86dga"
diff --git a/recipes/xorg-lib/libxxf86misc_1.0.1.bb b/recipes/xorg-lib/libxxf86misc_1.0.1.bb
deleted file mode 100644
index 91a7123..0000000
--- a/recipes/xorg-lib/libxxf86misc_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 XFree86 miscellaneous extension library"
-DEPENDS += "libxext xf86miscproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7cee0df63903cef7f7a3fb68cdd99eef"
-SRC_URI[archive.sha256sum] = "2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289"
-
-XORG_PN = "libXxf86misc"
diff --git a/recipes/xorg-lib/libxxf86vm_1.0.1.bb b/recipes/xorg-lib/libxxf86vm_1.0.1.bb
deleted file mode 100644
index b13707c..0000000
--- a/recipes/xorg-lib/libxxf86vm_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 XFree86 video mode extension library"
-DEPENDS += "libxext xf86vidmodeproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8de1ca6c55aaad7d8cae19b4f0b3da32"
-SRC_URI[archive.sha256sum] = "e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a"
-
-XORG_PN = "libXxf86vm"
diff --git a/recipes/xorg-lib/libxxf86vm_1.0.2.bb b/recipes/xorg-lib/libxxf86vm_1.0.2.bb
deleted file mode 100644
index e693362..0000000
--- a/recipes/xorg-lib/libxxf86vm_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 XFree86 video mode extension library"
-DEPENDS += "libxext xf86vidmodeproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "304d37bd0a10d9b58aa9b64469ad73e5"
-SRC_URI[archive.sha256sum] = "3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de"
-
-XORG_PN = "libXxf86vm"
diff --git a/recipes/xorg-lib/pixman-0.12.0/pixman-arm.patch b/recipes/xorg-lib/pixman-0.12.0/pixman-arm.patch
new file mode 100644
index 0000000..91dda03
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.12.0/pixman-arm.patch
@@ -0,0 +1,632 @@
+From: Jeff Muizelaar <jmuizelaar@mozilla.com>
+Date: Wed, 17 Sep 2008 19:53:20 +0000 (-0400)
+Subject: Add support for ARMv6 SIMD fastpaths.
+X-Git-Url: http://gitweb.freedesktop.org/?p=pixman.git;a=commitdiff;h=d0b181f347ef4720d130beee3f03196afbd28aba
+
+Add support for ARMv6 SIMD fastpaths.
+---
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -277,6 +277,44 @@ AC_SUBST(VMX_CFLAGS)
+
+ AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
+
++dnl Check for ARM
++
++have_armv6_simd=no
++AC_MSG_CHECKING(whether to use ARM assembler)
++xserver_save_CFLAGS=$CFLAGS
++CFLAGS="$CFLAGS $ARM_CFLAGS"
++AC_COMPILE_IFELSE([
++int main () {
++ asm("uqadd8 r1, r1, r2");
++ return 0;
++}], have_armv6_simd=yes)
++CFLAGS=$xserver_save_CFLAGS
++
++AC_ARG_ENABLE(arm,
++ [AC_HELP_STRING([--disable-arm],
++ [disable ARM fast paths])],
++ [enable_arm=$enableval], [enable_arm=auto])
++
++if test $enable_arm = no ; then
++ have_armv6_simd=disabled
++fi
++
++if test $have_armv6_simd = yes ; then
++ AC_DEFINE(USE_ARM, 1, [use ARM compiler intrinsics])
++else
++ ARM_CFLAGS=
++fi
++
++AC_MSG_RESULT($have_armv6_simd)
++if test $enable_arm = yes && test $have_armv6_simd = no ; then
++ AC_MSG_ERROR([ARM intrinsics not detected])
++fi
++
++AC_SUBST(ARM_CFLAGS)
++
++AM_CONDITIONAL(USE_ARM, test $have_armv6_simd = yes)
++
++
+ AC_ARG_ENABLE(gtk,
+ [AC_HELP_STRING([--enable-gtk],
+ [enable tests using GTK+ [default=auto]])],
+--- a/pixman/Makefile.am
++++ b/pixman/Makefile.am
+@@ -79,3 +79,15 @@ libpixman_sse2_la_LIBADD = $(DEP_LIBS)
+ libpixman_1_la_LIBADD += libpixman-sse2.la
+ endif
+
++# arm code
++if USE_ARM
++noinst_LTLIBRARIES += libpixman-arm.la
++libpixman_arm_la_SOURCES = \
++ pixman-arm.c \
++ pixman-arm.h
++libpixman_arm_la_CFLAGS = $(DEP_CFLAGS) $(ARM_CFLAGS)
++libpixman_arm_la_LIBADD = $(DEP_LIBS)
++libpixman_1_la_LIBADD += libpixman-arm.la
++endif
++
++
+--- /dev/null
++++ b/pixman/pixman-arm.c
+@@ -0,0 +1,409 @@
++/*
++ * Copyright © 2008 Mozilla Corporation
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Mozilla Corporation not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Mozilla Corporation makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ *
++ * Author: Jeff Muizelaar (jeff@infidigm.net)
++ *
++ */
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include "pixman-arm.h"
++
++void
++fbCompositeSrcAdd_8000x8000arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint8_t *dstLine, *dst;
++ uint8_t *srcLine, *src;
++ int dstStride, srcStride;
++ uint16_t w;
++ uint8_t s, d;
++
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1);
++ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
++
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ while (w && (unsigned long)dst & 3)
++ {
++ s = *src;
++ d = *dst;
++ asm("uqadd8 %0, %1, %2" : "+r"(d) : "r"(s));
++ *dst = d;
++
++ dst++;
++ src++;
++ w--;
++ }
++
++ while (w >= 4)
++ {
++ asm("uqadd8 %0, %1, %2" : "=r"(*(uint32_t*)dst) : "r"(*(uint32_t*)src), "r"(*(uint32_t*)dst));
++ dst += 4;
++ src += 4;
++ w -= 4;
++ }
++
++ while (w)
++ {
++ s = *src;
++ d = *dst;
++ asm("uqadd8 %0, %1, %2" : "+r"(d) : "r"(s));
++ *dst = d;
++
++ dst++;
++ src++;
++ w--;
++ }
++ }
++
++}
++
++void
++fbCompositeSrc_8888x8888arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t *dstLine, *dst;
++ uint32_t *srcLine, *src;
++ int dstStride, srcStride;
++ uint16_t w;
++ uint32_t component_half = 0x800080;
++ uint32_t upper_component_mask = 0xff00ff00;
++ uint32_t alpha_mask = 0xff;
++
++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++//#define inner_branch
++ asm volatile (
++ "cmp %[w], #0\n\t"
++ "beq 2f\n\t"
++ "1:\n\t"
++ /* load dest */
++ "ldr r5, [%[src]], #4\n\t"
++#ifdef inner_branch
++ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
++ * The 0x0 case also allows us to avoid doing an unecessary data
++ * write which is more valuable so we only check for that */
++ "cmp r5, #0x1000000\n\t"
++ "blt 3f\n\t"
++
++ /* = 255 - alpha */
++ "sub r8, %[alpha_mask], r5, lsr #24\n\t"
++
++ "ldr r4, [%[dest]] \n\t"
++
++#else
++ "ldr r4, [%[dest]] \n\t"
++
++ /* = 255 - alpha */
++ "sub r8, %[alpha_mask], r5, lsr #24\n\t"
++#endif
++ "uxtb16 r6, r4\n\t"
++ "uxtb16 r7, r4, ror #8\n\t"
++
++ /* multiply by 257 and divide by 65536 */
++ "mla r6, r6, r8, %[component_half]\n\t"
++ "mla r7, r7, r8, %[component_half]\n\t"
++
++ "uxtab16 r6, r6, r6, ror #8\n\t"
++ "uxtab16 r7, r7, r7, ror #8\n\t"
++
++ /* recombine the 0xff00ff00 bytes of r6 and r7 */
++ "and r7, %[upper_component_mask]\n\t"
++ "uxtab16 r6, r7, r6, ror #8\n\t"
++
++ "uqadd8 r5, r6, r5\n\t"
++
++#ifdef inner_branch
++ "3:\n\t"
++
++#endif
++ "str r5, [%[dest]], #4\n\t"
++ /* increment counter and jmp to top */
++ "subs %[w], %[w], #1\n\t"
++ "bne 1b\n\t"
++ "2:\n\t"
++ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src)
++ : [component_half] "r" (component_half), [upper_component_mask] "r" (upper_component_mask),
++ [alpha_mask] "r" (alpha_mask)
++ : "r4", "r5", "r6", "r7", "r8", "cc", "memory"
++ );
++ }
++}
++
++void
++fbCompositeSrc_8888x8x8888arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t *dstLine, *dst;
++ uint32_t *srcLine, *src;
++ uint32_t mask;
++ int dstStride, srcStride;
++ uint16_t w;
++ uint32_t component_half = 0x800080;
++ uint32_t alpha_mask = 0xff;
++
++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++
++ fbComposeGetSolid (pMask, mask, pDst->bits.format);
++ mask = (mask) >> 24;
++
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++//#define inner_branch
++ asm volatile (
++ "cmp %[w], #0\n\t"
++ "beq 2f\n\t"
++ "1:\n\t"
++ /* load dest */
++ "ldr r5, [%[src]], #4\n\t"
++#ifdef inner_branch
++ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
++ * The 0x0 case also allows us to avoid doing an unecessary data
++ * write which is more valuable so we only check for that */
++ "cmp r5, #0x1000000\n\t"
++ "blt 3f\n\t"
++
++#endif
++ "ldr r4, [%[dest]] \n\t"
++
++ "uxtb16 r6, r5\n\t"
++ "uxtb16 r7, r5, ror #8\n\t"
++
++ /* multiply by alpha (r8) then by 257 and divide by 65536 */
++ "mla r6, r6, %[mask_alpha], %[component_half]\n\t"
++ "mla r7, r7, %[mask_alpha], %[component_half]\n\t"
++
++ "uxtab16 r6, r6, r6, ror #8\n\t"
++ "uxtab16 r7, r7, r7, ror #8\n\t"
++
++ "uxtb16 r6, r6, ror #8\n\t"
++ "uxtb16 r7, r7, ror #8\n\t"
++
++ /* recombine */
++ "orr r5, r6, r7, lsl #8\n\t"
++
++ "uxtb16 r6, r4\n\t"
++ "uxtb16 r7, r4, ror #8\n\t"
++
++ /* 255 - alpha */
++ "sub r8, %[alpha_mask], r5, lsr #24\n\t"
++
++ /* multiply by alpha (r8) then by 257 and divide by 65536 */
++ "mla r6, r6, r8, %[component_half]\n\t"
++ "mla r7, r7, r8, %[component_half]\n\t"
++
++ "uxtab16 r6, r6, r6, ror #8\n\t"
++ "uxtab16 r7, r7, r7, ror #8\n\t"
++
++ "uxtb16 r6, r6, ror #8\n\t"
++ "uxtb16 r7, r7, ror #8\n\t"
++
++ /* recombine */
++ "orr r6, r6, r7, lsl #8\n\t"
++
++ "uqadd8 r5, r6, r5\n\t"
++
++#ifdef inner_branch
++ "3:\n\t"
++
++#endif
++ "str r5, [%[dest]], #4\n\t"
++ /* increment counter and jmp to top */
++ "subs %[w], %[w], #1\n\t"
++ "bne 1b\n\t"
++ "2:\n\t"
++ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src)
++ : [component_half] "r" (component_half), [mask_alpha] "r" (mask),
++ [alpha_mask] "r" (alpha_mask)
++ : "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory"
++ );
++ }
++}
++
++void
++fbCompositeSolidMask_nx8x8888arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t src, srca;
++ uint32_t *dstLine, *dst;
++ uint8_t *maskLine, *mask;
++ int dstStride, maskStride;
++ uint16_t w;
++
++ fbComposeGetSolid(pSrc, src, pDst->bits.format);
++
++ srca = src >> 24;
++ if (src == 0)
++ return;
++
++ uint32_t component_mask = 0xff00ff;
++ uint32_t component_half = 0x800080;
++
++ uint32_t src_hi = (src >> 8) & component_mask;
++ uint32_t src_lo = src & component_mask;
++
++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
++
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++//#define inner_branch
++ asm volatile (
++ "cmp %[w], #0\n\t"
++ "beq 2f\n\t"
++ "1:\n\t"
++ /* load mask */
++ "ldrb r5, [%[mask]], #1\n\t"
++#ifdef inner_branch
++ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
++ * The 0x0 case also allows us to avoid doing an unecessary data
++ * write which is more valuable so we only check for that */
++ /* 0x1000000 is the least value that contains alpha all values
++ * less than it have a 0 alpha value */
++ "cmp r5, #0x0\n\t"
++ "beq 3f\n\t"
++
++#endif
++ "ldr r4, [%[dest]] \n\t"
++
++ /* multiply by alpha (r8) then by 257 and divide by 65536 */
++ "mla r6, %[src_lo], r5, %[component_half]\n\t"
++ "mla r7, %[src_hi], r5, %[component_half]\n\t"
++
++ "uxtab16 r6, r6, r6, ror #8\n\t"
++ "uxtab16 r7, r7, r7, ror #8\n\t"
++
++ "uxtb16 r6, r6, ror #8\n\t"
++ "uxtb16 r7, r7, ror #8\n\t"
++
++ /* recombine */
++ "orr r5, r6, r7, lsl #8\n\t"
++
++ "uxtb16 r6, r4\n\t"
++ "uxtb16 r7, r4, ror #8\n\t"
++
++ /* we could simplify this to use 'sub' if we were
++ * willing to give up a register for alpha_mask */
++ "mvn r8, r5\n\t"
++ "mov r8, r8, lsr #24\n\t"
++
++ /* multiply by alpha (r8) then by 257 and divide by 65536 */
++ "mla r6, r6, r8, %[component_half]\n\t"
++ "mla r7, r7, r8, %[component_half]\n\t"
++
++ "uxtab16 r6, r6, r6, ror #8\n\t"
++ "uxtab16 r7, r7, r7, ror #8\n\t"
++
++ "uxtb16 r6, r6, ror #8\n\t"
++ "uxtb16 r7, r7, ror #8\n\t"
++
++ /* recombine */
++ "orr r6, r6, r7, lsl #8\n\t"
++
++ "uqadd8 r5, r6, r5\n\t"
++
++#ifdef inner_branch
++ "3:\n\t"
++
++#endif
++ "str r5, [%[dest]], #4\n\t"
++ /* increment counter and jmp to top */
++ "subs %[w], %[w], #1\n\t"
++ "bne 1b\n\t"
++ "2:\n\t"
++ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src), [mask] "+r" (mask)
++ : [component_half] "r" (component_half),
++ [src_hi] "r" (src_hi), [src_lo] "r" (src_lo)
++ : "r4", "r5", "r6", "r7", "r8", "cc", "memory"
++ );
++ }
++}
+--- /dev/null
++++ b/pixman/pixman-arm.h
+@@ -0,0 +1,94 @@
++/*
++ * Copyright © 2008 Mozilla Corporation
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Mozilla Corporation not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Mozilla Corporation makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ *
++ * Author: Jeff Muizelaar (jeff@infidigm.net)
++ *
++ */
++
++#include "pixman-private.h"
++
++#ifdef USE_ARM
++
++static inline pixman_bool_t pixman_have_arm(void) { return TRUE; }
++
++#else
++#define pixman_have_arm() FALSE
++#endif
++
++#ifdef USE_ARM
++
++void
++fbCompositeSrcAdd_8000x8000arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++void
++fbCompositeSrc_8888x8888arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSrc_8888x8x8888arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++void
++fbCompositeSolidMask_nx8x8888arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++
++#endif /* USE_ARM */
+--- a/pixman/pixman-pict.c
++++ b/pixman/pixman-pict.c
+@@ -34,6 +34,7 @@
+ #include "pixman-mmx.h"
+ #include "pixman-vmx.h"
+ #include "pixman-sse2.h"
++#include "pixman-arm.h"
+ #include "pixman-combine32.h"
+
+ #ifdef __GNUC__
+@@ -1479,6 +1480,26 @@ static const FastPathInfo vmx_fast_paths
+ };
+ #endif
+
++#ifdef USE_ARM
++static const FastPathInfo arm_fast_paths[] =
++{
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_a8b8g8r8, fbCompositeSrc_8888x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fbCompositeSrc_8888x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8x8888arm, NEED_SOLID_MASK },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8x8888arm, NEED_SOLID_MASK },
++
++ { PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcAdd_8000x8000arm, 0 },
++
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSolidMask_nx8x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSolidMask_nx8x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8b8g8r8, fbCompositeSolidMask_nx8x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8b8g8r8, fbCompositeSolidMask_nx8x8888arm, 0 },
++
++ { PIXMAN_OP_NONE },
++};
++#endif
+
+ static const FastPathInfo c_fast_paths[] =
+ {
+@@ -1829,6 +1850,12 @@ pixman_image_composite (pixman_op_t
+ if (!info && pixman_have_vmx())
+ info = get_fast_path (vmx_fast_paths, op, pSrc, pMask, pDst, pixbuf);
+ #endif
++
++#ifdef USE_ARM
++ if (!info && pixman_have_arm())
++ info = get_fast_path (arm_fast_paths, op, pSrc, pMask, pDst, pixbuf);
++#endif
++
+ if (!info)
+ info = get_fast_path (c_fast_paths, op, pSrc, pMask, pDst, pixbuf);
+
diff --git a/recipes/xorg-lib/pixman-0.12.0/pixman-x888-565.patch b/recipes/xorg-lib/pixman-0.12.0/pixman-x888-565.patch
new file mode 100644
index 0000000..a3fa331
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.12.0/pixman-x888-565.patch
@@ -0,0 +1,68 @@
+From: Vladimir Vukicevic <vladimir@slide.(none)>
+Date: Wed, 17 Sep 2008 20:01:31 +0000 (-0400)
+Subject: Add SRC x888x0565 C fast path
+X-Git-Url: http://gitweb.freedesktop.org/?p=pixman.git;a=commitdiff;h=7180230d4d87c55dfef1e17a0cc3b125d45aa3a0
+
+Add SRC x888x0565 C fast path
+---
+
+--- a/pixman/pixman-pict.c
++++ b/pixman/pixman-pict.c
+@@ -759,6 +759,46 @@ fbCompositeSrc_8888x0565 (pixman_op_t op
+ }
+ }
+
++
++void
++fbCompositeSrc_x888x0565 (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint16_t *dstLine, *dst;
++ uint32_t *srcLine, *src, s;
++ int dstStride, srcStride;
++ uint16_t w;
++
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ while (w--)
++ {
++ s = READ(pSrc, src++);
++ WRITE(pDst, dst, cvt8888to0565(s));
++ dst++;
++ }
++ }
++}
++
+ void
+ fbCompositeSrcAdd_8000x8000 (pixman_op_t op,
+ pixman_image_t * pSrc,
+@@ -1568,6 +1608,10 @@ static const FastPathInfo c_fast_paths[]
+ { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrcSrc_nxn, 0 },
+ { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrcSrc_nxn, 0 },
+ #endif
++ { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 },
+ { PIXMAN_OP_IN, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcIn_8x8, 0 },
+ { PIXMAN_OP_IN, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fbCompositeSolidMaskIn_nx8x8, 0 },
+ { PIXMAN_OP_NONE },
diff --git a/recipes/xorg-lib/pixman-0.13.2/pixman-0.13.2-neon1.patch b/recipes/xorg-lib/pixman-0.13.2/pixman-0.13.2-neon1.patch
new file mode 100644
index 0000000..b3bb762
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.13.2/pixman-0.13.2-neon1.patch
@@ -0,0 +1,1702 @@
+diff --git a/configure.ac b/configure.ac
+index 063f6eb..bada55c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -278,11 +278,12 @@ AC_SUBST(VMX_CFLAGS)
+ AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
+
+ dnl Check for ARM SIMD instructions
++ARM_SIMD_CFLAGS=""
+
+ have_arm_simd=no
+ AC_MSG_CHECKING(whether to use ARM SIMD assembler)
+ xserver_save_CFLAGS=$CFLAGS
+-CFLAGS="$CFLAGS $ARM_CFLAGS"
++CFLAGS="$CFLAGS $ARM_SIMD_CFLAGS"
+ AC_COMPILE_IFELSE([
+ int main () {
+ asm("uqadd8 r1, r1, r2");
+@@ -302,7 +303,7 @@ fi
+ if test $have_arm_simd = yes ; then
+ AC_DEFINE(USE_ARM_SIMD, 1, [use ARM SIMD compiler intrinsics])
+ else
+- ARM_CFLAGS=
++ ARM_SIMD_CFLAGS=
+ fi
+
+ AC_MSG_RESULT($have_arm_simd)
+@@ -310,9 +311,48 @@ if test $enable_arm_simd = yes && test $have_arm_simd = no ; then
+ AC_MSG_ERROR([ARM SIMD intrinsics not detected])
+ fi
+
+-AC_SUBST(ARM_CFLAGS)
++dnl Check for ARM NEON instructions
++ARM_NEON_CFLAGS="-mcpu=cortex-a8 -mfpu=neon"
++
++have_arm_neon=no
++AC_MSG_CHECKING(whether to use ARM NEON)
++xserver_save_CFLAGS=$CFLAGS
++CFLAGS="$CFLAGS $ARM_NEON_CFLAGS"
++AC_COMPILE_IFELSE([
++#include <arm_neon.h>
++int main () {
++ uint8x8_t neon_test=vmov_n_u8(0);
++ return 0;
++}], have_arm_neon=yes)
++CFLAGS=$xserver_save_CFLAGS
++
++AC_ARG_ENABLE(arm-neon,
++ [AC_HELP_STRING([--disable-arm-neon],
++ [disable ARM NEON fast paths])],
++ [enable_arm_neon=$enableval], [enable_arm_neon=auto])
++
++if test $enable_arm_neon = no ; then
++ have_arm_neon=disabled
++fi
++
++if test $have_arm_neon = yes ; then
++ AC_DEFINE(USE_ARM_NEON, 1, [use ARM NEON compiler intrinsics])
++else
++ ARM_NEON_CFLAGS=
++fi
++
++AC_MSG_RESULT($have_arm_neon)
++if test $enable_arm_neon = yes && test $have_arm_neon = no ; then
++ AC_MSG_ERROR([ARM NEON intrinsics not detected])
++fi
++
++
++AC_SUBST(ARM_SIMD_CFLAGS)
++AC_SUBST(ARM_NEON_CFLAGS)
+
+ AM_CONDITIONAL(USE_ARM_SIMD, test $have_arm_simd = yes)
++AM_CONDITIONAL(USE_ARM_NEON, test $have_arm_neon = yes)
++
+
+
+ AC_ARG_ENABLE(gtk,
+diff --git a/pixman/Makefile.am b/pixman/Makefile.am
+index c4612ea..4c1ec6b 100644
+--- a/pixman/Makefile.am
++++ b/pixman/Makefile.am
+@@ -80,15 +80,26 @@ libpixman_sse2_la_LIBADD = $(DEP_LIBS)
+ libpixman_1_la_LIBADD += libpixman-sse2.la
+ endif
+
+-# arm code
++# arm simd code
+ if USE_ARM_SIMD
+ noinst_LTLIBRARIES += libpixman-arm-simd.la
+ libpixman_arm_simd_la_SOURCES = \
+ pixman-arm-simd.c \
+ pixman-arm-simd.h
+-libpixman_arm_simd_la_CFLAGS = $(DEP_CFLAGS) $(ARM_CFLAGS)
++libpixman_arm_simd_la_CFLAGS = $(DEP_CFLAGS) $(ARM_SIMD_CFLAGS)
+ libpixman_arm_simd_la_LIBADD = $(DEP_LIBS)
+ libpixman_1_la_LIBADD += libpixman-arm-simd.la
+ endif
+
++# arm neon code
++if USE_ARM_NEON
++noinst_LTLIBRARIES += libpixman-arm-neon.la
++libpixman_arm_neon_la_SOURCES = \
++ pixman-arm-neon.c \
++ pixman-arm-neon.h
++libpixman_arm_neon_la_CFLAGS = $(DEP_CFLAGS) $(ARM_NEON_CFLAGS)
++libpixman_arm_neon_la_LIBADD = $(DEP_LIBS)
++libpixman_1_la_LIBADD += libpixman-arm-neon.la
++endif
++
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+new file mode 100644
+index 0000000..10050e4
+--- /dev/null
++++ b/pixman/pixman-arm-neon.c
+@@ -0,0 +1,1387 @@
++/*
++ * Copyright © 2009 Mozilla Corporation
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Mozilla Corporation not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Mozilla Corporation makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ *
++ * Author: Ian Rickards (ian.rickards@arm.com)
++ *
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include "pixman-arm-neon.h"
++
++#include <arm_neon.h>
++
++
++#if !defined(__ARMCC_VERSION) && !defined(FORCE_NO_NEON_INLINE_ASM)
++// [both armcc & gcc set __GNUC__]
++// Use GNU style inline asm on gcc, for best performance
++// Use intrinsics on armcc
++// This switch determines if any GNU style inline asm is allowed
++#define USE_NEON_INLINE_ASM
++#endif
++
++
++static force_inline uint8x8x4_t unpack0565(uint16x8_t rgb)
++{
++ uint16x8_t gb, b;
++ uint8x8x4_t res;
++
++ res.val[3] = vdup_n_u8(0);
++ gb = vshrq_n_u16(rgb, 5);
++ b = vshrq_n_u16(rgb, 5+6);
++ res.val[0] = vmovn_u16(rgb); // get low 5 bits
++ res.val[1] = vmovn_u16(gb); // get mid 6 bits
++ res.val[2] = vmovn_u16(b); // get top 5 bits
++
++ res.val[0] = vshl_n_u8(res.val[0], 3); // shift to top
++ res.val[1] = vshl_n_u8(res.val[1], 2); // shift to top
++ res.val[2] = vshl_n_u8(res.val[2], 3); // shift to top
++
++ res.val[0] = vsri_n_u8(res.val[0], res.val[0], 5);
++ res.val[1] = vsri_n_u8(res.val[1], res.val[1], 6);
++ res.val[2] = vsri_n_u8(res.val[2], res.val[2], 5);
++
++ return res;
++}
++
++static force_inline uint16x8_t pack0565(uint8x8x4_t s)
++{
++ uint16x8_t rgb, val_g, val_r;
++
++ rgb = vshll_n_u8(s.val[2],8);
++ val_g = vshll_n_u8(s.val[1],8);
++ val_r = vshll_n_u8(s.val[0],8);
++ rgb = vsriq_n_u16(rgb, val_g, 5);
++ rgb = vsriq_n_u16(rgb, val_r, 5+6);
++
++ return rgb;
++}
++
++static force_inline uint8x8_t neon2mul(uint8x8_t x, uint8x8_t alpha)
++{
++ uint16x8_t tmp,tmp2;
++ uint8x8_t res;
++
++ tmp = vmull_u8(x,alpha);
++ tmp2 = vrshrq_n_u16(tmp,8);
++ res = vraddhn_u16(tmp,tmp2);
++
++ return res;
++}
++
++static force_inline uint8x8x4_t neon8mul(uint8x8x4_t x, uint8x8_t alpha)
++{
++ uint16x8x4_t tmp;
++ uint8x8x4_t res;
++ uint16x8_t qtmp1,qtmp2;
++
++ tmp.val[0] = vmull_u8(x.val[0],alpha);
++ tmp.val[1] = vmull_u8(x.val[1],alpha);
++ tmp.val[2] = vmull_u8(x.val[2],alpha);
++ tmp.val[3] = vmull_u8(x.val[3],alpha);
++
++ qtmp1 = vrshrq_n_u16(tmp.val[0],8);
++ qtmp2 = vrshrq_n_u16(tmp.val[1],8);
++ res.val[0] = vraddhn_u16(tmp.val[0],qtmp1);
++ qtmp1 = vrshrq_n_u16(tmp.val[2],8);
++ res.val[1] = vraddhn_u16(tmp.val[1],qtmp2);
++ qtmp2 = vrshrq_n_u16(tmp.val[3],8);
++ res.val[2] = vraddhn_u16(tmp.val[2],qtmp1);
++ res.val[3] = vraddhn_u16(tmp.val[3],qtmp2);
++
++ return res;
++}
++
++static force_inline uint8x8x4_t neon8qadd(uint8x8x4_t x, uint8x8x4_t y)
++{
++ uint8x8x4_t res;
++
++ res.val[0] = vqadd_u8(x.val[0],y.val[0]);
++ res.val[1] = vqadd_u8(x.val[1],y.val[1]);
++ res.val[2] = vqadd_u8(x.val[2],y.val[2]);
++ res.val[3] = vqadd_u8(x.val[3],y.val[3]);
++
++ return res;
++}
++
++
++void
++fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint8_t *dstLine, *dst;
++ uint8_t *srcLine, *src;
++ int dstStride, srcStride;
++ uint16_t w;
++
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1);
++ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
++
++ if (width>=8)
++ {
++ // Use overlapping 8-pixel method
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ uint8_t *keep_dst;
++
++#ifndef USE_NEON_INLINE_ASM
++ uint8x8_t sval,dval,temp;
++
++ sval = vld1_u8((void*)src);
++ dval = vld1_u8((void*)dst);
++ keep_dst = dst;
++
++ temp = vqadd_u8(dval,sval);
++
++ src += (w & 7);
++ dst += (w & 7);
++ w -= (w & 7);
++
++ while (w)
++ {
++ sval = vld1_u8((void*)src);
++ dval = vld1_u8((void*)dst);
++
++ vst1_u8((void*)keep_dst,temp);
++ keep_dst = dst;
++
++ temp = vqadd_u8(dval,sval);
++
++ src+=8;
++ dst+=8;
++ w-=8;
++ }
++ vst1_u8((void*)keep_dst,temp);
++#else
++ asm volatile (
++// avoid using d8-d15 (q4-q7) aapcs callee-save registers
++ "vld1.8 {d0}, [%[src]]\n\t"
++ "vld1.8 {d4}, [%[dst]]\n\t"
++ "mov %[keep_dst], %[dst]\n\t"
++
++ "and ip, %[w], #7\n\t"
++ "add %[src], %[src], ip\n\t"
++ "add %[dst], %[dst], ip\n\t"
++ "subs %[w], %[w], ip\n\t"
++ "b 9f\n\t"
++// LOOP
++ "2:\n\t"
++ "vld1.8 {d0}, [%[src]]!\n\t"
++ "vld1.8 {d4}, [%[dst]]!\n\t"
++ "vst1.8 {d20}, [%[keep_dst]]\n\t"
++ "sub %[keep_dst], %[dst], #8\n\t"
++ "subs %[w], %[w], #8\n\t"
++ "9:\n\t"
++ "vqadd.u8 d20, d0, d4\n\t"
++
++ "bne 2b\n\t"
++
++ "1:\n\t"
++ "vst1.8 {d20}, [%[keep_dst]]\n\t"
++
++ : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
++ :
++ : "ip", "cc", "memory", "d0","d4",
++ "d20"
++ );
++#endif
++ }
++ }
++ else
++ {
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++ uint8x8_t sval, dval;
++ uint8_t *dst4, *dst2;
++
++ if (w&4)
++ {
++ sval = vreinterpret_u8_u32(vld1_lane_u32((void*)src,vreinterpret_u32_u8(sval),1));
++ dval = vreinterpret_u8_u32(vld1_lane_u32((void*)dst,vreinterpret_u32_u8(dval),1));
++ dst4=dst;
++ src+=4;
++ dst+=4;
++ }
++ if (w&2)
++ {
++ sval = vreinterpret_u8_u16(vld1_lane_u16((void*)src,vreinterpret_u16_u8(sval),1));
++ dval = vreinterpret_u8_u16(vld1_lane_u16((void*)dst,vreinterpret_u16_u8(dval),1));
++ dst2=dst;
++ src+=2;
++ dst+=2;
++ }
++ if (w&1)
++ {
++ sval = vld1_lane_u8((void*)src,sval,1);
++ dval = vld1_lane_u8((void*)dst,dval,1);
++ }
++
++ dval = vqadd_u8(dval,sval);
++
++ if (w&1)
++ vst1_lane_u8((void*)dst,dval,1);
++ if (w&2)
++ vst1_lane_u16((void*)dst2,vreinterpret_u16_u8(dval),1);
++ if (w&4)
++ vst1_lane_u32((void*)dst4,vreinterpret_u32_u8(dval),1);
++ }
++ }
++}
++
++
++void
++fbCompositeSrc_8888x8888neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t *dstLine, *dst;
++ uint32_t *srcLine, *src;
++ int dstStride, srcStride;
++ uint32_t w;
++
++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++
++ if (width>=8)
++ {
++ // Use overlapping 8-pixel method
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ uint32_t *keep_dst;
++
++#ifndef USE_NEON_INLINE_ASM
++ uint8x8x4_t sval,dval,temp;
++
++ sval = vld4_u8((void*)src);
++ dval = vld4_u8((void*)dst);
++ keep_dst = dst;
++
++ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
++ temp = neon8qadd(sval,temp);
++
++ src += (w & 7);
++ dst += (w & 7);
++ w -= (w & 7);
++
++ while (w)
++ {
++ sval = vld4_u8((void*)src);
++ dval = vld4_u8((void*)dst);
++
++ vst4_u8((void*)keep_dst,temp);
++ keep_dst = dst;
++
++ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
++ temp = neon8qadd(sval,temp);
++
++ src+=8;
++ dst+=8;
++ w-=8;
++ }
++ vst4_u8((void*)keep_dst,temp);
++#else
++ asm volatile (
++// avoid using d8-d15 (q4-q7) aapcs callee-save registers
++ "vld4.8 {d0-d3}, [%[src]]\n\t"
++ "vld4.8 {d4-d7}, [%[dst]]\n\t"
++ "mov %[keep_dst], %[dst]\n\t"
++
++ "and ip, %[w], #7\n\t"
++ "add %[src], %[src], ip, LSL#2\n\t"
++ "add %[dst], %[dst], ip, LSL#2\n\t"
++ "subs %[w], %[w], ip\n\t"
++ "b 9f\n\t"
++// LOOP
++ "2:\n\t"
++ "vld4.8 {d0-d3}, [%[src]]!\n\t"
++ "vld4.8 {d4-d7}, [%[dst]]!\n\t"
++ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
++ "sub %[keep_dst], %[dst], #8*4\n\t"
++ "subs %[w], %[w], #8\n\t"
++ "9:\n\t"
++ "vmvn.8 d31, d3\n\t"
++ "vmull.u8 q10, d31, d4\n\t"
++ "vmull.u8 q11, d31, d5\n\t"
++ "vmull.u8 q12, d31, d6\n\t"
++ "vmull.u8 q13, d31, d7\n\t"
++ "vrshr.u16 q8, q10, #8\n\t"
++ "vrshr.u16 q9, q11, #8\n\t"
++ "vraddhn.u16 d20, q10, q8\n\t"
++ "vraddhn.u16 d21, q11, q9\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vraddhn.u16 d22, q12, q8\n\t"
++ "vraddhn.u16 d23, q13, q9\n\t"
++// result in d20-d23
++ "vqadd.u8 d20, d0, d20\n\t"
++ "vqadd.u8 d21, d1, d21\n\t"
++ "vqadd.u8 d22, d2, d22\n\t"
++ "vqadd.u8 d23, d3, d23\n\t"
++
++ "bne 2b\n\t"
++
++ "1:\n\t"
++ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
++
++ : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
++ :
++ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
++ "d16","d17","d18","d19","d20","d21","d22","d23"
++ );
++#endif
++ }
++ }
++ else
++ {
++ uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL));
++
++ // Handle width<8
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ while (w>=2)
++ {
++ uint8x8_t sval,dval;
++
++ /* two 32-bit pixels packed into D-reg; ad-hoc vectorization */
++ sval = vreinterpret_u8_u32(vld1_u32((void*)src));
++ dval = vreinterpret_u8_u32(vld1_u32((void*)dst));
++ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval),alpha_selector));
++ vst1_u8((void*)dst,vqadd_u8(sval,dval));
++
++ src+=2;
++ dst+=2;
++ w-=2;
++ }
++
++ if (w)
++ {
++ uint8x8_t sval,dval;
++
++ /* single 32-bit pixel in lane 0 */
++ sval = vreinterpret_u8_u32(vld1_dup_u32((void*)src)); // only interested in lane 0
++ dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst)); // only interested in lane 0
++ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval),alpha_selector));
++ vst1_lane_u32((void*)dst,vreinterpret_u32_u8(vqadd_u8(sval,dval)),0);
++ }
++ }
++ }
++}
++
++
++
++void
++fbCompositeSrc_x888x0565neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint16_t *dstLine, *dst;
++ uint32_t *srcLine, *src;
++ int dstStride, srcStride;
++ uint32_t w;
++
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++
++ if (width>=8)
++ {
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ do {
++ while (w>=8)
++ {
++#ifndef USE_NEON_INLINE_ASM
++ vst1q_u16(dst, pack0565(vld4_u8((void*)src)));
++#else
++ asm volatile (
++ "vld4.8 {d4-d7}, [%[src]]\n\t"
++ "vshll.u8 q0, d6, #8\n\t"
++ "vshll.u8 q1, d5, #8\n\t"
++ "vsriq.u16 q0, q1, #5\t\n"
++ "vshll.u8 q1, d4, #8\n\t"
++ "vsriq.u16 q0, q1, #11\t\n"
++ "vst1.16 {q0}, [%[dst]]\n\t"
++ :
++ : [dst] "r" (dst), [src] "r" (src)
++ : "memory", "d0","d1","d2","d3","d4","d5","d6","d7"
++ );
++#endif
++ src+=8;
++ dst+=8;
++ w-=8;
++ }
++ if (w != 0)
++ {
++ src -= (8-w);
++ dst -= (8-w);
++ w = 8; // do another vector
++ }
++ } while (w!=0);
++ }
++ }
++ else
++ {
++ // Handle width<8
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ while (w>=2)
++ {
++ uint32x2_t sval, rgb, g, b;
++ sval = vld1_u32(src);
++ rgb = vshr_n_u32(sval,8-5); // r (5 bits)
++ g = vshr_n_u32(sval,8+8-6); // g to bottom byte
++ rgb = vsli_n_u32(rgb, g, 5);
++ b = vshr_n_u32(sval,8+8+8-5); // b to bottom byte
++ rgb = vsli_n_u32(rgb, b, 11);
++ vst1_lane_u16(dst++,vreinterpret_u16_u32(rgb),0);
++ vst1_lane_u16(dst++,vreinterpret_u16_u32(rgb),2);
++ src+=2;
++ w-=2;
++ }
++ if (w)
++ {
++ uint32x2_t sval, rgb, g, b;
++ sval = vld1_dup_u32(src);
++ rgb = vshr_n_u32(sval,8-5); // r (5 bits)
++ g = vshr_n_u32(sval,8+8-6); // g to bottom byte
++ rgb = vsli_n_u32(rgb, g, 5);
++ b = vshr_n_u32(sval,8+8+8-5); // b to bottom byte
++ rgb = vsli_n_u32(rgb, b, 11);
++ vst1_lane_u16(dst++,vreinterpret_u16_u32(rgb),0);
++ }
++ }
++ }
++}
++
++
++void
++fbCompositeSrc_8888x8x8888neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t *dstLine, *dst;
++ uint32_t *srcLine, *src;
++ uint32_t mask;
++ int dstStride, srcStride;
++ uint32_t w;
++ uint8x8_t mask_alpha;
++
++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++
++ fbComposeGetSolid (pMask, mask, pDst->bits.format);
++ mask_alpha = vdup_n_u8((mask) >> 24);
++
++ if (width>=8)
++ {
++ // Use overlapping 8-pixel method
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ uint32_t *keep_dst;
++
++#ifndef USE_NEON_INLINE_ASM
++ uint8x8x4_t sval,dval,temp;
++
++ sval = vld4_u8((void*)src);
++ dval = vld4_u8((void*)dst);
++ keep_dst = dst;
++
++ sval = neon8mul(sval,mask_alpha);
++ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
++ temp = neon8qadd(sval,temp);
++
++ src += (w & 7);
++ dst += (w & 7);
++ w -= (w & 7);
++
++ while (w)
++ {
++ sval = vld4_u8((void*)src);
++ dval = vld4_u8((void*)dst);
++
++ vst4_u8((void*)keep_dst,temp);
++ keep_dst = dst;
++
++ sval = neon8mul(sval,mask_alpha);
++ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
++ temp = neon8qadd(sval,temp);
++
++ src+=8;
++ dst+=8;
++ w-=8;
++ }
++ vst4_u8((void*)keep_dst,temp);
++#else
++ asm volatile (
++// avoid using d8-d15 (q4-q7) aapcs callee-save registers
++ "vdup.32 d30, %[mask]\n\t"
++ "vdup.8 d30, d30[3]\n\t"
++
++ "vld4.8 {d0-d3}, [%[src]]\n\t"
++ "vld4.8 {d4-d7}, [%[dst]]\n\t"
++ "mov %[keep_dst], %[dst]\n\t"
++
++ "and ip, %[w], #7\n\t"
++ "add %[src], %[src], ip, LSL#2\n\t"
++ "add %[dst], %[dst], ip, LSL#2\n\t"
++ "subs %[w], %[w], ip\n\t"
++ "b 9f\n\t"
++// LOOP
++ "2:\n\t"
++ "vld4.8 {d0-d3}, [%[src]]!\n\t"
++ "vld4.8 {d4-d7}, [%[dst]]!\n\t"
++ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
++ "sub %[keep_dst], %[dst], #8*4\n\t"
++ "subs %[w], %[w], #8\n\t"
++
++ "9:\n\t"
++ "vmull.u8 q10, d30, d0\n\t"
++ "vmull.u8 q11, d30, d1\n\t"
++ "vmull.u8 q12, d30, d2\n\t"
++ "vmull.u8 q13, d30, d3\n\t"
++ "vrshr.u16 q8, q10, #8\n\t"
++ "vrshr.u16 q9, q11, #8\n\t"
++ "vraddhn.u16 d0, q10, q8\n\t"
++ "vraddhn.u16 d1, q11, q9\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d3, q13, q9\n\t"
++ "vraddhn.u16 d2, q12, q8\n\t"
++
++ "vmvn.8 d31, d3\n\t"
++ "vmull.u8 q10, d31, d4\n\t"
++ "vmull.u8 q11, d31, d5\n\t"
++ "vmull.u8 q12, d31, d6\n\t"
++ "vmull.u8 q13, d31, d7\n\t"
++ "vrshr.u16 q8, q10, #8\n\t"
++ "vrshr.u16 q9, q11, #8\n\t"
++ "vraddhn.u16 d20, q10, q8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d21, q11, q9\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vraddhn.u16 d22, q12, q8\n\t"
++ "vraddhn.u16 d23, q13, q9\n\t"
++// result in d20-d23
++ "vqadd.u8 d20, d0, d20\n\t"
++ "vqadd.u8 d21, d1, d21\n\t"
++ "vqadd.u8 d22, d2, d22\n\t"
++ "vqadd.u8 d23, d3, d23\n\t"
++
++ "bne 2b\n\t"
++
++ "1:\n\t"
++ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
++
++ : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
++ : [mask] "r" (mask)
++ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
++ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27",
++ "d30","d31"
++ );
++#endif
++ }
++ }
++ else
++ {
++ uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL));
++
++ // Handle width<8
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ while (w>=2)
++ {
++ uint8x8_t sval,dval;
++
++ sval = vreinterpret_u8_u32(vld1_u32((void*)src));
++ dval = vreinterpret_u8_u32(vld1_u32((void*)dst));
++
++ /* sval * const alpha_mul */
++ sval = neon2mul(sval,mask_alpha);
++
++ /* dval * 255-(src alpha) */
++ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval), alpha_selector));
++
++ vst1_u8((void*)dst,vqadd_u8(sval,dval));
++
++ src+=2;
++ dst+=2;
++ w-=2;
++ }
++
++ if (w)
++ {
++ uint8x8_t sval,dval;
++
++ sval = vreinterpret_u8_u32(vld1_dup_u32((void*)src));
++ dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst));
++
++ /* sval * const alpha_mul */
++ sval = neon2mul(sval,mask_alpha);
++
++ /* dval * 255-(src alpha) */
++ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval), alpha_selector));
++
++ vst1_lane_u32((void*)dst,vreinterpret_u32_u8(vqadd_u8(sval,dval)),0);
++ }
++ }
++ }
++}
++
++
++
++void
++fbCompositeSolidMask_nx8x0565neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t src, srca;
++ uint16_t *dstLine, *dst;
++ uint8_t *maskLine, *mask;
++ int dstStride, maskStride;
++ uint32_t w;
++ uint8x8_t sval2;
++ uint8x8x4_t sval8;
++
++ fbComposeGetSolid(pSrc, src, pDst->bits.format);
++
++ srca = src >> 24;
++ if (src == 0)
++ return;
++
++ sval2=vreinterpret_u8_u32(vdup_n_u32(src));
++ sval8.val[0]=vdup_lane_u8(sval2,0);
++ sval8.val[1]=vdup_lane_u8(sval2,1);
++ sval8.val[2]=vdup_lane_u8(sval2,2);
++ sval8.val[3]=vdup_lane_u8(sval2,3);
++
++ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
++
++ if (width>=8)
++ {
++ // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
++ while (height--)
++ {
++ uint16_t *keep_dst;
++
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++#ifndef USE_NEON_INLINE_ASM
++ uint8x8_t alpha;
++ uint16x8_t dval, temp;
++ uint8x8x4_t sval8temp;
++
++ alpha = vld1_u8((void*)mask);
++ dval = vld1q_u16((void*)dst);
++ keep_dst = dst;
++
++ sval8temp = neon8mul(sval8,alpha);
++ temp = pack0565(neon8qadd(sval8temp,neon8mul(unpack0565(dval),vmvn_u8(sval8temp.val[3]))));
++
++ mask += (w & 7);
++ dst += (w & 7);
++ w -= (w & 7);
++
++ while (w)
++ {
++ dval = vld1q_u16((void*)dst);
++ alpha = vld1_u8((void*)mask);
++
++ vst1q_u16((void*)keep_dst,temp);
++ keep_dst = dst;
++
++ sval8temp = neon8mul(sval8,alpha);
++ temp = pack0565(neon8qadd(sval8temp,neon8mul(unpack0565(dval),vmvn_u8(sval8temp.val[3]))));
++
++ mask+=8;
++ dst+=8;
++ w-=8;
++ }
++ vst1q_u16((void*)keep_dst,temp);
++#else
++ asm volatile (
++ "vdup.32 d0, %[src]\n\t"
++ "vdup.8 d1, d0[1]\n\t"
++ "vdup.8 d2, d0[2]\n\t"
++ "vdup.8 d3, d0[3]\n\t"
++ "vdup.8 d0, d0[0]\n\t"
++
++ "vld1.8 {q12}, [%[dst]]\n\t"
++ "vld1.8 {d31}, [%[mask]]\n\t"
++ "mov %[keep_dst], %[dst]\n\t"
++
++ "and ip, %[w], #7\n\t"
++ "add %[mask], %[mask], ip\n\t"
++ "add %[dst], %[dst], ip, LSL#1\n\t"
++ "subs %[w], %[w], ip\n\t"
++ "b 9f\n\t"
++// LOOP
++ "2:\n\t"
++
++ "vld1.16 {q12}, [%[dst]]!\n\t"
++ "vld1.8 {d31}, [%[mask]]!\n\t"
++ "vst1.16 {q10}, [%[keep_dst]]\n\t"
++ "sub %[keep_dst], %[dst], #8*2\n\t"
++ "subs %[w], %[w], #8\n\t"
++ "9:\n\t"
++// expand 0565 q12 to 8888 {d4-d7}
++ "vmovn.u16 d4, q12\t\n"
++ "vshr.u16 q11, q12, #5\t\n"
++ "vshr.u16 q10, q12, #6+5\t\n"
++ "vmovn.u16 d5, q11\t\n"
++ "vmovn.u16 d6, q10\t\n"
++ "vshl.u8 d4, d4, #3\t\n"
++ "vshl.u8 d5, d5, #2\t\n"
++ "vshl.u8 d6, d6, #3\t\n"
++ "vsri.u8 d4, d4, #5\t\n"
++ "vsri.u8 d5, d5, #6\t\n"
++ "vsri.u8 d6, d6, #5\t\n"
++
++ "vmull.u8 q10, d31, d0\n\t"
++ "vmull.u8 q11, d31, d1\n\t"
++ "vmull.u8 q12, d31, d2\n\t"
++ "vmull.u8 q13, d31, d3\n\t"
++ "vrshr.u16 q8, q10, #8\n\t"
++ "vrshr.u16 q9, q11, #8\n\t"
++ "vraddhn.u16 d20, q10, q8\n\t"
++ "vraddhn.u16 d21, q11, q9\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d23, q13, q9\n\t"
++ "vraddhn.u16 d22, q12, q8\n\t"
++
++// duplicate in 4/2/1 & 8pix vsns
++ "vmvn.8 d30, d23\n\t"
++ "vmull.u8 q14, d30, d6\n\t"
++ "vmull.u8 q13, d30, d5\n\t"
++ "vmull.u8 q12, d30, d4\n\t"
++ "vrshr.u16 q8, q14, #8\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vraddhn.u16 d6, q14, q8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d5, q13, q9\n\t"
++ "vqadd.u8 d6, d6, d22\n\t" // moved up
++ "vraddhn.u16 d4, q12, q8\n\t"
++// intentionally don't calculate alpha
++// result in d4-d6
++
++// "vqadd.u8 d6, d6, d22\n\t" ** moved up
++ "vqadd.u8 d5, d5, d21\n\t"
++ "vqadd.u8 d4, d4, d20\n\t"
++
++// pack 8888 {d20-d23} to 0565 q10
++ "vshll.u8 q10, d6, #8\n\t"
++ "vshll.u8 q3, d5, #8\n\t"
++ "vshll.u8 q2, d4, #8\n\t"
++ "vsri.u16 q10, q3, #5\t\n"
++ "vsri.u16 q10, q2, #11\t\n"
++
++ "bne 2b\n\t"
++
++ "1:\n\t"
++ "vst1.16 {q10}, [%[keep_dst]]\n\t"
++
++ : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [keep_dst] "+r" (keep_dst)
++ : [src] "r" (src)
++ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
++ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
++ "d30","d31"
++ );
++#endif
++ }
++ }
++ else
++ {
++ while (height--)
++ {
++ void *dst4, *dst2;
++
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++
++#ifndef USE_NEON_INLINE_ASM
++ uint8x8_t alpha;
++ uint16x8_t dval, temp;
++ uint8x8x4_t sval8temp;
++
++ if (w&4)
++ {
++ alpha = vreinterpret_u8_u32(vld1_lane_u32((void*)mask,vreinterpret_u32_u8(alpha),1));
++ dval = vreinterpretq_u16_u64(vld1q_lane_u64((void*)dst,vreinterpretq_u64_u16(dval),1));
++ dst4=dst;
++ mask+=4;
++ dst+=4;
++ }
++ if (w&2)
++ {
++ alpha = vreinterpret_u8_u16(vld1_lane_u16((void*)mask,vreinterpret_u16_u8(alpha),1));
++ dval = vreinterpretq_u16_u32(vld1q_lane_u32((void*)dst,vreinterpretq_u32_u16(dval),1));
++ dst2=dst;
++ mask+=2;
++ dst+=2;
++ }
++ if (w&1)
++ {
++ alpha = vld1_lane_u8((void*)mask,alpha,1);
++ dval = vld1q_lane_u16((void*)dst,dval,1);
++ }
++
++ sval8temp = neon8mul(sval8,alpha);
++ temp = pack0565(neon8qadd(sval8temp,neon8mul(unpack0565(dval),vmvn_u8(sval8temp.val[3]))));
++
++ if (w&1)
++ vst1q_lane_u16((void*)dst,temp,1);
++ if (w&2)
++ vst1q_lane_u32((void*)dst2,vreinterpretq_u32_u16(temp),1);
++ if (w&4)
++ vst1q_lane_u64((void*)dst4,vreinterpretq_u64_u16(temp),1);
++#else
++ asm volatile (
++ "vdup.32 d0, %[src]\n\t"
++ "vdup.8 d1, d0[1]\n\t"
++ "vdup.8 d2, d0[2]\n\t"
++ "vdup.8 d3, d0[3]\n\t"
++ "vdup.8 d0, d0[0]\n\t"
++
++ "tst %[w], #4\t\n"
++ "beq skip_load4\t\n"
++
++ "vld1.64 {d25}, [%[dst]]\n\t"
++ "vld1.32 {d31[1]}, [%[mask]]\n\t"
++ "mov %[dst4], %[dst]\t\n"
++ "add %[mask], %[mask], #4\t\n"
++ "add %[dst], %[dst], #4*2\t\n"
++
++ "skip_load4:\t\n"
++ "tst %[w], #2\t\n"
++ "beq skip_load2\t\n"
++ "vld1.32 {d24[1]}, [%[dst]]\n\t"
++ "vld1.16 {d31[1]}, [%[mask]]\n\t"
++ "mov %[dst2], %[dst]\t\n"
++ "add %[mask], %[mask], #2\t\n"
++ "add %[dst], %[dst], #2*2\t\n"
++
++ "skip_load2:\t\n"
++ "tst %[w], #1\t\n"
++ "beq skip_load1\t\n"
++ "vld1.16 {d24[1]}, [%[dst]]\n\t"
++ "vld1.8 {d31[1]}, [%[mask]]\n\t"
++
++ "skip_load1:\t\n"
++// expand 0565 q12 to 8888 {d4-d7}
++ "vmovn.u16 d4, q12\t\n"
++ "vshr.u16 q11, q12, #5\t\n"
++ "vshr.u16 q10, q12, #6+5\t\n"
++ "vmovn.u16 d5, q11\t\n"
++ "vmovn.u16 d6, q10\t\n"
++ "vshl.u8 d4, d4, #3\t\n"
++ "vshl.u8 d5, d5, #2\t\n"
++ "vshl.u8 d6, d6, #3\t\n"
++ "vsri.u8 d4, d4, #5\t\n"
++ "vsri.u8 d5, d5, #6\t\n"
++ "vsri.u8 d6, d6, #5\t\n"
++
++ "vmull.u8 q10, d31, d0\n\t"
++ "vmull.u8 q11, d31, d1\n\t"
++ "vmull.u8 q12, d31, d2\n\t"
++ "vmull.u8 q13, d31, d3\n\t"
++ "vrshr.u16 q8, q10, #8\n\t"
++ "vrshr.u16 q9, q11, #8\n\t"
++ "vraddhn.u16 d20, q10, q8\n\t"
++ "vraddhn.u16 d21, q11, q9\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d23, q13, q9\n\t"
++ "vraddhn.u16 d22, q12, q8\n\t"
++
++// duplicate in 4/2/1 & 8pix vsns
++ "vmvn.8 d30, d23\n\t"
++ "vmull.u8 q14, d30, d6\n\t"
++ "vmull.u8 q13, d30, d5\n\t"
++ "vmull.u8 q12, d30, d4\n\t"
++ "vrshr.u16 q8, q14, #8\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vraddhn.u16 d6, q14, q8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d5, q13, q9\n\t"
++ "vqadd.u8 d6, d6, d22\n\t" // moved up
++ "vraddhn.u16 d4, q12, q8\n\t"
++// intentionally don't calculate alpha
++// result in d4-d6
++
++// "vqadd.u8 d6, d6, d22\n\t" ** moved up
++ "vqadd.u8 d5, d5, d21\n\t"
++ "vqadd.u8 d4, d4, d20\n\t"
++
++// pack 8888 {d20-d23} to 0565 q10
++ "vshll.u8 q10, d6, #8\n\t"
++ "vshll.u8 q3, d5, #8\n\t"
++ "vshll.u8 q2, d4, #8\n\t"
++ "vsri.u16 q10, q3, #5\t\n"
++ "vsri.u16 q10, q2, #11\t\n"
++
++ "tst %[w], #1\n\t"
++ "beq skip_store1\t\n"
++ "vst1.16 {d20[1]}, [%[dst]]\t\n"
++ "skip_store1:\t\n"
++ "tst %[w], #2\n\t"
++ "beq skip_store2\t\n"
++ "vst1.32 {d20[1]}, [%[dst2]]\t\n"
++ "skip_store2:\t\n"
++ "tst %[w], #4\n\t"
++ "beq skip_store4\t\n"
++ "vst1.16 {d21}, [%[dst4]]\t\n"
++ "skip_store4:\t\n"
++
++ : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [dst4] "+r" (dst4), [dst2] "+r" (dst2)
++ : [src] "r" (src)
++ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
++ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
++ "d30","d31"
++ );
++#endif
++ }
++ }
++}
++
++
++void
++fbCompositeSolidMask_nx8x8888neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t src, srca;
++ uint32_t *dstLine, *dst;
++ uint8_t *maskLine, *mask;
++ int dstStride, maskStride;
++ uint32_t w;
++ uint8x8_t sval2;
++ uint8x8x4_t sval8;
++ uint8x8_t mask_selector=vreinterpret_u8_u64(vcreate_u64(0x0101010100000000ULL));
++ uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL));
++
++ fbComposeGetSolid(pSrc, src, pDst->bits.format);
++
++ srca = src >> 24;
++ if (src == 0)
++ return;
++
++ sval2=vreinterpret_u8_u32(vdup_n_u32(src));
++ sval8.val[0]=vdup_lane_u8(sval2,0);
++ sval8.val[1]=vdup_lane_u8(sval2,1);
++ sval8.val[2]=vdup_lane_u8(sval2,2);
++ sval8.val[3]=vdup_lane_u8(sval2,3);
++
++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
++
++ if (width>=8)
++ {
++ // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
++ while (height--)
++ {
++ uint32_t *keep_dst;
++
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++#ifndef USE_NEON_INLINE_ASM
++ uint8x8_t alpha;
++ uint8x8x4_t dval, temp;
++
++ alpha = vld1_u8((void*)mask);
++ dval = vld4_u8((void*)dst);
++ keep_dst = dst;
++
++ temp = neon8mul(sval8,alpha);
++ dval = neon8mul(dval,vmvn_u8(temp.val[3]));
++ temp = neon8qadd(temp,dval);
++
++ mask += (w & 7);
++ dst += (w & 7);
++ w -= (w & 7);
++
++ while (w)
++ {
++ alpha = vld1_u8((void*)mask);
++ dval = vld4_u8((void*)dst);
++
++ vst4_u8((void*)keep_dst,temp);
++ keep_dst = dst;
++
++ temp = neon8mul(sval8,alpha);
++ dval = neon8mul(dval,vmvn_u8(temp.val[3]));
++ temp = neon8qadd(temp,dval);
++
++ mask+=8;
++ dst+=8;
++ w-=8;
++ }
++ vst4_u8((void*)keep_dst,temp);
++#else
++ asm volatile (
++ "vdup.32 d0, %[src]\n\t"
++ "vdup.8 d1, d0[1]\n\t"
++ "vdup.8 d2, d0[2]\n\t"
++ "vdup.8 d3, d0[3]\n\t"
++ "vdup.8 d0, d0[0]\n\t"
++
++ "vld4.8 {d4-d7}, [%[dst]]\n\t"
++ "vld1.8 {d31}, [%[mask]]\n\t"
++ "mov %[keep_dst], %[dst]\n\t"
++
++ "and ip, %[w], #7\n\t"
++ "add %[mask], %[mask], ip\n\t"
++ "add %[dst], %[dst], ip, LSL#2\n\t"
++ "subs %[w], %[w], ip\n\t"
++ "b 9f\n\t"
++// LOOP
++ "2:\n\t"
++ "vld4.8 {d4-d7}, [%[dst]]!\n\t"
++ "vld1.8 {d31}, [%[mask]]!\n\t"
++ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
++ "sub %[keep_dst], %[dst], #8*4\n\t"
++ "subs %[w], %[w], #8\n\t"
++ "9:\n\t"
++
++ "vmull.u8 q10, d31, d0\n\t"
++ "vmull.u8 q11, d31, d1\n\t"
++ "vmull.u8 q12, d31, d2\n\t"
++ "vmull.u8 q13, d31, d3\n\t"
++ "vrshr.u16 q8, q10, #8\n\t"
++ "vrshr.u16 q9, q11, #8\n\t"
++ "vraddhn.u16 d20, q10, q8\n\t"
++ "vraddhn.u16 d21, q11, q9\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d23, q13, q9\n\t"
++ "vraddhn.u16 d22, q12, q8\n\t"
++
++ "vmvn.8 d30, d23\n\t"
++ "vmull.u8 q12, d30, d4\n\t"
++ "vmull.u8 q13, d30, d5\n\t"
++ "vmull.u8 q14, d30, d6\n\t"
++ "vmull.u8 q15, d30, d7\n\t"
++
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vraddhn.u16 d4, q12, q8\n\t"
++ "vrshr.u16 q8, q14, #8\n\t"
++ "vraddhn.u16 d5, q13, q9\n\t"
++ "vrshr.u16 q9, q15, #8\n\t"
++ "vraddhn.u16 d6, q14, q8\n\t"
++ "vraddhn.u16 d7, q15, q9\n\t"
++// result in d4-d7
++
++ "vqadd.u8 d20, d4, d20\n\t"
++ "vqadd.u8 d21, d5, d21\n\t"
++ "vqadd.u8 d22, d6, d22\n\t"
++ "vqadd.u8 d23, d7, d23\n\t"
++
++ "bne 2b\n\t"
++
++ "1:\n\t"
++ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
++
++ : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [keep_dst] "+r" (keep_dst)
++ : [src] "r" (src)
++ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
++ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
++ "d30","d31"
++ );
++#endif
++ }
++ }
++ else
++ {
++ while (height--)
++ {
++ uint8x8_t alpha;
++
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++ while (w>=2)
++ {
++ uint8x8_t dval, temp, res;
++
++ alpha = vtbl1_u8(vreinterpret_u8_u16(vld1_dup_u16((void*)mask)), mask_selector);
++ dval = vld1_u8((void*)dst);
++
++ temp = neon2mul(sval2,alpha);
++ res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector)));
++
++ vst1_u8((void*)dst,res);
++
++ mask+=2;
++ dst+=2;
++ w-=2;
++ }
++ if (w)
++ {
++ uint8x8_t dval, temp, res;
++
++ alpha = vtbl1_u8(vld1_dup_u8((void*)mask), mask_selector);
++ dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst));
++
++ temp = neon2mul(sval2,alpha);
++ res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector)));
++
++ vst1_lane_u32((void*)dst,vreinterpret_u32_u8(res),0);
++ }
++ }
++ }
++}
++
++
++void
++fbCompositeSrcAdd_8888x8x8neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint8_t *dstLine, *dst;
++ uint8_t *maskLine, *mask;
++ int dstStride, maskStride;
++ uint32_t w;
++ uint32_t src;
++ uint8x8_t sa;
++
++ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
++ fbComposeGetSolid (pSrc, src, pDst->bits.format);
++ sa = vdup_n_u8((src) >> 24);
++
++ if (width>=8)
++ {
++ // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++ uint8x8_t mval, dval, res;
++ uint8_t *keep_dst;
++
++ mval = vld1_u8((void *)mask);
++ dval = vld1_u8((void *)dst);
++ keep_dst = dst;
++
++ res = vqadd_u8(neon2mul(mval,sa),dval);
++
++ mask += (w & 7);
++ dst += (w & 7);
++ w -= w & 7;
++
++ while (w)
++ {
++ mval = vld1_u8((void *)mask);
++ dval = vld1_u8((void *)dst);
++ vst1_u8((void *)keep_dst, res);
++ keep_dst = dst;
++
++ res = vqadd_u8(neon2mul(mval,sa),dval);
++
++ mask += 8;
++ dst += 8;
++ w -= 8;
++ }
++ vst1_u8((void *)keep_dst, res);
++ }
++ }
++ else
++ {
++ // Use 4/2/1 load/store method to handle 1-7 pixels
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++ uint8x8_t mval, dval, res;
++ uint8_t *dst4, *dst2;
++
++ if (w&4)
++ {
++ mval = vreinterpret_u8_u32(vld1_lane_u32((void *)mask, vreinterpret_u32_u8(mval), 1));
++ dval = vreinterpret_u8_u32(vld1_lane_u32((void *)dst, vreinterpret_u32_u8(dval), 1));
++
++ dst4 = dst;
++ mask += 4;
++ dst += 4;
++ }
++ if (w&2)
++ {
++ mval = vreinterpret_u8_u16(vld1_lane_u16((void *)mask, vreinterpret_u16_u8(mval), 1));
++ dval = vreinterpret_u8_u16(vld1_lane_u16((void *)dst, vreinterpret_u16_u8(dval), 1));
++ dst2 = dst;
++ mask += 2;
++ dst += 2;
++ }
++ if (w&1)
++ {
++ mval = vld1_lane_u8((void *)mask, mval, 1);
++ dval = vld1_lane_u8((void *)dst, dval, 1);
++ }
++
++ res = vqadd_u8(neon2mul(mval,sa),dval);
++
++ if (w&1)
++ vst1_lane_u8((void *)dst, res, 1);
++ if (w&2)
++ vst1_lane_u16((void *)dst2, vreinterpret_u16_u8(res), 1);
++ if (w&4)
++ vst1_lane_u32((void *)dst4, vreinterpret_u32_u8(res), 1);
++ }
++ }
++}
++
+diff --git a/pixman/pixman-arm-neon.h b/pixman/pixman-arm-neon.h
+new file mode 100644
+index 0000000..bab4dee
+--- /dev/null
++++ b/pixman/pixman-arm-neon.h
+@@ -0,0 +1,137 @@
++/*
++ * Copyright © 2009 Mozilla Corporation
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Mozilla Corporation not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Mozilla Corporation makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ *
++ * Author: Ian Rickards (ian.rickards@arm.com)
++ *
++ */
++
++#include "pixman-private.h"
++
++#ifdef USE_ARM_NEON
++
++static inline pixman_bool_t pixman_have_arm_neon(void) { return TRUE; }
++
++#else
++#define pixman_have_arm_neon() FALSE
++#endif
++
++#ifdef USE_ARM_NEON
++
++void
++fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSrc_8888x8888neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSrc_8888x8x8888neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSolidMask_nx8x0565neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSolidMask_nx8x8888neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSrc_x888x0565neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSrcAdd_8888x8x8neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++#endif /* USE_ARM_NEON */
+diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
+index 1388517..b13947a 100644
+--- a/pixman/pixman-pict.c
++++ b/pixman/pixman-pict.c
+@@ -34,6 +34,7 @@
+ #include "pixman-mmx.h"
+ #include "pixman-vmx.h"
+ #include "pixman-sse2.h"
++#include "pixman-arm-neon.h"
+ #include "pixman-arm-simd.h"
+ #include "pixman-combine32.h"
+
+@@ -1518,6 +1519,31 @@ static const FastPathInfo vmx_fast_paths[] =
+ };
+ #endif
+
++#ifdef USE_ARM_NEON
++static const FastPathInfo arm_neon_fast_paths[] =
++{
++ { PIXMAN_OP_ADD, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fbCompositeSrcAdd_8888x8x8neon, 0 },
++ { PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcAdd_8000x8000neon, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565neon, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565neon, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565neon, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_a8b8g8r8, fbCompositeSrc_8888x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fbCompositeSrc_8888x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8x8888neon, NEED_SOLID_MASK },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8x8888neon, NEED_SOLID_MASK },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_r5g6b5, fbCompositeSolidMask_nx8x0565neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_b5g6r5, fbCompositeSolidMask_nx8x0565neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSolidMask_nx8x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSolidMask_nx8x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8b8g8r8, fbCompositeSolidMask_nx8x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8b8g8r8, fbCompositeSolidMask_nx8x8888neon, 0 },
++ { PIXMAN_OP_NONE },
++};
++#endif
++
+ #ifdef USE_ARM_SIMD
+ static const FastPathInfo arm_simd_fast_paths[] =
+ {
+@@ -1893,6 +1919,11 @@ pixman_image_composite (pixman_op_t op,
+ info = get_fast_path (vmx_fast_paths, op, pSrc, pMask, pDst, pixbuf);
+ #endif
+
++#ifdef USE_ARM_NEON
++ if (!info && pixman_have_arm_neon())
++ info = get_fast_path (arm_neon_fast_paths, op, pSrc, pMask, pDst, pixbuf);
++#endif
++
+ #ifdef USE_ARM_SIMD
+ if (!info && pixman_have_arm_simd())
+ info = get_fast_path (arm_simd_fast_paths, op, pSrc, pMask, pDst, pixbuf);
diff --git a/recipes/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
deleted file mode 100644
index 25ce7ee..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From c29c9fa826b7112156fd6150b5f1564227935c05 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:27:33 +0300
-Subject: [PATCH 3/6] Generic C implementation of pixman_blt with overlapping support
-
-Uses memcpy/memmove functions to copy pixels, can handle the
-case when both source and destination areas are in the same
-image (this is useful for scrolling).
-
-It is assumed that copying direction is only important when
-using the same image for both source and destination (and
-src_stride == dst_stride). Copying direction is undefined
-for the images with different source and destination stride
-which happen to be in the overlapped areas (but this is an
-unrealistic case anyway).
----
- pixman/pixman-general.c | 21 ++++++++++++++++++---
- pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 61 insertions(+), 3 deletions(-)
-
-diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
-index c96a3f9..d71a299 100644
---- a/pixman/pixman-general.c
-+++ b/pixman/pixman-general.c
-@@ -300,9 +300,24 @@ general_blt (pixman_implementation_t *imp,
- int width,
- int height)
- {
-- /* We can't blit unless we have sse2 or mmx */
--
-- return FALSE;
-+ uint8_t *dst_bytes = (uint8_t *)dst_bits;
-+ uint8_t *src_bytes = (uint8_t *)src_bits;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
-+ return FALSE;
-+
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
-+ dst_bytes + dst_y * dst_stride + dst_x * bpp,
-+ src_stride,
-+ dst_stride,
-+ width,
-+ height);
-+ return TRUE;
- }
-
- static pixman_bool_t
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index 5000f91..8c5d4fd 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -10,6 +10,7 @@
-
- #include "pixman.h"
- #include <time.h>
-+#include <string.h>
- #include <assert.h>
-
- #include "pixman-compiler.h"
-@@ -794,4 +795,46 @@ void pixman_timer_register (pixman_timer_t *timer);
-
- #endif /* PIXMAN_TIMERS */
-
-+/* a helper function, can blit 8-bit images with src/dst overlapping support */
-+static inline void
-+pixman_blt_helper (uint8_t *src_bytes,
-+ uint8_t *dst_bytes,
-+ int src_stride,
-+ int dst_stride,
-+ int width,
-+ int height)
-+{
-+ /*
-+ * The second part of this check is not strictly needed, but it prevents
-+ * unnecessary upside-down processing of areas which belong to different
-+ * images. Upside-down processing can be slower with fixed-distance-ahead
-+ * prefetch and perceived as having more tearing.
-+ */
-+ if (src_bytes < dst_bytes + width &&
-+ src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+ /* Horizontal scrolling to the left needs memmove */
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return;
-+ }
-+ }
-+ while (--height >= 0)
-+ {
-+ memcpy (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+}
-+
- #endif /* PIXMAN_PRIVATE_H */
---
-1.6.2.4
-
diff --git a/recipes/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
deleted file mode 100644
index 74c7b45..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 7ca32542c957ff308a6ca7e3715e6552a65ae395 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:45:47 +0300
-Subject: [PATCH 4/6] Support of overlapping src/dst for pixman_blt_mmx
-
----
- pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++---------------------
- 1 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
-index 819e3a0..dcccadb 100644
---- a/pixman/pixman-mmx.c
-+++ b/pixman/pixman-mmx.c
-@@ -3002,34 +3002,43 @@ pixman_blt_mmx (uint32_t *src_bits,
- {
- uint8_t * src_bytes;
- uint8_t * dst_bytes;
-- int byte_width;
-+ int bpp;
-
-- if (src_bpp != dst_bpp)
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-- if (src_bpp == 16)
-- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 2 * width;
-- src_stride *= 2;
-- dst_stride *= 2;
-- }
-- else if (src_bpp == 32)
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 4 * width;
-- src_stride *= 4;
-- dst_stride *= 4;
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
- }
-- else
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
- {
-- return FALSE;
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using MMX */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
- }
-
- while (height--)
-@@ -3039,7 +3048,7 @@ pixman_blt_mmx (uint32_t *src_bits,
- uint8_t *d = dst_bytes;
- src_bytes += src_stride;
- dst_bytes += dst_stride;
-- w = byte_width;
-+ w = width;
-
- while (w >= 2 && ((unsigned long)d & 3))
- {
---
-1.6.2.4
-
diff --git a/recipes/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
deleted file mode 100644
index 3704fbf..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From edc80b41c6480b7c80ec5f7c835c92b2debb3774 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:45:54 +0300
-Subject: [PATCH 5/6] Support of overlapping src/dst for pixman_blt_sse2
-
----
- pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++--------------------
- 1 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
-index 78b0ad1..b84636b 100644
---- a/pixman/pixman-sse2.c
-+++ b/pixman/pixman-sse2.c
-@@ -5300,34 +5300,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
- {
- uint8_t * src_bytes;
- uint8_t * dst_bytes;
-- int byte_width;
-+ int bpp;
-
-- if (src_bpp != dst_bpp)
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-- if (src_bpp == 16)
-- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 2 * width;
-- src_stride *= 2;
-- dst_stride *= 2;
-- }
-- else if (src_bpp == 32)
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 4 * width;
-- src_stride *= 4;
-- dst_stride *= 4;
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
- }
-- else
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
- {
-- return FALSE;
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using SSE2 */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
- }
-
- cache_prefetch ((__m128i*)src_bytes);
-@@ -5340,7 +5349,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
- uint8_t *d = dst_bytes;
- src_bytes += src_stride;
- dst_bytes += dst_stride;
-- w = byte_width;
-+ w = width;
-
- cache_prefetch_next ((__m128i*)s);
- cache_prefetch_next ((__m128i*)d);
---
-1.6.2.4
-
diff --git a/recipes/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
deleted file mode 100644
index 7c22483..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 86870ff530b5e435034bd80207e5758466d96cff Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Wed, 18 Nov 2009 06:08:48 +0200
-Subject: [PATCH 6/6] Support of overlapping src/dst for pixman_blt_neon
-
----
- pixman/pixman-arm-neon.c | 63 ++++++++++++++++++++++++++++++++++++++-------
- 1 files changed, 53 insertions(+), 10 deletions(-)
-
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 495fda4..c632ff5 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -357,26 +357,66 @@
- int width,
- int height)
- {
-- if (src_bpp != dst_bpp)
-+ uint8_t * src_bytes;
-+ uint8_t * dst_bytes;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
-+ {
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
-+ }
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using NEON */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
-+ }
-+
- switch (src_bpp)
- {
- case 16:
- pixman_composite_src_0565_0565_asm_neon (
-- width, height,
-- (uint16_t *)(((char *) dst_bits) +
-- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
-- (uint16_t *)(((char *) src_bits) +
-- src_y * src_stride * 4 + src_x * 2), src_stride * 2);
-+ width >> 1,
-+ height,
-+ (uint16_t *) dst_bytes,
-+ dst_stride >> 1,
-+ (uint16_t *) src_bytes,
-+ src_stride >> 1);
- return TRUE;
- case 32:
- pixman_composite_src_8888_8888_asm_neon (
-- width, height,
-- (uint32_t *)(((char *) dst_bits) +
-- dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
-- (uint32_t *)(((char *) src_bits) +
-- src_y * src_stride * 4 + src_x * 4), src_stride);
-+ width >> 2,
-+ height,
-+ (uint32_t *) dst_bytes,
-+ dst_stride >> 2,
-+ (uint32_t *) src_bytes,
-+ src_stride >> 2);
- return TRUE;
- default:
- return FALSE;
---
-1.6.2.4
-
diff --git a/recipes/xorg-lib/pixman-0.17.8/1-composite.patch b/recipes/xorg-lib/pixman-0.17.8/1-composite.patch
deleted file mode 100644
index 31bfa39..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/1-composite.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 78652135f48c6a304fc2e75bc0e440b8b2034a4d Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Tue, 23 Feb 2010 23:44:00 +0000
-Subject: ARM: added 'neon_composite_over_n_8888_8888_ca' fast path
-
-This fast path function improves performance of 'firefox-talos-gfx'
-cairo-perf trace.
-
-Benchmark from ARM Cortex-A8 @720MHz
-
-before:
-
-[ # ] backend test min(s) median(s) stddev. count
-[ 0] image firefox-talos-gfx 139.969 141.176 0.35% 6/6
-
-after:
-
-[ # ] backend test min(s) median(s) stddev. count
-[ 0] image firefox-talos-gfx 111.810 112.196 0.23% 6/6
----
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index 2986884..e90d662 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -1026,6 +1026,111 @@ generate_composite_function \
-
- /******************************************************************************/
-
-+.macro pixman_composite_over_n_8888_8888_ca_process_pixblock_head
-+ /*
-+ * 'combine_mask_ca' replacement
-+ *
-+ * input: solid src (n) in {d8, d9, d10, d11}
-+ * dest in {d4, d5, d6, d7 }
-+ * mask in {d24, d25, d26, d27}
-+ * output: updated src in {d0, d1, d2, d3 }
-+ * updated mask in {d24, d25, d26, d3 }
-+ */
-+ vmull.u8 q0, d24, d8
-+ vmull.u8 q1, d25, d9
-+ vmull.u8 q6, d26, d10
-+ vmull.u8 q7, d27, d11
-+ vmull.u8 q9, d11, d25
-+ vmull.u8 q12, d11, d24
-+ vmull.u8 q13, d11, d26
-+ vrshr.u16 q8, q0, #8
-+ vrshr.u16 q10, q1, #8
-+ vrshr.u16 q11, q6, #8
-+ vraddhn.u16 d0, q0, q8
-+ vraddhn.u16 d1, q1, q10
-+ vraddhn.u16 d2, q6, q11
-+ vrshr.u16 q11, q12, #8
-+ vrshr.u16 q8, q9, #8
-+ vrshr.u16 q6, q13, #8
-+ vrshr.u16 q10, q7, #8
-+ vraddhn.u16 d24, q12, q11
-+ vraddhn.u16 d25, q9, q8
-+ vraddhn.u16 d26, q13, q6
-+ vraddhn.u16 d3, q7, q10
-+ /*
-+ * 'combine_over_ca' replacement
-+ *
-+ * output: updated dest in {d28, d29, d30, d31}
-+ */
-+ vmvn.8 d24, d24
-+ vmvn.8 d25, d25
-+ vmull.u8 q8, d24, d4
-+ vmull.u8 q9, d25, d5
-+ vmvn.8 d26, d26
-+ vmvn.8 d27, d3
-+ vmull.u8 q10, d26, d6
-+ vmull.u8 q11, d27, d7
-+.endm
-+
-+.macro pixman_composite_over_n_8888_8888_ca_process_pixblock_tail
-+ /* ... continue 'combine_over_ca' replacement */
-+ vrshr.u16 q14, q8, #8
-+ vrshr.u16 q15, q9, #8
-+ vrshr.u16 q6, q10, #8
-+ vrshr.u16 q7, q11, #8
-+ vraddhn.u16 d28, q14, q8
-+ vraddhn.u16 d29, q15, q9
-+ vraddhn.u16 d30, q6, q10
-+ vraddhn.u16 d31, q7, q11
-+ vqadd.u8 q14, q0, q14
-+ vqadd.u8 q15, q1, q15
-+.endm
-+
-+.macro pixman_composite_over_n_8888_8888_ca_process_pixblock_tail_head
-+ vrshr.u16 q14, q8, #8
-+ vrshr.u16 q15, q9, #8
-+ vld4.8 {d4, d5, d6, d7}, [DST_R, :128]!
-+ vrshr.u16 q6, q10, #8
-+ vrshr.u16 q7, q11, #8
-+ vraddhn.u16 d28, q14, q8
-+ vraddhn.u16 d29, q15, q9
-+ vraddhn.u16 d30, q6, q10
-+ vraddhn.u16 d31, q7, q11
-+ vld4.8 {d24, d25, d26, d27}, [MASK]!
-+ vqadd.u8 q14, q0, q14
-+ vqadd.u8 q15, q1, q15
-+ cache_preload 8, 8
-+ pixman_composite_over_n_8888_8888_ca_process_pixblock_head
-+ vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
-+.endm
-+
-+.macro pixman_composite_over_n_8888_8888_ca_init
-+ add DUMMY, sp, #ARGS_STACK_OFFSET
-+ vpush {d8-d15}
-+ vld1.32 {d11[0]}, [DUMMY]
-+ vdup.8 d8, d11[0]
-+ vdup.8 d9, d11[1]
-+ vdup.8 d10, d11[2]
-+ vdup.8 d11, d11[3]
-+.endm
-+
-+.macro pixman_composite_over_n_8888_8888_ca_cleanup
-+ vpop {d8-d15}
-+.endm
-+
-+generate_composite_function \
-+ pixman_composite_over_n_8888_8888_ca_asm_neon, 0, 32, 32, \
-+ FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ 5, /* prefetch distance */ \
-+ pixman_composite_over_n_8888_8888_ca_init, \
-+ pixman_composite_over_n_8888_8888_ca_cleanup, \
-+ pixman_composite_over_n_8888_8888_ca_process_pixblock_head, \
-+ pixman_composite_over_n_8888_8888_ca_process_pixblock_tail, \
-+ pixman_composite_over_n_8888_8888_ca_process_pixblock_tail_head
-+
-+/******************************************************************************/
-+
- .macro pixman_composite_add_n_8_8_process_pixblock_head
- /* expecting source data in {d8, d9, d10, d11} */
- /* d8 - blue, d9 - green, d10 - red, d11 - alpha */
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 557301e..3f0e18e 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -269,6 +269,7 @@ BIND_SRC_NULL_DST(over_8888_8888, uint32_t, 1, uint32_t, 1)
-
- BIND_N_MASK_DST(over_n_8_0565, uint8_t, 1, uint16_t, 1)
- BIND_N_MASK_DST(over_n_8_8888, uint8_t, 1, uint32_t, 1)
-+BIND_N_MASK_DST(over_n_8888_8888_ca, uint32_t, 1, uint32_t, 1)
- BIND_N_MASK_DST(add_n_8_8, uint8_t, 1, uint8_t, 1)
-
- BIND_SRC_N_DST(over_8888_n_8888, uint32_t, 1, uint32_t, 1)
-@@ -412,6 +413,10 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
- PIXMAN_STD_FAST_PATH (OVER, solid, null, r5g6b5, neon_composite_over_n_0565),
- PIXMAN_STD_FAST_PATH (OVER, solid, null, a8r8g8b8, neon_composite_over_n_8888),
- PIXMAN_STD_FAST_PATH (OVER, solid, null, x8r8g8b8, neon_composite_over_n_8888),
-+ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, a8r8g8b8, neon_composite_over_n_8888_8888_ca),
-+ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, x8r8g8b8, neon_composite_over_n_8888_8888_ca),
-+ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, a8b8g8r8, neon_composite_over_n_8888_8888_ca),
-+ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, x8b8g8r8, neon_composite_over_n_8888_8888_ca),
- PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, a8r8g8b8, neon_composite_over_8888_n_8888),
- PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, x8r8g8b8, neon_composite_over_8888_n_8888),
- PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, a8, a8r8g8b8, neon_composite_over_8888_8_8888),
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman-0.17.8/2-composite.patch b/recipes/xorg-lib/pixman-0.17.8/2-composite.patch
deleted file mode 100644
index 84d4d9c..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/2-composite.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 6e0df74dbfca26f92a18d968e1bf410bae134c8a Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Wed, 24 Feb 2010 00:26:57 +0000
-Subject: ARM: added 'neon_composite_src_x888_8888' fast path
-
-This fast path function improves performance of 'gnome-system-monitor'
-cairo-perf trace.
-
-Benchmark from ARM Cortex-A8 @720MHz
-
-before:
-
-[ # ] backend test min(s) median(s) stddev. count
-[ 0] image gnome-system-monitor 68.838 68.899 0.05% 5/6
-
-after:
-
-[ # ] backend test min(s) median(s) stddev. count
-[ 0] image gnome-system-monitor 53.336 53.384 0.09% 6/6
----
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index e90d662..f2643de 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -947,6 +947,44 @@ generate_composite_function \
-
- /******************************************************************************/
-
-+.macro pixman_composite_src_x888_8888_process_pixblock_head
-+ vorr q0, q0, q2
-+ vorr q1, q1, q2
-+.endm
-+
-+.macro pixman_composite_src_x888_8888_process_pixblock_tail
-+.endm
-+
-+.macro pixman_composite_src_x888_8888_process_pixblock_tail_head
-+ vst1.32 {d0, d1, d2, d3}, [DST_W, :128]!
-+ vld1.32 {d0, d1, d2, d3}, [SRC]!
-+ vorr q0, q0, q2
-+ vorr q1, q1, q2
-+ cache_preload 8, 8
-+.endm
-+
-+.macro pixman_composite_src_x888_8888_init
-+ vmov.u8 q2, #0xFF
-+ vshl.u32 q2, q2, #24
-+.endm
-+
-+generate_composite_function \
-+ pixman_composite_src_x888_8888_asm_neon, 32, 0, 32, \
-+ FLAG_DST_WRITEONLY, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ 10, /* prefetch distance */ \
-+ pixman_composite_src_x888_8888_init, \
-+ default_cleanup, \
-+ pixman_composite_src_x888_8888_process_pixblock_head, \
-+ pixman_composite_src_x888_8888_process_pixblock_tail, \
-+ pixman_composite_src_x888_8888_process_pixblock_tail_head, \
-+ 0, /* dst_w_basereg */ \
-+ 0, /* dst_r_basereg */ \
-+ 0, /* src_basereg */ \
-+ 0 /* mask_basereg */
-+
-+/******************************************************************************/
-+
- .macro pixman_composite_over_n_8_8888_process_pixblock_head
- /* expecting deinterleaved source data in {d8, d9, d10, d11} */
- /* d8 - blue, d9 - green, d10 - red, d11 - alpha */
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 3f0e18e..0a7ac31 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -251,6 +251,7 @@ neon_composite_##name (pixman_implementation_t *imp, \
-
-
- BIND_SRC_NULL_DST(src_8888_8888, uint32_t, 1, uint32_t, 1)
-+BIND_SRC_NULL_DST(src_x888_8888, uint32_t, 1, uint32_t, 1)
- BIND_SRC_NULL_DST(src_0565_0565, uint16_t, 1, uint16_t, 1)
- BIND_SRC_NULL_DST(src_0888_0888, uint8_t, 3, uint8_t, 3)
- BIND_SRC_NULL_DST(src_8888_0565, uint32_t, 1, uint16_t, 1)
-@@ -400,6 +401,10 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
- PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, x8r8g8b8, neon_composite_src_8888_8888),
- PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, x8b8g8r8, neon_composite_src_8888_8888),
- PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, x8b8g8r8, neon_composite_src_8888_8888),
-+ PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, a8r8g8b8, neon_composite_src_8888_8888),
-+ PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, a8b8g8r8, neon_composite_src_8888_8888),
-+ PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, a8r8g8b8, neon_composite_src_x888_8888),
-+ PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, a8b8g8r8, neon_composite_src_x888_8888),
- PIXMAN_STD_FAST_PATH (SRC, r8g8b8, null, r8g8b8, neon_composite_src_0888_0888),
- PIXMAN_STD_FAST_PATH (SRC, b8g8r8, null, x8r8g8b8, neon_composite_src_0888_8888_rev),
- PIXMAN_STD_FAST_PATH (SRC, b8g8r8, null, r5g6b5, neon_composite_src_0888_0565_rev),
-@@ -430,6 +435,7 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
- PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, x8r8g8b8, neon_composite_over_8888_8888),
- PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, a8b8g8r8, neon_composite_over_8888_8888),
- PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, x8b8g8r8, neon_composite_over_8888_8888),
-+ PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, null, a8r8g8b8, neon_composite_src_x888_8888),
- PIXMAN_STD_FAST_PATH (ADD, solid, a8, a8, neon_composite_add_n_8_8),
- PIXMAN_STD_FAST_PATH (ADD, a8, a8, a8, neon_composite_add_8_8_8),
- PIXMAN_STD_FAST_PATH (ADD, a8r8g8b8, a8r8g8b8, a8r8g8b8, neon_composite_add_8888_8888_8888),
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman-0.17.8/3-composite.patch b/recipes/xorg-lib/pixman-0.17.8/3-composite.patch
deleted file mode 100644
index 06e40fe..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/3-composite.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 19fc0c4c8d28796f0fbc2c8f47edc130851ae3a5 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Wed, 24 Feb 2010 02:14:45 +0000
-Subject: ARM: added 'neon_composite_over_reverse_n_8888' fast path
-
-This fast path function improves performance of 'poppler' cairo-perf trace.
-
-Benchmark from ARM Cortex-A8 @720MHz
-
-before:
-
-[ # ] backend test min(s) median(s) stddev. count
-[ 0] image poppler 38.986 39.158 0.23% 6/6
-
-after:
-
-[ # ] backend test min(s) median(s) stddev. count
-[ 0] image poppler 24.981 25.136 0.28% 6/6
----
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index f2643de..eb8cc4c 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -680,6 +680,61 @@ generate_composite_function \
-
- /******************************************************************************/
-
-+.macro pixman_composite_over_reverse_n_8888_process_pixblock_tail_head
-+ vrshr.u16 q14, q8, #8
-+ PF add PF_X, PF_X, #8
-+ PF tst PF_CTL, #0xF
-+ vrshr.u16 q15, q9, #8
-+ vrshr.u16 q12, q10, #8
-+ vrshr.u16 q13, q11, #8
-+ PF addne PF_X, PF_X, #8
-+ PF subne PF_CTL, PF_CTL, #1
-+ vraddhn.u16 d28, q14, q8
-+ vraddhn.u16 d29, q15, q9
-+ PF cmp PF_X, ORIG_W
-+ vraddhn.u16 d30, q12, q10
-+ vraddhn.u16 d31, q13, q11
-+ vqadd.u8 q14, q0, q14
-+ vqadd.u8 q15, q1, q15
-+ vld4.8 {d0, d1, d2, d3}, [DST_R, :128]!
-+ vmvn.8 d22, d3
-+ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
-+ vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
-+ PF subge PF_X, PF_X, ORIG_W
-+ vmull.u8 q8, d22, d4
-+ PF subges PF_CTL, PF_CTL, #0x10
-+ vmull.u8 q9, d22, d5
-+ vmull.u8 q10, d22, d6
-+ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
-+ vmull.u8 q11, d22, d7
-+.endm
-+
-+.macro pixman_composite_over_reverse_n_8888_init
-+ add DUMMY, sp, #ARGS_STACK_OFFSET
-+ vld1.32 {d7[0]}, [DUMMY]
-+ vdup.8 d4, d7[0]
-+ vdup.8 d5, d7[1]
-+ vdup.8 d6, d7[2]
-+ vdup.8 d7, d7[3]
-+.endm
-+
-+generate_composite_function \
-+ pixman_composite_over_reverse_n_8888_asm_neon, 0, 0, 32, \
-+ FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ 5, /* prefetch distance */ \
-+ pixman_composite_over_reverse_n_8888_init, \
-+ default_cleanup, \
-+ pixman_composite_over_8888_8888_process_pixblock_head, \
-+ pixman_composite_over_8888_8888_process_pixblock_tail, \
-+ pixman_composite_over_reverse_n_8888_process_pixblock_tail_head, \
-+ 28, /* dst_w_basereg */ \
-+ 0, /* dst_r_basereg */ \
-+ 4, /* src_basereg */ \
-+ 24 /* mask_basereg */
-+
-+/******************************************************************************/
-+
- .macro pixman_composite_over_n_8_0565_process_pixblock_head
- /* in */
- vmull.u8 q0, d24, d8
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 0a7ac31..30c5056 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -264,6 +264,7 @@ BIND_SRC_NULL_DST(add_8888_8888, uint32_t, 1, uint32_t, 1)
-
- BIND_N_NULL_DST(over_n_0565, uint16_t, 1)
- BIND_N_NULL_DST(over_n_8888, uint32_t, 1)
-+BIND_N_NULL_DST(over_reverse_n_8888, uint32_t, 1)
-
- BIND_SRC_NULL_DST(over_8888_0565, uint32_t, 1, uint16_t, 1)
- BIND_SRC_NULL_DST(over_8888_8888, uint32_t, 1, uint32_t, 1)
-@@ -442,6 +443,8 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
- PIXMAN_STD_FAST_PATH (ADD, a8, null, a8, neon_composite_add_8000_8000),
- PIXMAN_STD_FAST_PATH (ADD, a8r8g8b8, null, a8r8g8b8, neon_composite_add_8888_8888),
- PIXMAN_STD_FAST_PATH (ADD, a8b8g8r8, null, a8b8g8r8, neon_composite_add_8888_8888),
-+ PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8r8g8b8, neon_composite_over_reverse_n_8888),
-+ PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8b8g8r8, neon_composite_over_reverse_n_8888),
-
- { PIXMAN_OP_NONE },
- };
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
deleted file mode 100644
index 06b07a3..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 5234e3c2c161ed5fc92caa336ae78f89112c7d77 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Tue, 16 Mar 2010 16:55:28 +0100
-Subject: [PATCH 1/5] Generic C implementation of pixman_blt with overlapping support
-
-Uses memcpy/memmove functions to copy pixels, can handle the
-case when both source and destination areas are in the same
-image (this is useful for scrolling).
-
-It is assumed that copying direction is only important when
-using the same image for both source and destination (and
-src_stride == dst_stride). Copying direction is undefined
-for the images with different source and destination stride
-which happen to be in the overlapped areas (but this is an
-unrealistic case anyway).
----
- pixman/pixman-general.c | 21 ++++++++++++++++++---
- pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 61 insertions(+), 3 deletions(-)
-
-diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
-index bddf79a..f525744 100644
---- a/pixman/pixman-general.c
-+++ b/pixman/pixman-general.c
-@@ -285,9 +285,24 @@ general_blt (pixman_implementation_t *imp,
- int width,
- int height)
- {
-- /* We can't blit unless we have sse2 or mmx */
--
-- return FALSE;
-+ uint8_t *dst_bytes = (uint8_t *)dst_bits;
-+ uint8_t *src_bytes = (uint8_t *)src_bits;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
-+ return FALSE;
-+
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
-+ dst_bytes + dst_y * dst_stride + dst_x * bpp,
-+ src_stride,
-+ dst_stride,
-+ width,
-+ height);
-+ return TRUE;
- }
-
- static pixman_bool_t
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index d5767af..eeb677d 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -10,6 +10,7 @@
-
- #include "pixman.h"
- #include <time.h>
-+#include <string.h>
- #include <assert.h>
- #include <stdio.h>
- #include <string.h>
-@@ -867,4 +868,46 @@ void pixman_timer_register (pixman_timer_t *timer);
-
- #endif /* PIXMAN_TIMERS */
-
-+/* a helper function, can blit 8-bit images with src/dst overlapping support */
-+static inline void
-+pixman_blt_helper (uint8_t *src_bytes,
-+ uint8_t *dst_bytes,
-+ int src_stride,
-+ int dst_stride,
-+ int width,
-+ int height)
-+{
-+ /*
-+ * The second part of this check is not strictly needed, but it prevents
-+ * unnecessary upside-down processing of areas which belong to different
-+ * images. Upside-down processing can be slower with fixed-distance-ahead
-+ * prefetch and perceived as having more tearing.
-+ */
-+ if (src_bytes < dst_bytes + width &&
-+ src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+ /* Horizontal scrolling to the left needs memmove */
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return;
-+ }
-+ }
-+ while (--height >= 0)
-+ {
-+ memcpy (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+}
-+
- #endif /* PIXMAN_PRIVATE_H */
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
deleted file mode 100644
index bf6e58c..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From f607cd0250d398077b0c51201258775e372cb3c3 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:45:47 +0300
-Subject: [PATCH 2/5] Support of overlapping src/dst for pixman_blt_mmx
-
----
- pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++---------------------
- 1 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
-index e084e7f..6212b31 100644
---- a/pixman/pixman-mmx.c
-+++ b/pixman/pixman-mmx.c
-@@ -2994,34 +2994,43 @@ pixman_blt_mmx (uint32_t *src_bits,
- {
- uint8_t * src_bytes;
- uint8_t * dst_bytes;
-- int byte_width;
-+ int bpp;
-
-- if (src_bpp != dst_bpp)
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-- if (src_bpp == 16)
-- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 2 * width;
-- src_stride *= 2;
-- dst_stride *= 2;
-- }
-- else if (src_bpp == 32)
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 4 * width;
-- src_stride *= 4;
-- dst_stride *= 4;
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
- }
-- else
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
- {
-- return FALSE;
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using MMX */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
- }
-
- while (height--)
-@@ -3031,7 +3040,7 @@ pixman_blt_mmx (uint32_t *src_bits,
- uint8_t *d = dst_bytes;
- src_bytes += src_stride;
- dst_bytes += dst_stride;
-- w = byte_width;
-+ w = width;
-
- while (w >= 2 && ((unsigned long)d & 3))
- {
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
deleted file mode 100644
index c1f3b2e..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 45a9a537f94a7feab47bd82171c7d620f0d34e3f Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:45:54 +0300
-Subject: [PATCH 3/5] Support of overlapping src/dst for pixman_blt_sse2
-
----
- pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++--------------------
- 1 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
-index 946e7ba..66053ae 100644
---- a/pixman/pixman-sse2.c
-+++ b/pixman/pixman-sse2.c
-@@ -5299,34 +5299,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
- {
- uint8_t * src_bytes;
- uint8_t * dst_bytes;
-- int byte_width;
-+ int bpp;
-
-- if (src_bpp != dst_bpp)
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-- if (src_bpp == 16)
-- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 2 * width;
-- src_stride *= 2;
-- dst_stride *= 2;
-- }
-- else if (src_bpp == 32)
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 4 * width;
-- src_stride *= 4;
-- dst_stride *= 4;
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
- }
-- else
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
- {
-- return FALSE;
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using SSE2 */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
- }
-
- cache_prefetch ((__m128i*)src_bytes);
-@@ -5339,7 +5348,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
- uint8_t *d = dst_bytes;
- src_bytes += src_stride;
- dst_bytes += dst_stride;
-- w = byte_width;
-+ w = width;
-
- cache_prefetch_next ((__m128i*)s);
- cache_prefetch_next ((__m128i*)d);
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
deleted file mode 100644
index c37673e..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 4cf5bfc72a724fb653c48338b93e91dccea238af Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Wed, 18 Nov 2009 06:08:48 +0200
-Subject: [PATCH 4/5] Support of overlapping src/dst for pixman_blt_neon
-
----
- pixman/pixman-arm-neon.c | 62 +++++++++++++++++++++++++++++++++++++--------
- 1 files changed, 51 insertions(+), 11 deletions(-)
-
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 6808b36..7feee1d 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -168,26 +168,66 @@ pixman_blt_neon (uint32_t *src_bits,
- int width,
- int height)
- {
-- if (src_bpp != dst_bpp)
-+ uint8_t * src_bytes;
-+ uint8_t * dst_bytes;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
-+ {
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
-+ }
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using NEON */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
-+ }
-+
- switch (src_bpp)
- {
- case 16:
- pixman_composite_src_0565_0565_asm_neon (
-- width, height,
-- (uint16_t *)(((char *) dst_bits) +
-- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
-- (uint16_t *)(((char *) src_bits) +
-- src_y * src_stride * 4 + src_x * 2), src_stride * 2);
-+ width >> 1,
-+ height,
-+ (uint16_t *) dst_bytes,
-+ dst_stride >> 1,
-+ (uint16_t *) src_bytes,
-+ src_stride >> 1);
- return TRUE;
- case 32:
- pixman_composite_src_8888_8888_asm_neon (
-- width, height,
-- (uint32_t *)(((char *) dst_bits) +
-- dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
-- (uint32_t *)(((char *) src_bits) +
-- src_y * src_stride * 4 + src_x * 4), src_stride);
-+ width >> 2,
-+ height,
-+ (uint32_t *) dst_bytes,
-+ dst_stride >> 2,
-+ (uint32_t *) src_bytes,
-+ src_stride >> 2);
- return TRUE;
- default:
- return FALSE;
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch b/recipes/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
deleted file mode 100644
index d776574..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From d1410558827fce8aac354274a7150fa915881c50 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 10 Dec 2009 00:51:50 +0200
-Subject: [PATCH 5/5] ARM: added NEON optimizations for fetch/store r5g6b5 scanline
-
----
- pixman/pixman-access.c | 23 ++++++++++++++++++++++-
- pixman/pixman-arm-neon-asm.S | 20 ++++++++++++++++++++
- pixman/pixman-arm-neon.c | 41 +++++++++++++++++++++++++++++++++++++++++
- pixman/pixman-private.h | 5 +++++
- 4 files changed, 88 insertions(+), 1 deletions(-)
-
-diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
-index fa0a267..5bb3e09 100644
---- a/pixman/pixman-access.c
-+++ b/pixman/pixman-access.c
-@@ -2748,7 +2748,7 @@ typedef struct
- store_scanline_ ## format, store_scanline_generic_64 \
- }
-
--static const format_info_t accessors[] =
-+static format_info_t accessors[] =
- {
- /* 32 bpp formats */
- FORMAT_INFO (a8r8g8b8),
-@@ -2891,6 +2891,27 @@ _pixman_bits_image_setup_raw_accessors (bits_image_t *image)
- setup_accessors (image);
- }
-
-+void
-+_pixman_bits_override_accessors (pixman_format_code_t format,
-+ fetch_scanline_t fetch_func,
-+ store_scanline_t store_func)
-+{
-+ format_info_t *info = accessors;
-+
-+ while (info->format != PIXMAN_null)
-+ {
-+ if (info->format == format)
-+ {
-+ if (fetch_func)
-+ info->fetch_scanline_raw_32 = fetch_func;
-+ if (store_func)
-+ info->store_scanline_raw_32 = store_func;
-+ return;
-+ }
-+ info++;
-+ }
-+}
-+
- #else
-
- void
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index 51bc347..f30869e 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -458,6 +458,16 @@ generate_composite_function \
- pixman_composite_src_8888_0565_process_pixblock_tail, \
- pixman_composite_src_8888_0565_process_pixblock_tail_head
-
-+generate_composite_function_single_scanline \
-+ pixman_store_scanline_r5g6b5_asm_neon, 32, 0, 16, \
-+ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ default_init, \
-+ default_cleanup, \
-+ pixman_composite_src_8888_0565_process_pixblock_head, \
-+ pixman_composite_src_8888_0565_process_pixblock_tail, \
-+ pixman_composite_src_8888_0565_process_pixblock_tail_head
-+
- /******************************************************************************/
-
- .macro pixman_composite_src_0565_8888_process_pixblock_head
-@@ -493,6 +503,16 @@ generate_composite_function \
- pixman_composite_src_0565_8888_process_pixblock_tail, \
- pixman_composite_src_0565_8888_process_pixblock_tail_head
-
-+generate_composite_function_single_scanline \
-+ pixman_fetch_scanline_r5g6b5_asm_neon, 16, 0, 32, \
-+ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ default_init, \
-+ default_cleanup, \
-+ pixman_composite_src_0565_8888_process_pixblock_head, \
-+ pixman_composite_src_0565_8888_process_pixblock_tail, \
-+ pixman_composite_src_0565_8888_process_pixblock_tail_head
-+
- /******************************************************************************/
-
- .macro pixman_composite_add_8000_8000_process_pixblock_head
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 7feee1d..fda7a09 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -375,6 +375,43 @@ neon_combine_##name##_u (pixman_implementation_t *imp, \
- BIND_COMBINE_U (over)
- BIND_COMBINE_U (add)
-
-+void
-+pixman_fetch_scanline_r5g6b5_asm_neon (int width,
-+ uint32_t *buffer,
-+ const uint16_t *pixel);
-+void
-+pixman_store_scanline_r5g6b5_asm_neon (int width,
-+ uint16_t *pixel,
-+ const uint32_t *values);
-+
-+static void
-+neon_fetch_scanline_r5g6b5 (pixman_image_t *image,
-+ int x,
-+ int y,
-+ int width,
-+ uint32_t * buffer,
-+ const uint32_t *mask,
-+ uint32_t mask_bits)
-+{
-+ const uint32_t *bits = image->bits.bits + y * image->bits.rowstride;
-+ const uint16_t *pixel = (const uint16_t *)bits + x;
-+
-+ pixman_fetch_scanline_r5g6b5_asm_neon (width, buffer, pixel);
-+}
-+
-+static void
-+neon_store_scanline_r5g6b5 (bits_image_t * image,
-+ int x,
-+ int y,
-+ int width,
-+ const uint32_t *values)
-+{
-+ uint32_t *bits = image->bits + image->rowstride * y;
-+ uint16_t *pixel = ((uint16_t *) bits) + x;
-+
-+ pixman_store_scanline_r5g6b5_asm_neon (width, pixel, values);
-+}
-+
- pixman_implementation_t *
- _pixman_implementation_create_arm_neon (void)
- {
-@@ -385,6 +422,10 @@ _pixman_implementation_create_arm_neon (void)
- imp->combine_32[PIXMAN_OP_OVER] = neon_combine_over_u;
- imp->combine_32[PIXMAN_OP_ADD] = neon_combine_add_u;
-
-+ _pixman_bits_override_accessors (PIXMAN_r5g6b5,
-+ neon_fetch_scanline_r5g6b5,
-+ neon_store_scanline_r5g6b5);
-+
- imp->blt = arm_neon_blt;
- imp->fill = arm_neon_fill;
-
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index eeb677d..ba2d401 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -220,6 +220,11 @@ void
- _pixman_bits_image_setup_raw_accessors (bits_image_t *image);
-
- void
-+_pixman_bits_override_accessors (pixman_format_code_t format,
-+ fetch_scanline_t fetch_func,
-+ store_scanline_t store_func);
-+
-+void
- _pixman_image_get_scanline_generic_64 (pixman_image_t *image,
- int x,
- int y,
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman-0.18.0/565-scanline.patch b/recipes/xorg-lib/pixman-0.18.0/565-scanline.patch
deleted file mode 100644
index 8461a46..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/565-scanline.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From deef1daf5896062f47fa61b94e1e77c7c0041820 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Fri, 04 Dec 2009 16:49:19 +0000
-Subject: A copy-paste version of 16bpp bilinear scanline fetcher
-
----
-diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
-index 3d78ff0..1656975 100644
---- a/pixman/pixman-bits-image.c
-+++ b/pixman/pixman-bits-image.c
-@@ -535,6 +535,212 @@ bits_image_fetch_bilinear_no_repeat_8888 (pixman_image_t * ima,
- *buffer++ = 0;
- }
-
-+static void
-+bits_image_fetch_bilinear_no_repeat_0565 (pixman_image_t * ima,
-+ int offset,
-+ int line,
-+ int width,
-+ uint32_t * buffer,
-+ const uint32_t * mask,
-+ uint32_t mask_bits)
-+{
-+ bits_image_t *bits = &ima->bits;
-+ pixman_fixed_t x_top, x_bottom, x;
-+ pixman_fixed_t ux_top, ux_bottom, ux;
-+ pixman_vector_t v;
-+ uint32_t top_mask, bottom_mask;
-+ uint16_t *top_row;
-+ uint16_t *bottom_row;
-+ uint32_t *end;
-+ uint16_t zero[2] = { 0, 0 };
-+ int y, y1, y2;
-+ int disty;
-+ int mask_inc;
-+ int w;
-+
-+ /* reference point is the center of the pixel */
-+ v.vector[0] = pixman_int_to_fixed (offset) + pixman_fixed_1 / 2;
-+ v.vector[1] = pixman_int_to_fixed (line) + pixman_fixed_1 / 2;
-+ v.vector[2] = pixman_fixed_1;
-+
-+ if (!pixman_transform_point_3d (bits->common.transform, &v))
-+ return;
-+
-+ ux = ux_top = ux_bottom = bits->common.transform->matrix[0][0];
-+ x = x_top = x_bottom = v.vector[0] - pixman_fixed_1/2;
-+
-+ y = v.vector[1] - pixman_fixed_1/2;
-+ disty = (y >> 8) & 0xff;
-+
-+ /* Load the pointers to the first and second lines from the source
-+ * image that bilinear code must read.
-+ *
-+ * The main trick in this code is about the check if any line are
-+ * outside of the image;
-+ *
-+ * When I realize that a line (any one) is outside, I change
-+ * the pointer to a dummy area with zeros. Once I change this, I
-+ * must be sure the pointer will not change, so I set the
-+ * variables to each pointer increments inside the loop.
-+ */
-+ y1 = pixman_fixed_to_int (y);
-+ y2 = y1 + 1;
-+
-+ if (y1 < 0 || y1 >= bits->height)
-+ {
-+ top_row = zero;
-+ x_top = 0;
-+ ux_top = 0;
-+ }
-+ else
-+ {
-+ top_row = bits->bits + y1 * bits->rowstride;
-+ x_top = x;
-+ ux_top = ux;
-+ }
-+
-+ if (y2 < 0 || y2 >= bits->height)
-+ {
-+ bottom_row = zero;
-+ x_bottom = 0;
-+ ux_bottom = 0;
-+ }
-+ else
-+ {
-+ bottom_row = bits->bits + y2 * bits->rowstride;
-+ x_bottom = x;
-+ ux_bottom = ux;
-+ }
-+
-+ /* Instead of checking whether the operation uses the mast in
-+ * each loop iteration, verify this only once and prepare the
-+ * variables to make the code smaller inside the loop.
-+ */
-+ if (!mask)
-+ {
-+ mask_inc = 0;
-+ mask_bits = 1;
-+ mask = &mask_bits;
-+ }
-+ else
-+ {
-+ /* If have a mask, prepare the variables to check it */
-+ mask_inc = 1;
-+ }
-+
-+ /* If both are zero, then the whole thing is zero */
-+ if (top_row == zero && bottom_row == zero)
-+ {
-+ memset (buffer, 0, width * sizeof (uint32_t));
-+ return;
-+ }
-+ else
-+ {
-+ if (top_row == zero)
-+ {
-+ top_mask = 0;
-+ bottom_mask = 0xff000000;
-+ }
-+ else if (bottom_row == zero)
-+ {
-+ top_mask = 0xff000000;
-+ bottom_mask = 0;
-+ }
-+ else
-+ {
-+ top_mask = 0xff000000;
-+ bottom_mask = 0xff000000;
-+ }
-+ }
-+
-+ end = buffer + width;
-+
-+ /* Zero fill to the left of the image */
-+ while (buffer < end && x < pixman_fixed_minus_1)
-+ {
-+ *buffer++ = 0;
-+ x += ux;
-+ x_top += ux_top;
-+ x_bottom += ux_bottom;
-+ mask += mask_inc;
-+ }
-+
-+ /* Left edge
-+ */
-+ while (buffer < end && x < 0)
-+ {
-+ uint32_t tr, br;
-+ int32_t distx;
-+
-+ tr = CONVERT_0565_TO_0888 (top_row[pixman_fixed_to_int (x_top) + 1]) | top_mask;
-+ br = CONVERT_0565_TO_0888 (bottom_row[pixman_fixed_to_int (x_bottom) + 1]) | bottom_mask;
-+
-+ distx = (x >> 8) & 0xff;
-+
-+ *buffer++ = bilinear_interpolation (0, tr, 0, br, distx, disty);
-+
-+ x += ux;
-+ x_top += ux_top;
-+ x_bottom += ux_bottom;
-+ mask += mask_inc;
-+ }
-+
-+ /* Main part */
-+ w = pixman_int_to_fixed (bits->width - 1);
-+
-+ while (buffer < end && x < w)
-+ {
-+ if (*mask)
-+ {
-+ uint32_t tl, tr, bl, br;
-+ int32_t distx;
-+
-+ tl = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top)]) | top_mask;
-+ tr = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top) + 1]) | top_mask;
-+ bl = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom)]) | bottom_mask;
-+ br = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom) + 1]) | bottom_mask;
-+
-+ distx = (x >> 8) & 0xff;
-+
-+ *buffer = bilinear_interpolation (tl, tr, bl, br, distx, disty);
-+ }
-+
-+ buffer++;
-+ x += ux;
-+ x_top += ux_top;
-+ x_bottom += ux_bottom;
-+ mask += mask_inc;
-+ }
-+
-+ /* Right Edge */
-+ w = pixman_int_to_fixed (bits->width);
-+ while (buffer < end && x < w)
-+ {
-+ if (*mask)
-+ {
-+ uint32_t tl, bl;
-+ int32_t distx;
-+
-+ tl = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top)]) | top_mask;
-+ bl = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom)]) | bottom_mask;
-+
-+ distx = (x >> 8) & 0xff;
-+
-+ *buffer = bilinear_interpolation (tl, 0, bl, 0, distx, disty);
-+ }
-+
-+ buffer++;
-+ x += ux;
-+ x_top += ux_top;
-+ x_bottom += ux_bottom;
-+ mask += mask_inc;
-+ }
-+
-+ /* Zero fill to the left of the image */
-+ while (buffer < end)
-+ *buffer++ = 0;
-+}
-+
- static force_inline uint32_t
- bits_image_fetch_pixel_convolution (bits_image_t *image,
- pixman_fixed_t x,
-@@ -917,14 +1123,26 @@ bits_image_property_changed (pixman_image_t *image)
- (bits->common.filter == PIXMAN_FILTER_BILINEAR ||
- bits->common.filter == PIXMAN_FILTER_GOOD ||
- bits->common.filter == PIXMAN_FILTER_BEST) &&
-- bits->common.repeat == PIXMAN_REPEAT_NONE &&
-- (bits->format == PIXMAN_a8r8g8b8 ||
-- bits->format == PIXMAN_x8r8g8b8))
-+ bits->common.repeat == PIXMAN_REPEAT_NONE)
- {
- image->common.get_scanline_64 =
- _pixman_image_get_scanline_generic_64;
-- image->common.get_scanline_32 =
-- bits_image_fetch_bilinear_no_repeat_8888;
-+
-+ if (bits->format == PIXMAN_a8r8g8b8 || bits->format == PIXMAN_x8r8g8b8)
-+ {
-+ image->common.get_scanline_32 =
-+ bits_image_fetch_bilinear_no_repeat_8888;
-+ }
-+ else if (bits->format == PIXMAN_r5g6b5)
-+ {
-+ image->common.get_scanline_32 =
-+ bits_image_fetch_bilinear_no_repeat_0565;
-+ }
-+ else
-+ {
-+ image->common.get_scanline_32 =
-+ bits_image_fetch_transformed;
-+ }
- }
- else
- {
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman-0.18.0/missing-cache-preload.diff b/recipes/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
deleted file mode 100644
index 475bb35..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4f45c7688e6b767a5f7b7f5cced51b4797a3c288 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Fri, 21 May 2010 13:31:03 +0000
-Subject: ARM: added missing cache preload
-
----
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index 51bc347..a99555a 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -388,6 +388,7 @@ generate_composite_function \
- vld1.16 {d4, d5}, [DST_R, :128]!
- vst1.16 {d28, d29}, [DST_W, :128]!
- pixman_composite_over_n_0565_process_pixblock_head
-+ cache_preload 8, 8
- .endm
-
- .macro pixman_composite_over_n_0565_init
-@@ -660,6 +661,7 @@ generate_composite_function_single_scanline \
- vld4.8 {d4, d5, d6, d7}, [DST_R, :128]!
- vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
- pixman_composite_over_8888_8888_process_pixblock_head
-+ cache_preload 8, 8
- .endm
-
- .macro pixman_composite_over_n_8888_init
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch b/recipes/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
deleted file mode 100644
index 05fe829..0000000
--- a/recipes/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Carl Worth <cworth@cworth.org>
-
-Don't copy unused bits to an alpha channel
-
-This bug was identified by cairo's rgb24-ignore-alpha test which
-blends RGB24 over ARGB32 and notices that "alpha" values are
-making it from the source to the destination.
-
-Index: a/pixman/pixman-pict.c
-===================================================================
---- a/pixman/pixman-pict.c b8b7b767b3ed1fc57ba177c38187e1eb3daf4de8
-+++ b/pixman/pixman-pict.c c7d73fc532c2da313041906ac0f48dba1b10d3bc
-@@ -1778,7 +1778,6 @@ pixman_image_composite (pixman_op_t
- break;
- case PIXMAN_x8r8g8b8:
- switch (pDst->bits.format) {
-- case PIXMAN_a8r8g8b8:
- case PIXMAN_x8r8g8b8:
- #ifdef USE_MMX
- if (pixman_have_mmx())
-@@ -1790,7 +1789,6 @@ pixman_image_composite (pixman_op_t
- }
- case PIXMAN_x8b8g8r8:
- switch (pDst->bits.format) {
-- case PIXMAN_a8b8g8r8:
- case PIXMAN_x8b8g8r8:
- #ifdef USE_MMX
- if (pixman_have_mmx())
-
diff --git a/recipes/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
deleted file mode 100644
index a2cda24..0000000
--- a/recipes/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 8ea1a333de202018a862a7b04b94479d3109274b Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Tue, 16 Mar 2010 16:55:28 +0100
-Subject: [PATCH 1/5] Generic C implementation of pixman_blt with overlapping support
-
-Uses memcpy/memmove functions to copy pixels, can handle the
-case when both source and destination areas are in the same
-image (this is useful for scrolling).
-
-It is assumed that copying direction is only important when
-using the same image for both source and destination (and
-src_stride == dst_stride). Copying direction is undefined
-for the images with different source and destination stride
-which happen to be in the overlapped areas (but this is an
-unrealistic case anyway).
----
- pixman/pixman-general.c | 21 ++++++++++++++++++---
- pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 61 insertions(+), 3 deletions(-)
-
-diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
-index bddf79a..f525744 100644
---- a/pixman/pixman-general.c
-+++ b/pixman/pixman-general.c
-@@ -285,9 +285,24 @@ general_blt (pixman_implementation_t *imp,
- int width,
- int height)
- {
-- /* We can't blit unless we have sse2 or mmx */
--
-- return FALSE;
-+ uint8_t *dst_bytes = (uint8_t *)dst_bits;
-+ uint8_t *src_bytes = (uint8_t *)src_bits;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
-+ return FALSE;
-+
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
-+ dst_bytes + dst_y * dst_stride + dst_x * bpp,
-+ src_stride,
-+ dst_stride,
-+ width,
-+ height);
-+ return TRUE;
- }
-
- static pixman_bool_t
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index d5767af..eeb677d 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -10,6 +10,7 @@
-
- #include "pixman.h"
- #include <time.h>
-+#include <string.h>
- #include <assert.h>
- #include <stdio.h>
- #include <string.h>
-@@ -867,4 +868,46 @@ void pixman_timer_register (pixman_timer_t *timer);
-
- #endif /* PIXMAN_TIMERS */
-
-+/* a helper function, can blit 8-bit images with src/dst overlapping support */
-+static inline void
-+pixman_blt_helper (uint8_t *src_bytes,
-+ uint8_t *dst_bytes,
-+ int src_stride,
-+ int dst_stride,
-+ int width,
-+ int height)
-+{
-+ /*
-+ * The second part of this check is not strictly needed, but it prevents
-+ * unnecessary upside-down processing of areas which belong to different
-+ * images. Upside-down processing can be slower with fixed-distance-ahead
-+ * prefetch and perceived as having more tearing.
-+ */
-+ if (src_bytes < dst_bytes + width &&
-+ src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+ /* Horizontal scrolling to the left needs memmove */
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return;
-+ }
-+ }
-+ while (--height >= 0)
-+ {
-+ memcpy (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+}
-+
- #endif /* PIXMAN_PRIVATE_H */
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
deleted file mode 100644
index 003337f..0000000
--- a/recipes/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 3170d9f5e927681a2516bcec52b317d1d4785e25 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:45:47 +0300
-Subject: [PATCH 2/5] Support of overlapping src/dst for pixman_blt_mmx
-
----
- pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++---------------------
- 1 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
-index e084e7f..6212b31 100644
---- a/pixman/pixman-mmx.c
-+++ b/pixman/pixman-mmx.c
-@@ -2994,34 +2994,43 @@ pixman_blt_mmx (uint32_t *src_bits,
- {
- uint8_t * src_bytes;
- uint8_t * dst_bytes;
-- int byte_width;
-+ int bpp;
-
-- if (src_bpp != dst_bpp)
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-- if (src_bpp == 16)
-- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 2 * width;
-- src_stride *= 2;
-- dst_stride *= 2;
-- }
-- else if (src_bpp == 32)
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 4 * width;
-- src_stride *= 4;
-- dst_stride *= 4;
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
- }
-- else
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
- {
-- return FALSE;
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using MMX */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
- }
-
- while (height--)
-@@ -3031,7 +3040,7 @@ pixman_blt_mmx (uint32_t *src_bits,
- uint8_t *d = dst_bytes;
- src_bytes += src_stride;
- dst_bytes += dst_stride;
-- w = byte_width;
-+ w = width;
-
- while (w >= 2 && ((unsigned long)d & 3))
- {
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
deleted file mode 100644
index 7e8f34f..0000000
--- a/recipes/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From f07cd58c643b490dcb1ef7be2642926cfeca1e69 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:45:54 +0300
-Subject: [PATCH 3/5] Support of overlapping src/dst for pixman_blt_sse2
-
----
- pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++--------------------
- 1 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
-index 946e7ba..66053ae 100644
---- a/pixman/pixman-sse2.c
-+++ b/pixman/pixman-sse2.c
-@@ -5299,34 +5299,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
- {
- uint8_t * src_bytes;
- uint8_t * dst_bytes;
-- int byte_width;
-+ int bpp;
-
-- if (src_bpp != dst_bpp)
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-- if (src_bpp == 16)
-- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 2 * width;
-- src_stride *= 2;
-- dst_stride *= 2;
-- }
-- else if (src_bpp == 32)
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 4 * width;
-- src_stride *= 4;
-- dst_stride *= 4;
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
- }
-- else
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
- {
-- return FALSE;
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using SSE2 */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
- }
-
- cache_prefetch ((__m128i*)src_bytes);
-@@ -5339,7 +5348,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
- uint8_t *d = dst_bytes;
- src_bytes += src_stride;
- dst_bytes += dst_stride;
-- w = byte_width;
-+ w = width;
-
- cache_prefetch_next ((__m128i*)s);
- cache_prefetch_next ((__m128i*)d);
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
deleted file mode 100644
index 0ba5b84..0000000
--- a/recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From e0542866c466ad512d69292df098d4b880e35e52 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Wed, 18 Nov 2009 06:08:48 +0200
-Subject: [PATCH 4/5] Support of overlapping src/dst for pixman_blt_neon
-
----
- pixman/pixman-arm-neon.c | 62 +++++++++++++++++++++++++++++++++++++--------
- 1 files changed, 51 insertions(+), 11 deletions(-)
-
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 24ceeeb..134493d 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -360,26 +360,66 @@ pixman_blt_neon (uint32_t *src_bits,
- int width,
- int height)
- {
-- if (src_bpp != dst_bpp)
-+ uint8_t * src_bytes;
-+ uint8_t * dst_bytes;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
-+ {
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
-+ }
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using NEON */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
-+ }
-+
- switch (src_bpp)
- {
- case 16:
- pixman_composite_src_0565_0565_asm_neon (
-- width, height,
-- (uint16_t *)(((char *) dst_bits) +
-- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
-- (uint16_t *)(((char *) src_bits) +
-- src_y * src_stride * 4 + src_x * 2), src_stride * 2);
-+ width >> 1,
-+ height,
-+ (uint16_t *) dst_bytes,
-+ dst_stride >> 1,
-+ (uint16_t *) src_bytes,
-+ src_stride >> 1);
- return TRUE;
- case 32:
- pixman_composite_src_8888_8888_asm_neon (
-- width, height,
-- (uint32_t *)(((char *) dst_bits) +
-- dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
-- (uint32_t *)(((char *) src_bits) +
-- src_y * src_stride * 4 + src_x * 4), src_stride);
-+ width >> 2,
-+ height,
-+ (uint32_t *) dst_bytes,
-+ dst_stride >> 2,
-+ (uint32_t *) src_bytes,
-+ src_stride >> 2);
- return TRUE;
- default:
- return FALSE;
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch b/recipes/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
deleted file mode 100644
index 769ed2e..0000000
--- a/recipes/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From d51b10a2750d99543a0c92ca44802aa7a4d70e54 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 10 Dec 2009 00:51:50 +0200
-Subject: [PATCH 5/5] ARM: added NEON optimizations for fetch/store r5g6b5 scanline
-
----
- pixman/pixman-access.c | 23 ++++++++++++++++++++++-
- pixman/pixman-arm-neon-asm.S | 20 ++++++++++++++++++++
- pixman/pixman-arm-neon.c | 41 +++++++++++++++++++++++++++++++++++++++++
- pixman/pixman-private.h | 5 +++++
- 4 files changed, 88 insertions(+), 1 deletions(-)
-
-diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
-index fa0a267..5bb3e09 100644
---- a/pixman/pixman-access.c
-+++ b/pixman/pixman-access.c
-@@ -2748,7 +2748,7 @@ typedef struct
- store_scanline_ ## format, store_scanline_generic_64 \
- }
-
--static const format_info_t accessors[] =
-+static format_info_t accessors[] =
- {
- /* 32 bpp formats */
- FORMAT_INFO (a8r8g8b8),
-@@ -2891,6 +2891,27 @@ _pixman_bits_image_setup_raw_accessors (bits_image_t *image)
- setup_accessors (image);
- }
-
-+void
-+_pixman_bits_override_accessors (pixman_format_code_t format,
-+ fetch_scanline_t fetch_func,
-+ store_scanline_t store_func)
-+{
-+ format_info_t *info = accessors;
-+
-+ while (info->format != PIXMAN_null)
-+ {
-+ if (info->format == format)
-+ {
-+ if (fetch_func)
-+ info->fetch_scanline_raw_32 = fetch_func;
-+ if (store_func)
-+ info->store_scanline_raw_32 = store_func;
-+ return;
-+ }
-+ info++;
-+ }
-+}
-+
- #else
-
- void
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index eb8cc4c..6ab3301 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -454,6 +454,16 @@ generate_composite_function \
- pixman_composite_src_8888_0565_process_pixblock_tail, \
- pixman_composite_src_8888_0565_process_pixblock_tail_head
-
-+generate_composite_function_single_scanline \
-+ pixman_store_scanline_r5g6b5_asm_neon, 32, 0, 16, \
-+ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ default_init, \
-+ default_cleanup, \
-+ pixman_composite_src_8888_0565_process_pixblock_head, \
-+ pixman_composite_src_8888_0565_process_pixblock_tail, \
-+ pixman_composite_src_8888_0565_process_pixblock_tail_head
-+
- /******************************************************************************/
-
- .macro pixman_composite_src_0565_8888_process_pixblock_head
-@@ -489,6 +499,16 @@ generate_composite_function \
- pixman_composite_src_0565_8888_process_pixblock_tail, \
- pixman_composite_src_0565_8888_process_pixblock_tail_head
-
-+generate_composite_function_single_scanline \
-+ pixman_fetch_scanline_r5g6b5_asm_neon, 16, 0, 32, \
-+ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ default_init, \
-+ default_cleanup, \
-+ pixman_composite_src_0565_8888_process_pixblock_head, \
-+ pixman_composite_src_0565_8888_process_pixblock_tail, \
-+ pixman_composite_src_0565_8888_process_pixblock_tail_head
-+
- /******************************************************************************/
-
- .macro pixman_composite_add_8000_8000_process_pixblock_head
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 134493d..2245b52 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -567,6 +567,43 @@ neon_combine_##name##_u (pixman_implementation_t *imp, \
- BIND_COMBINE_U (over)
- BIND_COMBINE_U (add)
-
-+void
-+pixman_fetch_scanline_r5g6b5_asm_neon (int width,
-+ uint32_t *buffer,
-+ const uint16_t *pixel);
-+void
-+pixman_store_scanline_r5g6b5_asm_neon (int width,
-+ uint16_t *pixel,
-+ const uint32_t *values);
-+
-+static void
-+neon_fetch_scanline_r5g6b5 (pixman_image_t *image,
-+ int x,
-+ int y,
-+ int width,
-+ uint32_t * buffer,
-+ const uint32_t *mask,
-+ uint32_t mask_bits)
-+{
-+ const uint32_t *bits = image->bits.bits + y * image->bits.rowstride;
-+ const uint16_t *pixel = (const uint16_t *)bits + x;
-+
-+ pixman_fetch_scanline_r5g6b5_asm_neon (width, buffer, pixel);
-+}
-+
-+static void
-+neon_store_scanline_r5g6b5 (bits_image_t * image,
-+ int x,
-+ int y,
-+ int width,
-+ const uint32_t *values)
-+{
-+ uint32_t *bits = image->bits + image->rowstride * y;
-+ uint16_t *pixel = ((uint16_t *) bits) + x;
-+
-+ pixman_store_scanline_r5g6b5_asm_neon (width, pixel, values);
-+}
-+
- pixman_implementation_t *
- _pixman_implementation_create_arm_neon (void)
- {
-@@ -577,6 +614,10 @@ _pixman_implementation_create_arm_neon (void)
- imp->combine_32[PIXMAN_OP_OVER] = neon_combine_over_u;
- imp->combine_32[PIXMAN_OP_ADD] = neon_combine_add_u;
-
-+ _pixman_bits_override_accessors (PIXMAN_r5g6b5,
-+ neon_fetch_scanline_r5g6b5,
-+ neon_store_scanline_r5g6b5);
-+
- imp->blt = arm_neon_blt;
- imp->fill = arm_neon_fill;
-
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index eeb677d..ba2d401 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -220,6 +220,11 @@ void
- _pixman_bits_image_setup_raw_accessors (bits_image_t *image);
-
- void
-+_pixman_bits_override_accessors (pixman_format_code_t format,
-+ fetch_scanline_t fetch_func,
-+ store_scanline_t store_func);
-+
-+void
- _pixman_image_get_scanline_generic_64 (pixman_image_t *image,
- int x,
- int y,
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch b/recipes/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch
deleted file mode 100644
index 3d8d4e8..0000000
--- a/recipes/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 7f0adaef68c5b0bb1c5eb9f5db5792b71b8b8beb Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Fri, 19 Mar 2010 10:44:09 +0100
-Subject: [PATCH 6/6] Revert "ARM: SIMD: Try without any CFLAGS before forcing -mcpu="
-
-This forces -marm that results in runtime SIGILL on thumb userspace
-
-This reverts commit 18f0de452dc7e12e4cb544d761a626d5c6031663.
----
- configure.ac | 20 +++++---------------
- 1 files changed, 5 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fc3ee24..f84a4dc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -363,28 +363,18 @@ AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
-
- dnl ===========================================================================
- dnl Check for ARM SIMD instructions
--ARM_SIMD_CFLAGS=""
-+ARM_SIMD_CFLAGS="-mcpu=arm1136j-s"
-
- have_arm_simd=no
- AC_MSG_CHECKING(whether to use ARM SIMD assembler)
--# check with default CFLAGS in case the toolchain turns on a sufficiently recent -mcpu=
-+xserver_save_CFLAGS=$CFLAGS
-+CFLAGS="$ARM_SIMD_CFLAGS $CFLAGS"
- AC_COMPILE_IFELSE([
- int main () {
- asm("uqadd8 r1, r1, r2");
- return 0;
--}], have_arm_simd=yes,
-- # check again with an explicit -mcpu= in case the toolchain defaults to an
-- # older one; note that uqadd8 isn't available in Thumb mode on arm1136j-s
-- # so we force ARM mode
-- ARM_SIMD_CFLAGS="-mcpu=arm1136j-s -marm"
-- xserver_save_CFLAGS=$CFLAGS
-- CFLAGS="$ARM_SIMD_CFLAGS $CFLAGS"
-- AC_COMPILE_IFELSE([
-- int main () {
-- asm("uqadd8 r1, r1, r2");
-- return 0;
-- }], have_arm_simd=yes)
-- CFLAGS=$xserver_save_CFLAGS)
-+}], have_arm_simd=yes)
-+CFLAGS=$xserver_save_CFLAGS
-
- AC_ARG_ENABLE(arm-simd,
- [AC_HELP_STRING([--disable-arm-simd],
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman/calloc.patch b/recipes/xorg-lib/pixman/calloc.patch
deleted file mode 100644
index 4a60d7e..0000000
--- a/recipes/xorg-lib/pixman/calloc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 634ba33b5b1fcfd5a0e7910f9991b4ed4f674549 Mon Sep 17 00:00:00 2001
-From: Søren Sandmann Pedersen <ssp@redhat.com>
-Date: Wed, 07 Apr 2010 05:39:14 +0000
-Subject: Fix uninitialized cache when pthreads are used
-
-The thread local cache is allocated with malloc(), but we rely on it
-being initialized to zero, so allocate it with calloc() instead.
----
-diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
-index a4e3f88..cdac0d8 100644
---- a/pixman/pixman-compiler.h
-+++ b/pixman/pixman-compiler.h
-@@ -101,7 +101,7 @@
- static type * \
- tls_ ## name ## _alloc (key) \
- { \
-- type *value = malloc (sizeof (type)); \
-+ type *value = calloc (1, sizeof (type)); \
- if (value) \
- pthread_setspecific (key, value); \
- return value; \
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman/nearest-neighbour.patch b/recipes/xorg-lib/pixman/nearest-neighbour.patch
deleted file mode 100644
index 29b140f..0000000
--- a/recipes/xorg-lib/pixman/nearest-neighbour.patch
+++ /dev/null
@@ -1,1040 +0,0 @@
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Fri, 17 Jul 2009 10:22:23 +0000 (+0300)
-Subject: Fastpath for nearest neighbour scaled compositing operations.
-X-Git-Url: http://siarhei.siamashka.name/gitweb/?p=pixman.git;a=commitdiff_plain;h=247531c6978725a88fd3706129b9d3e339026f54
-
-Fastpath for nearest neighbour scaled compositing operations.
-
-OVER 8888x8888, OVER 8888x0565, SRC 8888x8888, SRC 8888x0565
-and SRC 0565x0565 cases are supported.
----
-
-diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
-index 7f80578..7f3a6ad 100644
---- a/pixman/pixman-fast-path.c
-+++ b/pixman/pixman-fast-path.c
-@@ -1261,6 +1261,993 @@ fast_composite_src_scale_nearest (pixman_implementation_t *imp,
- }
- }
-
-+/*
-+ * Functions, which implement the core inner loops for the nearest neighbour
-+ * scaled fastpath compositing operations. The do not need to do clipping
-+ * checks, also the loops are unrolled to process two pixels per iteration
-+ * for better performance on most CPU architectures (superscalar processors
-+ * can issue several operations simultaneously, other processors can hide
-+ * instructions latencies by pipelining operations). Unrolling more
-+ * does not make much sense because the compiler will start running out
-+ * of spare registers soon.
-+ */
-+
-+#undef READ
-+#undef WRITE
-+#define READ(img,x) (*(x))
-+#define WRITE(img,ptr,v) ((*(ptr)) = (v))
-+
-+#define UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(x, a, y) do { \
-+ UN8x4_MUL_UN8_ADD_UN8x4(x, a, y); \
-+ x = CONVERT_8888_TO_0565(x); \
-+ } while (0)
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x0565 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint16_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t d;
-+ uint32_t s1, s2;
-+ uint8_t a1, a2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+
-+ uint32_t *src;
-+ uint16_t *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+
-+ if ((y < 0) || (y >= pSrc->bits.height)) {
-+ continue;
-+ }
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ s2 = READ(pSrc, src + x2);
-+
-+ a1 = s1 >> 24;
-+ a2 = s2 >> 24;
-+
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ else if (s1) {
-+ d = CONVERT_0565_TO_0888(READ(pDst, dst));
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+
-+ if (a2 == 0xff)
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
-+ else if (s2) {
-+ d = CONVERT_0565_TO_0888(READ(pDst, dst));
-+ a2 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a2, s2);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ a1 = s1 >> 24;
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ else if (s1) {
-+ d = CONVERT_0565_TO_0888(READ(pDst, dst));
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x0565 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint16_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t d;
-+ uint32_t s1, s2;
-+ uint8_t a1, a2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+ int32_t max_vx, max_vy;
-+
-+ uint32_t *src;
-+ uint16_t *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ max_vx = pSrc->bits.width << 16;
-+ max_vy = pSrc->bits.height << 16;
-+
-+ while (orig_vx < 0) orig_vx += max_vx;
-+ while (vy < 0) vy += max_vy;
-+ while (orig_vx >= max_vx) orig_vx -= max_vx;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s2 = READ(pSrc, src + x2);
-+
-+ a1 = s1 >> 24;
-+ a2 = s2 >> 24;
-+
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ else if (s1) {
-+ d = CONVERT_0565_TO_0888(READ(pDst, dst));
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+
-+ if (a2 == 0xff)
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
-+ else if (s2) {
-+ d = CONVERT_0565_TO_0888(READ(pDst, dst));
-+ a2 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a2, s2);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ a1 = s1 >> 24;
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ else if (s1) {
-+ d = CONVERT_0565_TO_0888(READ(pDst, dst));
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x8888 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint32_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t d;
-+ uint32_t s1, s2;
-+ uint8_t a1, a2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+
-+ uint32_t *src, *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+
-+ if ((y < 0) || (y >= pSrc->bits.height)) {
-+ continue;
-+ }
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ s2 = READ(pSrc, src + x2);
-+
-+ a1 = s1 >> 24;
-+ a2 = s2 >> 24;
-+
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, s1);
-+ else if (s1) {
-+ d = READ(pDst, dst);
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+
-+ if (a2 == 0xff)
-+ WRITE(pDst, dst, s2);
-+ else if (s2) {
-+ d = READ(pDst, dst);
-+ a2 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4(d, a2, s2);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ a1 = s1 >> 24;
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, s1);
-+ else if (s1) {
-+ d = READ(pDst, dst);
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x8888 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint32_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t d;
-+ uint32_t s1, s2;
-+ uint8_t a1, a2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+ int32_t max_vx, max_vy;
-+
-+ uint32_t *src, *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ max_vx = pSrc->bits.width << 16;
-+ max_vy = pSrc->bits.height << 16;
-+
-+ while (orig_vx < 0) orig_vx += max_vx;
-+ while (vy < 0) vy += max_vy;
-+ while (orig_vx >= max_vx) orig_vx -= max_vx;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s2 = READ(pSrc, src + x2);
-+
-+ a1 = s1 >> 24;
-+ a2 = s2 >> 24;
-+
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, s1);
-+ else if (s1) {
-+ d = READ(pDst, dst);
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+
-+ if (a2 == 0xff)
-+ WRITE(pDst, dst, s2);
-+ else if (s2) {
-+ d = READ(pDst, dst);
-+ a2 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4(d, a2, s2);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ a1 = s1 >> 24;
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, s1);
-+ else if (s1) {
-+ d = READ(pDst, dst);
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x8888 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint32_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t s1, s2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+
-+ uint32_t *src, *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+
-+ if ((y < 0) || (y >= pSrc->bits.height)) {
-+ memset(dst, 0, width * sizeof(*dst));
-+ continue;
-+ }
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ s2 = READ(pSrc, src + x2);
-+
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ WRITE(pDst, dst, s2);
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x8888 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint32_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t s1, s2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+ int32_t max_vx, max_vy;
-+
-+ uint32_t *src, *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ max_vx = pSrc->bits.width << 16;
-+ max_vy = pSrc->bits.height << 16;
-+
-+ while (orig_vx < 0) orig_vx += max_vx;
-+ while (vy < 0) vy += max_vy;
-+ while (orig_vx >= max_vx) orig_vx -= max_vx;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s2 = READ(pSrc, src + x2);
-+
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ WRITE(pDst, dst, s2);
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_0565x0565 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint16_t *dstLine;
-+ uint16_t *srcFirstLine;
-+ uint16_t s1, s2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+
-+ uint16_t *src, *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint16_t, srcStride, srcFirstLine, 1);
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+
-+ if ((y < 0) || (y >= pSrc->bits.height)) {
-+ memset(dst, 0, width * sizeof(*dst));
-+ continue;
-+ }
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ s2 = READ(pSrc, src + x2);
-+
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ WRITE(pDst, dst, s2);
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_0565x0565 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint16_t *dstLine;
-+ uint16_t *srcFirstLine;
-+ uint16_t s1, s2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+ int32_t max_vx, max_vy;
-+
-+ uint16_t *src, *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint16_t, srcStride, srcFirstLine, 1);
-+
-+ max_vx = pSrc->bits.width << 16;
-+ max_vy = pSrc->bits.height << 16;
-+
-+ while (orig_vx < 0) orig_vx += max_vx;
-+ while (vy < 0) vy += max_vy;
-+ while (orig_vx >= max_vx) orig_vx -= max_vx;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s2 = READ(pSrc, src + x2);
-+
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ WRITE(pDst, dst, s2);
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x0565 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint16_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t s1, s2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+
-+ uint32_t *src;
-+ uint16_t *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+
-+ if ((y < 0) || (y >= pSrc->bits.height)) {
-+ memset(dst, 0, width * sizeof(*dst));
-+ continue;
-+ }
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ s2 = READ(pSrc, src + x2);
-+
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ dst++;
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x0565 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint16_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t s1, s2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+ int32_t max_vx, max_vy;
-+
-+ uint32_t *src;
-+ uint16_t *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ max_vx = pSrc->bits.width << 16;
-+ max_vy = pSrc->bits.height << 16;
-+
-+ while (orig_vx < 0) orig_vx += max_vx;
-+ while (vy < 0) vy += max_vy;
-+ while (orig_vx >= max_vx) orig_vx -= max_vx;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s2 = READ(pSrc, src + x2);
-+
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ dst++;
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ dst++;
-+ }
-+ }
-+}
-+
-+/*
-+ * Check if the clipping boundary is crossed on horizontal scaling
-+ */
-+static inline pixman_bool_t
-+fbTransformVerifyHorizontalClipping(pixman_image_t *pict, int width, int32_t vx, int32_t unit_x)
-+{
-+ while (--width >= 0) {
-+ int x = vx >> 16;
-+ if ((x < 0) || (x >= pict->bits.width)) return 1;
-+ vx += unit_x;
-+ }
-+ return 0;
-+}
-+
-+/*
-+ * Check if the clipping boundary is crossed on vertical scaling
-+ */
-+static inline pixman_bool_t
-+fbTransformVerifyVerticalClipping(pixman_image_t *pict, int height, int32_t vy, int32_t unit_y)
-+{
-+ while (--height >= 0) {
-+ int y = vy >> 16;
-+ if ((y < 0) || (y >= pict->bits.height)) return 1;
-+ vy += unit_y;
-+ }
-+ return 0;
-+}
-+
-+/*
-+ * Easy case of transform without rotation or complex clipping
-+ * Returns 1 in the case if it was able to handle this operation and 0 otherwise
-+ */
-+static pixman_bool_t
-+fbCompositeTransformNonrotatedAffineTrivialclip (
-+ pixman_op_t op,
-+ pixman_image_t *pSrc,
-+ pixman_image_t *pMask,
-+ pixman_image_t *pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ pixman_vector_t v, unit;
-+ int skipdst_x = 0, skipdst_y = 0;
-+
-+ /* Handle destination clipping */
-+ if (xDst < pDst->common.clip_region.extents.x1) {
-+ skipdst_x = pDst->common.clip_region.extents.x1 - xDst;
-+ if (skipdst_x >= (int)width)
-+ return 1;
-+ xDst = pDst->common.clip_region.extents.x1;
-+ width -= skipdst_x;
-+ }
-+
-+ if (yDst < pDst->common.clip_region.extents.y1) {
-+ skipdst_y = pDst->common.clip_region.extents.y1 - yDst;
-+ if (skipdst_y >= (int)height)
-+ return 1;
-+ yDst = pDst->common.clip_region.extents.y1;
-+ height -= skipdst_y;
-+ }
-+
-+ if (xDst >= pDst->common.clip_region.extents.x2 ||
-+ yDst >= pDst->common.clip_region.extents.y2)
-+ {
-+ return 1;
-+ }
-+
-+ if (xDst + width > pDst->common.clip_region.extents.x2)
-+ width = pDst->common.clip_region.extents.x2 - xDst;
-+ if (yDst + height > pDst->common.clip_region.extents.y2)
-+ height = pDst->common.clip_region.extents.y2 - yDst;
-+
-+ /* reference point is the center of the pixel */
-+ v.vector[0] = pixman_int_to_fixed(xSrc) + pixman_fixed_1 / 2;
-+ v.vector[1] = pixman_int_to_fixed(ySrc) + pixman_fixed_1 / 2;
-+ v.vector[2] = pixman_fixed_1;
-+
-+ if (!pixman_transform_point_3d (pSrc->common.transform, &v))
-+ return 0;
-+
-+ /* Round down to closest integer, ensuring that 0.5 rounds to 0, not 1 */
-+ v.vector[0] -= pixman_fixed_e;
-+ v.vector[1] -= pixman_fixed_e;
-+
-+ unit.vector[0] = pSrc->common.transform->matrix[0][0];
-+ unit.vector[1] = pSrc->common.transform->matrix[1][1];
-+
-+ v.vector[0] += unit.vector[0] * skipdst_x;
-+ v.vector[1] += unit.vector[1] * skipdst_y;
-+
-+ /* Check for possible fixed point arithmetics problems/overflows */
-+ if (unit.vector[0] <= 0 || unit.vector[1] <= 0)
-+ return 0;
-+ if (width == 0 || height == 0)
-+ return 0;
-+ if ((uint32_t)width + (unit.vector[0] >> 16) >= 0x7FFF)
-+ return 0;
-+ if ((uint32_t)height + (unit.vector[1] >> 16) >= 0x7FFF)
-+ return 0;
-+
-+ /* Horizontal source clipping is only supported for NORMAL repeat */
-+ if (pSrc->common.repeat != PIXMAN_REPEAT_NORMAL
-+ && fbTransformVerifyHorizontalClipping(pSrc, width, v.vector[0], unit.vector[0])) {
-+ return 0;
-+ }
-+
-+ /* Vertical source clipping is only supported for NONE and NORMAL repeat */
-+ if (pSrc->common.repeat != PIXMAN_REPEAT_NONE && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL
-+ && fbTransformVerifyVerticalClipping(pSrc, height, v.vector[1], unit.vector[1])) {
-+ return 0;
-+ }
-+
-+ if (op == PIXMAN_OP_OVER && pSrc->bits.format == PIXMAN_a8r8g8b8
-+ && (pDst->bits.format == PIXMAN_x8r8g8b8 || pDst->bits.format == PIXMAN_a8r8g8b8))
-+ {
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x8888(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x8888(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ }
-+
-+ if (op == PIXMAN_OP_SRC && (pSrc->bits.format == PIXMAN_x8r8g8b8 || pSrc->bits.format == PIXMAN_a8r8g8b8)
-+ && (pDst->bits.format == PIXMAN_x8r8g8b8 || pDst->bits.format == pSrc->bits.format))
-+ {
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x8888(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x8888(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ }
-+
-+ if (op == PIXMAN_OP_OVER && pSrc->bits.format == PIXMAN_a8r8g8b8 && pDst->bits.format == PIXMAN_r5g6b5)
-+ {
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x0565(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x0565(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ }
-+
-+ if (op == PIXMAN_OP_SRC && pSrc->bits.format == PIXMAN_r5g6b5 && pDst->bits.format == PIXMAN_r5g6b5)
-+ {
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_0565x0565(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_0565x0565(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ }
-+
-+ if (op == PIXMAN_OP_SRC && (pSrc->bits.format == PIXMAN_x8r8g8b8 || pSrc->bits.format == PIXMAN_a8r8g8b8)
-+ && pDst->bits.format == PIXMAN_r5g6b5)
-+ {
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x0565(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x0565(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ }
-+
-+ /* No fastpath scaling implemented for this case */
-+ return 0;
-+}
-+
- static void
- fast_path_composite (pixman_implementation_t *imp,
- pixman_op_t op,
-@@ -1279,6 +2266,30 @@ fast_path_composite (pixman_implementation_t *imp,
- if (src->type == BITS
- && src->common.transform
- && !mask
-+ && !src->common.alpha_map && !dest->common.alpha_map
-+ && (src->common.filter == PIXMAN_FILTER_NEAREST)
-+ && !src->bits.read_func && !src->bits.write_func
-+ && !dest->bits.read_func && !dest->bits.write_func)
-+ {
-+ /* ensure that the transform matrix only has a scale */
-+ if (src->common.transform->matrix[0][1] == 0 &&
-+ src->common.transform->matrix[1][0] == 0 &&
-+ src->common.transform->matrix[2][0] == 0 &&
-+ src->common.transform->matrix[2][1] == 0 &&
-+ src->common.transform->matrix[2][2] == pixman_fixed_1 &&
-+ dest->common.clip_region.data == NULL)
-+ {
-+ if (fbCompositeTransformNonrotatedAffineTrivialclip (op, src, mask, dest,
-+ src_x, src_y, mask_x, mask_y, dest_x, dest_y, width, height))
-+ {
-+ return;
-+ }
-+ }
-+ }
-+
-+ if (src->type == BITS
-+ && src->common.transform
-+ && !mask
- && op == PIXMAN_OP_SRC
- && !src->common.alpha_map && !dest->common.alpha_map
- && (src->common.filter == PIXMAN_FILTER_NEAREST)
diff --git a/recipes/xorg-lib/pixman/over-n-8-0565.patch b/recipes/xorg-lib/pixman/over-n-8-0565.patch
deleted file mode 100644
index 3911068..0000000
--- a/recipes/xorg-lib/pixman/over-n-8-0565.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From de2221a32d0b6628116565563f7b4ccd0a44e8b6 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 04 Mar 2010 23:20:25 +0000
-Subject: ARM: added 'armv6_composite_over_n_8_0565' fast path
-
-Provides ~3x performance improvement when working with
-data in L1 cache and memory. This fast path is important
-for fonts rendering when using 16bpp desktop.
-
-Microbenchmark from N800 (ARM11 @ 400MHz), measured in MPix/s:
-
-before:
-
- over_n_8_0565 = L1: 2.99 M: 2.86
-
-after:
-
- over_n_8_0565 = L1: 9.07 M: 8.05
----
-diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
-index 09a2888..c375c01 100644
---- a/pixman/pixman-arm-simd.c
-+++ b/pixman/pixman-arm-simd.c
-@@ -419,6 +419,193 @@ arm_composite_over_n_8_8888 (pixman_implementation_t * impl,
- }
- }
-
-+#if defined(__ARM_EABI__) && defined(__linux__)
-+/*
-+ * ARMv6 assembly optimized version of 'composite_over_n_8_0565'. It is
-+ * a bare metal 'naked' function which uses all the available CPU registers
-+ * and is compatible with ARM EABI. It might (or might not) break when used
-+ * with a different ABI, anyway it is better to be safe than sorry.
-+ */
-+static void __attribute__((naked)) armv6_composite_over_n_8_0565_asm (
-+ uint16_t *dst, uint8_t *mask, uint32_t src, int w,
-+ int dst_stride_delta, int mask_stride_delta, int h)
-+{
-+ asm volatile (
-+ ".macro composite_internal_armv6_asm opaque_flag\n"
-+ /* save all registers (8 words) to stack */
-+ "stmdb sp!, {r4-r11, ip, lr}\n"
-+ /* some register aliases for better readability */
-+ "DST .req r0\n"
-+ "MASK .req r1\n"
-+ "S .req r2\n"
-+ "W .req r3\n"
-+ "A .req r8\n"
-+ "D .req r10\n"
-+ "C0000FF .req r11\n"
-+ "C00001F .req r9\n"
-+ "C800080 .req ip\n"
-+ "CE000E0 .req lr\n"
-+ /* precalculate some stuff and put it on stack */
-+ "mov r6, #0xF8\n"
-+ "mov r7, #0xFC\n"
-+
-+ "str W, [sp, #-8]!\n"
-+
-+ ".if \\opaque_flag\n"
-+ /* precalculate and save it to stack for later use:
-+ * ((src >> 3) & 0x001F) |
-+ * ((src >> 5) & 0x07E0) |
-+ * ((src >> 8) & 0xF800)
-+ */
-+ "mov A, #0x1F\n"
-+ "and D, A, S, lsr #3\n"
-+ "and r4, S, #0xF80000\n"
-+ "and r5, S, #0xFC00\n"
-+ "orr D, r4, lsr #8\n"
-+ "orr D, r5, lsr #5\n"
-+ "str D, [sp, #4]\n"
-+ ".endif\n"
-+
-+ "ldr D, [sp, #(8 + 10*4 + 8)]\n" /* h */
-+ "ldr A, =0xFF00FF\n"
-+ "ldr C800080, =0x800080\n"
-+ "ldr CE000E0, =0xE000E0\n"
-+ "ldr C0000FF, =0xFF\n"
-+ "ldr C00001F, =0x1F\n"
-+ "and r4, A, S\n" /* r4 = src & 0x00FF00FF */
-+ "and r5, A, S, lsr #8\n" /* r5 = (src >> 8) & 0x00FF00FF */
-+ "stmdb sp!, {r4, r5, r6, r7}\n"
-+ "0:\n"
-+ "subs D, D, #1\n"
-+ "blt 6f\n"
-+ "1:\n"
-+ "subs W, W, #1\n"
-+ "blt 5f\n"
-+ "2:\n"
-+ "ldrb A, [MASK], #1\n"
-+ "ldmia sp, {r4, r5, r6, r7}\n" /* load constants from stack */
-+ "add DST, DST, #2\n"
-+ "cmp A, #0\n"
-+ "beq 1b\n"
-+
-+ ".if \\opaque_flag\n"
-+ "cmp A, #0xFF\n"
-+ "bne 3f\n"
-+ "ldr D, [sp, #(4*4 + 4)]\n" /* load precalculated value */
-+ "subs W, #1\n"
-+ "strh D, [DST, #-2]\n"
-+ "bge 2b\n"
-+ ".endif\n"
-+
-+ "3:\n"
-+ "ldrh D, [DST, #-2]\n"
-+ "mla r4, A, r4, C800080\n"
-+ "mla r5, A, r5, C800080\n"
-+ "and r6, r6, D, lsl #3\n" /* & 0xF8 */
-+ "and r7, r7, D, lsr #3\n" /* & 0xFC */
-+ "and D, D, #0xF800\n"
-+ "bic S, r4, #0xFF0000\n"
-+ "bic A, r5, #0xFF0000\n"
-+ "add r4, r4, S, lsr #8\n"
-+ "add r5, r5, A, lsr #8\n"
-+
-+ "and S, r7, #0xC0\n"
-+ "orr r6, r6, D, lsl #8\n"
-+ "and D, r6, CE000E0\n"
-+ "eor A, C0000FF, r5, lsr #24\n"
-+ "orr r6, D, lsr #5\n"
-+ "orr r7, S, lsr #6\n"
-+
-+ "mla r6, A, r6, C800080\n"
-+ "mla r7, A, r7, C800080\n"
-+ "subs W, #1\n"
-+ "bic D, r6, #0xFF0000\n"
-+ "bic A, r7, #0xFF0000\n"
-+ "add r6, r6, D, lsr #8\n"
-+ "uqadd8 r4, r4, r6\n"
-+ "add r7, r7, A, lsr #8\n"
-+ "uqadd8 r5, r5, r7\n"
-+ "and D, C00001F, r4, lsr #11\n"
-+ "and r4, r4, #0xF8000000\n"
-+ "and r5, r5, #0xFC00\n"
-+ "orr D, r4, lsr #16\n"
-+ "orr D, r5, lsr #5\n"
-+ "strh D, [DST, #-2]\n"
-+ "bge 2b\n"
-+ "5:\n"
-+ "ldr r6, [sp, #(4*4 + 8 + 10*4 + 8)]\n" /* h */
-+ "ldr r4, [sp, #(4*4 + 8 + 10*4 + 4)]\n" /* mask stride */
-+ "ldr r5, [sp, #(4*4 + 8 + 10*4 + 0)]\n" /* dst stride */
-+ "ldr W, [sp, #(4*4)]\n"
-+ "subs r6, r6, #1\n" /* h */
-+ "str r6, [sp, #(4*4 + 8 + 10*4 + 8)]\n" /* h */
-+ "add MASK, MASK, r4\n"
-+ "add DST, DST, r5, lsl #1\n"
-+ "bgt 1b\n"
-+ "6:\n"
-+ "add sp, sp, #(4*4 + 8)\n"
-+ /* restore all registers and return */
-+ "ldmia sp!, {r4-r11, ip, pc}\n"
-+ ".unreq DST\n"
-+ ".unreq MASK\n"
-+ ".unreq S\n"
-+ ".unreq W\n"
-+ ".unreq A\n"
-+ ".unreq D\n"
-+ ".unreq C0000FF\n"
-+ ".unreq C00001F\n"
-+ ".unreq C800080\n"
-+ ".unreq CE000E0\n"
-+ ".endm\n"
-+
-+ "mov ip, r2, lsr #24\n"
-+ "cmp ip, #0xFF\n"
-+ "beq 9f\n"
-+ "composite_internal_armv6_asm 0\n"
-+ "9:\n"
-+ "composite_internal_armv6_asm 1\n"
-+ ".ltorg\n"
-+ ".purgem composite_internal_armv6_asm\n"
-+ );
-+}
-+
-+static void
-+armv6_composite_over_n_8_0565 (pixman_implementation_t * impl,
-+ pixman_op_t op,
-+ pixman_image_t * src_image,
-+ pixman_image_t * mask_image,
-+ pixman_image_t * dst_image,
-+ int32_t src_x,
-+ int32_t src_y,
-+ int32_t mask_x,
-+ int32_t mask_y,
-+ int32_t dest_x,
-+ int32_t dest_y,
-+ int32_t width,
-+ int32_t height)
-+{
-+ uint32_t src;
-+ uint16_t *dst;
-+ uint8_t *mask;
-+ int dst_stride, mask_stride;
-+
-+ src = _pixman_image_get_solid (src_image, dst_image->bits.format);
-+
-+ /* bail out if fully transparent */
-+ if (src == 0)
-+ return;
-+
-+ PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t,
-+ dst_stride, dst, 1);
-+ PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t,
-+ mask_stride, mask, 1);
-+
-+ armv6_composite_over_n_8_0565_asm (dst, mask, src, width,
-+ dst_stride - width, mask_stride - width, height);
-+}
-+
-+#endif
-+
- static const pixman_fast_path_t arm_simd_fast_paths[] =
- {
- PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, a8r8g8b8, arm_composite_over_8888_8888),
-@@ -434,7 +621,10 @@ static const pixman_fast_path_t arm_simd_fast_paths[] =
- PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8r8g8b8, arm_composite_over_n_8_8888),
- PIXMAN_STD_FAST_PATH (OVER, solid, a8, a8b8g8r8, arm_composite_over_n_8_8888),
- PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8b8g8r8, arm_composite_over_n_8_8888),
--
-+#if defined(__ARM_EABI__) && defined(__linux__)
-+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, r5g6b5, armv6_composite_over_n_8_0565),
-+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, b5g6r5, armv6_composite_over_n_8_0565),
-+#endif
- { PIXMAN_OP_NONE },
- };
-
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman/pixman-0.13.2-neon1.patch b/recipes/xorg-lib/pixman/pixman-0.13.2-neon1.patch
deleted file mode 100644
index b3bb762..0000000
--- a/recipes/xorg-lib/pixman/pixman-0.13.2-neon1.patch
+++ /dev/null
@@ -1,1702 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 063f6eb..bada55c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -278,11 +278,12 @@ AC_SUBST(VMX_CFLAGS)
- AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
-
- dnl Check for ARM SIMD instructions
-+ARM_SIMD_CFLAGS=""
-
- have_arm_simd=no
- AC_MSG_CHECKING(whether to use ARM SIMD assembler)
- xserver_save_CFLAGS=$CFLAGS
--CFLAGS="$CFLAGS $ARM_CFLAGS"
-+CFLAGS="$CFLAGS $ARM_SIMD_CFLAGS"
- AC_COMPILE_IFELSE([
- int main () {
- asm("uqadd8 r1, r1, r2");
-@@ -302,7 +303,7 @@ fi
- if test $have_arm_simd = yes ; then
- AC_DEFINE(USE_ARM_SIMD, 1, [use ARM SIMD compiler intrinsics])
- else
-- ARM_CFLAGS=
-+ ARM_SIMD_CFLAGS=
- fi
-
- AC_MSG_RESULT($have_arm_simd)
-@@ -310,9 +311,48 @@ if test $enable_arm_simd = yes && test $have_arm_simd = no ; then
- AC_MSG_ERROR([ARM SIMD intrinsics not detected])
- fi
-
--AC_SUBST(ARM_CFLAGS)
-+dnl Check for ARM NEON instructions
-+ARM_NEON_CFLAGS="-mcpu=cortex-a8 -mfpu=neon"
-+
-+have_arm_neon=no
-+AC_MSG_CHECKING(whether to use ARM NEON)
-+xserver_save_CFLAGS=$CFLAGS
-+CFLAGS="$CFLAGS $ARM_NEON_CFLAGS"
-+AC_COMPILE_IFELSE([
-+#include <arm_neon.h>
-+int main () {
-+ uint8x8_t neon_test=vmov_n_u8(0);
-+ return 0;
-+}], have_arm_neon=yes)
-+CFLAGS=$xserver_save_CFLAGS
-+
-+AC_ARG_ENABLE(arm-neon,
-+ [AC_HELP_STRING([--disable-arm-neon],
-+ [disable ARM NEON fast paths])],
-+ [enable_arm_neon=$enableval], [enable_arm_neon=auto])
-+
-+if test $enable_arm_neon = no ; then
-+ have_arm_neon=disabled
-+fi
-+
-+if test $have_arm_neon = yes ; then
-+ AC_DEFINE(USE_ARM_NEON, 1, [use ARM NEON compiler intrinsics])
-+else
-+ ARM_NEON_CFLAGS=
-+fi
-+
-+AC_MSG_RESULT($have_arm_neon)
-+if test $enable_arm_neon = yes && test $have_arm_neon = no ; then
-+ AC_MSG_ERROR([ARM NEON intrinsics not detected])
-+fi
-+
-+
-+AC_SUBST(ARM_SIMD_CFLAGS)
-+AC_SUBST(ARM_NEON_CFLAGS)
-
- AM_CONDITIONAL(USE_ARM_SIMD, test $have_arm_simd = yes)
-+AM_CONDITIONAL(USE_ARM_NEON, test $have_arm_neon = yes)
-+
-
-
- AC_ARG_ENABLE(gtk,
-diff --git a/pixman/Makefile.am b/pixman/Makefile.am
-index c4612ea..4c1ec6b 100644
---- a/pixman/Makefile.am
-+++ b/pixman/Makefile.am
-@@ -80,15 +80,26 @@ libpixman_sse2_la_LIBADD = $(DEP_LIBS)
- libpixman_1_la_LIBADD += libpixman-sse2.la
- endif
-
--# arm code
-+# arm simd code
- if USE_ARM_SIMD
- noinst_LTLIBRARIES += libpixman-arm-simd.la
- libpixman_arm_simd_la_SOURCES = \
- pixman-arm-simd.c \
- pixman-arm-simd.h
--libpixman_arm_simd_la_CFLAGS = $(DEP_CFLAGS) $(ARM_CFLAGS)
-+libpixman_arm_simd_la_CFLAGS = $(DEP_CFLAGS) $(ARM_SIMD_CFLAGS)
- libpixman_arm_simd_la_LIBADD = $(DEP_LIBS)
- libpixman_1_la_LIBADD += libpixman-arm-simd.la
- endif
-
-+# arm neon code
-+if USE_ARM_NEON
-+noinst_LTLIBRARIES += libpixman-arm-neon.la
-+libpixman_arm_neon_la_SOURCES = \
-+ pixman-arm-neon.c \
-+ pixman-arm-neon.h
-+libpixman_arm_neon_la_CFLAGS = $(DEP_CFLAGS) $(ARM_NEON_CFLAGS)
-+libpixman_arm_neon_la_LIBADD = $(DEP_LIBS)
-+libpixman_1_la_LIBADD += libpixman-arm-neon.la
-+endif
-+
-
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-new file mode 100644
-index 0000000..10050e4
---- /dev/null
-+++ b/pixman/pixman-arm-neon.c
-@@ -0,0 +1,1387 @@
-+/*
-+ * Copyright © 2009 Mozilla Corporation
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Mozilla Corporation not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Mozilla Corporation makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ *
-+ * Author: Ian Rickards (ian.rickards@arm.com)
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include "pixman-arm-neon.h"
-+
-+#include <arm_neon.h>
-+
-+
-+#if !defined(__ARMCC_VERSION) && !defined(FORCE_NO_NEON_INLINE_ASM)
-+// [both armcc & gcc set __GNUC__]
-+// Use GNU style inline asm on gcc, for best performance
-+// Use intrinsics on armcc
-+// This switch determines if any GNU style inline asm is allowed
-+#define USE_NEON_INLINE_ASM
-+#endif
-+
-+
-+static force_inline uint8x8x4_t unpack0565(uint16x8_t rgb)
-+{
-+ uint16x8_t gb, b;
-+ uint8x8x4_t res;
-+
-+ res.val[3] = vdup_n_u8(0);
-+ gb = vshrq_n_u16(rgb, 5);
-+ b = vshrq_n_u16(rgb, 5+6);
-+ res.val[0] = vmovn_u16(rgb); // get low 5 bits
-+ res.val[1] = vmovn_u16(gb); // get mid 6 bits
-+ res.val[2] = vmovn_u16(b); // get top 5 bits
-+
-+ res.val[0] = vshl_n_u8(res.val[0], 3); // shift to top
-+ res.val[1] = vshl_n_u8(res.val[1], 2); // shift to top
-+ res.val[2] = vshl_n_u8(res.val[2], 3); // shift to top
-+
-+ res.val[0] = vsri_n_u8(res.val[0], res.val[0], 5);
-+ res.val[1] = vsri_n_u8(res.val[1], res.val[1], 6);
-+ res.val[2] = vsri_n_u8(res.val[2], res.val[2], 5);
-+
-+ return res;
-+}
-+
-+static force_inline uint16x8_t pack0565(uint8x8x4_t s)
-+{
-+ uint16x8_t rgb, val_g, val_r;
-+
-+ rgb = vshll_n_u8(s.val[2],8);
-+ val_g = vshll_n_u8(s.val[1],8);
-+ val_r = vshll_n_u8(s.val[0],8);
-+ rgb = vsriq_n_u16(rgb, val_g, 5);
-+ rgb = vsriq_n_u16(rgb, val_r, 5+6);
-+
-+ return rgb;
-+}
-+
-+static force_inline uint8x8_t neon2mul(uint8x8_t x, uint8x8_t alpha)
-+{
-+ uint16x8_t tmp,tmp2;
-+ uint8x8_t res;
-+
-+ tmp = vmull_u8(x,alpha);
-+ tmp2 = vrshrq_n_u16(tmp,8);
-+ res = vraddhn_u16(tmp,tmp2);
-+
-+ return res;
-+}
-+
-+static force_inline uint8x8x4_t neon8mul(uint8x8x4_t x, uint8x8_t alpha)
-+{
-+ uint16x8x4_t tmp;
-+ uint8x8x4_t res;
-+ uint16x8_t qtmp1,qtmp2;
-+
-+ tmp.val[0] = vmull_u8(x.val[0],alpha);
-+ tmp.val[1] = vmull_u8(x.val[1],alpha);
-+ tmp.val[2] = vmull_u8(x.val[2],alpha);
-+ tmp.val[3] = vmull_u8(x.val[3],alpha);
-+
-+ qtmp1 = vrshrq_n_u16(tmp.val[0],8);
-+ qtmp2 = vrshrq_n_u16(tmp.val[1],8);
-+ res.val[0] = vraddhn_u16(tmp.val[0],qtmp1);
-+ qtmp1 = vrshrq_n_u16(tmp.val[2],8);
-+ res.val[1] = vraddhn_u16(tmp.val[1],qtmp2);
-+ qtmp2 = vrshrq_n_u16(tmp.val[3],8);
-+ res.val[2] = vraddhn_u16(tmp.val[2],qtmp1);
-+ res.val[3] = vraddhn_u16(tmp.val[3],qtmp2);
-+
-+ return res;
-+}
-+
-+static force_inline uint8x8x4_t neon8qadd(uint8x8x4_t x, uint8x8x4_t y)
-+{
-+ uint8x8x4_t res;
-+
-+ res.val[0] = vqadd_u8(x.val[0],y.val[0]);
-+ res.val[1] = vqadd_u8(x.val[1],y.val[1]);
-+ res.val[2] = vqadd_u8(x.val[2],y.val[2]);
-+ res.val[3] = vqadd_u8(x.val[3],y.val[3]);
-+
-+ return res;
-+}
-+
-+
-+void
-+fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint8_t *dstLine, *dst;
-+ uint8_t *srcLine, *src;
-+ int dstStride, srcStride;
-+ uint16_t w;
-+
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1);
-+ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
-+
-+ if (width>=8)
-+ {
-+ // Use overlapping 8-pixel method
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ uint8_t *keep_dst;
-+
-+#ifndef USE_NEON_INLINE_ASM
-+ uint8x8_t sval,dval,temp;
-+
-+ sval = vld1_u8((void*)src);
-+ dval = vld1_u8((void*)dst);
-+ keep_dst = dst;
-+
-+ temp = vqadd_u8(dval,sval);
-+
-+ src += (w & 7);
-+ dst += (w & 7);
-+ w -= (w & 7);
-+
-+ while (w)
-+ {
-+ sval = vld1_u8((void*)src);
-+ dval = vld1_u8((void*)dst);
-+
-+ vst1_u8((void*)keep_dst,temp);
-+ keep_dst = dst;
-+
-+ temp = vqadd_u8(dval,sval);
-+
-+ src+=8;
-+ dst+=8;
-+ w-=8;
-+ }
-+ vst1_u8((void*)keep_dst,temp);
-+#else
-+ asm volatile (
-+// avoid using d8-d15 (q4-q7) aapcs callee-save registers
-+ "vld1.8 {d0}, [%[src]]\n\t"
-+ "vld1.8 {d4}, [%[dst]]\n\t"
-+ "mov %[keep_dst], %[dst]\n\t"
-+
-+ "and ip, %[w], #7\n\t"
-+ "add %[src], %[src], ip\n\t"
-+ "add %[dst], %[dst], ip\n\t"
-+ "subs %[w], %[w], ip\n\t"
-+ "b 9f\n\t"
-+// LOOP
-+ "2:\n\t"
-+ "vld1.8 {d0}, [%[src]]!\n\t"
-+ "vld1.8 {d4}, [%[dst]]!\n\t"
-+ "vst1.8 {d20}, [%[keep_dst]]\n\t"
-+ "sub %[keep_dst], %[dst], #8\n\t"
-+ "subs %[w], %[w], #8\n\t"
-+ "9:\n\t"
-+ "vqadd.u8 d20, d0, d4\n\t"
-+
-+ "bne 2b\n\t"
-+
-+ "1:\n\t"
-+ "vst1.8 {d20}, [%[keep_dst]]\n\t"
-+
-+ : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
-+ :
-+ : "ip", "cc", "memory", "d0","d4",
-+ "d20"
-+ );
-+#endif
-+ }
-+ }
-+ else
-+ {
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+ uint8x8_t sval, dval;
-+ uint8_t *dst4, *dst2;
-+
-+ if (w&4)
-+ {
-+ sval = vreinterpret_u8_u32(vld1_lane_u32((void*)src,vreinterpret_u32_u8(sval),1));
-+ dval = vreinterpret_u8_u32(vld1_lane_u32((void*)dst,vreinterpret_u32_u8(dval),1));
-+ dst4=dst;
-+ src+=4;
-+ dst+=4;
-+ }
-+ if (w&2)
-+ {
-+ sval = vreinterpret_u8_u16(vld1_lane_u16((void*)src,vreinterpret_u16_u8(sval),1));
-+ dval = vreinterpret_u8_u16(vld1_lane_u16((void*)dst,vreinterpret_u16_u8(dval),1));
-+ dst2=dst;
-+ src+=2;
-+ dst+=2;
-+ }
-+ if (w&1)
-+ {
-+ sval = vld1_lane_u8((void*)src,sval,1);
-+ dval = vld1_lane_u8((void*)dst,dval,1);
-+ }
-+
-+ dval = vqadd_u8(dval,sval);
-+
-+ if (w&1)
-+ vst1_lane_u8((void*)dst,dval,1);
-+ if (w&2)
-+ vst1_lane_u16((void*)dst2,vreinterpret_u16_u8(dval),1);
-+ if (w&4)
-+ vst1_lane_u32((void*)dst4,vreinterpret_u32_u8(dval),1);
-+ }
-+ }
-+}
-+
-+
-+void
-+fbCompositeSrc_8888x8888neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t *dstLine, *dst;
-+ uint32_t *srcLine, *src;
-+ int dstStride, srcStride;
-+ uint32_t w;
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
-+
-+ if (width>=8)
-+ {
-+ // Use overlapping 8-pixel method
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ uint32_t *keep_dst;
-+
-+#ifndef USE_NEON_INLINE_ASM
-+ uint8x8x4_t sval,dval,temp;
-+
-+ sval = vld4_u8((void*)src);
-+ dval = vld4_u8((void*)dst);
-+ keep_dst = dst;
-+
-+ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
-+ temp = neon8qadd(sval,temp);
-+
-+ src += (w & 7);
-+ dst += (w & 7);
-+ w -= (w & 7);
-+
-+ while (w)
-+ {
-+ sval = vld4_u8((void*)src);
-+ dval = vld4_u8((void*)dst);
-+
-+ vst4_u8((void*)keep_dst,temp);
-+ keep_dst = dst;
-+
-+ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
-+ temp = neon8qadd(sval,temp);
-+
-+ src+=8;
-+ dst+=8;
-+ w-=8;
-+ }
-+ vst4_u8((void*)keep_dst,temp);
-+#else
-+ asm volatile (
-+// avoid using d8-d15 (q4-q7) aapcs callee-save registers
-+ "vld4.8 {d0-d3}, [%[src]]\n\t"
-+ "vld4.8 {d4-d7}, [%[dst]]\n\t"
-+ "mov %[keep_dst], %[dst]\n\t"
-+
-+ "and ip, %[w], #7\n\t"
-+ "add %[src], %[src], ip, LSL#2\n\t"
-+ "add %[dst], %[dst], ip, LSL#2\n\t"
-+ "subs %[w], %[w], ip\n\t"
-+ "b 9f\n\t"
-+// LOOP
-+ "2:\n\t"
-+ "vld4.8 {d0-d3}, [%[src]]!\n\t"
-+ "vld4.8 {d4-d7}, [%[dst]]!\n\t"
-+ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
-+ "sub %[keep_dst], %[dst], #8*4\n\t"
-+ "subs %[w], %[w], #8\n\t"
-+ "9:\n\t"
-+ "vmvn.8 d31, d3\n\t"
-+ "vmull.u8 q10, d31, d4\n\t"
-+ "vmull.u8 q11, d31, d5\n\t"
-+ "vmull.u8 q12, d31, d6\n\t"
-+ "vmull.u8 q13, d31, d7\n\t"
-+ "vrshr.u16 q8, q10, #8\n\t"
-+ "vrshr.u16 q9, q11, #8\n\t"
-+ "vraddhn.u16 d20, q10, q8\n\t"
-+ "vraddhn.u16 d21, q11, q9\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vraddhn.u16 d22, q12, q8\n\t"
-+ "vraddhn.u16 d23, q13, q9\n\t"
-+// result in d20-d23
-+ "vqadd.u8 d20, d0, d20\n\t"
-+ "vqadd.u8 d21, d1, d21\n\t"
-+ "vqadd.u8 d22, d2, d22\n\t"
-+ "vqadd.u8 d23, d3, d23\n\t"
-+
-+ "bne 2b\n\t"
-+
-+ "1:\n\t"
-+ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
-+
-+ : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
-+ :
-+ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
-+ "d16","d17","d18","d19","d20","d21","d22","d23"
-+ );
-+#endif
-+ }
-+ }
-+ else
-+ {
-+ uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL));
-+
-+ // Handle width<8
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ while (w>=2)
-+ {
-+ uint8x8_t sval,dval;
-+
-+ /* two 32-bit pixels packed into D-reg; ad-hoc vectorization */
-+ sval = vreinterpret_u8_u32(vld1_u32((void*)src));
-+ dval = vreinterpret_u8_u32(vld1_u32((void*)dst));
-+ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval),alpha_selector));
-+ vst1_u8((void*)dst,vqadd_u8(sval,dval));
-+
-+ src+=2;
-+ dst+=2;
-+ w-=2;
-+ }
-+
-+ if (w)
-+ {
-+ uint8x8_t sval,dval;
-+
-+ /* single 32-bit pixel in lane 0 */
-+ sval = vreinterpret_u8_u32(vld1_dup_u32((void*)src)); // only interested in lane 0
-+ dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst)); // only interested in lane 0
-+ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval),alpha_selector));
-+ vst1_lane_u32((void*)dst,vreinterpret_u32_u8(vqadd_u8(sval,dval)),0);
-+ }
-+ }
-+ }
-+}
-+
-+
-+
-+void
-+fbCompositeSrc_x888x0565neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint16_t *dstLine, *dst;
-+ uint32_t *srcLine, *src;
-+ int dstStride, srcStride;
-+ uint32_t w;
-+
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
-+ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+
-+ if (width>=8)
-+ {
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ do {
-+ while (w>=8)
-+ {
-+#ifndef USE_NEON_INLINE_ASM
-+ vst1q_u16(dst, pack0565(vld4_u8((void*)src)));
-+#else
-+ asm volatile (
-+ "vld4.8 {d4-d7}, [%[src]]\n\t"
-+ "vshll.u8 q0, d6, #8\n\t"
-+ "vshll.u8 q1, d5, #8\n\t"
-+ "vsriq.u16 q0, q1, #5\t\n"
-+ "vshll.u8 q1, d4, #8\n\t"
-+ "vsriq.u16 q0, q1, #11\t\n"
-+ "vst1.16 {q0}, [%[dst]]\n\t"
-+ :
-+ : [dst] "r" (dst), [src] "r" (src)
-+ : "memory", "d0","d1","d2","d3","d4","d5","d6","d7"
-+ );
-+#endif
-+ src+=8;
-+ dst+=8;
-+ w-=8;
-+ }
-+ if (w != 0)
-+ {
-+ src -= (8-w);
-+ dst -= (8-w);
-+ w = 8; // do another vector
-+ }
-+ } while (w!=0);
-+ }
-+ }
-+ else
-+ {
-+ // Handle width<8
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ while (w>=2)
-+ {
-+ uint32x2_t sval, rgb, g, b;
-+ sval = vld1_u32(src);
-+ rgb = vshr_n_u32(sval,8-5); // r (5 bits)
-+ g = vshr_n_u32(sval,8+8-6); // g to bottom byte
-+ rgb = vsli_n_u32(rgb, g, 5);
-+ b = vshr_n_u32(sval,8+8+8-5); // b to bottom byte
-+ rgb = vsli_n_u32(rgb, b, 11);
-+ vst1_lane_u16(dst++,vreinterpret_u16_u32(rgb),0);
-+ vst1_lane_u16(dst++,vreinterpret_u16_u32(rgb),2);
-+ src+=2;
-+ w-=2;
-+ }
-+ if (w)
-+ {
-+ uint32x2_t sval, rgb, g, b;
-+ sval = vld1_dup_u32(src);
-+ rgb = vshr_n_u32(sval,8-5); // r (5 bits)
-+ g = vshr_n_u32(sval,8+8-6); // g to bottom byte
-+ rgb = vsli_n_u32(rgb, g, 5);
-+ b = vshr_n_u32(sval,8+8+8-5); // b to bottom byte
-+ rgb = vsli_n_u32(rgb, b, 11);
-+ vst1_lane_u16(dst++,vreinterpret_u16_u32(rgb),0);
-+ }
-+ }
-+ }
-+}
-+
-+
-+void
-+fbCompositeSrc_8888x8x8888neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t *dstLine, *dst;
-+ uint32_t *srcLine, *src;
-+ uint32_t mask;
-+ int dstStride, srcStride;
-+ uint32_t w;
-+ uint8x8_t mask_alpha;
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
-+
-+ fbComposeGetSolid (pMask, mask, pDst->bits.format);
-+ mask_alpha = vdup_n_u8((mask) >> 24);
-+
-+ if (width>=8)
-+ {
-+ // Use overlapping 8-pixel method
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ uint32_t *keep_dst;
-+
-+#ifndef USE_NEON_INLINE_ASM
-+ uint8x8x4_t sval,dval,temp;
-+
-+ sval = vld4_u8((void*)src);
-+ dval = vld4_u8((void*)dst);
-+ keep_dst = dst;
-+
-+ sval = neon8mul(sval,mask_alpha);
-+ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
-+ temp = neon8qadd(sval,temp);
-+
-+ src += (w & 7);
-+ dst += (w & 7);
-+ w -= (w & 7);
-+
-+ while (w)
-+ {
-+ sval = vld4_u8((void*)src);
-+ dval = vld4_u8((void*)dst);
-+
-+ vst4_u8((void*)keep_dst,temp);
-+ keep_dst = dst;
-+
-+ sval = neon8mul(sval,mask_alpha);
-+ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
-+ temp = neon8qadd(sval,temp);
-+
-+ src+=8;
-+ dst+=8;
-+ w-=8;
-+ }
-+ vst4_u8((void*)keep_dst,temp);
-+#else
-+ asm volatile (
-+// avoid using d8-d15 (q4-q7) aapcs callee-save registers
-+ "vdup.32 d30, %[mask]\n\t"
-+ "vdup.8 d30, d30[3]\n\t"
-+
-+ "vld4.8 {d0-d3}, [%[src]]\n\t"
-+ "vld4.8 {d4-d7}, [%[dst]]\n\t"
-+ "mov %[keep_dst], %[dst]\n\t"
-+
-+ "and ip, %[w], #7\n\t"
-+ "add %[src], %[src], ip, LSL#2\n\t"
-+ "add %[dst], %[dst], ip, LSL#2\n\t"
-+ "subs %[w], %[w], ip\n\t"
-+ "b 9f\n\t"
-+// LOOP
-+ "2:\n\t"
-+ "vld4.8 {d0-d3}, [%[src]]!\n\t"
-+ "vld4.8 {d4-d7}, [%[dst]]!\n\t"
-+ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
-+ "sub %[keep_dst], %[dst], #8*4\n\t"
-+ "subs %[w], %[w], #8\n\t"
-+
-+ "9:\n\t"
-+ "vmull.u8 q10, d30, d0\n\t"
-+ "vmull.u8 q11, d30, d1\n\t"
-+ "vmull.u8 q12, d30, d2\n\t"
-+ "vmull.u8 q13, d30, d3\n\t"
-+ "vrshr.u16 q8, q10, #8\n\t"
-+ "vrshr.u16 q9, q11, #8\n\t"
-+ "vraddhn.u16 d0, q10, q8\n\t"
-+ "vraddhn.u16 d1, q11, q9\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d3, q13, q9\n\t"
-+ "vraddhn.u16 d2, q12, q8\n\t"
-+
-+ "vmvn.8 d31, d3\n\t"
-+ "vmull.u8 q10, d31, d4\n\t"
-+ "vmull.u8 q11, d31, d5\n\t"
-+ "vmull.u8 q12, d31, d6\n\t"
-+ "vmull.u8 q13, d31, d7\n\t"
-+ "vrshr.u16 q8, q10, #8\n\t"
-+ "vrshr.u16 q9, q11, #8\n\t"
-+ "vraddhn.u16 d20, q10, q8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d21, q11, q9\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vraddhn.u16 d22, q12, q8\n\t"
-+ "vraddhn.u16 d23, q13, q9\n\t"
-+// result in d20-d23
-+ "vqadd.u8 d20, d0, d20\n\t"
-+ "vqadd.u8 d21, d1, d21\n\t"
-+ "vqadd.u8 d22, d2, d22\n\t"
-+ "vqadd.u8 d23, d3, d23\n\t"
-+
-+ "bne 2b\n\t"
-+
-+ "1:\n\t"
-+ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
-+
-+ : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
-+ : [mask] "r" (mask)
-+ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
-+ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27",
-+ "d30","d31"
-+ );
-+#endif
-+ }
-+ }
-+ else
-+ {
-+ uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL));
-+
-+ // Handle width<8
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ while (w>=2)
-+ {
-+ uint8x8_t sval,dval;
-+
-+ sval = vreinterpret_u8_u32(vld1_u32((void*)src));
-+ dval = vreinterpret_u8_u32(vld1_u32((void*)dst));
-+
-+ /* sval * const alpha_mul */
-+ sval = neon2mul(sval,mask_alpha);
-+
-+ /* dval * 255-(src alpha) */
-+ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval), alpha_selector));
-+
-+ vst1_u8((void*)dst,vqadd_u8(sval,dval));
-+
-+ src+=2;
-+ dst+=2;
-+ w-=2;
-+ }
-+
-+ if (w)
-+ {
-+ uint8x8_t sval,dval;
-+
-+ sval = vreinterpret_u8_u32(vld1_dup_u32((void*)src));
-+ dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst));
-+
-+ /* sval * const alpha_mul */
-+ sval = neon2mul(sval,mask_alpha);
-+
-+ /* dval * 255-(src alpha) */
-+ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval), alpha_selector));
-+
-+ vst1_lane_u32((void*)dst,vreinterpret_u32_u8(vqadd_u8(sval,dval)),0);
-+ }
-+ }
-+ }
-+}
-+
-+
-+
-+void
-+fbCompositeSolidMask_nx8x0565neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t src, srca;
-+ uint16_t *dstLine, *dst;
-+ uint8_t *maskLine, *mask;
-+ int dstStride, maskStride;
-+ uint32_t w;
-+ uint8x8_t sval2;
-+ uint8x8x4_t sval8;
-+
-+ fbComposeGetSolid(pSrc, src, pDst->bits.format);
-+
-+ srca = src >> 24;
-+ if (src == 0)
-+ return;
-+
-+ sval2=vreinterpret_u8_u32(vdup_n_u32(src));
-+ sval8.val[0]=vdup_lane_u8(sval2,0);
-+ sval8.val[1]=vdup_lane_u8(sval2,1);
-+ sval8.val[2]=vdup_lane_u8(sval2,2);
-+ sval8.val[3]=vdup_lane_u8(sval2,3);
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
-+
-+ if (width>=8)
-+ {
-+ // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
-+ while (height--)
-+ {
-+ uint16_t *keep_dst;
-+
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+#ifndef USE_NEON_INLINE_ASM
-+ uint8x8_t alpha;
-+ uint16x8_t dval, temp;
-+ uint8x8x4_t sval8temp;
-+
-+ alpha = vld1_u8((void*)mask);
-+ dval = vld1q_u16((void*)dst);
-+ keep_dst = dst;
-+
-+ sval8temp = neon8mul(sval8,alpha);
-+ temp = pack0565(neon8qadd(sval8temp,neon8mul(unpack0565(dval),vmvn_u8(sval8temp.val[3]))));
-+
-+ mask += (w & 7);
-+ dst += (w & 7);
-+ w -= (w & 7);
-+
-+ while (w)
-+ {
-+ dval = vld1q_u16((void*)dst);
-+ alpha = vld1_u8((void*)mask);
-+
-+ vst1q_u16((void*)keep_dst,temp);
-+ keep_dst = dst;
-+
-+ sval8temp = neon8mul(sval8,alpha);
-+ temp = pack0565(neon8qadd(sval8temp,neon8mul(unpack0565(dval),vmvn_u8(sval8temp.val[3]))));
-+
-+ mask+=8;
-+ dst+=8;
-+ w-=8;
-+ }
-+ vst1q_u16((void*)keep_dst,temp);
-+#else
-+ asm volatile (
-+ "vdup.32 d0, %[src]\n\t"
-+ "vdup.8 d1, d0[1]\n\t"
-+ "vdup.8 d2, d0[2]\n\t"
-+ "vdup.8 d3, d0[3]\n\t"
-+ "vdup.8 d0, d0[0]\n\t"
-+
-+ "vld1.8 {q12}, [%[dst]]\n\t"
-+ "vld1.8 {d31}, [%[mask]]\n\t"
-+ "mov %[keep_dst], %[dst]\n\t"
-+
-+ "and ip, %[w], #7\n\t"
-+ "add %[mask], %[mask], ip\n\t"
-+ "add %[dst], %[dst], ip, LSL#1\n\t"
-+ "subs %[w], %[w], ip\n\t"
-+ "b 9f\n\t"
-+// LOOP
-+ "2:\n\t"
-+
-+ "vld1.16 {q12}, [%[dst]]!\n\t"
-+ "vld1.8 {d31}, [%[mask]]!\n\t"
-+ "vst1.16 {q10}, [%[keep_dst]]\n\t"
-+ "sub %[keep_dst], %[dst], #8*2\n\t"
-+ "subs %[w], %[w], #8\n\t"
-+ "9:\n\t"
-+// expand 0565 q12 to 8888 {d4-d7}
-+ "vmovn.u16 d4, q12\t\n"
-+ "vshr.u16 q11, q12, #5\t\n"
-+ "vshr.u16 q10, q12, #6+5\t\n"
-+ "vmovn.u16 d5, q11\t\n"
-+ "vmovn.u16 d6, q10\t\n"
-+ "vshl.u8 d4, d4, #3\t\n"
-+ "vshl.u8 d5, d5, #2\t\n"
-+ "vshl.u8 d6, d6, #3\t\n"
-+ "vsri.u8 d4, d4, #5\t\n"
-+ "vsri.u8 d5, d5, #6\t\n"
-+ "vsri.u8 d6, d6, #5\t\n"
-+
-+ "vmull.u8 q10, d31, d0\n\t"
-+ "vmull.u8 q11, d31, d1\n\t"
-+ "vmull.u8 q12, d31, d2\n\t"
-+ "vmull.u8 q13, d31, d3\n\t"
-+ "vrshr.u16 q8, q10, #8\n\t"
-+ "vrshr.u16 q9, q11, #8\n\t"
-+ "vraddhn.u16 d20, q10, q8\n\t"
-+ "vraddhn.u16 d21, q11, q9\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d23, q13, q9\n\t"
-+ "vraddhn.u16 d22, q12, q8\n\t"
-+
-+// duplicate in 4/2/1 & 8pix vsns
-+ "vmvn.8 d30, d23\n\t"
-+ "vmull.u8 q14, d30, d6\n\t"
-+ "vmull.u8 q13, d30, d5\n\t"
-+ "vmull.u8 q12, d30, d4\n\t"
-+ "vrshr.u16 q8, q14, #8\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vraddhn.u16 d6, q14, q8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d5, q13, q9\n\t"
-+ "vqadd.u8 d6, d6, d22\n\t" // moved up
-+ "vraddhn.u16 d4, q12, q8\n\t"
-+// intentionally don't calculate alpha
-+// result in d4-d6
-+
-+// "vqadd.u8 d6, d6, d22\n\t" ** moved up
-+ "vqadd.u8 d5, d5, d21\n\t"
-+ "vqadd.u8 d4, d4, d20\n\t"
-+
-+// pack 8888 {d20-d23} to 0565 q10
-+ "vshll.u8 q10, d6, #8\n\t"
-+ "vshll.u8 q3, d5, #8\n\t"
-+ "vshll.u8 q2, d4, #8\n\t"
-+ "vsri.u16 q10, q3, #5\t\n"
-+ "vsri.u16 q10, q2, #11\t\n"
-+
-+ "bne 2b\n\t"
-+
-+ "1:\n\t"
-+ "vst1.16 {q10}, [%[keep_dst]]\n\t"
-+
-+ : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [keep_dst] "+r" (keep_dst)
-+ : [src] "r" (src)
-+ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
-+ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
-+ "d30","d31"
-+ );
-+#endif
-+ }
-+ }
-+ else
-+ {
-+ while (height--)
-+ {
-+ void *dst4, *dst2;
-+
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+
-+#ifndef USE_NEON_INLINE_ASM
-+ uint8x8_t alpha;
-+ uint16x8_t dval, temp;
-+ uint8x8x4_t sval8temp;
-+
-+ if (w&4)
-+ {
-+ alpha = vreinterpret_u8_u32(vld1_lane_u32((void*)mask,vreinterpret_u32_u8(alpha),1));
-+ dval = vreinterpretq_u16_u64(vld1q_lane_u64((void*)dst,vreinterpretq_u64_u16(dval),1));
-+ dst4=dst;
-+ mask+=4;
-+ dst+=4;
-+ }
-+ if (w&2)
-+ {
-+ alpha = vreinterpret_u8_u16(vld1_lane_u16((void*)mask,vreinterpret_u16_u8(alpha),1));
-+ dval = vreinterpretq_u16_u32(vld1q_lane_u32((void*)dst,vreinterpretq_u32_u16(dval),1));
-+ dst2=dst;
-+ mask+=2;
-+ dst+=2;
-+ }
-+ if (w&1)
-+ {
-+ alpha = vld1_lane_u8((void*)mask,alpha,1);
-+ dval = vld1q_lane_u16((void*)dst,dval,1);
-+ }
-+
-+ sval8temp = neon8mul(sval8,alpha);
-+ temp = pack0565(neon8qadd(sval8temp,neon8mul(unpack0565(dval),vmvn_u8(sval8temp.val[3]))));
-+
-+ if (w&1)
-+ vst1q_lane_u16((void*)dst,temp,1);
-+ if (w&2)
-+ vst1q_lane_u32((void*)dst2,vreinterpretq_u32_u16(temp),1);
-+ if (w&4)
-+ vst1q_lane_u64((void*)dst4,vreinterpretq_u64_u16(temp),1);
-+#else
-+ asm volatile (
-+ "vdup.32 d0, %[src]\n\t"
-+ "vdup.8 d1, d0[1]\n\t"
-+ "vdup.8 d2, d0[2]\n\t"
-+ "vdup.8 d3, d0[3]\n\t"
-+ "vdup.8 d0, d0[0]\n\t"
-+
-+ "tst %[w], #4\t\n"
-+ "beq skip_load4\t\n"
-+
-+ "vld1.64 {d25}, [%[dst]]\n\t"
-+ "vld1.32 {d31[1]}, [%[mask]]\n\t"
-+ "mov %[dst4], %[dst]\t\n"
-+ "add %[mask], %[mask], #4\t\n"
-+ "add %[dst], %[dst], #4*2\t\n"
-+
-+ "skip_load4:\t\n"
-+ "tst %[w], #2\t\n"
-+ "beq skip_load2\t\n"
-+ "vld1.32 {d24[1]}, [%[dst]]\n\t"
-+ "vld1.16 {d31[1]}, [%[mask]]\n\t"
-+ "mov %[dst2], %[dst]\t\n"
-+ "add %[mask], %[mask], #2\t\n"
-+ "add %[dst], %[dst], #2*2\t\n"
-+
-+ "skip_load2:\t\n"
-+ "tst %[w], #1\t\n"
-+ "beq skip_load1\t\n"
-+ "vld1.16 {d24[1]}, [%[dst]]\n\t"
-+ "vld1.8 {d31[1]}, [%[mask]]\n\t"
-+
-+ "skip_load1:\t\n"
-+// expand 0565 q12 to 8888 {d4-d7}
-+ "vmovn.u16 d4, q12\t\n"
-+ "vshr.u16 q11, q12, #5\t\n"
-+ "vshr.u16 q10, q12, #6+5\t\n"
-+ "vmovn.u16 d5, q11\t\n"
-+ "vmovn.u16 d6, q10\t\n"
-+ "vshl.u8 d4, d4, #3\t\n"
-+ "vshl.u8 d5, d5, #2\t\n"
-+ "vshl.u8 d6, d6, #3\t\n"
-+ "vsri.u8 d4, d4, #5\t\n"
-+ "vsri.u8 d5, d5, #6\t\n"
-+ "vsri.u8 d6, d6, #5\t\n"
-+
-+ "vmull.u8 q10, d31, d0\n\t"
-+ "vmull.u8 q11, d31, d1\n\t"
-+ "vmull.u8 q12, d31, d2\n\t"
-+ "vmull.u8 q13, d31, d3\n\t"
-+ "vrshr.u16 q8, q10, #8\n\t"
-+ "vrshr.u16 q9, q11, #8\n\t"
-+ "vraddhn.u16 d20, q10, q8\n\t"
-+ "vraddhn.u16 d21, q11, q9\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d23, q13, q9\n\t"
-+ "vraddhn.u16 d22, q12, q8\n\t"
-+
-+// duplicate in 4/2/1 & 8pix vsns
-+ "vmvn.8 d30, d23\n\t"
-+ "vmull.u8 q14, d30, d6\n\t"
-+ "vmull.u8 q13, d30, d5\n\t"
-+ "vmull.u8 q12, d30, d4\n\t"
-+ "vrshr.u16 q8, q14, #8\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vraddhn.u16 d6, q14, q8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d5, q13, q9\n\t"
-+ "vqadd.u8 d6, d6, d22\n\t" // moved up
-+ "vraddhn.u16 d4, q12, q8\n\t"
-+// intentionally don't calculate alpha
-+// result in d4-d6
-+
-+// "vqadd.u8 d6, d6, d22\n\t" ** moved up
-+ "vqadd.u8 d5, d5, d21\n\t"
-+ "vqadd.u8 d4, d4, d20\n\t"
-+
-+// pack 8888 {d20-d23} to 0565 q10
-+ "vshll.u8 q10, d6, #8\n\t"
-+ "vshll.u8 q3, d5, #8\n\t"
-+ "vshll.u8 q2, d4, #8\n\t"
-+ "vsri.u16 q10, q3, #5\t\n"
-+ "vsri.u16 q10, q2, #11\t\n"
-+
-+ "tst %[w], #1\n\t"
-+ "beq skip_store1\t\n"
-+ "vst1.16 {d20[1]}, [%[dst]]\t\n"
-+ "skip_store1:\t\n"
-+ "tst %[w], #2\n\t"
-+ "beq skip_store2\t\n"
-+ "vst1.32 {d20[1]}, [%[dst2]]\t\n"
-+ "skip_store2:\t\n"
-+ "tst %[w], #4\n\t"
-+ "beq skip_store4\t\n"
-+ "vst1.16 {d21}, [%[dst4]]\t\n"
-+ "skip_store4:\t\n"
-+
-+ : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [dst4] "+r" (dst4), [dst2] "+r" (dst2)
-+ : [src] "r" (src)
-+ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
-+ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
-+ "d30","d31"
-+ );
-+#endif
-+ }
-+ }
-+}
-+
-+
-+void
-+fbCompositeSolidMask_nx8x8888neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t src, srca;
-+ uint32_t *dstLine, *dst;
-+ uint8_t *maskLine, *mask;
-+ int dstStride, maskStride;
-+ uint32_t w;
-+ uint8x8_t sval2;
-+ uint8x8x4_t sval8;
-+ uint8x8_t mask_selector=vreinterpret_u8_u64(vcreate_u64(0x0101010100000000ULL));
-+ uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL));
-+
-+ fbComposeGetSolid(pSrc, src, pDst->bits.format);
-+
-+ srca = src >> 24;
-+ if (src == 0)
-+ return;
-+
-+ sval2=vreinterpret_u8_u32(vdup_n_u32(src));
-+ sval8.val[0]=vdup_lane_u8(sval2,0);
-+ sval8.val[1]=vdup_lane_u8(sval2,1);
-+ sval8.val[2]=vdup_lane_u8(sval2,2);
-+ sval8.val[3]=vdup_lane_u8(sval2,3);
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
-+
-+ if (width>=8)
-+ {
-+ // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
-+ while (height--)
-+ {
-+ uint32_t *keep_dst;
-+
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+#ifndef USE_NEON_INLINE_ASM
-+ uint8x8_t alpha;
-+ uint8x8x4_t dval, temp;
-+
-+ alpha = vld1_u8((void*)mask);
-+ dval = vld4_u8((void*)dst);
-+ keep_dst = dst;
-+
-+ temp = neon8mul(sval8,alpha);
-+ dval = neon8mul(dval,vmvn_u8(temp.val[3]));
-+ temp = neon8qadd(temp,dval);
-+
-+ mask += (w & 7);
-+ dst += (w & 7);
-+ w -= (w & 7);
-+
-+ while (w)
-+ {
-+ alpha = vld1_u8((void*)mask);
-+ dval = vld4_u8((void*)dst);
-+
-+ vst4_u8((void*)keep_dst,temp);
-+ keep_dst = dst;
-+
-+ temp = neon8mul(sval8,alpha);
-+ dval = neon8mul(dval,vmvn_u8(temp.val[3]));
-+ temp = neon8qadd(temp,dval);
-+
-+ mask+=8;
-+ dst+=8;
-+ w-=8;
-+ }
-+ vst4_u8((void*)keep_dst,temp);
-+#else
-+ asm volatile (
-+ "vdup.32 d0, %[src]\n\t"
-+ "vdup.8 d1, d0[1]\n\t"
-+ "vdup.8 d2, d0[2]\n\t"
-+ "vdup.8 d3, d0[3]\n\t"
-+ "vdup.8 d0, d0[0]\n\t"
-+
-+ "vld4.8 {d4-d7}, [%[dst]]\n\t"
-+ "vld1.8 {d31}, [%[mask]]\n\t"
-+ "mov %[keep_dst], %[dst]\n\t"
-+
-+ "and ip, %[w], #7\n\t"
-+ "add %[mask], %[mask], ip\n\t"
-+ "add %[dst], %[dst], ip, LSL#2\n\t"
-+ "subs %[w], %[w], ip\n\t"
-+ "b 9f\n\t"
-+// LOOP
-+ "2:\n\t"
-+ "vld4.8 {d4-d7}, [%[dst]]!\n\t"
-+ "vld1.8 {d31}, [%[mask]]!\n\t"
-+ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
-+ "sub %[keep_dst], %[dst], #8*4\n\t"
-+ "subs %[w], %[w], #8\n\t"
-+ "9:\n\t"
-+
-+ "vmull.u8 q10, d31, d0\n\t"
-+ "vmull.u8 q11, d31, d1\n\t"
-+ "vmull.u8 q12, d31, d2\n\t"
-+ "vmull.u8 q13, d31, d3\n\t"
-+ "vrshr.u16 q8, q10, #8\n\t"
-+ "vrshr.u16 q9, q11, #8\n\t"
-+ "vraddhn.u16 d20, q10, q8\n\t"
-+ "vraddhn.u16 d21, q11, q9\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d23, q13, q9\n\t"
-+ "vraddhn.u16 d22, q12, q8\n\t"
-+
-+ "vmvn.8 d30, d23\n\t"
-+ "vmull.u8 q12, d30, d4\n\t"
-+ "vmull.u8 q13, d30, d5\n\t"
-+ "vmull.u8 q14, d30, d6\n\t"
-+ "vmull.u8 q15, d30, d7\n\t"
-+
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vraddhn.u16 d4, q12, q8\n\t"
-+ "vrshr.u16 q8, q14, #8\n\t"
-+ "vraddhn.u16 d5, q13, q9\n\t"
-+ "vrshr.u16 q9, q15, #8\n\t"
-+ "vraddhn.u16 d6, q14, q8\n\t"
-+ "vraddhn.u16 d7, q15, q9\n\t"
-+// result in d4-d7
-+
-+ "vqadd.u8 d20, d4, d20\n\t"
-+ "vqadd.u8 d21, d5, d21\n\t"
-+ "vqadd.u8 d22, d6, d22\n\t"
-+ "vqadd.u8 d23, d7, d23\n\t"
-+
-+ "bne 2b\n\t"
-+
-+ "1:\n\t"
-+ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
-+
-+ : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [keep_dst] "+r" (keep_dst)
-+ : [src] "r" (src)
-+ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
-+ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
-+ "d30","d31"
-+ );
-+#endif
-+ }
-+ }
-+ else
-+ {
-+ while (height--)
-+ {
-+ uint8x8_t alpha;
-+
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+ while (w>=2)
-+ {
-+ uint8x8_t dval, temp, res;
-+
-+ alpha = vtbl1_u8(vreinterpret_u8_u16(vld1_dup_u16((void*)mask)), mask_selector);
-+ dval = vld1_u8((void*)dst);
-+
-+ temp = neon2mul(sval2,alpha);
-+ res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector)));
-+
-+ vst1_u8((void*)dst,res);
-+
-+ mask+=2;
-+ dst+=2;
-+ w-=2;
-+ }
-+ if (w)
-+ {
-+ uint8x8_t dval, temp, res;
-+
-+ alpha = vtbl1_u8(vld1_dup_u8((void*)mask), mask_selector);
-+ dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst));
-+
-+ temp = neon2mul(sval2,alpha);
-+ res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector)));
-+
-+ vst1_lane_u32((void*)dst,vreinterpret_u32_u8(res),0);
-+ }
-+ }
-+ }
-+}
-+
-+
-+void
-+fbCompositeSrcAdd_8888x8x8neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint8_t *dstLine, *dst;
-+ uint8_t *maskLine, *mask;
-+ int dstStride, maskStride;
-+ uint32_t w;
-+ uint32_t src;
-+ uint8x8_t sa;
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
-+ fbComposeGetSolid (pSrc, src, pDst->bits.format);
-+ sa = vdup_n_u8((src) >> 24);
-+
-+ if (width>=8)
-+ {
-+ // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+ uint8x8_t mval, dval, res;
-+ uint8_t *keep_dst;
-+
-+ mval = vld1_u8((void *)mask);
-+ dval = vld1_u8((void *)dst);
-+ keep_dst = dst;
-+
-+ res = vqadd_u8(neon2mul(mval,sa),dval);
-+
-+ mask += (w & 7);
-+ dst += (w & 7);
-+ w -= w & 7;
-+
-+ while (w)
-+ {
-+ mval = vld1_u8((void *)mask);
-+ dval = vld1_u8((void *)dst);
-+ vst1_u8((void *)keep_dst, res);
-+ keep_dst = dst;
-+
-+ res = vqadd_u8(neon2mul(mval,sa),dval);
-+
-+ mask += 8;
-+ dst += 8;
-+ w -= 8;
-+ }
-+ vst1_u8((void *)keep_dst, res);
-+ }
-+ }
-+ else
-+ {
-+ // Use 4/2/1 load/store method to handle 1-7 pixels
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+ uint8x8_t mval, dval, res;
-+ uint8_t *dst4, *dst2;
-+
-+ if (w&4)
-+ {
-+ mval = vreinterpret_u8_u32(vld1_lane_u32((void *)mask, vreinterpret_u32_u8(mval), 1));
-+ dval = vreinterpret_u8_u32(vld1_lane_u32((void *)dst, vreinterpret_u32_u8(dval), 1));
-+
-+ dst4 = dst;
-+ mask += 4;
-+ dst += 4;
-+ }
-+ if (w&2)
-+ {
-+ mval = vreinterpret_u8_u16(vld1_lane_u16((void *)mask, vreinterpret_u16_u8(mval), 1));
-+ dval = vreinterpret_u8_u16(vld1_lane_u16((void *)dst, vreinterpret_u16_u8(dval), 1));
-+ dst2 = dst;
-+ mask += 2;
-+ dst += 2;
-+ }
-+ if (w&1)
-+ {
-+ mval = vld1_lane_u8((void *)mask, mval, 1);
-+ dval = vld1_lane_u8((void *)dst, dval, 1);
-+ }
-+
-+ res = vqadd_u8(neon2mul(mval,sa),dval);
-+
-+ if (w&1)
-+ vst1_lane_u8((void *)dst, res, 1);
-+ if (w&2)
-+ vst1_lane_u16((void *)dst2, vreinterpret_u16_u8(res), 1);
-+ if (w&4)
-+ vst1_lane_u32((void *)dst4, vreinterpret_u32_u8(res), 1);
-+ }
-+ }
-+}
-+
-diff --git a/pixman/pixman-arm-neon.h b/pixman/pixman-arm-neon.h
-new file mode 100644
-index 0000000..bab4dee
---- /dev/null
-+++ b/pixman/pixman-arm-neon.h
-@@ -0,0 +1,137 @@
-+/*
-+ * Copyright © 2009 Mozilla Corporation
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Mozilla Corporation not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Mozilla Corporation makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ *
-+ * Author: Ian Rickards (ian.rickards@arm.com)
-+ *
-+ */
-+
-+#include "pixman-private.h"
-+
-+#ifdef USE_ARM_NEON
-+
-+static inline pixman_bool_t pixman_have_arm_neon(void) { return TRUE; }
-+
-+#else
-+#define pixman_have_arm_neon() FALSE
-+#endif
-+
-+#ifdef USE_ARM_NEON
-+
-+void
-+fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSrc_8888x8888neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSrc_8888x8x8888neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSolidMask_nx8x0565neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSolidMask_nx8x8888neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSrc_x888x0565neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSrcAdd_8888x8x8neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+#endif /* USE_ARM_NEON */
-diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
-index 1388517..b13947a 100644
---- a/pixman/pixman-pict.c
-+++ b/pixman/pixman-pict.c
-@@ -34,6 +34,7 @@
- #include "pixman-mmx.h"
- #include "pixman-vmx.h"
- #include "pixman-sse2.h"
-+#include "pixman-arm-neon.h"
- #include "pixman-arm-simd.h"
- #include "pixman-combine32.h"
-
-@@ -1518,6 +1519,31 @@ static const FastPathInfo vmx_fast_paths[] =
- };
- #endif
-
-+#ifdef USE_ARM_NEON
-+static const FastPathInfo arm_neon_fast_paths[] =
-+{
-+ { PIXMAN_OP_ADD, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fbCompositeSrcAdd_8888x8x8neon, 0 },
-+ { PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcAdd_8000x8000neon, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565neon, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565neon, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565neon, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_a8b8g8r8, fbCompositeSrc_8888x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fbCompositeSrc_8888x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8x8888neon, NEED_SOLID_MASK },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8x8888neon, NEED_SOLID_MASK },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_r5g6b5, fbCompositeSolidMask_nx8x0565neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_b5g6r5, fbCompositeSolidMask_nx8x0565neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSolidMask_nx8x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSolidMask_nx8x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8b8g8r8, fbCompositeSolidMask_nx8x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8b8g8r8, fbCompositeSolidMask_nx8x8888neon, 0 },
-+ { PIXMAN_OP_NONE },
-+};
-+#endif
-+
- #ifdef USE_ARM_SIMD
- static const FastPathInfo arm_simd_fast_paths[] =
- {
-@@ -1893,6 +1919,11 @@ pixman_image_composite (pixman_op_t op,
- info = get_fast_path (vmx_fast_paths, op, pSrc, pMask, pDst, pixbuf);
- #endif
-
-+#ifdef USE_ARM_NEON
-+ if (!info && pixman_have_arm_neon())
-+ info = get_fast_path (arm_neon_fast_paths, op, pSrc, pMask, pDst, pixbuf);
-+#endif
-+
- #ifdef USE_ARM_SIMD
- if (!info && pixman_have_arm_simd())
- info = get_fast_path (arm_simd_fast_paths, op, pSrc, pMask, pDst, pixbuf);
diff --git a/recipes/xorg-lib/pixman/pixman-28986.patch b/recipes/xorg-lib/pixman/pixman-28986.patch
deleted file mode 100644
index f5ba4c3..0000000
--- a/recipes/xorg-lib/pixman/pixman-28986.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7b7860d61fb1526acdf010dd8fd644bbf1396b9e Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Fri, 28 Aug 2009 22:34:21 +0300
-Subject: [PATCH] ARM: workaround for gcc bug in vshll_n_u8 intrinsic
-
-Some versions of gcc (cs2009q1, 4.4.1) incorrectly reject
-shift operand having value >= 8, claiming that it is out of
-range. So inline assembly is used as a workaround.
----
- pixman/pixman-arm-neon.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 4125d1b..3e7f566 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -64,6 +64,12 @@ unpack0565 (uint16x8_t rgb)
- return res;
- }
-
-+#ifdef USE_GCC_INLINE_ASM
-+/* Some versions of gcc have problems with vshll_n_u8 intrinsic (Bug 23576) */
-+#define vshll_n_u8(a, n) ({ uint16x8_t r; \
-+ asm ("vshll.u8 %q0, %P1, %2\n" : "=w" (r) : "w" (a), "i" (n)); r; })
-+#endif
-+
- static force_inline uint16x8_t
- pack0565 (uint8x8x4_t s)
- {
---
-1.5.4.3
-
diff --git a/recipes/xorg-lib/pixman/pixman-arm.patch b/recipes/xorg-lib/pixman/pixman-arm.patch
deleted file mode 100644
index 91dda03..0000000
--- a/recipes/xorg-lib/pixman/pixman-arm.patch
+++ /dev/null
@@ -1,632 +0,0 @@
-From: Jeff Muizelaar <jmuizelaar@mozilla.com>
-Date: Wed, 17 Sep 2008 19:53:20 +0000 (-0400)
-Subject: Add support for ARMv6 SIMD fastpaths.
-X-Git-Url: http://gitweb.freedesktop.org/?p=pixman.git;a=commitdiff;h=d0b181f347ef4720d130beee3f03196afbd28aba
-
-Add support for ARMv6 SIMD fastpaths.
----
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -277,6 +277,44 @@ AC_SUBST(VMX_CFLAGS)
-
- AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
-
-+dnl Check for ARM
-+
-+have_armv6_simd=no
-+AC_MSG_CHECKING(whether to use ARM assembler)
-+xserver_save_CFLAGS=$CFLAGS
-+CFLAGS="$CFLAGS $ARM_CFLAGS"
-+AC_COMPILE_IFELSE([
-+int main () {
-+ asm("uqadd8 r1, r1, r2");
-+ return 0;
-+}], have_armv6_simd=yes)
-+CFLAGS=$xserver_save_CFLAGS
-+
-+AC_ARG_ENABLE(arm,
-+ [AC_HELP_STRING([--disable-arm],
-+ [disable ARM fast paths])],
-+ [enable_arm=$enableval], [enable_arm=auto])
-+
-+if test $enable_arm = no ; then
-+ have_armv6_simd=disabled
-+fi
-+
-+if test $have_armv6_simd = yes ; then
-+ AC_DEFINE(USE_ARM, 1, [use ARM compiler intrinsics])
-+else
-+ ARM_CFLAGS=
-+fi
-+
-+AC_MSG_RESULT($have_armv6_simd)
-+if test $enable_arm = yes && test $have_armv6_simd = no ; then
-+ AC_MSG_ERROR([ARM intrinsics not detected])
-+fi
-+
-+AC_SUBST(ARM_CFLAGS)
-+
-+AM_CONDITIONAL(USE_ARM, test $have_armv6_simd = yes)
-+
-+
- AC_ARG_ENABLE(gtk,
- [AC_HELP_STRING([--enable-gtk],
- [enable tests using GTK+ [default=auto]])],
---- a/pixman/Makefile.am
-+++ b/pixman/Makefile.am
-@@ -79,3 +79,15 @@ libpixman_sse2_la_LIBADD = $(DEP_LIBS)
- libpixman_1_la_LIBADD += libpixman-sse2.la
- endif
-
-+# arm code
-+if USE_ARM
-+noinst_LTLIBRARIES += libpixman-arm.la
-+libpixman_arm_la_SOURCES = \
-+ pixman-arm.c \
-+ pixman-arm.h
-+libpixman_arm_la_CFLAGS = $(DEP_CFLAGS) $(ARM_CFLAGS)
-+libpixman_arm_la_LIBADD = $(DEP_LIBS)
-+libpixman_1_la_LIBADD += libpixman-arm.la
-+endif
-+
-+
---- /dev/null
-+++ b/pixman/pixman-arm.c
-@@ -0,0 +1,409 @@
-+/*
-+ * Copyright © 2008 Mozilla Corporation
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Mozilla Corporation not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Mozilla Corporation makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ *
-+ * Author: Jeff Muizelaar (jeff@infidigm.net)
-+ *
-+ */
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include "pixman-arm.h"
-+
-+void
-+fbCompositeSrcAdd_8000x8000arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint8_t *dstLine, *dst;
-+ uint8_t *srcLine, *src;
-+ int dstStride, srcStride;
-+ uint16_t w;
-+ uint8_t s, d;
-+
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1);
-+ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
-+
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ while (w && (unsigned long)dst & 3)
-+ {
-+ s = *src;
-+ d = *dst;
-+ asm("uqadd8 %0, %1, %2" : "+r"(d) : "r"(s));
-+ *dst = d;
-+
-+ dst++;
-+ src++;
-+ w--;
-+ }
-+
-+ while (w >= 4)
-+ {
-+ asm("uqadd8 %0, %1, %2" : "=r"(*(uint32_t*)dst) : "r"(*(uint32_t*)src), "r"(*(uint32_t*)dst));
-+ dst += 4;
-+ src += 4;
-+ w -= 4;
-+ }
-+
-+ while (w)
-+ {
-+ s = *src;
-+ d = *dst;
-+ asm("uqadd8 %0, %1, %2" : "+r"(d) : "r"(s));
-+ *dst = d;
-+
-+ dst++;
-+ src++;
-+ w--;
-+ }
-+ }
-+
-+}
-+
-+void
-+fbCompositeSrc_8888x8888arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t *dstLine, *dst;
-+ uint32_t *srcLine, *src;
-+ int dstStride, srcStride;
-+ uint16_t w;
-+ uint32_t component_half = 0x800080;
-+ uint32_t upper_component_mask = 0xff00ff00;
-+ uint32_t alpha_mask = 0xff;
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
-+
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+//#define inner_branch
-+ asm volatile (
-+ "cmp %[w], #0\n\t"
-+ "beq 2f\n\t"
-+ "1:\n\t"
-+ /* load dest */
-+ "ldr r5, [%[src]], #4\n\t"
-+#ifdef inner_branch
-+ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
-+ * The 0x0 case also allows us to avoid doing an unecessary data
-+ * write which is more valuable so we only check for that */
-+ "cmp r5, #0x1000000\n\t"
-+ "blt 3f\n\t"
-+
-+ /* = 255 - alpha */
-+ "sub r8, %[alpha_mask], r5, lsr #24\n\t"
-+
-+ "ldr r4, [%[dest]] \n\t"
-+
-+#else
-+ "ldr r4, [%[dest]] \n\t"
-+
-+ /* = 255 - alpha */
-+ "sub r8, %[alpha_mask], r5, lsr #24\n\t"
-+#endif
-+ "uxtb16 r6, r4\n\t"
-+ "uxtb16 r7, r4, ror #8\n\t"
-+
-+ /* multiply by 257 and divide by 65536 */
-+ "mla r6, r6, r8, %[component_half]\n\t"
-+ "mla r7, r7, r8, %[component_half]\n\t"
-+
-+ "uxtab16 r6, r6, r6, ror #8\n\t"
-+ "uxtab16 r7, r7, r7, ror #8\n\t"
-+
-+ /* recombine the 0xff00ff00 bytes of r6 and r7 */
-+ "and r7, %[upper_component_mask]\n\t"
-+ "uxtab16 r6, r7, r6, ror #8\n\t"
-+
-+ "uqadd8 r5, r6, r5\n\t"
-+
-+#ifdef inner_branch
-+ "3:\n\t"
-+
-+#endif
-+ "str r5, [%[dest]], #4\n\t"
-+ /* increment counter and jmp to top */
-+ "subs %[w], %[w], #1\n\t"
-+ "bne 1b\n\t"
-+ "2:\n\t"
-+ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src)
-+ : [component_half] "r" (component_half), [upper_component_mask] "r" (upper_component_mask),
-+ [alpha_mask] "r" (alpha_mask)
-+ : "r4", "r5", "r6", "r7", "r8", "cc", "memory"
-+ );
-+ }
-+}
-+
-+void
-+fbCompositeSrc_8888x8x8888arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t *dstLine, *dst;
-+ uint32_t *srcLine, *src;
-+ uint32_t mask;
-+ int dstStride, srcStride;
-+ uint16_t w;
-+ uint32_t component_half = 0x800080;
-+ uint32_t alpha_mask = 0xff;
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
-+
-+ fbComposeGetSolid (pMask, mask, pDst->bits.format);
-+ mask = (mask) >> 24;
-+
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+//#define inner_branch
-+ asm volatile (
-+ "cmp %[w], #0\n\t"
-+ "beq 2f\n\t"
-+ "1:\n\t"
-+ /* load dest */
-+ "ldr r5, [%[src]], #4\n\t"
-+#ifdef inner_branch
-+ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
-+ * The 0x0 case also allows us to avoid doing an unecessary data
-+ * write which is more valuable so we only check for that */
-+ "cmp r5, #0x1000000\n\t"
-+ "blt 3f\n\t"
-+
-+#endif
-+ "ldr r4, [%[dest]] \n\t"
-+
-+ "uxtb16 r6, r5\n\t"
-+ "uxtb16 r7, r5, ror #8\n\t"
-+
-+ /* multiply by alpha (r8) then by 257 and divide by 65536 */
-+ "mla r6, r6, %[mask_alpha], %[component_half]\n\t"
-+ "mla r7, r7, %[mask_alpha], %[component_half]\n\t"
-+
-+ "uxtab16 r6, r6, r6, ror #8\n\t"
-+ "uxtab16 r7, r7, r7, ror #8\n\t"
-+
-+ "uxtb16 r6, r6, ror #8\n\t"
-+ "uxtb16 r7, r7, ror #8\n\t"
-+
-+ /* recombine */
-+ "orr r5, r6, r7, lsl #8\n\t"
-+
-+ "uxtb16 r6, r4\n\t"
-+ "uxtb16 r7, r4, ror #8\n\t"
-+
-+ /* 255 - alpha */
-+ "sub r8, %[alpha_mask], r5, lsr #24\n\t"
-+
-+ /* multiply by alpha (r8) then by 257 and divide by 65536 */
-+ "mla r6, r6, r8, %[component_half]\n\t"
-+ "mla r7, r7, r8, %[component_half]\n\t"
-+
-+ "uxtab16 r6, r6, r6, ror #8\n\t"
-+ "uxtab16 r7, r7, r7, ror #8\n\t"
-+
-+ "uxtb16 r6, r6, ror #8\n\t"
-+ "uxtb16 r7, r7, ror #8\n\t"
-+
-+ /* recombine */
-+ "orr r6, r6, r7, lsl #8\n\t"
-+
-+ "uqadd8 r5, r6, r5\n\t"
-+
-+#ifdef inner_branch
-+ "3:\n\t"
-+
-+#endif
-+ "str r5, [%[dest]], #4\n\t"
-+ /* increment counter and jmp to top */
-+ "subs %[w], %[w], #1\n\t"
-+ "bne 1b\n\t"
-+ "2:\n\t"
-+ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src)
-+ : [component_half] "r" (component_half), [mask_alpha] "r" (mask),
-+ [alpha_mask] "r" (alpha_mask)
-+ : "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory"
-+ );
-+ }
-+}
-+
-+void
-+fbCompositeSolidMask_nx8x8888arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t src, srca;
-+ uint32_t *dstLine, *dst;
-+ uint8_t *maskLine, *mask;
-+ int dstStride, maskStride;
-+ uint16_t w;
-+
-+ fbComposeGetSolid(pSrc, src, pDst->bits.format);
-+
-+ srca = src >> 24;
-+ if (src == 0)
-+ return;
-+
-+ uint32_t component_mask = 0xff00ff;
-+ uint32_t component_half = 0x800080;
-+
-+ uint32_t src_hi = (src >> 8) & component_mask;
-+ uint32_t src_lo = src & component_mask;
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
-+
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+//#define inner_branch
-+ asm volatile (
-+ "cmp %[w], #0\n\t"
-+ "beq 2f\n\t"
-+ "1:\n\t"
-+ /* load mask */
-+ "ldrb r5, [%[mask]], #1\n\t"
-+#ifdef inner_branch
-+ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
-+ * The 0x0 case also allows us to avoid doing an unecessary data
-+ * write which is more valuable so we only check for that */
-+ /* 0x1000000 is the least value that contains alpha all values
-+ * less than it have a 0 alpha value */
-+ "cmp r5, #0x0\n\t"
-+ "beq 3f\n\t"
-+
-+#endif
-+ "ldr r4, [%[dest]] \n\t"
-+
-+ /* multiply by alpha (r8) then by 257 and divide by 65536 */
-+ "mla r6, %[src_lo], r5, %[component_half]\n\t"
-+ "mla r7, %[src_hi], r5, %[component_half]\n\t"
-+
-+ "uxtab16 r6, r6, r6, ror #8\n\t"
-+ "uxtab16 r7, r7, r7, ror #8\n\t"
-+
-+ "uxtb16 r6, r6, ror #8\n\t"
-+ "uxtb16 r7, r7, ror #8\n\t"
-+
-+ /* recombine */
-+ "orr r5, r6, r7, lsl #8\n\t"
-+
-+ "uxtb16 r6, r4\n\t"
-+ "uxtb16 r7, r4, ror #8\n\t"
-+
-+ /* we could simplify this to use 'sub' if we were
-+ * willing to give up a register for alpha_mask */
-+ "mvn r8, r5\n\t"
-+ "mov r8, r8, lsr #24\n\t"
-+
-+ /* multiply by alpha (r8) then by 257 and divide by 65536 */
-+ "mla r6, r6, r8, %[component_half]\n\t"
-+ "mla r7, r7, r8, %[component_half]\n\t"
-+
-+ "uxtab16 r6, r6, r6, ror #8\n\t"
-+ "uxtab16 r7, r7, r7, ror #8\n\t"
-+
-+ "uxtb16 r6, r6, ror #8\n\t"
-+ "uxtb16 r7, r7, ror #8\n\t"
-+
-+ /* recombine */
-+ "orr r6, r6, r7, lsl #8\n\t"
-+
-+ "uqadd8 r5, r6, r5\n\t"
-+
-+#ifdef inner_branch
-+ "3:\n\t"
-+
-+#endif
-+ "str r5, [%[dest]], #4\n\t"
-+ /* increment counter and jmp to top */
-+ "subs %[w], %[w], #1\n\t"
-+ "bne 1b\n\t"
-+ "2:\n\t"
-+ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src), [mask] "+r" (mask)
-+ : [component_half] "r" (component_half),
-+ [src_hi] "r" (src_hi), [src_lo] "r" (src_lo)
-+ : "r4", "r5", "r6", "r7", "r8", "cc", "memory"
-+ );
-+ }
-+}
---- /dev/null
-+++ b/pixman/pixman-arm.h
-@@ -0,0 +1,94 @@
-+/*
-+ * Copyright © 2008 Mozilla Corporation
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Mozilla Corporation not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Mozilla Corporation makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ *
-+ * Author: Jeff Muizelaar (jeff@infidigm.net)
-+ *
-+ */
-+
-+#include "pixman-private.h"
-+
-+#ifdef USE_ARM
-+
-+static inline pixman_bool_t pixman_have_arm(void) { return TRUE; }
-+
-+#else
-+#define pixman_have_arm() FALSE
-+#endif
-+
-+#ifdef USE_ARM
-+
-+void
-+fbCompositeSrcAdd_8000x8000arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+void
-+fbCompositeSrc_8888x8888arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSrc_8888x8x8888arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+void
-+fbCompositeSolidMask_nx8x8888arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+
-+#endif /* USE_ARM */
---- a/pixman/pixman-pict.c
-+++ b/pixman/pixman-pict.c
-@@ -34,6 +34,7 @@
- #include "pixman-mmx.h"
- #include "pixman-vmx.h"
- #include "pixman-sse2.h"
-+#include "pixman-arm.h"
- #include "pixman-combine32.h"
-
- #ifdef __GNUC__
-@@ -1479,6 +1480,26 @@ static const FastPathInfo vmx_fast_paths
- };
- #endif
-
-+#ifdef USE_ARM
-+static const FastPathInfo arm_fast_paths[] =
-+{
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_a8b8g8r8, fbCompositeSrc_8888x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fbCompositeSrc_8888x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8x8888arm, NEED_SOLID_MASK },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8x8888arm, NEED_SOLID_MASK },
-+
-+ { PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcAdd_8000x8000arm, 0 },
-+
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSolidMask_nx8x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSolidMask_nx8x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8b8g8r8, fbCompositeSolidMask_nx8x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8b8g8r8, fbCompositeSolidMask_nx8x8888arm, 0 },
-+
-+ { PIXMAN_OP_NONE },
-+};
-+#endif
-
- static const FastPathInfo c_fast_paths[] =
- {
-@@ -1829,6 +1850,12 @@ pixman_image_composite (pixman_op_t
- if (!info && pixman_have_vmx())
- info = get_fast_path (vmx_fast_paths, op, pSrc, pMask, pDst, pixbuf);
- #endif
-+
-+#ifdef USE_ARM
-+ if (!info && pixman_have_arm())
-+ info = get_fast_path (arm_fast_paths, op, pSrc, pMask, pDst, pixbuf);
-+#endif
-+
- if (!info)
- info = get_fast_path (c_fast_paths, op, pSrc, pMask, pDst, pixbuf);
-
diff --git a/recipes/xorg-lib/pixman/pixman-x888-565.patch b/recipes/xorg-lib/pixman/pixman-x888-565.patch
deleted file mode 100644
index a3fa331..0000000
--- a/recipes/xorg-lib/pixman/pixman-x888-565.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Vladimir Vukicevic <vladimir@slide.(none)>
-Date: Wed, 17 Sep 2008 20:01:31 +0000 (-0400)
-Subject: Add SRC x888x0565 C fast path
-X-Git-Url: http://gitweb.freedesktop.org/?p=pixman.git;a=commitdiff;h=7180230d4d87c55dfef1e17a0cc3b125d45aa3a0
-
-Add SRC x888x0565 C fast path
----
-
---- a/pixman/pixman-pict.c
-+++ b/pixman/pixman-pict.c
-@@ -759,6 +759,46 @@ fbCompositeSrc_8888x0565 (pixman_op_t op
- }
- }
-
-+
-+void
-+fbCompositeSrc_x888x0565 (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint16_t *dstLine, *dst;
-+ uint32_t *srcLine, *src, s;
-+ int dstStride, srcStride;
-+ uint16_t w;
-+
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
-+ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ while (w--)
-+ {
-+ s = READ(pSrc, src++);
-+ WRITE(pDst, dst, cvt8888to0565(s));
-+ dst++;
-+ }
-+ }
-+}
-+
- void
- fbCompositeSrcAdd_8000x8000 (pixman_op_t op,
- pixman_image_t * pSrc,
-@@ -1568,6 +1608,10 @@ static const FastPathInfo c_fast_paths[]
- { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrcSrc_nxn, 0 },
- { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrcSrc_nxn, 0 },
- #endif
-+ { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 },
- { PIXMAN_OP_IN, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcIn_8x8, 0 },
- { PIXMAN_OP_IN, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fbCompositeSolidMaskIn_nx8x8, 0 },
- { PIXMAN_OP_NONE },
diff --git a/recipes/xorg-lib/pixman/prefetch.patch b/recipes/xorg-lib/pixman/prefetch.patch
deleted file mode 100644
index c2e856e..0000000
--- a/recipes/xorg-lib/pixman/prefetch.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-From d0044bfbd596f22ed1560579ea6537b39f3dc1af Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 29 Oct 2009 19:06:42 +0000
-Subject: ARM: Don't emit prefetch code if prefetch distance is set to 0
-
-Also it is now possible to disable prefetch globally with
-a configuration macro
----
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index bca499a..35e6a7e 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -219,33 +219,33 @@
- vshrn.u16 d7, q2, #3
- vsli.u16 q2, q2, #5
- vshll.u8 q14, d16, #8
-- add PF_X, PF_X, #8
-+ PF add PF_X, PF_X, #8
- vshll.u8 q8, d19, #8
-- tst PF_CTL, #0xF
-+ PF tst PF_CTL, #0xF
- vsri.u8 d6, d6, #5
-- addne PF_X, PF_X, #8
-+ PF addne PF_X, PF_X, #8
- vmvn.8 d3, d3
-- subne PF_CTL, PF_CTL, #1
-+ PF subne PF_CTL, PF_CTL, #1
- vsri.u8 d7, d7, #6
- vshrn.u16 d30, q2, #2
- vmull.u8 q10, d3, d6
-- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
-+ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
- vmull.u8 q11, d3, d7
- vmull.u8 q12, d3, d30
-- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
-+ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
- vsri.u16 q14, q8, #5
-- cmp PF_X, ORIG_W
-+ PF cmp PF_X, ORIG_W
- vshll.u8 q9, d18, #8
- vrshr.u16 q13, q10, #8
-- subge PF_X, PF_X, ORIG_W
-+ PF subge PF_X, PF_X, ORIG_W
- vrshr.u16 q3, q11, #8
- vrshr.u16 q15, q12, #8
-- subges PF_CTL, PF_CTL, #0x10
-+ PF subges PF_CTL, PF_CTL, #0x10
- vsri.u16 q14, q9, #11
-- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
- vraddhn.u16 d20, q10, q13
- vraddhn.u16 d23, q11, q3
-- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
- vraddhn.u16 d22, q12, q15
- vst1.16 {d28, d29}, [DST_W, :128]!
- .endm
-@@ -323,20 +323,20 @@ generate_composite_function \
-
- .macro pixman_composite_src_8888_0565_process_pixblock_tail_head
- vsri.u16 q14, q8, #5
-- add PF_X, PF_X, #8
-- tst PF_CTL, #0xF
-+ PF add PF_X, PF_X, #8
-+ PF tst PF_CTL, #0xF
- vld4.8 {d0, d1, d2, d3}, [SRC]!
-- addne PF_X, PF_X, #8
-- subne PF_CTL, PF_CTL, #1
-+ PF addne PF_X, PF_X, #8
-+ PF subne PF_CTL, PF_CTL, #1
- vsri.u16 q14, q9, #11
-- cmp PF_X, ORIG_W
-- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
-+ PF cmp PF_X, ORIG_W
-+ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
- vshll.u8 q8, d1, #8
- vst1.16 {d28, d29}, [DST_W, :128]!
-- subge PF_X, PF_X, ORIG_W
-- subges PF_CTL, PF_CTL, #0x10
-+ PF subge PF_X, PF_X, ORIG_W
-+ PF subges PF_CTL, PF_CTL, #0x10
- vshll.u8 q14, d2, #8
-- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
- vshll.u8 q9, d0, #8
- .endm
-
-@@ -363,20 +363,20 @@ generate_composite_function \
-
- .macro pixman_composite_add_8000_8000_process_pixblock_tail_head
- vld1.8 {d0, d1, d2, d3}, [SRC]!
-- add PF_X, PF_X, #32
-- tst PF_CTL, #0xF
-+ PF add PF_X, PF_X, #32
-+ PF tst PF_CTL, #0xF
- vld1.8 {d4, d5, d6, d7}, [DST_R, :128]!
-- addne PF_X, PF_X, #32
-- subne PF_CTL, PF_CTL, #1
-+ PF addne PF_X, PF_X, #32
-+ PF subne PF_CTL, PF_CTL, #1
- vst1.8 {d28, d29, d30, d31}, [DST_W, :128]!
-- cmp PF_X, ORIG_W
-- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
-- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
-- subge PF_X, PF_X, ORIG_W
-- subges PF_CTL, PF_CTL, #0x10
-+ PF cmp PF_X, ORIG_W
-+ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
-+ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
-+ PF subge PF_X, PF_X, ORIG_W
-+ PF subges PF_CTL, PF_CTL, #0x10
- vqadd.u8 q14, q0, q2
-- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
-- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
- vqadd.u8 q15, q1, q3
- .endm
-
-@@ -418,32 +418,32 @@ generate_composite_function \
- .macro pixman_composite_over_8888_8888_process_pixblock_tail_head
- vld4.8 {d4, d5, d6, d7}, [DST_R, :128]!
- vrshr.u16 q14, q8, #8
-- add PF_X, PF_X, #8
-- tst PF_CTL, #0xF
-+ PF add PF_X, PF_X, #8
-+ PF tst PF_CTL, #0xF
- vrshr.u16 q15, q9, #8
- vrshr.u16 q12, q10, #8
- vrshr.u16 q13, q11, #8
-- addne PF_X, PF_X, #8
-- subne PF_CTL, PF_CTL, #1
-+ PF addne PF_X, PF_X, #8
-+ PF subne PF_CTL, PF_CTL, #1
- vraddhn.u16 d28, q14, q8
- vraddhn.u16 d29, q15, q9
-- cmp PF_X, ORIG_W
-+ PF cmp PF_X, ORIG_W
- vraddhn.u16 d30, q12, q10
- vraddhn.u16 d31, q13, q11
- vqadd.u8 q14, q0, q14
- vqadd.u8 q15, q1, q15
- vld4.8 {d0, d1, d2, d3}, [SRC]!
-- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
-+ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
- vmvn.8 d22, d3
-- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
-+ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
- vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
-- subge PF_X, PF_X, ORIG_W
-+ PF subge PF_X, PF_X, ORIG_W
- vmull.u8 q8, d22, d4
-- subges PF_CTL, PF_CTL, #0x10
-+ PF subges PF_CTL, PF_CTL, #0x10
- vmull.u8 q9, d22, d5
-- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
- vmull.u8 q10, d22, d6
-- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
- vmull.u8 q11, d22, d7
- .endm
-
-diff --git a/pixman/pixman-arm-neon-asm.h b/pixman/pixman-arm-neon-asm.h
-index d276ab9..a2941ae 100644
---- a/pixman/pixman-arm-neon-asm.h
-+++ b/pixman/pixman-arm-neon-asm.h
-@@ -58,6 +58,11 @@
- #define RESPECT_STRICT_ALIGNMENT 1
-
- /*
-+ * If set to nonzero value, prefetch is globally disabled
-+ */
-+#define PREFETCH_GLOBALLY_DISABLED 0
-+
-+/*
- * Definitions of supplementary pixld/pixst macros (for partial load/store of
- * pixel data)
- */
-@@ -218,37 +223,43 @@
- * pixels processing like simple copy. Anyway, having prefetch is a must
- * when working with graphics data.
- */
-+.macro PF a, x:vararg
-+.if (ADVANCED_PREFETCH_ENABLED != 0) && (PREFETCH_GLOBALLY_DISABLED == 0)
-+ a x
-+.endif
-+.endm
-+
- .macro cache_preload std_increment, boost_increment
- .if (src_bpp_shift >= 0) || (dst_r_bpp != 0) || (mask_bpp_shift >= 0)
- .if regs_shortage
-- ldr ORIG_W, [sp] /* If we are short on regs, ORIG_W is kept on stack */
-+ PF ldr ORIG_W, [sp] /* If we are short on regs, ORIG_W is kept on stack */
- .endif
- .if std_increment != 0
-- add PF_X, PF_X, #std_increment
-+ PF add PF_X, PF_X, #std_increment
- .endif
-- tst PF_CTL, #0xF
-- addne PF_X, PF_X, #boost_increment
-- subne PF_CTL, PF_CTL, #1
-- cmp PF_X, ORIG_W
-+ PF tst PF_CTL, #0xF
-+ PF addne PF_X, PF_X, #boost_increment
-+ PF subne PF_CTL, PF_CTL, #1
-+ PF cmp PF_X, ORIG_W
- .if src_bpp_shift >= 0
-- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
-+ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
- .endif
- .if dst_r_bpp != 0
-- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
-+ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
- .endif
- .if mask_bpp_shift >= 0
-- pld [PF_MASK, PF_X, lsl #mask_bpp_shift]
-+ PF pld, [PF_MASK, PF_X, lsl #mask_bpp_shift]
- .endif
-- subge PF_X, PF_X, ORIG_W
-- subges PF_CTL, PF_CTL, #0x10
-+ PF subge PF_X, PF_X, ORIG_W
-+ PF subges PF_CTL, PF_CTL, #0x10
- .if src_bpp_shift >= 0
-- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
- .endif
- .if dst_r_bpp != 0
-- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
- .endif
- .if mask_bpp_shift >= 0
-- ldrgeb DUMMY, [PF_MASK, MASK_STRIDE, lsl #mask_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_MASK, MASK_STRIDE, lsl #mask_bpp_shift]!
- .endif
- .endif
- .endm
-@@ -297,6 +308,12 @@ fname:
- PF_DST .req r12
- PF_MASK .req r14
-
-+.if prefetch_distance == 0
-+ .set ADVANCED_PREFETCH_ENABLED, 0
-+.else
-+ .set ADVANCED_PREFETCH_ENABLED, 1
-+.endif
-+
- .if mask_bpp == 0
- ORIG_W .req r7 /* saved original width */
- DUMMY .req r8 /* temporary register */
-@@ -374,12 +391,12 @@ fname:
- ldr MASK_STRIDE, [sp, #52]
- .endif
- mov DST_R, DST_W
-- mov PF_SRC, SRC
-- mov PF_DST, DST_R
-- mov PF_MASK, MASK
-- mov PF_CTL, H, lsl #4
-- /* pf_ctl = 10 | ((h - 1) << 4) */
-- add PF_CTL, #(prefetch_distance - 0x10)
-+ PF mov PF_SRC, SRC
-+ PF mov PF_DST, DST_R
-+ PF mov PF_MASK, MASK
-+ /* PF_CTL = prefetch_distance | ((h - 1) << 4) */
-+ PF mov PF_CTL, H, lsl #4
-+ PF add PF_CTL, #(prefetch_distance - 0x10)
-
- init
- .if regs_shortage
-@@ -412,7 +429,7 @@ fname:
- .else
- add DST_R, DST_R, #lowbit
- .endif
-- add PF_X, PF_X, #(lowbit * 8 / dst_w_bpp)
-+ PF add PF_X, PF_X, #(lowbit * 8 / dst_w_bpp)
- sub W, W, #(lowbit * 8 / dst_w_bpp)
- 1:
- .endif
-@@ -444,7 +461,7 @@ fname:
- (src_basereg - pixblock_size * src_bpp / 64), SRC
- pixld pixblock_size, mask_bpp, \
- (mask_basereg - pixblock_size * mask_bpp / 64), MASK
-- add PF_X, PF_X, #pixblock_size
-+ PF add PF_X, PF_X, #pixblock_size
- process_pixblock_head
- cache_preload 0, pixblock_size
- subs W, W, #(pixblock_size * 2)
-@@ -468,7 +485,7 @@ fname:
- pixld chunk_size, src_bpp, src_basereg, SRC
- pixld chunk_size, mask_bpp, mask_basereg, MASK
- pixld_a chunk_size, dst_r_bpp, dst_r_basereg, DST_R
-- add PF_X, PF_X, #chunk_size
-+ PF add PF_X, PF_X, #chunk_size
- 1:
- .endif
- .endr
---
-cgit v0.8.2
diff --git a/recipes/xorg-lib/pixman/remove-broken.patch b/recipes/xorg-lib/pixman/remove-broken.patch
deleted file mode 100644
index fd025b4..0000000
--- a/recipes/xorg-lib/pixman/remove-broken.patch
+++ /dev/null
@@ -1,826 +0,0 @@
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Sun, 26 Jul 2009 22:21:26 +0000 (+0300)
-Subject: ARM: Removal of unused/broken NEON code
-X-Git-Url: http://siarhei.siamashka.name/gitweb/?p=pixman.git;a=commitdiff_plain;h=7ef2322eefcccc28a2d45c0da22c0fee88b8f464
-
-ARM: Removal of unused/broken NEON code
----
-
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 4125d1b..9404c70 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -1895,710 +1895,6 @@ pixman_fill_neon (uint32_t *bits,
- #endif
- }
-
--/* TODO: is there a more generic way of doing this being introduced? */
--#define NEON_SCANLINE_BUFFER_PIXELS (1024)
--
--static inline void
--neon_quadword_copy (void * dst,
-- void * src,
-- uint32_t count, /* of quadwords */
-- uint32_t trailer_count /* of bytes */)
--{
-- uint8_t *t_dst = dst, *t_src = src;
--
-- /* Uses aligned multi-register loads to maximise read bandwidth
-- * on uncached memory such as framebuffers
-- * The accesses do not have the aligned qualifiers, so that the copy
-- * may convert between aligned-uncached and unaligned-cached memory.
-- * It is assumed that the CPU can infer alignedness from the address.
-- */
--
--#ifdef USE_GCC_INLINE_ASM
--
-- asm volatile (
-- " cmp %[count], #8 \n"
-- " blt 1f @ skip oversized fragments \n"
-- "0: @ start with eight quadwords at a time \n"
-- " sub %[count], %[count], #8 \n"
-- " vld1.8 {d16, d17, d18, d19}, [%[src]]! \n"
-- " vld1.8 {d20, d21, d22, d23}, [%[src]]! \n"
-- " vld1.8 {d24, d25, d26, d27}, [%[src]]! \n"
-- " vld1.8 {d28, d29, d30, d31}, [%[src]]! \n"
-- " cmp %[count], #8 \n"
-- " vst1.8 {d16, d17, d18, d19}, [%[dst]]! \n"
-- " vst1.8 {d20, d21, d22, d23}, [%[dst]]! \n"
-- " vst1.8 {d24, d25, d26, d27}, [%[dst]]! \n"
-- " vst1.8 {d28, d29, d30, d31}, [%[dst]]! \n"
-- " bge 0b \n"
-- "1: @ four quadwords \n"
-- " tst %[count], #4 \n"
-- " beq 2f @ skip oversized fragment \n"
-- " vld1.8 {d16, d17, d18, d19}, [%[src]]! \n"
-- " vld1.8 {d20, d21, d22, d23}, [%[src]]! \n"
-- " vst1.8 {d16, d17, d18, d19}, [%[dst]]! \n"
-- " vst1.8 {d20, d21, d22, d23}, [%[dst]]! \n"
-- "2: @ two quadwords \n"
-- " tst %[count], #2 \n"
-- " beq 3f @ skip oversized fragment \n"
-- " vld1.8 {d16, d17, d18, d19}, [%[src]]! \n"
-- " vst1.8 {d16, d17, d18, d19}, [%[dst]]! \n"
-- "3: @ one quadword \n"
-- " tst %[count], #1 \n"
-- " beq 4f @ skip oversized fragment \n"
-- " vld1.8 {d16, d17}, [%[src]]! \n"
-- " vst1.8 {d16, d17}, [%[dst]]! \n"
-- "4: @ end \n"
--
-- /* Clobbered input registers marked as input/outputs */
-- : [dst] "+r" (t_dst), [src] "+r" (t_src), [count] "+r" (count)
--
-- /* No unclobbered inputs */
-- :
--
-- /* Clobbered vector registers */
-- : "d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23", "d24", "d25",
-- "d26", "d27", "d28", "d29", "d30", "d31", "cc", "memory");
--
--#else
--
-- while (count >= 8)
-- {
-- uint8x16x4_t t1 = vld4q_u8 (t_src);
-- uint8x16x4_t t2 = vld4q_u8 (t_src + sizeof(uint8x16x4_t));
--
-- t_src += sizeof(uint8x16x4_t) * 2;
-- vst4q_u8 (t_dst, t1);
-- vst4q_u8 (t_dst + sizeof(uint8x16x4_t), t2);
-- t_dst += sizeof(uint8x16x4_t) * 2;
-- count -= 8;
-- }
--
-- if (count & 4)
-- {
-- uint8x16x4_t t1 = vld4q_u8 (t_src);
--
-- t_src += sizeof(uint8x16x4_t);
-- vst4q_u8 (t_dst, t1);
-- t_dst += sizeof(uint8x16x4_t);
-- }
--
-- if (count & 2)
-- {
-- uint8x8x4_t t1 = vld4_u8 (t_src);
--
-- t_src += sizeof(uint8x8x4_t);
-- vst4_u8 (t_dst, t1);
-- t_dst += sizeof(uint8x8x4_t);
-- }
--
-- if (count & 1)
-- {
-- uint8x16_t t1 = vld1q_u8 (t_src);
--
-- t_src += sizeof(uint8x16_t);
-- vst1q_u8 (t_dst, t1);
-- t_dst += sizeof(uint8x16_t);
-- }
--
--#endif /* !USE_GCC_INLINE_ASM */
--
-- if (trailer_count)
-- {
-- if (trailer_count & 8)
-- {
-- uint8x8_t t1 = vld1_u8 (t_src);
--
-- t_src += sizeof(uint8x8_t);
-- vst1_u8 (t_dst, t1);
-- t_dst += sizeof(uint8x8_t);
-- }
--
-- if (trailer_count & 4)
-- {
-- *((uint32_t*) t_dst) = *((uint32_t*) t_src);
--
-- t_dst += 4;
-- t_src += 4;
-- }
--
-- if (trailer_count & 2)
-- {
-- *((uint16_t*) t_dst) = *((uint16_t*) t_src);
--
-- t_dst += 2;
-- t_src += 2;
-- }
--
-- if (trailer_count & 1)
-- {
-- *t_dst++ = *t_src++;
-- }
-- }
--}
--
--static inline void
--solid_over_565_8_pix_neon (uint32_t glyph_colour,
-- uint16_t *dest,
-- uint8_t * in_mask,
-- uint32_t dest_stride, /* bytes, not elements */
-- uint32_t mask_stride,
-- uint32_t count /* 8-pixel groups */)
--{
-- /* Inner loop of glyph blitter (solid colour, alpha mask) */
--
--#ifdef USE_GCC_INLINE_ASM
--
-- asm volatile (
-- " vld4.8 {d20[], d21[], d22[], d23[]}, [%[glyph_colour]] @ splat solid colour components \n"
-- "0: @ loop \n"
-- " vld1.16 {d0, d1}, [%[dest]] @ load first pixels from framebuffer \n"
-- " vld1.8 {d17}, [%[in_mask]] @ load alpha mask of glyph \n"
-- " vmull.u8 q9, d17, d23 @ apply glyph colour alpha to mask \n"
-- " vshrn.u16 d17, q9, #8 @ reformat it to match original mask \n"
-- " vmvn d18, d17 @ we need the inverse mask for the background \n"
-- " vsli.u16 q3, q0, #5 @ duplicate framebuffer blue bits \n"
-- " vshrn.u16 d2, q0, #8 @ unpack red from framebuffer pixels \n"
-- " vshrn.u16 d4, q0, #3 @ unpack green \n"
-- " vsri.u8 d2, d2, #5 @ duplicate red bits (extend 5 to 8) \n"
-- " vshrn.u16 d6, q3, #2 @ unpack extended blue (truncate 10 to 8) \n"
-- " vsri.u8 d4, d4, #6 @ duplicate green bits (extend 6 to 8) \n"
-- " vmull.u8 q1, d2, d18 @ apply inverse mask to background red... \n"
-- " vmull.u8 q2, d4, d18 @ ...green... \n"
-- " vmull.u8 q3, d6, d18 @ ...blue \n"
-- " subs %[count], %[count], #1 @ decrement/test loop counter \n"
-- " vmlal.u8 q1, d17, d22 @ add masked foreground red... \n"
-- " vmlal.u8 q2, d17, d21 @ ...green... \n"
-- " vmlal.u8 q3, d17, d20 @ ...blue \n"
-- " add %[in_mask], %[in_mask], %[mask_stride] @ advance mask pointer, while we wait \n"
-- " vsri.16 q1, q2, #5 @ pack green behind red \n"
-- " vsri.16 q1, q3, #11 @ pack blue into pixels \n"
-- " vst1.16 {d2, d3}, [%[dest]] @ store composited pixels \n"
-- " add %[dest], %[dest], %[dest_stride] @ advance framebuffer pointer \n"
-- " bne 0b @ next please \n"
--
-- /* Clobbered registers marked as input/outputs */
-- : [dest] "+r" (dest), [in_mask] "+r" (in_mask), [count] "+r" (count)
--
-- /* Inputs */
-- : [dest_stride] "r" (dest_stride), [mask_stride] "r" (mask_stride), [glyph_colour] "r" (&glyph_colour)
--
-- /* Clobbers, including the inputs we modify, and potentially lots of memory */
-- : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d17", "d18", "d19",
-- "d20", "d21", "d22", "d23", "d24", "d25", "cc", "memory"
-- );
--
--#else
--
-- uint8x8x4_t solid_colour = vld4_dup_u8 ((uint8_t*) &glyph_colour);
--
-- while (count--)
-- {
-- uint16x8_t pixels = vld1q_u16 (dest);
-- uint8x8_t mask = vshrn_n_u16 (vmull_u8 (solid_colour.val[3], vld1_u8 (in_mask)), 8);
-- uint8x8_t mask_image = vmvn_u8 (mask);
--
-- uint8x8_t t_red = vshrn_n_u16 (pixels, 8);
-- uint8x8_t t_green = vshrn_n_u16 (pixels, 3);
-- uint8x8_t t_blue = vshrn_n_u16 (vsli_n_u8 (pixels, pixels, 5), 2);
--
-- uint16x8_t s_red = vmull_u8 (vsri_n_u8 (t_red, t_red, 5), mask_image);
-- uint16x8_t s_green = vmull_u8 (vsri_n_u8 (t_green, t_green, 6), mask_image);
-- uint16x8_t s_blue = vmull_u8 (t_blue, mask_image);
--
-- s_red = vmlal (s_red, mask, solid_colour.val[2]);
-- s_green = vmlal (s_green, mask, solid_colour.val[1]);
-- s_blue = vmlal (s_blue, mask, solid_colour.val[0]);
--
-- pixels = vsri_n_u16 (s_red, s_green, 5);
-- pixels = vsri_n_u16 (pixels, s_blue, 11);
-- vst1q_u16 (dest, pixels);
--
-- dest += dest_stride;
-- mask += mask_stride;
-- }
--
--#endif
--}
--
--#if 0 /* this is broken currently */
--static void
--neon_composite_over_n_8_0565 (pixman_implementation_t * impl,
-- pixman_op_t op,
-- pixman_image_t * src_image,
-- pixman_image_t * mask_image,
-- pixman_image_t * dst_image,
-- int32_t src_x,
-- int32_t src_y,
-- int32_t mask_x,
-- int32_t mask_y,
-- int32_t dest_x,
-- int32_t dest_y,
-- int32_t width,
-- int32_t height)
--{
-- uint32_t src, srca;
-- uint16_t *dst_line, *aligned_line;
-- uint8_t *mask_line;
-- uint32_t dst_stride, mask_stride;
-- uint32_t kernel_count, copy_count, copy_tail;
-- uint8_t kernel_offset, copy_offset;
--
-- src = _pixman_image_get_solid (src_image, dst_image->bits.format);
--
-- /* bail out if fully transparent or degenerate */
-- srca = src >> 24;
-- if (src == 0)
-- return;
--
-- if (width == 0 || height == 0)
-- return;
--
-- if (width > NEON_SCANLINE_BUFFER_PIXELS)
-- {
-- /* split the blit, so we can use a fixed-size scanline buffer
-- * TODO: there must be a more elegant way of doing this.
-- */
-- int x;
-- for (x = 0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS)
-- {
-- neon_composite_over_n_8_0565 (
-- impl, op,
-- src_image, mask_image, dst_image,
-- src_x + x, src_y, mask_x + x, mask_y, dest_x + x, dest_y,
-- (x + NEON_SCANLINE_BUFFER_PIXELS > width) ? width - x : NEON_SCANLINE_BUFFER_PIXELS, height);
-- }
--
-- return;
-- }
--
-- PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
-- PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
--
-- /* keep within minimum number of aligned quadwords on width
-- * while also keeping the minimum number of columns to process
-- */
-- {
-- unsigned long aligned_left = (unsigned long)(dst_line) & ~0xF;
-- unsigned long aligned_right = (((unsigned long)(dst_line + width)) + 0xF) & ~0xF;
-- unsigned long ceiling_length = (((unsigned long) width) * sizeof(*dst_line) + 0xF) & ~0xF;
--
-- /* the fast copy should be quadword aligned */
-- copy_offset = dst_line - ((uint16_t*) aligned_left);
-- aligned_line = dst_line - copy_offset;
-- copy_count = (uint32_t) ((aligned_right - aligned_left) >> 4);
-- copy_tail = 0;
--
-- if (aligned_right - aligned_left > ceiling_length)
-- {
-- /* unaligned routine is tightest */
-- kernel_count = (uint32_t) (ceiling_length >> 4);
-- kernel_offset = copy_offset;
-- }
-- else
-- {
-- /* aligned routine is equally tight, so it is safer to align */
-- kernel_count = copy_count;
-- kernel_offset = 0;
-- }
--
-- /* We should avoid reading beyond scanline ends for safety */
-- if (aligned_line < (dst_line - dest_x) ||
-- (aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
-- {
-- /* switch to precise read */
-- copy_offset = kernel_offset = 0;
-- aligned_line = dst_line;
-- kernel_count = (uint32_t) (ceiling_length >> 4);
-- copy_count = (width * sizeof(*dst_line)) >> 4;
-- copy_tail = (width * sizeof(*dst_line)) & 0xF;
-- }
-- }
--
-- {
-- uint16_t scan_line[NEON_SCANLINE_BUFFER_PIXELS + 8]; /* deliberately not initialised */
-- uint8_t glyph_line[NEON_SCANLINE_BUFFER_PIXELS + 8];
-- int y = height;
--
-- /* row-major order */
-- /* left edge, middle block, right edge */
-- for ( ; y--; mask_line += mask_stride, aligned_line += dst_stride, dst_line += dst_stride)
-- {
-- /* We don't want to overrun the edges of the glyph,
-- * so realign the edge data into known buffers
-- */
-- neon_quadword_copy (glyph_line + copy_offset, mask_line, width >> 4, width & 0xF);
--
-- /* Uncached framebuffer access is really, really slow
-- * if we do it piecemeal. It should be much faster if we
-- * grab it all at once. One scanline should easily fit in
-- * L1 cache, so this should not waste RAM bandwidth.
-- */
-- neon_quadword_copy (scan_line, aligned_line, copy_count, copy_tail);
--
-- /* Apply the actual filter */
-- solid_over_565_8_pix_neon (
-- src, scan_line + kernel_offset,
-- glyph_line + kernel_offset, 8 * sizeof(*dst_line),
-- 8, kernel_count);
--
-- /* Copy the modified scanline back */
-- neon_quadword_copy (dst_line, scan_line + copy_offset,
-- width >> 3, (width & 7) * 2);
-- }
-- }
--}
--#endif
--
--#ifdef USE_GCC_INLINE_ASM
--
--static inline void
--plain_over_565_8_pix_neon (uint32_t colour,
-- uint16_t *dest,
-- uint32_t dest_stride, /* bytes, not elements */
-- uint32_t count /* 8-pixel groups */)
--{
-- /* Inner loop for plain translucent rects
-- * (solid colour without alpha mask)
-- */
-- asm volatile (
-- " vld4.8 {d20[], d21[], d22[], d23[]}, [%[colour]] @ solid colour load/splat \n"
-- " vmull.u8 q12, d23, d22 @ premultiply alpha red \n"
-- " vmull.u8 q13, d23, d21 @ premultiply alpha green \n"
-- " vmull.u8 q14, d23, d20 @ premultiply alpha blue \n"
-- " vmvn d18, d23 @ inverse alpha for background \n"
-- "0: @ loop\n"
-- " vld1.16 {d0, d1}, [%[dest]] @ load first pixels from framebuffer \n"
-- " vshrn.u16 d2, q0, #8 @ unpack red from framebuffer pixels \n"
-- " vshrn.u16 d4, q0, #3 @ unpack green \n"
-- " vsli.u16 q3, q0, #5 @ duplicate framebuffer blue bits \n"
-- " vsri.u8 d2, d2, #5 @ duplicate red bits (extend 5 to 8) \n"
-- " vsri.u8 d4, d4, #6 @ duplicate green bits (extend 6 to 8) \n"
-- " vshrn.u16 d6, q3, #2 @ unpack extended blue (truncate 10 to 8) \n"
-- " vmov q0, q12 @ retrieve foreground red \n"
-- " vmlal.u8 q0, d2, d18 @ blend red - my kingdom for a four-operand MLA \n"
-- " vmov q1, q13 @ retrieve foreground green \n"
-- " vmlal.u8 q1, d4, d18 @ blend green \n"
-- " vmov q2, q14 @ retrieve foreground blue \n"
-- " vmlal.u8 q2, d6, d18 @ blend blue \n"
-- " subs %[count], %[count], #1 @ decrement/test loop counter \n"
-- " vsri.16 q0, q1, #5 @ pack green behind red \n"
-- " vsri.16 q0, q2, #11 @ pack blue into pixels \n"
-- " vst1.16 {d0, d1}, [%[dest]] @ store composited pixels \n"
-- " add %[dest], %[dest], %[dest_stride] @ advance framebuffer pointer \n"
-- " bne 0b @ next please \n"
--
-- /* Clobbered registers marked as input/outputs */
-- : [dest] "+r" (dest), [count] "+r" (count)
--
-- /* Inputs */
-- : [dest_stride] "r" (dest_stride), [colour] "r" (&colour)
--
-- /* Clobbers, including the inputs we modify, and
-- * potentially lots of memory
-- */
-- : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d18", "d19",
-- "d20", "d21", "d22", "d23", "d24", "d25", "d26", "d27", "d28", "d29",
-- "cc", "memory"
-- );
--}
--
--static void
--neon_composite_over_n_0565 (pixman_implementation_t * impl,
-- pixman_op_t op,
-- pixman_image_t * src_image,
-- pixman_image_t * mask_image,
-- pixman_image_t * dst_image,
-- int32_t src_x,
-- int32_t src_y,
-- int32_t mask_x,
-- int32_t mask_y,
-- int32_t dest_x,
-- int32_t dest_y,
-- int32_t width,
-- int32_t height)
--{
-- uint32_t src, srca;
-- uint16_t *dst_line, *aligned_line;
-- uint32_t dst_stride;
-- uint32_t kernel_count, copy_count, copy_tail;
-- uint8_t kernel_offset, copy_offset;
--
-- src = _pixman_image_get_solid (src_image, dst_image->bits.format);
--
-- /* bail out if fully transparent */
-- srca = src >> 24;
-- if (src == 0)
-- return;
--
-- if (width == 0 || height == 0)
-- return;
--
-- if (width > NEON_SCANLINE_BUFFER_PIXELS)
-- {
-- /* split the blit, so we can use a fixed-size scanline buffer *
-- * TODO: there must be a more elegant way of doing this.
-- */
-- int x;
--
-- for (x = 0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS)
-- {
-- neon_composite_over_n_0565 (
-- impl, op,
-- src_image, mask_image, dst_image,
-- src_x + x, src_y, mask_x + x, mask_y, dest_x + x, dest_y,
-- (x + NEON_SCANLINE_BUFFER_PIXELS > width) ? width - x : NEON_SCANLINE_BUFFER_PIXELS, height);
-- }
-- return;
-- }
--
-- PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
--
-- /* keep within minimum number of aligned quadwords on width
-- * while also keeping the minimum number of columns to process
-- */
-- {
-- unsigned long aligned_left = (unsigned long)(dst_line) & ~0xF;
-- unsigned long aligned_right = (((unsigned long)(dst_line + width)) + 0xF) & ~0xF;
-- unsigned long ceiling_length = (((unsigned long) width) * sizeof(*dst_line) + 0xF) & ~0xF;
--
-- /* the fast copy should be quadword aligned */
-- copy_offset = dst_line - ((uint16_t*) aligned_left);
-- aligned_line = dst_line - copy_offset;
-- copy_count = (uint32_t) ((aligned_right - aligned_left) >> 4);
-- copy_tail = 0;
--
-- if (aligned_right - aligned_left > ceiling_length)
-- {
-- /* unaligned routine is tightest */
-- kernel_count = (uint32_t) (ceiling_length >> 4);
-- kernel_offset = copy_offset;
-- }
-- else
-- {
-- /* aligned routine is equally tight, so it is safer to align */
-- kernel_count = copy_count;
-- kernel_offset = 0;
-- }
--
-- /* We should avoid reading beyond scanline ends for safety */
-- if (aligned_line < (dst_line - dest_x) ||
-- (aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
-- {
-- /* switch to precise read */
-- copy_offset = kernel_offset = 0;
-- aligned_line = dst_line;
-- kernel_count = (uint32_t) (ceiling_length >> 4);
-- copy_count = (width * sizeof(*dst_line)) >> 4;
-- copy_tail = (width * sizeof(*dst_line)) & 0xF;
-- }
-- }
--
-- {
-- uint16_t scan_line[NEON_SCANLINE_BUFFER_PIXELS + 8]; /* deliberately not initialised */
--
-- /* row-major order */
-- /* left edge, middle block, right edge */
-- for ( ; height--; aligned_line += dst_stride, dst_line += dst_stride)
-- {
-- /* Uncached framebuffer access is really, really slow if we do it piecemeal.
-- * It should be much faster if we grab it all at once.
-- * One scanline should easily fit in L1 cache, so this should
-- * not waste RAM bandwidth.
-- */
-- neon_quadword_copy (scan_line, aligned_line, copy_count, copy_tail);
--
-- /* Apply the actual filter */
-- plain_over_565_8_pix_neon (
-- src, scan_line + kernel_offset, 8 * sizeof(*dst_line), kernel_count);
--
-- /* Copy the modified scanline back */
-- neon_quadword_copy (
-- dst_line, scan_line + copy_offset, width >> 3, (width & 7) * 2);
-- }
-- }
--}
--
--static inline void
--ARGB8_over_565_8_pix_neon (uint32_t *src,
-- uint16_t *dest,
-- uint32_t src_stride, /* bytes, not elements */
-- uint32_t count /* 8-pixel groups */)
--{
-- asm volatile (
-- "0: @ loop\n"
-- " pld [%[src], %[src_stride]] @ preload from next scanline \n"
-- " vld1.16 {d0, d1}, [%[dest]] @ load pixels from framebuffer \n"
-- " vld4.8 {d20, d21, d22, d23},[%[src]]! @ load source image pixels \n"
-- " vsli.u16 q3, q0, #5 @ duplicate framebuffer blue bits \n"
-- " vshrn.u16 d2, q0, #8 @ unpack red from framebuffer pixels \n"
-- " vshrn.u16 d4, q0, #3 @ unpack green \n"
-- " vmvn d18, d23 @ we need the inverse alpha for the background \n"
-- " vsri.u8 d2, d2, #5 @ duplicate red bits (extend 5 to 8) \n"
-- " vshrn.u16 d6, q3, #2 @ unpack extended blue (truncate 10 to 8) \n"
-- " vsri.u8 d4, d4, #6 @ duplicate green bits (extend 6 to 8) \n"
-- " vmull.u8 q1, d2, d18 @ apply inverse alpha to background red... \n"
-- " vmull.u8 q2, d4, d18 @ ...green... \n"
-- " vmull.u8 q3, d6, d18 @ ...blue \n"
-- " subs %[count], %[count], #1 @ decrement/test loop counter \n"
-- " vmlal.u8 q1, d23, d22 @ add blended foreground red... \n"
-- " vmlal.u8 q2, d23, d21 @ ...green... \n"
-- " vmlal.u8 q3, d23, d20 @ ...blue \n"
-- " vsri.16 q1, q2, #5 @ pack green behind red \n"
-- " vsri.16 q1, q3, #11 @ pack blue into pixels \n"
-- " vst1.16 {d2, d3}, [%[dest]]! @ store composited pixels \n"
-- " bne 0b @ next please \n"
--
-- /* Clobbered registers marked as input/outputs */
-- : [dest] "+r" (dest), [src] "+r" (src), [count] "+r" (count)
--
-- /* Inputs */
-- : [src_stride] "r" (src_stride)
--
-- /* Clobbers, including the inputs we modify, and potentially lots of memory */
-- : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d17", "d18", "d20",
-- "d21", "d22", "d23", "cc", "memory"
-- );
--}
--
--static void
--neon_composite_over_8888_0565 (pixman_implementation_t * impl,
-- pixman_op_t op,
-- pixman_image_t * src_image,
-- pixman_image_t * mask_image,
-- pixman_image_t * dst_image,
-- int32_t src_x,
-- int32_t src_y,
-- int32_t mask_x,
-- int32_t mask_y,
-- int32_t dest_x,
-- int32_t dest_y,
-- int32_t width,
-- int32_t height)
--{
-- uint32_t *src_line;
-- uint16_t *dst_line, *aligned_line;
-- uint32_t dst_stride, src_stride;
-- uint32_t kernel_count, copy_count, copy_tail;
-- uint8_t kernel_offset, copy_offset;
--
-- /* we assume mask is opaque
-- * so the only alpha to deal with is embedded in src
-- */
-- if (width > NEON_SCANLINE_BUFFER_PIXELS)
-- {
-- /* split the blit, so we can use a fixed-size scanline buffer */
-- int x;
-- for (x = 0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS)
-- {
-- neon_composite_over_8888_0565 (
-- impl, op,
-- src_image, mask_image, dst_image,
-- src_x + x, src_y, mask_x + x, mask_y, dest_x + x, dest_y,
-- (x + NEON_SCANLINE_BUFFER_PIXELS > width) ? width - x : NEON_SCANLINE_BUFFER_PIXELS, height);
-- }
-- return;
-- }
--
-- PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
-- PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
--
-- /* keep within minimum number of aligned quadwords on width
-- * while also keeping the minimum number of columns to process
-- */
-- {
-- unsigned long aligned_left = (unsigned long)(dst_line) & ~0xF;
-- unsigned long aligned_right = (((unsigned long)(dst_line + width)) + 0xF) & ~0xF;
-- unsigned long ceiling_length = (((unsigned long) width) * sizeof(*dst_line) + 0xF) & ~0xF;
--
-- /* the fast copy should be quadword aligned */
-- copy_offset = dst_line - ((uint16_t*) aligned_left);
-- aligned_line = dst_line - copy_offset;
-- copy_count = (uint32_t) ((aligned_right - aligned_left) >> 4);
-- copy_tail = 0;
--
-- if (aligned_right - aligned_left > ceiling_length)
-- {
-- /* unaligned routine is tightest */
-- kernel_count = (uint32_t) (ceiling_length >> 4);
-- kernel_offset = copy_offset;
-- }
-- else
-- {
-- /* aligned routine is equally tight, so it is safer to align */
-- kernel_count = copy_count;
-- kernel_offset = 0;
-- }
--
-- /* We should avoid reading beyond scanline ends for safety */
-- if (aligned_line < (dst_line - dest_x) ||
-- (aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
-- {
-- /* switch to precise read */
-- copy_offset = kernel_offset = 0;
-- aligned_line = dst_line;
-- kernel_count = (uint32_t) (ceiling_length >> 4);
-- copy_count = (width * sizeof(*dst_line)) >> 4;
-- copy_tail = (width * sizeof(*dst_line)) & 0xF;
-- }
-- }
--
-- /* Preload the first input scanline */
-- {
-- uint8_t *src_ptr = (uint8_t*) src_line;
-- uint32_t count = (width + 15) / 16;
--
--#ifdef USE_GCC_INLINE_ASM
-- asm volatile (
-- "0: @ loop \n"
-- " subs %[count], %[count], #1 \n"
-- " pld [%[src]] \n"
-- " add %[src], %[src], #64 \n"
-- " bgt 0b \n"
--
-- /* Clobbered input registers marked as input/outputs */
-- : [src] "+r" (src_ptr), [count] "+r" (count)
-- : /* no unclobbered inputs */
-- : "cc"
-- );
--#else
-- do
-- {
-- __pld (src_ptr);
-- src_ptr += 64;
-- }
-- while (--count);
--#endif
-- }
--
-- {
-- uint16_t scan_line[NEON_SCANLINE_BUFFER_PIXELS + 8]; /* deliberately not initialised */
--
-- /* row-major order */
-- /* left edge, middle block, right edge */
-- for ( ; height--; src_line += src_stride, aligned_line += dst_stride)
-- {
-- /* Uncached framebuffer access is really, really slow if we do
-- * it piecemeal. It should be much faster if we grab it all at
-- * once. One scanline should easily fit in L1 cache, so this
-- * should not waste RAM bandwidth.
-- */
-- neon_quadword_copy (scan_line, aligned_line, copy_count, copy_tail);
--
-- /* Apply the actual filter */
-- ARGB8_over_565_8_pix_neon (
-- src_line, scan_line + kernel_offset,
-- src_stride * sizeof(*src_line), kernel_count);
--
-- /* Copy the modified scanline back */
-- neon_quadword_copy (dst_line,
-- scan_line + copy_offset,
-- width >> 3, (width & 7) * 2);
-- }
-- }
--}
--
--#endif /* USE_GCC_INLINE_ASM */
--
- static const pixman_fast_path_t arm_neon_fast_path_array[] =
- {
- { PIXMAN_OP_ADD, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, neon_composite_add_8888_8_8, 0 },
-@@ -2612,12 +1908,6 @@ static const pixman_fast_path_t arm_neon_fast_path_array[] =
- #ifdef USE_GCC_INLINE_ASM
- { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_src_16_16, 0 },
- { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_src_16_16, 0 },
--#if 0 /* this code has some bugs */
-- { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_over_n_0565, 0 },
-- { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_over_n_0565, 0 },
-- { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_over_8888_0565, 0 },
-- { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_over_8888_0565, 0 },
--#endif
- #endif
- { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, neon_composite_over_8888_8888, 0 },
- { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, neon_composite_over_8888_8888, 0 },
-@@ -2668,79 +1958,6 @@ arm_neon_composite (pixman_implementation_t *imp,
- }
-
- static pixman_bool_t
--pixman_blt_neon (void *src_bits,
-- void *dst_bits,
-- int src_stride,
-- int dst_stride,
-- int src_bpp,
-- int dst_bpp,
-- int src_x,
-- int src_y,
-- int dst_x,
-- int dst_y,
-- int width,
-- int height)
--{
-- if (!width || !height)
-- return TRUE;
--
-- /* accelerate only straight copies involving complete bytes */
-- if (src_bpp != dst_bpp || (src_bpp & 7))
-- return FALSE;
--
-- {
-- uint32_t bytes_per_pixel = src_bpp >> 3;
-- uint32_t byte_width = width * bytes_per_pixel;
-- /* parameter is in words for some reason */
-- int32_t src_stride_bytes = src_stride * 4;
-- int32_t dst_stride_bytes = dst_stride * 4;
-- uint8_t *src_bytes = ((uint8_t*) src_bits) +
-- src_y * src_stride_bytes + src_x * bytes_per_pixel;
-- uint8_t *dst_bytes = ((uint8_t*) dst_bits) +
-- dst_y * dst_stride_bytes + dst_x * bytes_per_pixel;
-- uint32_t quadword_count = byte_width / 16;
-- uint32_t offset = byte_width % 16;
--
-- while (height--)
-- {
-- neon_quadword_copy (dst_bytes, src_bytes, quadword_count, offset);
-- src_bytes += src_stride_bytes;
-- dst_bytes += dst_stride_bytes;
-- }
-- }
--
-- return TRUE;
--}
--
--static pixman_bool_t
--arm_neon_blt (pixman_implementation_t *imp,
-- uint32_t * src_bits,
-- uint32_t * dst_bits,
-- int src_stride,
-- int dst_stride,
-- int src_bpp,
-- int dst_bpp,
-- int src_x,
-- int src_y,
-- int dst_x,
-- int dst_y,
-- int width,
-- int height)
--{
-- if (pixman_blt_neon (
-- src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
-- src_x, src_y, dst_x, dst_y, width, height))
-- {
-- return TRUE;
-- }
--
-- return _pixman_implementation_blt (
-- imp->delegate,
-- src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
-- src_x, src_y, dst_x, dst_y, width, height);
--}
--
--static pixman_bool_t
- arm_neon_fill (pixman_implementation_t *imp,
- uint32_t * bits,
- int stride,
-@@ -2765,9 +1982,6 @@ _pixman_implementation_create_arm_neon (void)
- pixman_implementation_t *imp = _pixman_implementation_create (simd);
-
- imp->composite = arm_neon_composite;
--#if 0 /* this code has some bugs */
-- imp->blt = arm_neon_blt;
--#endif
- imp->fill = arm_neon_fill;
-
- return imp;
diff --git a/recipes/xorg-lib/pixman/src-8888-0565.patch b/recipes/xorg-lib/pixman/src-8888-0565.patch
deleted file mode 100644
index c544225..0000000
--- a/recipes/xorg-lib/pixman/src-8888-0565.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-From 6494f9ae8820078d0e6109bf8f294156f7a5da4c Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Fri, 05 Mar 2010 00:40:34 +0000
-Subject: ARM: added 'armv6_composite_src_8888_0565' fast path
-
-Provides ~3x performance improvement when working with
-data in L1 cache, and ~80% performace improvement when working
-with memory. This fast path is important for 32bpp -> 16bpp
-color format conversion and is commonly used with 16bpp desktop.
-
-Microbenchmark from N800 (ARM11 @ 400MHz), measured in MPix/s:
-
-before:
-
- src_8888_0565 = L1: 21.54 M: 15.62
-
-after (armv4):
-
- src_8888_0565 = L1: 45.26 M: 23.29
-
-after (armv6):
-
- src_8888_0565 = L1: 60.62 M: 28.37
----
-diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
-index c375c01..69243c1 100644
---- a/pixman/pixman-arm-simd.c
-+++ b/pixman/pixman-arm-simd.c
-@@ -604,6 +604,282 @@ armv6_composite_over_n_8_0565 (pixman_implementation_t * impl,
- dst_stride - width, mask_stride - width, height);
- }
-
-+static inline void
-+armv4_composite_src_8888_0565_asm (
-+ uint16_t *dst, uint32_t *src, int w, int dst_stride,
-+ int src_stride, int h)
-+{
-+ uint32_t a, x, y, c1F001F = 0x1F001F, cFFFF = 0xFFFF;
-+ int backup_w = w;
-+ while (h--)
-+ {
-+ w = backup_w;
-+ if (w > 0 && (uintptr_t)dst & 2)
-+ {
-+ x = *src++;
-+
-+ a = (x >> 3) & c1F001F;
-+ x &= 0xFC00;
-+ a |= a >> 5;
-+ a |= x >> 5;
-+
-+ *dst++ = a;
-+ w--;
-+ }
-+
-+ asm volatile(
-+ "subs %[w], %[w], #2\n"
-+ "blt 2f\n"
-+ "1:\n"
-+ "ldr %[x], [%[src]], #4\n"
-+ "ldr %[y], [%[src]], #4\n"
-+ "subs %[w], %[w], #2\n"
-+
-+ "and %[a], %[c1F001F], %[x], lsr #3\n"
-+ "and %[x], %[x], #0xFC00\n\n"
-+ "orr %[a], %[a], %[a], lsr #5\n"
-+ "orr %[x], %[a], %[x], lsr #5\n"
-+
-+ "and %[a], %[c1F001F], %[y], lsr #3\n"
-+ "and %[y], %[y], #0xFC00\n\n"
-+ "orr %[a], %[a], %[a], lsr #5\n"
-+ "orr %[y], %[a], %[y], lsr #5\n"
-+ /*
-+ * Writing single 32-bit value is much faster than two
-+ * separate 16-bit values for older CPUs without (efficient)
-+ * write combining, even though it costs an extra instruction.
-+ */
-+ "and %[x], %[x], %[cFFFF]\n"
-+ "orr %[x], %[x], %[y], lsl #16\n"
-+ "str %[x], [%[dst]], #4\n"
-+ "bge 1b\n"
-+ "2:\n"
-+ : [c1F001F] "+&r" (c1F001F), [cFFFF] "+&r" (cFFFF),
-+ [src] "+&r" (src), [dst] "+&r" (dst), [a] "=&r" (a),
-+ [x] "=&r" (x), [y] "=&r" (y), [w] "+&r" (w)
-+ );
-+
-+ if (w & 1)
-+ {
-+ x = *src++;
-+
-+ a = (x >> 3) & c1F001F;
-+ x = x & 0xFC00;
-+ a |= a >> 5;
-+ a |= x >> 5;
-+
-+ *dst++ = a;
-+ }
-+
-+ src += src_stride - backup_w;
-+ dst += dst_stride - backup_w;
-+ }
-+}
-+
-+/*
-+ * Conversion x8r8g8b8 -> r5g6b5
-+ *
-+ * Note: 'w' must be >= 7 here
-+ */
-+static void __attribute__((naked))
-+armv6_composite_src_8888_0565_asm (
-+ uint16_t *dst, uint32_t *src, int w, int dst_stride,
-+ int src_stride, int h)
-+{
-+ asm volatile(
-+ /* define supplementary macros */
-+ ".macro cvt8888to565 PIX\n"
-+ "and A, C1F001F, \\PIX, lsr #3\n"
-+ "and \\PIX, \\PIX, #0xFC00\n\n"
-+ "orr A, A, A, lsr #5\n"
-+ "orr \\PIX, A, \\PIX, lsr #5\n"
-+ ".endm\n"
-+
-+ ".macro combine_pixels_pair PIX1, PIX2\n"
-+ /* Note: assume little endian byte order */
-+ "pkhbt \\PIX1, \\PIX1, \\PIX2, lsl #16\n"
-+ ".endm\n"
-+
-+ /* function entry, save all registers (10 words) to stack */
-+ "stmdb sp!, {r4-r11, ip, lr}\n"
-+
-+ /* define some aliases */
-+ "DST .req r0\n"
-+ "SRC .req r1\n"
-+ "W .req r2\n"
-+ "H .req r3\n"
-+
-+ "TMP1 .req r4\n"
-+ "TMP2 .req r5\n"
-+ "TMP3 .req r6\n"
-+ "TMP4 .req r7\n"
-+ "TMP5 .req r8\n"
-+ "TMP6 .req r9\n"
-+ "TMP7 .req r10\n"
-+ "TMP8 .req r11\n"
-+
-+ "C1F001F .req ip\n"
-+ "A .req lr\n"
-+
-+ "ldr TMP1, [sp, #(10*4+0)]\n" /* load src_stride */
-+ "ldr C1F001F, =0x1F001F\n"
-+ "sub r3, r3, W\n"
-+ "str r3, [sp, #(10*4+0)]\n" /* store (dst_stride-w) */
-+ "ldr r3, [sp, #(10*4+4)]\n" /* load h */
-+ "sub TMP1, TMP1, W\n"
-+ "str TMP1, [sp, #(10*4+4)]\n" /* store (src_stride-w) */
-+
-+ "str W, [sp, #(8*4)]\n" /* saved ip = W */
-+
-+ "0:\n"
-+ "subs H, H, #1\n"
-+ "blt 6f\n"
-+ "1:\n"
-+ /* align DST at 4 byte boundary */
-+ "tst DST, #2\n"
-+ "beq 2f\n"
-+ "ldr TMP1, [SRC], #4\n"
-+ "sub W, W, #1\n"
-+ "cvt8888to565 TMP1\n"
-+ "strh TMP1, [DST], #2\n"
-+ "2:"
-+ /* align DST at 8 byte boundary */
-+ "tst DST, #4\n"
-+ "beq 2f\n"
-+ "ldmia SRC!, {TMP1, TMP2}\n"
-+ "sub W, W, #2\n"
-+ "cvt8888to565 TMP1\n"
-+ "cvt8888to565 TMP2\n"
-+ "combine_pixels_pair TMP1, TMP2\n"
-+ "str TMP1, [DST], #4\n"
-+ "2:"
-+ /* align DST at 16 byte boundary */
-+ "tst DST, #8\n"
-+ "beq 2f\n"
-+ "ldmia SRC!, {TMP1, TMP2, TMP3, TMP4}\n"
-+ "sub W, W, #4\n"
-+ "cvt8888to565 TMP1\n"
-+ "cvt8888to565 TMP2\n"
-+ "cvt8888to565 TMP3\n"
-+ "cvt8888to565 TMP4\n"
-+ "combine_pixels_pair TMP1, TMP2\n"
-+ "combine_pixels_pair TMP3, TMP4\n"
-+ "stmia DST!, {TMP1, TMP3}\n"
-+ "2:"
-+ /* inner loop, process 8 pixels per iteration */
-+ "subs W, W, #8\n"
-+ "blt 4f\n"
-+ "3:\n"
-+ "ldmia SRC!, {TMP1, TMP2, TMP3, TMP4, TMP5, TMP6, TMP7, TMP8}\n"
-+ "subs W, W, #8\n"
-+ "cvt8888to565 TMP1\n"
-+ "cvt8888to565 TMP2\n"
-+ "cvt8888to565 TMP3\n"
-+ "cvt8888to565 TMP4\n"
-+ "cvt8888to565 TMP5\n"
-+ "cvt8888to565 TMP6\n"
-+ "cvt8888to565 TMP7\n"
-+ "cvt8888to565 TMP8\n"
-+ "combine_pixels_pair TMP1, TMP2\n"
-+ "combine_pixels_pair TMP3, TMP4\n"
-+ "combine_pixels_pair TMP5, TMP6\n"
-+ "combine_pixels_pair TMP7, TMP8\n"
-+ "stmia DST!, {TMP1, TMP3, TMP5, TMP7}\n"
-+ "bge 3b\n"
-+ "4:\n"
-+
-+ /* process the remaining pixels */
-+ "tst W, #4\n"
-+ "beq 4f\n"
-+ "ldmia SRC!, {TMP1, TMP2, TMP3, TMP4}\n"
-+ "cvt8888to565 TMP1\n"
-+ "cvt8888to565 TMP2\n"
-+ "cvt8888to565 TMP3\n"
-+ "cvt8888to565 TMP4\n"
-+ "combine_pixels_pair TMP1, TMP2\n"
-+ "combine_pixels_pair TMP3, TMP4\n"
-+ "stmia DST!, {TMP1, TMP3}\n"
-+ "4:\n"
-+ "tst W, #2\n"
-+ "beq 4f\n"
-+ "ldmia SRC!, {TMP1, TMP2}\n"
-+ "cvt8888to565 TMP1\n"
-+ "cvt8888to565 TMP2\n"
-+ "combine_pixels_pair TMP1, TMP2\n"
-+ "str TMP1, [DST], #4\n"
-+ "4:\n"
-+ "tst W, #1\n"
-+ "beq 4f\n"
-+ "ldr TMP1, [SRC], #4\n"
-+ "cvt8888to565 TMP1\n"
-+ "strh TMP1, [DST], #2\n"
-+ "4:\n"
-+ "ldr TMP1, [sp, #(10*4+0)]\n" /* (dst_stride-w) */
-+ "ldr TMP2, [sp, #(10*4+4)]\n" /* (src_stride-w) */
-+ "ldr W, [sp, #(8*4)]\n"
-+ "subs H, H, #1\n"
-+ "add DST, DST, TMP1, lsl #1\n"
-+ "add SRC, SRC, TMP2, lsl #2\n"
-+ "bge 1b\n"
-+ "6:\n"
-+ /* restore all registers and return */
-+ "ldmia sp!, {r4-r11, ip, pc}\n"
-+ ".ltorg\n"
-+
-+ ".unreq DST\n"
-+ ".unreq SRC\n"
-+ ".unreq W\n"
-+ ".unreq H\n"
-+
-+ ".unreq TMP1\n"
-+ ".unreq TMP2\n"
-+ ".unreq TMP3\n"
-+ ".unreq TMP4\n"
-+ ".unreq TMP5\n"
-+ ".unreq TMP6\n"
-+ ".unreq TMP7\n"
-+ ".unreq TMP8\n"
-+
-+ ".unreq C1F001F\n"
-+ ".unreq A\n"
-+
-+ ".purgem cvt8888to565\n"
-+ ".purgem combine_pixels_pair\n"
-+ );
-+}
-+
-+static void
-+armv6_composite_src_8888_0565 (pixman_implementation_t * impl,
-+ pixman_op_t op,
-+ pixman_image_t * src_image,
-+ pixman_image_t * mask_image,
-+ pixman_image_t * dst_image,
-+ int32_t src_x,
-+ int32_t src_y,
-+ int32_t mask_x,
-+ int32_t mask_y,
-+ int32_t dest_x,
-+ int32_t dest_y,
-+ int32_t width,
-+ int32_t height)
-+{
-+ uint32_t *src;
-+ uint16_t *dst;
-+ int src_stride, dst_stride;
-+
-+ PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t,
-+ dst_stride, dst, 1);
-+ PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t,
-+ src_stride, src, 1);
-+
-+ if (width < 7)
-+ armv4_composite_src_8888_0565_asm (dst, src, width,
-+ dst_stride, src_stride, height);
-+ else
-+ armv6_composite_src_8888_0565_asm (dst, src, width,
-+ dst_stride, src_stride, height);
-+}
-+
- #endif
-
- static const pixman_fast_path_t arm_simd_fast_paths[] =
-@@ -624,6 +900,10 @@ static const pixman_fast_path_t arm_simd_fast_paths[] =
- #if defined(__ARM_EABI__) && defined(__linux__)
- PIXMAN_STD_FAST_PATH (OVER, solid, a8, r5g6b5, armv6_composite_over_n_8_0565),
- PIXMAN_STD_FAST_PATH (OVER, solid, a8, b5g6r5, armv6_composite_over_n_8_0565),
-+ PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, r5g6b5, armv6_composite_src_8888_0565),
-+ PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, r5g6b5, armv6_composite_src_8888_0565),
-+ PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, b5g6r5, armv6_composite_src_8888_0565),
-+ PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, b5g6r5, armv6_composite_src_8888_0565),
- #endif
- { PIXMAN_OP_NONE },
- };
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman/tls.patch b/recipes/xorg-lib/pixman/tls.patch
deleted file mode 100644
index 316caed..0000000
--- a/recipes/xorg-lib/pixman/tls.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 714559dccda3165a72f0a9935c1edc3aef535f30 Mon Sep 17 00:00:00 2001
-From: Søren Sandmann Pedersen <ssp@redhat.com>
-Date: Wed, 07 Apr 2010 05:44:12 +0000
-Subject: Fixes for pthread thread local storage.
-
-The tls_name_key variable is passed to tls_name_get(), and the first
-time this happens it isn't initialized. tls_name_get() then passes it
-on to tls_name_alloc() which passes it on to pthread_setspecific()
-leading to undefined behavior.
-
-None of this is actually necessary at all because there is only one
-such variable per thread local variable, so it doesn't need to passed
-as a parameter at all.
-
-All of this was pointed out by Tor Lillqvist on the cairo mailing
-list.
----
-diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
-index cdac0d8..531c8c9 100644
---- a/pixman/pixman-compiler.h
-+++ b/pixman/pixman-compiler.h
-@@ -99,16 +99,16 @@
- } \
- \
- static type * \
-- tls_ ## name ## _alloc (key) \
-+ tls_ ## name ## _alloc (void) \
- { \
- type *value = calloc (1, sizeof (type)); \
- if (value) \
-- pthread_setspecific (key, value); \
-+ pthread_setspecific (tls_ ## name ## _key, value); \
- return value; \
- } \
- \
- static force_inline type * \
-- tls_ ## name ## _get (key) \
-+ tls_ ## name ## _get (void) \
- { \
- type *value = NULL; \
- if (pthread_once (&tls_ ## name ## _once_control, \
-@@ -116,13 +116,13 @@
- { \
- value = pthread_getspecific (tls_ ## name ## _key); \
- if (!value) \
-- value = tls_ ## name ## _alloc (key); \
-+ value = tls_ ## name ## _alloc (); \
- } \
- return value; \
- }
-
- # define PIXMAN_GET_THREAD_LOCAL(name) \
-- tls_ ## name ## _get (tls_ ## name ## _key)
-+ tls_ ## name ## _get ()
-
- #else
-
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman_0.10.0.bb b/recipes/xorg-lib/pixman_0.10.0.bb
deleted file mode 100644
index 8690818..0000000
--- a/recipes/xorg-lib/pixman_0.10.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "41804ac38025102dcc9891dfd4a3d105"
-SRC_URI[archive.sha256sum] = "48625f6b5ce130672942503c683d306d957ee40f59f8e59be6ca30a245ad47d0"
diff --git a/recipes/xorg-lib/pixman_0.11.4.bb b/recipes/xorg-lib/pixman_0.11.4.bb
deleted file mode 100644
index b058104..0000000
--- a/recipes/xorg-lib/pixman_0.11.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8c8afc259af61d42aa9b3d8ec5a9a03b"
-SRC_URI[archive.sha256sum] = "d034f4afb4329c38e8789a5a7a384194c7402094b4c2b7600d2d86d8589e8571"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/xorg-lib/pixman_0.11.8.bb b/recipes/xorg-lib/pixman_0.11.8.bb
deleted file mode 100644
index d7c6717..0000000
--- a/recipes/xorg-lib/pixman_0.11.8.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI += " \
- file://pixman-arm.patch \
- file://pixman-x888-565.patch \
- "
-SRC_URI[archive.md5sum] = "7b5db768c51337b5e5e954fc9c961cd3"
-SRC_URI[archive.sha256sum] = "720db5ef6ed0e744b9bac5360ade9a7c024f9fb3fab05c83a90ee28b08e66e01"
diff --git a/recipes/xorg-lib/pixman_0.15.18.bb b/recipes/xorg-lib/pixman_0.15.18.bb
deleted file mode 100644
index 4811a01..0000000
--- a/recipes/xorg-lib/pixman_0.15.18.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9b60fe7623621b546b76777b8b7d2490"
-SRC_URI[archive.sha256sum] = "3a5003cf6c7d5b03ed5977c108ee11410cfd7849eea370eb4feae98f2822c795"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/xorg-lib/pixman_0.15.6.bb b/recipes/xorg-lib/pixman_0.15.6.bb
deleted file mode 100644
index a09de4e..0000000
--- a/recipes/xorg-lib/pixman_0.15.6.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fe922698df46b21d7e19f28ded4ca100"
-SRC_URI[archive.sha256sum] = "3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/xorg-lib/pixman_0.17.12.bb b/recipes/xorg-lib/pixman_0.17.12.bb
deleted file mode 100644
index b476aaa..0000000
--- a/recipes/xorg-lib/pixman_0.17.12.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI += "\
- file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
- file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
- file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
- file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
- file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
- file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch \
- file://over-n-8-0565.patch \
- file://src-8888-0565.patch \
-"
-SRC_URI[archive.md5sum] = "331415d7a110145cf27aa00e11d0a683"
-SRC_URI[archive.sha256sum] = "8cce103af1b4200a13bedca5b763f74c9bc99a55985ab44ca92ba532dac6b57f"
-
-NEON = " --disable-arm-neon "
-NEON_armv7a = " "
-
-EXTRA_OECONF = "${NEON} --disable-gtk"
-
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_angstrom = "2"
-DEFAULT_PREFERENCE_shr = "2"
diff --git a/recipes/xorg-lib/pixman_0.17.8.bb b/recipes/xorg-lib/pixman_0.17.8.bb
deleted file mode 100644
index 55c70c8..0000000
--- a/recipes/xorg-lib/pixman_0.17.8.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI += " \
- file://0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
- file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
- file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
- file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
- file://1-composite.patch \
- file://2-composite.patch \
- file://3-composite.patch \
- "
-SRC_URI[archive.md5sum] = "a7deb2ff6b286b676d67aa6ae91317ae"
-SRC_URI[archive.sha256sum] = "ea24e9003455a0881bd43bf7e4169f2b34c90c8521405103e3490553876a81b4"
-
-NEON = " --disable-arm-neon "
-NEON_armv7a = " "
-
-EXTRA_OECONF = "${NEON} --disable-gtk"
-
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_angstrom = "2"
-DEFAULT_PREFERENCE_shr = "2"
diff --git a/recipes/xorg-lib/pixman_0.18.0.bb b/recipes/xorg-lib/pixman_0.18.0.bb
deleted file mode 100644
index c099b77..0000000
--- a/recipes/xorg-lib/pixman_0.18.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.3"
-
-SRC_URI += "\
- file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
- file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
- file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
- file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
- file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
- file://calloc.patch \
- file://tls.patch \
- file://565-scanline.patch \
- file://missing-cache-preload.diff \
-"
-SRC_URI[archive.md5sum] = "a4fb870fc325be258089f1683642e976"
-SRC_URI[archive.sha256sum] = "b305291bba3d9271a4481e5eedf901025ac8ba4ec8f7b76ccafc5094610cd4ff"
-
-NEON = " --disable-arm-neon "
-NEON_armv7a = " "
-
-EXTRA_OECONF = "${NEON} --disable-gtk"
-
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_shr = "2"
diff --git a/recipes/xorg-lib/pixman_0.9.4.bb b/recipes/xorg-lib/pixman_0.9.4.bb
deleted file mode 100644
index 254bf61..0000000
--- a/recipes/xorg-lib/pixman_0.9.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "Library for lowlevel pixel operations"
-DEPENDS = "virtual/libx11"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c354ab5b0da10227226d3ef604254875"
-SRC_URI[archive.sha256sum] = "261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa"
diff --git a/recipes/xorg-lib/pixman_0.9.5.bb b/recipes/xorg-lib/pixman_0.9.5.bb
deleted file mode 100644
index 6259dea..0000000
--- a/recipes/xorg-lib/pixman_0.9.5.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "Library for lowlevel pixel operations"
-DEPENDS = "virtual/libx11"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://dont-copy-unused-bits-to-alpha-channel.patch"
-SRC_URI[archive.md5sum] = "f9fea77e46ec7a3a16e925e137f146e7"
-SRC_URI[archive.sha256sum] = "a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8"
diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb
deleted file mode 100644
index 12140c1..0000000
--- a/recipes/xorg-lib/pixman_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require pixman.inc
-PV = "0.17.13"
-PR = "${INC_PR}.2"
-PR_append = "+gitr${SRCPV}"
-
-SRC_URI = "git://anongit.freedesktop.org/pixman;protocol=git;branch=master \
- file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
- file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
- file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
- file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
- file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
- file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch \
- file://over-n-8-0565.patch \
- file://src-8888-0565.patch \
- file://calloc.patch \
- file://tls.patch \
-"
-
-SRCREV = "69f1ec9a7827aeb522fcae99846237ef0f896e7b"
-S = "${WORKDIR}/git"
-
-NEON = " --disable-arm-neon "
-NEON_armv7a = " "
-
-EXTRA_OECONF = "${NEON} --disable-gtk"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/xorg-lib/xtrans/fix-missing-includepath.patch b/recipes/xorg-lib/xtrans/fix-missing-includepath.patch
deleted file mode 100644
index 043d14f..0000000
--- a/recipes/xorg-lib/xtrans/fix-missing-includepath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- xtrans-X11R7.0-1.0.0/xtrans.pc.in~fix-missing-includepath 2005-07-02 20:00:50.000000000 +0200
-+++ xtrans-X11R7.0-1.0.0/xtrans.pc.in 2006-08-11 19:27:58.000000000 +0200
-@@ -6,4 +6,4 @@
- Name: XTrans
- Description: Abstract network code for X
- Version: @PACKAGE_VERSION@
--Cflags: -I${includedir} -D_BSD_SOURCE @fchown_define@ @sticky_bit_define@
-+Cflags: -I${includedir} -I${includedir}/X11/Xtrans -D_BSD_SOURCE @fchown_define@ @sticky_bit_define@
diff --git a/recipes/xorg-lib/xtrans_1.0.3.bb b/recipes/xorg-lib/xtrans_1.0.3.bb
deleted file mode 100644
index 19a56fa..0000000
--- a/recipes/xorg-lib/xtrans_1.0.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-missing-includepath.patch"
-SRC_URI[archive.md5sum] = "bb196907ea1e182dcb396eb22f7d2c1a"
-SRC_URI[archive.sha256sum] = "e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085"
-
-FILESPATHPKG .= ":xtrans-${PV}:xtrans"
-
-ALLOW_EMPTY = "1"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/xorg-lib/xtrans_1.0.4.bb b/recipes/xorg-lib/xtrans_1.0.4.bb
deleted file mode 100644
index d19a6c0..0000000
--- a/recipes/xorg-lib/xtrans_1.0.4.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-missing-includepath.patch"
-SRC_URI[archive.md5sum] = "8b36cdf08df12be96615e3d550236626"
-SRC_URI[archive.sha256sum] = "765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c"
-
-FILESPATHPKG .= ":xtrans-${PV}:xtrans"
-
-ALLOW_EMPTY = "1"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/xorg-lib/xtrans_1.1.bb b/recipes/xorg-lib/xtrans_1.1.bb
deleted file mode 100644
index 1f3fcb4..0000000
--- a/recipes/xorg-lib/xtrans_1.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-missing-includepath.patch"
-SRC_URI[archive.md5sum] = "8546e3a060aefb42c889eaa4b5db33af"
-SRC_URI[archive.sha256sum] = "16bc4646f105efd3d0dd105899ac19035d67acf50950ca8c70cf68772508272d"
-
-FILESPATHPKG .= ":xtrans-${PV}:xtrans"
-
-ALLOW_EMPTY = "1"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/xorg-lib/xtrans_1.2.1.bb b/recipes/xorg-lib/xtrans_1.2.1.bb
deleted file mode 100644
index e695e35..0000000
--- a/recipes/xorg-lib/xtrans_1.2.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-RDEPENDS_${PN}-dev = ""
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "96e142331edd498a9364887b2548f1bb"
-SRC_URI[archive.sha256sum] = "9ff21a8d9ea524ca9b7cb6d6b4d522b4cb20b1c35edeb8995a9e9265a0df64bd"
-
-FILESPATHPKG .= ":xtrans-${PV}:xtrans"
-
-ALLOW_EMPTY = "1"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/xorg-lib/xtrans_1.2.3.bb b/recipes/xorg-lib/xtrans_1.2.3.bb
deleted file mode 100644
index 1f0ec39..0000000
--- a/recipes/xorg-lib/xtrans_1.2.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-RDEPENDS_${PN}-dev = ""
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f9cf791dfad59cf044e276aab3a71e1d"
-SRC_URI[archive.sha256sum] = "a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0"
-
-FILESPATHPKG .= ":xtrans-${PV}:xtrans"
-
-ALLOW_EMPTY = "1"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/xorg-lib/xtrans_1.2.bb b/recipes/xorg-lib/xtrans_1.2.bb
deleted file mode 100644
index 8a4ddca..0000000
--- a/recipes/xorg-lib/xtrans_1.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-missing-includepath.patch"
-SRC_URI[archive.md5sum] = "a91fef8b932b21992af7dfff7b2643f3"
-SRC_URI[archive.sha256sum] = "d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4"
-
-FILESPATHPKG .= ":xtrans-${PV}:xtrans"
-
-ALLOW_EMPTY = "1"
-
-BBCLASSEXTEND = "native nativesdk"
--
1.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 3/9] xorg-data: move older not pinned versions to obsolete dir
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
2010-08-16 15:30 ` [PATCH 1/9] xorg-app: move older not pinned versions to obsolete dir Martin Jansa
2010-08-16 15:30 ` [PATCH 2/9] xorg-lib: " Martin Jansa
@ 2010-08-16 15:30 ` Martin Jansa
2010-08-16 15:30 ` [PATCH 4/9] xorg-doc: " Martin Jansa
` (9 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 15:30 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes/obsolete/xorg/xorg-data/xbitmaps_1.0.1.bb | 10 ++++++++++
.../xorg/xorg-data/xcursor-themes_1.0.1.bb | 11 +++++++++++
recipes/xorg-data/xbitmaps_1.0.1.bb | 10 ----------
recipes/xorg-data/xcursor-themes_1.0.1.bb | 11 -----------
4 files changed, 21 insertions(+), 21 deletions(-)
create mode 100644 recipes/obsolete/xorg/xorg-data/xbitmaps_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-data/xcursor-themes_1.0.1.bb
delete mode 100644 recipes/xorg-data/xbitmaps_1.0.1.bb
delete mode 100644 recipes/xorg-data/xcursor-themes_1.0.1.bb
diff --git a/recipes/obsolete/xorg/xorg-data/xbitmaps_1.0.1.bb b/recipes/obsolete/xorg/xorg-data/xbitmaps_1.0.1.bb
new file mode 100644
index 0000000..e0333ce
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-data/xbitmaps_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-data-common.inc
+
+DESCRIPTION = "Common X11 Bitmaps"
+LICENSE = "MIT"
+DEPENDS += "libxmu"
+
+
+SRC_URI[archive.md5sum] = "b28a9840cde3c38d7c09716372fea257"
+SRC_URI[archive.sha256sum] = "5aa5be594e77f772b85d39f0c25f61a61c7f6fa02ba940e614c5ee386deeb867"
+PR = "${INC_PR}.0"
diff --git a/recipes/obsolete/xorg/xorg-data/xcursor-themes_1.0.1.bb b/recipes/obsolete/xorg/xorg-data/xcursor-themes_1.0.1.bb
new file mode 100644
index 0000000..9dca0ab
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-data/xcursor-themes_1.0.1.bb
@@ -0,0 +1,11 @@
+require xorg-data-common.inc
+PE = "1"
+
+DEPENDS += " libxcursor xcursorgen-native"
+
+FILES_${PN} += "${datadir}/icons"
+
+
+SRC_URI[archive.md5sum] = "014bad415e64c49994679cdb71a97e37"
+SRC_URI[archive.sha256sum] = "4e7dcd402cd045ce1bd1a3de496270e78d6ead2478a0bcb3404072b33c5c9ea0"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-data/xbitmaps_1.0.1.bb b/recipes/xorg-data/xbitmaps_1.0.1.bb
deleted file mode 100644
index e0333ce..0000000
--- a/recipes/xorg-data/xbitmaps_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-data-common.inc
-
-DESCRIPTION = "Common X11 Bitmaps"
-LICENSE = "MIT"
-DEPENDS += "libxmu"
-
-
-SRC_URI[archive.md5sum] = "b28a9840cde3c38d7c09716372fea257"
-SRC_URI[archive.sha256sum] = "5aa5be594e77f772b85d39f0c25f61a61c7f6fa02ba940e614c5ee386deeb867"
-PR = "${INC_PR}.0"
diff --git a/recipes/xorg-data/xcursor-themes_1.0.1.bb b/recipes/xorg-data/xcursor-themes_1.0.1.bb
deleted file mode 100644
index 9dca0ab..0000000
--- a/recipes/xorg-data/xcursor-themes_1.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-data-common.inc
-PE = "1"
-
-DEPENDS += " libxcursor xcursorgen-native"
-
-FILES_${PN} += "${datadir}/icons"
-
-
-SRC_URI[archive.md5sum] = "014bad415e64c49994679cdb71a97e37"
-SRC_URI[archive.sha256sum] = "4e7dcd402cd045ce1bd1a3de496270e78d6ead2478a0bcb3404072b33c5c9ea0"
-PR = "${INC_PR}.0"
--
1.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 4/9] xorg-doc: move older not pinned versions to obsolete dir
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
` (2 preceding siblings ...)
2010-08-16 15:30 ` [PATCH 3/9] xorg-data: " Martin Jansa
@ 2010-08-16 15:30 ` Martin Jansa
2010-08-16 15:30 ` [PATCH 5/9] xorg-driver: " Martin Jansa
` (8 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 15:30 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes/obsolete/xorg/xorg-doc/xorg-docs_1.0.1.bb | 11 +++++++++++
recipes/obsolete/xorg/xorg-doc/xorg-docs_1.2.bb | 11 +++++++++++
recipes/obsolete/xorg/xorg-doc/xorg-docs_1.4.bb | 13 +++++++++++++
.../xorg/xorg-doc/xorg-sgml-doctools_1.1.1.bb | 8 ++++++++
.../xorg/xorg-doc/xorg-sgml-doctools_1.2.bb | 8 ++++++++
.../xorg/xorg-doc/xorg-sgml-doctools_1.4.bb | 8 ++++++++
recipes/xorg-doc/xorg-docs_1.0.1.bb | 11 -----------
recipes/xorg-doc/xorg-docs_1.2.bb | 11 -----------
recipes/xorg-doc/xorg-docs_1.4.bb | 13 -------------
recipes/xorg-doc/xorg-sgml-doctools_1.1.1.bb | 8 --------
recipes/xorg-doc/xorg-sgml-doctools_1.2.bb | 8 --------
recipes/xorg-doc/xorg-sgml-doctools_1.4.bb | 8 --------
12 files changed, 59 insertions(+), 59 deletions(-)
create mode 100644 recipes/obsolete/xorg/xorg-doc/xorg-docs_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-doc/xorg-docs_1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-doc/xorg-docs_1.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-doc/xorg-sgml-doctools_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-doc/xorg-sgml-doctools_1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-doc/xorg-sgml-doctools_1.4.bb
delete mode 100644 recipes/xorg-doc/xorg-docs_1.0.1.bb
delete mode 100644 recipes/xorg-doc/xorg-docs_1.2.bb
delete mode 100644 recipes/xorg-doc/xorg-docs_1.4.bb
delete mode 100644 recipes/xorg-doc/xorg-sgml-doctools_1.1.1.bb
delete mode 100644 recipes/xorg-doc/xorg-sgml-doctools_1.2.bb
delete mode 100644 recipes/xorg-doc/xorg-sgml-doctools_1.4.bb
diff --git a/recipes/obsolete/xorg/xorg-doc/xorg-docs_1.0.1.bb b/recipes/obsolete/xorg/xorg-doc/xorg-docs_1.0.1.bb
new file mode 100644
index 0000000..5b2a1ce
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-doc/xorg-docs_1.0.1.bb
@@ -0,0 +1,11 @@
+require xorg-doc-common.inc
+DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
+source tree."
+DEPENDS += " intltool"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "78fd95f6d5ea69d91723dcc16280c664"
+SRC_URI[archive.sha256sum] = "b7b8593b055e29dedc0631e1db9781583038afc67bce0f715fdf3201570d1e4e"
+
+FILES_${PN} += " /usr/share/X11/doc"
diff --git a/recipes/obsolete/xorg/xorg-doc/xorg-docs_1.2.bb b/recipes/obsolete/xorg/xorg-doc/xorg-docs_1.2.bb
new file mode 100644
index 0000000..b7a33c9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-doc/xorg-docs_1.2.bb
@@ -0,0 +1,11 @@
+require xorg-doc-common.inc
+DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
+source tree."
+DEPENDS += " intltool"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f817c5df43817846c1b27bac83da74d7"
+SRC_URI[archive.sha256sum] = "23648ac11d5cc57f3e1e747a73bd1c4f83c42a657969814af0d399fdd3d7beec"
+
+FILES_${PN} += " /usr/share/X11/doc"
diff --git a/recipes/obsolete/xorg/xorg-doc/xorg-docs_1.4.bb b/recipes/obsolete/xorg/xorg-doc/xorg-docs_1.4.bb
new file mode 100644
index 0000000..12d671d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-doc/xorg-docs_1.4.bb
@@ -0,0 +1,13 @@
+require xorg-doc-common.inc
+DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
+source tree."
+DEPENDS += " intltool"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4f2005bdd430a98c262901383459009e"
+SRC_URI[archive.sha256sum] = "fffc67e50ce396e6ddd95e842fa8351954b8f09cb729a9a062e0496a8bda4925"
+
+EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
+
+FILES_${PN} += " /usr/share/X11/doc"
diff --git a/recipes/obsolete/xorg/xorg-doc/xorg-sgml-doctools_1.1.1.bb b/recipes/obsolete/xorg/xorg-doc/xorg-sgml-doctools_1.1.1.bb
new file mode 100644
index 0000000..8d6a17b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-doc/xorg-sgml-doctools_1.1.1.bb
@@ -0,0 +1,8 @@
+require xorg-doc-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ae3d4f73c42953b0a5513bb2967ab913"
+SRC_URI[archive.sha256sum] = "be1fbd7646a55eb9a9ad161f9b83034ba88a82c780e29d4a7888db2495947f25"
+
+FILES_${PN} += " /usr/share/sgml/X11"
diff --git a/recipes/obsolete/xorg/xorg-doc/xorg-sgml-doctools_1.2.bb b/recipes/obsolete/xorg/xorg-doc/xorg-sgml-doctools_1.2.bb
new file mode 100644
index 0000000..9a4fb30
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-doc/xorg-sgml-doctools_1.2.bb
@@ -0,0 +1,8 @@
+require xorg-doc-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f930e5be117922f0841614c8d43f1ae8"
+SRC_URI[archive.sha256sum] = "4def78f2e0e002f5693b61b53ab4325fbc150d3614fe53818e8df9b365a4dbea"
+
+FILES_${PN} += " /usr/share/sgml/X11"
diff --git a/recipes/obsolete/xorg/xorg-doc/xorg-sgml-doctools_1.4.bb b/recipes/obsolete/xorg/xorg-doc/xorg-sgml-doctools_1.4.bb
new file mode 100644
index 0000000..bfcf483
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-doc/xorg-sgml-doctools_1.4.bb
@@ -0,0 +1,8 @@
+require xorg-doc-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "20484c9d97800530616742cb14989ac2"
+SRC_URI[archive.sha256sum] = "e49b069c03cdc9d7a8aa23054431660fc2360213768a3defe61f8f9ee0af4d6f"
+
+FILES_${PN} += " /usr/share/sgml/X11"
diff --git a/recipes/xorg-doc/xorg-docs_1.0.1.bb b/recipes/xorg-doc/xorg-docs_1.0.1.bb
deleted file mode 100644
index 5b2a1ce..0000000
--- a/recipes/xorg-doc/xorg-docs_1.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-doc-common.inc
-DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
-source tree."
-DEPENDS += " intltool"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "78fd95f6d5ea69d91723dcc16280c664"
-SRC_URI[archive.sha256sum] = "b7b8593b055e29dedc0631e1db9781583038afc67bce0f715fdf3201570d1e4e"
-
-FILES_${PN} += " /usr/share/X11/doc"
diff --git a/recipes/xorg-doc/xorg-docs_1.2.bb b/recipes/xorg-doc/xorg-docs_1.2.bb
deleted file mode 100644
index b7a33c9..0000000
--- a/recipes/xorg-doc/xorg-docs_1.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-doc-common.inc
-DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
-source tree."
-DEPENDS += " intltool"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f817c5df43817846c1b27bac83da74d7"
-SRC_URI[archive.sha256sum] = "23648ac11d5cc57f3e1e747a73bd1c4f83c42a657969814af0d399fdd3d7beec"
-
-FILES_${PN} += " /usr/share/X11/doc"
diff --git a/recipes/xorg-doc/xorg-docs_1.4.bb b/recipes/xorg-doc/xorg-docs_1.4.bb
deleted file mode 100644
index 12d671d..0000000
--- a/recipes/xorg-doc/xorg-docs_1.4.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-doc-common.inc
-DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
-source tree."
-DEPENDS += " intltool"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4f2005bdd430a98c262901383459009e"
-SRC_URI[archive.sha256sum] = "fffc67e50ce396e6ddd95e842fa8351954b8f09cb729a9a062e0496a8bda4925"
-
-EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
-
-FILES_${PN} += " /usr/share/X11/doc"
diff --git a/recipes/xorg-doc/xorg-sgml-doctools_1.1.1.bb b/recipes/xorg-doc/xorg-sgml-doctools_1.1.1.bb
deleted file mode 100644
index 8d6a17b..0000000
--- a/recipes/xorg-doc/xorg-sgml-doctools_1.1.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-doc-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ae3d4f73c42953b0a5513bb2967ab913"
-SRC_URI[archive.sha256sum] = "be1fbd7646a55eb9a9ad161f9b83034ba88a82c780e29d4a7888db2495947f25"
-
-FILES_${PN} += " /usr/share/sgml/X11"
diff --git a/recipes/xorg-doc/xorg-sgml-doctools_1.2.bb b/recipes/xorg-doc/xorg-sgml-doctools_1.2.bb
deleted file mode 100644
index 9a4fb30..0000000
--- a/recipes/xorg-doc/xorg-sgml-doctools_1.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-doc-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f930e5be117922f0841614c8d43f1ae8"
-SRC_URI[archive.sha256sum] = "4def78f2e0e002f5693b61b53ab4325fbc150d3614fe53818e8df9b365a4dbea"
-
-FILES_${PN} += " /usr/share/sgml/X11"
diff --git a/recipes/xorg-doc/xorg-sgml-doctools_1.4.bb b/recipes/xorg-doc/xorg-sgml-doctools_1.4.bb
deleted file mode 100644
index bfcf483..0000000
--- a/recipes/xorg-doc/xorg-sgml-doctools_1.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-doc-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "20484c9d97800530616742cb14989ac2"
-SRC_URI[archive.sha256sum] = "e49b069c03cdc9d7a8aa23054431660fc2360213768a3defe61f8f9ee0af4d6f"
-
-FILES_${PN} += " /usr/share/sgml/X11"
--
1.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 5/9] xorg-driver: move older not pinned versions to obsolete dir
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
` (3 preceding siblings ...)
2010-08-16 15:30 ` [PATCH 4/9] xorg-doc: " Martin Jansa
@ 2010-08-16 15:30 ` Martin Jansa
2010-08-16 15:30 ` [PATCH 6/9] xorg-font: " Martin Jansa
` (7 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 15:30 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg/xorg-driver/xf86-input-acecad_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-acecad_1.2.1.bb | 7 +
.../xorg/xorg-driver/xf86-input-acecad_1.2.2.bb | 7 +
.../xorg/xorg-driver/xf86-input-aiptek_1.0.1.bb | 6 +
.../xorg/xorg-driver/xf86-input-aiptek_1.1.1.bb | 6 +
.../xorg/xorg-driver/xf86-input-calcomp_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-calcomp_1.1.1.bb | 7 +
.../xorg/xorg-driver/xf86-input-citron_2.2.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-citron_2.2.1.bb | 7 +
.../xorg-driver/xf86-input-digitaledge_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-dmc_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-dmc_1.1.1.bb | 7 +
.../xorg/xorg-driver/xf86-input-dynapro_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-dynapro_1.1.1.bb | 7 +
.../xorg/xorg-driver/xf86-input-elo2300_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-elo2300_1.1.1.bb | 7 +
.../xorg-driver/xf86-input-elographics_1.1.0.bb | 7 +
.../xorg-driver/xf86-input-elographics_1.2.2.bb | 7 +
.../xf86-input-elographics_X11R7.0-1.0.0.5.bb | 6 +
.../xorg/xorg-driver/xf86-input-evdev_1.1.5.bb | 7 +
.../xorg/xorg-driver/xf86-input-evdev_1.2.0.bb | 7 +
.../xorg/xorg-driver/xf86-input-evdev_1.99.4.bb | 7 +
.../xorg/xorg-driver/xf86-input-evdev_2.0.4.bb | 7 +
.../xorg/xorg-driver/xf86-input-evdev_2.1.0.bb | 7 +
.../xorg/xorg-driver/xf86-input-evdev_2.2.5.bb | 7 +
.../xorg/xorg-driver/xf86-input-evdev_2.2.6.bb | 7 +
.../xorg/xorg-driver/xf86-input-evdev_2.3.1.bb | 7 +
.../xorg/xorg-driver/xf86-input-evdev_2.3.2.bb | 7 +
.../xorg/xorg-driver/xf86-input-fpit_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-fpit_1.2.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-hyperpen_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-hyperpen_1.2.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-jamstudio_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-joystick_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-joystick_1.3.1.bb | 7 +
.../xorg/xorg-driver/xf86-input-joystick_1.3.2.bb | 7 +
.../xorg/xorg-driver/xf86-input-keyboard_1.1.1.bb | 7 +
.../xorg/xorg-driver/xf86-input-keyboard_1.2.0.bb | 7 +
.../xorg/xorg-driver/xf86-input-keyboard_1.2.2.bb | 7 +
.../xorg/xorg-driver/xf86-input-keyboard_1.3.1.bb | 8 +
.../xorg/xorg-driver/xf86-input-keyboard_1.3.2.bb | 8 +
.../xorg/xorg-driver/xf86-input-magellan_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-magellan_1.1.1.bb | 7 +
.../xorg-driver/xf86-input-microtouch_1.1.0.bb | 6 +
.../xorg-driver/xf86-input-microtouch_1.1.1.bb | 7 +
.../xorg/xorg-driver/xf86-input-mouse_1.1.2.bb | 7 +
.../xorg/xorg-driver/xf86-input-mouse_1.2.1.bb | 7 +
.../xorg/xorg-driver/xf86-input-mouse_1.2.2.bb | 7 +
.../xorg/xorg-driver/xf86-input-mouse_1.2.3.bb | 7 +
.../xorg/xorg-driver/xf86-input-mouse_1.3.0.bb | 7 +
.../xorg/xorg-driver/xf86-input-mouse_1.4.0.bb | 7 +
.../xorg/xorg-driver/xf86-input-mutouch_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-mutouch_1.2.0.bb | 7 +
.../xorg/xorg-driver/xf86-input-palmax_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-penmount_1.2.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-penmount_1.2.1.bb | 7 +
.../xorg/xorg-driver/xf86-input-penmount_1.3.0.bb | 7 +
.../xorg/xorg-driver/xf86-input-spaceorb_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-summa_1.1.0.bb | 6 +
.../xorg-driver/xf86-input-synaptics_0.15.0.bb | 7 +
.../xorg/xorg-driver/xf86-input-synaptics_1.2.1.bb | 7 +
.../xorg/xorg-driver/xf86-input-tek4957_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-vmmouse_12.4.0.bb | 9 +
.../xorg/xorg-driver/xf86-input-vmmouse_12.4.3.bb | 7 +
.../xorg/xorg-driver/xf86-input-vmmouse_12.5.1.bb | 9 +
.../xorg/xorg-driver/xf86-input-vmmouse_12.6.6.bb | 9 +
.../xorg/xorg-driver/xf86-input-vmmouse_12.6.9.bb | 9 +
.../xorg/xorg-driver/xf86-input-void_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-input-void_1.1.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-apm_1.1.1.bb | 8 +
.../xorg/xorg-driver/xf86-video-apm_1.2.0.bb | 9 +
.../xorg/xorg-driver/xf86-video-ark_0.6.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-ark_0.7.0.bb | 8 +
.../xorg/xorg-driver/xf86-video-ast_0.81.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-ast_0.85.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-ati_6.13.0.bb | 8 +
.../xorg/xorg-driver/xf86-video-ati_6.6.193.bb | 7 +
.../xorg/xorg-driver/xf86-video-ati_6.6.3.bb | 7 +
.../xorg/xorg-driver/xf86-video-ati_6.7.196.bb | 7 +
.../xorg/xorg-driver/xf86-video-ati_6.7.197.bb | 8 +
.../xorg/xorg-driver/xf86-video-ati_6.8.0.bb | 8 +
.../xorg/xorg-driver/xf86-video-chips_1.1.1.bb | 6 +
.../xorg/xorg-driver/xf86-video-chips_1.2.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-cirrus_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-cirrus_1.2.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-dummy_0.2.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-dummy_0.3.0.bb | 8 +
.../xorg/xorg-driver/xf86-video-dummy_0.3.3.bb | 8 +
| 48 ++++++
.../xorg/xorg-driver/xf86-video-fbdev_0.3.1.bb | 6 +
.../xorg/xorg-driver/xf86-video-fbdev_0.4.0.bb | 9 +
.../xorg/xorg-driver/xf86-video-geode/fixes.patch | 161 ++++++++++++++++++++
.../xorg/xorg-driver/xf86-video-geode_2.10.1.bb | 9 +
.../xorg/xorg-driver/xf86-video-geode_2.11.0.bb | 9 +
.../xorg/xorg-driver/xf86-video-geode_2.11.4.1.bb | 10 ++
.../xorg/xorg-driver/xf86-video-geode_2.11.7.bb | 9 +
.../xorg/xorg-driver/xf86-video-geode_2.8.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-geode_2.9.0.bb | 9 +
.../xorg/xorg-driver/xf86-video-glint_1.1.1.bb | 6 +
.../xorg/xorg-driver/xf86-video-glint_1.2.0.bb | 13 ++
.../xorg/xorg-driver/xf86-video-glint_1.2.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-i128_1.1.0.5.bb | 7 +
.../xorg/xorg-driver/xf86-video-i128_1.1.0.6.bb | 7 +
.../xorg/xorg-driver/xf86-video-i128_1.2.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-i128_1.3.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-i128_1.3.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-i740_1.1.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-i740_1.2.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-i810_1.6.5.bb | 8 +
.../xorg/xorg-driver/xf86-video-intel_2.10.0.bb | 11 ++
.../xorg/xorg-driver/xf86-video-intel_2.2.1.bb | 8 +
.../xorg/xorg-driver/xf86-video-intel_2.4.2.bb | 8 +
.../xorg/xorg-driver/xf86-video-intel_2.6.3.bb | 8 +
.../xorg/xorg-driver/xf86-video-mach64_6.8.0.bb | 8 +
.../xorg/xorg-driver/xf86-video-mga_1.4.1.bb | 6 +
.../xorg/xorg-driver/xf86-video-mga_1.4.9.bb | 6 +
.../xorg/xorg-driver/xf86-video-mga_1.9.99.bb | 7 +
.../xorg/xorg-driver/xf86-video-neomagic_1.1.1.bb | 8 +
.../xorg/xorg-driver/xf86-video-neomagic_1.2.1.bb | 8 +
.../xorg/xorg-driver/xf86-video-newport_0.2.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-nsc_2.8.2.bb | 11 ++
.../xorg/xorg-driver/xf86-video-nv_1.2.2.1.bb | 6 +
.../xorg/xorg-driver/xf86-video-nv_2.1.12.bb | 7 +
.../xorg/xorg-driver/xf86-video-nv_2.1.16.bb | 7 +
.../xorg/xorg-driver/xf86-video-nv_2.1.17.bb | 7 +
.../xorg/xorg-driver/xf86-video-nv_2.1.3.bb | 6 +
.../xorg/xorg-driver/xf86-video-nv_2.1.7.bb | 7 +
.../xorg/xorg-driver/xf86-video-nv_2.1.8.bb | 7 +
.../xorg/xorg-driver/xf86-video-nv_2.1.9.bb | 7 +
.../xorg-driver/xf86-video-openchrome_0.2.903.bb | 11 ++
.../xorg/xorg-driver/xf86-video-r128_6.8.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-radeonhd_1.2.0.bb | 12 ++
.../xorg/xorg-driver/xf86-video-rendition_4.1.3.bb | 7 +
.../xorg/xorg-driver/xf86-video-rendition_4.2.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-s3_0.5.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-s3_0.6.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-s3virge_1.10.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-s3virge_1.9.1.bb | 6 +
.../xorg/xorg-driver/xf86-video-savage_2.1.2.bb | 7 +
.../xorg/xorg-driver/xf86-video-savage_2.1.3.bb | 7 +
.../xorg/xorg-driver/xf86-video-savage_2.2.1.bb | 14 ++
.../xorg-driver/xf86-video-siliconmotion_1.5.1.bb | 6 +
.../xorg-driver/xf86-video-siliconmotion_1.6.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-sis_0.10.0.bb | 14 ++
.../xorg/xorg-driver/xf86-video-sis_0.10.1.bb | 14 ++
.../xorg/xorg-driver/xf86-video-sis_0.9.3.bb | 7 +
.../xorg/xorg-driver/xf86-video-sis_0.9.4.bb | 8 +
.../xorg/xorg-driver/xf86-video-sisusb_0.8.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-sisusb_0.9.0.bb | 8 +
.../xorg/xorg-driver/xf86-video-sisusb_0.9.1.bb | 8 +
.../xorg/xorg-driver/xf86-video-suncg14_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-suncg3_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-suncg6_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-sunffb_1.1.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-sunffb_1.2.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-sunleo_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-suntcx_1.1.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-tdfx_1.3.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-tdfx_1.4.0.bb | 13 ++
.../xorg/xorg-driver/xf86-video-tga_1.1.0.bb | 8 +
.../xorg/xorg-driver/xf86-video-tga_1.2.0.bb | 8 +
.../xorg/xorg-driver/xf86-video-trident_1.2.3.bb | 7 +
.../xorg/xorg-driver/xf86-video-trident_1.2.4.bb | 8 +
.../xorg/xorg-driver/xf86-video-trident_1.3.0.bb | 8 +
.../xorg/xorg-driver/xf86-video-tseng_1.1.1.bb | 6 +
.../xorg/xorg-driver/xf86-video-tseng_1.2.0.bb | 6 +
.../xorg/xorg-driver/xf86-video-v4l_0.1.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-vesa_1.3.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-vesa_2.0.0.bb | 8 +
.../xorg/xorg-driver/xf86-video-vesa_2.2.0.bb | 9 +
.../xorg/xorg-driver/xf86-video-vmware_10.14.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-vmware_10.15.2.bb | 7 +
.../xorg/xorg-driver/xf86-video-vmware_10.16.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-vmware_10.16.5.bb | 7 +
.../xorg/xorg-driver/xf86-video-vmware_10.16.9.bb | 7 +
.../xorg/xorg-driver/xf86-video-vmware_11.0.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-vmware_11.0.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-voodoo_1.1.1.bb | 8 +
.../xorg/xorg-driver/xf86-video-voodoo_1.2.0.bb | 8 +
.../xorg/xorg-driver/xf86-video-wsfb_0.2.1.bb | 7 +
.../xorg/xorg-driver/xf86-video-xgi_1.5.0.bb | 7 +
.../xorg/xorg-driver/xf86-video-xgixp_1.7.99.3.bb | 7 +
recipes/xorg-driver/xf86-input-acecad_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-acecad_1.2.1.bb | 7 -
recipes/xorg-driver/xf86-input-acecad_1.2.2.bb | 7 -
recipes/xorg-driver/xf86-input-aiptek_1.0.1.bb | 6 -
recipes/xorg-driver/xf86-input-aiptek_1.1.1.bb | 6 -
recipes/xorg-driver/xf86-input-calcomp_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-calcomp_1.1.1.bb | 7 -
recipes/xorg-driver/xf86-input-citron_2.2.0.bb | 6 -
recipes/xorg-driver/xf86-input-citron_2.2.1.bb | 7 -
.../xorg-driver/xf86-input-digitaledge_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-dmc_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-dmc_1.1.1.bb | 7 -
recipes/xorg-driver/xf86-input-dynapro_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-dynapro_1.1.1.bb | 7 -
recipes/xorg-driver/xf86-input-elo2300_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-elo2300_1.1.1.bb | 7 -
.../xorg-driver/xf86-input-elographics_1.1.0.bb | 7 -
.../xorg-driver/xf86-input-elographics_1.2.2.bb | 7 -
.../xf86-input-elographics_X11R7.0-1.0.0.5.bb | 6 -
recipes/xorg-driver/xf86-input-evdev_1.1.5.bb | 7 -
recipes/xorg-driver/xf86-input-evdev_1.2.0.bb | 7 -
recipes/xorg-driver/xf86-input-evdev_1.99.4.bb | 7 -
recipes/xorg-driver/xf86-input-evdev_2.0.4.bb | 7 -
recipes/xorg-driver/xf86-input-evdev_2.1.0.bb | 7 -
recipes/xorg-driver/xf86-input-evdev_2.2.5.bb | 7 -
recipes/xorg-driver/xf86-input-evdev_2.2.6.bb | 7 -
recipes/xorg-driver/xf86-input-evdev_2.3.1.bb | 7 -
recipes/xorg-driver/xf86-input-evdev_2.3.2.bb | 7 -
recipes/xorg-driver/xf86-input-fpit_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-fpit_1.2.0.bb | 6 -
recipes/xorg-driver/xf86-input-hyperpen_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-hyperpen_1.2.0.bb | 6 -
recipes/xorg-driver/xf86-input-jamstudio_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-joystick_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-joystick_1.3.1.bb | 7 -
recipes/xorg-driver/xf86-input-joystick_1.3.2.bb | 7 -
recipes/xorg-driver/xf86-input-keyboard_1.1.1.bb | 7 -
recipes/xorg-driver/xf86-input-keyboard_1.2.0.bb | 7 -
recipes/xorg-driver/xf86-input-keyboard_1.2.2.bb | 7 -
recipes/xorg-driver/xf86-input-keyboard_1.3.1.bb | 8 -
recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb | 8 -
recipes/xorg-driver/xf86-input-magellan_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-magellan_1.1.1.bb | 7 -
recipes/xorg-driver/xf86-input-microtouch_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-microtouch_1.1.1.bb | 7 -
recipes/xorg-driver/xf86-input-mouse_1.1.2.bb | 7 -
recipes/xorg-driver/xf86-input-mouse_1.2.1.bb | 7 -
recipes/xorg-driver/xf86-input-mouse_1.2.2.bb | 7 -
recipes/xorg-driver/xf86-input-mouse_1.2.3.bb | 7 -
recipes/xorg-driver/xf86-input-mouse_1.3.0.bb | 7 -
recipes/xorg-driver/xf86-input-mouse_1.4.0.bb | 7 -
recipes/xorg-driver/xf86-input-mutouch_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-mutouch_1.2.0.bb | 7 -
recipes/xorg-driver/xf86-input-palmax_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-penmount_1.2.0.bb | 6 -
recipes/xorg-driver/xf86-input-penmount_1.2.1.bb | 7 -
recipes/xorg-driver/xf86-input-penmount_1.3.0.bb | 7 -
recipes/xorg-driver/xf86-input-spaceorb_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-summa_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-synaptics_0.15.0.bb | 7 -
recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb | 7 -
recipes/xorg-driver/xf86-input-tek4957_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-vmmouse_12.4.0.bb | 9 -
recipes/xorg-driver/xf86-input-vmmouse_12.4.3.bb | 7 -
recipes/xorg-driver/xf86-input-vmmouse_12.5.1.bb | 9 -
recipes/xorg-driver/xf86-input-vmmouse_12.6.6.bb | 9 -
recipes/xorg-driver/xf86-input-vmmouse_12.6.9.bb | 9 -
recipes/xorg-driver/xf86-input-void_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-input-void_1.1.1.bb | 7 -
recipes/xorg-driver/xf86-video-apm_1.1.1.bb | 8 -
recipes/xorg-driver/xf86-video-apm_1.2.0.bb | 9 -
recipes/xorg-driver/xf86-video-ark_0.6.0.bb | 6 -
recipes/xorg-driver/xf86-video-ark_0.7.0.bb | 8 -
recipes/xorg-driver/xf86-video-ast_0.81.0.bb | 6 -
recipes/xorg-driver/xf86-video-ast_0.85.0.bb | 6 -
recipes/xorg-driver/xf86-video-ati_6.13.0.bb | 8 -
recipes/xorg-driver/xf86-video-ati_6.6.193.bb | 7 -
recipes/xorg-driver/xf86-video-ati_6.6.3.bb | 7 -
recipes/xorg-driver/xf86-video-ati_6.7.196.bb | 7 -
recipes/xorg-driver/xf86-video-ati_6.7.197.bb | 8 -
recipes/xorg-driver/xf86-video-ati_6.8.0.bb | 8 -
recipes/xorg-driver/xf86-video-chips_1.1.1.bb | 6 -
recipes/xorg-driver/xf86-video-chips_1.2.0.bb | 7 -
recipes/xorg-driver/xf86-video-cirrus_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-video-cirrus_1.2.1.bb | 7 -
recipes/xorg-driver/xf86-video-dummy_0.2.0.bb | 6 -
recipes/xorg-driver/xf86-video-dummy_0.3.0.bb | 8 -
recipes/xorg-driver/xf86-video-dummy_0.3.3.bb | 8 -
| 48 ------
recipes/xorg-driver/xf86-video-fbdev_0.3.1.bb | 6 -
recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb | 9 -
recipes/xorg-driver/xf86-video-geode/fixes.patch | 161 --------------------
recipes/xorg-driver/xf86-video-geode_2.10.1.bb | 9 -
recipes/xorg-driver/xf86-video-geode_2.11.0.bb | 9 -
recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb | 10 --
recipes/xorg-driver/xf86-video-geode_2.11.7.bb | 9 -
recipes/xorg-driver/xf86-video-geode_2.8.0.bb | 6 -
recipes/xorg-driver/xf86-video-geode_2.9.0.bb | 9 -
recipes/xorg-driver/xf86-video-glint_1.1.1.bb | 6 -
recipes/xorg-driver/xf86-video-glint_1.2.0.bb | 13 --
recipes/xorg-driver/xf86-video-glint_1.2.1.bb | 7 -
recipes/xorg-driver/xf86-video-i128_1.1.0.5.bb | 7 -
recipes/xorg-driver/xf86-video-i128_1.1.0.6.bb | 7 -
recipes/xorg-driver/xf86-video-i128_1.2.1.bb | 7 -
recipes/xorg-driver/xf86-video-i128_1.3.0.bb | 7 -
recipes/xorg-driver/xf86-video-i128_1.3.1.bb | 7 -
recipes/xorg-driver/xf86-video-i740_1.1.0.bb | 7 -
recipes/xorg-driver/xf86-video-i740_1.2.0.bb | 7 -
recipes/xorg-driver/xf86-video-i810_1.6.5.bb | 8 -
recipes/xorg-driver/xf86-video-intel_2.10.0.bb | 11 --
recipes/xorg-driver/xf86-video-intel_2.2.1.bb | 8 -
recipes/xorg-driver/xf86-video-intel_2.4.2.bb | 8 -
recipes/xorg-driver/xf86-video-intel_2.6.3.bb | 8 -
recipes/xorg-driver/xf86-video-mach64_6.8.0.bb | 8 -
recipes/xorg-driver/xf86-video-mga_1.4.1.bb | 6 -
recipes/xorg-driver/xf86-video-mga_1.4.9.bb | 6 -
recipes/xorg-driver/xf86-video-mga_1.9.99.bb | 7 -
recipes/xorg-driver/xf86-video-neomagic_1.1.1.bb | 8 -
recipes/xorg-driver/xf86-video-neomagic_1.2.1.bb | 8 -
recipes/xorg-driver/xf86-video-newport_0.2.1.bb | 7 -
recipes/xorg-driver/xf86-video-nsc_2.8.2.bb | 11 --
recipes/xorg-driver/xf86-video-nv_1.2.2.1.bb | 6 -
recipes/xorg-driver/xf86-video-nv_2.1.12.bb | 7 -
recipes/xorg-driver/xf86-video-nv_2.1.16.bb | 7 -
recipes/xorg-driver/xf86-video-nv_2.1.17.bb | 7 -
recipes/xorg-driver/xf86-video-nv_2.1.3.bb | 6 -
recipes/xorg-driver/xf86-video-nv_2.1.7.bb | 7 -
recipes/xorg-driver/xf86-video-nv_2.1.8.bb | 7 -
recipes/xorg-driver/xf86-video-nv_2.1.9.bb | 7 -
.../xorg-driver/xf86-video-openchrome_0.2.903.bb | 11 --
recipes/xorg-driver/xf86-video-r128_6.8.0.bb | 7 -
recipes/xorg-driver/xf86-video-radeonhd_1.2.0.bb | 12 --
recipes/xorg-driver/xf86-video-rendition_4.1.3.bb | 7 -
recipes/xorg-driver/xf86-video-rendition_4.2.0.bb | 7 -
recipes/xorg-driver/xf86-video-s3_0.5.0.bb | 6 -
recipes/xorg-driver/xf86-video-s3_0.6.0.bb | 7 -
recipes/xorg-driver/xf86-video-s3virge_1.10.1.bb | 7 -
recipes/xorg-driver/xf86-video-s3virge_1.9.1.bb | 6 -
recipes/xorg-driver/xf86-video-savage_2.1.2.bb | 7 -
recipes/xorg-driver/xf86-video-savage_2.1.3.bb | 7 -
recipes/xorg-driver/xf86-video-savage_2.2.1.bb | 14 --
.../xorg-driver/xf86-video-siliconmotion_1.5.1.bb | 6 -
.../xorg-driver/xf86-video-siliconmotion_1.6.0.bb | 7 -
recipes/xorg-driver/xf86-video-sis_0.10.0.bb | 14 --
recipes/xorg-driver/xf86-video-sis_0.10.1.bb | 14 --
recipes/xorg-driver/xf86-video-sis_0.9.3.bb | 7 -
recipes/xorg-driver/xf86-video-sis_0.9.4.bb | 8 -
recipes/xorg-driver/xf86-video-sisusb_0.8.1.bb | 7 -
recipes/xorg-driver/xf86-video-sisusb_0.9.0.bb | 8 -
recipes/xorg-driver/xf86-video-sisusb_0.9.1.bb | 8 -
recipes/xorg-driver/xf86-video-suncg14_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-video-suncg3_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-video-suncg6_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-video-sunffb_1.1.0.bb | 7 -
recipes/xorg-driver/xf86-video-sunffb_1.2.0.bb | 6 -
recipes/xorg-driver/xf86-video-sunleo_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-video-suntcx_1.1.0.bb | 6 -
recipes/xorg-driver/xf86-video-tdfx_1.3.0.bb | 7 -
recipes/xorg-driver/xf86-video-tdfx_1.4.0.bb | 13 --
recipes/xorg-driver/xf86-video-tga_1.1.0.bb | 8 -
recipes/xorg-driver/xf86-video-tga_1.2.0.bb | 8 -
recipes/xorg-driver/xf86-video-trident_1.2.3.bb | 7 -
recipes/xorg-driver/xf86-video-trident_1.2.4.bb | 8 -
recipes/xorg-driver/xf86-video-trident_1.3.0.bb | 8 -
recipes/xorg-driver/xf86-video-tseng_1.1.1.bb | 6 -
recipes/xorg-driver/xf86-video-tseng_1.2.0.bb | 6 -
recipes/xorg-driver/xf86-video-v4l_0.1.1.bb | 7 -
recipes/xorg-driver/xf86-video-vesa_1.3.0.bb | 7 -
recipes/xorg-driver/xf86-video-vesa_2.0.0.bb | 8 -
recipes/xorg-driver/xf86-video-vesa_2.2.0.bb | 9 -
recipes/xorg-driver/xf86-video-vmware_10.14.1.bb | 7 -
recipes/xorg-driver/xf86-video-vmware_10.15.2.bb | 7 -
recipes/xorg-driver/xf86-video-vmware_10.16.1.bb | 7 -
recipes/xorg-driver/xf86-video-vmware_10.16.5.bb | 7 -
recipes/xorg-driver/xf86-video-vmware_10.16.9.bb | 7 -
recipes/xorg-driver/xf86-video-vmware_11.0.0.bb | 7 -
recipes/xorg-driver/xf86-video-vmware_11.0.1.bb | 7 -
recipes/xorg-driver/xf86-video-voodoo_1.1.1.bb | 8 -
recipes/xorg-driver/xf86-video-voodoo_1.2.0.bb | 8 -
recipes/xorg-driver/xf86-video-wsfb_0.2.1.bb | 7 -
recipes/xorg-driver/xf86-video-xgi_1.5.0.bb | 7 -
recipes/xorg-driver/xf86-video-xgixp_1.7.99.3.bb | 7 -
364 files changed, 1521 insertions(+), 1521 deletions(-)
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-acecad_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-acecad_1.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-acecad_1.2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-aiptek_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-aiptek_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-calcomp_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-calcomp_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-citron_2.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-citron_2.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-digitaledge_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-dmc_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-dmc_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-dynapro_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-dynapro_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-elo2300_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-elo2300_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-elographics_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-elographics_1.2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_1.1.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_1.99.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.2.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.2.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.3.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.3.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-fpit_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-fpit_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-hyperpen_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-hyperpen_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-jamstudio_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-joystick_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-joystick_1.3.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-joystick_1.3.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.3.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.3.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-magellan_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-magellan_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-microtouch_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-microtouch_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.2.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.4.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-mutouch_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-mutouch_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-palmax_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-penmount_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-penmount_1.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-penmount_1.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-spaceorb_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-summa_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-synaptics_0.15.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-synaptics_1.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-tek4957_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.4.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.4.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.5.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.6.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.6.9.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-void_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-input-void_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-apm_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-apm_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-ark_0.6.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-ark_0.7.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-ast_0.81.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-ast_0.85.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.13.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.6.193.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.6.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.7.196.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.7.197.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.8.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-chips_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-chips_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-cirrus_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-cirrus_1.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-dummy_0.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-dummy_0.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-dummy_0.3.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-fbdev/use-staged-headers.patch
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-fbdev_0.3.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-fbdev_0.4.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-geode/fixes.patch
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.10.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.11.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.11.4.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.11.7.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.8.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.9.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-glint_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-glint_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-glint_1.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.1.0.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.3.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-i740_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-i740_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-i810_1.6.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.10.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.4.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.6.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-mach64_6.8.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-mga_1.4.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-mga_1.4.9.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-mga_1.9.99.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-neomagic_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-neomagic_1.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-newport_0.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-nsc_2.8.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-nv_1.2.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.12.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.16.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.17.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.7.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.9.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-openchrome_0.2.903.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-r128_6.8.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-radeonhd_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-rendition_4.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-rendition_4.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-s3_0.5.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-s3_0.6.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-s3virge_1.10.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-s3virge_1.9.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-savage_2.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-savage_2.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-savage_2.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-siliconmotion_1.5.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-siliconmotion_1.6.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.10.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.10.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.9.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.9.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-sisusb_0.8.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-sisusb_0.9.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-sisusb_0.9.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-suncg14_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-suncg3_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-suncg6_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-sunffb_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-sunffb_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-sunleo_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-suntcx_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-tdfx_1.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-tdfx_1.4.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-tga_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-tga_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-trident_1.2.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-trident_1.2.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-trident_1.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-tseng_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-tseng_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-v4l_0.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-vesa_1.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-vesa_2.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-vesa_2.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.14.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.15.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.16.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.16.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.16.9.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_11.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_11.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-voodoo_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-voodoo_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-wsfb_0.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-xgi_1.5.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-driver/xf86-video-xgixp_1.7.99.3.bb
delete mode 100644 recipes/xorg-driver/xf86-input-acecad_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-acecad_1.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-acecad_1.2.2.bb
delete mode 100644 recipes/xorg-driver/xf86-input-aiptek_1.0.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-aiptek_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-calcomp_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-calcomp_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-citron_2.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-citron_2.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-digitaledge_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-dmc_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-dmc_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-dynapro_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-dynapro_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-elo2300_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-elo2300_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-elographics_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-elographics_1.2.2.bb
delete mode 100644 recipes/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb
delete mode 100644 recipes/xorg-driver/xf86-input-evdev_1.1.5.bb
delete mode 100644 recipes/xorg-driver/xf86-input-evdev_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-evdev_1.99.4.bb
delete mode 100644 recipes/xorg-driver/xf86-input-evdev_2.0.4.bb
delete mode 100644 recipes/xorg-driver/xf86-input-evdev_2.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-evdev_2.2.5.bb
delete mode 100644 recipes/xorg-driver/xf86-input-evdev_2.2.6.bb
delete mode 100644 recipes/xorg-driver/xf86-input-evdev_2.3.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-evdev_2.3.2.bb
delete mode 100644 recipes/xorg-driver/xf86-input-fpit_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-fpit_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-hyperpen_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-hyperpen_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-jamstudio_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-joystick_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-joystick_1.3.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-joystick_1.3.2.bb
delete mode 100644 recipes/xorg-driver/xf86-input-keyboard_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-keyboard_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-keyboard_1.2.2.bb
delete mode 100644 recipes/xorg-driver/xf86-input-keyboard_1.3.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb
delete mode 100644 recipes/xorg-driver/xf86-input-magellan_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-magellan_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-microtouch_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-microtouch_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-mouse_1.1.2.bb
delete mode 100644 recipes/xorg-driver/xf86-input-mouse_1.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-mouse_1.2.2.bb
delete mode 100644 recipes/xorg-driver/xf86-input-mouse_1.2.3.bb
delete mode 100644 recipes/xorg-driver/xf86-input-mouse_1.3.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-mouse_1.4.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-mutouch_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-mutouch_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-palmax_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-penmount_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-penmount_1.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-penmount_1.3.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-spaceorb_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-summa_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-synaptics_0.15.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-tek4957_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-vmmouse_12.4.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-vmmouse_12.4.3.bb
delete mode 100644 recipes/xorg-driver/xf86-input-vmmouse_12.5.1.bb
delete mode 100644 recipes/xorg-driver/xf86-input-vmmouse_12.6.6.bb
delete mode 100644 recipes/xorg-driver/xf86-input-vmmouse_12.6.9.bb
delete mode 100644 recipes/xorg-driver/xf86-input-void_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-input-void_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-apm_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-apm_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-ark_0.6.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-ark_0.7.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-ast_0.81.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-ast_0.85.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-ati_6.13.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-ati_6.6.193.bb
delete mode 100644 recipes/xorg-driver/xf86-video-ati_6.6.3.bb
delete mode 100644 recipes/xorg-driver/xf86-video-ati_6.7.196.bb
delete mode 100644 recipes/xorg-driver/xf86-video-ati_6.7.197.bb
delete mode 100644 recipes/xorg-driver/xf86-video-ati_6.8.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-chips_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-chips_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-cirrus_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-cirrus_1.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-dummy_0.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-dummy_0.3.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-dummy_0.3.3.bb
delete mode 100644 recipes/xorg-driver/xf86-video-fbdev/use-staged-headers.patch
delete mode 100644 recipes/xorg-driver/xf86-video-fbdev_0.3.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-geode/fixes.patch
delete mode 100644 recipes/xorg-driver/xf86-video-geode_2.10.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-geode_2.11.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-geode_2.11.7.bb
delete mode 100644 recipes/xorg-driver/xf86-video-geode_2.8.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-geode_2.9.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-glint_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-glint_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-glint_1.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-i128_1.1.0.5.bb
delete mode 100644 recipes/xorg-driver/xf86-video-i128_1.1.0.6.bb
delete mode 100644 recipes/xorg-driver/xf86-video-i128_1.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-i128_1.3.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-i128_1.3.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-i740_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-i740_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-i810_1.6.5.bb
delete mode 100644 recipes/xorg-driver/xf86-video-intel_2.10.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-intel_2.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-intel_2.4.2.bb
delete mode 100644 recipes/xorg-driver/xf86-video-intel_2.6.3.bb
delete mode 100644 recipes/xorg-driver/xf86-video-mach64_6.8.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-mga_1.4.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-mga_1.4.9.bb
delete mode 100644 recipes/xorg-driver/xf86-video-mga_1.9.99.bb
delete mode 100644 recipes/xorg-driver/xf86-video-neomagic_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-neomagic_1.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-newport_0.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-nsc_2.8.2.bb
delete mode 100644 recipes/xorg-driver/xf86-video-nv_1.2.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-nv_2.1.12.bb
delete mode 100644 recipes/xorg-driver/xf86-video-nv_2.1.16.bb
delete mode 100644 recipes/xorg-driver/xf86-video-nv_2.1.17.bb
delete mode 100644 recipes/xorg-driver/xf86-video-nv_2.1.3.bb
delete mode 100644 recipes/xorg-driver/xf86-video-nv_2.1.7.bb
delete mode 100644 recipes/xorg-driver/xf86-video-nv_2.1.8.bb
delete mode 100644 recipes/xorg-driver/xf86-video-nv_2.1.9.bb
delete mode 100644 recipes/xorg-driver/xf86-video-openchrome_0.2.903.bb
delete mode 100644 recipes/xorg-driver/xf86-video-r128_6.8.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-radeonhd_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-rendition_4.1.3.bb
delete mode 100644 recipes/xorg-driver/xf86-video-rendition_4.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-s3_0.5.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-s3_0.6.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-s3virge_1.10.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-s3virge_1.9.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-savage_2.1.2.bb
delete mode 100644 recipes/xorg-driver/xf86-video-savage_2.1.3.bb
delete mode 100644 recipes/xorg-driver/xf86-video-savage_2.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-siliconmotion_1.5.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-siliconmotion_1.6.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-sis_0.10.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-sis_0.10.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-sis_0.9.3.bb
delete mode 100644 recipes/xorg-driver/xf86-video-sis_0.9.4.bb
delete mode 100644 recipes/xorg-driver/xf86-video-sisusb_0.8.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-sisusb_0.9.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-sisusb_0.9.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-suncg14_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-suncg3_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-suncg6_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-sunffb_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-sunffb_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-sunleo_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-suntcx_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-tdfx_1.3.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-tdfx_1.4.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-tga_1.1.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-tga_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-trident_1.2.3.bb
delete mode 100644 recipes/xorg-driver/xf86-video-trident_1.2.4.bb
delete mode 100644 recipes/xorg-driver/xf86-video-trident_1.3.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-tseng_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-tseng_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-v4l_0.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-vesa_1.3.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-vesa_2.0.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-vesa_2.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-vmware_10.14.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-vmware_10.15.2.bb
delete mode 100644 recipes/xorg-driver/xf86-video-vmware_10.16.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-vmware_10.16.5.bb
delete mode 100644 recipes/xorg-driver/xf86-video-vmware_10.16.9.bb
delete mode 100644 recipes/xorg-driver/xf86-video-vmware_11.0.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-vmware_11.0.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-voodoo_1.1.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-voodoo_1.2.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-wsfb_0.2.1.bb
delete mode 100644 recipes/xorg-driver/xf86-video-xgi_1.5.0.bb
delete mode 100644 recipes/xorg-driver/xf86-video-xgixp_1.7.99.3.bb
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-acecad_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-acecad_1.1.0.bb
new file mode 100644
index 0000000..b0eef56
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-acecad_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ce0b7bec500273ad935cbfa212b8ac8a"
+SRC_URI[archive.sha256sum] = "3e5feea79f1d48cd46a2a40661140042ac586f90311669f79d65fea6cfc112ad"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-acecad_1.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-acecad_1.2.1.bb
new file mode 100644
index 0000000..0c0a330
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-acecad_1.2.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- AceCad input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2c371317f2aae34c04db63c19759a44e"
+SRC_URI[archive.sha256sum] = "07d2f8a1153d34a6516b8f1129fc32a18f2862bbb58c9bad4637fb282d60385a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-acecad_1.2.2.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-acecad_1.2.2.bb
new file mode 100644
index 0000000..843ef1d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-acecad_1.2.2.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- AceCad input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2d6596b2b0cfa527b5ed4df2014684bf"
+SRC_URI[archive.sha256sum] = "953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-aiptek_1.0.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-aiptek_1.0.1.bb
new file mode 100644
index 0000000..f1c926d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-aiptek_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "951b2b1a270f67d28e2e89fd2b9f15ae"
+SRC_URI[archive.sha256sum] = "3db0e3259034d838c2ff7ae26718422db6d33d89cd1a2defa0efdddbbbfcc28a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-aiptek_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-aiptek_1.1.1.bb
new file mode 100644
index 0000000..499869b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-aiptek_1.1.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2aa75313ea5652a8cf93581c65ee6493"
+SRC_URI[archive.sha256sum] = "219116b0275b93333b8471fc94d97320a116d695c4249837fd97763f00a85d77"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-calcomp_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-calcomp_1.1.0.bb
new file mode 100644
index 0000000..e42a680
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-calcomp_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "af13f9de2af4e1d03b2da0c037fd718a"
+SRC_URI[archive.sha256sum] = "ebc446e74eea72d391104b1ce3b2a5376bced098154ec089a944f4311d240904"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-calcomp_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-calcomp_1.1.1.bb
new file mode 100644
index 0000000..91b6c40
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-calcomp_1.1.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- Calcomp input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "689099e2ade8a8c9f68f82fdf569b3ad"
+SRC_URI[archive.sha256sum] = "8117b37da2e031eb983e1e98034710a1511299496fcf235f936caff252fa8957"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-citron_2.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-citron_2.2.0.bb
new file mode 100644
index 0000000..e20503d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-citron_2.2.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1fe53cd055a69650f3c2e02377ec728c"
+SRC_URI[archive.sha256sum] = "26cfa755d3a383f80039fcd286c44ba5f7b353feb8c674f386bb08d741d2c3fe"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-citron_2.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-citron_2.2.1.bb
new file mode 100644
index 0000000..528e31f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-citron_2.2.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X Server -- Citron input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4e254fcefb3bea55772e63c12570f6d9"
+SRC_URI[archive.sha256sum] = "1480ba63b342c00a53292d513bd79a69e1ea7c01a0c77d1a368ffb22e37c1a83"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-digitaledge_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-digitaledge_1.1.0.bb
new file mode 100644
index 0000000..4d44741
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-digitaledge_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "53461c34cc0712aacab92b820b9fcb84"
+SRC_URI[archive.sha256sum] = "24001f19b46b5bc2fcf8212f04863e4efa90175fac797350525e14848ab98a38"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-dmc_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-dmc_1.1.0.bb
new file mode 100644
index 0000000..e263482
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-dmc_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e1bcbdefcb839173de79aeb3cd038b77"
+SRC_URI[archive.sha256sum] = "c5ca8fb2dfe0130767b2c10bd0661277a67e7d5b9171a7f5f6264ec48790473f"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-dmc_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-dmc_1.1.1.bb
new file mode 100644
index 0000000..cc59a54
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-dmc_1.1.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- DMC input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f21f008220bc7687ce1c34ab557ec32f"
+SRC_URI[archive.sha256sum] = "f98c5a7010fa71cee88b4c2470e5cd804e42dfbc5292cf1c20eb75e9b1814002"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-dynapro_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-dynapro_1.1.0.bb
new file mode 100644
index 0000000..96447fc
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-dynapro_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1683178d09dfc604dde9ea2aab950a28"
+SRC_URI[archive.sha256sum] = "fc2ad50b1aa027fe57da53cbb73db0b4b9d0de9032f00dd42e7cc0aae7c50d6a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-dynapro_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-dynapro_1.1.1.bb
new file mode 100644
index 0000000..9b569a3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-dynapro_1.1.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- Dynapro input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d47be12a230c44a05d56d6b79ebcfc38"
+SRC_URI[archive.sha256sum] = "ed0f1ba81febf8e7a20cfaf32b021fcaa102af37f3070d67d6a101eeb6964992"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-elo2300_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-elo2300_1.1.0.bb
new file mode 100644
index 0000000..4439f6c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-elo2300_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "43885769d6f741272dda162e82902b0d"
+SRC_URI[archive.sha256sum] = "9551f67e24c4573867a64d032d1ff6b63654caab8a85d3c6b2af7748daaa2134"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-elo2300_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-elo2300_1.1.1.bb
new file mode 100644
index 0000000..5f98171
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-elo2300_1.1.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- ELO2300 input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4eef20f44954d49571a10b9134fdb663"
+SRC_URI[archive.sha256sum] = "cc2cd97f49cce1795ea74034b1416ff7cd5107e1a69258b09a741d55a98ba005"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-elographics_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-elographics_1.1.0.bb
new file mode 100644
index 0000000..ae3a016
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-elographics_1.1.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- ELOGraphics input driver"
+PE = "2"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ecb2bf1f800d4f5f4c295f2a0e6b1de7"
+SRC_URI[archive.sha256sum] = "1583e1dae6e3ecd34ba55deae7dfc052efede0378f852de6224308d7e7d5b2d8"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-elographics_1.2.2.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-elographics_1.2.2.bb
new file mode 100644
index 0000000..ccda074
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-elographics_1.2.2.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- ELOGraphics input driver"
+PE = "2"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "50a9c32af12ca4733afe23042f012f9c"
+SRC_URI[archive.sha256sum] = "76ded0e6977f7d562a8236bc810423cd050320531be9621d868a48309ebc4d63"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000..0857670
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "24c33f833bb2db72a07c3d28bfc0aae9"
+SRC_URI[archive.sha256sum] = "f1b7f84175d33f4d18c83cd0d37bd3962acd668922fa074a8ae29e18517cdda7"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_1.1.5.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_1.1.5.bb
new file mode 100644
index 0000000..45e3010
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_1.1.5.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DEPENDS += " kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "01705ea9a4d1699d5eeb17e7f297a581"
+SRC_URI[archive.sha256sum] = "52b7daab86dade2d189f0378ddf196c018cdc9dd47ade0b3b8fc7591cb4bbe9e"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_1.2.0.bb
new file mode 100644
index 0000000..6dcfa8e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_1.2.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0c7c41d3f1637bb559e80c2ad708f05d"
+SRC_URI[archive.sha256sum] = "b23b231d754cab717a4b145ee3a5f3e73db46d877d23502326e9794d92d976ba"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_1.99.4.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_1.99.4.bb
new file mode 100644
index 0000000..395bfbc
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_1.99.4.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f56d98ab11ef77cfcbafb5d93c697791"
+SRC_URI[archive.sha256sum] = "71e896168819bcf50044c175482d03873c31bc6eb355305a87e94772580789dd"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.0.4.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.0.4.bb
new file mode 100644
index 0000000..c0458e1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ac97e155ea4db87a8393297493f9c406"
+SRC_URI[archive.sha256sum] = "825adcadaf4c90d4cb1d0bd21dcf67bf3b895f12f8e7bf186ed936445dc015ca"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.1.0.bb
new file mode 100644
index 0000000..5974386
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.1.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a6070ead29b2d81b5b386a96df2661b8"
+SRC_URI[archive.sha256sum] = "45c4b6df8d1dbc4db8aa580be4f3c693ebba4eba4908d82489948827d3bed0e5"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.2.5.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.2.5.bb
new file mode 100644
index 0000000..7605fe3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.2.5.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e926692d74ee81ed459d0fe89439ff8b"
+SRC_URI[archive.sha256sum] = "433fd29043cd427ba486bcce471aae3ad1abca94c8682feff92da0c380b8dff3"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.2.6.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.2.6.bb
new file mode 100644
index 0000000..b490d18
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.2.6.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "bc4b2356e1dbf2d21e1e95249b18f5f8"
+SRC_URI[archive.sha256sum] = "dbf3799e207175e91f50492d51343e5cfdc706f637f6e9f14257b764e86bb3f9"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.3.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.3.1.bb
new file mode 100644
index 0000000..32798ca
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.3.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e56ce4424b89b2409c6e73e007a85da7"
+SRC_URI[archive.sha256sum] = "462f2ae2fd389a87e09fa764a236cd04dcbf85bcfcd8000aa9a3810055511d8f"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.3.2.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.3.2.bb
new file mode 100644
index 0000000..3967e40
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-evdev_2.3.2.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b2bfe368022eedf2671ee28daba31efc"
+SRC_URI[archive.sha256sum] = "029bf469bd013bcc3e384c1297a05a59e4b9b3ba90a26c022b32c0819d115e28"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-fpit_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-fpit_1.1.0.bb
new file mode 100644
index 0000000..57647da
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-fpit_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a31066a2076d18619ceaea67f6d89698"
+SRC_URI[archive.sha256sum] = "8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-fpit_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-fpit_1.2.0.bb
new file mode 100644
index 0000000..261dfb0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-fpit_1.2.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0f3e013d5ff58e0aba3d9e1d18830291"
+SRC_URI[archive.sha256sum] = "87e3dd97d57ddb520cafa5e68fa7846cfc3d9d71cb054cdf0e1d650c7b1cff7e"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-hyperpen_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-hyperpen_1.1.0.bb
new file mode 100644
index 0000000..30d24d6
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-hyperpen_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1dfccb75069e61e0c6f990b47eb58c40"
+SRC_URI[archive.sha256sum] = "d1c20a3340e06c5634759832dcf2edc6acb41476a4f637eba6880730e607f493"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-hyperpen_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-hyperpen_1.2.0.bb
new file mode 100644
index 0000000..cc64178
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-hyperpen_1.2.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "175c1e1ad668ebbbe212c1e975dd14f9"
+SRC_URI[archive.sha256sum] = "689d1c5c1f21eed00ae03a01c57482f7bbef36d7e07156556c99febe28c7d413"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-jamstudio_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-jamstudio_1.1.0.bb
new file mode 100644
index 0000000..31c41f3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-jamstudio_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a32e36a24545791a3408cdc5563b6523"
+SRC_URI[archive.sha256sum] = "ce41b360bd08ea31036b79cfc25a32c854147522e4580f5ca1a203233e657e1a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-joystick_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-joystick_1.1.0.bb
new file mode 100644
index 0000000..ffb9ecc
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-joystick_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e0025215542c7a11c5a7f9548631dbd7"
+SRC_URI[archive.sha256sum] = "11c3e8056e8f44b9a6f348b5366c7e725155563374770b82e339e913b9a60d16"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-joystick_1.3.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-joystick_1.3.1.bb
new file mode 100644
index 0000000..b4bad29
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-joystick_1.3.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- joystick input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ff25ea697cfa1570cc28f4b9cf9c761f"
+SRC_URI[archive.sha256sum] = "1d33b9668e039ea9adc0680c1f2971785508cfd74b2215749db23af23ef8f9ce"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-joystick_1.3.2.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-joystick_1.3.2.bb
new file mode 100644
index 0000000..81bde8f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-joystick_1.3.2.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- joystick input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e48b99e55093525ebb7811a014391a0b"
+SRC_URI[archive.sha256sum] = "6cad238e0a54dec75c5224f9c0774b4fce2a03b06f1c61b404e9ea97d4941d4b"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.1.1.bb
new file mode 100644
index 0000000..75f3b39
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.1.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DEPENDS += " kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "babf094e37bdfc08076d4adb4c69c1d9"
+SRC_URI[archive.sha256sum] = "b7e7377d75f3a10cceb5df18019b8e4498fbed0100478edd4af75bf8cd45d6fd"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.2.0.bb
new file mode 100644
index 0000000..465de76
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.2.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DEPENDS += " kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "06e14029e00b32ed085769775b398efd"
+SRC_URI[archive.sha256sum] = "8c45fc324ea01377f9932250824ee1769bdf1eab6e4b661c22a39deb0b01580a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.2.2.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.2.2.bb
new file mode 100644
index 0000000..e407ff5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.2.2.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DEPENDS += " kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ab3122921f6359c54e250879288ffd47"
+SRC_URI[archive.sha256sum] = "c25b35524eaf00928d97bd0d8bf9e489d92993b133461b5f4d8d9655d37ec072"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.3.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.3.1.bb
new file mode 100644
index 0000000..46f8650
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.3.1.bb
@@ -0,0 +1,8 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+DEPENDS += " kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ebe5dcf8eed819103909f18321fc3b9d"
+SRC_URI[archive.sha256sum] = "7b514715dfb5a2512dea3355bc3f09eb879d7184440c5525f0a9d29ec9f3be42"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.3.2.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.3.2.bb
new file mode 100644
index 0000000..7c07927
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-keyboard_1.3.2.bb
@@ -0,0 +1,8 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+DEPENDS += " kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d6fe929c4f6085d6dd67f197ae9c42f6"
+SRC_URI[archive.sha256sum] = "33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-magellan_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-magellan_1.1.0.bb
new file mode 100644
index 0000000..06b901b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-magellan_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0d6a81aa864ac790d9a8b517ca7016ad"
+SRC_URI[archive.sha256sum] = "8eef54b50c428513a330ed7183ce37f269050252a4d1199d3b00ad6bf0a7833d"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-magellan_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-magellan_1.1.1.bb
new file mode 100644
index 0000000..4e020e6
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-magellan_1.1.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- Magellan input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8a966d3b74dc2a801ff09b895037090c"
+SRC_URI[archive.sha256sum] = "06da7d1b222ba47ba0c7fd561965d78f2c8e46f44c998cb768e98bdc3c0e1741"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-microtouch_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-microtouch_1.1.0.bb
new file mode 100644
index 0000000..d8adb95
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-microtouch_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7b3cc0330d70e7e4e07914fcb325b331"
+SRC_URI[archive.sha256sum] = "7f92f5531495ecfbfd00744198fd4b2aa3b8f5c188b115e55e865e961bca2039"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-microtouch_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-microtouch_1.1.1.bb
new file mode 100644
index 0000000..68c58e0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-microtouch_1.1.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- MicroTouch input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9843fbea6cc0c4129e96ce9a6c893cf6"
+SRC_URI[archive.sha256sum] = "5f2f0b16705c6226081a452f9f876508c388b384fca69106d377cd134cfddfd3"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.1.2.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.1.2.bb
new file mode 100644
index 0000000..a113404
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.1.2.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "Mouse Support in X11"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d8bcd9fb1b4efb02acd251495f9a30c1"
+SRC_URI[archive.sha256sum] = "7d4c2ecbe8f9327f7c8093c05401ab68b22f3343bcf04e4838cc40c21b7f8e0a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.2.1.bb
new file mode 100644
index 0000000..0145028
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.2.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "Mouse Support in X11"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "72b07e65bbea6ab484d84c048f6835fb"
+SRC_URI[archive.sha256sum] = "82671998e2b02ad097e3d5cc7d964e11de0b3ca3dfec4876e8fa2a13af6aacc3"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.2.2.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.2.2.bb
new file mode 100644
index 0000000..431b7a7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.2.2.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "Mouse Support in X11"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c47c598e55e7080b8ea30f70781f7ca3"
+SRC_URI[archive.sha256sum] = "80e9cb52b2036b71289b2140bcd3ac202cf46fd42830761c53120ddac38e7edf"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.2.3.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.2.3.bb
new file mode 100644
index 0000000..6f59dd2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.2.3.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "47da1fa52584933d045528109f094eff"
+SRC_URI[archive.sha256sum] = "a07cb2169f43018c90b7889781c0db30cda0da03811edccb8c4db533166357ab"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.3.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.3.0.bb
new file mode 100644
index 0000000..d96f51a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.3.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "31a51b0e5ddc4fac19754f48a3adf881"
+SRC_URI[archive.sha256sum] = "054b253f366795c2865714ce8bc545c79e59aa9ce1b7a9a4a05b9c674dff9dec"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.4.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.4.0.bb
new file mode 100644
index 0000000..8193994
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-mouse_1.4.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e7dc0759c14a9bfd373917a49e5f7c7d"
+SRC_URI[archive.sha256sum] = "e6e1dbd64d41c826619a5881c5aeed46095bfdcb87c3e27d65292fc12a5bb7c7"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-mutouch_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-mutouch_1.1.0.bb
new file mode 100644
index 0000000..50516db
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-mutouch_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "98ae915c67cabf0e6d40a425dbdbe10b"
+SRC_URI[archive.sha256sum] = "cc67e0dd4f4fcc8d798f0bfe42b975132c5739bdd80809580a74182e4d1b62ea"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-mutouch_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-mutouch_1.2.0.bb
new file mode 100644
index 0000000..233cf3b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-mutouch_1.2.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- muTouch input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "50711d390d2867e3fa7e06b59b2d575b"
+SRC_URI[archive.sha256sum] = "214f0831f36ebfc081b9f31f91ae27972ced9371b9b2256650998596a097061d"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-palmax_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-palmax_1.1.0.bb
new file mode 100644
index 0000000..f048b9c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-palmax_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0959dbf7972dfb95f56e4bd3f56447cf"
+SRC_URI[archive.sha256sum] = "5c00c85eed2950a575362bee2f21c2fa68eb8af81e7f1d451273a1302eac4145"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-penmount_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-penmount_1.2.0.bb
new file mode 100644
index 0000000..89e8c91
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-penmount_1.2.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0589f2eaa84afb9bd49b226ce7dacdda"
+SRC_URI[archive.sha256sum] = "dea18a07cf8f59e7bc981cfa1f6ef476dd14f7d9bee3bb1a55a6cc49f766150e"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-penmount_1.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-penmount_1.2.1.bb
new file mode 100644
index 0000000..ee0e818
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-penmount_1.2.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- Penmount input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "268af4dceda544d8c815b9b7e87d4536"
+SRC_URI[archive.sha256sum] = "fab08de727da6f56b82d8ecee451a52e7129ff80522e711c5322f1bd2fa9970a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-penmount_1.3.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-penmount_1.3.0.bb
new file mode 100644
index 0000000..4756ec7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-penmount_1.3.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- Penmount input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "24594c0222e631fedccc7c540c420b03"
+SRC_URI[archive.sha256sum] = "9cb4e0e83dcefe1ece814d638bd186785b6bc1debe1aa2101ce2a4ea0376805a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-spaceorb_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-spaceorb_1.1.0.bb
new file mode 100644
index 0000000..16dcb32
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-spaceorb_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "294810ca9e93c4096458c6a0f2fb5679"
+SRC_URI[archive.sha256sum] = "9cd53cb719bf401ff3f72233d3a88c59539b94eaf11e586e307c807a325f0815"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-summa_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-summa_1.1.0.bb
new file mode 100644
index 0000000..351bb09
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-summa_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b37a432fd87bb9f46d011622d6fce6b3"
+SRC_URI[archive.sha256sum] = "f10f2cadd4120b40b3658000c87f910e3005f4d787441c7dd83b48ebbf2a11f2"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-synaptics_0.15.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-synaptics_0.15.0.bb
new file mode 100644
index 0000000..959c651
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-synaptics_0.15.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "939f1c831c5cd3a6f027e982592dfc5b"
+SRC_URI[archive.sha256sum] = "e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-synaptics_1.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-synaptics_1.2.1.bb
new file mode 100644
index 0000000..0cfb5df
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-synaptics_1.2.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "29a6f9da5123149e4abc8ff83880ed5c"
+SRC_URI[archive.sha256sum] = "a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-tek4957_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-tek4957_1.1.0.bb
new file mode 100644
index 0000000..81965ce
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-tek4957_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "be8a4bd474ad6c85b93f66dd6fcfa6ee"
+SRC_URI[archive.sha256sum] = "09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.4.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.4.0.bb
new file mode 100644
index 0000000..8b58d0d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.4.0.bb
@@ -0,0 +1,9 @@
+require xorg-driver-input.inc
+DESCRIPTION = "The VMMouse driver enables support for the special VMMouse protocol \
+that is provided by VMware virtual machines to give absolute pointer \
+positioning. "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "313e403e56702f6c38d1a5c830b60dc2"
+SRC_URI[archive.sha256sum] = "383e0973aad0e96812fc019cb579abaf016f97427fc07466b150fe15739ba63c"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.4.3.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.4.3.bb
new file mode 100644
index 0000000..e2f4af6
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.4.3.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "44730af795616ed4d4a0cd9a3a07935d"
+SRC_URI[archive.sha256sum] = "d668c4cacd4be6d56608fbdf7779d60120f38f3315e6385a7cc87339124e77ab"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.5.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.5.1.bb
new file mode 100644
index 0000000..b268d75
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.5.1.bb
@@ -0,0 +1,9 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1e2feafb8e4f1b670aeb39bcac9fbb18"
+SRC_URI[archive.sha256sum] = "63608ba07138f01eadb9a02d8054c306501d907dd706ae61fdc030c50a7bfcfb"
+
+COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.6.6.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.6.6.bb
new file mode 100644
index 0000000..5a9fae1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.6.6.bb
@@ -0,0 +1,9 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1c57338928a8897b7ca0b5524fcb1223"
+SRC_URI[archive.sha256sum] = "0cb2896b7a284efd6337c019c599fd4d5a6de74a58c6e6c31c31ed399efa8171"
+
+COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.6.9.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.6.9.bb
new file mode 100644
index 0000000..4b3f2da
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-vmmouse_12.6.9.bb
@@ -0,0 +1,9 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6b7f2ffffc650ed61c9d333aeece893f"
+SRC_URI[archive.sha256sum] = "a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f"
+
+COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-void_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-void_1.1.0.bb
new file mode 100644
index 0000000..d1cb5a9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-void_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ea72a92d43b95f413347df96d6a73933"
+SRC_URI[archive.sha256sum] = "b43c5d920821bd06b6a1a131dd071ab838bf024c3cb092c6d1f10d57b648b0e4"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-input-void_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-input-void_1.1.1.bb
new file mode 100644
index 0000000..a76a38f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-input-void_1.1.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- void input driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "862c230f5f6e0c545f232b4c0fa9537a"
+SRC_URI[archive.sha256sum] = "dde062d6267a3fd9d51b0daee88fd84fceea52a6019de51dece46e92012dbc4f"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-apm_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-apm_1.1.1.bb
new file mode 100644
index 0000000..fd2e16a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-apm_1.1.1.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+"
+DEPENDS += " xf86rushproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ac7e05f0dfc7e02cac0bf17b9eb89b11"
+SRC_URI[archive.sha256sum] = "09d7e6cf30b94f141f8ebe2560b301a058f645e74108edc28c908e750865dcec"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-apm_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-apm_1.2.0.bb
new file mode 100644
index 0000000..241a11c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-apm_1.2.0.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+"
+DEPENDS += " xf86rushproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://get-rid-of-host-includes.patch"
+SRC_URI[archive.md5sum] = "4f78650d79656dc803a720049d65682e"
+SRC_URI[archive.sha256sum] = "f0fe020f892e6e3a696a490c86312a1b32672bffb7dead153c24f103540a6185"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-ark_0.6.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-ark_0.6.0.bb
new file mode 100644
index 0000000..a0595f4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-ark_0.6.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6921479baca8f7b156029489fd335854"
+SRC_URI[archive.sha256sum] = "e5abc4f4ae643ce56d5773f052515196f05786235e4afd155a3232e20dbc84d7"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-ark_0.7.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-ark_0.7.0.bb
new file mode 100644
index 0000000..938d501
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-ark_0.7.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- ark display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://get-rid-of-host-includes.patch"
+SRC_URI[archive.md5sum] = "6826c556ebe9a1248cbc7f7edd44f956"
+SRC_URI[archive.sha256sum] = "8e65e73045fabe37c15f6d4895baa09346bdac2f7537607b523aacd7bcf57594"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-ast_0.81.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-ast_0.81.0.bb
new file mode 100644
index 0000000..2623266
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-ast_0.81.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "04bc08907da13612dbc4918fe54e63e3"
+SRC_URI[archive.sha256sum] = "b95553aaf89bef28051c82914cee2b91102dbc2370d0d855404ba453902459b8"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-ast_0.85.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-ast_0.85.0.bb
new file mode 100644
index 0000000..e5c2bc4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-ast_0.85.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b415bf3259ad0acdaf62e3dde76e3289"
+SRC_URI[archive.sha256sum] = "9018ff84e4866d895c037aad33fb31c79d5f47d3f54707600cc3fe6076485b28"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.13.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.13.0.bb
new file mode 100644
index 0000000..974bb83
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.13.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- ATI display driver"
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7b2642442091808002963920c7693aeb"
+SRC_URI[archive.sha256sum] = "6d07847d63798f92237175f2645bf964d083b18c4c439e6c787a5f0c3dd68e31"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.6.193.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.6.193.bb
new file mode 100644
index 0000000..71e1136
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.6.193.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "102b781f543213852401f3422b18ccc7"
+SRC_URI[archive.sha256sum] = "9b0899694000cb91d5643e2482376af24bd495cb01b4c9dcdd6ee3545b0aefae"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.6.3.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.6.3.bb
new file mode 100644
index 0000000..aaaf3a8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.6.3.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f6d559f9d20f61567d381916b376590f"
+SRC_URI[archive.sha256sum] = "d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.7.196.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.7.196.bb
new file mode 100644
index 0000000..ab69068
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.7.196.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "06db625391c75c8be86c4dd5a5d713e6"
+SRC_URI[archive.sha256sum] = "8923a08232255ceacf770ef767d86bbfb195dffa9559baa1b1de90f9c947a6d9"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.7.197.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.7.197.bb
new file mode 100644
index 0000000..f9a0d8b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.7.197.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- ATI display driver"
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7bd53945ce6d0b48b7fd558039e82aa2"
+SRC_URI[archive.sha256sum] = "b6c67996cfdbbf9b3a191b9092f5d515dd7fae564544626792dd5ef404e29134"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.8.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.8.0.bb
new file mode 100644
index 0000000..1aa67c2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-ati_6.8.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- ATI display driver"
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3c97c7925ebf4162eeb3463e23adc0e3"
+SRC_URI[archive.sha256sum] = "3863851e3c85d25cc38941eec63e866656806821b028519ae32ab8b276664fba"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-chips_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-chips_1.1.1.bb
new file mode 100644
index 0000000..f083306
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-chips_1.1.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3182d43439ca4cbf08ff9aa76990bba3"
+SRC_URI[archive.sha256sum] = "16a81cdb6b311176936c3326d279c0d75530adbcf9a3489eea55992ac5bc7494"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-chips_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-chips_1.2.0.bb
new file mode 100644
index 0000000..79a3cd7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-chips_1.2.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- Chips display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0fec6bee65383790485d917247a61629"
+SRC_URI[archive.sha256sum] = "05f38c49b23be36afa68b738faf520b8dbf05b92c769107039426651801d4f99"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-cirrus_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-cirrus_1.1.0.bb
new file mode 100644
index 0000000..b04396f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-cirrus_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "66344e315def275605dafb314ce59851"
+SRC_URI[archive.sha256sum] = "5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-cirrus_1.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-cirrus_1.2.1.bb
new file mode 100644
index 0000000..c481738
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-cirrus_1.2.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- Cirrus display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "bc28fdedaee9059180e2534f9dbcd2f6"
+SRC_URI[archive.sha256sum] = "e7c99ed66326df5fadf6e5d875859a430fec4369415a27cde72a91109f78bb9c"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-dummy_0.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-dummy_0.2.0.bb
new file mode 100644
index 0000000..13bf350
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-dummy_0.2.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "22b7cc20a33443cbd218bd2521850cfe"
+SRC_URI[archive.sha256sum] = "46013885696f3c1a5e05c5d503abc69e691443319a97cf2c6a01ec031e06c910"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-dummy_0.3.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-dummy_0.3.0.bb
new file mode 100644
index 0000000..b375d93
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-dummy_0.3.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- dummy display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://get-rid-of-host-includes.patch"
+SRC_URI[archive.md5sum] = "3d96297556846bee02a74166ffb5d052"
+SRC_URI[archive.sha256sum] = "5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-dummy_0.3.3.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-dummy_0.3.3.bb
new file mode 100644
index 0000000..625b228
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-dummy_0.3.3.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- dummy display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://get-rid-of-host-includes.patch"
+SRC_URI[archive.md5sum] = "3ffe3a28f4452e66bf56180e7da9cbc5"
+SRC_URI[archive.sha256sum] = "df3f55de7953dba6d7ce10cc5f355da1a6164f781ad9393a38dae502dba4955d"
--git a/recipes/obsolete/xorg/xorg-driver/xf86-video-fbdev/use-staged-headers.patch b/recipes/obsolete/xorg/xorg-driver/xf86-video-fbdev/use-staged-headers.patch
new file mode 100644
index 0000000..0bf41fd
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-fbdev/use-staged-headers.patch
@@ -0,0 +1,48 @@
+Index: xf86-video-fbdev-0.4.0/src/fbdev.c
+===================================================================
+--- xf86-video-fbdev-0.4.0.orig/src/fbdev.c
++++ xf86-video-fbdev-0.4.0/src/fbdev.c
+@@ -10,29 +10,29 @@
+ #include <string.h>
+
+ /* all driver need this */
+-#include "xf86.h"
+-#include "xf86_OSproc.h"
++#include <xf86.h>
++#include <xf86_OSproc.h>
+
+-#include "mipointer.h"
+-#include "mibstore.h"
+-#include "micmap.h"
+-#include "colormapst.h"
+-#include "xf86cmap.h"
++#include <mipointer.h>
++#include <mibstore.h>
++#include <micmap.h>
++#include <colormapst.h>
++#include <xf86cmap.h>
+ #include "shadow.h"
+-#include "dgaproc.h"
++#include <dgaproc.h>
+
+ /* for visuals */
+-#include "fb.h"
++#include <fb.h>
+ #ifdef USE_AFB
+ #include "afb.h"
+ #endif
+
+-#include "xf86Resources.h"
+-#include "xf86RAC.h"
++#include <xf86Resources.h>
++#include <xf86RAC.h>
+
+-#include "fbdevhw.h"
++#include <fbdevhw.h>
+
+-#include "xf86xv.h"
++#include <xf86xv.h>
+
+ #ifdef XSERVER_LIBPCIACCESS
+ #include <pciaccess.h>
+
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-fbdev_0.3.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-fbdev_0.3.1.bb
new file mode 100644
index 0000000..df2f45b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-fbdev_0.3.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9ae810c6c6c3c9713a67866fe794d4ff"
+SRC_URI[archive.sha256sum] = "309d1f618c77559ea494c05d45b09577790c44900685e17bc812e4e1b19df6e7"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-fbdev_0.4.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-fbdev_0.4.0.bb
new file mode 100644
index 0000000..77225cf
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-fbdev_0.4.0.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- fbdev display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6572b39fec77b8e6de1c858a93992924"
+SRC_URI[archive.sha256sum] = "bba725daeb2a313b83f2b92855a9ae8aa72c4cc8581f9f62f101ebdf00ac359d"
+
+FILES_${PN} += " file://use-staged-headers.patch"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-geode/fixes.patch b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode/fixes.patch
new file mode 100644
index 0000000..b581b56
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode/fixes.patch
@@ -0,0 +1,161 @@
+diff --git a/README b/README
+index 8ae3ce7..74f3a9a 100644
+--- a/README
++++ b/README
+@@ -1,6 +1,6 @@
+ AMD Geode GX and LX graphics driver for X.Org
+ =============================================
+-README last updated: 2009-08-04
++README last updated: 2009-09-03
+
+ GIT repository:
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-geode
+@@ -29,15 +29,23 @@ at which point xf86-video-cyrix and xf86-video-nsc will be retired.
+
+ = Dependencies =
+
+-As of version 2.9.0, this driver depends on X.Org server 1.3 or newer,
++As of version 2.11.4, this driver depends upon X server 1.5 or newer,
++because the GX Randr code utilizes dixSetPrivate whose API was modified
++in a non backward-compatible way.
++
++ #ifdef'ing the changes from f1268f3ba8404129d358db3bb1e66f3841f7018a
++ and b28abde0276ddd7f687242f3886f98b0e49a7fc2 might make it possible
++ to build this driver against older X servers. Patches are welcome.
++
++As of version 2.9.0, this driver depends on X server 1.3 or newer,
+ because it utilizes the new common DDC probing libraries from X.Org.
+
+-If necessary, it might be possible to create autoconf macros to make
+-this driver compile against older X servers, following this example:
++ If necessary, it might be possible to create autoconf macros to make
++ this driver compile against older X servers, following this example:
+
+-http://lists.freedesktop.org/archives/xorg-commit/2007-February/010341.html
++ http://lists.freedesktop.org/archives/xorg-commit/2007-February/010341.html
+
+-Patches accomplishing the same trick for the Geode driver are welcome.
++ Patches accomplishing the same trick for the Geode driver are welcome.
+
+ = FAQ =
+
+diff --git a/src/geode.h b/src/geode.h
+index 4f0b467..8fe67b5 100644
+--- a/src/geode.h
++++ b/src/geode.h
+@@ -60,7 +60,7 @@
+ #define LX 0x20
+
+ #define PCI_VENDOR_ID_CYRIX 0x1078
+-#define PCI_VENDOR_ID_NS 0x100B
++#define PCI_VENDOR_ID_NS 0x100b
+ #define PCI_VENDOR_ID_AMD 0x1022
+
+ #define PCI_CHIP_5530 0x0104
+diff --git a/src/gx_driver.c b/src/gx_driver.c
+index 7ff5418..6f5767d 100644
+--- a/src/gx_driver.c
++++ b/src/gx_driver.c
+@@ -464,7 +464,7 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
+ /* Fill in the monitor information */
+ pScrni->monitor = pScrni->confScreen->monitor;
+
+- if (!xf86SetDepthBpp(pScrni, 16, 16, 16, Support24bppFb | Support32bppFb))
++ if (!xf86SetDepthBpp(pScrni, 24, 16, 32, Support24bppFb | Support32bppFb))
+ return FALSE;
+
+ switch (pScrni->depth) {
+diff --git a/src/gx_randr.c b/src/gx_randr.c
+index 2669912..91ca43e 100644
+--- a/src/gx_randr.c
++++ b/src/gx_randr.c
+@@ -56,15 +56,17 @@ typedef struct _GXRandRInfo
+ Rotation supported_rotations; /* driver supported */
+ } XF86RandRInfoRec, *XF86RandRInfoPtr;
+
+-#define AMD_OLDPRIV (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4)
+-
+ static int GXRandRIndex;
+
+-#if AMD_OLDPRIV
+-#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) (p)->devPrivates[GXRandRIndex].ptr)
++#define OLD_VIDEODRV_INTERFACE (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4)
++
++#if OLD_VIDEODRV_INTERFACE
++#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) (p)->devPrivates[GXRandRIndex].ptr)
++#define XF86RANDRSET(p, v) (p)->devPrivates[GXRandRIndex].ptr = v
+ #else
+-#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \
+- dixLookupPrivate(&(p)->devPrivates, &GXRandRIndex));
++#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \
++ dixLookupPrivate(&(p)->devPrivates, &GXRandRIndex))
++#define XF86RANDRSET(p, v) dixSetPrivate(&(p)->devPrivates, &GXRandRIndex, v)
+ #endif
+
+ static int
+@@ -327,7 +329,7 @@ GXRandRInit(ScreenPtr pScreen, int rotation)
+ if (GXRandRGeneration != serverGeneration) {
+ GXRandRGeneration = serverGeneration;
+ }
+-#if AMD_OLDPRIV
++#if OLD_VIDEODRV_INTERFACE
+ GXRandRIndex = AllocateScreenPrivateIndex();
+ #endif
+
+@@ -354,10 +356,7 @@ GXRandRInit(ScreenPtr pScreen, int rotation)
+ pRandr->supported_rotations = rotation;
+ pRandr->maxX = pRandr->maxY = 0;
+
+-#if AMD_OLDPRIV
+- pScreen->devPrivates[GXRandRIndex].ptr = pRandr;
+-#else
+- dixSetPrivate(&pScreen->devPrivates, &GXRandRIndex, pRandr);
+-#endif
++ XF86RANDRSET(pScreen, pRandr);
++
+ return TRUE;
+ }
+diff --git a/src/lx_driver.c b/src/lx_driver.c
+index 08d1fdd..79ec15c 100644
+--- a/src/lx_driver.c
++++ b/src/lx_driver.c
+@@ -331,7 +331,7 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
+ /* Fill in the monitor information */
+ pScrni->monitor = pScrni->confScreen->monitor;
+
+- if (!xf86SetDepthBpp(pScrni, 16, 16, 16, Support24bppFb | Support32bppFb))
++ if (!xf86SetDepthBpp(pScrni, 24, 16, 32, Support24bppFb | Support32bppFb))
+ return FALSE;
+
+ switch (pScrni->depth) {
+diff --git a/src/lx_output.c b/src/lx_output.c
+index 5508477..72e5e2a 100644
+--- a/src/lx_output.c
++++ b/src/lx_output.c
+@@ -108,7 +108,7 @@ lx_output_set_property(xf86OutputPtr output, Atom property,
+
+ if (!ret) {
+ xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
+- "Failed to set mode after propery change!\n");
++ "Failed to set mode after property change!\n");
+
+ pGeode->Scale = scale;
+ return FALSE;
+diff --git a/src/lx_output.c b/src/lx_output.c
+index 72e5e2a..3eecc9e 100644
+--- a/src/lx_output.c
++++ b/src/lx_output.c
+@@ -163,6 +163,13 @@ lx_output_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
+ return MODE_BAD;
+ }
+
++ if (gfx_is_display_mode_supported(pMode->HDisplay,
++ pMode->VDisplay,
++ pScrni->bitsPerPixel,
++ GeodeGetRefreshRate(pMode)) < 0) {
++ return MODE_BAD;
++ }
++
+ return MODE_OK;
+ }
+
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.10.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.10.1.bb
new file mode 100644
index 0000000..9a72053
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.10.1.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e307ab55a2a81d7868506df789f76dfb"
+SRC_URI[archive.sha256sum] = "9b6ef818e402e2c1b7b2f36eff657b8104c67d738f10d4d7d39c7bc118a8c650"
+
+COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.11.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.11.0.bb
new file mode 100644
index 0000000..a909137
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.11.0.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1dbede8f6393edfe6c1ecab2f754b3b2"
+SRC_URI[archive.sha256sum] = "d70c198cde981c3a53b1c41b717dea4bbf1d397d82957f584c641bb5fd02c82d"
+
+COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.11.4.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.11.4.1.bb
new file mode 100644
index 0000000..dccbd74
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.11.4.1.bb
@@ -0,0 +1,10 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fixes.patch"
+SRC_URI[archive.md5sum] = "05f85d897ef41d13de354ac0252bf923"
+SRC_URI[archive.sha256sum] = "d739f6762fe3aa7ef7ca74f87fbe4d6ec3bb13a735e5dfb82b6748eda2b31138"
+
+COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.11.7.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.11.7.bb
new file mode 100644
index 0000000..bdf626f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.11.7.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "086daecd062835eea51e2a718761dda3"
+SRC_URI[archive.sha256sum] = "ed864a37b44dabb760f0b7caac8a796e3b1a0a7f305b44c4684f871b273a9f9b"
+
+COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.8.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.8.0.bb
new file mode 100644
index 0000000..a342ca1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.8.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a2b9c70a32b0a6436d837d67fa7aae18"
+SRC_URI[archive.sha256sum] = "f0b68171dd4256c927fbee91ecf84fa28c409b5b6b39cbf47eaa48fd73db305f"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.9.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.9.0.bb
new file mode 100644
index 0000000..5f411b4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-geode_2.9.0.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d7b3254e6f4f1978fecf8f4fa2823259"
+SRC_URI[archive.sha256sum] = "b9aa934b94c0397e32cd702788fe2b6f2398bdc1a8c83594ad25274f82593590"
+
+COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-glint_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-glint_1.1.1.bb
new file mode 100644
index 0000000..632a7bb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-glint_1.1.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+DEPENDS += " xf86dgaproto drm xf86driproto"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2cf49f701024a145bd25aff9da11d479"
+SRC_URI[archive.sha256sum] = "d63e0dd3f5cecebaf1915193a68ac83e90c1e973e3276a71bd14651d67115e6d"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-glint_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-glint_1.2.0.bb
new file mode 100644
index 0000000..6c721f7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-glint_1.2.0.bb
@@ -0,0 +1,13 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- Glint display driver"
+DEPENDS += " xf86dgaproto drm xf86driproto"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1f5271ac01d4475efe73ab6f2c3646f4"
+SRC_URI[archive.sha256sum] = "a0edd1109c03efdb0f6defc18745f89fb3c11142381e2657f94d492ddd1e7419"
+
+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 \
+"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-glint_1.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-glint_1.2.1.bb
new file mode 100644
index 0000000..e2a9e9b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-glint_1.2.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- Glint display driver"
+DEPENDS += " xf86dgaproto drm xf86driproto"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6d7afdac0a26cf201c3f3b417c31c5e1"
+SRC_URI[archive.sha256sum] = "161780d2127d0548a2017ca461ce38e7a69afce5d921a08604e91478c6be1cda"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.1.0.5.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.1.0.5.bb
new file mode 100644
index 0000000..73be28f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.1.0.5.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "Number Nine I128 for X11"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6e0d3e09fc99d6f0a0e969613ddf58cc"
+SRC_URI[archive.sha256sum] = "a99d2b04b829faa7542545380317c8f59f54ecbd5e0a7008580f3155742d0381"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.1.0.6.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.1.0.6.bb
new file mode 100644
index 0000000..51d911b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.1.0.6.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "Number Nine I128 for X11"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c483efc90b1935025b17e4b9e9c2e4df"
+SRC_URI[archive.sha256sum] = "b52183f5a7d0adee1d21b4b0a0908886b7bbc69dc4498f1e7a3edc4b1988c41c"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.2.1.bb
new file mode 100644
index 0000000..896dc41
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.2.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- i128 display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d0080732eaa15059b0a953aa3522185a"
+SRC_URI[archive.sha256sum] = "0d023cacf8134241cd8efcd5744eb156399406c92f59d3895392f2b5fd055eb1"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.3.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.3.0.bb
new file mode 100644
index 0000000..6b70a68
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.3.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- i128 display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "aff4922d2f02bad7e0d8649358edbcee"
+SRC_URI[archive.sha256sum] = "62eadebd3417ffb3857f10f16597c59541ceb135ddbc30b2140f46d9eb7dddd7"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.3.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.3.1.bb
new file mode 100644
index 0000000..0ff9d08
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-i128_1.3.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- i128 display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3b170a6df5114420cd4021a057918a09"
+SRC_URI[archive.sha256sum] = "49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-i740_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-i740_1.1.0.bb
new file mode 100644
index 0000000..1843998
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-i740_1.1.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "I740 for X11"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "57302e225060a7286ae1a970c87a589b"
+SRC_URI[archive.sha256sum] = "b8f2144c987d8a14f8b477ee3aa43fc1c76d040a77e40938c3c97c8e34e2b7c5"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-i740_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-i740_1.2.0.bb
new file mode 100644
index 0000000..83e2d53
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-i740_1.2.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- i740 display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d0e5a805c546b29b1dd3b55a68d16dc4"
+SRC_URI[archive.sha256sum] = "59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-i810_1.6.5.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-i810_1.6.5.bb
new file mode 100644
index 0000000..d0a5bb8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-i810_1.6.5.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "I810 for X11"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fc1e0da3430551bf25a7babf7ccfd3bf"
+SRC_URI[archive.sha256sum] = "30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.10.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.10.0.bb
new file mode 100644
index 0000000..02a9411
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.10.0.bb
@@ -0,0 +1,11 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto "
+RDEPENDS_${PN} += "xserver-xorg-extension-dri \
+ xserver-xorg-extension-dri2 \
+ xserver-xorg-extension-glx"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "78309d4f04dd8ae6585d120377042741"
+SRC_URI[archive.sha256sum] = "e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.2.1.bb
new file mode 100644
index 0000000..d962ee4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.2.1.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3334dc5142871b78fc609fd1b3dac3f2"
+SRC_URI[archive.sha256sum] = "d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.4.2.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.4.2.bb
new file mode 100644
index 0000000..5da4140
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.4.2.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5cd6b3ed57c7e78ab51e9d9266e73fb6"
+SRC_URI[archive.sha256sum] = "5afdc91e93ffed09ea5258c6fde210c729ea2b44d83f98acfd92c3da7e99e64b"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.6.3.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.6.3.bb
new file mode 100644
index 0000000..635dc7d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-intel_2.6.3.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "440c014bbd3072b5d379fe1bdb861918"
+SRC_URI[archive.sha256sum] = "b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-mach64_6.8.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-mach64_6.8.0.bb
new file mode 100644
index 0000000..8152ac1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-mach64_6.8.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6081b8fa50c689d51f85c2fbaf93867e"
+SRC_URI[archive.sha256sum] = "fba616f88d351759e00a90965e38a0d82608698ae36fc2a18df4036cd384e1a1"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-mga_1.4.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-mga_1.4.1.bb
new file mode 100644
index 0000000..a6911b0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-mga_1.4.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ba373233a7d13084d14046a17b02e248"
+SRC_URI[archive.sha256sum] = "5becb5f0caf0f99296db28b32be46eb95d0a88ac8e4829c47cb637fb52d06564"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-mga_1.4.9.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-mga_1.4.9.bb
new file mode 100644
index 0000000..78b197e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-mga_1.4.9.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "11066b84b949cd04300ec819c9c51532"
+SRC_URI[archive.sha256sum] = "d57dd2323052f064092167a232fb7576f46e5d62e98bc9cc6a7f270cc8d0fdc0"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-mga_1.9.99.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-mga_1.9.99.bb
new file mode 100644
index 0000000..2081b47
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-mga_1.9.99.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- MGA display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "29785ff1de2b0f7b7f1c48350449447c"
+SRC_URI[archive.sha256sum] = "82a91e523d40625c9e042ee640276756d1169cca7eb305c691a3378805c4c81c"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-neomagic_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-neomagic_1.1.1.bb
new file mode 100644
index 0000000..12d3378
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-neomagic_1.1.1.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070"
+DEPENDS += " xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7a3d3d6e60b9686d955c45d9ebbd5c1b"
+SRC_URI[archive.sha256sum] = "d6497080967b8285b663fedd7cafd4457578282ebd7da0b216b6fa214dd88a86"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-neomagic_1.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-neomagic_1.2.1.bb
new file mode 100644
index 0000000..72e8a11
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-neomagic_1.2.1.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070"
+DEPENDS += " xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a72f57fca4f4dff9a2c82eb1fe7456f4"
+SRC_URI[archive.sha256sum] = "96e38d5378596174f76c735c4723ff2ac336f9069644502a9b706586b845e0a5"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-newport_0.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-newport_0.2.1.bb
new file mode 100644
index 0000000..ef8a412
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-newport_0.2.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards."
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2bd8e5b9ea68e0dcd80dfcaca0eff82c"
+SRC_URI[archive.sha256sum] = "66ac855452690ef896400577806dc1dd86318940f8a62ce20039037318b1ce08"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-nsc_2.8.2.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-nsc_2.8.2.bb
new file mode 100644
index 0000000..8c1893f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-nsc_2.8.2.bb
@@ -0,0 +1,11 @@
+require xorg-driver-video.inc
+DEPENDS += " xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1fbdd5e9b5508b032c0102f72d1e555c"
+SRC_URI[archive.sha256sum] = "060493a9dcad81e8912381d2a8d14a3e32a34414296a089756868f3442103c8c"
+
+# This driver is broken because it's seldom updated. It compiles
+# but fails to communicate with the card without this deprecated define.
+EXTRA_OEMAKE += "CFLAGS+=-DXFree86Server"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_1.2.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_1.2.2.1.bb
new file mode 100644
index 0000000..010a7a9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_1.2.2.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e4dc415b1e45db0bbdacc203ed33024a"
+SRC_URI[archive.sha256sum] = "97d47df7720d3cfcb56c4debca9218c3fc5352d34d82bc4880c8a620185f8c5e"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.12.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.12.bb
new file mode 100644
index 0000000..c634388
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.12.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- NV display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "42f12a36d7afc26c817e8e8f5c8b7274"
+SRC_URI[archive.sha256sum] = "f56d2bb42f6c4369dd3c6adc30988c53a229650f910b0db1bb3bf9376054011e"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.16.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.16.bb
new file mode 100644
index 0000000..61efa0f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.16.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- NV display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fb02d5506e35054348d1c2b2c924530d"
+SRC_URI[archive.sha256sum] = "4bf2f964b78d309769faa6a5d21c90a9907886623adf1f30ea890b4329bf578d"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.17.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.17.bb
new file mode 100644
index 0000000..bafcabc
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.17.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- NV display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4401c7b956e60a6d7de68ca6a8ec05d0"
+SRC_URI[archive.sha256sum] = "4286f8994d80a30c7b6b4fc9df6ea5d587f648adc23cb3f523f571738c6900f4"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.3.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.3.bb
new file mode 100644
index 0000000..a0b8b2b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.3.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f9b38e24157c3aac6014119ac18d76da"
+SRC_URI[archive.sha256sum] = "8d9b5ea137c31919f7821e7f3ecbd133158813c1059f4a8ed0a723535d969952"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.7.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.7.bb
new file mode 100644
index 0000000..0e6ea58
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.7.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- NV display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "192414222f1a98e228832ee53f8178c0"
+SRC_URI[archive.sha256sum] = "7c9135d80b519246b2a85ff0481d6ee0fddeb578d669ff490f236f85873e8c5a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.8.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.8.bb
new file mode 100644
index 0000000..7072fd6
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.8.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- NV display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c3e8c98287dc98677bebfbe1ba51ab77"
+SRC_URI[archive.sha256sum] = "825ffb97525517de9f0ff7155946c6e58c278dba11957573cc970dd3b094f94a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.9.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.9.bb
new file mode 100644
index 0000000..c82ed56
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-nv_2.1.9.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- NV display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c6b7e52fa18455c22eb040b8d2575ce5"
+SRC_URI[archive.sha256sum] = "20d92ff3ab4b9ecc150f4ed17a7012a48f56dbf3fb51b51dde769b28922976d9"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-openchrome_0.2.903.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-openchrome_0.2.903.bb
new file mode 100644
index 0000000..6b4d8cb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-openchrome_0.2.903.bb
@@ -0,0 +1,11 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- openchrome display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c0820787e89958c9114d359b6a3cd464"
+SRC_URI[archive.sha256sum] = "b7e4858d6b5c6428fae2485a2c2097cdf6073268ef812aae2ccbc3d936db7410"
+
+do_configure_prepend() {
+ rm ${S}/acinclude.m4 || true
+}
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-r128_6.8.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-r128_6.8.0.bb
new file mode 100644
index 0000000..490112f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-r128_6.8.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- r128 display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "007bec0c6b07d9d3aeca4da18e561efb"
+SRC_URI[archive.sha256sum] = "5689ca714fee9c9272bee12883b07a0ef2c40358ffb19fa684e963027b56567b"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-radeonhd_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-radeonhd_1.2.0.bb
new file mode 100644
index 0000000..b6b4a95
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-radeonhd_1.2.0.bb
@@ -0,0 +1,12 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- AMD/ATI r5xx, r6xx display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6a932ec17da9ce5a6d9000c1649c3a7e"
+SRC_URI[archive.sha256sum] = "87c6353dd52bbe22d3a45f28fb39de1dd44f41568aaf8a9b0d45a7ed62313e27"
+
+EXTRA_OECONF += " \
+ ac_cv_file___src_AtomBios_includes_atombios_h=yes \
+ ac_cv_file___src_AtomBios_includes_Decoder_h=yes \
+"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-rendition_4.1.3.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-rendition_4.1.3.bb
new file mode 100644
index 0000000..942dc58
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-rendition_4.1.3.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00."
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a8b97feccb32184820d5856fe78d34db"
+SRC_URI[archive.sha256sum] = "37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-rendition_4.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-rendition_4.2.0.bb
new file mode 100644
index 0000000..00efa96
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-rendition_4.2.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00."
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7c03de3804d4c4f6ff59f74050d24b2b"
+SRC_URI[archive.sha256sum] = "b57b62f707d87534a799170e31b33311449cfd7019a56e6b4fa85a4c7faaae15"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-s3_0.5.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-s3_0.5.0.bb
new file mode 100644
index 0000000..aa6bf0f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-s3_0.5.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d95ab6445cab477f39adfbbc81006f67"
+SRC_URI[archive.sha256sum] = "4a1206cb1a200aad8881216547d9913d0e24928138f3b1bb912a3336b9c05c97"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-s3_0.6.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-s3_0.6.0.bb
new file mode 100644
index 0000000..52f9584
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-s3_0.6.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- legacy S3 display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d05e7c3cb044437eda8663e174ba913c"
+SRC_URI[archive.sha256sum] = "ed07e4648b0f405fddd563783b49f971d649dd07cc8bc7737a93ff3d90f6c067"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-s3virge_1.10.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-s3virge_1.10.1.bb
new file mode 100644
index 0000000..2b83d22
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-s3virge_1.10.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- S3 ViRGE display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4a293047e988d4ea1e9e96d3b5793f43"
+SRC_URI[archive.sha256sum] = "9094115621ef73c957cf887332717ec727c751959b1059e3d00fbfe0114a978a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-s3virge_1.9.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-s3virge_1.9.1.bb
new file mode 100644
index 0000000..68b534b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-s3virge_1.9.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a91c73285ef67ee7cd9e2da28acb6cc4"
+SRC_URI[archive.sha256sum] = "cef5702963f49e737fb8b1472dc0241f7a5da49f844ac77f2df3e693a84bc822"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-savage_2.1.2.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-savage_2.1.2.bb
new file mode 100644
index 0000000..8f0ed08
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-savage_2.1.2.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6367e921a98f6a7fec9d0a9bc5ff0a47"
+SRC_URI[archive.sha256sum] = "1a9aa442152c139e3c54bc6c323bd13edf0bfff70a81c03969bcb1159317edb2"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-savage_2.1.3.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-savage_2.1.3.bb
new file mode 100644
index 0000000..1c6629f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-savage_2.1.3.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9c5e541613b07de6e7b2b2df3a2e35b1"
+SRC_URI[archive.sha256sum] = "f5f154df377cb445935d1453d6b7095d63912d5776dcb44f8d3c2f10ab1a3cc5"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-savage_2.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-savage_2.2.1.bb
new file mode 100644
index 0000000..66f4b70
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-savage_2.2.1.bb
@@ -0,0 +1,14 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- Savage display driver"
+DEPENDS += " drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "62b8aba48b54eaefeae87df502bf219c"
+SRC_URI[archive.sha256sum] = "adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e"
+
+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 \
+"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-siliconmotion_1.5.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-siliconmotion_1.5.1.bb
new file mode 100644
index 0000000..527b778
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-siliconmotion_1.5.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ee35d7714ce44a2b5ac7ad7b7b7dd75a"
+SRC_URI[archive.sha256sum] = "54cf791695a53d4836d32f899b7d34b969edf5415f02e36956b6e72993e21cd7"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-siliconmotion_1.6.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-siliconmotion_1.6.0.bb
new file mode 100644
index 0000000..f5fb737
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-siliconmotion_1.6.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- SiliconMotion display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a8419a8ed17b02b2a6dd4d30d5e94b00"
+SRC_URI[archive.sha256sum] = "cc5301b9c6adb9a0770509b8570d38730d43e9ffce6d6886cd9a090965017e53"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.10.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.10.0.bb
new file mode 100644
index 0000000..162ab1d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.10.0.bb
@@ -0,0 +1,14 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- SiS display driver"
+DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "331d432dccccca91ec7da39ff6bf1218"
+SRC_URI[archive.sha256sum] = "bcc0dcde5d469cc2500676e0ad29dcd12b1370066289902387ead762260e4b40"
+
+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 \
+"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.10.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.10.1.bb
new file mode 100644
index 0000000..1b58f87
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.10.1.bb
@@ -0,0 +1,14 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- SiS display driver"
+DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9f57c2f5ccbd8340db32da1c74083771"
+SRC_URI[archive.sha256sum] = "11529f094cbdcdaba505596488eda623e0f0bd3c51139359d587ea58b6527307"
+
+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 \
+"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.9.3.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.9.3.bb
new file mode 100644
index 0000000..c5de372
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.9.3.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e35d817fa4ee7beb6cd5aa744b9c0783"
+SRC_URI[archive.sha256sum] = "898ee8fb16fff89ba8ac5c83b9f5a2371084719db0cf034140427229191436f6"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.9.4.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.9.4.bb
new file mode 100644
index 0000000..d316d30
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-sis_0.9.4.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- SiS display driver"
+DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "43f12cabf770b06170cdd1cdaafdc50f"
+SRC_URI[archive.sha256sum] = "50856446841526fc393af6bae0fbc39c20bb07e60056a676d0bc620446b593ac"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-sisusb_0.8.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-sisusb_0.8.1.bb
new file mode 100644
index 0000000..5cc4976
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-sisusb_0.8.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "cbd669507e4aa35e468905f09b546333"
+SRC_URI[archive.sha256sum] = "1596b79ab3e33263bde2d456cc0376808abee80b4cde059605f176d98bdb45cb"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-sisusb_0.9.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-sisusb_0.9.0.bb
new file mode 100644
index 0000000..4fce26a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-sisusb_0.9.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- SiS USB display driver"
+DEPENDS += " xineramaproto xf86miscproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7b1f5465f423a859f306f4f1d6306a1b"
+SRC_URI[archive.sha256sum] = "76b79c9b7d3b35b8e2e5354569bf0936c4afd39a9dcbdf66327714d75137930a"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-sisusb_0.9.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-sisusb_0.9.1.bb
new file mode 100644
index 0000000..2229021
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-sisusb_0.9.1.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- SiS USB display driver"
+DEPENDS += " xineramaproto xf86miscproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "42069e70578bf3fb353cdacad186f6c0"
+SRC_URI[archive.sha256sum] = "b3ca934ce3e31f4a162bf263cad3913edccc46906d09132118b74a2095c157d9"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-suncg14_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-suncg14_1.1.0.bb
new file mode 100644
index 0000000..9729e24
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-suncg14_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9e25784e912cb2f0493b87431fd60773"
+SRC_URI[archive.sha256sum] = "1eca2b0970e725db49f9e462a0c2e618b2616389647335b5aec9d6e495e40527"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-suncg3_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-suncg3_1.1.0.bb
new file mode 100644
index 0000000..031d070
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-suncg3_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b9cb8cfb6a4234bebc434f744af53208"
+SRC_URI[archive.sha256sum] = "3564ebc8ccdfea872d46559166d881e93ac7c17e3ed46bb4087960f491c37df9"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-suncg6_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-suncg6_1.1.0.bb
new file mode 100644
index 0000000..692ddb3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-suncg6_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "aa6b7836fe6ccc99994bf15ff2b74e86"
+SRC_URI[archive.sha256sum] = "d6b1f3b79c57ef5281e0204b2847812cf9fa5df616478f01591445a36537194b"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-sunffb_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-sunffb_1.1.0.bb
new file mode 100644
index 0000000..e20c4fb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-sunffb_1.1.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "dee23564c0d8069f52c7cd29c78be667"
+SRC_URI[archive.sha256sum] = "f897a427e83cf6965fd82724e3298aea44eb3131ba62f904cb514dfd0a879029"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-sunffb_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-sunffb_1.2.0.bb
new file mode 100644
index 0000000..eead699
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-sunffb_1.2.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "816842de26bce8a935f3c9c3cfedbc42"
+SRC_URI[archive.sha256sum] = "59f2f8fc2399a4d6b0ce733481c58694e723a989f4712c00436d35e27c059292"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-sunleo_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-sunleo_1.1.0.bb
new file mode 100644
index 0000000..0970905
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-sunleo_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0408d95795d754c92d12d6476b6932a1"
+SRC_URI[archive.sha256sum] = "b504d50f261bea9bc9dcd2a9c9c3307b24dee97c18d13b5a6deb3eb393270da9"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-suntcx_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-suntcx_1.1.0.bb
new file mode 100644
index 0000000..dc0cb5d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-suntcx_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "779a31151e44d2fd2a5ee1794f836889"
+SRC_URI[archive.sha256sum] = "72986a3981b746f60df1aba443d610db437fe8d5053e64630686f471c47b01cf"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-tdfx_1.3.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-tdfx_1.3.0.bb
new file mode 100644
index 0000000..5bf9bd0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-tdfx_1.3.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "04c49acb5c5dbde14eabd32d06df6e73"
+SRC_URI[archive.sha256sum] = "6b1a00df5c9628817d08f07c6f18f578950744f3eb63b4397be8b0754e728624"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-tdfx_1.4.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-tdfx_1.4.0.bb
new file mode 100644
index 0000000..371823d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-tdfx_1.4.0.bb
@@ -0,0 +1,13 @@
+require xorg-driver-video.inc
+DEPENDS += " drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b13132f24683ef759bfb0c1db5096496"
+SRC_URI[archive.sha256sum] = "c3be06d324f2e49ece1f243b10d7180a32fbe65dbbb81e162279c8608800dead"
+
+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 \
+"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-tga_1.1.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-tga_1.1.0.bb
new file mode 100644
index 0000000..15f4518
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-tga_1.1.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "DEC 21030 X11 driver"
+DEPENDS += " xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9eda4d4490706b2dd8f4ecdbaf779856"
+SRC_URI[archive.sha256sum] = "50143dfdd259fd114dc2f41518a4898d5407bf55422251df75812b96a1fa6e9b"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-tga_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-tga_1.2.0.bb
new file mode 100644
index 0000000..4e20ae3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-tga_1.2.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "DEC 21030 X11 driver"
+DEPENDS += " xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f3bddf0a64932ca9bd72041ccd3b5501"
+SRC_URI[archive.sha256sum] = "a92f8cad0e21318be465719a9f30a50d5719b0b70bf8e15f3937e7850cf1aea6"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-trident_1.2.3.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-trident_1.2.3.bb
new file mode 100644
index 0000000..3d5815e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-trident_1.2.3.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c0e8b2f54942b6902b7dd4f30defe800"
+SRC_URI[archive.sha256sum] = "d23eb8fa165d238ddf64da63dcd60c70a01cd761608a18402cfb95aed6722495"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-trident_1.2.4.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-trident_1.2.4.bb
new file mode 100644
index 0000000..7871b1b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-trident_1.2.4.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.org X server -- Trident display driver"
+DEPENDS += " xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7f628f7eb4abdc4c49bb252eefc4335a"
+SRC_URI[archive.sha256sum] = "f942596e7427a089be9c9353c45c22002999580197c9715d9363d19ee170ba8d"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-trident_1.3.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-trident_1.3.0.bb
new file mode 100644
index 0000000..729eddb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-trident_1.3.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.org X server -- Trident display driver"
+DEPENDS += " xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e89799579d0cf3858362bd751469e0bf"
+SRC_URI[archive.sha256sum] = "a4f66c9f46f6e93c2c1f10e782a211ddc338b0ff9f0a2ccd2d660db031d3ddb5"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-tseng_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-tseng_1.1.1.bb
new file mode 100644
index 0000000..8f0cf7b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-tseng_1.1.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "488aa9c3ec7a95e6589afa4b50bec8b4"
+SRC_URI[archive.sha256sum] = "c9c1f3318715b7268068bc733d00bcab93924e97eb38f94548e442fd6cdfd56e"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-tseng_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-tseng_1.2.0.bb
new file mode 100644
index 0000000..273b05e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-tseng_1.2.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f98fc22142a009dc3a6cdf930c95203f"
+SRC_URI[archive.sha256sum] = "1090d9100934329000ac330d0c66a0ac4f60d2ba83196ea15c2833a28a18b1e3"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-v4l_0.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-v4l_0.1.1.bb
new file mode 100644
index 0000000..407735e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-v4l_0.1.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "Video 4 Linux adaptor driver for X11"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "69339c38eba2cebc357d67e7a755d734"
+SRC_URI[archive.sha256sum] = "33ad549ea3f6a8da7f58d9964f3f2d83aabc6d64c2ebc2ea0033ac8dacaec870"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-vesa_1.3.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-vesa_1.3.0.bb
new file mode 100644
index 0000000..9b153e5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-vesa_1.3.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-includepath.patch"
+SRC_URI[archive.md5sum] = "4a307852f3b4850e436a41dab2a73676"
+SRC_URI[archive.sha256sum] = "b96c80ae81f5123ecef344dac4c734b2e281143d3ab7a7e633d6bf04c893e203"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-vesa_2.0.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-vesa_2.0.0.bb
new file mode 100644
index 0000000..983b31d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-vesa_2.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-includepath.patch \
+ file://fix-configure-includes.patch"
+SRC_URI[archive.md5sum] = "433cf6f961eb4a2ab6fcb086def0b2b4"
+SRC_URI[archive.sha256sum] = "f20b2e429657552eea207fb8bc4b47c8e293d99c229dcb4da11b7c5bfdc1e165"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-vesa_2.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-vesa_2.2.0.bb
new file mode 100644
index 0000000..81b5d2f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-vesa_2.2.0.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+RDEPENDS_${PN} += "xserver-xorg-module-libint10 "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-includepath.patch \
+ file://fix-configure-includes.patch"
+SRC_URI[archive.md5sum] = "9a86b683f73f3806f55d05cd804a6f4a"
+SRC_URI[archive.sha256sum] = "8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.14.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.14.1.bb
new file mode 100644
index 0000000..4e3e5f0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.14.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X11 driver for VMware SVGA Device"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "eaf1ce9fa23363799140602afaa10f37"
+SRC_URI[archive.sha256sum] = "1971fd356ba54204c3611edb9144c43c25c21167a5fa5ee725d3f2e3f9864fa9"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.15.2.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.15.2.bb
new file mode 100644
index 0000000..0b787d3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.15.2.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "99322cbcc9081ad44e9cba63e3df8f7e"
+SRC_URI[archive.sha256sum] = "edae155c82d348b76dabe1373605bf6715b577cdd7a95f8b54ad534dc47c71ff"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.16.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.16.1.bb
new file mode 100644
index 0000000..fbf9826
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.16.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a5e1f2539b82206e411c3647f10c425f"
+SRC_URI[archive.sha256sum] = "91ed99ae936be5df25d310d81e31e0a7efefc023e462d93a9289ac18ebdf4e89"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.16.5.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.16.5.bb
new file mode 100644
index 0000000..e0e0368
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.16.5.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6d78c82ea7c2bb0fcb587d7bb4e8f60a"
+SRC_URI[archive.sha256sum] = "3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.16.9.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.16.9.bb
new file mode 100644
index 0000000..d55c68b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_10.16.9.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3b3d38abfa1f8be4b1e26dcd236bc94f"
+SRC_URI[archive.sha256sum] = "835a5e45b54837cbbd963a48bd09db709717e097e931dd76e68e397a167e8bc1"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_11.0.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_11.0.0.bb
new file mode 100644
index 0000000..fd5dbf8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_11.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2895deafa373b0f87b8a7feaf0ca2373"
+SRC_URI[archive.sha256sum] = "bb538ebb9f000767bcc389562c8deb4cda74aa3e608190f6c3ee1e93d394fb2d"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_11.0.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_11.0.1.bb
new file mode 100644
index 0000000..0caf4aa
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-vmware_11.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "52e9a12843c6469f976db57a7b5f78d2"
+SRC_URI[archive.sha256sum] = "a6371d5acb81ba4457f7ee2c7432941c38f9033ce5278551c6acc9a0827ce7be"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-voodoo_1.1.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-voodoo_1.1.1.bb
new file mode 100644
index 0000000..5e671f4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-voodoo_1.1.1.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X11 driver for Voodoo/Voodoo2"
+DEPENDS += " xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "bc878e795688b49a595b355482d27174"
+SRC_URI[archive.sha256sum] = "3975601baee674b2bad0dfe696586f17cc913f1dc7f1d5c4e184623e0461751c"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-voodoo_1.2.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-voodoo_1.2.0.bb
new file mode 100644
index 0000000..720e2d2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-voodoo_1.2.0.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X11 driver for Voodoo/Voodoo2"
+DEPENDS += " xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7c681d9b57f5e1f798263fc1a9d99245"
+SRC_URI[archive.sha256sum] = "b79ba6d5d4300570c00f8be37c536f47f2d78c18845f70f525da2a29e47c4b8c"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-wsfb_0.2.1.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-wsfb_0.2.1.bb
new file mode 100644
index 0000000..0e11e2d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-wsfb_0.2.1.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DESCRIPTION = "X.Org X server -- wsfb display driver"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c159af867a9af3abc4da332189213a76"
+SRC_URI[archive.sha256sum] = "39e358aa17d939f561a28c82b9e7beca202d7ebd7d40d401c88a9dff3d90d148"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-xgi_1.5.0.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-xgi_1.5.0.bb
new file mode 100644
index 0000000..84c4f05
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-xgi_1.5.0.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "08529fd015191be9244f598aa0894aa6"
+SRC_URI[archive.sha256sum] = "5fb23432ee8940c04494744da8b5f58bebc6ef113e96a50a74f0aa7d98a69194"
diff --git a/recipes/obsolete/xorg/xorg-driver/xf86-video-xgixp_1.7.99.3.bb b/recipes/obsolete/xorg/xorg-driver/xf86-video-xgixp_1.7.99.3.bb
new file mode 100644
index 0000000..fd15b7f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-driver/xf86-video-xgixp_1.7.99.3.bb
@@ -0,0 +1,7 @@
+require xorg-driver-video.inc
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c541152aee693fad743ef7cbf75a7ffc"
+SRC_URI[archive.sha256sum] = "13a1658ee3ead0ab8e8bf7a9c8f8f0e3e40e38138f45d8431e735cd7184fbbd8"
diff --git a/recipes/xorg-driver/xf86-input-acecad_1.1.0.bb b/recipes/xorg-driver/xf86-input-acecad_1.1.0.bb
deleted file mode 100644
index b0eef56..0000000
--- a/recipes/xorg-driver/xf86-input-acecad_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ce0b7bec500273ad935cbfa212b8ac8a"
-SRC_URI[archive.sha256sum] = "3e5feea79f1d48cd46a2a40661140042ac586f90311669f79d65fea6cfc112ad"
diff --git a/recipes/xorg-driver/xf86-input-acecad_1.2.1.bb b/recipes/xorg-driver/xf86-input-acecad_1.2.1.bb
deleted file mode 100644
index 0c0a330..0000000
--- a/recipes/xorg-driver/xf86-input-acecad_1.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- AceCad input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2c371317f2aae34c04db63c19759a44e"
-SRC_URI[archive.sha256sum] = "07d2f8a1153d34a6516b8f1129fc32a18f2862bbb58c9bad4637fb282d60385a"
diff --git a/recipes/xorg-driver/xf86-input-acecad_1.2.2.bb b/recipes/xorg-driver/xf86-input-acecad_1.2.2.bb
deleted file mode 100644
index 843ef1d..0000000
--- a/recipes/xorg-driver/xf86-input-acecad_1.2.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- AceCad input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2d6596b2b0cfa527b5ed4df2014684bf"
-SRC_URI[archive.sha256sum] = "953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e"
diff --git a/recipes/xorg-driver/xf86-input-aiptek_1.0.1.bb b/recipes/xorg-driver/xf86-input-aiptek_1.0.1.bb
deleted file mode 100644
index f1c926d..0000000
--- a/recipes/xorg-driver/xf86-input-aiptek_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "951b2b1a270f67d28e2e89fd2b9f15ae"
-SRC_URI[archive.sha256sum] = "3db0e3259034d838c2ff7ae26718422db6d33d89cd1a2defa0efdddbbbfcc28a"
diff --git a/recipes/xorg-driver/xf86-input-aiptek_1.1.1.bb b/recipes/xorg-driver/xf86-input-aiptek_1.1.1.bb
deleted file mode 100644
index 499869b..0000000
--- a/recipes/xorg-driver/xf86-input-aiptek_1.1.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2aa75313ea5652a8cf93581c65ee6493"
-SRC_URI[archive.sha256sum] = "219116b0275b93333b8471fc94d97320a116d695c4249837fd97763f00a85d77"
diff --git a/recipes/xorg-driver/xf86-input-calcomp_1.1.0.bb b/recipes/xorg-driver/xf86-input-calcomp_1.1.0.bb
deleted file mode 100644
index e42a680..0000000
--- a/recipes/xorg-driver/xf86-input-calcomp_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "af13f9de2af4e1d03b2da0c037fd718a"
-SRC_URI[archive.sha256sum] = "ebc446e74eea72d391104b1ce3b2a5376bced098154ec089a944f4311d240904"
diff --git a/recipes/xorg-driver/xf86-input-calcomp_1.1.1.bb b/recipes/xorg-driver/xf86-input-calcomp_1.1.1.bb
deleted file mode 100644
index 91b6c40..0000000
--- a/recipes/xorg-driver/xf86-input-calcomp_1.1.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- Calcomp input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "689099e2ade8a8c9f68f82fdf569b3ad"
-SRC_URI[archive.sha256sum] = "8117b37da2e031eb983e1e98034710a1511299496fcf235f936caff252fa8957"
diff --git a/recipes/xorg-driver/xf86-input-citron_2.2.0.bb b/recipes/xorg-driver/xf86-input-citron_2.2.0.bb
deleted file mode 100644
index e20503d..0000000
--- a/recipes/xorg-driver/xf86-input-citron_2.2.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1fe53cd055a69650f3c2e02377ec728c"
-SRC_URI[archive.sha256sum] = "26cfa755d3a383f80039fcd286c44ba5f7b353feb8c674f386bb08d741d2c3fe"
diff --git a/recipes/xorg-driver/xf86-input-citron_2.2.1.bb b/recipes/xorg-driver/xf86-input-citron_2.2.1.bb
deleted file mode 100644
index 528e31f..0000000
--- a/recipes/xorg-driver/xf86-input-citron_2.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X Server -- Citron input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4e254fcefb3bea55772e63c12570f6d9"
-SRC_URI[archive.sha256sum] = "1480ba63b342c00a53292d513bd79a69e1ea7c01a0c77d1a368ffb22e37c1a83"
diff --git a/recipes/xorg-driver/xf86-input-digitaledge_1.1.0.bb b/recipes/xorg-driver/xf86-input-digitaledge_1.1.0.bb
deleted file mode 100644
index 4d44741..0000000
--- a/recipes/xorg-driver/xf86-input-digitaledge_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "53461c34cc0712aacab92b820b9fcb84"
-SRC_URI[archive.sha256sum] = "24001f19b46b5bc2fcf8212f04863e4efa90175fac797350525e14848ab98a38"
diff --git a/recipes/xorg-driver/xf86-input-dmc_1.1.0.bb b/recipes/xorg-driver/xf86-input-dmc_1.1.0.bb
deleted file mode 100644
index e263482..0000000
--- a/recipes/xorg-driver/xf86-input-dmc_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e1bcbdefcb839173de79aeb3cd038b77"
-SRC_URI[archive.sha256sum] = "c5ca8fb2dfe0130767b2c10bd0661277a67e7d5b9171a7f5f6264ec48790473f"
diff --git a/recipes/xorg-driver/xf86-input-dmc_1.1.1.bb b/recipes/xorg-driver/xf86-input-dmc_1.1.1.bb
deleted file mode 100644
index cc59a54..0000000
--- a/recipes/xorg-driver/xf86-input-dmc_1.1.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- DMC input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f21f008220bc7687ce1c34ab557ec32f"
-SRC_URI[archive.sha256sum] = "f98c5a7010fa71cee88b4c2470e5cd804e42dfbc5292cf1c20eb75e9b1814002"
diff --git a/recipes/xorg-driver/xf86-input-dynapro_1.1.0.bb b/recipes/xorg-driver/xf86-input-dynapro_1.1.0.bb
deleted file mode 100644
index 96447fc..0000000
--- a/recipes/xorg-driver/xf86-input-dynapro_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1683178d09dfc604dde9ea2aab950a28"
-SRC_URI[archive.sha256sum] = "fc2ad50b1aa027fe57da53cbb73db0b4b9d0de9032f00dd42e7cc0aae7c50d6a"
diff --git a/recipes/xorg-driver/xf86-input-dynapro_1.1.1.bb b/recipes/xorg-driver/xf86-input-dynapro_1.1.1.bb
deleted file mode 100644
index 9b569a3..0000000
--- a/recipes/xorg-driver/xf86-input-dynapro_1.1.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- Dynapro input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "d47be12a230c44a05d56d6b79ebcfc38"
-SRC_URI[archive.sha256sum] = "ed0f1ba81febf8e7a20cfaf32b021fcaa102af37f3070d67d6a101eeb6964992"
diff --git a/recipes/xorg-driver/xf86-input-elo2300_1.1.0.bb b/recipes/xorg-driver/xf86-input-elo2300_1.1.0.bb
deleted file mode 100644
index 4439f6c..0000000
--- a/recipes/xorg-driver/xf86-input-elo2300_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "43885769d6f741272dda162e82902b0d"
-SRC_URI[archive.sha256sum] = "9551f67e24c4573867a64d032d1ff6b63654caab8a85d3c6b2af7748daaa2134"
diff --git a/recipes/xorg-driver/xf86-input-elo2300_1.1.1.bb b/recipes/xorg-driver/xf86-input-elo2300_1.1.1.bb
deleted file mode 100644
index 5f98171..0000000
--- a/recipes/xorg-driver/xf86-input-elo2300_1.1.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- ELO2300 input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4eef20f44954d49571a10b9134fdb663"
-SRC_URI[archive.sha256sum] = "cc2cd97f49cce1795ea74034b1416ff7cd5107e1a69258b09a741d55a98ba005"
diff --git a/recipes/xorg-driver/xf86-input-elographics_1.1.0.bb b/recipes/xorg-driver/xf86-input-elographics_1.1.0.bb
deleted file mode 100644
index ae3a016..0000000
--- a/recipes/xorg-driver/xf86-input-elographics_1.1.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- ELOGraphics input driver"
-PE = "2"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ecb2bf1f800d4f5f4c295f2a0e6b1de7"
-SRC_URI[archive.sha256sum] = "1583e1dae6e3ecd34ba55deae7dfc052efede0378f852de6224308d7e7d5b2d8"
diff --git a/recipes/xorg-driver/xf86-input-elographics_1.2.2.bb b/recipes/xorg-driver/xf86-input-elographics_1.2.2.bb
deleted file mode 100644
index ccda074..0000000
--- a/recipes/xorg-driver/xf86-input-elographics_1.2.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- ELOGraphics input driver"
-PE = "2"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "50a9c32af12ca4733afe23042f012f9c"
-SRC_URI[archive.sha256sum] = "76ded0e6977f7d562a8236bc810423cd050320531be9621d868a48309ebc4d63"
diff --git a/recipes/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb b/recipes/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb
deleted file mode 100644
index 0857670..0000000
--- a/recipes/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "24c33f833bb2db72a07c3d28bfc0aae9"
-SRC_URI[archive.sha256sum] = "f1b7f84175d33f4d18c83cd0d37bd3962acd668922fa074a8ae29e18517cdda7"
diff --git a/recipes/xorg-driver/xf86-input-evdev_1.1.5.bb b/recipes/xorg-driver/xf86-input-evdev_1.1.5.bb
deleted file mode 100644
index 45e3010..0000000
--- a/recipes/xorg-driver/xf86-input-evdev_1.1.5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DEPENDS += " kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "01705ea9a4d1699d5eeb17e7f297a581"
-SRC_URI[archive.sha256sum] = "52b7daab86dade2d189f0378ddf196c018cdc9dd47ade0b3b8fc7591cb4bbe9e"
diff --git a/recipes/xorg-driver/xf86-input-evdev_1.2.0.bb b/recipes/xorg-driver/xf86-input-evdev_1.2.0.bb
deleted file mode 100644
index 6dcfa8e..0000000
--- a/recipes/xorg-driver/xf86-input-evdev_1.2.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- evdev input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0c7c41d3f1637bb559e80c2ad708f05d"
-SRC_URI[archive.sha256sum] = "b23b231d754cab717a4b145ee3a5f3e73db46d877d23502326e9794d92d976ba"
diff --git a/recipes/xorg-driver/xf86-input-evdev_1.99.4.bb b/recipes/xorg-driver/xf86-input-evdev_1.99.4.bb
deleted file mode 100644
index 395bfbc..0000000
--- a/recipes/xorg-driver/xf86-input-evdev_1.99.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- evdev input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f56d98ab11ef77cfcbafb5d93c697791"
-SRC_URI[archive.sha256sum] = "71e896168819bcf50044c175482d03873c31bc6eb355305a87e94772580789dd"
diff --git a/recipes/xorg-driver/xf86-input-evdev_2.0.4.bb b/recipes/xorg-driver/xf86-input-evdev_2.0.4.bb
deleted file mode 100644
index c0458e1..0000000
--- a/recipes/xorg-driver/xf86-input-evdev_2.0.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- evdev input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ac97e155ea4db87a8393297493f9c406"
-SRC_URI[archive.sha256sum] = "825adcadaf4c90d4cb1d0bd21dcf67bf3b895f12f8e7bf186ed936445dc015ca"
diff --git a/recipes/xorg-driver/xf86-input-evdev_2.1.0.bb b/recipes/xorg-driver/xf86-input-evdev_2.1.0.bb
deleted file mode 100644
index 5974386..0000000
--- a/recipes/xorg-driver/xf86-input-evdev_2.1.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- evdev input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a6070ead29b2d81b5b386a96df2661b8"
-SRC_URI[archive.sha256sum] = "45c4b6df8d1dbc4db8aa580be4f3c693ebba4eba4908d82489948827d3bed0e5"
diff --git a/recipes/xorg-driver/xf86-input-evdev_2.2.5.bb b/recipes/xorg-driver/xf86-input-evdev_2.2.5.bb
deleted file mode 100644
index 7605fe3..0000000
--- a/recipes/xorg-driver/xf86-input-evdev_2.2.5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- evdev input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e926692d74ee81ed459d0fe89439ff8b"
-SRC_URI[archive.sha256sum] = "433fd29043cd427ba486bcce471aae3ad1abca94c8682feff92da0c380b8dff3"
diff --git a/recipes/xorg-driver/xf86-input-evdev_2.2.6.bb b/recipes/xorg-driver/xf86-input-evdev_2.2.6.bb
deleted file mode 100644
index b490d18..0000000
--- a/recipes/xorg-driver/xf86-input-evdev_2.2.6.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- evdev input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "bc4b2356e1dbf2d21e1e95249b18f5f8"
-SRC_URI[archive.sha256sum] = "dbf3799e207175e91f50492d51343e5cfdc706f637f6e9f14257b764e86bb3f9"
diff --git a/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb b/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb
deleted file mode 100644
index 32798ca..0000000
--- a/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- evdev input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e56ce4424b89b2409c6e73e007a85da7"
-SRC_URI[archive.sha256sum] = "462f2ae2fd389a87e09fa764a236cd04dcbf85bcfcd8000aa9a3810055511d8f"
diff --git a/recipes/xorg-driver/xf86-input-evdev_2.3.2.bb b/recipes/xorg-driver/xf86-input-evdev_2.3.2.bb
deleted file mode 100644
index 3967e40..0000000
--- a/recipes/xorg-driver/xf86-input-evdev_2.3.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- evdev input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b2bfe368022eedf2671ee28daba31efc"
-SRC_URI[archive.sha256sum] = "029bf469bd013bcc3e384c1297a05a59e4b9b3ba90a26c022b32c0819d115e28"
diff --git a/recipes/xorg-driver/xf86-input-fpit_1.1.0.bb b/recipes/xorg-driver/xf86-input-fpit_1.1.0.bb
deleted file mode 100644
index 57647da..0000000
--- a/recipes/xorg-driver/xf86-input-fpit_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a31066a2076d18619ceaea67f6d89698"
-SRC_URI[archive.sha256sum] = "8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8"
diff --git a/recipes/xorg-driver/xf86-input-fpit_1.2.0.bb b/recipes/xorg-driver/xf86-input-fpit_1.2.0.bb
deleted file mode 100644
index 261dfb0..0000000
--- a/recipes/xorg-driver/xf86-input-fpit_1.2.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0f3e013d5ff58e0aba3d9e1d18830291"
-SRC_URI[archive.sha256sum] = "87e3dd97d57ddb520cafa5e68fa7846cfc3d9d71cb054cdf0e1d650c7b1cff7e"
diff --git a/recipes/xorg-driver/xf86-input-hyperpen_1.1.0.bb b/recipes/xorg-driver/xf86-input-hyperpen_1.1.0.bb
deleted file mode 100644
index 30d24d6..0000000
--- a/recipes/xorg-driver/xf86-input-hyperpen_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1dfccb75069e61e0c6f990b47eb58c40"
-SRC_URI[archive.sha256sum] = "d1c20a3340e06c5634759832dcf2edc6acb41476a4f637eba6880730e607f493"
diff --git a/recipes/xorg-driver/xf86-input-hyperpen_1.2.0.bb b/recipes/xorg-driver/xf86-input-hyperpen_1.2.0.bb
deleted file mode 100644
index cc64178..0000000
--- a/recipes/xorg-driver/xf86-input-hyperpen_1.2.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "175c1e1ad668ebbbe212c1e975dd14f9"
-SRC_URI[archive.sha256sum] = "689d1c5c1f21eed00ae03a01c57482f7bbef36d7e07156556c99febe28c7d413"
diff --git a/recipes/xorg-driver/xf86-input-jamstudio_1.1.0.bb b/recipes/xorg-driver/xf86-input-jamstudio_1.1.0.bb
deleted file mode 100644
index 31c41f3..0000000
--- a/recipes/xorg-driver/xf86-input-jamstudio_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a32e36a24545791a3408cdc5563b6523"
-SRC_URI[archive.sha256sum] = "ce41b360bd08ea31036b79cfc25a32c854147522e4580f5ca1a203233e657e1a"
diff --git a/recipes/xorg-driver/xf86-input-joystick_1.1.0.bb b/recipes/xorg-driver/xf86-input-joystick_1.1.0.bb
deleted file mode 100644
index ffb9ecc..0000000
--- a/recipes/xorg-driver/xf86-input-joystick_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e0025215542c7a11c5a7f9548631dbd7"
-SRC_URI[archive.sha256sum] = "11c3e8056e8f44b9a6f348b5366c7e725155563374770b82e339e913b9a60d16"
diff --git a/recipes/xorg-driver/xf86-input-joystick_1.3.1.bb b/recipes/xorg-driver/xf86-input-joystick_1.3.1.bb
deleted file mode 100644
index b4bad29..0000000
--- a/recipes/xorg-driver/xf86-input-joystick_1.3.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- joystick input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ff25ea697cfa1570cc28f4b9cf9c761f"
-SRC_URI[archive.sha256sum] = "1d33b9668e039ea9adc0680c1f2971785508cfd74b2215749db23af23ef8f9ce"
diff --git a/recipes/xorg-driver/xf86-input-joystick_1.3.2.bb b/recipes/xorg-driver/xf86-input-joystick_1.3.2.bb
deleted file mode 100644
index 81bde8f..0000000
--- a/recipes/xorg-driver/xf86-input-joystick_1.3.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- joystick input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e48b99e55093525ebb7811a014391a0b"
-SRC_URI[archive.sha256sum] = "6cad238e0a54dec75c5224f9c0774b4fce2a03b06f1c61b404e9ea97d4941d4b"
diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.1.1.bb b/recipes/xorg-driver/xf86-input-keyboard_1.1.1.bb
deleted file mode 100644
index 75f3b39..0000000
--- a/recipes/xorg-driver/xf86-input-keyboard_1.1.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DEPENDS += " kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "babf094e37bdfc08076d4adb4c69c1d9"
-SRC_URI[archive.sha256sum] = "b7e7377d75f3a10cceb5df18019b8e4498fbed0100478edd4af75bf8cd45d6fd"
diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.2.0.bb b/recipes/xorg-driver/xf86-input-keyboard_1.2.0.bb
deleted file mode 100644
index 465de76..0000000
--- a/recipes/xorg-driver/xf86-input-keyboard_1.2.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DEPENDS += " kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "06e14029e00b32ed085769775b398efd"
-SRC_URI[archive.sha256sum] = "8c45fc324ea01377f9932250824ee1769bdf1eab6e4b661c22a39deb0b01580a"
diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.2.2.bb b/recipes/xorg-driver/xf86-input-keyboard_1.2.2.bb
deleted file mode 100644
index e407ff5..0000000
--- a/recipes/xorg-driver/xf86-input-keyboard_1.2.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DEPENDS += " kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ab3122921f6359c54e250879288ffd47"
-SRC_URI[archive.sha256sum] = "c25b35524eaf00928d97bd0d8bf9e489d92993b133461b5f4d8d9655d37ec072"
diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.3.1.bb b/recipes/xorg-driver/xf86-input-keyboard_1.3.1.bb
deleted file mode 100644
index 46f8650..0000000
--- a/recipes/xorg-driver/xf86-input-keyboard_1.3.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- keyboard input driver"
-DEPENDS += " kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ebe5dcf8eed819103909f18321fc3b9d"
-SRC_URI[archive.sha256sum] = "7b514715dfb5a2512dea3355bc3f09eb879d7184440c5525f0a9d29ec9f3be42"
diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb b/recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb
deleted file mode 100644
index 7c07927..0000000
--- a/recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- keyboard input driver"
-DEPENDS += " kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "d6fe929c4f6085d6dd67f197ae9c42f6"
-SRC_URI[archive.sha256sum] = "33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2"
diff --git a/recipes/xorg-driver/xf86-input-magellan_1.1.0.bb b/recipes/xorg-driver/xf86-input-magellan_1.1.0.bb
deleted file mode 100644
index 06b901b..0000000
--- a/recipes/xorg-driver/xf86-input-magellan_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0d6a81aa864ac790d9a8b517ca7016ad"
-SRC_URI[archive.sha256sum] = "8eef54b50c428513a330ed7183ce37f269050252a4d1199d3b00ad6bf0a7833d"
diff --git a/recipes/xorg-driver/xf86-input-magellan_1.1.1.bb b/recipes/xorg-driver/xf86-input-magellan_1.1.1.bb
deleted file mode 100644
index 4e020e6..0000000
--- a/recipes/xorg-driver/xf86-input-magellan_1.1.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- Magellan input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8a966d3b74dc2a801ff09b895037090c"
-SRC_URI[archive.sha256sum] = "06da7d1b222ba47ba0c7fd561965d78f2c8e46f44c998cb768e98bdc3c0e1741"
diff --git a/recipes/xorg-driver/xf86-input-microtouch_1.1.0.bb b/recipes/xorg-driver/xf86-input-microtouch_1.1.0.bb
deleted file mode 100644
index d8adb95..0000000
--- a/recipes/xorg-driver/xf86-input-microtouch_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7b3cc0330d70e7e4e07914fcb325b331"
-SRC_URI[archive.sha256sum] = "7f92f5531495ecfbfd00744198fd4b2aa3b8f5c188b115e55e865e961bca2039"
diff --git a/recipes/xorg-driver/xf86-input-microtouch_1.1.1.bb b/recipes/xorg-driver/xf86-input-microtouch_1.1.1.bb
deleted file mode 100644
index 68c58e0..0000000
--- a/recipes/xorg-driver/xf86-input-microtouch_1.1.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- MicroTouch input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9843fbea6cc0c4129e96ce9a6c893cf6"
-SRC_URI[archive.sha256sum] = "5f2f0b16705c6226081a452f9f876508c388b384fca69106d377cd134cfddfd3"
diff --git a/recipes/xorg-driver/xf86-input-mouse_1.1.2.bb b/recipes/xorg-driver/xf86-input-mouse_1.1.2.bb
deleted file mode 100644
index a113404..0000000
--- a/recipes/xorg-driver/xf86-input-mouse_1.1.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "Mouse Support in X11"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "d8bcd9fb1b4efb02acd251495f9a30c1"
-SRC_URI[archive.sha256sum] = "7d4c2ecbe8f9327f7c8093c05401ab68b22f3343bcf04e4838cc40c21b7f8e0a"
diff --git a/recipes/xorg-driver/xf86-input-mouse_1.2.1.bb b/recipes/xorg-driver/xf86-input-mouse_1.2.1.bb
deleted file mode 100644
index 0145028..0000000
--- a/recipes/xorg-driver/xf86-input-mouse_1.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "Mouse Support in X11"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "72b07e65bbea6ab484d84c048f6835fb"
-SRC_URI[archive.sha256sum] = "82671998e2b02ad097e3d5cc7d964e11de0b3ca3dfec4876e8fa2a13af6aacc3"
diff --git a/recipes/xorg-driver/xf86-input-mouse_1.2.2.bb b/recipes/xorg-driver/xf86-input-mouse_1.2.2.bb
deleted file mode 100644
index 431b7a7..0000000
--- a/recipes/xorg-driver/xf86-input-mouse_1.2.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "Mouse Support in X11"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c47c598e55e7080b8ea30f70781f7ca3"
-SRC_URI[archive.sha256sum] = "80e9cb52b2036b71289b2140bcd3ac202cf46fd42830761c53120ddac38e7edf"
diff --git a/recipes/xorg-driver/xf86-input-mouse_1.2.3.bb b/recipes/xorg-driver/xf86-input-mouse_1.2.3.bb
deleted file mode 100644
index 6f59dd2..0000000
--- a/recipes/xorg-driver/xf86-input-mouse_1.2.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- mouse input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "47da1fa52584933d045528109f094eff"
-SRC_URI[archive.sha256sum] = "a07cb2169f43018c90b7889781c0db30cda0da03811edccb8c4db533166357ab"
diff --git a/recipes/xorg-driver/xf86-input-mouse_1.3.0.bb b/recipes/xorg-driver/xf86-input-mouse_1.3.0.bb
deleted file mode 100644
index d96f51a..0000000
--- a/recipes/xorg-driver/xf86-input-mouse_1.3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- mouse input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "31a51b0e5ddc4fac19754f48a3adf881"
-SRC_URI[archive.sha256sum] = "054b253f366795c2865714ce8bc545c79e59aa9ce1b7a9a4a05b9c674dff9dec"
diff --git a/recipes/xorg-driver/xf86-input-mouse_1.4.0.bb b/recipes/xorg-driver/xf86-input-mouse_1.4.0.bb
deleted file mode 100644
index 8193994..0000000
--- a/recipes/xorg-driver/xf86-input-mouse_1.4.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- mouse input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e7dc0759c14a9bfd373917a49e5f7c7d"
-SRC_URI[archive.sha256sum] = "e6e1dbd64d41c826619a5881c5aeed46095bfdcb87c3e27d65292fc12a5bb7c7"
diff --git a/recipes/xorg-driver/xf86-input-mutouch_1.1.0.bb b/recipes/xorg-driver/xf86-input-mutouch_1.1.0.bb
deleted file mode 100644
index 50516db..0000000
--- a/recipes/xorg-driver/xf86-input-mutouch_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "98ae915c67cabf0e6d40a425dbdbe10b"
-SRC_URI[archive.sha256sum] = "cc67e0dd4f4fcc8d798f0bfe42b975132c5739bdd80809580a74182e4d1b62ea"
diff --git a/recipes/xorg-driver/xf86-input-mutouch_1.2.0.bb b/recipes/xorg-driver/xf86-input-mutouch_1.2.0.bb
deleted file mode 100644
index 233cf3b..0000000
--- a/recipes/xorg-driver/xf86-input-mutouch_1.2.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- muTouch input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "50711d390d2867e3fa7e06b59b2d575b"
-SRC_URI[archive.sha256sum] = "214f0831f36ebfc081b9f31f91ae27972ced9371b9b2256650998596a097061d"
diff --git a/recipes/xorg-driver/xf86-input-palmax_1.1.0.bb b/recipes/xorg-driver/xf86-input-palmax_1.1.0.bb
deleted file mode 100644
index f048b9c..0000000
--- a/recipes/xorg-driver/xf86-input-palmax_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0959dbf7972dfb95f56e4bd3f56447cf"
-SRC_URI[archive.sha256sum] = "5c00c85eed2950a575362bee2f21c2fa68eb8af81e7f1d451273a1302eac4145"
diff --git a/recipes/xorg-driver/xf86-input-penmount_1.2.0.bb b/recipes/xorg-driver/xf86-input-penmount_1.2.0.bb
deleted file mode 100644
index 89e8c91..0000000
--- a/recipes/xorg-driver/xf86-input-penmount_1.2.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0589f2eaa84afb9bd49b226ce7dacdda"
-SRC_URI[archive.sha256sum] = "dea18a07cf8f59e7bc981cfa1f6ef476dd14f7d9bee3bb1a55a6cc49f766150e"
diff --git a/recipes/xorg-driver/xf86-input-penmount_1.2.1.bb b/recipes/xorg-driver/xf86-input-penmount_1.2.1.bb
deleted file mode 100644
index ee0e818..0000000
--- a/recipes/xorg-driver/xf86-input-penmount_1.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- Penmount input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "268af4dceda544d8c815b9b7e87d4536"
-SRC_URI[archive.sha256sum] = "fab08de727da6f56b82d8ecee451a52e7129ff80522e711c5322f1bd2fa9970a"
diff --git a/recipes/xorg-driver/xf86-input-penmount_1.3.0.bb b/recipes/xorg-driver/xf86-input-penmount_1.3.0.bb
deleted file mode 100644
index 4756ec7..0000000
--- a/recipes/xorg-driver/xf86-input-penmount_1.3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- Penmount input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "24594c0222e631fedccc7c540c420b03"
-SRC_URI[archive.sha256sum] = "9cb4e0e83dcefe1ece814d638bd186785b6bc1debe1aa2101ce2a4ea0376805a"
diff --git a/recipes/xorg-driver/xf86-input-spaceorb_1.1.0.bb b/recipes/xorg-driver/xf86-input-spaceorb_1.1.0.bb
deleted file mode 100644
index 16dcb32..0000000
--- a/recipes/xorg-driver/xf86-input-spaceorb_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "294810ca9e93c4096458c6a0f2fb5679"
-SRC_URI[archive.sha256sum] = "9cd53cb719bf401ff3f72233d3a88c59539b94eaf11e586e307c807a325f0815"
diff --git a/recipes/xorg-driver/xf86-input-summa_1.1.0.bb b/recipes/xorg-driver/xf86-input-summa_1.1.0.bb
deleted file mode 100644
index 351bb09..0000000
--- a/recipes/xorg-driver/xf86-input-summa_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b37a432fd87bb9f46d011622d6fce6b3"
-SRC_URI[archive.sha256sum] = "f10f2cadd4120b40b3658000c87f910e3005f4d787441c7dd83b48ebbf2a11f2"
diff --git a/recipes/xorg-driver/xf86-input-synaptics_0.15.0.bb b/recipes/xorg-driver/xf86-input-synaptics_0.15.0.bb
deleted file mode 100644
index 959c651..0000000
--- a/recipes/xorg-driver/xf86-input-synaptics_0.15.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- mouse input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "939f1c831c5cd3a6f027e982592dfc5b"
-SRC_URI[archive.sha256sum] = "e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b"
diff --git a/recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb b/recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb
deleted file mode 100644
index 0cfb5df..0000000
--- a/recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- mouse input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "29a6f9da5123149e4abc8ff83880ed5c"
-SRC_URI[archive.sha256sum] = "a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6"
diff --git a/recipes/xorg-driver/xf86-input-tek4957_1.1.0.bb b/recipes/xorg-driver/xf86-input-tek4957_1.1.0.bb
deleted file mode 100644
index 81965ce..0000000
--- a/recipes/xorg-driver/xf86-input-tek4957_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "be8a4bd474ad6c85b93f66dd6fcfa6ee"
-SRC_URI[archive.sha256sum] = "09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727"
diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.4.0.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.4.0.bb
deleted file mode 100644
index 8b58d0d..0000000
--- a/recipes/xorg-driver/xf86-input-vmmouse_12.4.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "The VMMouse driver enables support for the special VMMouse protocol \
-that is provided by VMware virtual machines to give absolute pointer \
-positioning. "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "313e403e56702f6c38d1a5c830b60dc2"
-SRC_URI[archive.sha256sum] = "383e0973aad0e96812fc019cb579abaf016f97427fc07466b150fe15739ba63c"
diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.4.3.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.4.3.bb
deleted file mode 100644
index e2f4af6..0000000
--- a/recipes/xorg-driver/xf86-input-vmmouse_12.4.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "44730af795616ed4d4a0cd9a3a07935d"
-SRC_URI[archive.sha256sum] = "d668c4cacd4be6d56608fbdf7779d60120f38f3315e6385a7cc87339124e77ab"
diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.5.1.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.5.1.bb
deleted file mode 100644
index b268d75..0000000
--- a/recipes/xorg-driver/xf86-input-vmmouse_12.5.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1e2feafb8e4f1b670aeb39bcac9fbb18"
-SRC_URI[archive.sha256sum] = "63608ba07138f01eadb9a02d8054c306501d907dd706ae61fdc030c50a7bfcfb"
-
-COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.6.6.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.6.6.bb
deleted file mode 100644
index 5a9fae1..0000000
--- a/recipes/xorg-driver/xf86-input-vmmouse_12.6.6.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1c57338928a8897b7ca0b5524fcb1223"
-SRC_URI[archive.sha256sum] = "0cb2896b7a284efd6337c019c599fd4d5a6de74a58c6e6c31c31ed399efa8171"
-
-COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.6.9.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.6.9.bb
deleted file mode 100644
index 4b3f2da..0000000
--- a/recipes/xorg-driver/xf86-input-vmmouse_12.6.9.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6b7f2ffffc650ed61c9d333aeece893f"
-SRC_URI[archive.sha256sum] = "a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f"
-
-COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/xorg-driver/xf86-input-void_1.1.0.bb b/recipes/xorg-driver/xf86-input-void_1.1.0.bb
deleted file mode 100644
index d1cb5a9..0000000
--- a/recipes/xorg-driver/xf86-input-void_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-input.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ea72a92d43b95f413347df96d6a73933"
-SRC_URI[archive.sha256sum] = "b43c5d920821bd06b6a1a131dd071ab838bf024c3cb092c6d1f10d57b648b0e4"
diff --git a/recipes/xorg-driver/xf86-input-void_1.1.1.bb b/recipes/xorg-driver/xf86-input-void_1.1.1.bb
deleted file mode 100644
index a76a38f..0000000
--- a/recipes/xorg-driver/xf86-input-void_1.1.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-input.inc
-DESCRIPTION = "X.Org X server -- void input driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "862c230f5f6e0c545f232b4c0fa9537a"
-SRC_URI[archive.sha256sum] = "dde062d6267a3fd9d51b0daee88fd84fceea52a6019de51dece46e92012dbc4f"
diff --git a/recipes/xorg-driver/xf86-video-apm_1.1.1.bb b/recipes/xorg-driver/xf86-video-apm_1.1.1.bb
deleted file mode 100644
index fd2e16a..0000000
--- a/recipes/xorg-driver/xf86-video-apm_1.1.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+"
-DEPENDS += " xf86rushproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ac7e05f0dfc7e02cac0bf17b9eb89b11"
-SRC_URI[archive.sha256sum] = "09d7e6cf30b94f141f8ebe2560b301a058f645e74108edc28c908e750865dcec"
diff --git a/recipes/xorg-driver/xf86-video-apm_1.2.0.bb b/recipes/xorg-driver/xf86-video-apm_1.2.0.bb
deleted file mode 100644
index 241a11c..0000000
--- a/recipes/xorg-driver/xf86-video-apm_1.2.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+"
-DEPENDS += " xf86rushproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://get-rid-of-host-includes.patch"
-SRC_URI[archive.md5sum] = "4f78650d79656dc803a720049d65682e"
-SRC_URI[archive.sha256sum] = "f0fe020f892e6e3a696a490c86312a1b32672bffb7dead153c24f103540a6185"
diff --git a/recipes/xorg-driver/xf86-video-ark_0.6.0.bb b/recipes/xorg-driver/xf86-video-ark_0.6.0.bb
deleted file mode 100644
index a0595f4..0000000
--- a/recipes/xorg-driver/xf86-video-ark_0.6.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6921479baca8f7b156029489fd335854"
-SRC_URI[archive.sha256sum] = "e5abc4f4ae643ce56d5773f052515196f05786235e4afd155a3232e20dbc84d7"
diff --git a/recipes/xorg-driver/xf86-video-ark_0.7.0.bb b/recipes/xorg-driver/xf86-video-ark_0.7.0.bb
deleted file mode 100644
index 938d501..0000000
--- a/recipes/xorg-driver/xf86-video-ark_0.7.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- ark display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://get-rid-of-host-includes.patch"
-SRC_URI[archive.md5sum] = "6826c556ebe9a1248cbc7f7edd44f956"
-SRC_URI[archive.sha256sum] = "8e65e73045fabe37c15f6d4895baa09346bdac2f7537607b523aacd7bcf57594"
diff --git a/recipes/xorg-driver/xf86-video-ast_0.81.0.bb b/recipes/xorg-driver/xf86-video-ast_0.81.0.bb
deleted file mode 100644
index 2623266..0000000
--- a/recipes/xorg-driver/xf86-video-ast_0.81.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "04bc08907da13612dbc4918fe54e63e3"
-SRC_URI[archive.sha256sum] = "b95553aaf89bef28051c82914cee2b91102dbc2370d0d855404ba453902459b8"
diff --git a/recipes/xorg-driver/xf86-video-ast_0.85.0.bb b/recipes/xorg-driver/xf86-video-ast_0.85.0.bb
deleted file mode 100644
index e5c2bc4..0000000
--- a/recipes/xorg-driver/xf86-video-ast_0.85.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b415bf3259ad0acdaf62e3dde76e3289"
-SRC_URI[archive.sha256sum] = "9018ff84e4866d895c037aad33fb31c79d5f47d3f54707600cc3fe6076485b28"
diff --git a/recipes/xorg-driver/xf86-video-ati_6.13.0.bb b/recipes/xorg-driver/xf86-video-ati_6.13.0.bb
deleted file mode 100644
index 974bb83..0000000
--- a/recipes/xorg-driver/xf86-video-ati_6.13.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- ATI display driver"
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7b2642442091808002963920c7693aeb"
-SRC_URI[archive.sha256sum] = "6d07847d63798f92237175f2645bf964d083b18c4c439e6c787a5f0c3dd68e31"
diff --git a/recipes/xorg-driver/xf86-video-ati_6.6.193.bb b/recipes/xorg-driver/xf86-video-ati_6.6.193.bb
deleted file mode 100644
index 71e1136..0000000
--- a/recipes/xorg-driver/xf86-video-ati_6.6.193.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "102b781f543213852401f3422b18ccc7"
-SRC_URI[archive.sha256sum] = "9b0899694000cb91d5643e2482376af24bd495cb01b4c9dcdd6ee3545b0aefae"
diff --git a/recipes/xorg-driver/xf86-video-ati_6.6.3.bb b/recipes/xorg-driver/xf86-video-ati_6.6.3.bb
deleted file mode 100644
index aaaf3a8..0000000
--- a/recipes/xorg-driver/xf86-video-ati_6.6.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f6d559f9d20f61567d381916b376590f"
-SRC_URI[archive.sha256sum] = "d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780"
diff --git a/recipes/xorg-driver/xf86-video-ati_6.7.196.bb b/recipes/xorg-driver/xf86-video-ati_6.7.196.bb
deleted file mode 100644
index ab69068..0000000
--- a/recipes/xorg-driver/xf86-video-ati_6.7.196.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "06db625391c75c8be86c4dd5a5d713e6"
-SRC_URI[archive.sha256sum] = "8923a08232255ceacf770ef767d86bbfb195dffa9559baa1b1de90f9c947a6d9"
diff --git a/recipes/xorg-driver/xf86-video-ati_6.7.197.bb b/recipes/xorg-driver/xf86-video-ati_6.7.197.bb
deleted file mode 100644
index f9a0d8b..0000000
--- a/recipes/xorg-driver/xf86-video-ati_6.7.197.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- ATI display driver"
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7bd53945ce6d0b48b7fd558039e82aa2"
-SRC_URI[archive.sha256sum] = "b6c67996cfdbbf9b3a191b9092f5d515dd7fae564544626792dd5ef404e29134"
diff --git a/recipes/xorg-driver/xf86-video-ati_6.8.0.bb b/recipes/xorg-driver/xf86-video-ati_6.8.0.bb
deleted file mode 100644
index 1aa67c2..0000000
--- a/recipes/xorg-driver/xf86-video-ati_6.8.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- ATI display driver"
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3c97c7925ebf4162eeb3463e23adc0e3"
-SRC_URI[archive.sha256sum] = "3863851e3c85d25cc38941eec63e866656806821b028519ae32ab8b276664fba"
diff --git a/recipes/xorg-driver/xf86-video-chips_1.1.1.bb b/recipes/xorg-driver/xf86-video-chips_1.1.1.bb
deleted file mode 100644
index f083306..0000000
--- a/recipes/xorg-driver/xf86-video-chips_1.1.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3182d43439ca4cbf08ff9aa76990bba3"
-SRC_URI[archive.sha256sum] = "16a81cdb6b311176936c3326d279c0d75530adbcf9a3489eea55992ac5bc7494"
diff --git a/recipes/xorg-driver/xf86-video-chips_1.2.0.bb b/recipes/xorg-driver/xf86-video-chips_1.2.0.bb
deleted file mode 100644
index 79a3cd7..0000000
--- a/recipes/xorg-driver/xf86-video-chips_1.2.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- Chips display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0fec6bee65383790485d917247a61629"
-SRC_URI[archive.sha256sum] = "05f38c49b23be36afa68b738faf520b8dbf05b92c769107039426651801d4f99"
diff --git a/recipes/xorg-driver/xf86-video-cirrus_1.1.0.bb b/recipes/xorg-driver/xf86-video-cirrus_1.1.0.bb
deleted file mode 100644
index b04396f..0000000
--- a/recipes/xorg-driver/xf86-video-cirrus_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "66344e315def275605dafb314ce59851"
-SRC_URI[archive.sha256sum] = "5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b"
diff --git a/recipes/xorg-driver/xf86-video-cirrus_1.2.1.bb b/recipes/xorg-driver/xf86-video-cirrus_1.2.1.bb
deleted file mode 100644
index c481738..0000000
--- a/recipes/xorg-driver/xf86-video-cirrus_1.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- Cirrus display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "bc28fdedaee9059180e2534f9dbcd2f6"
-SRC_URI[archive.sha256sum] = "e7c99ed66326df5fadf6e5d875859a430fec4369415a27cde72a91109f78bb9c"
diff --git a/recipes/xorg-driver/xf86-video-dummy_0.2.0.bb b/recipes/xorg-driver/xf86-video-dummy_0.2.0.bb
deleted file mode 100644
index 13bf350..0000000
--- a/recipes/xorg-driver/xf86-video-dummy_0.2.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "22b7cc20a33443cbd218bd2521850cfe"
-SRC_URI[archive.sha256sum] = "46013885696f3c1a5e05c5d503abc69e691443319a97cf2c6a01ec031e06c910"
diff --git a/recipes/xorg-driver/xf86-video-dummy_0.3.0.bb b/recipes/xorg-driver/xf86-video-dummy_0.3.0.bb
deleted file mode 100644
index b375d93..0000000
--- a/recipes/xorg-driver/xf86-video-dummy_0.3.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- dummy display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://get-rid-of-host-includes.patch"
-SRC_URI[archive.md5sum] = "3d96297556846bee02a74166ffb5d052"
-SRC_URI[archive.sha256sum] = "5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278"
diff --git a/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb b/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb
deleted file mode 100644
index 625b228..0000000
--- a/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- dummy display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://get-rid-of-host-includes.patch"
-SRC_URI[archive.md5sum] = "3ffe3a28f4452e66bf56180e7da9cbc5"
-SRC_URI[archive.sha256sum] = "df3f55de7953dba6d7ce10cc5f355da1a6164f781ad9393a38dae502dba4955d"
diff --git a/recipes/xorg-driver/xf86-video-fbdev/use-staged-headers.patch b/recipes/xorg-driver/xf86-video-fbdev/use-staged-headers.patch
deleted file mode 100644
index 0bf41fd..0000000
--- a/recipes/xorg-driver/xf86-video-fbdev/use-staged-headers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: xf86-video-fbdev-0.4.0/src/fbdev.c
-===================================================================
---- xf86-video-fbdev-0.4.0.orig/src/fbdev.c
-+++ xf86-video-fbdev-0.4.0/src/fbdev.c
-@@ -10,29 +10,29 @@
- #include <string.h>
-
- /* all driver need this */
--#include "xf86.h"
--#include "xf86_OSproc.h"
-+#include <xf86.h>
-+#include <xf86_OSproc.h>
-
--#include "mipointer.h"
--#include "mibstore.h"
--#include "micmap.h"
--#include "colormapst.h"
--#include "xf86cmap.h"
-+#include <mipointer.h>
-+#include <mibstore.h>
-+#include <micmap.h>
-+#include <colormapst.h>
-+#include <xf86cmap.h>
- #include "shadow.h"
--#include "dgaproc.h"
-+#include <dgaproc.h>
-
- /* for visuals */
--#include "fb.h"
-+#include <fb.h>
- #ifdef USE_AFB
- #include "afb.h"
- #endif
-
--#include "xf86Resources.h"
--#include "xf86RAC.h"
-+#include <xf86Resources.h>
-+#include <xf86RAC.h>
-
--#include "fbdevhw.h"
-+#include <fbdevhw.h>
-
--#include "xf86xv.h"
-+#include <xf86xv.h>
-
- #ifdef XSERVER_LIBPCIACCESS
- #include <pciaccess.h>
-
diff --git a/recipes/xorg-driver/xf86-video-fbdev_0.3.1.bb b/recipes/xorg-driver/xf86-video-fbdev_0.3.1.bb
deleted file mode 100644
index df2f45b..0000000
--- a/recipes/xorg-driver/xf86-video-fbdev_0.3.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9ae810c6c6c3c9713a67866fe794d4ff"
-SRC_URI[archive.sha256sum] = "309d1f618c77559ea494c05d45b09577790c44900685e17bc812e4e1b19df6e7"
diff --git a/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb b/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb
deleted file mode 100644
index 77225cf..0000000
--- a/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- fbdev display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6572b39fec77b8e6de1c858a93992924"
-SRC_URI[archive.sha256sum] = "bba725daeb2a313b83f2b92855a9ae8aa72c4cc8581f9f62f101ebdf00ac359d"
-
-FILES_${PN} += " file://use-staged-headers.patch"
diff --git a/recipes/xorg-driver/xf86-video-geode/fixes.patch b/recipes/xorg-driver/xf86-video-geode/fixes.patch
deleted file mode 100644
index b581b56..0000000
--- a/recipes/xorg-driver/xf86-video-geode/fixes.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff --git a/README b/README
-index 8ae3ce7..74f3a9a 100644
---- a/README
-+++ b/README
-@@ -1,6 +1,6 @@
- AMD Geode GX and LX graphics driver for X.Org
- =============================================
--README last updated: 2009-08-04
-+README last updated: 2009-09-03
-
- GIT repository:
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-geode
-@@ -29,15 +29,23 @@ at which point xf86-video-cyrix and xf86-video-nsc will be retired.
-
- = Dependencies =
-
--As of version 2.9.0, this driver depends on X.Org server 1.3 or newer,
-+As of version 2.11.4, this driver depends upon X server 1.5 or newer,
-+because the GX Randr code utilizes dixSetPrivate whose API was modified
-+in a non backward-compatible way.
-+
-+ #ifdef'ing the changes from f1268f3ba8404129d358db3bb1e66f3841f7018a
-+ and b28abde0276ddd7f687242f3886f98b0e49a7fc2 might make it possible
-+ to build this driver against older X servers. Patches are welcome.
-+
-+As of version 2.9.0, this driver depends on X server 1.3 or newer,
- because it utilizes the new common DDC probing libraries from X.Org.
-
--If necessary, it might be possible to create autoconf macros to make
--this driver compile against older X servers, following this example:
-+ If necessary, it might be possible to create autoconf macros to make
-+ this driver compile against older X servers, following this example:
-
--http://lists.freedesktop.org/archives/xorg-commit/2007-February/010341.html
-+ http://lists.freedesktop.org/archives/xorg-commit/2007-February/010341.html
-
--Patches accomplishing the same trick for the Geode driver are welcome.
-+ Patches accomplishing the same trick for the Geode driver are welcome.
-
- = FAQ =
-
-diff --git a/src/geode.h b/src/geode.h
-index 4f0b467..8fe67b5 100644
---- a/src/geode.h
-+++ b/src/geode.h
-@@ -60,7 +60,7 @@
- #define LX 0x20
-
- #define PCI_VENDOR_ID_CYRIX 0x1078
--#define PCI_VENDOR_ID_NS 0x100B
-+#define PCI_VENDOR_ID_NS 0x100b
- #define PCI_VENDOR_ID_AMD 0x1022
-
- #define PCI_CHIP_5530 0x0104
-diff --git a/src/gx_driver.c b/src/gx_driver.c
-index 7ff5418..6f5767d 100644
---- a/src/gx_driver.c
-+++ b/src/gx_driver.c
-@@ -464,7 +464,7 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
- /* Fill in the monitor information */
- pScrni->monitor = pScrni->confScreen->monitor;
-
-- if (!xf86SetDepthBpp(pScrni, 16, 16, 16, Support24bppFb | Support32bppFb))
-+ if (!xf86SetDepthBpp(pScrni, 24, 16, 32, Support24bppFb | Support32bppFb))
- return FALSE;
-
- switch (pScrni->depth) {
-diff --git a/src/gx_randr.c b/src/gx_randr.c
-index 2669912..91ca43e 100644
---- a/src/gx_randr.c
-+++ b/src/gx_randr.c
-@@ -56,15 +56,17 @@ typedef struct _GXRandRInfo
- Rotation supported_rotations; /* driver supported */
- } XF86RandRInfoRec, *XF86RandRInfoPtr;
-
--#define AMD_OLDPRIV (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4)
--
- static int GXRandRIndex;
-
--#if AMD_OLDPRIV
--#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) (p)->devPrivates[GXRandRIndex].ptr)
-+#define OLD_VIDEODRV_INTERFACE (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4)
-+
-+#if OLD_VIDEODRV_INTERFACE
-+#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) (p)->devPrivates[GXRandRIndex].ptr)
-+#define XF86RANDRSET(p, v) (p)->devPrivates[GXRandRIndex].ptr = v
- #else
--#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \
-- dixLookupPrivate(&(p)->devPrivates, &GXRandRIndex));
-+#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \
-+ dixLookupPrivate(&(p)->devPrivates, &GXRandRIndex))
-+#define XF86RANDRSET(p, v) dixSetPrivate(&(p)->devPrivates, &GXRandRIndex, v)
- #endif
-
- static int
-@@ -327,7 +329,7 @@ GXRandRInit(ScreenPtr pScreen, int rotation)
- if (GXRandRGeneration != serverGeneration) {
- GXRandRGeneration = serverGeneration;
- }
--#if AMD_OLDPRIV
-+#if OLD_VIDEODRV_INTERFACE
- GXRandRIndex = AllocateScreenPrivateIndex();
- #endif
-
-@@ -354,10 +356,7 @@ GXRandRInit(ScreenPtr pScreen, int rotation)
- pRandr->supported_rotations = rotation;
- pRandr->maxX = pRandr->maxY = 0;
-
--#if AMD_OLDPRIV
-- pScreen->devPrivates[GXRandRIndex].ptr = pRandr;
--#else
-- dixSetPrivate(&pScreen->devPrivates, &GXRandRIndex, pRandr);
--#endif
-+ XF86RANDRSET(pScreen, pRandr);
-+
- return TRUE;
- }
-diff --git a/src/lx_driver.c b/src/lx_driver.c
-index 08d1fdd..79ec15c 100644
---- a/src/lx_driver.c
-+++ b/src/lx_driver.c
-@@ -331,7 +331,7 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
- /* Fill in the monitor information */
- pScrni->monitor = pScrni->confScreen->monitor;
-
-- if (!xf86SetDepthBpp(pScrni, 16, 16, 16, Support24bppFb | Support32bppFb))
-+ if (!xf86SetDepthBpp(pScrni, 24, 16, 32, Support24bppFb | Support32bppFb))
- return FALSE;
-
- switch (pScrni->depth) {
-diff --git a/src/lx_output.c b/src/lx_output.c
-index 5508477..72e5e2a 100644
---- a/src/lx_output.c
-+++ b/src/lx_output.c
-@@ -108,7 +108,7 @@ lx_output_set_property(xf86OutputPtr output, Atom property,
-
- if (!ret) {
- xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
-- "Failed to set mode after propery change!\n");
-+ "Failed to set mode after property change!\n");
-
- pGeode->Scale = scale;
- return FALSE;
-diff --git a/src/lx_output.c b/src/lx_output.c
-index 72e5e2a..3eecc9e 100644
---- a/src/lx_output.c
-+++ b/src/lx_output.c
-@@ -163,6 +163,13 @@ lx_output_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
- return MODE_BAD;
- }
-
-+ if (gfx_is_display_mode_supported(pMode->HDisplay,
-+ pMode->VDisplay,
-+ pScrni->bitsPerPixel,
-+ GeodeGetRefreshRate(pMode)) < 0) {
-+ return MODE_BAD;
-+ }
-+
- return MODE_OK;
- }
-
diff --git a/recipes/xorg-driver/xf86-video-geode_2.10.1.bb b/recipes/xorg-driver/xf86-video-geode_2.10.1.bb
deleted file mode 100644
index 9a72053..0000000
--- a/recipes/xorg-driver/xf86-video-geode_2.10.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e307ab55a2a81d7868506df789f76dfb"
-SRC_URI[archive.sha256sum] = "9b6ef818e402e2c1b7b2f36eff657b8104c67d738f10d4d7d39c7bc118a8c650"
-
-COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/xorg-driver/xf86-video-geode_2.11.0.bb b/recipes/xorg-driver/xf86-video-geode_2.11.0.bb
deleted file mode 100644
index a909137..0000000
--- a/recipes/xorg-driver/xf86-video-geode_2.11.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1dbede8f6393edfe6c1ecab2f754b3b2"
-SRC_URI[archive.sha256sum] = "d70c198cde981c3a53b1c41b717dea4bbf1d397d82957f584c641bb5fd02c82d"
-
-COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb b/recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb
deleted file mode 100644
index dccbd74..0000000
--- a/recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fixes.patch"
-SRC_URI[archive.md5sum] = "05f85d897ef41d13de354ac0252bf923"
-SRC_URI[archive.sha256sum] = "d739f6762fe3aa7ef7ca74f87fbe4d6ec3bb13a735e5dfb82b6748eda2b31138"
-
-COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/xorg-driver/xf86-video-geode_2.11.7.bb b/recipes/xorg-driver/xf86-video-geode_2.11.7.bb
deleted file mode 100644
index bdf626f..0000000
--- a/recipes/xorg-driver/xf86-video-geode_2.11.7.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "086daecd062835eea51e2a718761dda3"
-SRC_URI[archive.sha256sum] = "ed864a37b44dabb760f0b7caac8a796e3b1a0a7f305b44c4684f871b273a9f9b"
-
-COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/xorg-driver/xf86-video-geode_2.8.0.bb b/recipes/xorg-driver/xf86-video-geode_2.8.0.bb
deleted file mode 100644
index a342ca1..0000000
--- a/recipes/xorg-driver/xf86-video-geode_2.8.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a2b9c70a32b0a6436d837d67fa7aae18"
-SRC_URI[archive.sha256sum] = "f0b68171dd4256c927fbee91ecf84fa28c409b5b6b39cbf47eaa48fd73db305f"
diff --git a/recipes/xorg-driver/xf86-video-geode_2.9.0.bb b/recipes/xorg-driver/xf86-video-geode_2.9.0.bb
deleted file mode 100644
index 5f411b4..0000000
--- a/recipes/xorg-driver/xf86-video-geode_2.9.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "d7b3254e6f4f1978fecf8f4fa2823259"
-SRC_URI[archive.sha256sum] = "b9aa934b94c0397e32cd702788fe2b6f2398bdc1a8c83594ad25274f82593590"
-
-COMPATIBLE_HOST = "i.86.*-linux"
diff --git a/recipes/xorg-driver/xf86-video-glint_1.1.1.bb b/recipes/xorg-driver/xf86-video-glint_1.1.1.bb
deleted file mode 100644
index 632a7bb..0000000
--- a/recipes/xorg-driver/xf86-video-glint_1.1.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xf86dgaproto drm xf86driproto"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2cf49f701024a145bd25aff9da11d479"
-SRC_URI[archive.sha256sum] = "d63e0dd3f5cecebaf1915193a68ac83e90c1e973e3276a71bd14651d67115e6d"
diff --git a/recipes/xorg-driver/xf86-video-glint_1.2.0.bb b/recipes/xorg-driver/xf86-video-glint_1.2.0.bb
deleted file mode 100644
index 6c721f7..0000000
--- a/recipes/xorg-driver/xf86-video-glint_1.2.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- Glint display driver"
-DEPENDS += " xf86dgaproto drm xf86driproto"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1f5271ac01d4475efe73ab6f2c3646f4"
-SRC_URI[archive.sha256sum] = "a0edd1109c03efdb0f6defc18745f89fb3c11142381e2657f94d492ddd1e7419"
-
-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 \
-"
diff --git a/recipes/xorg-driver/xf86-video-glint_1.2.1.bb b/recipes/xorg-driver/xf86-video-glint_1.2.1.bb
deleted file mode 100644
index e2a9e9b..0000000
--- a/recipes/xorg-driver/xf86-video-glint_1.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- Glint display driver"
-DEPENDS += " xf86dgaproto drm xf86driproto"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6d7afdac0a26cf201c3f3b417c31c5e1"
-SRC_URI[archive.sha256sum] = "161780d2127d0548a2017ca461ce38e7a69afce5d921a08604e91478c6be1cda"
diff --git a/recipes/xorg-driver/xf86-video-i128_1.1.0.5.bb b/recipes/xorg-driver/xf86-video-i128_1.1.0.5.bb
deleted file mode 100644
index 73be28f..0000000
--- a/recipes/xorg-driver/xf86-video-i128_1.1.0.5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "Number Nine I128 for X11"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6e0d3e09fc99d6f0a0e969613ddf58cc"
-SRC_URI[archive.sha256sum] = "a99d2b04b829faa7542545380317c8f59f54ecbd5e0a7008580f3155742d0381"
diff --git a/recipes/xorg-driver/xf86-video-i128_1.1.0.6.bb b/recipes/xorg-driver/xf86-video-i128_1.1.0.6.bb
deleted file mode 100644
index 51d911b..0000000
--- a/recipes/xorg-driver/xf86-video-i128_1.1.0.6.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "Number Nine I128 for X11"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c483efc90b1935025b17e4b9e9c2e4df"
-SRC_URI[archive.sha256sum] = "b52183f5a7d0adee1d21b4b0a0908886b7bbc69dc4498f1e7a3edc4b1988c41c"
diff --git a/recipes/xorg-driver/xf86-video-i128_1.2.1.bb b/recipes/xorg-driver/xf86-video-i128_1.2.1.bb
deleted file mode 100644
index 896dc41..0000000
--- a/recipes/xorg-driver/xf86-video-i128_1.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- i128 display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "d0080732eaa15059b0a953aa3522185a"
-SRC_URI[archive.sha256sum] = "0d023cacf8134241cd8efcd5744eb156399406c92f59d3895392f2b5fd055eb1"
diff --git a/recipes/xorg-driver/xf86-video-i128_1.3.0.bb b/recipes/xorg-driver/xf86-video-i128_1.3.0.bb
deleted file mode 100644
index 6b70a68..0000000
--- a/recipes/xorg-driver/xf86-video-i128_1.3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- i128 display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "aff4922d2f02bad7e0d8649358edbcee"
-SRC_URI[archive.sha256sum] = "62eadebd3417ffb3857f10f16597c59541ceb135ddbc30b2140f46d9eb7dddd7"
diff --git a/recipes/xorg-driver/xf86-video-i128_1.3.1.bb b/recipes/xorg-driver/xf86-video-i128_1.3.1.bb
deleted file mode 100644
index 0ff9d08..0000000
--- a/recipes/xorg-driver/xf86-video-i128_1.3.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- i128 display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3b170a6df5114420cd4021a057918a09"
-SRC_URI[archive.sha256sum] = "49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75"
diff --git a/recipes/xorg-driver/xf86-video-i740_1.1.0.bb b/recipes/xorg-driver/xf86-video-i740_1.1.0.bb
deleted file mode 100644
index 1843998..0000000
--- a/recipes/xorg-driver/xf86-video-i740_1.1.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "I740 for X11"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "57302e225060a7286ae1a970c87a589b"
-SRC_URI[archive.sha256sum] = "b8f2144c987d8a14f8b477ee3aa43fc1c76d040a77e40938c3c97c8e34e2b7c5"
diff --git a/recipes/xorg-driver/xf86-video-i740_1.2.0.bb b/recipes/xorg-driver/xf86-video-i740_1.2.0.bb
deleted file mode 100644
index 83e2d53..0000000
--- a/recipes/xorg-driver/xf86-video-i740_1.2.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- i740 display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "d0e5a805c546b29b1dd3b55a68d16dc4"
-SRC_URI[archive.sha256sum] = "59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f"
diff --git a/recipes/xorg-driver/xf86-video-i810_1.6.5.bb b/recipes/xorg-driver/xf86-video-i810_1.6.5.bb
deleted file mode 100644
index d0a5bb8..0000000
--- a/recipes/xorg-driver/xf86-video-i810_1.6.5.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "I810 for X11"
-DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fc1e0da3430551bf25a7babf7ccfd3bf"
-SRC_URI[archive.sha256sum] = "30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f"
diff --git a/recipes/xorg-driver/xf86-video-intel_2.10.0.bb b/recipes/xorg-driver/xf86-video-intel_2.10.0.bb
deleted file mode 100644
index 02a9411..0000000
--- a/recipes/xorg-driver/xf86-video-intel_2.10.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
-DEPENDS += " virtual/libx11 libxvmc drm xf86driproto "
-RDEPENDS_${PN} += "xserver-xorg-extension-dri \
- xserver-xorg-extension-dri2 \
- xserver-xorg-extension-glx"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "78309d4f04dd8ae6585d120377042741"
-SRC_URI[archive.sha256sum] = "e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab"
diff --git a/recipes/xorg-driver/xf86-video-intel_2.2.1.bb b/recipes/xorg-driver/xf86-video-intel_2.2.1.bb
deleted file mode 100644
index d962ee4..0000000
--- a/recipes/xorg-driver/xf86-video-intel_2.2.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
-DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3334dc5142871b78fc609fd1b3dac3f2"
-SRC_URI[archive.sha256sum] = "d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a"
diff --git a/recipes/xorg-driver/xf86-video-intel_2.4.2.bb b/recipes/xorg-driver/xf86-video-intel_2.4.2.bb
deleted file mode 100644
index 5da4140..0000000
--- a/recipes/xorg-driver/xf86-video-intel_2.4.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
-DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5cd6b3ed57c7e78ab51e9d9266e73fb6"
-SRC_URI[archive.sha256sum] = "5afdc91e93ffed09ea5258c6fde210c729ea2b44d83f98acfd92c3da7e99e64b"
diff --git a/recipes/xorg-driver/xf86-video-intel_2.6.3.bb b/recipes/xorg-driver/xf86-video-intel_2.6.3.bb
deleted file mode 100644
index 635dc7d..0000000
--- a/recipes/xorg-driver/xf86-video-intel_2.6.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
-DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "440c014bbd3072b5d379fe1bdb861918"
-SRC_URI[archive.sha256sum] = "b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258"
diff --git a/recipes/xorg-driver/xf86-video-mach64_6.8.0.bb b/recipes/xorg-driver/xf86-video-mach64_6.8.0.bb
deleted file mode 100644
index 8152ac1..0000000
--- a/recipes/xorg-driver/xf86-video-mach64_6.8.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
-DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6081b8fa50c689d51f85c2fbaf93867e"
-SRC_URI[archive.sha256sum] = "fba616f88d351759e00a90965e38a0d82608698ae36fc2a18df4036cd384e1a1"
diff --git a/recipes/xorg-driver/xf86-video-mga_1.4.1.bb b/recipes/xorg-driver/xf86-video-mga_1.4.1.bb
deleted file mode 100644
index a6911b0..0000000
--- a/recipes/xorg-driver/xf86-video-mga_1.4.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ba373233a7d13084d14046a17b02e248"
-SRC_URI[archive.sha256sum] = "5becb5f0caf0f99296db28b32be46eb95d0a88ac8e4829c47cb637fb52d06564"
diff --git a/recipes/xorg-driver/xf86-video-mga_1.4.9.bb b/recipes/xorg-driver/xf86-video-mga_1.4.9.bb
deleted file mode 100644
index 78b197e..0000000
--- a/recipes/xorg-driver/xf86-video-mga_1.4.9.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "11066b84b949cd04300ec819c9c51532"
-SRC_URI[archive.sha256sum] = "d57dd2323052f064092167a232fb7576f46e5d62e98bc9cc6a7f270cc8d0fdc0"
diff --git a/recipes/xorg-driver/xf86-video-mga_1.9.99.bb b/recipes/xorg-driver/xf86-video-mga_1.9.99.bb
deleted file mode 100644
index 2081b47..0000000
--- a/recipes/xorg-driver/xf86-video-mga_1.9.99.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- MGA display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "29785ff1de2b0f7b7f1c48350449447c"
-SRC_URI[archive.sha256sum] = "82a91e523d40625c9e042ee640276756d1169cca7eb305c691a3378805c4c81c"
diff --git a/recipes/xorg-driver/xf86-video-neomagic_1.1.1.bb b/recipes/xorg-driver/xf86-video-neomagic_1.1.1.bb
deleted file mode 100644
index 12d3378..0000000
--- a/recipes/xorg-driver/xf86-video-neomagic_1.1.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070"
-DEPENDS += " xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7a3d3d6e60b9686d955c45d9ebbd5c1b"
-SRC_URI[archive.sha256sum] = "d6497080967b8285b663fedd7cafd4457578282ebd7da0b216b6fa214dd88a86"
diff --git a/recipes/xorg-driver/xf86-video-neomagic_1.2.1.bb b/recipes/xorg-driver/xf86-video-neomagic_1.2.1.bb
deleted file mode 100644
index 72e8a11..0000000
--- a/recipes/xorg-driver/xf86-video-neomagic_1.2.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070"
-DEPENDS += " xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a72f57fca4f4dff9a2c82eb1fe7456f4"
-SRC_URI[archive.sha256sum] = "96e38d5378596174f76c735c4723ff2ac336f9069644502a9b706586b845e0a5"
diff --git a/recipes/xorg-driver/xf86-video-newport_0.2.1.bb b/recipes/xorg-driver/xf86-video-newport_0.2.1.bb
deleted file mode 100644
index ef8a412..0000000
--- a/recipes/xorg-driver/xf86-video-newport_0.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards."
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2bd8e5b9ea68e0dcd80dfcaca0eff82c"
-SRC_URI[archive.sha256sum] = "66ac855452690ef896400577806dc1dd86318940f8a62ce20039037318b1ce08"
diff --git a/recipes/xorg-driver/xf86-video-nsc_2.8.2.bb b/recipes/xorg-driver/xf86-video-nsc_2.8.2.bb
deleted file mode 100644
index 8c1893f..0000000
--- a/recipes/xorg-driver/xf86-video-nsc_2.8.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1fbdd5e9b5508b032c0102f72d1e555c"
-SRC_URI[archive.sha256sum] = "060493a9dcad81e8912381d2a8d14a3e32a34414296a089756868f3442103c8c"
-
-# This driver is broken because it's seldom updated. It compiles
-# but fails to communicate with the card without this deprecated define.
-EXTRA_OEMAKE += "CFLAGS+=-DXFree86Server"
diff --git a/recipes/xorg-driver/xf86-video-nv_1.2.2.1.bb b/recipes/xorg-driver/xf86-video-nv_1.2.2.1.bb
deleted file mode 100644
index 010a7a9..0000000
--- a/recipes/xorg-driver/xf86-video-nv_1.2.2.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e4dc415b1e45db0bbdacc203ed33024a"
-SRC_URI[archive.sha256sum] = "97d47df7720d3cfcb56c4debca9218c3fc5352d34d82bc4880c8a620185f8c5e"
diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.12.bb b/recipes/xorg-driver/xf86-video-nv_2.1.12.bb
deleted file mode 100644
index c634388..0000000
--- a/recipes/xorg-driver/xf86-video-nv_2.1.12.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- NV display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "42f12a36d7afc26c817e8e8f5c8b7274"
-SRC_URI[archive.sha256sum] = "f56d2bb42f6c4369dd3c6adc30988c53a229650f910b0db1bb3bf9376054011e"
diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.16.bb b/recipes/xorg-driver/xf86-video-nv_2.1.16.bb
deleted file mode 100644
index 61efa0f..0000000
--- a/recipes/xorg-driver/xf86-video-nv_2.1.16.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- NV display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fb02d5506e35054348d1c2b2c924530d"
-SRC_URI[archive.sha256sum] = "4bf2f964b78d309769faa6a5d21c90a9907886623adf1f30ea890b4329bf578d"
diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.17.bb b/recipes/xorg-driver/xf86-video-nv_2.1.17.bb
deleted file mode 100644
index bafcabc..0000000
--- a/recipes/xorg-driver/xf86-video-nv_2.1.17.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- NV display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4401c7b956e60a6d7de68ca6a8ec05d0"
-SRC_URI[archive.sha256sum] = "4286f8994d80a30c7b6b4fc9df6ea5d587f648adc23cb3f523f571738c6900f4"
diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.3.bb b/recipes/xorg-driver/xf86-video-nv_2.1.3.bb
deleted file mode 100644
index a0b8b2b..0000000
--- a/recipes/xorg-driver/xf86-video-nv_2.1.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f9b38e24157c3aac6014119ac18d76da"
-SRC_URI[archive.sha256sum] = "8d9b5ea137c31919f7821e7f3ecbd133158813c1059f4a8ed0a723535d969952"
diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.7.bb b/recipes/xorg-driver/xf86-video-nv_2.1.7.bb
deleted file mode 100644
index 0e6ea58..0000000
--- a/recipes/xorg-driver/xf86-video-nv_2.1.7.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- NV display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "192414222f1a98e228832ee53f8178c0"
-SRC_URI[archive.sha256sum] = "7c9135d80b519246b2a85ff0481d6ee0fddeb578d669ff490f236f85873e8c5a"
diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.8.bb b/recipes/xorg-driver/xf86-video-nv_2.1.8.bb
deleted file mode 100644
index 7072fd6..0000000
--- a/recipes/xorg-driver/xf86-video-nv_2.1.8.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- NV display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c3e8c98287dc98677bebfbe1ba51ab77"
-SRC_URI[archive.sha256sum] = "825ffb97525517de9f0ff7155946c6e58c278dba11957573cc970dd3b094f94a"
diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.9.bb b/recipes/xorg-driver/xf86-video-nv_2.1.9.bb
deleted file mode 100644
index c82ed56..0000000
--- a/recipes/xorg-driver/xf86-video-nv_2.1.9.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- NV display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c6b7e52fa18455c22eb040b8d2575ce5"
-SRC_URI[archive.sha256sum] = "20d92ff3ab4b9ecc150f4ed17a7012a48f56dbf3fb51b51dde769b28922976d9"
diff --git a/recipes/xorg-driver/xf86-video-openchrome_0.2.903.bb b/recipes/xorg-driver/xf86-video-openchrome_0.2.903.bb
deleted file mode 100644
index 6b4d8cb..0000000
--- a/recipes/xorg-driver/xf86-video-openchrome_0.2.903.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- openchrome display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c0820787e89958c9114d359b6a3cd464"
-SRC_URI[archive.sha256sum] = "b7e4858d6b5c6428fae2485a2c2097cdf6073268ef812aae2ccbc3d936db7410"
-
-do_configure_prepend() {
- rm ${S}/acinclude.m4 || true
-}
diff --git a/recipes/xorg-driver/xf86-video-r128_6.8.0.bb b/recipes/xorg-driver/xf86-video-r128_6.8.0.bb
deleted file mode 100644
index 490112f..0000000
--- a/recipes/xorg-driver/xf86-video-r128_6.8.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- r128 display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "007bec0c6b07d9d3aeca4da18e561efb"
-SRC_URI[archive.sha256sum] = "5689ca714fee9c9272bee12883b07a0ef2c40358ffb19fa684e963027b56567b"
diff --git a/recipes/xorg-driver/xf86-video-radeonhd_1.2.0.bb b/recipes/xorg-driver/xf86-video-radeonhd_1.2.0.bb
deleted file mode 100644
index b6b4a95..0000000
--- a/recipes/xorg-driver/xf86-video-radeonhd_1.2.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- AMD/ATI r5xx, r6xx display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6a932ec17da9ce5a6d9000c1649c3a7e"
-SRC_URI[archive.sha256sum] = "87c6353dd52bbe22d3a45f28fb39de1dd44f41568aaf8a9b0d45a7ed62313e27"
-
-EXTRA_OECONF += " \
- ac_cv_file___src_AtomBios_includes_atombios_h=yes \
- ac_cv_file___src_AtomBios_includes_Decoder_h=yes \
-"
diff --git a/recipes/xorg-driver/xf86-video-rendition_4.1.3.bb b/recipes/xorg-driver/xf86-video-rendition_4.1.3.bb
deleted file mode 100644
index 942dc58..0000000
--- a/recipes/xorg-driver/xf86-video-rendition_4.1.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00."
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a8b97feccb32184820d5856fe78d34db"
-SRC_URI[archive.sha256sum] = "37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408"
diff --git a/recipes/xorg-driver/xf86-video-rendition_4.2.0.bb b/recipes/xorg-driver/xf86-video-rendition_4.2.0.bb
deleted file mode 100644
index 00efa96..0000000
--- a/recipes/xorg-driver/xf86-video-rendition_4.2.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00."
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7c03de3804d4c4f6ff59f74050d24b2b"
-SRC_URI[archive.sha256sum] = "b57b62f707d87534a799170e31b33311449cfd7019a56e6b4fa85a4c7faaae15"
diff --git a/recipes/xorg-driver/xf86-video-s3_0.5.0.bb b/recipes/xorg-driver/xf86-video-s3_0.5.0.bb
deleted file mode 100644
index aa6bf0f..0000000
--- a/recipes/xorg-driver/xf86-video-s3_0.5.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "d95ab6445cab477f39adfbbc81006f67"
-SRC_URI[archive.sha256sum] = "4a1206cb1a200aad8881216547d9913d0e24928138f3b1bb912a3336b9c05c97"
diff --git a/recipes/xorg-driver/xf86-video-s3_0.6.0.bb b/recipes/xorg-driver/xf86-video-s3_0.6.0.bb
deleted file mode 100644
index 52f9584..0000000
--- a/recipes/xorg-driver/xf86-video-s3_0.6.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- legacy S3 display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "d05e7c3cb044437eda8663e174ba913c"
-SRC_URI[archive.sha256sum] = "ed07e4648b0f405fddd563783b49f971d649dd07cc8bc7737a93ff3d90f6c067"
diff --git a/recipes/xorg-driver/xf86-video-s3virge_1.10.1.bb b/recipes/xorg-driver/xf86-video-s3virge_1.10.1.bb
deleted file mode 100644
index 2b83d22..0000000
--- a/recipes/xorg-driver/xf86-video-s3virge_1.10.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- S3 ViRGE display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4a293047e988d4ea1e9e96d3b5793f43"
-SRC_URI[archive.sha256sum] = "9094115621ef73c957cf887332717ec727c751959b1059e3d00fbfe0114a978a"
diff --git a/recipes/xorg-driver/xf86-video-s3virge_1.9.1.bb b/recipes/xorg-driver/xf86-video-s3virge_1.9.1.bb
deleted file mode 100644
index 68b534b..0000000
--- a/recipes/xorg-driver/xf86-video-s3virge_1.9.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a91c73285ef67ee7cd9e2da28acb6cc4"
-SRC_URI[archive.sha256sum] = "cef5702963f49e737fb8b1472dc0241f7a5da49f844ac77f2df3e693a84bc822"
diff --git a/recipes/xorg-driver/xf86-video-savage_2.1.2.bb b/recipes/xorg-driver/xf86-video-savage_2.1.2.bb
deleted file mode 100644
index 8f0ed08..0000000
--- a/recipes/xorg-driver/xf86-video-savage_2.1.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6367e921a98f6a7fec9d0a9bc5ff0a47"
-SRC_URI[archive.sha256sum] = "1a9aa442152c139e3c54bc6c323bd13edf0bfff70a81c03969bcb1159317edb2"
diff --git a/recipes/xorg-driver/xf86-video-savage_2.1.3.bb b/recipes/xorg-driver/xf86-video-savage_2.1.3.bb
deleted file mode 100644
index 1c6629f..0000000
--- a/recipes/xorg-driver/xf86-video-savage_2.1.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9c5e541613b07de6e7b2b2df3a2e35b1"
-SRC_URI[archive.sha256sum] = "f5f154df377cb445935d1453d6b7095d63912d5776dcb44f8d3c2f10ab1a3cc5"
diff --git a/recipes/xorg-driver/xf86-video-savage_2.2.1.bb b/recipes/xorg-driver/xf86-video-savage_2.2.1.bb
deleted file mode 100644
index 66f4b70..0000000
--- a/recipes/xorg-driver/xf86-video-savage_2.2.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- Savage display driver"
-DEPENDS += " drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "62b8aba48b54eaefeae87df502bf219c"
-SRC_URI[archive.sha256sum] = "adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e"
-
-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 \
-"
diff --git a/recipes/xorg-driver/xf86-video-siliconmotion_1.5.1.bb b/recipes/xorg-driver/xf86-video-siliconmotion_1.5.1.bb
deleted file mode 100644
index 527b778..0000000
--- a/recipes/xorg-driver/xf86-video-siliconmotion_1.5.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ee35d7714ce44a2b5ac7ad7b7b7dd75a"
-SRC_URI[archive.sha256sum] = "54cf791695a53d4836d32f899b7d34b969edf5415f02e36956b6e72993e21cd7"
diff --git a/recipes/xorg-driver/xf86-video-siliconmotion_1.6.0.bb b/recipes/xorg-driver/xf86-video-siliconmotion_1.6.0.bb
deleted file mode 100644
index f5fb737..0000000
--- a/recipes/xorg-driver/xf86-video-siliconmotion_1.6.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- SiliconMotion display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a8419a8ed17b02b2a6dd4d30d5e94b00"
-SRC_URI[archive.sha256sum] = "cc5301b9c6adb9a0770509b8570d38730d43e9ffce6d6886cd9a090965017e53"
diff --git a/recipes/xorg-driver/xf86-video-sis_0.10.0.bb b/recipes/xorg-driver/xf86-video-sis_0.10.0.bb
deleted file mode 100644
index 162ab1d..0000000
--- a/recipes/xorg-driver/xf86-video-sis_0.10.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- SiS display driver"
-DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "331d432dccccca91ec7da39ff6bf1218"
-SRC_URI[archive.sha256sum] = "bcc0dcde5d469cc2500676e0ad29dcd12b1370066289902387ead762260e4b40"
-
-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 \
-"
diff --git a/recipes/xorg-driver/xf86-video-sis_0.10.1.bb b/recipes/xorg-driver/xf86-video-sis_0.10.1.bb
deleted file mode 100644
index 1b58f87..0000000
--- a/recipes/xorg-driver/xf86-video-sis_0.10.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- SiS display driver"
-DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9f57c2f5ccbd8340db32da1c74083771"
-SRC_URI[archive.sha256sum] = "11529f094cbdcdaba505596488eda623e0f0bd3c51139359d587ea58b6527307"
-
-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 \
-"
diff --git a/recipes/xorg-driver/xf86-video-sis_0.9.3.bb b/recipes/xorg-driver/xf86-video-sis_0.9.3.bb
deleted file mode 100644
index c5de372..0000000
--- a/recipes/xorg-driver/xf86-video-sis_0.9.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e35d817fa4ee7beb6cd5aa744b9c0783"
-SRC_URI[archive.sha256sum] = "898ee8fb16fff89ba8ac5c83b9f5a2371084719db0cf034140427229191436f6"
diff --git a/recipes/xorg-driver/xf86-video-sis_0.9.4.bb b/recipes/xorg-driver/xf86-video-sis_0.9.4.bb
deleted file mode 100644
index d316d30..0000000
--- a/recipes/xorg-driver/xf86-video-sis_0.9.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- SiS display driver"
-DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "43f12cabf770b06170cdd1cdaafdc50f"
-SRC_URI[archive.sha256sum] = "50856446841526fc393af6bae0fbc39c20bb07e60056a676d0bc620446b593ac"
diff --git a/recipes/xorg-driver/xf86-video-sisusb_0.8.1.bb b/recipes/xorg-driver/xf86-video-sisusb_0.8.1.bb
deleted file mode 100644
index 5cc4976..0000000
--- a/recipes/xorg-driver/xf86-video-sisusb_0.8.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "cbd669507e4aa35e468905f09b546333"
-SRC_URI[archive.sha256sum] = "1596b79ab3e33263bde2d456cc0376808abee80b4cde059605f176d98bdb45cb"
diff --git a/recipes/xorg-driver/xf86-video-sisusb_0.9.0.bb b/recipes/xorg-driver/xf86-video-sisusb_0.9.0.bb
deleted file mode 100644
index 4fce26a..0000000
--- a/recipes/xorg-driver/xf86-video-sisusb_0.9.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- SiS USB display driver"
-DEPENDS += " xineramaproto xf86miscproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7b1f5465f423a859f306f4f1d6306a1b"
-SRC_URI[archive.sha256sum] = "76b79c9b7d3b35b8e2e5354569bf0936c4afd39a9dcbdf66327714d75137930a"
diff --git a/recipes/xorg-driver/xf86-video-sisusb_0.9.1.bb b/recipes/xorg-driver/xf86-video-sisusb_0.9.1.bb
deleted file mode 100644
index 2229021..0000000
--- a/recipes/xorg-driver/xf86-video-sisusb_0.9.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- SiS USB display driver"
-DEPENDS += " xineramaproto xf86miscproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "42069e70578bf3fb353cdacad186f6c0"
-SRC_URI[archive.sha256sum] = "b3ca934ce3e31f4a162bf263cad3913edccc46906d09132118b74a2095c157d9"
diff --git a/recipes/xorg-driver/xf86-video-suncg14_1.1.0.bb b/recipes/xorg-driver/xf86-video-suncg14_1.1.0.bb
deleted file mode 100644
index 9729e24..0000000
--- a/recipes/xorg-driver/xf86-video-suncg14_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9e25784e912cb2f0493b87431fd60773"
-SRC_URI[archive.sha256sum] = "1eca2b0970e725db49f9e462a0c2e618b2616389647335b5aec9d6e495e40527"
diff --git a/recipes/xorg-driver/xf86-video-suncg3_1.1.0.bb b/recipes/xorg-driver/xf86-video-suncg3_1.1.0.bb
deleted file mode 100644
index 031d070..0000000
--- a/recipes/xorg-driver/xf86-video-suncg3_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b9cb8cfb6a4234bebc434f744af53208"
-SRC_URI[archive.sha256sum] = "3564ebc8ccdfea872d46559166d881e93ac7c17e3ed46bb4087960f491c37df9"
diff --git a/recipes/xorg-driver/xf86-video-suncg6_1.1.0.bb b/recipes/xorg-driver/xf86-video-suncg6_1.1.0.bb
deleted file mode 100644
index 692ddb3..0000000
--- a/recipes/xorg-driver/xf86-video-suncg6_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "aa6b7836fe6ccc99994bf15ff2b74e86"
-SRC_URI[archive.sha256sum] = "d6b1f3b79c57ef5281e0204b2847812cf9fa5df616478f01591445a36537194b"
diff --git a/recipes/xorg-driver/xf86-video-sunffb_1.1.0.bb b/recipes/xorg-driver/xf86-video-sunffb_1.1.0.bb
deleted file mode 100644
index e20c4fb..0000000
--- a/recipes/xorg-driver/xf86-video-sunffb_1.1.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "dee23564c0d8069f52c7cd29c78be667"
-SRC_URI[archive.sha256sum] = "f897a427e83cf6965fd82724e3298aea44eb3131ba62f904cb514dfd0a879029"
diff --git a/recipes/xorg-driver/xf86-video-sunffb_1.2.0.bb b/recipes/xorg-driver/xf86-video-sunffb_1.2.0.bb
deleted file mode 100644
index eead699..0000000
--- a/recipes/xorg-driver/xf86-video-sunffb_1.2.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "816842de26bce8a935f3c9c3cfedbc42"
-SRC_URI[archive.sha256sum] = "59f2f8fc2399a4d6b0ce733481c58694e723a989f4712c00436d35e27c059292"
diff --git a/recipes/xorg-driver/xf86-video-sunleo_1.1.0.bb b/recipes/xorg-driver/xf86-video-sunleo_1.1.0.bb
deleted file mode 100644
index 0970905..0000000
--- a/recipes/xorg-driver/xf86-video-sunleo_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0408d95795d754c92d12d6476b6932a1"
-SRC_URI[archive.sha256sum] = "b504d50f261bea9bc9dcd2a9c9c3307b24dee97c18d13b5a6deb3eb393270da9"
diff --git a/recipes/xorg-driver/xf86-video-suntcx_1.1.0.bb b/recipes/xorg-driver/xf86-video-suntcx_1.1.0.bb
deleted file mode 100644
index dc0cb5d..0000000
--- a/recipes/xorg-driver/xf86-video-suntcx_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "779a31151e44d2fd2a5ee1794f836889"
-SRC_URI[archive.sha256sum] = "72986a3981b746f60df1aba443d610db437fe8d5053e64630686f471c47b01cf"
diff --git a/recipes/xorg-driver/xf86-video-tdfx_1.3.0.bb b/recipes/xorg-driver/xf86-video-tdfx_1.3.0.bb
deleted file mode 100644
index 5bf9bd0..0000000
--- a/recipes/xorg-driver/xf86-video-tdfx_1.3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "04c49acb5c5dbde14eabd32d06df6e73"
-SRC_URI[archive.sha256sum] = "6b1a00df5c9628817d08f07c6f18f578950744f3eb63b4397be8b0754e728624"
diff --git a/recipes/xorg-driver/xf86-video-tdfx_1.4.0.bb b/recipes/xorg-driver/xf86-video-tdfx_1.4.0.bb
deleted file mode 100644
index 371823d..0000000
--- a/recipes/xorg-driver/xf86-video-tdfx_1.4.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b13132f24683ef759bfb0c1db5096496"
-SRC_URI[archive.sha256sum] = "c3be06d324f2e49ece1f243b10d7180a32fbe65dbbb81e162279c8608800dead"
-
-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 \
-"
diff --git a/recipes/xorg-driver/xf86-video-tga_1.1.0.bb b/recipes/xorg-driver/xf86-video-tga_1.1.0.bb
deleted file mode 100644
index 15f4518..0000000
--- a/recipes/xorg-driver/xf86-video-tga_1.1.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "DEC 21030 X11 driver"
-DEPENDS += " xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9eda4d4490706b2dd8f4ecdbaf779856"
-SRC_URI[archive.sha256sum] = "50143dfdd259fd114dc2f41518a4898d5407bf55422251df75812b96a1fa6e9b"
diff --git a/recipes/xorg-driver/xf86-video-tga_1.2.0.bb b/recipes/xorg-driver/xf86-video-tga_1.2.0.bb
deleted file mode 100644
index 4e20ae3..0000000
--- a/recipes/xorg-driver/xf86-video-tga_1.2.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "DEC 21030 X11 driver"
-DEPENDS += " xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f3bddf0a64932ca9bd72041ccd3b5501"
-SRC_URI[archive.sha256sum] = "a92f8cad0e21318be465719a9f30a50d5719b0b70bf8e15f3937e7850cf1aea6"
diff --git a/recipes/xorg-driver/xf86-video-trident_1.2.3.bb b/recipes/xorg-driver/xf86-video-trident_1.2.3.bb
deleted file mode 100644
index 3d5815e..0000000
--- a/recipes/xorg-driver/xf86-video-trident_1.2.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c0e8b2f54942b6902b7dd4f30defe800"
-SRC_URI[archive.sha256sum] = "d23eb8fa165d238ddf64da63dcd60c70a01cd761608a18402cfb95aed6722495"
diff --git a/recipes/xorg-driver/xf86-video-trident_1.2.4.bb b/recipes/xorg-driver/xf86-video-trident_1.2.4.bb
deleted file mode 100644
index 7871b1b..0000000
--- a/recipes/xorg-driver/xf86-video-trident_1.2.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.org X server -- Trident display driver"
-DEPENDS += " xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7f628f7eb4abdc4c49bb252eefc4335a"
-SRC_URI[archive.sha256sum] = "f942596e7427a089be9c9353c45c22002999580197c9715d9363d19ee170ba8d"
diff --git a/recipes/xorg-driver/xf86-video-trident_1.3.0.bb b/recipes/xorg-driver/xf86-video-trident_1.3.0.bb
deleted file mode 100644
index 729eddb..0000000
--- a/recipes/xorg-driver/xf86-video-trident_1.3.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.org X server -- Trident display driver"
-DEPENDS += " xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e89799579d0cf3858362bd751469e0bf"
-SRC_URI[archive.sha256sum] = "a4f66c9f46f6e93c2c1f10e782a211ddc338b0ff9f0a2ccd2d660db031d3ddb5"
diff --git a/recipes/xorg-driver/xf86-video-tseng_1.1.1.bb b/recipes/xorg-driver/xf86-video-tseng_1.1.1.bb
deleted file mode 100644
index 8f0cf7b..0000000
--- a/recipes/xorg-driver/xf86-video-tseng_1.1.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "488aa9c3ec7a95e6589afa4b50bec8b4"
-SRC_URI[archive.sha256sum] = "c9c1f3318715b7268068bc733d00bcab93924e97eb38f94548e442fd6cdfd56e"
diff --git a/recipes/xorg-driver/xf86-video-tseng_1.2.0.bb b/recipes/xorg-driver/xf86-video-tseng_1.2.0.bb
deleted file mode 100644
index 273b05e..0000000
--- a/recipes/xorg-driver/xf86-video-tseng_1.2.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f98fc22142a009dc3a6cdf930c95203f"
-SRC_URI[archive.sha256sum] = "1090d9100934329000ac330d0c66a0ac4f60d2ba83196ea15c2833a28a18b1e3"
diff --git a/recipes/xorg-driver/xf86-video-v4l_0.1.1.bb b/recipes/xorg-driver/xf86-video-v4l_0.1.1.bb
deleted file mode 100644
index 407735e..0000000
--- a/recipes/xorg-driver/xf86-video-v4l_0.1.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "Video 4 Linux adaptor driver for X11"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "69339c38eba2cebc357d67e7a755d734"
-SRC_URI[archive.sha256sum] = "33ad549ea3f6a8da7f58d9964f3f2d83aabc6d64c2ebc2ea0033ac8dacaec870"
diff --git a/recipes/xorg-driver/xf86-video-vesa_1.3.0.bb b/recipes/xorg-driver/xf86-video-vesa_1.3.0.bb
deleted file mode 100644
index 9b153e5..0000000
--- a/recipes/xorg-driver/xf86-video-vesa_1.3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-includepath.patch"
-SRC_URI[archive.md5sum] = "4a307852f3b4850e436a41dab2a73676"
-SRC_URI[archive.sha256sum] = "b96c80ae81f5123ecef344dac4c734b2e281143d3ab7a7e633d6bf04c893e203"
diff --git a/recipes/xorg-driver/xf86-video-vesa_2.0.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.0.0.bb
deleted file mode 100644
index 983b31d..0000000
--- a/recipes/xorg-driver/xf86-video-vesa_2.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-includepath.patch \
- file://fix-configure-includes.patch"
-SRC_URI[archive.md5sum] = "433cf6f961eb4a2ab6fcb086def0b2b4"
-SRC_URI[archive.sha256sum] = "f20b2e429657552eea207fb8bc4b47c8e293d99c229dcb4da11b7c5bfdc1e165"
diff --git a/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb
deleted file mode 100644
index 81b5d2f..0000000
--- a/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-driver-video.inc
-RDEPENDS_${PN} += "xserver-xorg-module-libint10 "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-includepath.patch \
- file://fix-configure-includes.patch"
-SRC_URI[archive.md5sum] = "9a86b683f73f3806f55d05cd804a6f4a"
-SRC_URI[archive.sha256sum] = "8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226"
diff --git a/recipes/xorg-driver/xf86-video-vmware_10.14.1.bb b/recipes/xorg-driver/xf86-video-vmware_10.14.1.bb
deleted file mode 100644
index 4e3e5f0..0000000
--- a/recipes/xorg-driver/xf86-video-vmware_10.14.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X11 driver for VMware SVGA Device"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "eaf1ce9fa23363799140602afaa10f37"
-SRC_URI[archive.sha256sum] = "1971fd356ba54204c3611edb9144c43c25c21167a5fa5ee725d3f2e3f9864fa9"
diff --git a/recipes/xorg-driver/xf86-video-vmware_10.15.2.bb b/recipes/xorg-driver/xf86-video-vmware_10.15.2.bb
deleted file mode 100644
index 0b787d3..0000000
--- a/recipes/xorg-driver/xf86-video-vmware_10.15.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "99322cbcc9081ad44e9cba63e3df8f7e"
-SRC_URI[archive.sha256sum] = "edae155c82d348b76dabe1373605bf6715b577cdd7a95f8b54ad534dc47c71ff"
diff --git a/recipes/xorg-driver/xf86-video-vmware_10.16.1.bb b/recipes/xorg-driver/xf86-video-vmware_10.16.1.bb
deleted file mode 100644
index fbf9826..0000000
--- a/recipes/xorg-driver/xf86-video-vmware_10.16.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a5e1f2539b82206e411c3647f10c425f"
-SRC_URI[archive.sha256sum] = "91ed99ae936be5df25d310d81e31e0a7efefc023e462d93a9289ac18ebdf4e89"
diff --git a/recipes/xorg-driver/xf86-video-vmware_10.16.5.bb b/recipes/xorg-driver/xf86-video-vmware_10.16.5.bb
deleted file mode 100644
index e0e0368..0000000
--- a/recipes/xorg-driver/xf86-video-vmware_10.16.5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6d78c82ea7c2bb0fcb587d7bb4e8f60a"
-SRC_URI[archive.sha256sum] = "3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366"
diff --git a/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb b/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb
deleted file mode 100644
index d55c68b..0000000
--- a/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3b3d38abfa1f8be4b1e26dcd236bc94f"
-SRC_URI[archive.sha256sum] = "835a5e45b54837cbbd963a48bd09db709717e097e931dd76e68e397a167e8bc1"
diff --git a/recipes/xorg-driver/xf86-video-vmware_11.0.0.bb b/recipes/xorg-driver/xf86-video-vmware_11.0.0.bb
deleted file mode 100644
index fd5dbf8..0000000
--- a/recipes/xorg-driver/xf86-video-vmware_11.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2895deafa373b0f87b8a7feaf0ca2373"
-SRC_URI[archive.sha256sum] = "bb538ebb9f000767bcc389562c8deb4cda74aa3e608190f6c3ee1e93d394fb2d"
diff --git a/recipes/xorg-driver/xf86-video-vmware_11.0.1.bb b/recipes/xorg-driver/xf86-video-vmware_11.0.1.bb
deleted file mode 100644
index 0caf4aa..0000000
--- a/recipes/xorg-driver/xf86-video-vmware_11.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "52e9a12843c6469f976db57a7b5f78d2"
-SRC_URI[archive.sha256sum] = "a6371d5acb81ba4457f7ee2c7432941c38f9033ce5278551c6acc9a0827ce7be"
diff --git a/recipes/xorg-driver/xf86-video-voodoo_1.1.1.bb b/recipes/xorg-driver/xf86-video-voodoo_1.1.1.bb
deleted file mode 100644
index 5e671f4..0000000
--- a/recipes/xorg-driver/xf86-video-voodoo_1.1.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X11 driver for Voodoo/Voodoo2"
-DEPENDS += " xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "bc878e795688b49a595b355482d27174"
-SRC_URI[archive.sha256sum] = "3975601baee674b2bad0dfe696586f17cc913f1dc7f1d5c4e184623e0461751c"
diff --git a/recipes/xorg-driver/xf86-video-voodoo_1.2.0.bb b/recipes/xorg-driver/xf86-video-voodoo_1.2.0.bb
deleted file mode 100644
index 720e2d2..0000000
--- a/recipes/xorg-driver/xf86-video-voodoo_1.2.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X11 driver for Voodoo/Voodoo2"
-DEPENDS += " xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7c681d9b57f5e1f798263fc1a9d99245"
-SRC_URI[archive.sha256sum] = "b79ba6d5d4300570c00f8be37c536f47f2d78c18845f70f525da2a29e47c4b8c"
diff --git a/recipes/xorg-driver/xf86-video-wsfb_0.2.1.bb b/recipes/xorg-driver/xf86-video-wsfb_0.2.1.bb
deleted file mode 100644
index 0e11e2d..0000000
--- a/recipes/xorg-driver/xf86-video-wsfb_0.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DESCRIPTION = "X.Org X server -- wsfb display driver"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c159af867a9af3abc4da332189213a76"
-SRC_URI[archive.sha256sum] = "39e358aa17d939f561a28c82b9e7beca202d7ebd7d40d401c88a9dff3d90d148"
diff --git a/recipes/xorg-driver/xf86-video-xgi_1.5.0.bb b/recipes/xorg-driver/xf86-video-xgi_1.5.0.bb
deleted file mode 100644
index 84c4f05..0000000
--- a/recipes/xorg-driver/xf86-video-xgi_1.5.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "08529fd015191be9244f598aa0894aa6"
-SRC_URI[archive.sha256sum] = "5fb23432ee8940c04494744da8b5f58bebc6ef113e96a50a74f0aa7d98a69194"
diff --git a/recipes/xorg-driver/xf86-video-xgixp_1.7.99.3.bb b/recipes/xorg-driver/xf86-video-xgixp_1.7.99.3.bb
deleted file mode 100644
index fd15b7f..0000000
--- a/recipes/xorg-driver/xf86-video-xgixp_1.7.99.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-driver-video.inc
-DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c541152aee693fad743ef7cbf75a7ffc"
-SRC_URI[archive.sha256sum] = "13a1658ee3ead0ab8e8bf7a9c8f8f0e3e40e38138f45d8431e735cd7184fbbd8"
--
1.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 6/9] xorg-font: move older not pinned versions to obsolete dir
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
` (4 preceding siblings ...)
2010-08-16 15:30 ` [PATCH 5/9] xorg-driver: " Martin Jansa
@ 2010-08-16 15:30 ` Martin Jansa
2010-08-16 15:30 ` [PATCH 7/9] xorg-proto: " Martin Jansa
` (6 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 15:30 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes/obsolete/xorg/xorg-font/encodings_1.0.2.bb | 8 +++
.../xorg/xorg-font/files/imake-staging.patch | 38 +++++++++++++++
.../xorg/xorg-font/font-adobe-100dpi_1.0.0.bb | 6 +++
.../xorg/xorg-font/font-adobe-75dpi_1.0.0.bb | 6 +++
.../xorg-font/font-adobe-utopia-100dpi_1.0.1.bb | 9 ++++
.../xorg-font/font-adobe-utopia-75dpi_1.0.1.bb | 9 ++++
.../xorg-font/font-adobe-utopia-type1_1.0.1.bb | 9 ++++
.../obsolete/xorg/xorg-font/font-alias_1.0.1.bb | 12 +++++
.../xorg/xorg-font/font-arabic-misc_1.0.0.bb | 10 ++++
.../xorg/xorg-font/font-bh-100dpi_1.0.0.bb | 7 +++
.../obsolete/xorg/xorg-font/font-bh-75dpi_1.0.0.bb | 7 +++
.../font-bh-lucidatypewriter-100dpi_1.0.0.bb | 7 +++
.../font-bh-lucidatypewriter-75dpi_1.0.0.bb | 7 +++
.../obsolete/xorg/xorg-font/font-bh-ttf_1.0.0.bb | 7 +++
.../obsolete/xorg/xorg-font/font-bh-type1_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-bitstream-100dpi_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-bitstream-75dpi_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-bitstream-speedo_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-bitstream-type1_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-cronyx-cyrillic_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-cursor-misc_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-daewoo-misc_1.0.0.bb | 7 +++
.../obsolete/xorg/xorg-font/font-dec-misc_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-ibm-type1_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-isas-misc_1.0.0.bb | 7 +++
.../obsolete/xorg/xorg-font/font-jis-misc_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-micro-misc_1.0.0.bb | 9 ++++
.../xorg/xorg-font/font-misc-cyrillic_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-misc-ethiopic_1.0.0.bb | 6 +++
.../xorg/xorg-font/font-misc-meltho_1.0.0.bb | 8 +++
.../font-misc-misc/configure-mapdir.patch | 11 +++++
.../xorg/xorg-font/font-misc-misc_1.0.0.bb | 10 ++++
.../xorg/xorg-font/font-mutt-misc_1.0.0.bb | 10 ++++
.../xorg/xorg-font/font-schumacher-misc_1.0.0.bb | 6 +++
.../xorg/xorg-font/font-screen-cyrillic_1.0.0.bb | 6 +++
.../xorg/xorg-font/font-sony-misc_1.0.0.bb | 6 +++
.../obsolete/xorg/xorg-font/font-sun-misc_1.0.0.bb | 6 +++
.../xorg/xorg-font/font-util-native_1.0.1.bb | 12 +++++
recipes/obsolete/xorg/xorg-font/font-util_1.0.1.bb | 14 ++++++
.../xorg/xorg-font/font-winitzki-cyrillic_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-xfree86-type1_1.0.0.bb | 7 +++
.../xorg/xorg-font/font-xfree86-type1_1.0.1.bb | 7 +++
recipes/xorg-font/encodings_1.0.2.bb | 8 ---
recipes/xorg-font/files/imake-staging.patch | 38 ---------------
recipes/xorg-font/files/lexer.patch | 48 --------------------
recipes/xorg-font/font-adobe-100dpi_1.0.0.bb | 6 ---
recipes/xorg-font/font-adobe-75dpi_1.0.0.bb | 6 ---
.../xorg-font/font-adobe-utopia-100dpi_1.0.1.bb | 9 ----
recipes/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb | 9 ----
recipes/xorg-font/font-adobe-utopia-type1_1.0.1.bb | 9 ----
recipes/xorg-font/font-alias_1.0.1.bb | 12 -----
recipes/xorg-font/font-arabic-misc_1.0.0.bb | 10 ----
recipes/xorg-font/font-bh-100dpi_1.0.0.bb | 7 ---
recipes/xorg-font/font-bh-75dpi_1.0.0.bb | 7 ---
.../font-bh-lucidatypewriter-100dpi_1.0.0.bb | 7 ---
.../font-bh-lucidatypewriter-75dpi_1.0.0.bb | 7 ---
recipes/xorg-font/font-bh-ttf_1.0.0.bb | 7 ---
recipes/xorg-font/font-bh-type1_1.0.0.bb | 7 ---
recipes/xorg-font/font-bitstream-100dpi_1.0.0.bb | 7 ---
recipes/xorg-font/font-bitstream-75dpi_1.0.0.bb | 7 ---
recipes/xorg-font/font-bitstream-speedo_1.0.0.bb | 7 ---
recipes/xorg-font/font-bitstream-type1_1.0.0.bb | 7 ---
recipes/xorg-font/font-cronyx-cyrillic_1.0.0.bb | 7 ---
recipes/xorg-font/font-cursor-misc_1.0.0.bb | 7 ---
recipes/xorg-font/font-daewoo-misc_1.0.0.bb | 7 ---
recipes/xorg-font/font-dec-misc_1.0.0.bb | 7 ---
recipes/xorg-font/font-ibm-type1_1.0.0.bb | 7 ---
recipes/xorg-font/font-isas-misc_1.0.0.bb | 7 ---
recipes/xorg-font/font-jis-misc_1.0.0.bb | 7 ---
recipes/xorg-font/font-micro-misc_1.0.0.bb | 9 ----
recipes/xorg-font/font-misc-cyrillic_1.0.0.bb | 7 ---
recipes/xorg-font/font-misc-ethiopic_1.0.0.bb | 6 ---
recipes/xorg-font/font-misc-meltho_1.0.0.bb | 8 ---
.../font-misc-misc/configure-mapdir.patch | 11 -----
recipes/xorg-font/font-misc-misc_1.0.0.bb | 10 ----
recipes/xorg-font/font-mutt-misc_1.0.0.bb | 10 ----
recipes/xorg-font/font-schumacher-misc_1.0.0.bb | 6 ---
recipes/xorg-font/font-screen-cyrillic_1.0.0.bb | 6 ---
recipes/xorg-font/font-sony-misc_1.0.0.bb | 6 ---
recipes/xorg-font/font-sun-misc_1.0.0.bb | 6 ---
recipes/xorg-font/font-util-native_1.0.1.bb | 12 -----
recipes/xorg-font/font-util_1.0.1.bb | 14 ------
recipes/xorg-font/font-winitzki-cyrillic_1.0.0.bb | 7 ---
recipes/xorg-font/font-xfree86-type1_1.0.0.bb | 7 ---
recipes/xorg-font/font-xfree86-type1_1.0.1.bb | 7 ---
recipes/xorg-font/xfonts-xorg-6.8/lexer.patch | 48 ++++++++++++++++++++
86 files changed, 406 insertions(+), 406 deletions(-)
create mode 100644 recipes/obsolete/xorg/xorg-font/encodings_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/files/imake-staging.patch
create mode 100644 recipes/obsolete/xorg/xorg-font/font-adobe-100dpi_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-adobe-75dpi_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-adobe-utopia-type1_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-alias_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-arabic-misc_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-bh-100dpi_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-bh-75dpi_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-bh-ttf_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-bh-type1_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-bitstream-100dpi_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-bitstream-75dpi_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-bitstream-speedo_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-bitstream-type1_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-cronyx-cyrillic_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-cursor-misc_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-daewoo-misc_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-dec-misc_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-ibm-type1_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-isas-misc_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-jis-misc_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-micro-misc_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-misc-cyrillic_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-misc-ethiopic_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-misc-meltho_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-misc-misc/configure-mapdir.patch
create mode 100644 recipes/obsolete/xorg/xorg-font/font-misc-misc_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-mutt-misc_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-schumacher-misc_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-screen-cyrillic_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-sony-misc_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-sun-misc_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-util-native_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-util_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-winitzki-cyrillic_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-xfree86-type1_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-font/font-xfree86-type1_1.0.1.bb
delete mode 100644 recipes/xorg-font/encodings_1.0.2.bb
delete mode 100644 recipes/xorg-font/files/imake-staging.patch
delete mode 100644 recipes/xorg-font/files/lexer.patch
delete mode 100644 recipes/xorg-font/font-adobe-100dpi_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-adobe-75dpi_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb
delete mode 100644 recipes/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb
delete mode 100644 recipes/xorg-font/font-adobe-utopia-type1_1.0.1.bb
delete mode 100644 recipes/xorg-font/font-alias_1.0.1.bb
delete mode 100644 recipes/xorg-font/font-arabic-misc_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-bh-100dpi_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-bh-75dpi_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-bh-ttf_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-bh-type1_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-bitstream-100dpi_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-bitstream-75dpi_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-bitstream-speedo_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-bitstream-type1_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-cronyx-cyrillic_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-cursor-misc_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-daewoo-misc_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-dec-misc_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-ibm-type1_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-isas-misc_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-jis-misc_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-micro-misc_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-misc-cyrillic_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-misc-ethiopic_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-misc-meltho_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-misc-misc/configure-mapdir.patch
delete mode 100644 recipes/xorg-font/font-misc-misc_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-mutt-misc_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-schumacher-misc_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-screen-cyrillic_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-sony-misc_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-sun-misc_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-util-native_1.0.1.bb
delete mode 100644 recipes/xorg-font/font-util_1.0.1.bb
delete mode 100644 recipes/xorg-font/font-winitzki-cyrillic_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-xfree86-type1_1.0.0.bb
delete mode 100644 recipes/xorg-font/font-xfree86-type1_1.0.1.bb
create mode 100644 recipes/xorg-font/xfonts-xorg-6.8/lexer.patch
diff --git a/recipes/obsolete/xorg/xorg-font/encodings_1.0.2.bb b/recipes/obsolete/xorg/xorg-font/encodings_1.0.2.bb
new file mode 100644
index 0000000..b0272a2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/encodings_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-font-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+DEPENDS = "mkfontscale-native font-util-native"
+
+SRC_URI[archive.md5sum] = "11adda157b03d63fd61d95ad7ef00466"
+SRC_URI[archive.sha256sum] = "6d19107b66bbc96c085b0c2dd286ece22dcb73ba56a17fc95b0f2cbc5d6f4eac"
diff --git a/recipes/obsolete/xorg/xorg-font/files/imake-staging.patch b/recipes/obsolete/xorg/xorg-font/files/imake-staging.patch
new file mode 100644
index 0000000..bf2e350
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/files/imake-staging.patch
@@ -0,0 +1,38 @@
+--- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100
++++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100
+@@ -2038,11 +2038,11 @@
+ */
+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
++ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+ LDPRELIB = LdPreLib $(INSTALLED_LIBS)
+ LDPOSTLIB = LdPostLib
+- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
++ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING)
+ CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
+
+ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
+--- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100
++++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100
+@@ -114,7 +114,7 @@
+ STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
+ CDEBUGFLAGS = LibraryCDebugFlags
+ CLIBDEBUGFLAGS = LibraryDebugOpt
+- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
+ # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
+ PICFLAGS = LargePositionIndependentCFlags
+ # endif
+--- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100
++++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100
+@@ -3359,7 +3359,7 @@
+ FREETYPE2LIBDIR = Freetype2LibDir
+ FREETYPE2INCDIR = Freetype2IncDir
+ #if Freetype2LibDirStandard
+-FREETYPE2LIB = -lfreetype
++FREETYPE2LIB = $(LD_STAGING) -lfreetype
+ #else
+ FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
+ #endif
diff --git a/recipes/obsolete/xorg/xorg-font/font-adobe-100dpi_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-adobe-100dpi_1.0.0.bb
new file mode 100644
index 0000000..31da680
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-adobe-100dpi_1.0.0.bb
@@ -0,0 +1,6 @@
+require xorg-font-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "443acfe70e26716282f9068730fe92c4"
+SRC_URI[archive.sha256sum] = "f16c1b3a1625c9a225aff2ac12067bd3907d157b0c60625689a5080f092e9a19"
diff --git a/recipes/obsolete/xorg/xorg-font/font-adobe-75dpi_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-adobe-75dpi_1.0.0.bb
new file mode 100644
index 0000000..f0654d2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-adobe-75dpi_1.0.0.bb
@@ -0,0 +1,6 @@
+require xorg-font-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "813b5d3723c84388a938ab6732e1329c"
+SRC_URI[archive.sha256sum] = "d62745bee0f5e4f355f237020667d783ae9fea5f18a864d748ae1287bd176339"
diff --git a/recipes/obsolete/xorg/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb b/recipes/obsolete/xorg/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb
new file mode 100644
index 0000000..f5286ee
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "Adobe typeface software"
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5d28a30efef966f8dbbaff9a6619f01a"
+SRC_URI[archive.sha256sum] = "1943e1aa70c169b13bc7a308c8e949267f9ce6327479803203fbf10c06a9b5fe"
diff --git a/recipes/obsolete/xorg/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb b/recipes/obsolete/xorg/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb
new file mode 100644
index 0000000..7cffdd8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "Adobe typeface software"
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "dd912284e4750023f9682812532fa033"
+SRC_URI[archive.sha256sum] = "ebd4e2194bbc727e3bbda0f5dc1493fe3a211c7cf77e3d41f93135dd04ca7089"
diff --git a/recipes/obsolete/xorg/xorg-font/font-adobe-utopia-type1_1.0.1.bb b/recipes/obsolete/xorg/xorg-font/font-adobe-utopia-type1_1.0.1.bb
new file mode 100644
index 0000000..648fe05
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-adobe-utopia-type1_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "Adobe typeface software"
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "aa7ff4bd20b961afda9c15d103b972a5"
+SRC_URI[archive.sha256sum] = "e9c672c8ff275fd5c2d76dda9a9f11138766e246e31e45763cd7e14d8824c0dc"
diff --git a/recipes/obsolete/xorg/xorg-font/font-alias_1.0.1.bb b/recipes/obsolete/xorg/xorg-font/font-alias_1.0.1.bb
new file mode 100644
index 0000000..687e0a4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-alias_1.0.1.bb
@@ -0,0 +1,12 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "X font aliases."
+
+DEPENDS = "virtual/xserver font-util"
+RDEPENDS_${PN} = "encodings font-util"
+
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "c4776b6f0f2ecdb7670b6fe64b5d2a2d"
+SRC_URI[archive.sha256sum] = "77db60d63224b9d856129d23c0b0d0e9154a166137daf749d39abfd56a4f89b6"
diff --git a/recipes/obsolete/xorg/xorg-font/font-arabic-misc_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-arabic-misc_1.0.0.bb
new file mode 100644
index 0000000..4ebf72e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-arabic-misc_1.0.0.bb
@@ -0,0 +1,10 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "100dpi, 24 point (approximately) font to minimally support (almost) all \
+of the Arabic characters available in Unicode."
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "81595016e2ff859716fc256ebb136ba6"
+SRC_URI[archive.sha256sum] = "90e9dfa3f33805ea2ffe06faa7258d8335cdf415826f963a1d0a76bd8df7bc94"
diff --git a/recipes/obsolete/xorg/xorg-font/font-bh-100dpi_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-bh-100dpi_1.0.0.bb
new file mode 100644
index 0000000..69cbe4e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-bh-100dpi_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e5592de74a5c04e3a2608800dd079197"
+SRC_URI[archive.sha256sum] = "ae8a11777579a2242f52ed19b5fdd6c6ef6fe2c2661a49d0599188de78cfee4a"
diff --git a/recipes/obsolete/xorg/xorg-font/font-bh-75dpi_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-bh-75dpi_1.0.0.bb
new file mode 100644
index 0000000..605f759
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-bh-75dpi_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6e51cd02f4ce32e1393e34ab17a9b211"
+SRC_URI[archive.sha256sum] = "c79467b440cc9389c75d55fba64d0126d0f2e1e6c019dfafb7d89d07802c05bf"
diff --git a/recipes/obsolete/xorg/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb
new file mode 100644
index 0000000..e075cb4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c44d3f730564da465993e9292a33c235"
+SRC_URI[archive.sha256sum] = "36d47dcba591037b6af35fc151e3d7a6c9f16f42b3182e083ea140cb584d7013"
diff --git a/recipes/obsolete/xorg/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb
new file mode 100644
index 0000000..d5d87a8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fdd9be5b9db94ef363a33e39b7977e2b"
+SRC_URI[archive.sha256sum] = "50f2f36f533a49c65842568052fe4d065354ff6f39ab36dd2129f465741da046"
diff --git a/recipes/obsolete/xorg/xorg-font/font-bh-ttf_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-bh-ttf_1.0.0.bb
new file mode 100644
index 0000000..b276908
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-bh-ttf_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ad43cf739b3d46ba1e7dc778a0608a52"
+SRC_URI[archive.sha256sum] = "7a1a5e72f7e42398b98d70aa64252837e85ed76eea77a1b9a4cd0f1203d7d644"
diff --git a/recipes/obsolete/xorg/xorg-font/font-bh-type1_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-bh-type1_1.0.0.bb
new file mode 100644
index 0000000..93ddfe8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-bh-type1_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "46588b22678e440741d6220bc3945cbf"
+SRC_URI[archive.sha256sum] = "5a8a5513f2c829d56043a0f74980efc11b4b4522f21116f16711998f72c3645b"
diff --git a/recipes/obsolete/xorg/xorg-font/font-bitstream-100dpi_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-bitstream-100dpi_1.0.0.bb
new file mode 100644
index 0000000..25af60c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-bitstream-100dpi_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "173352ddec3d26e2b91df1edcf1ae85b"
+SRC_URI[archive.sha256sum] = "0c705a74d7b52e41a1f1aa6732f0200877ba2d4303b79513a524e7cc1b30e2d2"
diff --git a/recipes/obsolete/xorg/xorg-font/font-bitstream-75dpi_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-bitstream-75dpi_1.0.0.bb
new file mode 100644
index 0000000..64c2b55
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-bitstream-75dpi_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "beb476657d50d07d17eef7c325a5ed08"
+SRC_URI[archive.sha256sum] = "2ddfeaccca97524e1b0f4fb37b2fd0f1338698e35f8b05b22b594fe29e201bfb"
diff --git a/recipes/obsolete/xorg/xorg-font/font-bitstream-speedo_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-bitstream-speedo_1.0.0.bb
new file mode 100644
index 0000000..cd4790e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-bitstream-speedo_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1399dc18aeb9571b0951d9570ea1059d"
+SRC_URI[archive.sha256sum] = "99ac01786ac400cc7407f1c427b92c5ff1ac5a31ce7d5907b7ad3c969214f6e6"
diff --git a/recipes/obsolete/xorg/xorg-font/font-bitstream-type1_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-bitstream-type1_1.0.0.bb
new file mode 100644
index 0000000..39f8f33
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-bitstream-type1_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6610475e2e231242f8f2122a709c3695"
+SRC_URI[archive.sha256sum] = "4fce492dcf168837342ea1787ac35b53e4d30361239cba207c9520c42454d903"
diff --git a/recipes/obsolete/xorg/xorg-font/font-cronyx-cyrillic_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-cronyx-cyrillic_1.0.0.bb
new file mode 100644
index 0000000..d875de8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-cronyx-cyrillic_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "22b451e7230b8c003cfc496ee2d360cc"
+SRC_URI[archive.sha256sum] = "06c94e7033f5cae77b9ba27b84af7c1d3e7f73a7239346aabf98eda6c7f484ee"
diff --git a/recipes/obsolete/xorg/xorg-font/font-cursor-misc_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-cursor-misc_1.0.0.bb
new file mode 100644
index 0000000..c152a1f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-cursor-misc_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "305fa22cdfefb8f80babd711051a534b"
+SRC_URI[archive.sha256sum] = "955de27117581ba501d7c2abae7f38b0a65662e4ab2e2b54b9eb2dc07aa5f3c5"
diff --git a/recipes/obsolete/xorg/xorg-font/font-daewoo-misc_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-daewoo-misc_1.0.0.bb
new file mode 100644
index 0000000..67344e5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-daewoo-misc_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "61f9eab48c619af5494d3e384d8d7d79"
+SRC_URI[archive.sha256sum] = "f198eac92e343a38b1e23288880bac91c439bdc90c61a79a7cb0718e9a468926"
diff --git a/recipes/obsolete/xorg/xorg-font/font-dec-misc_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-dec-misc_1.0.0.bb
new file mode 100644
index 0000000..06a6b0f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-dec-misc_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "284e554db1c64fb7580a06df01444a2b"
+SRC_URI[archive.sha256sum] = "83386d1225dab1ebc58e7d197acc4c310ed4e29840abf291b1fa2ffac1b68bb9"
diff --git a/recipes/obsolete/xorg/xorg-font/font-ibm-type1_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-ibm-type1_1.0.0.bb
new file mode 100644
index 0000000..b82fcdb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-ibm-type1_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8e8733051371e2b51123376b49f5d3ea"
+SRC_URI[archive.sha256sum] = "30d091c2e3506943f8a6e152c4be973c462ba19293a864bbb48b82c6cf9c461e"
diff --git a/recipes/obsolete/xorg/xorg-font/font-isas-misc_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-isas-misc_1.0.0.bb
new file mode 100644
index 0000000..fc41381
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-isas-misc_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ec709a96b64b497a5cb5658c93bd38dc"
+SRC_URI[archive.sha256sum] = "97e61313ce0bf229da5d489fc5a05562fdca14f9acc17c40d0b272a345ba4ea2"
diff --git a/recipes/obsolete/xorg/xorg-font/font-jis-misc_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-jis-misc_1.0.0.bb
new file mode 100644
index 0000000..f61ce02
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-jis-misc_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "61febb49a71065723a1fba17cbf23c67"
+SRC_URI[archive.sha256sum] = "3721eefd4ffc47c6948065f7acf9d5c731c4e8e54105d096735876d3712dc7ba"
diff --git a/recipes/obsolete/xorg/xorg-font/font-micro-misc_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-micro-misc_1.0.0.bb
new file mode 100644
index 0000000..d15b7c2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-micro-misc_1.0.0.bb
@@ -0,0 +1,9 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r"
+
+SRC_URI[archive.md5sum] = "8c8bffd7540f05caa0dbb4e6e1d6c58e"
+SRC_URI[archive.sha256sum] = "16b17b5939e12e9381c8096c1f77f064ee0073fa9cb09297dec278bade17a572"
diff --git a/recipes/obsolete/xorg/xorg-font/font-misc-cyrillic_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-misc-cyrillic_1.0.0.bb
new file mode 100644
index 0000000..ba0bec7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-misc-cyrillic_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3596907d7a2a99c81d8de99bc4552b6a"
+SRC_URI[archive.sha256sum] = "7c0bac1302129d3bf40ec7d9830e728b0251dc20dda8c8979227b478663290ff"
diff --git a/recipes/obsolete/xorg/xorg-font/font-misc-ethiopic_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-misc-ethiopic_1.0.0.bb
new file mode 100644
index 0000000..6d96c46
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-misc-ethiopic_1.0.0.bb
@@ -0,0 +1,6 @@
+require xorg-font-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0b271fc617087d77560bdca20c0cdbb0"
+SRC_URI[archive.sha256sum] = "58d2868801ca063797fa88fb4aea59f7c550473be4e9a4f96d84fe39b967d141"
diff --git a/recipes/obsolete/xorg/xorg-font/font-misc-meltho_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-misc-meltho_1.0.0.bb
new file mode 100644
index 0000000..c51cdc3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-misc-meltho_1.0.0.bb
@@ -0,0 +1,8 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "These fonts are designed for the display of Syriac text."
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ccb212a7badf7aefdc9f9a92af428d32"
+SRC_URI[archive.sha256sum] = "c7e12b9926b6053f3567eae548840f0b3d283ce34f842b06309a81c1d98d3924"
diff --git a/recipes/obsolete/xorg/xorg-font/font-misc-misc/configure-mapdir.patch b/recipes/obsolete/xorg/xorg-font/font-misc-misc/configure-mapdir.patch
new file mode 100644
index 0000000..caf09b6
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-misc-misc/configure-mapdir.patch
@@ -0,0 +1,11 @@
+--- s/configure.ac~ 2005-12-15 00:24:25.000000000 +0000
++++ s/configure.ac 2008-07-27 10:05:30.000000000 +0100
+@@ -45,7 +45,7 @@
+ AC_SUBST(FONTDIR)
+
+ PKG_CHECK_MODULES(MAPS, [fontutil])
+-MAPFILES_PATH=$(pkg-config --variable=mapdir fontutil)
++MAPFILES_PATH=$(PKG_CONFIG_PATH="${STAGING_LIBDIR_NATIVE}/pkg-config" ${PKG_CONFIG} --variable=mapdir fontutil)
+ AC_SUBST(MAPFILES_PATH)
+
+ XORG_FONT_CHECK_ISO8859_1
diff --git a/recipes/obsolete/xorg/xorg-font/font-misc-misc_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-misc-misc_1.0.0.bb
new file mode 100644
index 0000000..43bfa95
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-misc-misc_1.0.0.bb
@@ -0,0 +1,10 @@
+EXTRA_OECONF = "STAGING_LIBDIR_NATIVE=\"${STAGING_LIBDIR_NATIVE}\""
+
+require xorg-font-common.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://configure-mapdir.patch"
+
+SRC_URI[archive.md5sum] = "2a57f6188c41d4bc1b88ca3d08ad011d"
+SRC_URI[archive.sha256sum] = "26a02560ad1f1648e7c36be6daf42910762131d3974422d1b306e6cae13f17db"
diff --git a/recipes/obsolete/xorg/xorg-font/font-mutt-misc_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-mutt-misc_1.0.0.bb
new file mode 100644
index 0000000..aae3d9d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-mutt-misc_1.0.0.bb
@@ -0,0 +1,10 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "Provides a 12pt, 100dpi proportional font with many of \
+the glyphs needed for Unicode text."
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "648b409b7eb78ad1cd5f6d7fac3eef88"
+SRC_URI[archive.sha256sum] = "f219183bd0f2b8ceca42a8a345c921f2a8ee19f4d86fef11c4ce8918d41aedff"
diff --git a/recipes/obsolete/xorg/xorg-font/font-schumacher-misc_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-schumacher-misc_1.0.0.bb
new file mode 100644
index 0000000..7a5b4f6
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-schumacher-misc_1.0.0.bb
@@ -0,0 +1,6 @@
+require xorg-font-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f1c6063d2fadc57e696a0aab69afd6e0"
+SRC_URI[archive.sha256sum] = "454e6cf885a4475569ce24ad3d4a82cb331d74e1a25f0747694a71098b56ef7a"
diff --git a/recipes/obsolete/xorg/xorg-font/font-screen-cyrillic_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-screen-cyrillic_1.0.0.bb
new file mode 100644
index 0000000..30f3984
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-screen-cyrillic_1.0.0.bb
@@ -0,0 +1,6 @@
+require xorg-font-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "aea02d9dff03e0e1a3de85364367c0c6"
+SRC_URI[archive.sha256sum] = "01de82644a9b765599ba8c36c6b689035a85b6590486842067f707f2cb0cf268"
diff --git a/recipes/obsolete/xorg/xorg-font/font-sony-misc_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-sony-misc_1.0.0.bb
new file mode 100644
index 0000000..1f3897e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-sony-misc_1.0.0.bb
@@ -0,0 +1,6 @@
+require xorg-font-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0dfddd1a946e4497f009094c0ae1bdd5"
+SRC_URI[archive.sha256sum] = "1ae93ae76020b57cb0054ba9f33b4d5aec71342c6596750c07303d5c53452e23"
diff --git a/recipes/obsolete/xorg/xorg-font/font-sun-misc_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-sun-misc_1.0.0.bb
new file mode 100644
index 0000000..62bcf2e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-sun-misc_1.0.0.bb
@@ -0,0 +1,6 @@
+require xorg-font-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e17d43a7c6c0d862cfba0908ff132ffa"
+SRC_URI[archive.sha256sum] = "03c12d8f4d8e7f0178f501ea3ee0709ee3a1deda733afecd631807e6ba5729e5"
diff --git a/recipes/obsolete/xorg/xorg-font/font-util-native_1.0.1.bb b/recipes/obsolete/xorg/xorg-font/font-util-native_1.0.1.bb
new file mode 100644
index 0000000..84f65d7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-util-native_1.0.1.bb
@@ -0,0 +1,12 @@
+inherit native
+require xorg-font-common.inc
+
+XORG_PN = "font-util"
+
+DEPENDS = "bdftopcf-native"
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b81535f78fe05732931f02841e5ca37b"
+SRC_URI[archive.sha256sum] = "048c23b17ea32ee3abb341f0b1105ad07517b2e78efe2e95a4a8218089600612"
diff --git a/recipes/obsolete/xorg/xorg-font/font-util_1.0.1.bb b/recipes/obsolete/xorg/xorg-font/font-util_1.0.1.bb
new file mode 100644
index 0000000..47fa71a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-util_1.0.1.bb
@@ -0,0 +1,14 @@
+require xorg-font-common.inc
+
+PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
+
+DESCRIPTION = "X font utils."
+
+DEPENDS = "encodings"
+RDEPENDS_${PN} = "mkfontdir mkfontscale encodings"
+
+PE = "1"
+PR = "${INC_PR}.2"
+
+SRC_URI[archive.md5sum] = "b81535f78fe05732931f02841e5ca37b"
+SRC_URI[archive.sha256sum] = "048c23b17ea32ee3abb341f0b1105ad07517b2e78efe2e95a4a8218089600612"
diff --git a/recipes/obsolete/xorg/xorg-font/font-winitzki-cyrillic_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-winitzki-cyrillic_1.0.0.bb
new file mode 100644
index 0000000..7069f0a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-winitzki-cyrillic_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b99b02aff36a88ca3379715423c60303"
+SRC_URI[archive.sha256sum] = "478a7f6881fce6a335b409e1326449af4162a147d268f1978b8dd81c834beee3"
diff --git a/recipes/obsolete/xorg/xorg-font/font-xfree86-type1_1.0.0.bb b/recipes/obsolete/xorg/xorg-font/font-xfree86-type1_1.0.0.bb
new file mode 100644
index 0000000..3e091f3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-xfree86-type1_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e66f36a6d68203cc4cf7b56ebbb192dd"
+SRC_URI[archive.sha256sum] = "ef76d3b91d1bdaa9ff73cc1e5905ad4bbdc028f06157d0d2319d38e7b7f84a4d"
diff --git a/recipes/obsolete/xorg/xorg-font/font-xfree86-type1_1.0.1.bb b/recipes/obsolete/xorg/xorg-font/font-xfree86-type1_1.0.1.bb
new file mode 100644
index 0000000..090a197
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-font/font-xfree86-type1_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d7e965776c7f0c30b0f09742176fb77a"
+SRC_URI[archive.sha256sum] = "8fd9f9b81120d8afc25ea8901a8a91d7428c45cd9cfe7a7bef2b15c8b8d5f341"
diff --git a/recipes/xorg-font/encodings_1.0.2.bb b/recipes/xorg-font/encodings_1.0.2.bb
deleted file mode 100644
index b0272a2..0000000
--- a/recipes/xorg-font/encodings_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-font-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-DEPENDS = "mkfontscale-native font-util-native"
-
-SRC_URI[archive.md5sum] = "11adda157b03d63fd61d95ad7ef00466"
-SRC_URI[archive.sha256sum] = "6d19107b66bbc96c085b0c2dd286ece22dcb73ba56a17fc95b0f2cbc5d6f4eac"
diff --git a/recipes/xorg-font/files/imake-staging.patch b/recipes/xorg-font/files/imake-staging.patch
deleted file mode 100644
index bf2e350..0000000
--- a/recipes/xorg-font/files/imake-staging.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100
-+++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100
-@@ -2038,11 +2038,11 @@
- */
- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
-- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
- LDPRELIB = LdPreLib $(INSTALLED_LIBS)
- LDPOSTLIB = LdPostLib
-- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING)
- CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-
- LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
---- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100
-+++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100
-@@ -114,7 +114,7 @@
- STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
- CDEBUGFLAGS = LibraryCDebugFlags
- CLIBDEBUGFLAGS = LibraryDebugOpt
-- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
-+ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
- # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
- PICFLAGS = LargePositionIndependentCFlags
- # endif
---- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100
-+++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100
-@@ -3359,7 +3359,7 @@
- FREETYPE2LIBDIR = Freetype2LibDir
- FREETYPE2INCDIR = Freetype2IncDir
- #if Freetype2LibDirStandard
--FREETYPE2LIB = -lfreetype
-+FREETYPE2LIB = $(LD_STAGING) -lfreetype
- #else
- FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
- #endif
diff --git a/recipes/xorg-font/files/lexer.patch b/recipes/xorg-font/files/lexer.patch
deleted file mode 100644
index c3caf57..0000000
--- a/recipes/xorg-font/files/lexer.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur xc.old/config/pswrap/lexer.l xc/config/pswrap/lexer.l
---- xc.old/config/pswrap/lexer.l 2004-04-23 18:42:00.000000000 +0000
-+++ xc/config/pswrap/lexer.l 2004-11-16 21:07:10.569144105 +0000
-@@ -41,6 +41,7 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <string.h>
-+int yy_prev_more_offset;
-
- #include "pswpriv.h"
- #include "pswparser.h"
-diff -Naur xc.old/programs/twm/lex.l xc/programs/twm/lex.l
---- xc.old/programs/twm/lex.l 2004-04-23 18:42:00.000000000 +0000
-+++ xc/programs/twm/lex.l 2004-11-16 21:07:10.569144105 +0000
-@@ -65,6 +41,7 @@
- #include "gram.h"
- #include "list.h"
- #include "parse.h"
-+int yy_prev_more_offset;
-
- #ifdef FLEX_SCANNER
- int yylineno;
-diff -Naur xc.old/programs/xgc/lex.l xc/programs/xgc/lex.l
---- xc.old/programs/xgc/lex.l 2004-04-23 18:42:00.000000000 +0000
-+++ xc/programs/xgc/lex.l 2004-11-16 21:07:10.569144105 +0000
-@@ -11,6 +11,9 @@
- #include <X11/X.h>
- #include "gram.h"
- #include "constants.h"
-+
-+int yy_prev_more_offset;
-+
- #if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__)
- int yylineno = 0;
- #endif
-diff -Naur xc.old/programs/Xserver/hw/dmx/config/scanner.l xc/programs/Xserver/hw/dmx/config/scanner.l
---- xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-07-30 20:06:00.000000000 +0000
-+++ xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-11-16 21:07:10.569144105 +0000
-@@ -37,6 +37,9 @@
- #include "parser.h"
- #include <string.h>
- #include <ctype.h>
-+
-+int yy_prev_more_offset;
-+
- static int getdimension(int token, const char *text, int leng);
- static int getstring(int token, const char *text, int leng);
- static int gettoken(int token, const char *text, int leng);
diff --git a/recipes/xorg-font/font-adobe-100dpi_1.0.0.bb b/recipes/xorg-font/font-adobe-100dpi_1.0.0.bb
deleted file mode 100644
index 31da680..0000000
--- a/recipes/xorg-font/font-adobe-100dpi_1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-font-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "443acfe70e26716282f9068730fe92c4"
-SRC_URI[archive.sha256sum] = "f16c1b3a1625c9a225aff2ac12067bd3907d157b0c60625689a5080f092e9a19"
diff --git a/recipes/xorg-font/font-adobe-75dpi_1.0.0.bb b/recipes/xorg-font/font-adobe-75dpi_1.0.0.bb
deleted file mode 100644
index f0654d2..0000000
--- a/recipes/xorg-font/font-adobe-75dpi_1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-font-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "813b5d3723c84388a938ab6732e1329c"
-SRC_URI[archive.sha256sum] = "d62745bee0f5e4f355f237020667d783ae9fea5f18a864d748ae1287bd176339"
diff --git a/recipes/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb b/recipes/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb
deleted file mode 100644
index f5286ee..0000000
--- a/recipes/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "Adobe typeface software"
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5d28a30efef966f8dbbaff9a6619f01a"
-SRC_URI[archive.sha256sum] = "1943e1aa70c169b13bc7a308c8e949267f9ce6327479803203fbf10c06a9b5fe"
diff --git a/recipes/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb b/recipes/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb
deleted file mode 100644
index 7cffdd8..0000000
--- a/recipes/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "Adobe typeface software"
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "dd912284e4750023f9682812532fa033"
-SRC_URI[archive.sha256sum] = "ebd4e2194bbc727e3bbda0f5dc1493fe3a211c7cf77e3d41f93135dd04ca7089"
diff --git a/recipes/xorg-font/font-adobe-utopia-type1_1.0.1.bb b/recipes/xorg-font/font-adobe-utopia-type1_1.0.1.bb
deleted file mode 100644
index 648fe05..0000000
--- a/recipes/xorg-font/font-adobe-utopia-type1_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "Adobe typeface software"
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "aa7ff4bd20b961afda9c15d103b972a5"
-SRC_URI[archive.sha256sum] = "e9c672c8ff275fd5c2d76dda9a9f11138766e246e31e45763cd7e14d8824c0dc"
diff --git a/recipes/xorg-font/font-alias_1.0.1.bb b/recipes/xorg-font/font-alias_1.0.1.bb
deleted file mode 100644
index 687e0a4..0000000
--- a/recipes/xorg-font/font-alias_1.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "X font aliases."
-
-DEPENDS = "virtual/xserver font-util"
-RDEPENDS_${PN} = "encodings font-util"
-
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "c4776b6f0f2ecdb7670b6fe64b5d2a2d"
-SRC_URI[archive.sha256sum] = "77db60d63224b9d856129d23c0b0d0e9154a166137daf749d39abfd56a4f89b6"
diff --git a/recipes/xorg-font/font-arabic-misc_1.0.0.bb b/recipes/xorg-font/font-arabic-misc_1.0.0.bb
deleted file mode 100644
index 4ebf72e..0000000
--- a/recipes/xorg-font/font-arabic-misc_1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "100dpi, 24 point (approximately) font to minimally support (almost) all \
-of the Arabic characters available in Unicode."
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "81595016e2ff859716fc256ebb136ba6"
-SRC_URI[archive.sha256sum] = "90e9dfa3f33805ea2ffe06faa7258d8335cdf415826f963a1d0a76bd8df7bc94"
diff --git a/recipes/xorg-font/font-bh-100dpi_1.0.0.bb b/recipes/xorg-font/font-bh-100dpi_1.0.0.bb
deleted file mode 100644
index 69cbe4e..0000000
--- a/recipes/xorg-font/font-bh-100dpi_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e5592de74a5c04e3a2608800dd079197"
-SRC_URI[archive.sha256sum] = "ae8a11777579a2242f52ed19b5fdd6c6ef6fe2c2661a49d0599188de78cfee4a"
diff --git a/recipes/xorg-font/font-bh-75dpi_1.0.0.bb b/recipes/xorg-font/font-bh-75dpi_1.0.0.bb
deleted file mode 100644
index 605f759..0000000
--- a/recipes/xorg-font/font-bh-75dpi_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6e51cd02f4ce32e1393e34ab17a9b211"
-SRC_URI[archive.sha256sum] = "c79467b440cc9389c75d55fba64d0126d0f2e1e6c019dfafb7d89d07802c05bf"
diff --git a/recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb b/recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb
deleted file mode 100644
index e075cb4..0000000
--- a/recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c44d3f730564da465993e9292a33c235"
-SRC_URI[archive.sha256sum] = "36d47dcba591037b6af35fc151e3d7a6c9f16f42b3182e083ea140cb584d7013"
diff --git a/recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb b/recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb
deleted file mode 100644
index d5d87a8..0000000
--- a/recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fdd9be5b9db94ef363a33e39b7977e2b"
-SRC_URI[archive.sha256sum] = "50f2f36f533a49c65842568052fe4d065354ff6f39ab36dd2129f465741da046"
diff --git a/recipes/xorg-font/font-bh-ttf_1.0.0.bb b/recipes/xorg-font/font-bh-ttf_1.0.0.bb
deleted file mode 100644
index b276908..0000000
--- a/recipes/xorg-font/font-bh-ttf_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ad43cf739b3d46ba1e7dc778a0608a52"
-SRC_URI[archive.sha256sum] = "7a1a5e72f7e42398b98d70aa64252837e85ed76eea77a1b9a4cd0f1203d7d644"
diff --git a/recipes/xorg-font/font-bh-type1_1.0.0.bb b/recipes/xorg-font/font-bh-type1_1.0.0.bb
deleted file mode 100644
index 93ddfe8..0000000
--- a/recipes/xorg-font/font-bh-type1_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "46588b22678e440741d6220bc3945cbf"
-SRC_URI[archive.sha256sum] = "5a8a5513f2c829d56043a0f74980efc11b4b4522f21116f16711998f72c3645b"
diff --git a/recipes/xorg-font/font-bitstream-100dpi_1.0.0.bb b/recipes/xorg-font/font-bitstream-100dpi_1.0.0.bb
deleted file mode 100644
index 25af60c..0000000
--- a/recipes/xorg-font/font-bitstream-100dpi_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "173352ddec3d26e2b91df1edcf1ae85b"
-SRC_URI[archive.sha256sum] = "0c705a74d7b52e41a1f1aa6732f0200877ba2d4303b79513a524e7cc1b30e2d2"
diff --git a/recipes/xorg-font/font-bitstream-75dpi_1.0.0.bb b/recipes/xorg-font/font-bitstream-75dpi_1.0.0.bb
deleted file mode 100644
index 64c2b55..0000000
--- a/recipes/xorg-font/font-bitstream-75dpi_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "beb476657d50d07d17eef7c325a5ed08"
-SRC_URI[archive.sha256sum] = "2ddfeaccca97524e1b0f4fb37b2fd0f1338698e35f8b05b22b594fe29e201bfb"
diff --git a/recipes/xorg-font/font-bitstream-speedo_1.0.0.bb b/recipes/xorg-font/font-bitstream-speedo_1.0.0.bb
deleted file mode 100644
index cd4790e..0000000
--- a/recipes/xorg-font/font-bitstream-speedo_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1399dc18aeb9571b0951d9570ea1059d"
-SRC_URI[archive.sha256sum] = "99ac01786ac400cc7407f1c427b92c5ff1ac5a31ce7d5907b7ad3c969214f6e6"
diff --git a/recipes/xorg-font/font-bitstream-type1_1.0.0.bb b/recipes/xorg-font/font-bitstream-type1_1.0.0.bb
deleted file mode 100644
index 39f8f33..0000000
--- a/recipes/xorg-font/font-bitstream-type1_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6610475e2e231242f8f2122a709c3695"
-SRC_URI[archive.sha256sum] = "4fce492dcf168837342ea1787ac35b53e4d30361239cba207c9520c42454d903"
diff --git a/recipes/xorg-font/font-cronyx-cyrillic_1.0.0.bb b/recipes/xorg-font/font-cronyx-cyrillic_1.0.0.bb
deleted file mode 100644
index d875de8..0000000
--- a/recipes/xorg-font/font-cronyx-cyrillic_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "22b451e7230b8c003cfc496ee2d360cc"
-SRC_URI[archive.sha256sum] = "06c94e7033f5cae77b9ba27b84af7c1d3e7f73a7239346aabf98eda6c7f484ee"
diff --git a/recipes/xorg-font/font-cursor-misc_1.0.0.bb b/recipes/xorg-font/font-cursor-misc_1.0.0.bb
deleted file mode 100644
index c152a1f..0000000
--- a/recipes/xorg-font/font-cursor-misc_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "305fa22cdfefb8f80babd711051a534b"
-SRC_URI[archive.sha256sum] = "955de27117581ba501d7c2abae7f38b0a65662e4ab2e2b54b9eb2dc07aa5f3c5"
diff --git a/recipes/xorg-font/font-daewoo-misc_1.0.0.bb b/recipes/xorg-font/font-daewoo-misc_1.0.0.bb
deleted file mode 100644
index 67344e5..0000000
--- a/recipes/xorg-font/font-daewoo-misc_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "61f9eab48c619af5494d3e384d8d7d79"
-SRC_URI[archive.sha256sum] = "f198eac92e343a38b1e23288880bac91c439bdc90c61a79a7cb0718e9a468926"
diff --git a/recipes/xorg-font/font-dec-misc_1.0.0.bb b/recipes/xorg-font/font-dec-misc_1.0.0.bb
deleted file mode 100644
index 06a6b0f..0000000
--- a/recipes/xorg-font/font-dec-misc_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "284e554db1c64fb7580a06df01444a2b"
-SRC_URI[archive.sha256sum] = "83386d1225dab1ebc58e7d197acc4c310ed4e29840abf291b1fa2ffac1b68bb9"
diff --git a/recipes/xorg-font/font-ibm-type1_1.0.0.bb b/recipes/xorg-font/font-ibm-type1_1.0.0.bb
deleted file mode 100644
index b82fcdb..0000000
--- a/recipes/xorg-font/font-ibm-type1_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8e8733051371e2b51123376b49f5d3ea"
-SRC_URI[archive.sha256sum] = "30d091c2e3506943f8a6e152c4be973c462ba19293a864bbb48b82c6cf9c461e"
diff --git a/recipes/xorg-font/font-isas-misc_1.0.0.bb b/recipes/xorg-font/font-isas-misc_1.0.0.bb
deleted file mode 100644
index fc41381..0000000
--- a/recipes/xorg-font/font-isas-misc_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ec709a96b64b497a5cb5658c93bd38dc"
-SRC_URI[archive.sha256sum] = "97e61313ce0bf229da5d489fc5a05562fdca14f9acc17c40d0b272a345ba4ea2"
diff --git a/recipes/xorg-font/font-jis-misc_1.0.0.bb b/recipes/xorg-font/font-jis-misc_1.0.0.bb
deleted file mode 100644
index f61ce02..0000000
--- a/recipes/xorg-font/font-jis-misc_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "61febb49a71065723a1fba17cbf23c67"
-SRC_URI[archive.sha256sum] = "3721eefd4ffc47c6948065f7acf9d5c731c4e8e54105d096735876d3712dc7ba"
diff --git a/recipes/xorg-font/font-micro-misc_1.0.0.bb b/recipes/xorg-font/font-micro-misc_1.0.0.bb
deleted file mode 100644
index d15b7c2..0000000
--- a/recipes/xorg-font/font-micro-misc_1.0.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r"
-
-SRC_URI[archive.md5sum] = "8c8bffd7540f05caa0dbb4e6e1d6c58e"
-SRC_URI[archive.sha256sum] = "16b17b5939e12e9381c8096c1f77f064ee0073fa9cb09297dec278bade17a572"
diff --git a/recipes/xorg-font/font-misc-cyrillic_1.0.0.bb b/recipes/xorg-font/font-misc-cyrillic_1.0.0.bb
deleted file mode 100644
index ba0bec7..0000000
--- a/recipes/xorg-font/font-misc-cyrillic_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3596907d7a2a99c81d8de99bc4552b6a"
-SRC_URI[archive.sha256sum] = "7c0bac1302129d3bf40ec7d9830e728b0251dc20dda8c8979227b478663290ff"
diff --git a/recipes/xorg-font/font-misc-ethiopic_1.0.0.bb b/recipes/xorg-font/font-misc-ethiopic_1.0.0.bb
deleted file mode 100644
index 6d96c46..0000000
--- a/recipes/xorg-font/font-misc-ethiopic_1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-font-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0b271fc617087d77560bdca20c0cdbb0"
-SRC_URI[archive.sha256sum] = "58d2868801ca063797fa88fb4aea59f7c550473be4e9a4f96d84fe39b967d141"
diff --git a/recipes/xorg-font/font-misc-meltho_1.0.0.bb b/recipes/xorg-font/font-misc-meltho_1.0.0.bb
deleted file mode 100644
index c51cdc3..0000000
--- a/recipes/xorg-font/font-misc-meltho_1.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "These fonts are designed for the display of Syriac text."
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ccb212a7badf7aefdc9f9a92af428d32"
-SRC_URI[archive.sha256sum] = "c7e12b9926b6053f3567eae548840f0b3d283ce34f842b06309a81c1d98d3924"
diff --git a/recipes/xorg-font/font-misc-misc/configure-mapdir.patch b/recipes/xorg-font/font-misc-misc/configure-mapdir.patch
deleted file mode 100644
index caf09b6..0000000
--- a/recipes/xorg-font/font-misc-misc/configure-mapdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- s/configure.ac~ 2005-12-15 00:24:25.000000000 +0000
-+++ s/configure.ac 2008-07-27 10:05:30.000000000 +0100
-@@ -45,7 +45,7 @@
- AC_SUBST(FONTDIR)
-
- PKG_CHECK_MODULES(MAPS, [fontutil])
--MAPFILES_PATH=$(pkg-config --variable=mapdir fontutil)
-+MAPFILES_PATH=$(PKG_CONFIG_PATH="${STAGING_LIBDIR_NATIVE}/pkg-config" ${PKG_CONFIG} --variable=mapdir fontutil)
- AC_SUBST(MAPFILES_PATH)
-
- XORG_FONT_CHECK_ISO8859_1
diff --git a/recipes/xorg-font/font-misc-misc_1.0.0.bb b/recipes/xorg-font/font-misc-misc_1.0.0.bb
deleted file mode 100644
index 43bfa95..0000000
--- a/recipes/xorg-font/font-misc-misc_1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-EXTRA_OECONF = "STAGING_LIBDIR_NATIVE=\"${STAGING_LIBDIR_NATIVE}\""
-
-require xorg-font-common.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://configure-mapdir.patch"
-
-SRC_URI[archive.md5sum] = "2a57f6188c41d4bc1b88ca3d08ad011d"
-SRC_URI[archive.sha256sum] = "26a02560ad1f1648e7c36be6daf42910762131d3974422d1b306e6cae13f17db"
diff --git a/recipes/xorg-font/font-mutt-misc_1.0.0.bb b/recipes/xorg-font/font-mutt-misc_1.0.0.bb
deleted file mode 100644
index aae3d9d..0000000
--- a/recipes/xorg-font/font-mutt-misc_1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-font-common.inc
-
-DESCRIPTION = "Provides a 12pt, 100dpi proportional font with many of \
-the glyphs needed for Unicode text."
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "648b409b7eb78ad1cd5f6d7fac3eef88"
-SRC_URI[archive.sha256sum] = "f219183bd0f2b8ceca42a8a345c921f2a8ee19f4d86fef11c4ce8918d41aedff"
diff --git a/recipes/xorg-font/font-schumacher-misc_1.0.0.bb b/recipes/xorg-font/font-schumacher-misc_1.0.0.bb
deleted file mode 100644
index 7a5b4f6..0000000
--- a/recipes/xorg-font/font-schumacher-misc_1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-font-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f1c6063d2fadc57e696a0aab69afd6e0"
-SRC_URI[archive.sha256sum] = "454e6cf885a4475569ce24ad3d4a82cb331d74e1a25f0747694a71098b56ef7a"
diff --git a/recipes/xorg-font/font-screen-cyrillic_1.0.0.bb b/recipes/xorg-font/font-screen-cyrillic_1.0.0.bb
deleted file mode 100644
index 30f3984..0000000
--- a/recipes/xorg-font/font-screen-cyrillic_1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-font-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "aea02d9dff03e0e1a3de85364367c0c6"
-SRC_URI[archive.sha256sum] = "01de82644a9b765599ba8c36c6b689035a85b6590486842067f707f2cb0cf268"
diff --git a/recipes/xorg-font/font-sony-misc_1.0.0.bb b/recipes/xorg-font/font-sony-misc_1.0.0.bb
deleted file mode 100644
index 1f3897e..0000000
--- a/recipes/xorg-font/font-sony-misc_1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-font-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0dfddd1a946e4497f009094c0ae1bdd5"
-SRC_URI[archive.sha256sum] = "1ae93ae76020b57cb0054ba9f33b4d5aec71342c6596750c07303d5c53452e23"
diff --git a/recipes/xorg-font/font-sun-misc_1.0.0.bb b/recipes/xorg-font/font-sun-misc_1.0.0.bb
deleted file mode 100644
index 62bcf2e..0000000
--- a/recipes/xorg-font/font-sun-misc_1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-font-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e17d43a7c6c0d862cfba0908ff132ffa"
-SRC_URI[archive.sha256sum] = "03c12d8f4d8e7f0178f501ea3ee0709ee3a1deda733afecd631807e6ba5729e5"
diff --git a/recipes/xorg-font/font-util-native_1.0.1.bb b/recipes/xorg-font/font-util-native_1.0.1.bb
deleted file mode 100644
index 84f65d7..0000000
--- a/recipes/xorg-font/font-util-native_1.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-inherit native
-require xorg-font-common.inc
-
-XORG_PN = "font-util"
-
-DEPENDS = "bdftopcf-native"
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b81535f78fe05732931f02841e5ca37b"
-SRC_URI[archive.sha256sum] = "048c23b17ea32ee3abb341f0b1105ad07517b2e78efe2e95a4a8218089600612"
diff --git a/recipes/xorg-font/font-util_1.0.1.bb b/recipes/xorg-font/font-util_1.0.1.bb
deleted file mode 100644
index 47fa71a..0000000
--- a/recipes/xorg-font/font-util_1.0.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-font-common.inc
-
-PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
-
-DESCRIPTION = "X font utils."
-
-DEPENDS = "encodings"
-RDEPENDS_${PN} = "mkfontdir mkfontscale encodings"
-
-PE = "1"
-PR = "${INC_PR}.2"
-
-SRC_URI[archive.md5sum] = "b81535f78fe05732931f02841e5ca37b"
-SRC_URI[archive.sha256sum] = "048c23b17ea32ee3abb341f0b1105ad07517b2e78efe2e95a4a8218089600612"
diff --git a/recipes/xorg-font/font-winitzki-cyrillic_1.0.0.bb b/recipes/xorg-font/font-winitzki-cyrillic_1.0.0.bb
deleted file mode 100644
index 7069f0a..0000000
--- a/recipes/xorg-font/font-winitzki-cyrillic_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b99b02aff36a88ca3379715423c60303"
-SRC_URI[archive.sha256sum] = "478a7f6881fce6a335b409e1326449af4162a147d268f1978b8dd81c834beee3"
diff --git a/recipes/xorg-font/font-xfree86-type1_1.0.0.bb b/recipes/xorg-font/font-xfree86-type1_1.0.0.bb
deleted file mode 100644
index 3e091f3..0000000
--- a/recipes/xorg-font/font-xfree86-type1_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e66f36a6d68203cc4cf7b56ebbb192dd"
-SRC_URI[archive.sha256sum] = "ef76d3b91d1bdaa9ff73cc1e5905ad4bbdc028f06157d0d2319d38e7b7f84a4d"
diff --git a/recipes/xorg-font/font-xfree86-type1_1.0.1.bb b/recipes/xorg-font/font-xfree86-type1_1.0.1.bb
deleted file mode 100644
index 090a197..0000000
--- a/recipes/xorg-font/font-xfree86-type1_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-font-common.inc
-
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "d7e965776c7f0c30b0f09742176fb77a"
-SRC_URI[archive.sha256sum] = "8fd9f9b81120d8afc25ea8901a8a91d7428c45cd9cfe7a7bef2b15c8b8d5f341"
diff --git a/recipes/xorg-font/xfonts-xorg-6.8/lexer.patch b/recipes/xorg-font/xfonts-xorg-6.8/lexer.patch
new file mode 100644
index 0000000..c3caf57
--- /dev/null
+++ b/recipes/xorg-font/xfonts-xorg-6.8/lexer.patch
@@ -0,0 +1,48 @@
+diff -Naur xc.old/config/pswrap/lexer.l xc/config/pswrap/lexer.l
+--- xc.old/config/pswrap/lexer.l 2004-04-23 18:42:00.000000000 +0000
++++ xc/config/pswrap/lexer.l 2004-11-16 21:07:10.569144105 +0000
+@@ -41,6 +41,7 @@
+ #include <ctype.h>
+ #include <stdlib.h>
+ #include <string.h>
++int yy_prev_more_offset;
+
+ #include "pswpriv.h"
+ #include "pswparser.h"
+diff -Naur xc.old/programs/twm/lex.l xc/programs/twm/lex.l
+--- xc.old/programs/twm/lex.l 2004-04-23 18:42:00.000000000 +0000
++++ xc/programs/twm/lex.l 2004-11-16 21:07:10.569144105 +0000
+@@ -65,6 +41,7 @@
+ #include "gram.h"
+ #include "list.h"
+ #include "parse.h"
++int yy_prev_more_offset;
+
+ #ifdef FLEX_SCANNER
+ int yylineno;
+diff -Naur xc.old/programs/xgc/lex.l xc/programs/xgc/lex.l
+--- xc.old/programs/xgc/lex.l 2004-04-23 18:42:00.000000000 +0000
++++ xc/programs/xgc/lex.l 2004-11-16 21:07:10.569144105 +0000
+@@ -11,6 +11,9 @@
+ #include <X11/X.h>
+ #include "gram.h"
+ #include "constants.h"
++
++int yy_prev_more_offset;
++
+ #if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__)
+ int yylineno = 0;
+ #endif
+diff -Naur xc.old/programs/Xserver/hw/dmx/config/scanner.l xc/programs/Xserver/hw/dmx/config/scanner.l
+--- xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-07-30 20:06:00.000000000 +0000
++++ xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-11-16 21:07:10.569144105 +0000
+@@ -37,6 +37,9 @@
+ #include "parser.h"
+ #include <string.h>
+ #include <ctype.h>
++
++int yy_prev_more_offset;
++
+ static int getdimension(int token, const char *text, int leng);
+ static int getstring(int token, const char *text, int leng);
+ static int gettoken(int token, const char *text, int leng);
--
1.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 7/9] xorg-proto: move older not pinned versions to obsolete dir
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
` (5 preceding siblings ...)
2010-08-16 15:30 ` [PATCH 6/9] xorg-font: " Martin Jansa
@ 2010-08-16 15:30 ` Martin Jansa
2010-08-16 15:30 ` [PATCH 8/9] xorg-util: " Martin Jansa
` (5 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 15:30 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../obsolete/xorg/xorg-proto/applewmproto_1.0.3.bb | 6 ++++++
.../obsolete/xorg/xorg-proto/applewmproto_1.2.0.bb | 6 ++++++
.../obsolete/xorg/xorg-proto/bigreqsproto_1.0.2.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/compositeproto_0.4.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/damageproto_1.1.0.bb | 8 ++++++++
recipes/obsolete/xorg/xorg-proto/dmxproto_2.2.2.bb | 6 ++++++
recipes/obsolete/xorg/xorg-proto/dri2proto_1.1.bb | 6 ++++++
recipes/obsolete/xorg/xorg-proto/dri2proto_2.0.bb | 6 ++++++
recipes/obsolete/xorg/xorg-proto/dri2proto_2.2.bb | 6 ++++++
recipes/obsolete/xorg/xorg-proto/evieext_1.0.2.bb | 6 ++++++
recipes/obsolete/xorg/xorg-proto/fixesproto_4.0.bb | 10 ++++++++++
.../xorg/xorg-proto/fontcacheproto_0.1.2.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/fontsproto_2.0.2.bb | 8 ++++++++
recipes/obsolete/xorg/xorg-proto/glproto_1.4.11.bb | 6 ++++++
recipes/obsolete/xorg/xorg-proto/glproto_1.4.8.bb | 6 ++++++
.../obsolete/xorg/xorg-proto/inputproto_1.4.1.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/inputproto_1.4.2.1.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/inputproto_1.4.2.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/inputproto_1.4.3.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/inputproto_1.4.4.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/inputproto_1.5.0.bb | 8 ++++++++
recipes/obsolete/xorg/xorg-proto/kbproto_1.0.3.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/printproto_1.0.3.bb | 6 ++++++
.../obsolete/xorg/xorg-proto/randrproto_1.3.0.bb | 10 ++++++++++
.../obsolete/xorg/xorg-proto/recordproto_1.13.2.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/renderproto_0.9.2.bb | 10 ++++++++++
.../obsolete/xorg/xorg-proto/renderproto_0.9.3.bb | 10 ++++++++++
.../xorg/xorg-proto/resourceproto_1.0.2.bb | 8 ++++++++
.../xorg/xorg-proto/scrnsaverproto_1.1.0.bb | 6 ++++++
.../obsolete/xorg/xorg-proto/videoproto_2.2.2.bb | 6 ++++++
.../xorg/xorg-proto/windowswmproto_1.0.3.bb | 6 ++++++
.../obsolete/xorg/xorg-proto/xcmiscproto_1.1.2.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/xextproto_7.0.2.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/xextproto_7.0.3.bb | 8 ++++++++
.../xorg/xorg-proto/xf86bigfontproto_1.1.2.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/xf86dgaproto_2.0.2.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/xf86dgaproto_2.0.3.bb | 8 ++++++++
.../obsolete/xorg/xorg-proto/xf86driproto_2.0.3.bb | 6 ++++++
.../obsolete/xorg/xorg-proto/xf86driproto_2.0.4.bb | 6 ++++++
.../xorg/xorg-proto/xf86miscproto_0.9.2.bb | 6 ++++++
.../xorg/xorg-proto/xf86vidmodeproto_2.2.2.bb | 8 ++++++++
.../xorg/xorg-proto/xineramaproto_1.1.2.bb | 6 ++++++
recipes/obsolete/xorg/xorg-proto/xproto_7.0.10.bb | 8 ++++++++
recipes/obsolete/xorg/xorg-proto/xproto_7.0.11.bb | 9 +++++++++
recipes/obsolete/xorg/xorg-proto/xproto_7.0.12.bb | 8 ++++++++
recipes/obsolete/xorg/xorg-proto/xproto_7.0.13.bb | 8 ++++++++
recipes/obsolete/xorg/xorg-proto/xproto_7.0.15.bb | 8 ++++++++
recipes/obsolete/xorg/xorg-proto/xproto_7.0.17.bb | 8 ++++++++
.../xorg-proto/xproxymanagementprotocol_1.0.2.bb | 7 +++++++
recipes/xorg-proto/applewmproto_1.0.3.bb | 6 ------
recipes/xorg-proto/applewmproto_1.2.0.bb | 6 ------
recipes/xorg-proto/bigreqsproto_1.0.2.bb | 8 --------
recipes/xorg-proto/compositeproto_0.4.bb | 8 --------
recipes/xorg-proto/damageproto_1.1.0.bb | 8 --------
recipes/xorg-proto/dmxproto_2.2.2.bb | 6 ------
recipes/xorg-proto/dri2proto_1.1.bb | 6 ------
recipes/xorg-proto/dri2proto_2.0.bb | 6 ------
recipes/xorg-proto/dri2proto_2.2.bb | 6 ------
recipes/xorg-proto/evieext_1.0.2.bb | 6 ------
recipes/xorg-proto/fixesproto_4.0.bb | 10 ----------
recipes/xorg-proto/fontcacheproto_0.1.2.bb | 8 --------
recipes/xorg-proto/fontsproto_2.0.2.bb | 8 --------
recipes/xorg-proto/glproto_1.4.11.bb | 6 ------
recipes/xorg-proto/glproto_1.4.8.bb | 6 ------
recipes/xorg-proto/inputproto_1.4.1.bb | 8 --------
recipes/xorg-proto/inputproto_1.4.2.1.bb | 8 --------
recipes/xorg-proto/inputproto_1.4.2.bb | 8 --------
recipes/xorg-proto/inputproto_1.4.3.bb | 8 --------
recipes/xorg-proto/inputproto_1.4.4.bb | 8 --------
recipes/xorg-proto/inputproto_1.5.0.bb | 8 --------
recipes/xorg-proto/kbproto_1.0.3.bb | 8 --------
recipes/xorg-proto/printproto_1.0.3.bb | 6 ------
recipes/xorg-proto/randrproto_1.3.0.bb | 10 ----------
recipes/xorg-proto/recordproto_1.13.2.bb | 8 --------
recipes/xorg-proto/renderproto_0.9.2.bb | 10 ----------
recipes/xorg-proto/renderproto_0.9.3.bb | 10 ----------
recipes/xorg-proto/resourceproto_1.0.2.bb | 8 --------
recipes/xorg-proto/scrnsaverproto_1.1.0.bb | 6 ------
recipes/xorg-proto/videoproto_2.2.2.bb | 6 ------
recipes/xorg-proto/windowswmproto_1.0.3.bb | 6 ------
recipes/xorg-proto/xcmiscproto_1.1.2.bb | 8 --------
recipes/xorg-proto/xextproto_7.0.2.bb | 8 --------
recipes/xorg-proto/xextproto_7.0.3.bb | 8 --------
recipes/xorg-proto/xf86bigfontproto_1.1.2.bb | 8 --------
recipes/xorg-proto/xf86dgaproto_2.0.2.bb | 8 --------
recipes/xorg-proto/xf86dgaproto_2.0.3.bb | 8 --------
recipes/xorg-proto/xf86driproto_2.0.3.bb | 6 ------
recipes/xorg-proto/xf86driproto_2.0.4.bb | 6 ------
recipes/xorg-proto/xf86miscproto_0.9.2.bb | 6 ------
recipes/xorg-proto/xf86vidmodeproto_2.2.2.bb | 8 --------
recipes/xorg-proto/xineramaproto_1.1.2.bb | 6 ------
recipes/xorg-proto/xproto_7.0.10.bb | 8 --------
recipes/xorg-proto/xproto_7.0.11.bb | 9 ---------
recipes/xorg-proto/xproto_7.0.12.bb | 8 --------
recipes/xorg-proto/xproto_7.0.13.bb | 8 --------
recipes/xorg-proto/xproto_7.0.15.bb | 8 --------
recipes/xorg-proto/xproto_7.0.17.bb | 8 --------
.../xorg-proto/xproxymanagementprotocol_1.0.2.bb | 7 -------
98 files changed, 366 insertions(+), 366 deletions(-)
create mode 100644 recipes/obsolete/xorg/xorg-proto/applewmproto_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/applewmproto_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/bigreqsproto_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/compositeproto_0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/damageproto_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/dmxproto_2.2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/dri2proto_1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/dri2proto_2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/dri2proto_2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/evieext_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/fixesproto_4.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/fontcacheproto_0.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/fontsproto_2.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/glproto_1.4.11.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/glproto_1.4.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/inputproto_1.4.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/inputproto_1.4.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/inputproto_1.4.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/inputproto_1.4.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/inputproto_1.4.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/inputproto_1.5.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/kbproto_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/printproto_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/randrproto_1.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/recordproto_1.13.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/renderproto_0.9.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/renderproto_0.9.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/resourceproto_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/scrnsaverproto_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/videoproto_2.2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/windowswmproto_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xcmiscproto_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xextproto_7.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xextproto_7.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xf86bigfontproto_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xf86dgaproto_2.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xf86dgaproto_2.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xf86driproto_2.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xf86driproto_2.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xf86miscproto_0.9.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xf86vidmodeproto_2.2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xineramaproto_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xproto_7.0.10.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xproto_7.0.11.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xproto_7.0.12.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xproto_7.0.13.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xproto_7.0.15.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xproto_7.0.17.bb
create mode 100644 recipes/obsolete/xorg/xorg-proto/xproxymanagementprotocol_1.0.2.bb
delete mode 100644 recipes/xorg-proto/applewmproto_1.0.3.bb
delete mode 100644 recipes/xorg-proto/applewmproto_1.2.0.bb
delete mode 100644 recipes/xorg-proto/bigreqsproto_1.0.2.bb
delete mode 100644 recipes/xorg-proto/compositeproto_0.4.bb
delete mode 100644 recipes/xorg-proto/damageproto_1.1.0.bb
delete mode 100644 recipes/xorg-proto/dmxproto_2.2.2.bb
delete mode 100644 recipes/xorg-proto/dri2proto_1.1.bb
delete mode 100644 recipes/xorg-proto/dri2proto_2.0.bb
delete mode 100644 recipes/xorg-proto/dri2proto_2.2.bb
delete mode 100644 recipes/xorg-proto/evieext_1.0.2.bb
delete mode 100644 recipes/xorg-proto/fixesproto_4.0.bb
delete mode 100644 recipes/xorg-proto/fontcacheproto_0.1.2.bb
delete mode 100644 recipes/xorg-proto/fontsproto_2.0.2.bb
delete mode 100644 recipes/xorg-proto/glproto_1.4.11.bb
delete mode 100644 recipes/xorg-proto/glproto_1.4.8.bb
delete mode 100644 recipes/xorg-proto/inputproto_1.4.1.bb
delete mode 100644 recipes/xorg-proto/inputproto_1.4.2.1.bb
delete mode 100644 recipes/xorg-proto/inputproto_1.4.2.bb
delete mode 100644 recipes/xorg-proto/inputproto_1.4.3.bb
delete mode 100644 recipes/xorg-proto/inputproto_1.4.4.bb
delete mode 100644 recipes/xorg-proto/inputproto_1.5.0.bb
delete mode 100644 recipes/xorg-proto/kbproto_1.0.3.bb
delete mode 100644 recipes/xorg-proto/printproto_1.0.3.bb
delete mode 100644 recipes/xorg-proto/randrproto_1.3.0.bb
delete mode 100644 recipes/xorg-proto/recordproto_1.13.2.bb
delete mode 100644 recipes/xorg-proto/renderproto_0.9.2.bb
delete mode 100644 recipes/xorg-proto/renderproto_0.9.3.bb
delete mode 100644 recipes/xorg-proto/resourceproto_1.0.2.bb
delete mode 100644 recipes/xorg-proto/scrnsaverproto_1.1.0.bb
delete mode 100644 recipes/xorg-proto/videoproto_2.2.2.bb
delete mode 100644 recipes/xorg-proto/windowswmproto_1.0.3.bb
delete mode 100644 recipes/xorg-proto/xcmiscproto_1.1.2.bb
delete mode 100644 recipes/xorg-proto/xextproto_7.0.2.bb
delete mode 100644 recipes/xorg-proto/xextproto_7.0.3.bb
delete mode 100644 recipes/xorg-proto/xf86bigfontproto_1.1.2.bb
delete mode 100644 recipes/xorg-proto/xf86dgaproto_2.0.2.bb
delete mode 100644 recipes/xorg-proto/xf86dgaproto_2.0.3.bb
delete mode 100644 recipes/xorg-proto/xf86driproto_2.0.3.bb
delete mode 100644 recipes/xorg-proto/xf86driproto_2.0.4.bb
delete mode 100644 recipes/xorg-proto/xf86miscproto_0.9.2.bb
delete mode 100644 recipes/xorg-proto/xf86vidmodeproto_2.2.2.bb
delete mode 100644 recipes/xorg-proto/xineramaproto_1.1.2.bb
delete mode 100644 recipes/xorg-proto/xproto_7.0.10.bb
delete mode 100644 recipes/xorg-proto/xproto_7.0.11.bb
delete mode 100644 recipes/xorg-proto/xproto_7.0.12.bb
delete mode 100644 recipes/xorg-proto/xproto_7.0.13.bb
delete mode 100644 recipes/xorg-proto/xproto_7.0.15.bb
delete mode 100644 recipes/xorg-proto/xproto_7.0.17.bb
delete mode 100644 recipes/xorg-proto/xproxymanagementprotocol_1.0.2.bb
diff --git a/recipes/obsolete/xorg/xorg-proto/applewmproto_1.0.3.bb b/recipes/obsolete/xorg/xorg-proto/applewmproto_1.0.3.bb
new file mode 100644
index 0000000..82100e3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/applewmproto_1.0.3.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d5d7c69837cc7dcbf2aa181ff423ab20"
+SRC_URI[archive.sha256sum] = "a938c07ea331359f379802c50c33aa0307b913f742ad74087d45e7fb2a1f4d50"
diff --git a/recipes/obsolete/xorg/xorg-proto/applewmproto_1.2.0.bb b/recipes/obsolete/xorg/xorg-proto/applewmproto_1.2.0.bb
new file mode 100644
index 0000000..b178abd
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/applewmproto_1.2.0.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "44e18d01857f9dfeb8628e317e786f31"
+SRC_URI[archive.sha256sum] = "4f549083df9db85e61d0b272645e3dc71bacde9b9156ca20a57440e794b71042"
diff --git a/recipes/obsolete/xorg/xorg-proto/bigreqsproto_1.0.2.bb b/recipes/obsolete/xorg/xorg-proto/bigreqsproto_1.0.2.bb
new file mode 100644
index 0000000..f817bca
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/bigreqsproto_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "95c29d9d10bf2868996c0c47a3b9a8dc"
+SRC_URI[archive.sha256sum] = "30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/compositeproto_0.4.bb b/recipes/obsolete/xorg/xorg-proto/compositeproto_0.4.bb
new file mode 100644
index 0000000..aebc61b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/compositeproto_0.4.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6281344d656d4e0c8e9db4918efe3d1d"
+SRC_URI[archive.sha256sum] = "6013d1ca63b2b7540f6f99977090812b899852acfbd9df123b5ebaa911e30003"
+
+CONFLICTS = "compositeext"
diff --git a/recipes/obsolete/xorg/xorg-proto/damageproto_1.1.0.bb b/recipes/obsolete/xorg/xorg-proto/damageproto_1.1.0.bb
new file mode 100644
index 0000000..2daea83
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/damageproto_1.1.0.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "33ee591e0b1ca5ad7902934541db7d24"
+SRC_URI[archive.sha256sum] = "9d2684fac835e9cdf78befff2a58292f54db90094acbfb9f2ed5316fa30d641d"
+
+CONFLICTS = "damageext"
diff --git a/recipes/obsolete/xorg/xorg-proto/dmxproto_2.2.2.bb b/recipes/obsolete/xorg/xorg-proto/dmxproto_2.2.2.bb
new file mode 100644
index 0000000..999e47f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/dmxproto_2.2.2.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d80acad88411e7944b9b085463d53302"
+SRC_URI[archive.sha256sum] = "aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2"
diff --git a/recipes/obsolete/xorg/xorg-proto/dri2proto_1.1.bb b/recipes/obsolete/xorg/xorg-proto/dri2proto_1.1.bb
new file mode 100644
index 0000000..7329971
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/dri2proto_1.1.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+DESCRIPTION = "DRI2 extension headers"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1d70f0653b0b3a837853262dc5d34da4"
+SRC_URI[archive.sha256sum] = "69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11"
diff --git a/recipes/obsolete/xorg/xorg-proto/dri2proto_2.0.bb b/recipes/obsolete/xorg/xorg-proto/dri2proto_2.0.bb
new file mode 100644
index 0000000..6df4e52
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/dri2proto_2.0.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+DESCRIPTION = "DRI2 extension headers"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "26f6515322ec50691584ac74291b4254"
+SRC_URI[archive.sha256sum] = "1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4"
diff --git a/recipes/obsolete/xorg/xorg-proto/dri2proto_2.2.bb b/recipes/obsolete/xorg/xorg-proto/dri2proto_2.2.bb
new file mode 100644
index 0000000..84467a3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/dri2proto_2.2.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+DESCRIPTION = "DRI2 extension headers"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3ca8ddb42cd4ee31b8690031303221af"
+SRC_URI[archive.sha256sum] = "f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1"
diff --git a/recipes/obsolete/xorg/xorg-proto/evieext_1.0.2.bb b/recipes/obsolete/xorg/xorg-proto/evieext_1.0.2.bb
new file mode 100644
index 0000000..1a3bff2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/evieext_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2507b5d0f4b2848147fbddd155aa6cfe"
+SRC_URI[archive.sha256sum] = "0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125"
diff --git a/recipes/obsolete/xorg/xorg-proto/fixesproto_4.0.bb b/recipes/obsolete/xorg/xorg-proto/fixesproto_4.0.bb
new file mode 100644
index 0000000..0004625
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/fixesproto_4.0.bb
@@ -0,0 +1,10 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8b298cc3424597f8138c7faf7763dce9"
+SRC_URI[archive.sha256sum] = "b3fe971ccc8152db6c78da7117c31fc4cd2fcb2b6a4df3db0f8fed13d4ceb08f"
+
+BBCLASSEXTEND = "native"
+
+CONFLICTS = "fixesext"
diff --git a/recipes/obsolete/xorg/xorg-proto/fontcacheproto_0.1.2.bb b/recipes/obsolete/xorg/xorg-proto/fontcacheproto_0.1.2.bb
new file mode 100644
index 0000000..aed2402
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/fontcacheproto_0.1.2.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "60df6b625074a9790e28543dcea71651"
+SRC_URI[archive.sha256sum] = "48063ed49b200927376645f9ffe65faa39af84d59ba6f60f2abb2f9c6fa3d9f9"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-proto/fontsproto_2.0.2.bb b/recipes/obsolete/xorg/xorg-proto/fontsproto_2.0.2.bb
new file mode 100644
index 0000000..5b044d3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/fontsproto_2.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c946f166107b016a21cc7a02e1132724"
+SRC_URI[archive.sha256sum] = "83bd547131aa11a232717a0f06d3c6cd58a0b2f6d541660bbe9ebf43073a8b7b"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-proto/glproto_1.4.11.bb b/recipes/obsolete/xorg/xorg-proto/glproto_1.4.11.bb
new file mode 100644
index 0000000..13d35ab
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/glproto_1.4.11.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "78e7c4dc7dcb74b1869fee7897e00f59"
+SRC_URI[archive.sha256sum] = "fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451"
diff --git a/recipes/obsolete/xorg/xorg-proto/glproto_1.4.8.bb b/recipes/obsolete/xorg/xorg-proto/glproto_1.4.8.bb
new file mode 100644
index 0000000..ee27027
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/glproto_1.4.8.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3dfbd17203c0c88b94b6f579f24c11cc"
+SRC_URI[archive.sha256sum] = "2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c"
diff --git a/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.1.bb b/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.1.bb
new file mode 100644
index 0000000..6e21b13
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.1.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "563cc41eeb590cf5eb2127807b838dfc"
+SRC_URI[archive.sha256sum] = "913ff534aa777e3c36f3e9fe3e8638c3ccfe398daeb7532fa917e7bcd6fed07d"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.2.1.bb b/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.2.1.bb
new file mode 100644
index 0000000..b05df8c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.2.1.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "aa948a7469168ddd9c33f11c5dff55ac"
+SRC_URI[archive.sha256sum] = "9b6db77037de7c52b9a17862b99bc435bd5c20e5d3faf5aec943b206cdaff3ed"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.2.bb b/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.2.bb
new file mode 100644
index 0000000..96bdc72
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.2.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e2c4cf4c2ad59d1e27f09381f6b4a3c3"
+SRC_URI[archive.sha256sum] = "62ba68a056daa89f5b21a02b27f6a4c858933e1c5547c9d16985d9ed182014e6"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.3.bb b/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.3.bb
new file mode 100644
index 0000000..ab4981f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.3.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a0f0d8cf6fbf0db8ba3937d0cc16138d"
+SRC_URI[archive.sha256sum] = "627119ff21391314b88e5f34da837473151a54ab980d2f76d7f3c6bd3d560d4a"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.4.bb b/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.4.bb
new file mode 100644
index 0000000..0c37756
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/inputproto_1.4.4.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3a532379f226c34b36a5c585999f75e4"
+SRC_URI[archive.sha256sum] = "63278ef492d6babb9e3efaef84a67a982e5362c51623714c9428f0384007dfe5"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/inputproto_1.5.0.bb b/recipes/obsolete/xorg/xorg-proto/inputproto_1.5.0.bb
new file mode 100644
index 0000000..007e477
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/inputproto_1.5.0.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "dcc36554aea1338b3813943daf1e9988"
+SRC_URI[archive.sha256sum] = "ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/kbproto_1.0.3.bb b/recipes/obsolete/xorg/xorg-proto/kbproto_1.0.3.bb
new file mode 100644
index 0000000..1b089d6
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/kbproto_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6092cdb0a1225f95356ddbe6c2abaad5"
+SRC_URI[archive.sha256sum] = "7000005ebbd07a28a71477d72bcb76c47064e043a4ead26fcf4d5af394ce19df"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/printproto_1.0.3.bb b/recipes/obsolete/xorg/xorg-proto/printproto_1.0.3.bb
new file mode 100644
index 0000000..e579a5a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/printproto_1.0.3.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0f4e7982c6d4ec3b2cf38502dd1293a3"
+SRC_URI[archive.sha256sum] = "8b375f8cda83dfc7d84be44af41eedd484d0e2499acbd19bdca5b4056dec7235"
diff --git a/recipes/obsolete/xorg/xorg-proto/randrproto_1.3.0.bb b/recipes/obsolete/xorg/xorg-proto/randrproto_1.3.0.bb
new file mode 100644
index 0000000..aab111a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/randrproto_1.3.0.bb
@@ -0,0 +1,10 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a49416013fff33c853efb32f1926551e"
+SRC_URI[archive.sha256sum] = "cfeb1429465e3c24debde1bf53ec35ef738fde5e80d2eed14f33e315e747bb8d"
+
+BBCLASSEXTEND = "nativesdk sdk"
+
+CONFLICTS = "randrext"
diff --git a/recipes/obsolete/xorg/xorg-proto/recordproto_1.13.2.bb b/recipes/obsolete/xorg/xorg-proto/recordproto_1.13.2.bb
new file mode 100644
index 0000000..fc5e086
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/recordproto_1.13.2.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0ed4706564a34fc2aff724aa16d3ff00"
+SRC_URI[archive.sha256sum] = "04e77a8b14f373a1825bbe0116cd0db8b2c5dee17b34ba9bddd27e576609cff9"
+
+CONFLICTS = "recordext"
diff --git a/recipes/obsolete/xorg/xorg-proto/renderproto_0.9.2.bb b/recipes/obsolete/xorg/xorg-proto/renderproto_0.9.2.bb
new file mode 100644
index 0000000..8c5edbf
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/renderproto_0.9.2.bb
@@ -0,0 +1,10 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "28fbe8a59ebd31f098b90ec64f3d133a"
+SRC_URI[archive.sha256sum] = "7754dfbbb1e3818f28720fa9647b8a593e9d54626a7896771c2bfac7f75e2726"
+
+BBCLASSEXTEND = "native nativesdk sdk"
+
+CONFLICTS = "renderext"
diff --git a/recipes/obsolete/xorg/xorg-proto/renderproto_0.9.3.bb b/recipes/obsolete/xorg/xorg-proto/renderproto_0.9.3.bb
new file mode 100644
index 0000000..ac8550e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/renderproto_0.9.3.bb
@@ -0,0 +1,10 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "598bc9a493deee2e48e4434e94467189"
+SRC_URI[archive.sha256sum] = "c98a08b877e98a8fa7daa04be472de7e0cb38a99593faca8b987effcea2dd45b"
+
+BBCLASSEXTEND = "native nativesdk sdk"
+
+CONFLICTS = "renderext"
diff --git a/recipes/obsolete/xorg/xorg-proto/resourceproto_1.0.2.bb b/recipes/obsolete/xorg/xorg-proto/resourceproto_1.0.2.bb
new file mode 100644
index 0000000..40e19ea
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/resourceproto_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b823b314e37eb19dae1f297951d2e933"
+SRC_URI[archive.sha256sum] = "0c33d6fceef5483001459bdc934b5831502250b27f1f4ad370ab044f8ab53487"
+
+CONFLICTS = "resourceext"
diff --git a/recipes/obsolete/xorg/xorg-proto/scrnsaverproto_1.1.0.bb b/recipes/obsolete/xorg/xorg-proto/scrnsaverproto_1.1.0.bb
new file mode 100644
index 0000000..52d4869
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/scrnsaverproto_1.1.0.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5d551850e6f4acdf49a13f4eb3a5bbfa"
+SRC_URI[archive.sha256sum] = "db09abf73cc339c05c0488639731794372a4770cfca76c2645f503f9fccd478f"
diff --git a/recipes/obsolete/xorg/xorg-proto/videoproto_2.2.2.bb b/recipes/obsolete/xorg/xorg-proto/videoproto_2.2.2.bb
new file mode 100644
index 0000000..071f6a3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/videoproto_2.2.2.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "44292d74a9a3c94b1ecb9d77a0da83e8"
+SRC_URI[archive.sha256sum] = "ab088478830cd30c2fe34fb7f44ffd4d177af7711c225c24676d3e9e9f24780c"
diff --git a/recipes/obsolete/xorg/xorg-proto/windowswmproto_1.0.3.bb b/recipes/obsolete/xorg/xorg-proto/windowswmproto_1.0.3.bb
new file mode 100644
index 0000000..1daa5c7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/windowswmproto_1.0.3.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ed5416cf7e2ba6e66641c88f12768c0c"
+SRC_URI[archive.sha256sum] = "780d249696bb2de7acabded90a465a62cd6cbda3b7f0ccff6ebfdf0d8180f151"
diff --git a/recipes/obsolete/xorg/xorg-proto/xcmiscproto_1.1.2.bb b/recipes/obsolete/xorg/xorg-proto/xcmiscproto_1.1.2.bb
new file mode 100644
index 0000000..cafebbc
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xcmiscproto_1.1.2.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fde0b050901f024b19159cdacdcfbd20"
+SRC_URI[archive.sha256sum] = "b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/xextproto_7.0.2.bb b/recipes/obsolete/xorg/xorg-proto/xextproto_7.0.2.bb
new file mode 100644
index 0000000..e58f88a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xextproto_7.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "242388ab65dde3a3dd313eeee265e429"
+SRC_URI[archive.sha256sum] = "53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/xextproto_7.0.3.bb b/recipes/obsolete/xorg/xorg-proto/xextproto_7.0.3.bb
new file mode 100644
index 0000000..908cd32
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xextproto_7.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3a2e0252e853ab30b3bff05ac92ec61c"
+SRC_URI[archive.sha256sum] = "3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/xf86bigfontproto_1.1.2.bb b/recipes/obsolete/xorg/xorg-proto/xf86bigfontproto_1.1.2.bb
new file mode 100644
index 0000000..228b5e2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xf86bigfontproto_1.1.2.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a318c1e86123832d7b0c95fc7d47ef35"
+SRC_URI[archive.sha256sum] = "01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/xf86dgaproto_2.0.2.bb b/recipes/obsolete/xorg/xorg-proto/xf86dgaproto_2.0.2.bb
new file mode 100644
index 0000000..fc04869
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xf86dgaproto_2.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "461aa291a23e8cf387b70f3efa71b05c"
+SRC_URI[archive.sha256sum] = "3ee1db2481ea222269bd201eef4d0e5d8ca4dbdb5eeb4852cf1efc42d4269b60"
+
+CONFLICTS = "xxf86dgaext"
diff --git a/recipes/obsolete/xorg/xorg-proto/xf86dgaproto_2.0.3.bb b/recipes/obsolete/xorg/xorg-proto/xf86dgaproto_2.0.3.bb
new file mode 100644
index 0000000..171a401
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xf86dgaproto_2.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "42fdcebc66efac02ab4beec2b1b0ad6e"
+SRC_URI[archive.sha256sum] = "5ac4d4a308b032727c61fd56db5a2eaadaedfbce5bc9dc504320bff9d696b002"
+
+CONFLICTS = "xxf86dgaext"
diff --git a/recipes/obsolete/xorg/xorg-proto/xf86driproto_2.0.3.bb b/recipes/obsolete/xorg/xorg-proto/xf86driproto_2.0.3.bb
new file mode 100644
index 0000000..6c62b64
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xf86driproto_2.0.3.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e4a282cfd708b8892fca4425fee9cd7b"
+SRC_URI[archive.sha256sum] = "111c469a24374803b08104c725d8318760b226cedccd12b199c83d1b2756b8d6"
diff --git a/recipes/obsolete/xorg/xorg-proto/xf86driproto_2.0.4.bb b/recipes/obsolete/xorg/xorg-proto/xf86driproto_2.0.4.bb
new file mode 100644
index 0000000..cd7b087
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xf86driproto_2.0.4.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "01470d088da3a8a3deefa8e1f45d69cb"
+SRC_URI[archive.sha256sum] = "f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da"
diff --git a/recipes/obsolete/xorg/xorg-proto/xf86miscproto_0.9.2.bb b/recipes/obsolete/xorg/xorg-proto/xf86miscproto_0.9.2.bb
new file mode 100644
index 0000000..df4c612
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xf86miscproto_0.9.2.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "acae8edeb05a406f7f60bcbb218a8f1d"
+SRC_URI[archive.sha256sum] = "aaab4cbf19c73ded4785ba69cdd7ae23aaf103c7040559283f85fc1237dad6e6"
diff --git a/recipes/obsolete/xorg/xorg-proto/xf86vidmodeproto_2.2.2.bb b/recipes/obsolete/xorg/xorg-proto/xf86vidmodeproto_2.2.2.bb
new file mode 100644
index 0000000..00fc499
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xf86vidmodeproto_2.2.2.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f00844a63d6e76b69eb0eb5e41eed843"
+SRC_URI[archive.sha256sum] = "07152f990cc79ec5931989decc4a90b1919147e98ff6fcfe39507a9d3fc4d96e"
+
+CONFLICTS = "xxf86vmext"
diff --git a/recipes/obsolete/xorg/xorg-proto/xineramaproto_1.1.2.bb b/recipes/obsolete/xorg/xorg-proto/xineramaproto_1.1.2.bb
new file mode 100644
index 0000000..2c8b2f7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xineramaproto_1.1.2.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1cc292c562962ad0ad3a253cae68c632"
+SRC_URI[archive.sha256sum] = "e8a62b1cafbcfc3b9fed147612ed4320233d0c9d6de30c991c2cd0c691c40910"
diff --git a/recipes/obsolete/xorg/xorg-proto/xproto_7.0.10.bb b/recipes/obsolete/xorg/xorg-proto/xproto_7.0.10.bb
new file mode 100644
index 0000000..558bc60
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xproto_7.0.10.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2ed80e90992e7455eaac4c3e977ebd01"
+SRC_URI[archive.sha256sum] = "6d659920262d41e48714184f94ff9cd2608515e0f3d2f074892fe0c048784df4"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/xproto_7.0.11.bb b/recipes/obsolete/xorg/xorg-proto/xproto_7.0.11.bb
new file mode 100644
index 0000000..0ea401a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xproto_7.0.11.bb
@@ -0,0 +1,9 @@
+require xorg-proto-common.inc
+DESCRIPTION = "X11 core wire protocol and auxiliary headers"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6b6c266576d81c505aa4a1828151f7f8"
+SRC_URI[archive.sha256sum] = "4ba69b7ef195c1a4e2e8ea9a1101f5079ada1f060c66968226754687685e9e53"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/xproto_7.0.12.bb b/recipes/obsolete/xorg/xorg-proto/xproto_7.0.12.bb
new file mode 100644
index 0000000..8969c85
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xproto_7.0.12.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "388234421add6c1760b4fc99fcdc76b0"
+SRC_URI[archive.sha256sum] = "bec5a98bbea56da069785784116261ec956df039fb07d0cdca53ae1ed03ebc0f"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/xproto_7.0.13.bb b/recipes/obsolete/xorg/xorg-proto/xproto_7.0.13.bb
new file mode 100644
index 0000000..938df7f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xproto_7.0.13.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7d26f45dca52632712a696e0631dc17b"
+SRC_URI[archive.sha256sum] = "6f6328922d69f5de29513a5baf1d010db2a7a54cb58a7a6cbbb1b25097ecd592"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/xproto_7.0.15.bb b/recipes/obsolete/xorg/xorg-proto/xproto_7.0.15.bb
new file mode 100644
index 0000000..4beb67f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xproto_7.0.15.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1a2b31430d04340be2e49e8b6445e076"
+SRC_URI[archive.sha256sum] = "fd8cd0bc3e94d7416e6af9eddfa909b0e64246e0d2bb41c00f4e02bd85c76bee"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/xproto_7.0.17.bb b/recipes/obsolete/xorg/xorg-proto/xproto_7.0.17.bb
new file mode 100644
index 0000000..5d7ed8f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xproto_7.0.17.bb
@@ -0,0 +1,8 @@
+require xorg-proto-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "74abb8fb91af66f35873b1f444731220"
+SRC_URI[archive.sha256sum] = "9b2c1fdc5b3780cedc9f5d9caf8f1364f26d07f8502b0eccdde74319157f9d01"
+
+BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/obsolete/xorg/xorg-proto/xproxymanagementprotocol_1.0.2.bb b/recipes/obsolete/xorg/xorg-proto/xproxymanagementprotocol_1.0.2.bb
new file mode 100644
index 0000000..b018f77
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-proto/xproxymanagementprotocol_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-proto-common.inc
+PROVIDES = "xproxymngproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "d28007a50976204960fc1fc07b4ca093"
+SRC_URI[archive.sha256sum] = "c45176d002c85c142ac52774680f5325d330c5ecc32d4d6a056d85ee039a0cbc"
diff --git a/recipes/xorg-proto/applewmproto_1.0.3.bb b/recipes/xorg-proto/applewmproto_1.0.3.bb
deleted file mode 100644
index 82100e3..0000000
--- a/recipes/xorg-proto/applewmproto_1.0.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "d5d7c69837cc7dcbf2aa181ff423ab20"
-SRC_URI[archive.sha256sum] = "a938c07ea331359f379802c50c33aa0307b913f742ad74087d45e7fb2a1f4d50"
diff --git a/recipes/xorg-proto/applewmproto_1.2.0.bb b/recipes/xorg-proto/applewmproto_1.2.0.bb
deleted file mode 100644
index b178abd..0000000
--- a/recipes/xorg-proto/applewmproto_1.2.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "44e18d01857f9dfeb8628e317e786f31"
-SRC_URI[archive.sha256sum] = "4f549083df9db85e61d0b272645e3dc71bacde9b9156ca20a57440e794b71042"
diff --git a/recipes/xorg-proto/bigreqsproto_1.0.2.bb b/recipes/xorg-proto/bigreqsproto_1.0.2.bb
deleted file mode 100644
index f817bca..0000000
--- a/recipes/xorg-proto/bigreqsproto_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "95c29d9d10bf2868996c0c47a3b9a8dc"
-SRC_URI[archive.sha256sum] = "30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/compositeproto_0.4.bb b/recipes/xorg-proto/compositeproto_0.4.bb
deleted file mode 100644
index aebc61b..0000000
--- a/recipes/xorg-proto/compositeproto_0.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6281344d656d4e0c8e9db4918efe3d1d"
-SRC_URI[archive.sha256sum] = "6013d1ca63b2b7540f6f99977090812b899852acfbd9df123b5ebaa911e30003"
-
-CONFLICTS = "compositeext"
diff --git a/recipes/xorg-proto/damageproto_1.1.0.bb b/recipes/xorg-proto/damageproto_1.1.0.bb
deleted file mode 100644
index 2daea83..0000000
--- a/recipes/xorg-proto/damageproto_1.1.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "33ee591e0b1ca5ad7902934541db7d24"
-SRC_URI[archive.sha256sum] = "9d2684fac835e9cdf78befff2a58292f54db90094acbfb9f2ed5316fa30d641d"
-
-CONFLICTS = "damageext"
diff --git a/recipes/xorg-proto/dmxproto_2.2.2.bb b/recipes/xorg-proto/dmxproto_2.2.2.bb
deleted file mode 100644
index 999e47f..0000000
--- a/recipes/xorg-proto/dmxproto_2.2.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "d80acad88411e7944b9b085463d53302"
-SRC_URI[archive.sha256sum] = "aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2"
diff --git a/recipes/xorg-proto/dri2proto_1.1.bb b/recipes/xorg-proto/dri2proto_1.1.bb
deleted file mode 100644
index 7329971..0000000
--- a/recipes/xorg-proto/dri2proto_1.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-DESCRIPTION = "DRI2 extension headers"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1d70f0653b0b3a837853262dc5d34da4"
-SRC_URI[archive.sha256sum] = "69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11"
diff --git a/recipes/xorg-proto/dri2proto_2.0.bb b/recipes/xorg-proto/dri2proto_2.0.bb
deleted file mode 100644
index 6df4e52..0000000
--- a/recipes/xorg-proto/dri2proto_2.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-DESCRIPTION = "DRI2 extension headers"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "26f6515322ec50691584ac74291b4254"
-SRC_URI[archive.sha256sum] = "1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4"
diff --git a/recipes/xorg-proto/dri2proto_2.2.bb b/recipes/xorg-proto/dri2proto_2.2.bb
deleted file mode 100644
index 84467a3..0000000
--- a/recipes/xorg-proto/dri2proto_2.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-DESCRIPTION = "DRI2 extension headers"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3ca8ddb42cd4ee31b8690031303221af"
-SRC_URI[archive.sha256sum] = "f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1"
diff --git a/recipes/xorg-proto/evieext_1.0.2.bb b/recipes/xorg-proto/evieext_1.0.2.bb
deleted file mode 100644
index 1a3bff2..0000000
--- a/recipes/xorg-proto/evieext_1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2507b5d0f4b2848147fbddd155aa6cfe"
-SRC_URI[archive.sha256sum] = "0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125"
diff --git a/recipes/xorg-proto/fixesproto_4.0.bb b/recipes/xorg-proto/fixesproto_4.0.bb
deleted file mode 100644
index 0004625..0000000
--- a/recipes/xorg-proto/fixesproto_4.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8b298cc3424597f8138c7faf7763dce9"
-SRC_URI[archive.sha256sum] = "b3fe971ccc8152db6c78da7117c31fc4cd2fcb2b6a4df3db0f8fed13d4ceb08f"
-
-BBCLASSEXTEND = "native"
-
-CONFLICTS = "fixesext"
diff --git a/recipes/xorg-proto/fontcacheproto_0.1.2.bb b/recipes/xorg-proto/fontcacheproto_0.1.2.bb
deleted file mode 100644
index aed2402..0000000
--- a/recipes/xorg-proto/fontcacheproto_0.1.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "60df6b625074a9790e28543dcea71651"
-SRC_URI[archive.sha256sum] = "48063ed49b200927376645f9ffe65faa39af84d59ba6f60f2abb2f9c6fa3d9f9"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-proto/fontsproto_2.0.2.bb b/recipes/xorg-proto/fontsproto_2.0.2.bb
deleted file mode 100644
index 5b044d3..0000000
--- a/recipes/xorg-proto/fontsproto_2.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c946f166107b016a21cc7a02e1132724"
-SRC_URI[archive.sha256sum] = "83bd547131aa11a232717a0f06d3c6cd58a0b2f6d541660bbe9ebf43073a8b7b"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-proto/glproto_1.4.11.bb b/recipes/xorg-proto/glproto_1.4.11.bb
deleted file mode 100644
index 13d35ab..0000000
--- a/recipes/xorg-proto/glproto_1.4.11.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "78e7c4dc7dcb74b1869fee7897e00f59"
-SRC_URI[archive.sha256sum] = "fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451"
diff --git a/recipes/xorg-proto/glproto_1.4.8.bb b/recipes/xorg-proto/glproto_1.4.8.bb
deleted file mode 100644
index ee27027..0000000
--- a/recipes/xorg-proto/glproto_1.4.8.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3dfbd17203c0c88b94b6f579f24c11cc"
-SRC_URI[archive.sha256sum] = "2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c"
diff --git a/recipes/xorg-proto/inputproto_1.4.1.bb b/recipes/xorg-proto/inputproto_1.4.1.bb
deleted file mode 100644
index 6e21b13..0000000
--- a/recipes/xorg-proto/inputproto_1.4.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "563cc41eeb590cf5eb2127807b838dfc"
-SRC_URI[archive.sha256sum] = "913ff534aa777e3c36f3e9fe3e8638c3ccfe398daeb7532fa917e7bcd6fed07d"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/inputproto_1.4.2.1.bb b/recipes/xorg-proto/inputproto_1.4.2.1.bb
deleted file mode 100644
index b05df8c..0000000
--- a/recipes/xorg-proto/inputproto_1.4.2.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "aa948a7469168ddd9c33f11c5dff55ac"
-SRC_URI[archive.sha256sum] = "9b6db77037de7c52b9a17862b99bc435bd5c20e5d3faf5aec943b206cdaff3ed"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/inputproto_1.4.2.bb b/recipes/xorg-proto/inputproto_1.4.2.bb
deleted file mode 100644
index 96bdc72..0000000
--- a/recipes/xorg-proto/inputproto_1.4.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e2c4cf4c2ad59d1e27f09381f6b4a3c3"
-SRC_URI[archive.sha256sum] = "62ba68a056daa89f5b21a02b27f6a4c858933e1c5547c9d16985d9ed182014e6"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/inputproto_1.4.3.bb b/recipes/xorg-proto/inputproto_1.4.3.bb
deleted file mode 100644
index ab4981f..0000000
--- a/recipes/xorg-proto/inputproto_1.4.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a0f0d8cf6fbf0db8ba3937d0cc16138d"
-SRC_URI[archive.sha256sum] = "627119ff21391314b88e5f34da837473151a54ab980d2f76d7f3c6bd3d560d4a"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/inputproto_1.4.4.bb b/recipes/xorg-proto/inputproto_1.4.4.bb
deleted file mode 100644
index 0c37756..0000000
--- a/recipes/xorg-proto/inputproto_1.4.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3a532379f226c34b36a5c585999f75e4"
-SRC_URI[archive.sha256sum] = "63278ef492d6babb9e3efaef84a67a982e5362c51623714c9428f0384007dfe5"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/inputproto_1.5.0.bb b/recipes/xorg-proto/inputproto_1.5.0.bb
deleted file mode 100644
index 007e477..0000000
--- a/recipes/xorg-proto/inputproto_1.5.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "dcc36554aea1338b3813943daf1e9988"
-SRC_URI[archive.sha256sum] = "ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/kbproto_1.0.3.bb b/recipes/xorg-proto/kbproto_1.0.3.bb
deleted file mode 100644
index 1b089d6..0000000
--- a/recipes/xorg-proto/kbproto_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6092cdb0a1225f95356ddbe6c2abaad5"
-SRC_URI[archive.sha256sum] = "7000005ebbd07a28a71477d72bcb76c47064e043a4ead26fcf4d5af394ce19df"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/printproto_1.0.3.bb b/recipes/xorg-proto/printproto_1.0.3.bb
deleted file mode 100644
index e579a5a..0000000
--- a/recipes/xorg-proto/printproto_1.0.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0f4e7982c6d4ec3b2cf38502dd1293a3"
-SRC_URI[archive.sha256sum] = "8b375f8cda83dfc7d84be44af41eedd484d0e2499acbd19bdca5b4056dec7235"
diff --git a/recipes/xorg-proto/randrproto_1.3.0.bb b/recipes/xorg-proto/randrproto_1.3.0.bb
deleted file mode 100644
index aab111a..0000000
--- a/recipes/xorg-proto/randrproto_1.3.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a49416013fff33c853efb32f1926551e"
-SRC_URI[archive.sha256sum] = "cfeb1429465e3c24debde1bf53ec35ef738fde5e80d2eed14f33e315e747bb8d"
-
-BBCLASSEXTEND = "nativesdk sdk"
-
-CONFLICTS = "randrext"
diff --git a/recipes/xorg-proto/recordproto_1.13.2.bb b/recipes/xorg-proto/recordproto_1.13.2.bb
deleted file mode 100644
index fc5e086..0000000
--- a/recipes/xorg-proto/recordproto_1.13.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0ed4706564a34fc2aff724aa16d3ff00"
-SRC_URI[archive.sha256sum] = "04e77a8b14f373a1825bbe0116cd0db8b2c5dee17b34ba9bddd27e576609cff9"
-
-CONFLICTS = "recordext"
diff --git a/recipes/xorg-proto/renderproto_0.9.2.bb b/recipes/xorg-proto/renderproto_0.9.2.bb
deleted file mode 100644
index 8c5edbf..0000000
--- a/recipes/xorg-proto/renderproto_0.9.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "28fbe8a59ebd31f098b90ec64f3d133a"
-SRC_URI[archive.sha256sum] = "7754dfbbb1e3818f28720fa9647b8a593e9d54626a7896771c2bfac7f75e2726"
-
-BBCLASSEXTEND = "native nativesdk sdk"
-
-CONFLICTS = "renderext"
diff --git a/recipes/xorg-proto/renderproto_0.9.3.bb b/recipes/xorg-proto/renderproto_0.9.3.bb
deleted file mode 100644
index ac8550e..0000000
--- a/recipes/xorg-proto/renderproto_0.9.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "598bc9a493deee2e48e4434e94467189"
-SRC_URI[archive.sha256sum] = "c98a08b877e98a8fa7daa04be472de7e0cb38a99593faca8b987effcea2dd45b"
-
-BBCLASSEXTEND = "native nativesdk sdk"
-
-CONFLICTS = "renderext"
diff --git a/recipes/xorg-proto/resourceproto_1.0.2.bb b/recipes/xorg-proto/resourceproto_1.0.2.bb
deleted file mode 100644
index 40e19ea..0000000
--- a/recipes/xorg-proto/resourceproto_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b823b314e37eb19dae1f297951d2e933"
-SRC_URI[archive.sha256sum] = "0c33d6fceef5483001459bdc934b5831502250b27f1f4ad370ab044f8ab53487"
-
-CONFLICTS = "resourceext"
diff --git a/recipes/xorg-proto/scrnsaverproto_1.1.0.bb b/recipes/xorg-proto/scrnsaverproto_1.1.0.bb
deleted file mode 100644
index 52d4869..0000000
--- a/recipes/xorg-proto/scrnsaverproto_1.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5d551850e6f4acdf49a13f4eb3a5bbfa"
-SRC_URI[archive.sha256sum] = "db09abf73cc339c05c0488639731794372a4770cfca76c2645f503f9fccd478f"
diff --git a/recipes/xorg-proto/videoproto_2.2.2.bb b/recipes/xorg-proto/videoproto_2.2.2.bb
deleted file mode 100644
index 071f6a3..0000000
--- a/recipes/xorg-proto/videoproto_2.2.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "44292d74a9a3c94b1ecb9d77a0da83e8"
-SRC_URI[archive.sha256sum] = "ab088478830cd30c2fe34fb7f44ffd4d177af7711c225c24676d3e9e9f24780c"
diff --git a/recipes/xorg-proto/windowswmproto_1.0.3.bb b/recipes/xorg-proto/windowswmproto_1.0.3.bb
deleted file mode 100644
index 1daa5c7..0000000
--- a/recipes/xorg-proto/windowswmproto_1.0.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ed5416cf7e2ba6e66641c88f12768c0c"
-SRC_URI[archive.sha256sum] = "780d249696bb2de7acabded90a465a62cd6cbda3b7f0ccff6ebfdf0d8180f151"
diff --git a/recipes/xorg-proto/xcmiscproto_1.1.2.bb b/recipes/xorg-proto/xcmiscproto_1.1.2.bb
deleted file mode 100644
index cafebbc..0000000
--- a/recipes/xorg-proto/xcmiscproto_1.1.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fde0b050901f024b19159cdacdcfbd20"
-SRC_URI[archive.sha256sum] = "b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/xextproto_7.0.2.bb b/recipes/xorg-proto/xextproto_7.0.2.bb
deleted file mode 100644
index e58f88a..0000000
--- a/recipes/xorg-proto/xextproto_7.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "242388ab65dde3a3dd313eeee265e429"
-SRC_URI[archive.sha256sum] = "53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/xextproto_7.0.3.bb b/recipes/xorg-proto/xextproto_7.0.3.bb
deleted file mode 100644
index 908cd32..0000000
--- a/recipes/xorg-proto/xextproto_7.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3a2e0252e853ab30b3bff05ac92ec61c"
-SRC_URI[archive.sha256sum] = "3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/xf86bigfontproto_1.1.2.bb b/recipes/xorg-proto/xf86bigfontproto_1.1.2.bb
deleted file mode 100644
index 228b5e2..0000000
--- a/recipes/xorg-proto/xf86bigfontproto_1.1.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a318c1e86123832d7b0c95fc7d47ef35"
-SRC_URI[archive.sha256sum] = "01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/xf86dgaproto_2.0.2.bb b/recipes/xorg-proto/xf86dgaproto_2.0.2.bb
deleted file mode 100644
index fc04869..0000000
--- a/recipes/xorg-proto/xf86dgaproto_2.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "461aa291a23e8cf387b70f3efa71b05c"
-SRC_URI[archive.sha256sum] = "3ee1db2481ea222269bd201eef4d0e5d8ca4dbdb5eeb4852cf1efc42d4269b60"
-
-CONFLICTS = "xxf86dgaext"
diff --git a/recipes/xorg-proto/xf86dgaproto_2.0.3.bb b/recipes/xorg-proto/xf86dgaproto_2.0.3.bb
deleted file mode 100644
index 171a401..0000000
--- a/recipes/xorg-proto/xf86dgaproto_2.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "42fdcebc66efac02ab4beec2b1b0ad6e"
-SRC_URI[archive.sha256sum] = "5ac4d4a308b032727c61fd56db5a2eaadaedfbce5bc9dc504320bff9d696b002"
-
-CONFLICTS = "xxf86dgaext"
diff --git a/recipes/xorg-proto/xf86driproto_2.0.3.bb b/recipes/xorg-proto/xf86driproto_2.0.3.bb
deleted file mode 100644
index 6c62b64..0000000
--- a/recipes/xorg-proto/xf86driproto_2.0.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e4a282cfd708b8892fca4425fee9cd7b"
-SRC_URI[archive.sha256sum] = "111c469a24374803b08104c725d8318760b226cedccd12b199c83d1b2756b8d6"
diff --git a/recipes/xorg-proto/xf86driproto_2.0.4.bb b/recipes/xorg-proto/xf86driproto_2.0.4.bb
deleted file mode 100644
index cd7b087..0000000
--- a/recipes/xorg-proto/xf86driproto_2.0.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "01470d088da3a8a3deefa8e1f45d69cb"
-SRC_URI[archive.sha256sum] = "f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da"
diff --git a/recipes/xorg-proto/xf86miscproto_0.9.2.bb b/recipes/xorg-proto/xf86miscproto_0.9.2.bb
deleted file mode 100644
index df4c612..0000000
--- a/recipes/xorg-proto/xf86miscproto_0.9.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "acae8edeb05a406f7f60bcbb218a8f1d"
-SRC_URI[archive.sha256sum] = "aaab4cbf19c73ded4785ba69cdd7ae23aaf103c7040559283f85fc1237dad6e6"
diff --git a/recipes/xorg-proto/xf86vidmodeproto_2.2.2.bb b/recipes/xorg-proto/xf86vidmodeproto_2.2.2.bb
deleted file mode 100644
index 00fc499..0000000
--- a/recipes/xorg-proto/xf86vidmodeproto_2.2.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f00844a63d6e76b69eb0eb5e41eed843"
-SRC_URI[archive.sha256sum] = "07152f990cc79ec5931989decc4a90b1919147e98ff6fcfe39507a9d3fc4d96e"
-
-CONFLICTS = "xxf86vmext"
diff --git a/recipes/xorg-proto/xineramaproto_1.1.2.bb b/recipes/xorg-proto/xineramaproto_1.1.2.bb
deleted file mode 100644
index 2c8b2f7..0000000
--- a/recipes/xorg-proto/xineramaproto_1.1.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1cc292c562962ad0ad3a253cae68c632"
-SRC_URI[archive.sha256sum] = "e8a62b1cafbcfc3b9fed147612ed4320233d0c9d6de30c991c2cd0c691c40910"
diff --git a/recipes/xorg-proto/xproto_7.0.10.bb b/recipes/xorg-proto/xproto_7.0.10.bb
deleted file mode 100644
index 558bc60..0000000
--- a/recipes/xorg-proto/xproto_7.0.10.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2ed80e90992e7455eaac4c3e977ebd01"
-SRC_URI[archive.sha256sum] = "6d659920262d41e48714184f94ff9cd2608515e0f3d2f074892fe0c048784df4"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/xproto_7.0.11.bb b/recipes/xorg-proto/xproto_7.0.11.bb
deleted file mode 100644
index 0ea401a..0000000
--- a/recipes/xorg-proto/xproto_7.0.11.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-proto-common.inc
-DESCRIPTION = "X11 core wire protocol and auxiliary headers"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6b6c266576d81c505aa4a1828151f7f8"
-SRC_URI[archive.sha256sum] = "4ba69b7ef195c1a4e2e8ea9a1101f5079ada1f060c66968226754687685e9e53"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/xproto_7.0.12.bb b/recipes/xorg-proto/xproto_7.0.12.bb
deleted file mode 100644
index 8969c85..0000000
--- a/recipes/xorg-proto/xproto_7.0.12.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "388234421add6c1760b4fc99fcdc76b0"
-SRC_URI[archive.sha256sum] = "bec5a98bbea56da069785784116261ec956df039fb07d0cdca53ae1ed03ebc0f"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/xproto_7.0.13.bb b/recipes/xorg-proto/xproto_7.0.13.bb
deleted file mode 100644
index 938df7f..0000000
--- a/recipes/xorg-proto/xproto_7.0.13.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7d26f45dca52632712a696e0631dc17b"
-SRC_URI[archive.sha256sum] = "6f6328922d69f5de29513a5baf1d010db2a7a54cb58a7a6cbbb1b25097ecd592"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/xproto_7.0.15.bb b/recipes/xorg-proto/xproto_7.0.15.bb
deleted file mode 100644
index 4beb67f..0000000
--- a/recipes/xorg-proto/xproto_7.0.15.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1a2b31430d04340be2e49e8b6445e076"
-SRC_URI[archive.sha256sum] = "fd8cd0bc3e94d7416e6af9eddfa909b0e64246e0d2bb41c00f4e02bd85c76bee"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/xproto_7.0.17.bb b/recipes/xorg-proto/xproto_7.0.17.bb
deleted file mode 100644
index 5d7ed8f..0000000
--- a/recipes/xorg-proto/xproto_7.0.17.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-proto-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "74abb8fb91af66f35873b1f444731220"
-SRC_URI[archive.sha256sum] = "9b2c1fdc5b3780cedc9f5d9caf8f1364f26d07f8502b0eccdde74319157f9d01"
-
-BBCLASSEXTEND = "native nativesdk sdk"
diff --git a/recipes/xorg-proto/xproxymanagementprotocol_1.0.2.bb b/recipes/xorg-proto/xproxymanagementprotocol_1.0.2.bb
deleted file mode 100644
index b018f77..0000000
--- a/recipes/xorg-proto/xproxymanagementprotocol_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-proto-common.inc
-PROVIDES = "xproxymngproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "d28007a50976204960fc1fc07b4ca093"
-SRC_URI[archive.sha256sum] = "c45176d002c85c142ac52774680f5325d330c5ecc32d4d6a056d85ee039a0cbc"
--
1.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 8/9] xorg-util: move older not pinned versions to obsolete dir
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
` (6 preceding siblings ...)
2010-08-16 15:30 ` [PATCH 7/9] xorg-proto: " Martin Jansa
@ 2010-08-16 15:30 ` Martin Jansa
2010-08-16 15:30 ` [PATCH 9/9] xorg-xserver: " Martin Jansa
` (4 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 15:30 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-util/files/unbreak_cross_compile.patch | 26 +++++++++++++++++++
recipes/obsolete/xorg/xorg-util/lndir_1.0.1.bb | 7 +++++
.../obsolete/xorg/xorg-util/makedepend_1.0.1.bb | 4 +++
.../util-macros-1.1.6/unbreak_cross_compile.patch | 19 ++++++++++++++
.../cross-compiler-for-checking.patch | 11 ++++++++
.../malloc_zero_returns_null.patch | 27 ++++++++++++++++++++
.../obsolete/xorg/xorg-util/util-macros_1.1.5.bb | 5 +++
.../obsolete/xorg/xorg-util/util-macros_1.1.6.bb | 4 +++
.../obsolete/xorg/xorg-util/util-macros_1.2.1.bb | 10 +++++++
.../obsolete/xorg/xorg-util/util-macros_1.4.1.bb | 5 +++
.../obsolete/xorg/xorg-util/util-macros_1.5.0.bb | 4 +++
.../obsolete/xorg/xorg-util/util-macros_1.6.0.bb | 4 +++
.../obsolete/xorg/xorg-util/util-macros_1.6.1.bb | 4 +++
.../obsolete/xorg/xorg-util/util-macros_1.7.0.bb | 4 +++
.../obsolete/xorg/xorg-util/util-macros_1.8.0.bb | 4 +++
.../obsolete/xorg/xorg-util/xorg-cf-files_1.0.2.bb | 10 +++++++
.../xorg-util/files/unbreak_cross_compile.patch | 26 -------------------
recipes/xorg-util/lndir_1.0.1.bb | 7 -----
recipes/xorg-util/makedepend_1.0.1.bb | 4 ---
.../util-macros-1.1.6/unbreak_cross_compile.patch | 19 --------------
.../cross-compiler-for-checking.patch | 11 --------
.../malloc_zero_returns_null.patch | 27 --------------------
recipes/xorg-util/util-macros_1.1.5.bb | 5 ---
recipes/xorg-util/util-macros_1.1.6.bb | 4 ---
recipes/xorg-util/util-macros_1.2.1.bb | 10 -------
recipes/xorg-util/util-macros_1.4.1.bb | 5 ---
recipes/xorg-util/util-macros_1.5.0.bb | 4 ---
recipes/xorg-util/util-macros_1.6.0.bb | 4 ---
recipes/xorg-util/util-macros_1.6.1.bb | 4 ---
recipes/xorg-util/util-macros_1.7.0.bb | 4 ---
recipes/xorg-util/util-macros_1.8.0.bb | 4 ---
recipes/xorg-util/xorg-cf-files_1.0.2.bb | 10 -------
32 files changed, 148 insertions(+), 148 deletions(-)
create mode 100644 recipes/obsolete/xorg/xorg-util/files/unbreak_cross_compile.patch
create mode 100644 recipes/obsolete/xorg/xorg-util/lndir_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-util/makedepend_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-util/util-macros-1.1.6/unbreak_cross_compile.patch
create mode 100644 recipes/obsolete/xorg/xorg-util/util-macros-1.2.1/cross-compiler-for-checking.patch
create mode 100644 recipes/obsolete/xorg/xorg-util/util-macros-1.4.1/malloc_zero_returns_null.patch
create mode 100644 recipes/obsolete/xorg/xorg-util/util-macros_1.1.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-util/util-macros_1.1.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-util/util-macros_1.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-util/util-macros_1.4.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-util/util-macros_1.5.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-util/util-macros_1.6.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-util/util-macros_1.6.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-util/util-macros_1.7.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-util/util-macros_1.8.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-util/xorg-cf-files_1.0.2.bb
delete mode 100644 recipes/xorg-util/files/unbreak_cross_compile.patch
delete mode 100644 recipes/xorg-util/lndir_1.0.1.bb
delete mode 100644 recipes/xorg-util/makedepend_1.0.1.bb
delete mode 100644 recipes/xorg-util/util-macros-1.1.6/unbreak_cross_compile.patch
delete mode 100644 recipes/xorg-util/util-macros-1.2.1/cross-compiler-for-checking.patch
delete mode 100644 recipes/xorg-util/util-macros-1.4.1/malloc_zero_returns_null.patch
delete mode 100644 recipes/xorg-util/util-macros_1.1.5.bb
delete mode 100644 recipes/xorg-util/util-macros_1.1.6.bb
delete mode 100644 recipes/xorg-util/util-macros_1.2.1.bb
delete mode 100644 recipes/xorg-util/util-macros_1.4.1.bb
delete mode 100644 recipes/xorg-util/util-macros_1.5.0.bb
delete mode 100644 recipes/xorg-util/util-macros_1.6.0.bb
delete mode 100644 recipes/xorg-util/util-macros_1.6.1.bb
delete mode 100644 recipes/xorg-util/util-macros_1.7.0.bb
delete mode 100644 recipes/xorg-util/util-macros_1.8.0.bb
delete mode 100644 recipes/xorg-util/xorg-cf-files_1.0.2.bb
diff --git a/recipes/obsolete/xorg/xorg-util/files/unbreak_cross_compile.patch b/recipes/obsolete/xorg/xorg-util/files/unbreak_cross_compile.patch
new file mode 100644
index 0000000..fd84aad
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/files/unbreak_cross_compile.patch
@@ -0,0 +1,26 @@
+---
+ xorg-macros.m4.in | 4 ----
+ 1 file changed, 4 deletions(-)
+
+Index: util-macros-1.1.5/xorg-macros.m4.in
+===================================================================
+--- util-macros-1.1.5.orig/xorg-macros.m4.in 2006-11-08 14:23:10.000000000 +0000
++++ util-macros-1.1.5/xorg-macros.m4.in 2007-01-31 15:28:55.000000000 +0000
+@@ -194,8 +194,6 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
+ XORG_SGML_PATH=$prefix/share/sgml
+ HAVE_DEFS_ENT=
+
+-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+-
+ AC_PATH_PROG(LINUXDOC, linuxdoc)
+ AC_PATH_PROG(PS2PDF, ps2pdf)
+
+@@ -250,8 +248,6 @@ BUILDPDFDOC=no
+ BUILDPSDOC=no
+ BUILDHTMLDOC=no
+
+-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+-
+ AC_PATH_PROG(DOCBOOKPS, docbook2ps)
+ AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
+ AC_PATH_PROG(DOCBOOKHTML, docbook2html)
diff --git a/recipes/obsolete/xorg/xorg-util/lndir_1.0.1.bb b/recipes/obsolete/xorg/xorg-util/lndir_1.0.1.bb
new file mode 100644
index 0000000..0512517
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/lndir_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "create a shadow directory of symbolic links to another directory tree"
+PR = "r2"
+PE = "1"
+SRC_URI[archive.md5sum] = "1a53ddd7e1804abe8f3d9799a88b6aa8"
+SRC_URI[archive.sha256sum] = "89bff89702ebf2e5cc2268d79d5a27c62190c5a85ab080935d4425d3e309bc57"
diff --git a/recipes/obsolete/xorg/xorg-util/makedepend_1.0.1.bb b/recipes/obsolete/xorg/xorg-util/makedepend_1.0.1.bb
new file mode 100644
index 0000000..05cc5e6
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/makedepend_1.0.1.bb
@@ -0,0 +1,4 @@
+require makedepend.inc
+PR = "${INC_PR}.0"
+SRC_URI[archive.md5sum] = "90f5f3b987497a481b94d49372f17dce"
+SRC_URI[archive.sha256sum] = "0a4a0d4e2613b0cd4321e55fd4741788b728736fc8a517996e2015fa49862e61"
diff --git a/recipes/obsolete/xorg/xorg-util/util-macros-1.1.6/unbreak_cross_compile.patch b/recipes/obsolete/xorg/xorg-util/util-macros-1.1.6/unbreak_cross_compile.patch
new file mode 100644
index 0000000..1f78494
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/util-macros-1.1.6/unbreak_cross_compile.patch
@@ -0,0 +1,19 @@
+---
+ xorg-macros.m4.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- util-macros-1.1.6.orig/xorg-macros.m4.in
++++ util-macros-1.1.6/xorg-macros.m4.in
+@@ -252,12 +252,10 @@ HAVE_DEFS_ENT=
+ BUILDTXTDOC=no
+ BUILDPDFDOC=no
+ BUILDPSDOC=no
+ BUILDHTMLDOC=no
+
+-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+-
+ AC_PATH_PROG(DOCBOOKPS, docbook2ps)
+ AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
+ AC_PATH_PROG(DOCBOOKHTML, docbook2html)
+ AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
+
diff --git a/recipes/obsolete/xorg/xorg-util/util-macros-1.2.1/cross-compiler-for-checking.patch b/recipes/obsolete/xorg/xorg-util/util-macros-1.2.1/cross-compiler-for-checking.patch
new file mode 100644
index 0000000..c646fff
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/util-macros-1.2.1/cross-compiler-for-checking.patch
@@ -0,0 +1,11 @@
+--- util-macros-1.2.1/xorg-macros.m4.in-orig 2009-06-08 13:49:09.000000000 +0200
++++ util-macros-1.2.1/xorg-macros.m4.in 2009-06-08 13:51:28.000000000 +0200
+@@ -445,7 +445,7 @@
+ CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+ -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
+ -Wbad-function-cast"
+- case `gcc -dumpversion` in
++ case `$CC -dumpversion 2>/dev/null` in
+ 3.4.* | 4.*)
+ CWARNFLAGS+=" -Wold-style-definition -Wdeclaration-after-statement"
+ ;;
diff --git a/recipes/obsolete/xorg/xorg-util/util-macros-1.4.1/malloc_zero_returns_null.patch b/recipes/obsolete/xorg/xorg-util/util-macros-1.4.1/malloc_zero_returns_null.patch
new file mode 100644
index 0000000..0d8a9cd
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/util-macros-1.4.1/malloc_zero_returns_null.patch
@@ -0,0 +1,27 @@
+From 48e2b3d0ee8d637d83b88bf29c6d417f61aaa0e4 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Sat, 10 Oct 2009 12:28:28 +0000
+Subject: Use conservative default for malloc(0) when cross-compiling #24460
+
+When cross-compiling, AC_RUN_IFELSE can't run test programs.
+MALLOC_ZERO_RETURNS_NULL=yes is a conservative default in this case.
+
+Signed-off-by: Colin Watson <cjwatson@canonical.com>
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+---
+diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
+index 6f9635f..393186f 100644
+--- a/xorg-macros.m4.in
++++ b/xorg-macros.m4.in
+@@ -339,7 +339,8 @@ main() {
+ exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
+ }],
+ [MALLOC_ZERO_RETURNS_NULL=yes],
+- [MALLOC_ZERO_RETURNS_NULL=no])
++ [MALLOC_ZERO_RETURNS_NULL=no],
++ [MALLOC_ZERO_RETURNS_NULL=yes])
+ fi
+ AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
+
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-util/util-macros_1.1.5.bb b/recipes/obsolete/xorg/xorg-util/util-macros_1.1.5.bb
new file mode 100644
index 0000000..bd580ad
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/util-macros_1.1.5.bb
@@ -0,0 +1,5 @@
+require util-macros.inc
+SRC_URI += "file://unbreak_cross_compile.patch"
+PR = "${INC_PR}.0"
+SRC_URI[archive.md5sum] = "d168aa001b946b58d9aab6088c09d256"
+SRC_URI[archive.sha256sum] = "4f2a8a19e90ad82bc2da4eb52799a299a1c94bf5143bc2711e9e5d4cc5a7cdb4"
diff --git a/recipes/obsolete/xorg/xorg-util/util-macros_1.1.6.bb b/recipes/obsolete/xorg/xorg-util/util-macros_1.1.6.bb
new file mode 100644
index 0000000..39ba8fa
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/util-macros_1.1.6.bb
@@ -0,0 +1,4 @@
+require util-macros.inc
+PR = "${INC_PR}.0"
+SRC_URI[archive.md5sum] = "ea2d9cd33ca6fd05923f007bd74d7c37"
+SRC_URI[archive.sha256sum] = "97748154c41a1cd12635a79aee0c2846fd48ecb555fc8b54e3e5baec174e6e74"
diff --git a/recipes/obsolete/xorg/xorg-util/util-macros_1.2.1.bb b/recipes/obsolete/xorg/xorg-util/util-macros_1.2.1.bb
new file mode 100644
index 0000000..9c37f50
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/util-macros_1.2.1.bb
@@ -0,0 +1,10 @@
+require util-macros.inc
+
+# Version 1.2.1 uses plain `gcc' for checking the compiler version.
+# Instead, the cross compiler must be used. Whenever upgrading to
+# a new version, please recheck for this problem, otherwise it breaks
+# builds with older gcc versions!
+SRC_URI += " file://cross-compiler-for-checking.patch"
+PR = "${INC_PR}.0"
+SRC_URI[archive.md5sum] = "81b9746d6202ccf0b4a498cfd0731e71"
+SRC_URI[archive.sha256sum] = "f3804f02f51a1be243ce7413dc67dca774f000686f8f2efedc77203a1962d401"
diff --git a/recipes/obsolete/xorg/xorg-util/util-macros_1.4.1.bb b/recipes/obsolete/xorg/xorg-util/util-macros_1.4.1.bb
new file mode 100644
index 0000000..7d9e608
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/util-macros_1.4.1.bb
@@ -0,0 +1,5 @@
+require util-macros.inc
+SRC_URI += " file://malloc_zero_returns_null.patch"
+PR = "${INC_PR}.0"
+SRC_URI[archive.md5sum] = "8ac38951e753f250aaefbd4ba0afda94"
+SRC_URI[archive.sha256sum] = "d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986"
diff --git a/recipes/obsolete/xorg/xorg-util/util-macros_1.5.0.bb b/recipes/obsolete/xorg/xorg-util/util-macros_1.5.0.bb
new file mode 100644
index 0000000..ff3b6f4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/util-macros_1.5.0.bb
@@ -0,0 +1,4 @@
+require util-macros.inc
+PR = "${INC_PR}.0"
+SRC_URI[archive.md5sum] = "ffef78135535c60c2b68d0a2a4ecae9b"
+SRC_URI[archive.sha256sum] = "d47116ce5df198859a6082af7a72505575d1685b8c82bb4ef6fbedfa3316617e"
diff --git a/recipes/obsolete/xorg/xorg-util/util-macros_1.6.0.bb b/recipes/obsolete/xorg/xorg-util/util-macros_1.6.0.bb
new file mode 100644
index 0000000..c5a715f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/util-macros_1.6.0.bb
@@ -0,0 +1,4 @@
+require util-macros.inc
+SRC_URI[archive.md5sum] = "eb991c709781f811fbfcdbd43f9edd16"
+SRC_URI[archive.sha256sum] = "12c7a8819f2df62ff7fca20152438d6b4e93ac581d7de211e31149739aa37ce9"
+PR = "${INC_PR}.0"
diff --git a/recipes/obsolete/xorg/xorg-util/util-macros_1.6.1.bb b/recipes/obsolete/xorg/xorg-util/util-macros_1.6.1.bb
new file mode 100644
index 0000000..80c5971
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/util-macros_1.6.1.bb
@@ -0,0 +1,4 @@
+require util-macros.inc
+SRC_URI[archive.md5sum] = "a4bef59dd4a2e3450c07c77c6b45a79f"
+SRC_URI[archive.sha256sum] = "ba91652d78f2a63d69253fb80af2f0a76c2e1b081c64521f90fac3866ee893d7"
+PR = "${INC_PR}.0"
diff --git a/recipes/obsolete/xorg/xorg-util/util-macros_1.7.0.bb b/recipes/obsolete/xorg/xorg-util/util-macros_1.7.0.bb
new file mode 100644
index 0000000..df57ea0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/util-macros_1.7.0.bb
@@ -0,0 +1,4 @@
+require util-macros.inc
+SRC_URI[archive.md5sum] = "8a8d208f24672e7a37d1aa4d2ffcef8e"
+SRC_URI[archive.sha256sum] = "7a5519ca22cd6bc4664be7b52cc58d5594e9f18c282ee0f6f7c59c1dffabdd13"
+PR = "${INC_PR}.0"
diff --git a/recipes/obsolete/xorg/xorg-util/util-macros_1.8.0.bb b/recipes/obsolete/xorg/xorg-util/util-macros_1.8.0.bb
new file mode 100644
index 0000000..7d7d59d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/util-macros_1.8.0.bb
@@ -0,0 +1,4 @@
+require util-macros.inc
+PR = "${INC_PR}.0"
+SRC_URI[archive.md5sum] = "fe73a69d02bd0be6cdf7c773bfd72041"
+SRC_URI[archive.sha256sum] = "2de6954271dbd43f073022c371c15d5f1102a3631eaa4f4053bfd173e148f7d7"
diff --git a/recipes/obsolete/xorg/xorg-util/xorg-cf-files_1.0.2.bb b/recipes/obsolete/xorg/xorg-util/xorg-cf-files_1.0.2.bb
new file mode 100644
index 0000000..dcf1f17
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-util/xorg-cf-files_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "X Window System CF files"
+
+PR = "r1"
+PE = "1"
+
+FILES_${PN} += " /usr/lib/X11/config"
+SRC_URI[archive.md5sum] = "f96f44b87132afd2fff677a8c89166dd"
+SRC_URI[archive.sha256sum] = "4edcaf61ad8b4bef65169af2b98d3992be07260f90cca65128dc523d6935bdd8"
diff --git a/recipes/xorg-util/files/unbreak_cross_compile.patch b/recipes/xorg-util/files/unbreak_cross_compile.patch
deleted file mode 100644
index fd84aad..0000000
--- a/recipes/xorg-util/files/unbreak_cross_compile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
----
- xorg-macros.m4.in | 4 ----
- 1 file changed, 4 deletions(-)
-
-Index: util-macros-1.1.5/xorg-macros.m4.in
-===================================================================
---- util-macros-1.1.5.orig/xorg-macros.m4.in 2006-11-08 14:23:10.000000000 +0000
-+++ util-macros-1.1.5/xorg-macros.m4.in 2007-01-31 15:28:55.000000000 +0000
-@@ -194,8 +194,6 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
- XORG_SGML_PATH=$prefix/share/sgml
- HAVE_DEFS_ENT=
-
--AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
--
- AC_PATH_PROG(LINUXDOC, linuxdoc)
- AC_PATH_PROG(PS2PDF, ps2pdf)
-
-@@ -250,8 +248,6 @@ BUILDPDFDOC=no
- BUILDPSDOC=no
- BUILDHTMLDOC=no
-
--AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
--
- AC_PATH_PROG(DOCBOOKPS, docbook2ps)
- AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
- AC_PATH_PROG(DOCBOOKHTML, docbook2html)
diff --git a/recipes/xorg-util/lndir_1.0.1.bb b/recipes/xorg-util/lndir_1.0.1.bb
deleted file mode 100644
index 0512517..0000000
--- a/recipes/xorg-util/lndir_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "create a shadow directory of symbolic links to another directory tree"
-PR = "r2"
-PE = "1"
-SRC_URI[archive.md5sum] = "1a53ddd7e1804abe8f3d9799a88b6aa8"
-SRC_URI[archive.sha256sum] = "89bff89702ebf2e5cc2268d79d5a27c62190c5a85ab080935d4425d3e309bc57"
diff --git a/recipes/xorg-util/makedepend_1.0.1.bb b/recipes/xorg-util/makedepend_1.0.1.bb
deleted file mode 100644
index 05cc5e6..0000000
--- a/recipes/xorg-util/makedepend_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require makedepend.inc
-PR = "${INC_PR}.0"
-SRC_URI[archive.md5sum] = "90f5f3b987497a481b94d49372f17dce"
-SRC_URI[archive.sha256sum] = "0a4a0d4e2613b0cd4321e55fd4741788b728736fc8a517996e2015fa49862e61"
diff --git a/recipes/xorg-util/util-macros-1.1.6/unbreak_cross_compile.patch b/recipes/xorg-util/util-macros-1.1.6/unbreak_cross_compile.patch
deleted file mode 100644
index 1f78494..0000000
--- a/recipes/xorg-util/util-macros-1.1.6/unbreak_cross_compile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
----
- xorg-macros.m4.in | 2 --
- 1 file changed, 2 deletions(-)
-
---- util-macros-1.1.6.orig/xorg-macros.m4.in
-+++ util-macros-1.1.6/xorg-macros.m4.in
-@@ -252,12 +252,10 @@ HAVE_DEFS_ENT=
- BUILDTXTDOC=no
- BUILDPDFDOC=no
- BUILDPSDOC=no
- BUILDHTMLDOC=no
-
--AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
--
- AC_PATH_PROG(DOCBOOKPS, docbook2ps)
- AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
- AC_PATH_PROG(DOCBOOKHTML, docbook2html)
- AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
-
diff --git a/recipes/xorg-util/util-macros-1.2.1/cross-compiler-for-checking.patch b/recipes/xorg-util/util-macros-1.2.1/cross-compiler-for-checking.patch
deleted file mode 100644
index c646fff..0000000
--- a/recipes/xorg-util/util-macros-1.2.1/cross-compiler-for-checking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util-macros-1.2.1/xorg-macros.m4.in-orig 2009-06-08 13:49:09.000000000 +0200
-+++ util-macros-1.2.1/xorg-macros.m4.in 2009-06-08 13:51:28.000000000 +0200
-@@ -445,7 +445,7 @@
- CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
- -Wbad-function-cast"
-- case `gcc -dumpversion` in
-+ case `$CC -dumpversion 2>/dev/null` in
- 3.4.* | 4.*)
- CWARNFLAGS+=" -Wold-style-definition -Wdeclaration-after-statement"
- ;;
diff --git a/recipes/xorg-util/util-macros-1.4.1/malloc_zero_returns_null.patch b/recipes/xorg-util/util-macros-1.4.1/malloc_zero_returns_null.patch
deleted file mode 100644
index 0d8a9cd..0000000
--- a/recipes/xorg-util/util-macros-1.4.1/malloc_zero_returns_null.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 48e2b3d0ee8d637d83b88bf29c6d417f61aaa0e4 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@canonical.com>
-Date: Sat, 10 Oct 2009 12:28:28 +0000
-Subject: Use conservative default for malloc(0) when cross-compiling #24460
-
-When cross-compiling, AC_RUN_IFELSE can't run test programs.
-MALLOC_ZERO_RETURNS_NULL=yes is a conservative default in this case.
-
-Signed-off-by: Colin Watson <cjwatson@canonical.com>
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
-index 6f9635f..393186f 100644
---- a/xorg-macros.m4.in
-+++ b/xorg-macros.m4.in
-@@ -339,7 +339,8 @@ main() {
- exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
- }],
- [MALLOC_ZERO_RETURNS_NULL=yes],
-- [MALLOC_ZERO_RETURNS_NULL=no])
-+ [MALLOC_ZERO_RETURNS_NULL=no],
-+ [MALLOC_ZERO_RETURNS_NULL=yes])
- fi
- AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
-
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-util/util-macros_1.1.5.bb b/recipes/xorg-util/util-macros_1.1.5.bb
deleted file mode 100644
index bd580ad..0000000
--- a/recipes/xorg-util/util-macros_1.1.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require util-macros.inc
-SRC_URI += "file://unbreak_cross_compile.patch"
-PR = "${INC_PR}.0"
-SRC_URI[archive.md5sum] = "d168aa001b946b58d9aab6088c09d256"
-SRC_URI[archive.sha256sum] = "4f2a8a19e90ad82bc2da4eb52799a299a1c94bf5143bc2711e9e5d4cc5a7cdb4"
diff --git a/recipes/xorg-util/util-macros_1.1.6.bb b/recipes/xorg-util/util-macros_1.1.6.bb
deleted file mode 100644
index 39ba8fa..0000000
--- a/recipes/xorg-util/util-macros_1.1.6.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require util-macros.inc
-PR = "${INC_PR}.0"
-SRC_URI[archive.md5sum] = "ea2d9cd33ca6fd05923f007bd74d7c37"
-SRC_URI[archive.sha256sum] = "97748154c41a1cd12635a79aee0c2846fd48ecb555fc8b54e3e5baec174e6e74"
diff --git a/recipes/xorg-util/util-macros_1.2.1.bb b/recipes/xorg-util/util-macros_1.2.1.bb
deleted file mode 100644
index 9c37f50..0000000
--- a/recipes/xorg-util/util-macros_1.2.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require util-macros.inc
-
-# Version 1.2.1 uses plain `gcc' for checking the compiler version.
-# Instead, the cross compiler must be used. Whenever upgrading to
-# a new version, please recheck for this problem, otherwise it breaks
-# builds with older gcc versions!
-SRC_URI += " file://cross-compiler-for-checking.patch"
-PR = "${INC_PR}.0"
-SRC_URI[archive.md5sum] = "81b9746d6202ccf0b4a498cfd0731e71"
-SRC_URI[archive.sha256sum] = "f3804f02f51a1be243ce7413dc67dca774f000686f8f2efedc77203a1962d401"
diff --git a/recipes/xorg-util/util-macros_1.4.1.bb b/recipes/xorg-util/util-macros_1.4.1.bb
deleted file mode 100644
index 7d9e608..0000000
--- a/recipes/xorg-util/util-macros_1.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require util-macros.inc
-SRC_URI += " file://malloc_zero_returns_null.patch"
-PR = "${INC_PR}.0"
-SRC_URI[archive.md5sum] = "8ac38951e753f250aaefbd4ba0afda94"
-SRC_URI[archive.sha256sum] = "d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986"
diff --git a/recipes/xorg-util/util-macros_1.5.0.bb b/recipes/xorg-util/util-macros_1.5.0.bb
deleted file mode 100644
index ff3b6f4..0000000
--- a/recipes/xorg-util/util-macros_1.5.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require util-macros.inc
-PR = "${INC_PR}.0"
-SRC_URI[archive.md5sum] = "ffef78135535c60c2b68d0a2a4ecae9b"
-SRC_URI[archive.sha256sum] = "d47116ce5df198859a6082af7a72505575d1685b8c82bb4ef6fbedfa3316617e"
diff --git a/recipes/xorg-util/util-macros_1.6.0.bb b/recipes/xorg-util/util-macros_1.6.0.bb
deleted file mode 100644
index c5a715f..0000000
--- a/recipes/xorg-util/util-macros_1.6.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require util-macros.inc
-SRC_URI[archive.md5sum] = "eb991c709781f811fbfcdbd43f9edd16"
-SRC_URI[archive.sha256sum] = "12c7a8819f2df62ff7fca20152438d6b4e93ac581d7de211e31149739aa37ce9"
-PR = "${INC_PR}.0"
diff --git a/recipes/xorg-util/util-macros_1.6.1.bb b/recipes/xorg-util/util-macros_1.6.1.bb
deleted file mode 100644
index 80c5971..0000000
--- a/recipes/xorg-util/util-macros_1.6.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require util-macros.inc
-SRC_URI[archive.md5sum] = "a4bef59dd4a2e3450c07c77c6b45a79f"
-SRC_URI[archive.sha256sum] = "ba91652d78f2a63d69253fb80af2f0a76c2e1b081c64521f90fac3866ee893d7"
-PR = "${INC_PR}.0"
diff --git a/recipes/xorg-util/util-macros_1.7.0.bb b/recipes/xorg-util/util-macros_1.7.0.bb
deleted file mode 100644
index df57ea0..0000000
--- a/recipes/xorg-util/util-macros_1.7.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require util-macros.inc
-SRC_URI[archive.md5sum] = "8a8d208f24672e7a37d1aa4d2ffcef8e"
-SRC_URI[archive.sha256sum] = "7a5519ca22cd6bc4664be7b52cc58d5594e9f18c282ee0f6f7c59c1dffabdd13"
-PR = "${INC_PR}.0"
diff --git a/recipes/xorg-util/util-macros_1.8.0.bb b/recipes/xorg-util/util-macros_1.8.0.bb
deleted file mode 100644
index 7d7d59d..0000000
--- a/recipes/xorg-util/util-macros_1.8.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require util-macros.inc
-PR = "${INC_PR}.0"
-SRC_URI[archive.md5sum] = "fe73a69d02bd0be6cdf7c773bfd72041"
-SRC_URI[archive.sha256sum] = "2de6954271dbd43f073022c371c15d5f1102a3631eaa4f4053bfd173e148f7d7"
diff --git a/recipes/xorg-util/xorg-cf-files_1.0.2.bb b/recipes/xorg-util/xorg-cf-files_1.0.2.bb
deleted file mode 100644
index dcf1f17..0000000
--- a/recipes/xorg-util/xorg-cf-files_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X Window System CF files"
-
-PR = "r1"
-PE = "1"
-
-FILES_${PN} += " /usr/lib/X11/config"
-SRC_URI[archive.md5sum] = "f96f44b87132afd2fff677a8c89166dd"
-SRC_URI[archive.sha256sum] = "4edcaf61ad8b4bef65169af2b98d3992be07260f90cca65128dc523d6935bdd8"
--
1.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 9/9] xorg-xserver: move older not pinned versions to obsolete dir
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
` (7 preceding siblings ...)
2010-08-16 15:30 ` [PATCH 8/9] xorg-util: " Martin Jansa
@ 2010-08-16 15:30 ` Martin Jansa
2010-08-16 19:25 ` xorg recipes cleanup Frans Meulenbroeks
` (3 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 15:30 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../obsolete/xorg-xserver/xorg-xserver-common.inc | 113 --------------------
.../xorg-xserver/xserver-xorg-1.6.1/drmfix.patch | 15 ---
...ack-assume-pixman-supports-overlapped-blt.patch | 14 ---
...ack-assume-pixman-supports-overlapped-blt.patch | 14 ---
.../obsolete/xorg-xserver/xserver-xorg_1.6.1.bb | 20 ----
.../obsolete/xorg-xserver/xserver-xorg_1.7.2.bb | 22 ----
.../obsolete/xorg-xserver/xserver-xorg_1.7.3.bb | 30 -----
.../xorg/xorg-xserver/files/xcalibrate-xorg.diff | 11 ++
.../xorg/xorg-xserver/xorg-xserver-common.inc | 113 ++++++++++++++++++++
.../xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch | 13 +++
.../xserver-xorg-1.3.0.0/glyphstr.patch | 15 +++
.../xorg-xserver/xserver-xorg-1.4.2/drmfix.patch | 15 +++
.../xorg-xserver/xserver-xorg-1.4/drmfix.patch | 15 +++
.../xorg-xserver/xserver-xorg-1.5.1/drmfix.patch | 15 +++
.../xorg-xserver/xserver-xorg-1.5.3/drmfix.patch | 15 +++
.../xorg-server-1.5.3-configure.patch | 38 +++++++
...g-server-1.5.3-glcore-prepare-for-dynamic.patch | 108 +++++++++++++++++++
.../xorg-xserver/xserver-xorg-1.6.1/drmfix.patch | 15 +++
...ack-assume-pixman-supports-overlapped-blt.patch | 14 +++
...ack-assume-pixman-supports-overlapped-blt.patch | 14 +++
.../xorg/xorg-xserver/xserver-xorg/dolt-fix.patch | 22 ++++
.../xorg/xorg-xserver/xserver-xorg/drmfix.patch | 15 +++
.../xorg/xorg-xserver/xserver-xorg/fontfile.patch | 11 ++
.../xorg/xorg-xserver/xserver-xorg/freetype.patch | 22 ++++
.../hack-fbdev-ignore-return-mode.patch | 39 +++++++
.../xserver-xorg/imake-installed.patch | 11 ++
.../xserver-xorg/no-screen-blanking.patch | 15 +++
.../xserver-xorg/xpconfig-parentdir.patch | 30 +++++
.../xorg/xorg-xserver/xserver-xorg_1.2.0.bb | 15 +++
.../xorg/xorg-xserver/xserver-xorg_1.3.0.0.bb | 18 +++
.../xorg/xorg-xserver/xserver-xorg_1.4.2.bb | 20 ++++
.../obsolete/xorg/xorg-xserver/xserver-xorg_1.4.bb | 18 +++
.../xorg/xorg-xserver/xserver-xorg_1.5.1.bb | 17 +++
.../xorg/xorg-xserver/xserver-xorg_1.5.3.bb | 21 ++++
.../xorg/xorg-xserver/xserver-xorg_1.6.1.bb | 20 ++++
.../xorg/xorg-xserver/xserver-xorg_1.7.2.bb | 22 ++++
.../xorg/xorg-xserver/xserver-xorg_1.7.3.bb | 30 +++++
.../files/fix-picturestr-include-order.patch | 15 ---
recipes/xorg-xserver/files/pkgconfig_fix.patch | 13 ---
.../files/report-correct-randr10.patch | 25 -----
.../files/report-correct-randr12.patch | 29 -----
recipes/xorg-xserver/files/sysroot_fix.patch | 13 ---
recipes/xorg-xserver/files/xcalibrate-xorg.diff | 11 --
recipes/xorg-xserver/files/xorg-avr32-support.diff | 21 ----
.../fix-picturestr-include-order.patch | 15 +++
.../report-correct-randr12.patch | 29 +++++
.../xserver-kdrive-1.5.3/sysroot_fix.patch | 13 +++
.../fix-picturestr-include-order.patch | 15 +++
.../report-correct-randr10.patch | 25 +++++
.../fix-picturestr-include-order.patch | 15 +++
.../fix-picturestr-include-order.patch | 15 +++
.../report-correct-randr10.patch | 25 +++++
.../xserver-kdrive/pkgconfig_fix.patch | 13 +++
.../xserver-kdrive/report-correct-randr10.patch | 25 +++++
.../xserver-kdrive/xorg-avr32-support.diff | 21 ++++
.../xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch | 13 ---
.../xserver-xorg-1.3.0.0/glyphstr.patch | 15 ---
.../xorg-xserver/xserver-xorg-1.4.2/drmfix.patch | 15 ---
recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch | 15 ---
.../xorg-xserver/xserver-xorg-1.5.1/drmfix.patch | 15 ---
.../xorg-xserver/xserver-xorg-1.5.3/drmfix.patch | 15 ---
.../xorg-server-1.5.3-configure.patch | 38 -------
...g-server-1.5.3-glcore-prepare-for-dynamic.patch | 108 -------------------
.../xorg-xserver/xserver-xorg-1.7.1/dolt-fix.patch | 22 ++++
.../xserver-xorg-1.7.1/randr-support.patch | 96 +++++++++++++++++
.../xserver-xorg-1.7.1/sysroot_fix.patch | 13 +++
.../xorg-xserver/xserver-xorg-1.7.4/dolt-fix.patch | 22 ++++
.../hack-fbdev-ignore-return-mode.patch | 39 +++++++
.../xserver-xorg-1.7.4/randr-support.patch | 96 +++++++++++++++++
.../xserver-xorg-1.7.4/sysroot_fix.patch | 13 +++
.../xorg-xserver/xserver-xorg-1.8.1/dolt-fix.patch | 22 ++++
.../hack-fbdev-ignore-return-mode.patch | 39 +++++++
.../xserver-xorg-1.8.1/randr-support.patch | 96 +++++++++++++++++
...ake-sure-that-DisplayModeRec-name-is-init.patch | 25 -----
.../xserver-xorg-1.8.99.906/dolt-fix.patch | 22 ++++
.../hack-fbdev-ignore-return-mode.patch | 39 +++++++
.../xserver-xorg-1.8.99.906/randr-support.patch | 96 +++++++++++++++++
.../xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch | 22 ----
recipes/xorg-xserver/xserver-xorg/dolt-fix.patch | 22 ----
recipes/xorg-xserver/xserver-xorg/drmfix.patch | 15 ---
recipes/xorg-xserver/xserver-xorg/fontfile.patch | 11 --
recipes/xorg-xserver/xserver-xorg/freetype.patch | 22 ----
.../hack-fbdev-ignore-return-mode.patch | 39 -------
.../xserver-xorg/imake-installed.patch | 11 --
.../xserver-xorg/no-screen-blanking.patch | 15 ---
.../xserver-xorg/randr-support-1.7.0.patch | 96 -----------------
.../xserver-xorg/xpconfig-parentdir.patch | 30 -----
recipes/xorg-xserver/xserver-xorg_1.2.0.bb | 15 ---
recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb | 18 ---
recipes/xorg-xserver/xserver-xorg_1.4.2.bb | 20 ----
recipes/xorg-xserver/xserver-xorg_1.4.bb | 18 ---
recipes/xorg-xserver/xserver-xorg_1.5.1.bb | 17 ---
recipes/xorg-xserver/xserver-xorg_1.5.3.bb | 21 ----
recipes/xorg-xserver/xserver-xorg_1.7.1.bb | 4 +-
recipes/xorg-xserver/xserver-xorg_1.7.4.bb | 4 +-
recipes/xorg-xserver/xserver-xorg_1.8.1.bb | 4 +-
recipes/xorg-xserver/xserver-xorg_1.8.99.906.bb | 6 +-
recipes/xorg-xserver/xserver-xorg_git.bb | 13 ++-
98 files changed, 1589 insertions(+), 1021 deletions(-)
delete mode 100644 recipes/obsolete/xorg-xserver/xorg-xserver-common.inc
delete mode 100644 recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
delete mode 100644 recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch
delete mode 100644 recipes/obsolete/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch
delete mode 100644 recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb
delete mode 100644 recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb
delete mode 100644 recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-xserver/files/xcalibrate-xorg.diff
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xorg-xserver-common.inc
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4/drmfix.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg/dolt-fix.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg/drmfix.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg/fontfile.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg/freetype.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg/imake-installed.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg/no-screen-blanking.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.3.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.6.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.3.bb
delete mode 100644 recipes/xorg-xserver/files/fix-picturestr-include-order.patch
delete mode 100644 recipes/xorg-xserver/files/pkgconfig_fix.patch
delete mode 100644 recipes/xorg-xserver/files/report-correct-randr10.patch
delete mode 100644 recipes/xorg-xserver/files/report-correct-randr12.patch
delete mode 100644 recipes/xorg-xserver/files/sysroot_fix.patch
delete mode 100644 recipes/xorg-xserver/files/xcalibrate-xorg.diff
delete mode 100644 recipes/xorg-xserver/files/xorg-avr32-support.diff
create mode 100644 recipes/xorg-xserver/xserver-kdrive-1.3.0.0/fix-picturestr-include-order.patch
create mode 100644 recipes/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch
create mode 100644 recipes/xorg-xserver/xserver-kdrive-1.5.3/sysroot_fix.patch
create mode 100644 recipes/xorg-xserver/xserver-kdrive-imageon/fix-picturestr-include-order.patch
create mode 100644 recipes/xorg-xserver/xserver-kdrive-imageon/report-correct-randr10.patch
create mode 100644 recipes/xorg-xserver/xserver-kdrive-nomadik/fix-picturestr-include-order.patch
create mode 100644 recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch
create mode 100644 recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch
create mode 100644 recipes/xorg-xserver/xserver-kdrive/pkgconfig_fix.patch
create mode 100644 recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch
create mode 100644 recipes/xorg-xserver/xserver-kdrive/xorg-avr32-support.diff
delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.1/dolt-fix.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.1/randr-support.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.1/sysroot_fix.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.4/dolt-fix.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.4/hack-fbdev-ignore-return-mode.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.4/randr-support.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.4/sysroot_fix.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.1/dolt-fix.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.1/hack-fbdev-ignore-return-mode.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.1/randr-support.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.99.906/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.99.906/dolt-fix.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.99.906/hack-fbdev-ignore-return-mode.patch
create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.99.906/randr-support.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg/dolt-fix.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg/drmfix.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg/fontfile.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg/freetype.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg/imake-installed.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg/randr-support-1.7.0.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch
delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.2.0.bb
delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb
delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.4.2.bb
delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.4.bb
delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.5.1.bb
delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.5.3.bb
diff --git a/recipes/obsolete/xorg-xserver/xorg-xserver-common.inc b/recipes/obsolete/xorg-xserver/xorg-xserver-common.inc
deleted file mode 100644
index 79905d2..0000000
--- a/recipes/obsolete/xorg-xserver/xorg-xserver-common.inc
+++ /dev/null
@@ -1,113 +0,0 @@
-HOMEPAGE = "http://www.x.org"
-SECTION = "x11/base"
-LICENSE = "MIT-X"
-
-INC_PR = "r14"
-
-PROVIDES = "virtual/xserver"
-
-# Config manager for xserver, options are: hal, udev, empty (for configuration in xorg.conf)
-DISTRO_XORG_CONFIG_MANAGER ?= "hal"
-DISTRO_XORG_CONFIG_MANAGER_shr ?= ""
-
-# default none, enabled by DISTRO_XORG_CONFIG_MANAGER setting
-CONFIG_MANAGER_OPTION += "${@['--disable-config-hal','--enable-config-hal',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['hal']]}"
-CONFIG_MANAGER_OPTION += "${@['--disable-config-udev','--enable-config-udev',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['udev']]}"
-
-DEPENDS = "fontconfig freetype flex-native liblbxutil kbproto \
-xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
-xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \
-scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
-xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \
-resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
-libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
-libxkbui libxxf86misc libxi libdmx libxtst libxres virtual/libgl libxcalibrate \
-libxv ${DISTRO_XORG_CONFIG_MANAGER}"
-
-RRECOMMENDS_${PN} = "libpciaccess"
-
-XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2;name=archive"
-
-S = "${WORKDIR}/${XORG_PN}-${PV}"
-
-inherit autotools pkgconfig glx-use-tls
-
-EXTRA_OECONF += " --enable-xcalibrate \
- --enable-kdrive \
- --enable-xephyr \
- --disable-xfbdev \
- --disable-xnest \
- --disable-kdrive-vesa \
- --with-default-font-path="/usr/share/fonts/X11/misc" \
- ac_cv_file__usr_share_sgml_X11_defs_ent=no"
-
-# CONFIG_MANAGER_OPTION is used only in recipes which support those options
-
-EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no "
-
-PACKAGES =+ "xserver-security-policy"
-FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
-RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb xserver-xorg-conf"
-
-PACKAGES =+ "${PN}-sdl ${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr"
-
-FILES_${PN}-fbdev = "${bindir}/Xfbdev"
-FILES_${PN}-sdl = "${bindir}/Xsdl"
-FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
-FILES_${PN}-xvfb = "${bindir}/Xvfb"
-FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules ${libdir}/xorg/modules /etc/X11 ${libdir}/xorg/protocol.txt"
-FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
-FILES_${PN}-xephyr = "${bindir}/Xephyr"
-
-FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
- ${libdir}/xorg/modules/*/.debug \
- ${libdir}/xorg/modules/*/*/.debug \
- "
-
-# Split out some modules and extensions from the main package
-# These aren't needed for basic operations and only take up space:
-# 32.0k libdri.so
-# 336.0k libglx.so
-# 1360k libint10.so
-# 180.0k libwfb.so
-# 320.0k libxaa.so
-# 124.0k libxf1bpp.so
-# 84.0k libxf4bpp.so
-
-PACKAGES =+ "${PN}-extension-dri \
- ${PN}-extension-dri2 \
- ${PN}-extension-glx \
- ${PN}-module-libint10 \
- ${PN}-module-libafb \
- ${PN}-module-libwfb \
- ${PN}-module-libmfb \
- ${PN}-module-libcfb \
- ${PN}-module-xaa \
- ${PN}-module-libxf1bpp \
- ${PN}-module-libxf4bpp"
-
-FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
-FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
-FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
-FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
-FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
-FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
-FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
-FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
-FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
-FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
-FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
-
-PACKAGES =+ "${PN}-multimedia-modules"
-
-FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
-
-do_stage() {
- autotools_stage_all
-}
-
-do_install_append () {
- ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
-}
diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch b/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
deleted file mode 100644
index 8ebda98..0000000
--- a/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
-
-Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
-===================================================================
---- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100
-+++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000
-@@ -40,7 +40,7 @@
-
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
-
--INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
-+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
-
- # FIXME: These need to be added to the build
- LNX_EXTRA_SRCS = \
diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch
deleted file mode 100644
index a947582..0000000
--- a/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/fb/fbcopy.c b/fb/fbcopy.c
-index 07eb663..ba394b7 100644
---- a/fb/fbcopy.c
-+++ b/fb/fbcopy.c
-@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable,
- while (nbox--)
- {
- #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */
-- if (pm == FB_ALLONES && alu == GXcopy && !reverse &&
-- !upsidedown)
-+ if (pm == FB_ALLONES && alu == GXcopy)
- {
- if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp,
- (pbox->x1 + dx + srcXoff),
diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/obsolete/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch
deleted file mode 100644
index a947582..0000000
--- a/recipes/obsolete/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/fb/fbcopy.c b/fb/fbcopy.c
-index 07eb663..ba394b7 100644
---- a/fb/fbcopy.c
-+++ b/fb/fbcopy.c
-@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable,
- while (nbox--)
- {
- #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */
-- if (pm == FB_ALLONES && alu == GXcopy && !reverse &&
-- !upsidedown)
-+ if (pm == FB_ALLONES && alu == GXcopy)
- {
- if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp,
- (pbox->x1 + dx + srcXoff),
diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb
deleted file mode 100644
index 630ec57..0000000
--- a/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require xorg-xserver-common.inc
-
-DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama"
-RDEPENDS_${PN} += "hal"
-PE = "2"
-PR = "${INC_PR}.2"
-
-SRC_URI += "file://sysroot_fix.patch \
- file://dolt-fix.patch"
-
-# This requires support in pixman, which the default one doesn't have
-SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
-
-MESA_VER = "7.2"
-
-export LDFLAGS += " -ldl "
-
-SRC_URI[archive.md5sum] = "ed0878bf32a24d4948c3b8a122a39eff"
-SRC_URI[archive.sha256sum] = "0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf"
diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb b/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb
deleted file mode 100644
index efe68d2..0000000
--- a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require xorg-xserver-common.inc
-
-DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
-PE = "2"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://sysroot_fix.patch \
- file://dolt-fix-1.7.0.patch \
- file://randr-support-1.7.0.patch \
- "
-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 "
-
-SRC_URI[archive.md5sum] = "5c087e0f555203065fd90d02ef5f736e"
-SRC_URI[archive.sha256sum] = "f4fb49209a6f3cb1c5b039b1f43870774e2eac1540b4d3235a2f13bc441da159"
diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb
deleted file mode 100644
index fc8c354..0000000
--- a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-require xorg-xserver-common.inc
-
-DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
-PE = "2"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://sysroot_fix.patch \
- file://dolt-fix-1.7.0.patch \
- file://randr-support-1.7.0.patch \
- file://hack-fbdev-ignore-return-mode.patch \
- "
-
-SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
-SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch"
-
-do_install_prepend() {
- mkdir -p ${D}/${libdir}/X11/fonts
-}
-
-# The NVidia driver requires Xinerama support in the X server. Ion uses it.
-XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
-
-EXTRA_OECONF += " --enable-config-hal ${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 "
-
-SRC_URI[archive.md5sum] = "4c63b22cad9ed8ae8b86561f0f92c327"
-SRC_URI[archive.sha256sum] = "4b644113cd030fc77615c03c7b6529e063dc1d471ec6a990e6f62eb45a9c2db4"
diff --git a/recipes/obsolete/xorg/xorg-xserver/files/xcalibrate-xorg.diff b/recipes/obsolete/xorg/xorg-xserver/files/xcalibrate-xorg.diff
new file mode 100644
index 0000000..65121ef
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/files/xcalibrate-xorg.diff
@@ -0,0 +1,11 @@
+--- /tmp/configure.ac 2008-10-29 18:53:23.000000000 +0100
++++ xorg-server-1.4.2/configure.ac 2008-10-29 18:53:40.000000000 +0100
+@@ -865,7 +865,7 @@
+ FONTPATH="built-ins"
+ fi
+
+-if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then
++if test "x$XCALIBRATE" = xyes ; then
+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto"
+ else
diff --git a/recipes/obsolete/xorg/xorg-xserver/xorg-xserver-common.inc b/recipes/obsolete/xorg/xorg-xserver/xorg-xserver-common.inc
new file mode 100644
index 0000000..79905d2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xorg-xserver-common.inc
@@ -0,0 +1,113 @@
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/base"
+LICENSE = "MIT-X"
+
+INC_PR = "r14"
+
+PROVIDES = "virtual/xserver"
+
+# Config manager for xserver, options are: hal, udev, empty (for configuration in xorg.conf)
+DISTRO_XORG_CONFIG_MANAGER ?= "hal"
+DISTRO_XORG_CONFIG_MANAGER_shr ?= ""
+
+# default none, enabled by DISTRO_XORG_CONFIG_MANAGER setting
+CONFIG_MANAGER_OPTION += "${@['--disable-config-hal','--enable-config-hal',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['hal']]}"
+CONFIG_MANAGER_OPTION += "${@['--disable-config-udev','--enable-config-udev',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['udev']]}"
+
+DEPENDS = "fontconfig freetype flex-native liblbxutil kbproto \
+xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
+xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \
+scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
+xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \
+resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
+libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
+libxkbui libxxf86misc libxi libdmx libxtst libxres virtual/libgl libxcalibrate \
+libxv ${DISTRO_XORG_CONFIG_MANAGER}"
+
+RRECOMMENDS_${PN} = "libpciaccess"
+
+XORG_PN = "xorg-server"
+SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2;name=archive"
+
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig glx-use-tls
+
+EXTRA_OECONF += " --enable-xcalibrate \
+ --enable-kdrive \
+ --enable-xephyr \
+ --disable-xfbdev \
+ --disable-xnest \
+ --disable-kdrive-vesa \
+ --with-default-font-path="/usr/share/fonts/X11/misc" \
+ ac_cv_file__usr_share_sgml_X11_defs_ent=no"
+
+# CONFIG_MANAGER_OPTION is used only in recipes which support those options
+
+EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no "
+
+PACKAGES =+ "xserver-security-policy"
+FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
+RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb xserver-xorg-conf"
+
+PACKAGES =+ "${PN}-sdl ${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr"
+
+FILES_${PN}-fbdev = "${bindir}/Xfbdev"
+FILES_${PN}-sdl = "${bindir}/Xsdl"
+FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
+FILES_${PN}-xvfb = "${bindir}/Xvfb"
+FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
+FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules ${libdir}/xorg/modules /etc/X11 ${libdir}/xorg/protocol.txt"
+FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
+FILES_${PN}-xephyr = "${bindir}/Xephyr"
+
+FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
+ ${libdir}/xorg/modules/*/.debug \
+ ${libdir}/xorg/modules/*/*/.debug \
+ "
+
+# Split out some modules and extensions from the main package
+# These aren't needed for basic operations and only take up space:
+# 32.0k libdri.so
+# 336.0k libglx.so
+# 1360k libint10.so
+# 180.0k libwfb.so
+# 320.0k libxaa.so
+# 124.0k libxf1bpp.so
+# 84.0k libxf4bpp.so
+
+PACKAGES =+ "${PN}-extension-dri \
+ ${PN}-extension-dri2 \
+ ${PN}-extension-glx \
+ ${PN}-module-libint10 \
+ ${PN}-module-libafb \
+ ${PN}-module-libwfb \
+ ${PN}-module-libmfb \
+ ${PN}-module-libcfb \
+ ${PN}-module-xaa \
+ ${PN}-module-libxf1bpp \
+ ${PN}-module-libxf4bpp"
+
+FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
+FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
+FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
+FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
+FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
+FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
+FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
+FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
+FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
+FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
+FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
+
+PACKAGES =+ "${PN}-multimedia-modules"
+
+FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
+
+do_stage() {
+ autotools_stage_all
+}
+
+do_install_append () {
+ ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
+}
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
new file mode 100644
index 0000000..72bdcda
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
@@ -0,0 +1,13 @@
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
+
+--- xorg-server-1.3.0.0.orig/hw/xfree86/os-support/linux/Makefile.am
++++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/Makefile.am
+@@ -38,7 +38,7 @@
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SOURCES = \
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
new file mode 100644
index 0000000..6dfe7ba
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
@@ -0,0 +1,15 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22133
+status: Rejected
+comment: It's a bit unclear if this patch was ever needed, but recent versions seem
+ to work fine without it.
+
+--- xorg-server-1.3.0.0/render/glyphstr.h~ 2006-09-18 03:04:18.000000000 -0300
++++ xorg-server-1.3.0.0/render/glyphstr.h 2008-02-03 22:14:23.187159732 -0200
+@@ -25,6 +25,7 @@
+ #ifndef _GLYPHSTR_H_
+ #define _GLYPHSTR_H_
+
++#include <X11/X.h>
+ #include <X11/extensions/renderproto.h>
+ #include "picture.h"
+ #include "screenint.h"
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
new file mode 100644
index 0000000..dde7637
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
@@ -0,0 +1,15 @@
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
+
+Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200
++++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100
+@@ -41,7 +41,7 @@
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4/drmfix.patch
new file mode 100644
index 0000000..dde7637
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.4/drmfix.patch
@@ -0,0 +1,15 @@
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
+
+Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200
++++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100
+@@ -41,7 +41,7 @@
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
new file mode 100644
index 0000000..8ebda98
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
@@ -0,0 +1,15 @@
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
+
+Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100
++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000
+@@ -40,7 +40,7 @@
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch
new file mode 100644
index 0000000..8ebda98
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch
@@ -0,0 +1,15 @@
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
+
+Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100
++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000
+@@ -40,7 +40,7 @@
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch
new file mode 100644
index 0000000..85db023
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch
@@ -0,0 +1,38 @@
+From ddb265e3c5e99065ceeef92ecb9fd94b4c3e169e Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniel@fooishbar.org>
+Date: Thu, 7 May 2009 14:23:25 +0200
+Subject: [PATCH 36/78] configure.ac: Add GLX_SYS_LIBS for Xvfb and Xnest
+
+This fixes the linking for these two when using DRI2, which requires
+DLOPEN_LIBS.
+(cherry picked from commit ae38151ddda9984effca5bb7c582540061201dce)
+
+Conflicts:
+
+ configure.ac
+---
+ configure.ac | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: xorg-server-1.5.3/configure.ac
+===================================================================
+--- xorg-server-1.5.3.orig/configure.ac 2008-11-05 11:46:15.000000000 -0800
++++ xorg-server-1.5.3/configure.ac 2009-09-14 19:48:11.043879237 -0700
+@@ -1215,7 +1215,7 @@
+
+ if test "x$XVFB" = xyes; then
+ XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
+- XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
++ XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
+ AC_SUBST([XVFB_LIBS])
+ AC_SUBST([XVFB_SYS_LIBS])
+ fi
+@@ -1233,7 +1233,7 @@
+
+ if test "x$XNEST" = xyes; then
+ XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB"
+- XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
++ XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
+ AC_SUBST([XNEST_LIBS])
+ AC_SUBST([XNEST_SYS_LIBS])
+ fi
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch
new file mode 100644
index 0000000..17eb0f5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch
@@ -0,0 +1,108 @@
+From 70df9cb2b93ed3d4b7d6e201a58951c9981bbc93 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Thu, 7 May 2009 14:19:22 +0200
+Subject: [PATCH 35/78] cherry-pick the rest of "glcore: prepare for dynamic loading"
+
+When f2c30a57e3c6169fbecdbb60ac24ad2a5e9aa8a4 was cherry-picked into the
+1.5 branch, some parts were lost. This commit brings the missing bits.
+
+Conflicts:
+
+ configure.ac
+---
+ configure.ac | 2 +-
+ hw/kdrive/ephyr/Makefile.am | 4 ++++
+ hw/kdrive/fake/Makefile.am | 4 ++++
+ hw/kdrive/fbdev/Makefile.am | 4 ++++
+ hw/kdrive/sdl/Makefile.am | 4 ++++
+ hw/kdrive/vesa/Makefile.am | 4 ++++
+ 6 files changed, 21 insertions(+), 1 deletions(-)
+
+Index: xorg-server-1.5.3/configure.ac
+===================================================================
+--- xorg-server-1.5.3.orig/configure.ac 2009-09-14 19:48:11.043879237 -0700
++++ xorg-server-1.5.3/configure.ac 2009-09-14 19:49:34.903881120 -0700
+@@ -1964,7 +1964,7 @@
+ KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
+ KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
+ KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
+- KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
++ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS"
+
+ # check if we can build Xephyr
+ PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
+Index: xorg-server-1.5.3/hw/kdrive/ephyr/Makefile.am
+===================================================================
+--- xorg-server-1.5.3.orig/hw/kdrive/ephyr/Makefile.am 2008-11-05 08:52:17.000000000 -0800
++++ xorg-server-1.5.3/hw/kdrive/ephyr/Makefile.am 2009-09-14 19:49:34.903881120 -0700
+@@ -67,6 +67,10 @@
+ Xephyr_SOURCES = \
+ ephyrinit.c
+
++if GLX
++Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
++endif
++
+ Xephyr_LDADD = \
+ libxephyr.a \
+ libxephyr-hostx.a \
+Index: xorg-server-1.5.3/hw/kdrive/fake/Makefile.am
+===================================================================
+--- xorg-server-1.5.3.orig/hw/kdrive/fake/Makefile.am 2008-07-11 08:12:13.000000000 -0700
++++ xorg-server-1.5.3/hw/kdrive/fake/Makefile.am 2009-09-14 19:49:34.903881120 -0700
+@@ -16,6 +16,10 @@
+ Xfake_SOURCES = \
+ fakeinit.c
+
++if GLX
++Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
++endif
++
+ Xfake_LDADD = \
+ libfake.a \
+ @KDRIVE_LIBS@ \
+Index: xorg-server-1.5.3/hw/kdrive/fbdev/Makefile.am
+===================================================================
+--- xorg-server-1.5.3.orig/hw/kdrive/fbdev/Makefile.am 2008-07-11 08:12:13.000000000 -0700
++++ xorg-server-1.5.3/hw/kdrive/fbdev/Makefile.am 2009-09-14 19:49:34.903881120 -0700
+@@ -14,6 +14,10 @@
+ Xfbdev_SOURCES = \
+ fbinit.c
+
++if GLX
++Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
++endif
++
+ Xfbdev_LDADD = \
+ libfbdev.a \
+ @KDRIVE_LIBS@
+Index: xorg-server-1.5.3/hw/kdrive/sdl/Makefile.am
+===================================================================
+--- xorg-server-1.5.3.orig/hw/kdrive/sdl/Makefile.am 2008-07-11 08:12:13.000000000 -0700
++++ xorg-server-1.5.3/hw/kdrive/sdl/Makefile.am 2009-09-14 19:49:34.903881120 -0700
+@@ -7,6 +7,10 @@
+
+ Xsdl_SOURCES = sdl.c
+
++if GLX
++Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
++endif
++
+ Xsdl_LDADD = \
+ @KDRIVE_LIBS@ \
+ @XSDL_LIBS@
+Index: xorg-server-1.5.3/hw/kdrive/vesa/Makefile.am
+===================================================================
+--- xorg-server-1.5.3.orig/hw/kdrive/vesa/Makefile.am 2008-11-05 08:52:17.000000000 -0800
++++ xorg-server-1.5.3/hw/kdrive/vesa/Makefile.am 2009-09-14 19:49:34.903881120 -0700
+@@ -19,6 +19,10 @@
+ Xvesa_SOURCES = \
+ vesainit.c
+
++if GLX
++Xvesa_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
++endif
++
+ Xvesa_LDADD = \
+ libvesa.a \
+ @KDRIVE_LIBS@
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
new file mode 100644
index 0000000..8ebda98
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
@@ -0,0 +1,15 @@
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
+
+Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100
++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000
+@@ -40,7 +40,7 @@
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch
new file mode 100644
index 0000000..a947582
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch
@@ -0,0 +1,14 @@
+diff --git a/fb/fbcopy.c b/fb/fbcopy.c
+index 07eb663..ba394b7 100644
+--- a/fb/fbcopy.c
++++ b/fb/fbcopy.c
+@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable,
+ while (nbox--)
+ {
+ #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */
+- if (pm == FB_ALLONES && alu == GXcopy && !reverse &&
+- !upsidedown)
++ if (pm == FB_ALLONES && alu == GXcopy)
+ {
+ if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp,
+ (pbox->x1 + dx + srcXoff),
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch
new file mode 100644
index 0000000..a947582
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch
@@ -0,0 +1,14 @@
+diff --git a/fb/fbcopy.c b/fb/fbcopy.c
+index 07eb663..ba394b7 100644
+--- a/fb/fbcopy.c
++++ b/fb/fbcopy.c
+@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable,
+ while (nbox--)
+ {
+ #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */
+- if (pm == FB_ALLONES && alu == GXcopy && !reverse &&
+- !upsidedown)
++ if (pm == FB_ALLONES && alu == GXcopy)
+ {
+ if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp,
+ (pbox->x1 + dx + srcXoff),
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/dolt-fix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/dolt-fix.patch
new file mode 100644
index 0000000..9e15f42
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/dolt-fix.patch
@@ -0,0 +1,22 @@
+Index: xorg-server-1.6.1/acinclude.m4
+===================================================================
+--- xorg-server-1.6.1.orig/acinclude.m4 2009-04-14 21:14:56.000000000 +0400
++++ xorg-server-1.6.1/acinclude.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__
+
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/drmfix.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/drmfix.patch
new file mode 100644
index 0000000..fcbeac0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/drmfix.patch
@@ -0,0 +1,15 @@
+upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
+
+Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/linux/Makefile.am
++++ xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
+@@ -24,7 +24,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_vid
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+
+-INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(LIBDRM_CFLAGS)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SOURCES = \
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/fontfile.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/fontfile.patch
new file mode 100644
index 0000000..ed39bf4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/fontfile.patch
@@ -0,0 +1,11 @@
+--- xc/lib/font/fontfile/Imakefile.old 2005-06-03 20:09:53.000000000 +0100
++++ xc/lib/font/fontfile/Imakefile 2005-06-03 20:09:57.000000000 +0100
+@@ -14,7 +14,7 @@
+ #endif
+
+ INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \
+- -I$(INCLUDESRC)
++ -I$(INCLUDESRC) $(CC_STAGING)
+ HEADERS =
+ #ifdef FontFormatDefines
+ FORMAT_DEFS = FontFormatDefines
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/freetype.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/freetype.patch
new file mode 100644
index 0000000..0ba3dd5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/freetype.patch
@@ -0,0 +1,22 @@
+--- xc/lib/font/FreeType/Imakefile.old 2005-06-03 20:18:51.000000000 +0100
++++ xc/lib/font/FreeType/Imakefile 2005-06-03 20:18:52.000000000 +0100
+@@ -20,7 +20,7 @@
+
+ INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \
+ -I$(SERVERSRC)/include $(EXTRAINCLUDES) \
+- -I$(INCLUDESRC)
++ -I$(INCLUDESRC) $(CC_STAGING)
+
+ SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c
+ OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o
+--- xc/config/cf/X11.tmpl.old 2005-06-03 20:40:24.000000000 +0100
++++ xc/config/cf/X11.tmpl 2005-06-03 20:40:40.000000000 +0100
+@@ -3371,7 +3371,7 @@
+
+ #if BuildFreetype2Library || HasFreetype2
+ #if Freetype2IncDirStandard
+-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
++FREETYPE2INCLUDES = `pkg-config --cflags freetype2`
+ #else
+ FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
+ #endif
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch
new file mode 100644
index 0000000..d3661cb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch
@@ -0,0 +1,39 @@
+Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1
+(and probably other) while returning from chvt or resume on some
+hardware (e. g. zaurus).
+
+Correct fix would require debugging of fbdev mode during LeaveVT and
+EnterVT.
+
+This patch may cause staying in incorrect or corrupted display mode
+after EnterVT, but on man affected devices it does not cause any visible
+problems.
+
+Hacked code is never called on properly written drivers.
+
+Devices affected and testers involved for future patch removal:
+Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz>
+
+See also:
+https://bugzilla.redhat.com/show_bug.cgi?id=238451
+
+The bug (first line indicates that your device is affected):
+
+(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode
+
+Fatal server error:
+EnterVT failed for screen 0
+
+Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
+===================================================================
+--- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c
++++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
+@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa
+ #if DEBUG
+ print_fbdev_mode("returned", &set_var);
+ #endif
+- return FALSE;
++ /* return FALSE; UGLY HACK to allow return from chvt */
+ }
+
+ if (!check)
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/imake-installed.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/imake-installed.patch
new file mode 100644
index 0000000..5782107
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/imake-installed.patch
@@ -0,0 +1,11 @@
+--- xc/config/cf/Imake.tmpl.old 2005-05-05 21:04:45.000000000 +0100
++++ xc/config/cf/Imake.tmpl 2005-05-05 21:04:49.000000000 +0100
+@@ -2058,7 +2058,7 @@
+ * INCLUDES contains client-specific includes set in Imakefile
+ * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
+ */
+- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
++ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/no-screen-blanking.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/no-screen-blanking.patch
new file mode 100644
index 0000000..cd7cbe3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/no-screen-blanking.patch
@@ -0,0 +1,15 @@
+upstream: not applicable to upstream
+
+--- xserver/include/site.h-orig 2006-11-02 10:37:14.000000000 +0000
++++ xserver/include/site.h 2006-11-02 10:37:14.000000000 +0000
+@@ -117,8 +117,8 @@
+ #define DEFAULT_PTR_DENOMINATOR 1
+ #define DEFAULT_PTR_THRESHOLD 4
+
+-#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000))
+-#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))
++#define DEFAULT_SCREEN_SAVER_TIME 0
++#define DEFAULT_SCREEN_SAVER_INTERVAL 0
+ #define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking
+ #define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures
+ #ifndef NOLOGOHACK
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch
new file mode 100644
index 0000000..17d05d3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch
@@ -0,0 +1,30 @@
+--- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am.orig 2006-06-23 10:20:42.126095128 -0600
++++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am 2006-06-23 10:20:50.923757680 -0600
+@@ -1,6 +1,6 @@
+ xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS/fonts
+
+-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
++parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+
+ XPFONTS = \
+ AvantGarde-Book.pmf \
+--- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am.orig 2006-06-23 10:21:02.877940368 -0600
++++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am 2006-06-23 10:21:11.903568264 -0600
+@@ -1,6 +1,6 @@
+ xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS/fonts
+
+-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
++parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+
+ XPFONTS = \
+ AvantGarde-Book.pmf \
+--- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am.orig 2006-06-23 10:21:22.893897480 -0600
++++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am 2006-06-23 10:21:28.412058592 -0600
+@@ -1,6 +1,6 @@
+ xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts
+
+-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
++parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+
+ XPFONTS = \
+ Courier-Bold.pmf \
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.2.0.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.2.0.bb
new file mode 100644
index 0000000..0b2e399
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.2.0.bb
@@ -0,0 +1,15 @@
+MESA_VER = "6.5.2"
+
+require xorg-xserver-common.inc
+PE = "1"
+PR = "${INC_PR}.1"
+
+export LDFLAGS += " -ldl "
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+SRC_URI += "file://report-correct-randr10.patch"
+SRC_URI[archive.md5sum] = "ea291c89e68832d570d9d5e007218bd6"
+SRC_URI[archive.sha256sum] = "e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85"
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.3.0.0.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.3.0.0.bb
new file mode 100644
index 0000000..c2ec4b1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.3.0.0.bb
@@ -0,0 +1,18 @@
+MESA_VER = "6.5.2"
+
+require xorg-xserver-common.inc
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI += "file://drmfix.patch \
+ file://glyphstr.patch \
+ file://report-correct-randr12.patch"
+
+export LDFLAGS += " -ldl "
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+SRC_URI[archive.md5sum] = "a51a7d482e3c689394755bb17bda8526"
+SRC_URI[archive.sha256sum] = "93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975"
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.2.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.2.bb
new file mode 100644
index 0000000..0f4f8e7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -0,0 +1,20 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman"
+RDEPENDS_${PN} += "hal"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI += "file://drmfix.patch \
+ file://pkgconfig_fix.patch \
+ file://sysroot_fix.patch \
+ file://xcalibrate-xorg.diff \
+"
+
+MESA_VER = "7.0.2"
+
+export LDFLAGS += " -ldl "
+
+SRC_URI[archive.md5sum] = "fa2915ae377f61c340a18ebef484b64b"
+SRC_URI[archive.sha256sum] = "829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d"
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.bb
new file mode 100644
index 0000000..f153212
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.4.bb
@@ -0,0 +1,18 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman"
+RDEPENDS_${PN} += "hal"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI += "file://drmfix.patch \
+ file://pkgconfig_fix.patch \
+ file://sysroot_fix.patch"
+
+MESA_VER = "7.0.2"
+
+export LDFLAGS += " -ldl "
+
+SRC_URI[archive.md5sum] = "a06d9fe4f9f1d459ae02657f9ce64220"
+SRC_URI[archive.sha256sum] = "51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2"
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.1.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.1.bb
new file mode 100644
index 0000000..b1eef4f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.1.bb
@@ -0,0 +1,17 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl"
+RDEPENDS_${PN} += "hal"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI += "file://drmfix.patch \
+ file://sysroot_fix.patch"
+
+MESA_VER = "7.2"
+
+export LDFLAGS += " -ldl "
+
+SRC_URI[archive.md5sum] = "d16f5a033f001c9069b4141194614da2"
+SRC_URI[archive.sha256sum] = "2f36880bffaee0a5b2b704376a02b22066b6842445e1d77da698854e5973eb21"
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.3.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.3.bb
new file mode 100644
index 0000000..776b87f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.5.3.bb
@@ -0,0 +1,21 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl"
+RDEPENDS_${PN} += "hal"
+PE = "2"
+PR = "${INC_PR}.2"
+
+SRC_URI += "file://drmfix.patch \
+ file://sysroot_fix.patch \
+ file://xorg-avr32-support.diff \
+ file://xorg-server-1.5.3-configure.patch \
+ file://xorg-server-1.5.3-glcore-prepare-for-dynamic.patch \
+"
+
+MESA_VER = "7.2"
+
+export LDFLAGS += " -ldl "
+
+SRC_URI[archive.md5sum] = "308971036e25250e7fe3cccfd5a120f8"
+SRC_URI[archive.sha256sum] = "a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb"
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.6.1.bb
new file mode 100644
index 0000000..630ec57
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.6.1.bb
@@ -0,0 +1,20 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama"
+RDEPENDS_${PN} += "hal"
+PE = "2"
+PR = "${INC_PR}.2"
+
+SRC_URI += "file://sysroot_fix.patch \
+ file://dolt-fix.patch"
+
+# This requires support in pixman, which the default one doesn't have
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
+
+MESA_VER = "7.2"
+
+export LDFLAGS += " -ldl "
+
+SRC_URI[archive.md5sum] = "ed0878bf32a24d4948c3b8a122a39eff"
+SRC_URI[archive.sha256sum] = "0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf"
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.2.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.2.bb
new file mode 100644
index 0000000..efe68d2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.2.bb
@@ -0,0 +1,22 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
+PE = "2"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://sysroot_fix.patch \
+ file://dolt-fix-1.7.0.patch \
+ file://randr-support-1.7.0.patch \
+ "
+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 "
+
+SRC_URI[archive.md5sum] = "5c087e0f555203065fd90d02ef5f736e"
+SRC_URI[archive.sha256sum] = "f4fb49209a6f3cb1c5b039b1f43870774e2eac1540b4d3235a2f13bc441da159"
diff --git a/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.3.bb
new file mode 100644
index 0000000..fc8c354
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-xserver/xserver-xorg_1.7.3.bb
@@ -0,0 +1,30 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
+PE = "2"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://sysroot_fix.patch \
+ file://dolt-fix-1.7.0.patch \
+ file://randr-support-1.7.0.patch \
+ file://hack-fbdev-ignore-return-mode.patch \
+ "
+
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch"
+SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch"
+
+do_install_prepend() {
+ mkdir -p ${D}/${libdir}/X11/fonts
+}
+
+# The NVidia driver requires Xinerama support in the X server. Ion uses it.
+XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
+
+EXTRA_OECONF += " --enable-config-hal ${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 "
+
+SRC_URI[archive.md5sum] = "4c63b22cad9ed8ae8b86561f0f92c327"
+SRC_URI[archive.sha256sum] = "4b644113cd030fc77615c03c7b6529e063dc1d471ec6a990e6f62eb45a9c2db4"
diff --git a/recipes/xorg-xserver/files/fix-picturestr-include-order.patch b/recipes/xorg-xserver/files/fix-picturestr-include-order.patch
deleted file mode 100644
index 3da235e..0000000
--- a/recipes/xorg-xserver/files/fix-picturestr-include-order.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3
-Index: xorg-server-1.2.0/render/picturestr.h
-===================================================================
---- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100
-+++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100
-@@ -26,8 +26,8 @@
- #ifndef _PICTURESTR_H_
- #define _PICTURESTR_H_
-
--#include "glyphstr.h"
- #include "scrnintstr.h"
-+#include "glyphstr.h"
- #include "resource.h"
-
- typedef struct _DirectFormat {
diff --git a/recipes/xorg-xserver/files/pkgconfig_fix.patch b/recipes/xorg-xserver/files/pkgconfig_fix.patch
deleted file mode 100644
index e75e209..0000000
--- a/recipes/xorg-xserver/files/pkgconfig_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xorg-server-1.4/xorg-server.pc.in
-===================================================================
---- xorg-server-1.4.orig/xorg-server.pc.in 2008-02-29 12:29:02.000000000 +0000
-+++ xorg-server-1.4/xorg-server.pc.in 2008-02-29 12:27:36.000000000 +0000
-@@ -7,6 +7,7 @@
-
- Name: xorg-server
- Description: Modular X.Org X Server
-+Requires: pixman-1
- Version: @PACKAGE_VERSION@
--Cflags: -I${sdkdir} @PIXMAN_CFLAGS@
-+Cflags: -I${sdkdir}
- Libs: -L${libdir}
diff --git a/recipes/xorg-xserver/files/report-correct-randr10.patch b/recipes/xorg-xserver/files/report-correct-randr10.patch
deleted file mode 100644
index 540f598..0000000
--- a/recipes/xorg-xserver/files/report-correct-randr10.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: xorg-server-1.1.0/randr/randr.c
-===================================================================
---- xorg-server-1.1.0.orig/randr/randr.c
-+++ xorg-server-1.1.0/randr/randr.c
-@@ -56,6 +56,9 @@
- #define SubPixelUnknown 0
- #endif
-
-+#define SERVER_RANDR_MAJOR 1
-+#define SERVER_RANDR_MINOR 0
-+
- #define RR_VALIDATE
- int RRGeneration;
- int RRNScreens;
-@@ -473,8 +476,8 @@ ProcRRQueryVersion (ClientPtr client)
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
-- rep.majorVersion = RANDR_MAJOR;
-- rep.minorVersion = RANDR_MINOR;
-+ rep.majorVersion = SERVER_RANDR_MAJOR;
-+ rep.minorVersion = SERVER_RANDR_MINOR;
- if (client->swapped) {
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
diff --git a/recipes/xorg-xserver/files/report-correct-randr12.patch b/recipes/xorg-xserver/files/report-correct-randr12.patch
deleted file mode 100644
index 72c8a18..0000000
--- a/recipes/xorg-xserver/files/report-correct-randr12.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Server reports XRandR version provided by libxrandr instead of XRandR
-version implemented. It confuses applications that execute XRandR
-version dependent code (e. g. gtk+ >= 2.18.0).
-
-Index: xorg-server-1.3.0.0/randr/rrdispatch.c
-===================================================================
---- xorg-server-1.3.0.0.orig/randr/rrdispatch.c
-+++ xorg-server-1.3.0.0/randr/rrdispatch.c
-@@ -22,6 +22,9 @@
-
- #include "randrstr.h"
-
-+#define SERVER_RANDR_MAJOR 1
-+#define SERVER_RANDR_MINOR 2
-+
- Bool
- RRClientKnowsRates (ClientPtr pClient)
- {
-@@ -49,8 +52,8 @@ ProcRRQueryVersion (ClientPtr client)
- * Report the current version; the current
- * spec says they're all compatible after 1.0
- */
-- rep.majorVersion = RANDR_MAJOR;
-- rep.minorVersion = RANDR_MINOR;
-+ rep.majorVersion = SERVER_RANDR_MAJOR;
-+ rep.minorVersion = SERVER_RANDR_MINOR;
- if (client->swapped) {
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
diff --git a/recipes/xorg-xserver/files/sysroot_fix.patch b/recipes/xorg-xserver/files/sysroot_fix.patch
deleted file mode 100644
index 59753d5..0000000
--- a/recipes/xorg-xserver/files/sysroot_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xorg-server-1.4/xorg-server.m4
-===================================================================
---- xorg-server-1.4.orig/xorg-server.m4 2008-03-15 20:09:36.000000000 +0100
-+++ xorg-server-1.4/xorg-server.m4 2008-03-15 20:09:51.000000000 +0100
-@@ -30,7 +30,7 @@
-
- AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
-+ CFLAGS="$CFLAGS `pkg-config --cflags xorg-server`"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include "xorg-server.h"
- #if !defined $1
diff --git a/recipes/xorg-xserver/files/xcalibrate-xorg.diff b/recipes/xorg-xserver/files/xcalibrate-xorg.diff
deleted file mode 100644
index 65121ef..0000000
--- a/recipes/xorg-xserver/files/xcalibrate-xorg.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/configure.ac 2008-10-29 18:53:23.000000000 +0100
-+++ xorg-server-1.4.2/configure.ac 2008-10-29 18:53:40.000000000 +0100
-@@ -865,7 +865,7 @@
- FONTPATH="built-ins"
- fi
-
--if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then
-+if test "x$XCALIBRATE" = xyes ; then
- AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
- REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto"
- else
diff --git a/recipes/xorg-xserver/files/xorg-avr32-support.diff b/recipes/xorg-xserver/files/xorg-avr32-support.diff
deleted file mode 100644
index 583191e..0000000
--- a/recipes/xorg-xserver/files/xorg-avr32-support.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-upstream: applied in 82b37d35af13a9f402755e167493ab256b664b9c (2008-04-22)
-
---- /tmp/servermd.h 2007-09-30 17:27:22.310911628 +0200
-+++ xorg-server-1.4/include/servermd.h 2007-09-30 17:28:25.297799199 +0200
-@@ -130,6 +130,16 @@
-
- #endif /* vax */
-
-+#ifdef __avr32__
-+
-+#define IMAGE_BYTE_ORDER MSBFirst
-+#define BITMAP_BIT_ORDER MSBFirst
-+#define GLYPHPADBYTES 4
-+#define GETLEFTBITS_ALIGNMENT 1
-+#define AVOID_MEMORY_READ
-+
-+#endif /* __avr32__ */
-+
- #ifdef __arm32__
-
- #define IMAGE_BYTE_ORDER LSBFirst
diff --git a/recipes/xorg-xserver/xserver-kdrive-1.3.0.0/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-1.3.0.0/fix-picturestr-include-order.patch
new file mode 100644
index 0000000..3da235e
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.3.0.0/fix-picturestr-include-order.patch
@@ -0,0 +1,15 @@
+# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3
+Index: xorg-server-1.2.0/render/picturestr.h
+===================================================================
+--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100
++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100
+@@ -26,8 +26,8 @@
+ #ifndef _PICTURESTR_H_
+ #define _PICTURESTR_H_
+
+-#include "glyphstr.h"
+ #include "scrnintstr.h"
++#include "glyphstr.h"
+ #include "resource.h"
+
+ typedef struct _DirectFormat {
diff --git a/recipes/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch b/recipes/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch
new file mode 100644
index 0000000..72c8a18
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch
@@ -0,0 +1,29 @@
+Server reports XRandR version provided by libxrandr instead of XRandR
+version implemented. It confuses applications that execute XRandR
+version dependent code (e. g. gtk+ >= 2.18.0).
+
+Index: xorg-server-1.3.0.0/randr/rrdispatch.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/randr/rrdispatch.c
++++ xorg-server-1.3.0.0/randr/rrdispatch.c
+@@ -22,6 +22,9 @@
+
+ #include "randrstr.h"
+
++#define SERVER_RANDR_MAJOR 1
++#define SERVER_RANDR_MINOR 2
++
+ Bool
+ RRClientKnowsRates (ClientPtr pClient)
+ {
+@@ -49,8 +52,8 @@ ProcRRQueryVersion (ClientPtr client)
+ * Report the current version; the current
+ * spec says they're all compatible after 1.0
+ */
+- rep.majorVersion = RANDR_MAJOR;
+- rep.minorVersion = RANDR_MINOR;
++ rep.majorVersion = SERVER_RANDR_MAJOR;
++ rep.minorVersion = SERVER_RANDR_MINOR;
+ if (client->swapped) {
+ swaps(&rep.sequenceNumber, n);
+ swapl(&rep.length, n);
diff --git a/recipes/xorg-xserver/xserver-kdrive-1.5.3/sysroot_fix.patch b/recipes/xorg-xserver/xserver-kdrive-1.5.3/sysroot_fix.patch
new file mode 100644
index 0000000..59753d5
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.5.3/sysroot_fix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4/xorg-server.m4
+===================================================================
+--- xorg-server-1.4.orig/xorg-server.m4 2008-03-15 20:09:36.000000000 +0100
++++ xorg-server-1.4/xorg-server.m4 2008-03-15 20:09:51.000000000 +0100
+@@ -30,7 +30,7 @@
+
+ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+ SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
++ CFLAGS="$CFLAGS `pkg-config --cflags xorg-server`"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "xorg-server.h"
+ #if !defined $1
diff --git a/recipes/xorg-xserver/xserver-kdrive-imageon/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-imageon/fix-picturestr-include-order.patch
new file mode 100644
index 0000000..3da235e
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-imageon/fix-picturestr-include-order.patch
@@ -0,0 +1,15 @@
+# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3
+Index: xorg-server-1.2.0/render/picturestr.h
+===================================================================
+--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100
++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100
+@@ -26,8 +26,8 @@
+ #ifndef _PICTURESTR_H_
+ #define _PICTURESTR_H_
+
+-#include "glyphstr.h"
+ #include "scrnintstr.h"
++#include "glyphstr.h"
+ #include "resource.h"
+
+ typedef struct _DirectFormat {
diff --git a/recipes/xorg-xserver/xserver-kdrive-imageon/report-correct-randr10.patch b/recipes/xorg-xserver/xserver-kdrive-imageon/report-correct-randr10.patch
new file mode 100644
index 0000000..540f598
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-imageon/report-correct-randr10.patch
@@ -0,0 +1,25 @@
+Index: xorg-server-1.1.0/randr/randr.c
+===================================================================
+--- xorg-server-1.1.0.orig/randr/randr.c
++++ xorg-server-1.1.0/randr/randr.c
+@@ -56,6 +56,9 @@
+ #define SubPixelUnknown 0
+ #endif
+
++#define SERVER_RANDR_MAJOR 1
++#define SERVER_RANDR_MINOR 0
++
+ #define RR_VALIDATE
+ int RRGeneration;
+ int RRNScreens;
+@@ -473,8 +476,8 @@ ProcRRQueryVersion (ClientPtr client)
+ rep.type = X_Reply;
+ rep.length = 0;
+ rep.sequenceNumber = client->sequence;
+- rep.majorVersion = RANDR_MAJOR;
+- rep.minorVersion = RANDR_MINOR;
++ rep.majorVersion = SERVER_RANDR_MAJOR;
++ rep.minorVersion = SERVER_RANDR_MINOR;
+ if (client->swapped) {
+ swaps(&rep.sequenceNumber, n);
+ swapl(&rep.length, n);
diff --git a/recipes/xorg-xserver/xserver-kdrive-nomadik/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-nomadik/fix-picturestr-include-order.patch
new file mode 100644
index 0000000..3da235e
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-nomadik/fix-picturestr-include-order.patch
@@ -0,0 +1,15 @@
+# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3
+Index: xorg-server-1.2.0/render/picturestr.h
+===================================================================
+--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100
++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100
+@@ -26,8 +26,8 @@
+ #ifndef _PICTURESTR_H_
+ #define _PICTURESTR_H_
+
+-#include "glyphstr.h"
+ #include "scrnintstr.h"
++#include "glyphstr.h"
+ #include "resource.h"
+
+ typedef struct _DirectFormat {
diff --git a/recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch
new file mode 100644
index 0000000..3da235e
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch
@@ -0,0 +1,15 @@
+# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3
+Index: xorg-server-1.2.0/render/picturestr.h
+===================================================================
+--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100
++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100
+@@ -26,8 +26,8 @@
+ #ifndef _PICTURESTR_H_
+ #define _PICTURESTR_H_
+
+-#include "glyphstr.h"
+ #include "scrnintstr.h"
++#include "glyphstr.h"
+ #include "resource.h"
+
+ typedef struct _DirectFormat {
diff --git a/recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch b/recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch
new file mode 100644
index 0000000..540f598
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch
@@ -0,0 +1,25 @@
+Index: xorg-server-1.1.0/randr/randr.c
+===================================================================
+--- xorg-server-1.1.0.orig/randr/randr.c
++++ xorg-server-1.1.0/randr/randr.c
+@@ -56,6 +56,9 @@
+ #define SubPixelUnknown 0
+ #endif
+
++#define SERVER_RANDR_MAJOR 1
++#define SERVER_RANDR_MINOR 0
++
+ #define RR_VALIDATE
+ int RRGeneration;
+ int RRNScreens;
+@@ -473,8 +476,8 @@ ProcRRQueryVersion (ClientPtr client)
+ rep.type = X_Reply;
+ rep.length = 0;
+ rep.sequenceNumber = client->sequence;
+- rep.majorVersion = RANDR_MAJOR;
+- rep.minorVersion = RANDR_MINOR;
++ rep.majorVersion = SERVER_RANDR_MAJOR;
++ rep.minorVersion = SERVER_RANDR_MINOR;
+ if (client->swapped) {
+ swaps(&rep.sequenceNumber, n);
+ swapl(&rep.length, n);
diff --git a/recipes/xorg-xserver/xserver-kdrive/pkgconfig_fix.patch b/recipes/xorg-xserver/xserver-kdrive/pkgconfig_fix.patch
new file mode 100644
index 0000000..e75e209
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive/pkgconfig_fix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4/xorg-server.pc.in
+===================================================================
+--- xorg-server-1.4.orig/xorg-server.pc.in 2008-02-29 12:29:02.000000000 +0000
++++ xorg-server-1.4/xorg-server.pc.in 2008-02-29 12:27:36.000000000 +0000
+@@ -7,6 +7,7 @@
+
+ Name: xorg-server
+ Description: Modular X.Org X Server
++Requires: pixman-1
+ Version: @PACKAGE_VERSION@
+-Cflags: -I${sdkdir} @PIXMAN_CFLAGS@
++Cflags: -I${sdkdir}
+ Libs: -L${libdir}
diff --git a/recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch b/recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch
new file mode 100644
index 0000000..540f598
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch
@@ -0,0 +1,25 @@
+Index: xorg-server-1.1.0/randr/randr.c
+===================================================================
+--- xorg-server-1.1.0.orig/randr/randr.c
++++ xorg-server-1.1.0/randr/randr.c
+@@ -56,6 +56,9 @@
+ #define SubPixelUnknown 0
+ #endif
+
++#define SERVER_RANDR_MAJOR 1
++#define SERVER_RANDR_MINOR 0
++
+ #define RR_VALIDATE
+ int RRGeneration;
+ int RRNScreens;
+@@ -473,8 +476,8 @@ ProcRRQueryVersion (ClientPtr client)
+ rep.type = X_Reply;
+ rep.length = 0;
+ rep.sequenceNumber = client->sequence;
+- rep.majorVersion = RANDR_MAJOR;
+- rep.minorVersion = RANDR_MINOR;
++ rep.majorVersion = SERVER_RANDR_MAJOR;
++ rep.minorVersion = SERVER_RANDR_MINOR;
+ if (client->swapped) {
+ swaps(&rep.sequenceNumber, n);
+ swapl(&rep.length, n);
diff --git a/recipes/xorg-xserver/xserver-kdrive/xorg-avr32-support.diff b/recipes/xorg-xserver/xserver-kdrive/xorg-avr32-support.diff
new file mode 100644
index 0000000..583191e
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive/xorg-avr32-support.diff
@@ -0,0 +1,21 @@
+upstream: applied in 82b37d35af13a9f402755e167493ab256b664b9c (2008-04-22)
+
+--- /tmp/servermd.h 2007-09-30 17:27:22.310911628 +0200
++++ xorg-server-1.4/include/servermd.h 2007-09-30 17:28:25.297799199 +0200
+@@ -130,6 +130,16 @@
+
+ #endif /* vax */
+
++#ifdef __avr32__
++
++#define IMAGE_BYTE_ORDER MSBFirst
++#define BITMAP_BIT_ORDER MSBFirst
++#define GLYPHPADBYTES 4
++#define GETLEFTBITS_ALIGNMENT 1
++#define AVOID_MEMORY_READ
++
++#endif /* __avr32__ */
++
+ #ifdef __arm32__
+
+ #define IMAGE_BYTE_ORDER LSBFirst
diff --git a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
deleted file mode 100644
index 72bdcda..0000000
--- a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
-
---- xorg-server-1.3.0.0.orig/hw/xfree86/os-support/linux/Makefile.am
-+++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/Makefile.am
-@@ -38,7 +38,7 @@
-
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES)
-
--INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
-+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
-
- # FIXME: These need to be added to the build
- LNX_EXTRA_SOURCES = \
diff --git a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
deleted file mode 100644
index 6dfe7ba..0000000
--- a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22133
-status: Rejected
-comment: It's a bit unclear if this patch was ever needed, but recent versions seem
- to work fine without it.
-
---- xorg-server-1.3.0.0/render/glyphstr.h~ 2006-09-18 03:04:18.000000000 -0300
-+++ xorg-server-1.3.0.0/render/glyphstr.h 2008-02-03 22:14:23.187159732 -0200
-@@ -25,6 +25,7 @@
- #ifndef _GLYPHSTR_H_
- #define _GLYPHSTR_H_
-
-+#include <X11/X.h>
- #include <X11/extensions/renderproto.h>
- #include "picture.h"
- #include "screenint.h"
diff --git a/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
deleted file mode 100644
index dde7637..0000000
--- a/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
-
-Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
-===================================================================
---- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200
-+++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100
-@@ -41,7 +41,7 @@
-
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
-
--INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
-+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
-
- # FIXME: These need to be added to the build
- LNX_EXTRA_SRCS = \
diff --git a/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch
deleted file mode 100644
index dde7637..0000000
--- a/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
-
-Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
-===================================================================
---- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200
-+++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100
-@@ -41,7 +41,7 @@
-
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
-
--INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
-+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
-
- # FIXME: These need to be added to the build
- LNX_EXTRA_SRCS = \
diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
deleted file mode 100644
index 8ebda98..0000000
--- a/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
-
-Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
-===================================================================
---- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100
-+++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000
-@@ -40,7 +40,7 @@
-
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
-
--INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
-+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
-
- # FIXME: These need to be added to the build
- LNX_EXTRA_SRCS = \
diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch
deleted file mode 100644
index 8ebda98..0000000
--- a/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
-
-Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
-===================================================================
---- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100
-+++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000
-@@ -40,7 +40,7 @@
-
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
-
--INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
-+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
-
- # FIXME: These need to be added to the build
- LNX_EXTRA_SRCS = \
diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch b/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch
deleted file mode 100644
index 85db023..0000000
--- a/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ddb265e3c5e99065ceeef92ecb9fd94b4c3e169e Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniel@fooishbar.org>
-Date: Thu, 7 May 2009 14:23:25 +0200
-Subject: [PATCH 36/78] configure.ac: Add GLX_SYS_LIBS for Xvfb and Xnest
-
-This fixes the linking for these two when using DRI2, which requires
-DLOPEN_LIBS.
-(cherry picked from commit ae38151ddda9984effca5bb7c582540061201dce)
-
-Conflicts:
-
- configure.ac
----
- configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: xorg-server-1.5.3/configure.ac
-===================================================================
---- xorg-server-1.5.3.orig/configure.ac 2008-11-05 11:46:15.000000000 -0800
-+++ xorg-server-1.5.3/configure.ac 2009-09-14 19:48:11.043879237 -0700
-@@ -1215,7 +1215,7 @@
-
- if test "x$XVFB" = xyes; then
- XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
-- XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
-+ XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
- AC_SUBST([XVFB_LIBS])
- AC_SUBST([XVFB_SYS_LIBS])
- fi
-@@ -1233,7 +1233,7 @@
-
- if test "x$XNEST" = xyes; then
- XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB"
-- XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
-+ XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
- AC_SUBST([XNEST_LIBS])
- AC_SUBST([XNEST_SYS_LIBS])
- fi
diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch b/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch
deleted file mode 100644
index 17eb0f5..0000000
--- a/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 70df9cb2b93ed3d4b7d6e201a58951c9981bbc93 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Thu, 7 May 2009 14:19:22 +0200
-Subject: [PATCH 35/78] cherry-pick the rest of "glcore: prepare for dynamic loading"
-
-When f2c30a57e3c6169fbecdbb60ac24ad2a5e9aa8a4 was cherry-picked into the
-1.5 branch, some parts were lost. This commit brings the missing bits.
-
-Conflicts:
-
- configure.ac
----
- configure.ac | 2 +-
- hw/kdrive/ephyr/Makefile.am | 4 ++++
- hw/kdrive/fake/Makefile.am | 4 ++++
- hw/kdrive/fbdev/Makefile.am | 4 ++++
- hw/kdrive/sdl/Makefile.am | 4 ++++
- hw/kdrive/vesa/Makefile.am | 4 ++++
- 6 files changed, 21 insertions(+), 1 deletions(-)
-
-Index: xorg-server-1.5.3/configure.ac
-===================================================================
---- xorg-server-1.5.3.orig/configure.ac 2009-09-14 19:48:11.043879237 -0700
-+++ xorg-server-1.5.3/configure.ac 2009-09-14 19:49:34.903881120 -0700
-@@ -1964,7 +1964,7 @@
- KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
- KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
- KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
-- KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
-+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS"
-
- # check if we can build Xephyr
- PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
-Index: xorg-server-1.5.3/hw/kdrive/ephyr/Makefile.am
-===================================================================
---- xorg-server-1.5.3.orig/hw/kdrive/ephyr/Makefile.am 2008-11-05 08:52:17.000000000 -0800
-+++ xorg-server-1.5.3/hw/kdrive/ephyr/Makefile.am 2009-09-14 19:49:34.903881120 -0700
-@@ -67,6 +67,10 @@
- Xephyr_SOURCES = \
- ephyrinit.c
-
-+if GLX
-+Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-+endif
-+
- Xephyr_LDADD = \
- libxephyr.a \
- libxephyr-hostx.a \
-Index: xorg-server-1.5.3/hw/kdrive/fake/Makefile.am
-===================================================================
---- xorg-server-1.5.3.orig/hw/kdrive/fake/Makefile.am 2008-07-11 08:12:13.000000000 -0700
-+++ xorg-server-1.5.3/hw/kdrive/fake/Makefile.am 2009-09-14 19:49:34.903881120 -0700
-@@ -16,6 +16,10 @@
- Xfake_SOURCES = \
- fakeinit.c
-
-+if GLX
-+Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-+endif
-+
- Xfake_LDADD = \
- libfake.a \
- @KDRIVE_LIBS@ \
-Index: xorg-server-1.5.3/hw/kdrive/fbdev/Makefile.am
-===================================================================
---- xorg-server-1.5.3.orig/hw/kdrive/fbdev/Makefile.am 2008-07-11 08:12:13.000000000 -0700
-+++ xorg-server-1.5.3/hw/kdrive/fbdev/Makefile.am 2009-09-14 19:49:34.903881120 -0700
-@@ -14,6 +14,10 @@
- Xfbdev_SOURCES = \
- fbinit.c
-
-+if GLX
-+Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-+endif
-+
- Xfbdev_LDADD = \
- libfbdev.a \
- @KDRIVE_LIBS@
-Index: xorg-server-1.5.3/hw/kdrive/sdl/Makefile.am
-===================================================================
---- xorg-server-1.5.3.orig/hw/kdrive/sdl/Makefile.am 2008-07-11 08:12:13.000000000 -0700
-+++ xorg-server-1.5.3/hw/kdrive/sdl/Makefile.am 2009-09-14 19:49:34.903881120 -0700
-@@ -7,6 +7,10 @@
-
- Xsdl_SOURCES = sdl.c
-
-+if GLX
-+Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-+endif
-+
- Xsdl_LDADD = \
- @KDRIVE_LIBS@ \
- @XSDL_LIBS@
-Index: xorg-server-1.5.3/hw/kdrive/vesa/Makefile.am
-===================================================================
---- xorg-server-1.5.3.orig/hw/kdrive/vesa/Makefile.am 2008-11-05 08:52:17.000000000 -0800
-+++ xorg-server-1.5.3/hw/kdrive/vesa/Makefile.am 2009-09-14 19:49:34.903881120 -0700
-@@ -19,6 +19,10 @@
- Xvesa_SOURCES = \
- vesainit.c
-
-+if GLX
-+Xvesa_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-+endif
-+
- Xvesa_LDADD = \
- libvesa.a \
- @KDRIVE_LIBS@
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.1/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.7.1/dolt-fix.patch
new file mode 100644
index 0000000..e332ce0
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.7.1/dolt-fix.patch
@@ -0,0 +1,22 @@
+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__
+
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.1/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.7.1/randr-support.patch
new file mode 100644
index 0000000..fb8d381
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.7.1/randr-support.patch
@@ -0,0 +1,96 @@
+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;
+ }
+
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.1/sysroot_fix.patch b/recipes/xorg-xserver/xserver-xorg-1.7.1/sysroot_fix.patch
new file mode 100644
index 0000000..59753d5
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.7.1/sysroot_fix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4/xorg-server.m4
+===================================================================
+--- xorg-server-1.4.orig/xorg-server.m4 2008-03-15 20:09:36.000000000 +0100
++++ xorg-server-1.4/xorg-server.m4 2008-03-15 20:09:51.000000000 +0100
+@@ -30,7 +30,7 @@
+
+ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+ SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
++ CFLAGS="$CFLAGS `pkg-config --cflags xorg-server`"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "xorg-server.h"
+ #if !defined $1
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.4/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/dolt-fix.patch
new file mode 100644
index 0000000..e332ce0
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/dolt-fix.patch
@@ -0,0 +1,22 @@
+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__
+
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-fbdev-ignore-return-mode.patch
new file mode 100644
index 0000000..d3661cb
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-fbdev-ignore-return-mode.patch
@@ -0,0 +1,39 @@
+Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1
+(and probably other) while returning from chvt or resume on some
+hardware (e. g. zaurus).
+
+Correct fix would require debugging of fbdev mode during LeaveVT and
+EnterVT.
+
+This patch may cause staying in incorrect or corrupted display mode
+after EnterVT, but on man affected devices it does not cause any visible
+problems.
+
+Hacked code is never called on properly written drivers.
+
+Devices affected and testers involved for future patch removal:
+Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz>
+
+See also:
+https://bugzilla.redhat.com/show_bug.cgi?id=238451
+
+The bug (first line indicates that your device is affected):
+
+(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode
+
+Fatal server error:
+EnterVT failed for screen 0
+
+Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
+===================================================================
+--- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c
++++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
+@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa
+ #if DEBUG
+ print_fbdev_mode("returned", &set_var);
+ #endif
+- return FALSE;
++ /* return FALSE; UGLY HACK to allow return from chvt */
+ }
+
+ if (!check)
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.4/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/randr-support.patch
new file mode 100644
index 0000000..fb8d381
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/randr-support.patch
@@ -0,0 +1,96 @@
+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;
+ }
+
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.4/sysroot_fix.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/sysroot_fix.patch
new file mode 100644
index 0000000..59753d5
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/sysroot_fix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4/xorg-server.m4
+===================================================================
+--- xorg-server-1.4.orig/xorg-server.m4 2008-03-15 20:09:36.000000000 +0100
++++ xorg-server-1.4/xorg-server.m4 2008-03-15 20:09:51.000000000 +0100
+@@ -30,7 +30,7 @@
+
+ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+ SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
++ CFLAGS="$CFLAGS `pkg-config --cflags xorg-server`"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "xorg-server.h"
+ #if !defined $1
diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.1/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.8.1/dolt-fix.patch
new file mode 100644
index 0000000..e332ce0
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.8.1/dolt-fix.patch
@@ -0,0 +1,22 @@
+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__
+
diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.1/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.8.1/hack-fbdev-ignore-return-mode.patch
new file mode 100644
index 0000000..d3661cb
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.8.1/hack-fbdev-ignore-return-mode.patch
@@ -0,0 +1,39 @@
+Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1
+(and probably other) while returning from chvt or resume on some
+hardware (e. g. zaurus).
+
+Correct fix would require debugging of fbdev mode during LeaveVT and
+EnterVT.
+
+This patch may cause staying in incorrect or corrupted display mode
+after EnterVT, but on man affected devices it does not cause any visible
+problems.
+
+Hacked code is never called on properly written drivers.
+
+Devices affected and testers involved for future patch removal:
+Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz>
+
+See also:
+https://bugzilla.redhat.com/show_bug.cgi?id=238451
+
+The bug (first line indicates that your device is affected):
+
+(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode
+
+Fatal server error:
+EnterVT failed for screen 0
+
+Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
+===================================================================
+--- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c
++++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
+@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa
+ #if DEBUG
+ print_fbdev_mode("returned", &set_var);
+ #endif
+- return FALSE;
++ /* return FALSE; UGLY HACK to allow return from chvt */
+ }
+
+ if (!check)
diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.1/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.8.1/randr-support.patch
new file mode 100644
index 0000000..fb8d381
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.8.1/randr-support.patch
@@ -0,0 +1,96 @@
+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;
+ }
+
diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.906/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch
deleted file mode 100644
index adbc274..0000000
--- a/recipes/xorg-xserver/xserver-xorg-1.8.99.906/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7deb3068ff65ecadf035e8e493d418aca89c9212 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 30 Jun 2010 10:42:36 +0200
-Subject: [PATCH] xf86Modes: make sure that DisplayModeRec name is initialized to NULL and then don't call free() on it in xf86SetModeDefaultName
-
----
- hw/xfree86/modes/xf86Modes.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
-index 05f4319..09a9679 100644
---- a/hw/xfree86/modes/xf86Modes.c
-+++ b/hw/xfree86/modes/xf86Modes.c
-@@ -206,7 +206,7 @@ xf86DuplicateMode(const DisplayModeRec *pMode)
- {
- DisplayModePtr pNew;
-
-- pNew = xnfalloc(sizeof(DisplayModeRec));
-+ pNew = xnfcalloc(1, sizeof(DisplayModeRec));
- *pNew = *pMode;
- pNew->next = NULL;
- pNew->prev = NULL;
---
-1.7.1
-
diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.906/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/dolt-fix.patch
new file mode 100644
index 0000000..e332ce0
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/dolt-fix.patch
@@ -0,0 +1,22 @@
+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__
+
diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.906/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/hack-fbdev-ignore-return-mode.patch
new file mode 100644
index 0000000..d3661cb
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/hack-fbdev-ignore-return-mode.patch
@@ -0,0 +1,39 @@
+Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1
+(and probably other) while returning from chvt or resume on some
+hardware (e. g. zaurus).
+
+Correct fix would require debugging of fbdev mode during LeaveVT and
+EnterVT.
+
+This patch may cause staying in incorrect or corrupted display mode
+after EnterVT, but on man affected devices it does not cause any visible
+problems.
+
+Hacked code is never called on properly written drivers.
+
+Devices affected and testers involved for future patch removal:
+Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz>
+
+See also:
+https://bugzilla.redhat.com/show_bug.cgi?id=238451
+
+The bug (first line indicates that your device is affected):
+
+(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode
+
+Fatal server error:
+EnterVT failed for screen 0
+
+Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
+===================================================================
+--- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c
++++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
+@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa
+ #if DEBUG
+ print_fbdev_mode("returned", &set_var);
+ #endif
+- return FALSE;
++ /* return FALSE; UGLY HACK to allow return from chvt */
+ }
+
+ if (!check)
diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.906/randr-support.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/randr-support.patch
new file mode 100644
index 0000000..fb8d381
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.8.99.906/randr-support.patch
@@ -0,0 +1,96 @@
+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;
+ }
+
diff --git a/recipes/xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch b/recipes/xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch
deleted file mode 100644
index e332ce0..0000000
--- a/recipes/xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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__
-
diff --git a/recipes/xorg-xserver/xserver-xorg/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg/dolt-fix.patch
deleted file mode 100644
index 9e15f42..0000000
--- a/recipes/xorg-xserver/xserver-xorg/dolt-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: xorg-server-1.6.1/acinclude.m4
-===================================================================
---- xorg-server-1.6.1.orig/acinclude.m4 2009-04-14 21:14:56.000000000 +0400
-+++ xorg-server-1.6.1/acinclude.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__
-
diff --git a/recipes/xorg-xserver/xserver-xorg/drmfix.patch b/recipes/xorg-xserver/xserver-xorg/drmfix.patch
deleted file mode 100644
index fcbeac0..0000000
--- a/recipes/xorg-xserver/xserver-xorg/drmfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28)
-
-Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
-===================================================================
---- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/linux/Makefile.am
-+++ xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
-@@ -24,7 +24,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_vid
-
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
-
--INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
-+INCLUDES = $(XORG_INCS) $(LIBDRM_CFLAGS)
-
- # FIXME: These need to be added to the build
- LNX_EXTRA_SOURCES = \
diff --git a/recipes/xorg-xserver/xserver-xorg/fontfile.patch b/recipes/xorg-xserver/xserver-xorg/fontfile.patch
deleted file mode 100644
index ed39bf4..0000000
--- a/recipes/xorg-xserver/xserver-xorg/fontfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xc/lib/font/fontfile/Imakefile.old 2005-06-03 20:09:53.000000000 +0100
-+++ xc/lib/font/fontfile/Imakefile 2005-06-03 20:09:57.000000000 +0100
-@@ -14,7 +14,7 @@
- #endif
-
- INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \
-- -I$(INCLUDESRC)
-+ -I$(INCLUDESRC) $(CC_STAGING)
- HEADERS =
- #ifdef FontFormatDefines
- FORMAT_DEFS = FontFormatDefines
diff --git a/recipes/xorg-xserver/xserver-xorg/freetype.patch b/recipes/xorg-xserver/xserver-xorg/freetype.patch
deleted file mode 100644
index 0ba3dd5..0000000
--- a/recipes/xorg-xserver/xserver-xorg/freetype.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xc/lib/font/FreeType/Imakefile.old 2005-06-03 20:18:51.000000000 +0100
-+++ xc/lib/font/FreeType/Imakefile 2005-06-03 20:18:52.000000000 +0100
-@@ -20,7 +20,7 @@
-
- INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \
- -I$(SERVERSRC)/include $(EXTRAINCLUDES) \
-- -I$(INCLUDESRC)
-+ -I$(INCLUDESRC) $(CC_STAGING)
-
- SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c
- OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o
---- xc/config/cf/X11.tmpl.old 2005-06-03 20:40:24.000000000 +0100
-+++ xc/config/cf/X11.tmpl 2005-06-03 20:40:40.000000000 +0100
-@@ -3371,7 +3371,7 @@
-
- #if BuildFreetype2Library || HasFreetype2
- #if Freetype2IncDirStandard
--FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
-+FREETYPE2INCLUDES = `pkg-config --cflags freetype2`
- #else
- FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
- #endif
diff --git a/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch
deleted file mode 100644
index d3661cb..0000000
--- a/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1
-(and probably other) while returning from chvt or resume on some
-hardware (e. g. zaurus).
-
-Correct fix would require debugging of fbdev mode during LeaveVT and
-EnterVT.
-
-This patch may cause staying in incorrect or corrupted display mode
-after EnterVT, but on man affected devices it does not cause any visible
-problems.
-
-Hacked code is never called on properly written drivers.
-
-Devices affected and testers involved for future patch removal:
-Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz>
-
-See also:
-https://bugzilla.redhat.com/show_bug.cgi?id=238451
-
-The bug (first line indicates that your device is affected):
-
-(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode
-
-Fatal server error:
-EnterVT failed for screen 0
-
-Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
-===================================================================
---- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c
-+++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
-@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa
- #if DEBUG
- print_fbdev_mode("returned", &set_var);
- #endif
-- return FALSE;
-+ /* return FALSE; UGLY HACK to allow return from chvt */
- }
-
- if (!check)
diff --git a/recipes/xorg-xserver/xserver-xorg/imake-installed.patch b/recipes/xorg-xserver/xserver-xorg/imake-installed.patch
deleted file mode 100644
index 5782107..0000000
--- a/recipes/xorg-xserver/xserver-xorg/imake-installed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xc/config/cf/Imake.tmpl.old 2005-05-05 21:04:45.000000000 +0100
-+++ xc/config/cf/Imake.tmpl 2005-05-05 21:04:49.000000000 +0100
-@@ -2058,7 +2058,7 @@
- * INCLUDES contains client-specific includes set in Imakefile
- * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
- */
-- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
diff --git a/recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch b/recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch
deleted file mode 100644
index cd7cbe3..0000000
--- a/recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-upstream: not applicable to upstream
-
---- xserver/include/site.h-orig 2006-11-02 10:37:14.000000000 +0000
-+++ xserver/include/site.h 2006-11-02 10:37:14.000000000 +0000
-@@ -117,8 +117,8 @@
- #define DEFAULT_PTR_DENOMINATOR 1
- #define DEFAULT_PTR_THRESHOLD 4
-
--#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000))
--#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))
-+#define DEFAULT_SCREEN_SAVER_TIME 0
-+#define DEFAULT_SCREEN_SAVER_INTERVAL 0
- #define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking
- #define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures
- #ifndef NOLOGOHACK
diff --git a/recipes/xorg-xserver/xserver-xorg/randr-support-1.7.0.patch b/recipes/xorg-xserver/xserver-xorg/randr-support-1.7.0.patch
deleted file mode 100644
index fb8d381..0000000
--- a/recipes/xorg-xserver/xserver-xorg/randr-support-1.7.0.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-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;
- }
-
diff --git a/recipes/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch b/recipes/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch
deleted file mode 100644
index 17d05d3..0000000
--- a/recipes/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am.orig 2006-06-23 10:20:42.126095128 -0600
-+++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am 2006-06-23 10:20:50.923757680 -0600
-@@ -1,6 +1,6 @@
- xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS/fonts
-
--parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
-+parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
-
- XPFONTS = \
- AvantGarde-Book.pmf \
---- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am.orig 2006-06-23 10:21:02.877940368 -0600
-+++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am 2006-06-23 10:21:11.903568264 -0600
-@@ -1,6 +1,6 @@
- xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS/fonts
-
--parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
-+parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
-
- XPFONTS = \
- AvantGarde-Book.pmf \
---- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am.orig 2006-06-23 10:21:22.893897480 -0600
-+++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am 2006-06-23 10:21:28.412058592 -0600
-@@ -1,6 +1,6 @@
- xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts
-
--parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
-+parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
-
- XPFONTS = \
- Courier-Bold.pmf \
diff --git a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb b/recipes/xorg-xserver/xserver-xorg_1.2.0.bb
deleted file mode 100644
index 0b2e399..0000000
--- a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-MESA_VER = "6.5.2"
-
-require xorg-xserver-common.inc
-PE = "1"
-PR = "${INC_PR}.1"
-
-export LDFLAGS += " -ldl "
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-SRC_URI += "file://report-correct-randr10.patch"
-SRC_URI[archive.md5sum] = "ea291c89e68832d570d9d5e007218bd6"
-SRC_URI[archive.sha256sum] = "e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb b/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb
deleted file mode 100644
index c2ec4b1..0000000
--- a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-MESA_VER = "6.5.2"
-
-require xorg-xserver-common.inc
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI += "file://drmfix.patch \
- file://glyphstr.patch \
- file://report-correct-randr12.patch"
-
-export LDFLAGS += " -ldl "
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
-SRC_URI[archive.md5sum] = "a51a7d482e3c689394755bb17bda8526"
-SRC_URI[archive.sha256sum] = "93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb
deleted file mode 100644
index 0f4f8e7..0000000
--- a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require xorg-xserver-common.inc
-
-DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman"
-RDEPENDS_${PN} += "hal"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI += "file://drmfix.patch \
- file://pkgconfig_fix.patch \
- file://sysroot_fix.patch \
- file://xcalibrate-xorg.diff \
-"
-
-MESA_VER = "7.0.2"
-
-export LDFLAGS += " -ldl "
-
-SRC_URI[archive.md5sum] = "fa2915ae377f61c340a18ebef484b64b"
-SRC_URI[archive.sha256sum] = "829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.bb b/recipes/xorg-xserver/xserver-xorg_1.4.bb
deleted file mode 100644
index f153212..0000000
--- a/recipes/xorg-xserver/xserver-xorg_1.4.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require xorg-xserver-common.inc
-
-DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman"
-RDEPENDS_${PN} += "hal"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI += "file://drmfix.patch \
- file://pkgconfig_fix.patch \
- file://sysroot_fix.patch"
-
-MESA_VER = "7.0.2"
-
-export LDFLAGS += " -ldl "
-
-SRC_URI[archive.md5sum] = "a06d9fe4f9f1d459ae02657f9ce64220"
-SRC_URI[archive.sha256sum] = "51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb
deleted file mode 100644
index b1eef4f..0000000
--- a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require xorg-xserver-common.inc
-
-DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl"
-RDEPENDS_${PN} += "hal"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI += "file://drmfix.patch \
- file://sysroot_fix.patch"
-
-MESA_VER = "7.2"
-
-export LDFLAGS += " -ldl "
-
-SRC_URI[archive.md5sum] = "d16f5a033f001c9069b4141194614da2"
-SRC_URI[archive.sha256sum] = "2f36880bffaee0a5b2b704376a02b22066b6842445e1d77da698854e5973eb21"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
deleted file mode 100644
index 776b87f..0000000
--- a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require xorg-xserver-common.inc
-
-DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl"
-RDEPENDS_${PN} += "hal"
-PE = "2"
-PR = "${INC_PR}.2"
-
-SRC_URI += "file://drmfix.patch \
- file://sysroot_fix.patch \
- file://xorg-avr32-support.diff \
- file://xorg-server-1.5.3-configure.patch \
- file://xorg-server-1.5.3-glcore-prepare-for-dynamic.patch \
-"
-
-MESA_VER = "7.2"
-
-export LDFLAGS += " -ldl "
-
-SRC_URI[archive.md5sum] = "308971036e25250e7fe3cccfd5a120f8"
-SRC_URI[archive.sha256sum] = "a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.1.bb b/recipes/xorg-xserver/xserver-xorg_1.7.1.bb
index a0bbab4..60d4575 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.1.bb
@@ -6,8 +6,8 @@ PE = "2"
PR = "${INC_PR}.1"
SRC_URI += "file://sysroot_fix.patch \
- file://dolt-fix-1.7.0.patch \
- file://randr-support-1.7.0.patch \
+ file://dolt-fix.patch \
+ file://randr-support.patch \
"
do_install_prepend() {
mkdir -p ${D}/${libdir}/X11/fonts
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
index ef57039..41f0afc 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
@@ -6,8 +6,8 @@ PE = "2"
PR = "${INC_PR}.2"
SRC_URI += "file://sysroot_fix.patch \
- file://dolt-fix-1.7.0.patch \
- file://randr-support-1.7.0.patch \
+ file://dolt-fix.patch \
+ file://randr-support.patch \
file://hack-fbdev-ignore-return-mode.patch \
"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.1.bb b/recipes/xorg-xserver/xserver-xorg_1.8.1.bb
index 06f36cb..31ce24a 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.8.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.8.1.bb
@@ -9,8 +9,8 @@ PE = "2"
PR = "${INC_PR}.2"
SRC_URI += " \
- file://dolt-fix-1.7.0.patch \
- file://randr-support-1.7.0.patch \
+ file://dolt-fix.patch \
+ file://randr-support.patch \
file://hack-fbdev-ignore-return-mode.patch \
"
SRC_URI[archive.md5sum] = "7c3b873692f4e93938261d774510e78d"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.99.906.bb b/recipes/xorg-xserver/xserver-xorg_1.8.99.906.bb
index fc7530d..6558380 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.8.99.906.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.8.99.906.bb
@@ -8,15 +8,13 @@ DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts fon
PE = "2"
PR = "${INC_PR}.3"
-# Needs newer mesa-dri, where is D_P = "-1"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_shr = "1"
SRC_URI += " \
- file://dolt-fix-1.7.0.patch \
- file://randr-support-1.7.0.patch \
+ file://dolt-fix.patch \
+ file://randr-support.patch \
file://hack-fbdev-ignore-return-mode.patch \
- file://0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch \
"
SRC_URI[archive.md5sum] = "d4ab361cacc35e2ed4587019980b7e57"
SRC_URI[archive.sha256sum] = "7bb5e3d1e36b65e367d11707e7e11285d9eb087d3281c59c8143dfe90cf9977e"
diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
index 46b0e08..9c82174 100644
--- a/recipes/xorg-xserver/xserver-xorg_git.bb
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -1,19 +1,21 @@
+# Assign it here, since the hal->udev transition happens post 1.7 in angstrom
+DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev"
+
require xorg-xserver-common.inc
DESCRIPTION = "the X.Org X server"
DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
-PV = "1.8.99.905"
+PV = "1.8.99.906"
PR = "${INC_PR}.4"
PR_append = "+gitr${SRCPV}"
PE = "2"
DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_shr = "1"
-SRCREV = "6dae7f3792611aace1df0cca63bf50c50d93de43"
+SRCREV = "71af1f71c0492c365707c6b3810f94642ff39352"
SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \
- file://dolt-fix-1.7.0.patch \
- file://randr-support-1.7.0.patch \
+ file://dolt-fix.patch \
+ file://randr-support.patch \
file://hack-fbdev-ignore-return-mode.patch \
"
@@ -31,5 +33,6 @@ PACKAGE_ARCH_ion = "${MACHINE_ARCH}"
XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " --enable-dri2 --disable-unit-tests "
export LDFLAGS += " -ldl "
--
1.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: xorg recipes cleanup
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
` (8 preceding siblings ...)
2010-08-16 15:30 ` [PATCH 9/9] xorg-xserver: " Martin Jansa
@ 2010-08-16 19:25 ` Frans Meulenbroeks
2010-08-16 19:42 ` Martin Jansa
2010-08-16 19:49 ` [PATCH 1/9] xorg-app: move older not pinned versions to obsolete dir Martin Jansa
` (2 subsequent siblings)
12 siblings, 1 reply; 16+ messages in thread
From: Frans Meulenbroeks @ 2010-08-16 19:25 UTC (permalink / raw)
To: openembedded-devel
2010/8/16 Martin Jansa <martin.jansa@gmail.com>:
> Hi,
>
> all distributions are now using
> preferred-xorg-versions-X11R7.5.inc or
> preferred-xorg-versions-live.inc or
> no preferred-xorg-versions*.inc at all
>
> So we can remove some older versions not pinned in those 2
> to make future maintanance of xorg-* dirs a bit easier.
>
> As this is really easy to test (if you apply all 9 and build your
> favourite target again, no xorg package should be rebuilt - version changed),
> please test and ACK or don't scream later that you had some strange version
> preferred from local.conf.
I could not test, as patch 2 is not on patchwork (and retrieving them
from gmail is somewhat tricky)
Do we indeed want to move this to obsolete? Is there a point in
retaining it? Why not just rm them (they are still in git)
Or do we want obsolete to become the graveyard of old recipes?
Frans
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: xorg recipes cleanup
2010-08-16 19:25 ` xorg recipes cleanup Frans Meulenbroeks
@ 2010-08-16 19:42 ` Martin Jansa
2010-08-16 19:52 ` Frans Meulenbroeks
0 siblings, 1 reply; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 19:42 UTC (permalink / raw)
To: openembedded-devel
On Mon, Aug 16, 2010 at 09:25:51PM +0200, Frans Meulenbroeks wrote:
> 2010/8/16 Martin Jansa <martin.jansa@gmail.com>:
> > Hi,
> >
> > all distributions are now using
> > preferred-xorg-versions-X11R7.5.inc or
> > preferred-xorg-versions-live.inc or
> > no preferred-xorg-versions*.inc at all
> >
> > So we can remove some older versions not pinned in those 2
> > to make future maintanance of xorg-* dirs a bit easier.
> >
> > As this is really easy to test (if you apply all 9 and build your
> > favourite target again, no xorg package should be rebuilt - version changed),
> > please test and ACK or don't scream later that you had some strange version
> > preferred from local.conf.
>
> I could not test, as patch 2 is not on patchwork (and retrieving them
> from gmail is somewhat tricky)
I'm checking why :/ only clue is
bitbake@jama ~/oe $ git send-email 0002-xorg-lib-move-older-not-pinned-versions-to-obsolete-.patch
The following files are 8bit, but do not declare a
Content-Transfer-Encoding.
0002-xorg-lib-move-older-not-pinned-versions-to-obsolete-.patch
Which 8bit encoding should I declare [UTF-8]?
<enter>
> Do we indeed want to move this to obsolete? Is there a point in
> retaining it? Why not just rm them (they are still in git)
> Or do we want obsolete to become the graveyard of old recipes?
I usually move it to obsolete where it's not parsed if you have
'standard'
BBFILES := "/OE/dev/recipes/*/*.bb"
and if nobody screams then I'll remove whole obsolete/xorg dir after a
while.
I know it's SCM and I can look to every version in history, but while
it's still in obsolete it's faster to call just diff if I need to check
what changed since previous version.
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: xorg recipes cleanup
2010-08-16 19:42 ` Martin Jansa
@ 2010-08-16 19:52 ` Frans Meulenbroeks
0 siblings, 0 replies; 16+ messages in thread
From: Frans Meulenbroeks @ 2010-08-16 19:52 UTC (permalink / raw)
To: openembedded-devel
2010/8/16 Martin Jansa <martin.jansa@gmail.com>:
> On Mon, Aug 16, 2010 at 09:25:51PM +0200, Frans Meulenbroeks wrote:
>>
>> I could not test, as patch 2 is not on patchwork (and retrieving them
>> from gmail is somewhat tricky)
>
> I'm checking why :/ only clue is
> bitbake@jama ~/oe $ git send-email 0002-xorg-lib-move-older-not-pinned-versions-to-obsolete-.patch
> The following files are 8bit, but do not declare a
> Content-Transfer-Encoding.
> 0002-xorg-lib-move-older-not-pinned-versions-to-obsolete-.patch
> Which 8bit encoding should I declare [UTF-8]?
> <enter>
>
>> Do we indeed want to move this to obsolete? Is there a point in
>> retaining it? Why not just rm them (they are still in git)
>> Or do we want obsolete to become the graveyard of old recipes?
>
> I usually move it to obsolete where it's not parsed if you have
> 'standard'
> BBFILES := "/OE/dev/recipes/*/*.bb"
> and if nobody screams then I'll remove whole obsolete/xorg dir after a
> while.
>
> I know it's SCM and I can look to every version in history, but while
> it's still in obsolete it's faster to call just diff if I need to check
> what changed since previous version.
Ah ok, well in that case I have no problems with moving to obsolete.
I was assuming that would be the end-of-the-line. If it is temp until
things stabilize, fine with me.
Frans
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/9] xorg-app: move older not pinned versions to obsolete dir
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
` (9 preceding siblings ...)
2010-08-16 19:25 ` xorg recipes cleanup Frans Meulenbroeks
@ 2010-08-16 19:49 ` Martin Jansa
2010-08-16 19:49 ` Martin Jansa
2010-08-16 19:50 ` [PATCH 2/9] xorg-lib: " Martin Jansa
12 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 19:49 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb | 10 ++
.../obsolete/xorg/xorg-app/beforelight_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb | 7 +
recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb | 7 +
recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb | 7 +
recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb | 9 +
recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb | 8 +
.../obsolete/xorg/xorg-app/mkcomposecache_1.2.bb | 6 +
recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb | 10 ++
recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb | 10 ++
.../obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb | 9 +
.../obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb | 9 +
.../obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb | 9 +
recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb | 9 +
recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb | 6 +
recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb | 6 +
recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb | 6 +
recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb | 7 +
recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb | 7 +
recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb | 7 +
recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb | 13 ++
recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb | 6 +
recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb | 9 +
recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb | 9 +
recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb | 9 +
recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb | 8 +
recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb | 8 +
recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb | 8 +
recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb | 8 +
recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb | 7 +
recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb | 9 +
recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb | 9 +
recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb | 9 +
recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb | 6 +
recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb | 5 +
recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb | 11 ++
recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb | 8 +
.../obsolete/xorg/xorg-app/xmodmap/autofoo.patch | 109 ++++++++++++++
recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch | 157 ++++++++++++++++++++
recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb | 8 +
recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch | 132 ++++++++++++++++
recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb | 9 +
recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb | 9 +
recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb | 9 +
recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb | 6 +
recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xset/autofoo.patch | 109 ++++++++++++++
.../obsolete/xorg/xorg-app/xset/disable-xkb.patch | 18 +++
recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb | 14 ++
recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb | 14 ++
recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb | 14 ++
.../obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb | 7 +
recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb | 9 +
recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb | 9 +
recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb | 7 +
recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb | 6 +
recipes/xorg-app/appres_1.0.1.bb | 8 -
recipes/xorg-app/bdftopcf_1.0.1.bb | 10 --
recipes/xorg-app/beforelight_1.0.2.bb | 7 -
recipes/xorg-app/bitmap_1.0.2.bb | 7 -
recipes/xorg-app/bitmap_1.0.3.bb | 7 -
recipes/xorg-app/constype_1.0.1.bb | 8 -
recipes/xorg-app/editres_1.0.2.bb | 7 -
recipes/xorg-app/editres_1.0.3.bb | 7 -
recipes/xorg-app/fonttosfnt_1.0.3.bb | 7 -
recipes/xorg-app/fslsfonts_1.0.1.bb | 7 -
recipes/xorg-app/fstobdf_1.0.2.bb | 7 -
recipes/xorg-app/iceauth_1.0.2.bb | 8 -
recipes/xorg-app/lbxproxy_1.0.1.bb | 9 -
recipes/xorg-app/luit_1.0.2.bb | 7 -
recipes/xorg-app/luit_1.0.3.bb | 8 -
recipes/xorg-app/mkcomposecache_1.2.bb | 6 -
recipes/xorg-app/mkfontdir_1.0.3.bb | 10 --
recipes/xorg-app/mkfontdir_1.0.4.bb | 10 --
recipes/xorg-app/mkfontscale_1.0.3.bb | 9 -
recipes/xorg-app/mkfontscale_1.0.4.bb | 9 -
recipes/xorg-app/mkfontscale_1.0.5.bb | 9 -
recipes/xorg-app/rgb_1.0.1.bb | 9 -
recipes/xorg-app/rstart_1.0.2.bb | 6 -
recipes/xorg-app/sessreg_1.0.2.bb | 6 -
recipes/xorg-app/sessreg_1.0.3.bb | 6 -
recipes/xorg-app/sessreg_1.0.4.bb | 7 -
recipes/xorg-app/setxkbmap_1.0.3.bb | 7 -
recipes/xorg-app/setxkbmap_1.0.4.bb | 7 -
recipes/xorg-app/showfont_1.0.1.bb | 7 -
recipes/xorg-app/smproxy_1.0.2.bb | 7 -
recipes/xorg-app/twm_1.0.3.bb | 13 --
recipes/xorg-app/x11perf_1.4.1.bb | 8 -
recipes/xorg-app/x11perf_1.5.bb | 10 --
recipes/xorg-app/xauth_1.0.2.bb | 8 -
recipes/xorg-app/xauth_1.0.3.bb | 8 -
recipes/xorg-app/xbacklight_1.1.bb | 8 -
recipes/xorg-app/xcalc_1.0.1.bb | 7 -
recipes/xorg-app/xclipboard_1.0.1.bb | 7 -
recipes/xorg-app/xclock_1.0.2.bb | 7 -
recipes/xorg-app/xclock_1.0.3.bb | 8 -
recipes/xorg-app/xcmsdb_1.0.1.bb | 6 -
recipes/xorg-app/xconsole_1.0.2.bb | 7 -
recipes/xorg-app/xcursorgen_1.0.1.bb | 9 -
recipes/xorg-app/xcursorgen_1.0.2.bb | 10 --
recipes/xorg-app/xdm_1.1.3.bb | 10 --
recipes/xorg-app/xdm_1.1.4.bb | 10 --
recipes/xorg-app/xdm_1.1.6.bb | 12 --
recipes/xorg-app/xdm_1.1.7.bb | 12 --
recipes/xorg-app/xdm_1.1.8.bb | 12 --
recipes/xorg-app/xdpyinfo_1.0.2.bb | 12 --
recipes/xorg-app/xdpyinfo_1.0.3.bb | 12 --
recipes/xorg-app/xdriinfo_1.0.1.bb | 7 -
recipes/xorg-app/xdriinfo_1.0.2.bb | 8 -
recipes/xorg-app/xedit_1.0.2.bb | 7 -
recipes/xorg-app/xev_1.0.2.bb | 9 -
recipes/xorg-app/xev_1.0.3.bb | 9 -
recipes/xorg-app/xeyes_1.0.1.bb | 7 -
recipes/xorg-app/xfs_1.0.4.bb | 8 -
recipes/xorg-app/xfs_1.0.5.bb | 8 -
recipes/xorg-app/xfs_1.0.6.bb | 8 -
recipes/xorg-app/xfs_1.0.8.bb | 8 -
recipes/xorg-app/xfsinfo_1.0.1.bb | 7 -
recipes/xorg-app/xgamma_1.0.1.bb | 7 -
recipes/xorg-app/xgamma_1.0.2.bb | 8 -
recipes/xorg-app/xhost_1.0.2.bb | 9 -
recipes/xorg-app/xinit_1.0.3.bb | 8 -
recipes/xorg-app/xinit_1.0.4.bb | 9 -
recipes/xorg-app/xinit_1.0.5.bb | 9 -
recipes/xorg-app/xinit_1.0.7.bb | 9 -
recipes/xorg-app/xinit_1.0.8.bb | 9 -
recipes/xorg-app/xinit_1.0.9.bb | 9 -
recipes/xorg-app/xinit_1.1.0.bb | 9 -
recipes/xorg-app/xinit_1.2.0.bb | 10 --
recipes/xorg-app/xinput_1.3.0.bb | 7 -
recipes/xorg-app/xinput_1.4.2.bb | 7 -
recipes/xorg-app/xinput_1.5.1.bb | 7 -
recipes/xorg-app/xkbcomp_1.0.3.bb | 9 -
recipes/xorg-app/xkbcomp_1.0.4.bb | 9 -
recipes/xorg-app/xkbcomp_1.0.5.bb | 9 -
recipes/xorg-app/xkbevd_1.0.2.bb | 7 -
recipes/xorg-app/xkbutils_1.0.1.bb | 6 -
recipes/xorg-app/xkill_1.0.1.bb | 7 -
recipes/xorg-app/xload_1.0.1.bb | 7 -
recipes/xorg-app/xlsatoms_1.0.1.bb | 7 -
recipes/xorg-app/xlsclients_1.0.1.bb | 7 -
recipes/xorg-app/xlsfonts_1.0.1.bb | 5 -
recipes/xorg-app/xmag_1.0.1.bb | 7 -
recipes/xorg-app/xmag_1.0.2.bb | 8 -
recipes/xorg-app/xman_1.0.2.bb | 10 --
recipes/xorg-app/xman_1.0.3.bb | 11 --
recipes/xorg-app/xmessage_1.0.1.bb | 8 -
recipes/xorg-app/xmodmap/autofoo.patch | 109 --------------
recipes/xorg-app/xmodmap_1.0.2.bb | 8 -
recipes/xorg-app/xmodmap_1.0.3.bb | 8 -
recipes/xorg-app/xpr_1.0.1.bb | 7 -
recipes/xorg-app/xpr_1.0.2.bb | 8 -
recipes/xorg-app/xprop/autofoo.patch | 157 --------------------
recipes/xorg-app/xprop_1.0.2.bb | 7 -
recipes/xorg-app/xprop_1.0.4.bb | 8 -
recipes/xorg-app/xrandr_1.2.2.bb | 10 --
recipes/xorg-app/xrandr_1.2.3.bb | 10 --
recipes/xorg-app/xrdb/autofoo.patch | 132 ----------------
recipes/xorg-app/xrdb_1.0.3.bb | 9 -
recipes/xorg-app/xrdb_1.0.4.bb | 9 -
recipes/xorg-app/xrdb_1.0.5.bb | 9 -
recipes/xorg-app/xrefresh_1.0.2.bb | 6 -
recipes/xorg-app/xrx_1.0.1.bb | 7 -
recipes/xorg-app/xset/autofoo.patch | 109 --------------
recipes/xorg-app/xset/disable-xkb.patch | 18 ---
recipes/xorg-app/xset_1.0.2.bb | 14 --
recipes/xorg-app/xset_1.0.3.bb | 14 --
recipes/xorg-app/xset_1.0.4.bb | 14 --
recipes/xorg-app/xsetpointer_1.0.0.bb | 7 -
recipes/xorg-app/xsetroot_1.0.1.bb | 9 -
recipes/xorg-app/xsetroot_1.0.2.bb | 9 -
recipes/xorg-app/xvinfo_1.0.1.bb | 8 -
recipes/xorg-app/xvinfo_1.0.2.bb | 8 -
recipes/xorg-app/xwd_1.0.1.bb | 7 -
recipes/xorg-app/xwd_1.0.2.bb | 7 -
recipes/xorg-app/xwininfo_1.0.2.bb | 7 -
recipes/xorg-app/xwininfo_1.0.3.bb | 8 -
recipes/xorg-app/xwininfo_1.0.4.bb | 7 -
recipes/xorg-app/xwud_1.0.1.bb | 6 -
246 files changed, 1501 insertions(+), 1501 deletions(-)
create mode 100644 recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/beforelight_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkcomposecache_1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmodmap/autofoo.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xset/autofoo.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xset/disable-xkb.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb
delete mode 100644 recipes/xorg-app/appres_1.0.1.bb
delete mode 100644 recipes/xorg-app/bdftopcf_1.0.1.bb
delete mode 100644 recipes/xorg-app/beforelight_1.0.2.bb
delete mode 100644 recipes/xorg-app/bitmap_1.0.2.bb
delete mode 100644 recipes/xorg-app/bitmap_1.0.3.bb
delete mode 100644 recipes/xorg-app/constype_1.0.1.bb
delete mode 100644 recipes/xorg-app/editres_1.0.2.bb
delete mode 100644 recipes/xorg-app/editres_1.0.3.bb
delete mode 100644 recipes/xorg-app/fonttosfnt_1.0.3.bb
delete mode 100644 recipes/xorg-app/fslsfonts_1.0.1.bb
delete mode 100644 recipes/xorg-app/fstobdf_1.0.2.bb
delete mode 100644 recipes/xorg-app/iceauth_1.0.2.bb
delete mode 100644 recipes/xorg-app/lbxproxy_1.0.1.bb
delete mode 100644 recipes/xorg-app/luit_1.0.2.bb
delete mode 100644 recipes/xorg-app/luit_1.0.3.bb
delete mode 100644 recipes/xorg-app/mkcomposecache_1.2.bb
delete mode 100644 recipes/xorg-app/mkfontdir_1.0.3.bb
delete mode 100644 recipes/xorg-app/mkfontdir_1.0.4.bb
delete mode 100644 recipes/xorg-app/mkfontscale_1.0.3.bb
delete mode 100644 recipes/xorg-app/mkfontscale_1.0.4.bb
delete mode 100644 recipes/xorg-app/mkfontscale_1.0.5.bb
delete mode 100644 recipes/xorg-app/rgb_1.0.1.bb
delete mode 100644 recipes/xorg-app/rstart_1.0.2.bb
delete mode 100644 recipes/xorg-app/sessreg_1.0.2.bb
delete mode 100644 recipes/xorg-app/sessreg_1.0.3.bb
delete mode 100644 recipes/xorg-app/sessreg_1.0.4.bb
delete mode 100644 recipes/xorg-app/setxkbmap_1.0.3.bb
delete mode 100644 recipes/xorg-app/setxkbmap_1.0.4.bb
delete mode 100644 recipes/xorg-app/showfont_1.0.1.bb
delete mode 100644 recipes/xorg-app/smproxy_1.0.2.bb
delete mode 100644 recipes/xorg-app/twm_1.0.3.bb
delete mode 100644 recipes/xorg-app/x11perf_1.4.1.bb
delete mode 100644 recipes/xorg-app/x11perf_1.5.bb
delete mode 100644 recipes/xorg-app/xauth_1.0.2.bb
delete mode 100644 recipes/xorg-app/xauth_1.0.3.bb
delete mode 100644 recipes/xorg-app/xbacklight_1.1.bb
delete mode 100644 recipes/xorg-app/xcalc_1.0.1.bb
delete mode 100644 recipes/xorg-app/xclipboard_1.0.1.bb
delete mode 100644 recipes/xorg-app/xclock_1.0.2.bb
delete mode 100644 recipes/xorg-app/xclock_1.0.3.bb
delete mode 100644 recipes/xorg-app/xcmsdb_1.0.1.bb
delete mode 100644 recipes/xorg-app/xconsole_1.0.2.bb
delete mode 100644 recipes/xorg-app/xcursorgen_1.0.1.bb
delete mode 100644 recipes/xorg-app/xcursorgen_1.0.2.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.3.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.4.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.6.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.7.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.8.bb
delete mode 100644 recipes/xorg-app/xdpyinfo_1.0.2.bb
delete mode 100644 recipes/xorg-app/xdpyinfo_1.0.3.bb
delete mode 100644 recipes/xorg-app/xdriinfo_1.0.1.bb
delete mode 100644 recipes/xorg-app/xdriinfo_1.0.2.bb
delete mode 100644 recipes/xorg-app/xedit_1.0.2.bb
delete mode 100644 recipes/xorg-app/xev_1.0.2.bb
delete mode 100644 recipes/xorg-app/xev_1.0.3.bb
delete mode 100644 recipes/xorg-app/xeyes_1.0.1.bb
delete mode 100644 recipes/xorg-app/xfs_1.0.4.bb
delete mode 100644 recipes/xorg-app/xfs_1.0.5.bb
delete mode 100644 recipes/xorg-app/xfs_1.0.6.bb
delete mode 100644 recipes/xorg-app/xfs_1.0.8.bb
delete mode 100644 recipes/xorg-app/xfsinfo_1.0.1.bb
delete mode 100644 recipes/xorg-app/xgamma_1.0.1.bb
delete mode 100644 recipes/xorg-app/xgamma_1.0.2.bb
delete mode 100644 recipes/xorg-app/xhost_1.0.2.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.3.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.4.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.5.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.7.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.8.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.9.bb
delete mode 100644 recipes/xorg-app/xinit_1.1.0.bb
delete mode 100644 recipes/xorg-app/xinit_1.2.0.bb
delete mode 100644 recipes/xorg-app/xinput_1.3.0.bb
delete mode 100644 recipes/xorg-app/xinput_1.4.2.bb
delete mode 100644 recipes/xorg-app/xinput_1.5.1.bb
delete mode 100644 recipes/xorg-app/xkbcomp_1.0.3.bb
delete mode 100644 recipes/xorg-app/xkbcomp_1.0.4.bb
delete mode 100644 recipes/xorg-app/xkbcomp_1.0.5.bb
delete mode 100644 recipes/xorg-app/xkbevd_1.0.2.bb
delete mode 100644 recipes/xorg-app/xkbutils_1.0.1.bb
delete mode 100644 recipes/xorg-app/xkill_1.0.1.bb
delete mode 100644 recipes/xorg-app/xload_1.0.1.bb
delete mode 100644 recipes/xorg-app/xlsatoms_1.0.1.bb
delete mode 100644 recipes/xorg-app/xlsclients_1.0.1.bb
delete mode 100644 recipes/xorg-app/xlsfonts_1.0.1.bb
delete mode 100644 recipes/xorg-app/xmag_1.0.1.bb
delete mode 100644 recipes/xorg-app/xmag_1.0.2.bb
delete mode 100644 recipes/xorg-app/xman_1.0.2.bb
delete mode 100644 recipes/xorg-app/xman_1.0.3.bb
delete mode 100644 recipes/xorg-app/xmessage_1.0.1.bb
delete mode 100644 recipes/xorg-app/xmodmap/autofoo.patch
delete mode 100644 recipes/xorg-app/xmodmap_1.0.2.bb
delete mode 100644 recipes/xorg-app/xmodmap_1.0.3.bb
delete mode 100644 recipes/xorg-app/xpr_1.0.1.bb
delete mode 100644 recipes/xorg-app/xpr_1.0.2.bb
delete mode 100644 recipes/xorg-app/xprop/autofoo.patch
delete mode 100644 recipes/xorg-app/xprop_1.0.2.bb
delete mode 100644 recipes/xorg-app/xprop_1.0.4.bb
delete mode 100644 recipes/xorg-app/xrandr_1.2.2.bb
delete mode 100644 recipes/xorg-app/xrandr_1.2.3.bb
delete mode 100644 recipes/xorg-app/xrdb/autofoo.patch
delete mode 100644 recipes/xorg-app/xrdb_1.0.3.bb
delete mode 100644 recipes/xorg-app/xrdb_1.0.4.bb
delete mode 100644 recipes/xorg-app/xrdb_1.0.5.bb
delete mode 100644 recipes/xorg-app/xrefresh_1.0.2.bb
delete mode 100644 recipes/xorg-app/xrx_1.0.1.bb
delete mode 100644 recipes/xorg-app/xset/autofoo.patch
delete mode 100644 recipes/xorg-app/xset/disable-xkb.patch
delete mode 100644 recipes/xorg-app/xset_1.0.2.bb
delete mode 100644 recipes/xorg-app/xset_1.0.3.bb
delete mode 100644 recipes/xorg-app/xset_1.0.4.bb
delete mode 100644 recipes/xorg-app/xsetpointer_1.0.0.bb
delete mode 100644 recipes/xorg-app/xsetroot_1.0.1.bb
delete mode 100644 recipes/xorg-app/xsetroot_1.0.2.bb
delete mode 100644 recipes/xorg-app/xvinfo_1.0.1.bb
delete mode 100644 recipes/xorg-app/xvinfo_1.0.2.bb
delete mode 100644 recipes/xorg-app/xwd_1.0.1.bb
delete mode 100644 recipes/xorg-app/xwd_1.0.2.bb
delete mode 100644 recipes/xorg-app/xwininfo_1.0.2.bb
delete mode 100644 recipes/xorg-app/xwininfo_1.0.3.bb
delete mode 100644 recipes/xorg-app/xwininfo_1.0.4.bb
delete mode 100644 recipes/xorg-app/xwud_1.0.1.bb
diff --git a/recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb
new file mode 100644
index 0000000..698b7c4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "The appres program prints the resources seen by an application."
+DEPENDS += " libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "420e6cdf38bb771ec8b00228bf09e8ff"
+SRC_URI[archive.sha256sum] = "15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962"
diff --git a/recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb
new file mode 100644
index 0000000..d5ddd50
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "converts BDF fonts to PCF fonts"
+DEPENDS += " libxfont"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "9685fab33d39954ab8a0d22e0969d5a4"
+SRC_URI[archive.sha256sum] = "aaaa45ab361781aebda2093fdc7eb5c187f6215b4ba308dd6b9ff2b727e805d3"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/beforelight_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/beforelight_1.0.2.bb
new file mode 100644
index 0000000..09852db
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/beforelight_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxscrnsaver libxt libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8bc2e35cdcd2e6a80eab1b77c41f2a46"
+SRC_URI[archive.sha256sum] = "00e217559c93779fe04fd948017820af118a3981d6b4371ace95107cb3b047a7"
diff --git a/recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb
new file mode 100644
index 0000000..70be2aa
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu xbitmaps libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "78e8ab5c1830e2cdfbff7a952162a5a7"
+SRC_URI[archive.sha256sum] = "83719927ac4309f42e3cadde125a52cfba2e9c951115ac4c017f292f6e4c14bc"
diff --git a/recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb
new file mode 100644
index 0000000..9a83106
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu xbitmaps libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "98200c358e5401d648b980564d9ae39d"
+SRC_URI[archive.sha256sum] = "863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41"
diff --git a/recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb
new file mode 100644
index 0000000..d8a957b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "print an X window dump"
+DEPENDS += " libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9f99bee77ff3c565b4898663810fbef5"
+SRC_URI[archive.sha256sum] = "11403054cb407cdf31da48216f55d1b5943798cb442bcab69faa0a3d7d167541"
diff --git a/recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb
new file mode 100644
index 0000000..23956d3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt libxmu libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9db49742bd4c17966fff7d76ac566d31"
+SRC_URI[archive.sha256sum] = "978fbc134eef3da8a5f363c9e93494a3d7399e8f2b435ac6b1f2c63f09c167df"
diff --git a/recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb
new file mode 100644
index 0000000..56cadc1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt libxmu libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a25f931cc6c8d03daaed434f5db5df2d"
+SRC_URI[archive.sha256sum] = "a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae"
diff --git a/recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb
new file mode 100644
index 0000000..71e147c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " xproto freetype libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b0ebd86029571239b9d7b0c61191b591"
+SRC_URI[archive.sha256sum] = "9d2b0149ea49a097ab6c563801c06af9975e98f9fa4c8af1a8ac3238e4fd5243"
diff --git a/recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb
new file mode 100644
index 0000000..c1040ad
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c7b2f8a938749d41dc86db6bd1e6a4ca"
+SRC_URI[archive.sha256sum] = "3feb006a25f36856924e26249fe84b27142678f97175780960f085e1e263a62e"
diff --git a/recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb
new file mode 100644
index 0000000..6c3148c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "99144743ab3cbb9cf37090fdc9e747db"
+SRC_URI[archive.sha256sum] = "690e45b252cd96036dd9b89af8624eb423e16d4bd662b07d264a3f876ce7ac22"
diff --git a/recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb
new file mode 100644
index 0000000..bcda802
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "a tool for manipulating ICE protocol authorization records"
+DEPENDS += " libice"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7ab8b64edf0212a9d9a3c8129901a450"
+SRC_URI[archive.sha256sum] = "06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb"
diff --git a/recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb
new file mode 100644
index 0000000..7b35f1b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Applications that would like to take advantage of the Low Bandwidth \
+extension to X (LBX) must make their connections to an lbxproxy."
+DEPENDS += " xtrans libxext liblbxutil libice xproxymngproto bigreqsproto zlib"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9d5045a5c76b1fe360221b967a5aa0e9"
+SRC_URI[archive.sha256sum] = "e2e757986724a5d2ee299aa7616a3d9985af45e363021b486b7abbcac4ca01c2"
diff --git a/recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb
new file mode 100644
index 0000000..d8c3475
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " zlib zlib libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "aacda46598ce3af8ca16e2a8132db1b2"
+SRC_URI[archive.sha256sum] = "c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c"
diff --git a/recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb
new file mode 100644
index 0000000..4baac79
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals"
+DEPENDS += " zlib zlib libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b01e4f71c20fc1c79ed727759c1df40c"
+SRC_URI[archive.sha256sum] = "2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7"
diff --git a/recipes/obsolete/xorg/xorg-app/mkcomposecache_1.2.bb b/recipes/obsolete/xorg/xorg-app/mkcomposecache_1.2.bb
new file mode 100644
index 0000000..8de1fad
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkcomposecache_1.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+DESCRIPTION = "used for creating global (system-wide) Compose cache files"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c8237b4aea1ae0c15441deab6b12c5c0"
+SRC_URI[archive.sha256sum] = "8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb
new file mode 100644
index 0000000..e3d1782
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of X font files in a directory"
+RDEPENDS_${PN} += "mkfontscale"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "4d0f89a23f77e22f1671a77bf0898955"
+SRC_URI[archive.sha256sum] = "2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb
new file mode 100644
index 0000000..dbc0884
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of X font files in a directory"
+RDEPENDS_${PN} += "mkfontscale"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "35394bf3f746a57fba624dba52fdbba3"
+SRC_URI[archive.sha256sum] = "6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb
new file mode 100644
index 0000000..10d511f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of scalable font files for X"
+DEPENDS += " zlib libfontenc freetype "
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "1d608771aca9695b828cec1e34178fd1"
+SRC_URI[archive.sha256sum] = "0458a3a5525b4ab458a018648ef8575afc191f904364c00e27876a7bd53af020"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb
new file mode 100644
index 0000000..6a29088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of scalable font files for X"
+DEPENDS += " zlib libfontenc freetype "
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "e5d7373c4266973b3b13aac5d1a4655b"
+SRC_URI[archive.sha256sum] = "dc9b946cc23490c960fbca8b32e4bba4bc23ce404a8d7e1c0e916894c83b4227"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb
new file mode 100644
index 0000000..5e37e8e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of scalable font files for X"
+DEPENDS += " zlib libfontenc freetype "
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "5e6e210b70adfef1264b0212aab1f758"
+SRC_URI[archive.sha256sum] = "f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb
new file mode 100644
index 0000000..c78047f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DEPENDS += " xproto util-macros"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "255222b3ab3af671289a6b4844e9f393"
+SRC_URI[archive.sha256sum] = "f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad"
+
+FILES_${PN} += "${datadir}/X11"
diff --git a/recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb
new file mode 100644
index 0000000..2f17f8a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "99aea04a27197056368a4431f30f9cdb"
+SRC_URI[archive.sha256sum] = "02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596"
diff --git a/recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb
new file mode 100644
index 0000000..e7bede7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "bee5d87d40615e67c84ab0b0c65049ba"
+SRC_URI[archive.sha256sum] = "c23c12259854c7cec6d19bf397afff4a542a22170b14de73b321aa8cafcf3a86"
diff --git a/recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb
new file mode 100644
index 0000000..5482af9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "07665816f2623ec82e665fb7d31c6cef"
+SRC_URI[archive.sha256sum] = "7d0c145d53246ddf09fc749f91324897ed9a3da0064808f99b789c37470080dc"
diff --git a/recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb
new file mode 100644
index 0000000..9738608
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a simple program for managing utmp/wtmp entries"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "839e968d7197b9563f0fd8a5a3aac2e3"
+SRC_URI[archive.sha256sum] = "23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802"
diff --git a/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb
new file mode 100644
index 0000000..f9434d7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxkbfile "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2b53542095a35a8a5731164118643883"
+SRC_URI[archive.sha256sum] = "086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508"
diff --git a/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb
new file mode 100644
index 0000000..8a9558b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxkbfile "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6fab3bb176be9e510c5613d054ef1ca4"
+SRC_URI[archive.sha256sum] = "9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac"
diff --git a/recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb
new file mode 100644
index 0000000..a5ffa3a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "339b2faf1ca5114fda414338e15b6e21"
+SRC_URI[archive.sha256sum] = "87db3cf12914abc6b074d12b35c7f39c8fd7b5d3933b339e2c1260a51061760c"
diff --git a/recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb
new file mode 100644
index 0000000..0ef6033
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "31da204a0255ba8c6a65386e65dc1c90"
+SRC_URI[archive.sha256sum] = "76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2"
diff --git a/recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb
new file mode 100644
index 0000000..feaebdd
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb
@@ -0,0 +1,13 @@
+require xorg-app-common.inc
+DESCRIPTION = "tiny window manager"
+DEPENDS += " libxext libxt libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a56b71dc40249195b32b304633c28a3e"
+SRC_URI[archive.sha256sum] = "5b41550477a893bf2b82ab73fc7fb6c839ba52d0deac059be1a473dd7bb92a4e"
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/twm"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "1"
diff --git a/recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb b/recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb
new file mode 100644
index 0000000..7c61228
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X11 server performance test program"
+DEPENDS += "libxmu libxrender libxft libxext fontconfig"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fd06c8b8e3572a0e14af65a49e0dd7d1"
+SRC_URI[archive.sha256sum] = "c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064"
diff --git a/recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb b/recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb
new file mode 100644
index 0000000..9cff277
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X11 server performance test program"
+DEPENDS += "libxmu libxrender libxft libxext fontconfig"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "31283bfc3c78718ac1bd71e510d4e774"
+SRC_URI[archive.sha256sum] = "4729da53dde0b7e1748db4bb771f9b7aaf2e2b1e67293a3a5b96d54043ce1233"
+
+FILES_${PN} += "/usr/lib/X11/x11perfcomp/*"
diff --git a/recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb
new file mode 100644
index 0000000..bd391a2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X authority file utility"
+DEPENDS += "libxau libxext libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "31b956edaeb453ddaa640420e97b25b2"
+SRC_URI[archive.sha256sum] = "569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17"
diff --git a/recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb
new file mode 100644
index 0000000..7adb51d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X authority file utility"
+DEPENDS += "libxau libxext libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e91e10ace1df0d5f2cbc74ead256407a"
+SRC_URI[archive.sha256sum] = "1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c"
diff --git a/recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb b/recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb
new file mode 100644
index 0000000..287b2b1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "adjust backlight brightness using RandR extension"
+DEPENDS += " libxrender libxrandr"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "51b4a1c0ae2b3bd77417306fd78a3e94"
+SRC_URI[archive.sha256sum] = "c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4"
diff --git a/recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb
new file mode 100644
index 0000000..ff042f0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "07b948cf671fde88df1a59bfb0cab3b8"
+SRC_URI[archive.sha256sum] = "17484e5fec0ebe7dd8df7218fde1449c52be3f4c6377a85a9fd86e377a7f4248"
diff --git a/recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb
new file mode 100644
index 0000000..06aeda2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2c6ecedb10dc51adbb64c95f22fd99c2"
+SRC_URI[archive.sha256sum] = "3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc"
diff --git a/recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb
new file mode 100644
index 0000000..0bf6117
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6b930326f71993fb54b7203902b387cd"
+SRC_URI[archive.sha256sum] = "ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d"
diff --git a/recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb
new file mode 100644
index 0000000..73ac39c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "analog / digital clock for X"
+DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2b1a3d030d87e62a591db8ee4c0072e6"
+SRC_URI[archive.sha256sum] = "10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f"
diff --git a/recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb
new file mode 100644
index 0000000..770db7e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8579d5f50ba7f0c4a5bf16b9670fea01"
+SRC_URI[archive.sha256sum] = "e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e"
diff --git a/recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb
new file mode 100644
index 0000000..a7eacc3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8678ddd23573022d68dcd883ae239be8"
+SRC_URI[archive.sha256sum] = "45db847e810a932bb962041a4c242f97779142f7e36feec64ec5f9073bd9b377"
diff --git a/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb
new file mode 100644
index 0000000..39c6aa2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DEPENDS += " libxcursor libpng"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "39e1e62f5bd92603b0230b8b948c2fc4"
+SRC_URI[archive.sha256sum] = "18d3e0d64853089c2154f1f867df087fc15f87e03e09fabc98ee5e265d8a53ef"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb
new file mode 100644
index 0000000..a058a88
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "create an X cursor file from a collection of PNG images"
+DEPENDS += " libxcursor libpng"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "6fc90896b8c786cb1a2100b4167f7874"
+SRC_URI[archive.sha256sum] = "e009322bd2afef8d4ad91bcb6b17874e1cd00b1aaf397e7019a82cc44f3c174e"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb
new file mode 100644
index 0000000..02df29e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "619d0549c6c20ca15aa77769f2fbabe2"
+SRC_URI[archive.sha256sum] = "9e640974c132ef1faafedc77e4602d55457b2791006b677cec071ee8afbf9a74"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb
new file mode 100644
index 0000000..c0268c5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a2b4c280f3e324d081a0d9ed76a8a123"
+SRC_URI[archive.sha256sum] = "928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb
new file mode 100644
index 0000000..9a4d7d3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb
@@ -0,0 +1,12 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c89f8bc74fda4d19e5f374f59c88810f"
+SRC_URI[archive.sha256sum] = "c41ac89d9da5c3f5424e9c4871d363ff17acf0fd2a46830931c447ba0b5a8bcd"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
+
+FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb
new file mode 100644
index 0000000..844413c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb
@@ -0,0 +1,12 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "92effdb698d9ecc9113fe4f49294bd90"
+SRC_URI[archive.sha256sum] = "6a7bceccb1eb9ce3d14259be7a6cc8268bc9e1f127298480b9322ceb6f032d6d"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
+
+FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb
new file mode 100644
index 0000000..fc8fa99
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb
@@ -0,0 +1,12 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "cc1816bc62a3722ad509373b0b7f30fe"
+SRC_URI[archive.sha256sum] = "e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
+
+FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb
new file mode 100644
index 0000000..80f4bf7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb
@@ -0,0 +1,12 @@
+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"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "c9ee60ae52c97c51d4ca327e53f0cb61"
+SRC_URI[archive.sha256sum] = "c9927fc33e8a4422d74b1ebee0d19dd5a16d9ebc435e8f47f0aa546501ccfed3"
+
+EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb
new file mode 100644
index 0000000..eff9c09
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb
@@ -0,0 +1,12 @@
+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"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "b7cbab6cbcd12bf7ad65dbc12d86e104"
+SRC_URI[archive.sha256sum] = "4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962"
+
+EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb
new file mode 100644
index 0000000..8a349d9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " glproto virtual/libgl"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "be3c5a9b242a57226b5bb5f22ec341ca"
+SRC_URI[archive.sha256sum] = "f693977bdaea7eb6b095a6b6bc60b8a62110ecdef4c455211346e592f59c3772"
diff --git a/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb
new file mode 100644
index 0000000..6f27ff2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "query configuration information of DRI drivers"
+DEPENDS += " glproto virtual/libgl"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a5ec51ed9f0a55dc3462d90d52ff899c"
+SRC_URI[archive.sha256sum] = "7b03ac095b6c79688c20ad61e3576d4698e3f16c09a7f3f1e7c50826814e7265"
diff --git a/recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb
new file mode 100644
index 0000000..001cbcd
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxprintutil libxp libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c56160e93c24ddf17e69891ed50deb72"
+SRC_URI[archive.sha256sum] = "2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df"
diff --git a/recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb
new file mode 100644
index 0000000..402db0b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Event Viewer"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://diet-x11.patch"
+SRC_URI[archive.md5sum] = "e3008eb0655da3026c162a5597d70869"
+SRC_URI[archive.sha256sum] = "cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053"
diff --git a/recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb
new file mode 100644
index 0000000..a0990d2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Event Viewer"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://diet-x11.patch"
+SRC_URI[archive.md5sum] = "a9532c3d1683c99bb5df1895cb3a60b1"
+SRC_URI[archive.sha256sum] = "d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a"
diff --git a/recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb
new file mode 100644
index 0000000..6382df4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxau libxt libxext libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "033f14f7c4e30d1f4edbb22d5ef86883"
+SRC_URI[archive.sha256sum] = "530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029"
diff --git a/recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb
new file mode 100644
index 0000000..f50eaf4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f43cb64d623b748208dfd9012d17b654"
+SRC_URI[archive.sha256sum] = "452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b"
diff --git a/recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb
new file mode 100644
index 0000000..1d31d21
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3fc73b5e39a1fe8b8d96563c8144cffe"
+SRC_URI[archive.sha256sum] = "f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9"
diff --git a/recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb b/recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb
new file mode 100644
index 0000000..24028ac
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a62ea490a8b97f74b53732df8fc309d8"
+SRC_URI[archive.sha256sum] = "5a3ad18fdc67e261454740217f7c02d1b6825013abcebdcd778a4865fd823353"
diff --git a/recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb b/recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb
new file mode 100644
index 0000000..6324d81
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f10717e45535b64eb45226aac571dac2"
+SRC_URI[archive.sha256sum] = "34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482"
diff --git a/recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb
new file mode 100644
index 0000000..2df9b2a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e98b18fbce1261de30b1de819d86f48a"
+SRC_URI[archive.sha256sum] = "adc33443b3a7f334d2407de702004a0491f24708e0e1abe74cd8ae114cd60cd9"
diff --git a/recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb
new file mode 100644
index 0000000..d6245ee
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxxf86vm"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "45d8fa3c85d4bfda87251798fd605a45"
+SRC_URI[archive.sha256sum] = "085330064fdb90a152d2d44474fa20bb81ccb6c587c144f5f9c323cb9cc31eee"
diff --git a/recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb
new file mode 100644
index 0000000..2b11285
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "Alter a monitor's gamma correction through the X server"
+DEPENDS += " libxxf86vm"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f13ddedaa63a608d3b025d326f4f5b5d"
+SRC_URI[archive.sha256sum] = "5d3d5b230fc60aefae8f4865c17add133b5fb11377fd61c80897ef94fcccf41e"
diff --git a/recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb
new file mode 100644
index 0000000..1a42fb1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Server access control program for X"
+LICENSE = "MIT"
+DEPENDS += "libxmu libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f746aba36f075ae4cae313d849a94f4e"
+SRC_URI[archive.sha256sum] = "edab2cc49d230f58e54c0f7b83fd726fec5fc31356668a11589649f19ba90db6"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb
new file mode 100644
index 0000000..703f825
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f04a903cc0e18b3c338f58eb90f6caf8"
+SRC_URI[archive.sha256sum] = "c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186"
+
+FILES_${PN} += " /usr/lib/X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb
new file mode 100644
index 0000000..2ff99ce
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9df52a504dc04313a6650fae364ae04a"
+SRC_URI[archive.sha256sum] = "1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb
new file mode 100644
index 0000000..120f42f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9a2aad51042141a0e6ad066015397595"
+SRC_URI[archive.sha256sum] = "95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb
new file mode 100644
index 0000000..50c4270
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8b882d9e2deed9d85469a3beaec566a3"
+SRC_URI[archive.sha256sum] = "15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb
new file mode 100644
index 0000000..1771578
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "521574088fbd688edbf91e6bae674265"
+SRC_URI[archive.sha256sum] = "06c1049f6b63d1c368a1e03e2392097919b22ff24899e190de3577bffe6fe524"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb
new file mode 100644
index 0000000..7d8270a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "224c36057e4416205d4e421af01a2f15"
+SRC_URI[archive.sha256sum] = "b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb
new file mode 100644
index 0000000..1829819
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9144097186c3d2454beffe8ac3b53c6e"
+SRC_URI[archive.sha256sum] = "c79ec1a4d60404715a626f2832f1b62f43b9d52a1e4642b40af743ee41362590"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb
new file mode 100644
index 0000000..fc5ca59
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+DEPENDS += "util-linux-ng"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fe1696cab2fbed6fa059d0cd1c53ac13"
+SRC_URI[archive.sha256sum] = "ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb b/recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb
new file mode 100644
index 0000000..dac3150
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "977d657e8d7b59f7d82c98ebef444b28"
+SRC_URI[archive.sha256sum] = "330c3e5188abf256131c162c456060804f369349e9a0e7aa3efbc54add802e45"
diff --git a/recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb b/recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb
new file mode 100644
index 0000000..9e58205
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "58e619576cbf4b6057eebb7a97fe2ddf"
+SRC_URI[archive.sha256sum] = "3195916b6cebf109eb571b939d7cea7075ef1933782526a6d8fbbb353bc3924b"
diff --git a/recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb b/recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb
new file mode 100644
index 0000000..9b990b0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "82400f0ba63217df9b00d825532cea7d"
+SRC_URI[archive.sha256sum] = "e33c8361c2b6cb13db9a7157753d417c168c8203c8b7027e9dda2fbeef00fd33"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb
new file mode 100644
index 0000000..ebc8375
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+DEPENDS += " libxkbfile"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "2fbcae1323c266edf5b6c61751f2e343"
+SRC_URI[archive.sha256sum] = "0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb
new file mode 100644
index 0000000..64b2370
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+DEPENDS += " libxkbfile"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "d5122f1d5a91725a81c843f3bd388244"
+SRC_URI[archive.sha256sum] = "fefc574bf639d64348939edf9654306af2bb3c20447be9cff493cb06d87cb672"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb
new file mode 100644
index 0000000..bcd1455
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+DEPENDS += " libxkbfile"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "6cc96c3e4ed5d9802fe717beac008f19"
+SRC_URI[archive.sha256sum] = "204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb
new file mode 100644
index 0000000..66b6937
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxkbfile "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "68f2a143716c23b566f8509d9498f516"
+SRC_URI[archive.sha256sum] = "4b78e316ecf9a9498291f634a7e9ee712ba429d5606f300c0a27eacdaaa1f72b"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb
new file mode 100644
index 0000000..7547e96
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxkbfile "
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "84396a3dd75337caaae29d8fa5616fb1"
+SRC_URI[archive.sha256sum] = "aaad73ed8db764978a18bc6ba774d38a4c1330c86622c0b47ae3ced09c175856"
diff --git a/recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb
new file mode 100644
index 0000000..ba95dbe
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f66d76abb0f75514ca32272e23cca757"
+SRC_URI[archive.sha256sum] = "77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de"
diff --git a/recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb
new file mode 100644
index 0000000..9b72817
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ba013813f9c21eb015559466f8d02a44"
+SRC_URI[archive.sha256sum] = "8d51184d6b18eea2f64e0c5b88cd95edff8353ce6529e780f95b1f2347babbf2"
diff --git a/recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb
new file mode 100644
index 0000000..3acd54f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "69adcda848479acc3b82b3928812d191"
+SRC_URI[archive.sha256sum] = "456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a"
diff --git a/recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb
new file mode 100644
index 0000000..9b32088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "44473b880d26bfbe8b3d4d72b183cba7"
+SRC_URI[archive.sha256sum] = "988c71c6dc3519523fe5844ee3e49d91f843a83c783dd0baa20526d9d2981698"
diff --git a/recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb
new file mode 100644
index 0000000..5a88403
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ca9c6c88d0b83360b7b5092615fbf591"
+SRC_URI[archive.sha256sum] = "c8d826194299b2b8e3c6edce7070f05421465b0118ed47135a0195d12fe8a720"
diff --git a/recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb
new file mode 100644
index 0000000..c09140d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "058d168d1c7c991b8d12158433ea5f63"
+SRC_URI[archive.sha256sum] = "1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02"
diff --git a/recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb
new file mode 100644
index 0000000..2856093
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "magnify parts of the screen"
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7c6a783e42c88360ac31d259a864a19d"
+SRC_URI[archive.sha256sum] = "51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43"
diff --git a/recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb
new file mode 100644
index 0000000..1844180
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxprintutil libxp libxt"
+RDEPENDS_${PN} = " man"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "855f2dbfa2aff58b8b9cd6a1c1120fad"
+SRC_URI[archive.sha256sum] = "00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2"
+
+FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb
new file mode 100644
index 0000000..d1dcf65
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb
@@ -0,0 +1,11 @@
+require xorg-app-common.inc
+DESCRIPTION = "manual page browser for X"
+DEPENDS += " libxaw libxprintutil libxp libxt"
+RDEPENDS_${PN} = " man"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3d3a4b310a65ccce82472ef83acbbf97"
+SRC_URI[archive.sha256sum] = "38e03bfa2d3d109d55342e3539be952268e405fb458fb8c4f87739594a25394a"
+
+FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb
new file mode 100644
index 0000000..5ecfae0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "xmessage displays a message or query in a window."
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b3674c3a00a089764d86aa94e257ccec"
+SRC_URI[archive.sha256sum] = "b921aef62c2a2f5c32048502cd96630e9d42493cd39d1841fde247274f24bbda"
diff --git a/recipes/obsolete/xorg/xorg-app/xmodmap/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xmodmap/autofoo.patch
new file mode 100644
index 0000000..f309add
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmodmap/autofoo.patch
@@ -0,0 +1,109 @@
+diff -urN xmodmap.orig/Makefile.am xmodmap/Makefile.am
+--- xmodmap.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xmodmap/Makefile.am 2004-08-31 19:49:33.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XMODMAP_CFLAGS@
++
++bin_PROGRAMS = xmodmap
++
++xmodmap_SOURCES = exec.c handle.c pf.c wq.h xmodmap.c xmodmap.h
++
++xmodmap_LDADD = @XMODMAP_LIBS@
++
++man5_MANS=xmodmap.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xmodmap.orig/autogen.sh xmodmap/autogen.sh
+--- xmodmap.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xmodmap/autogen.sh 2004-08-31 19:46:14.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xmodmap.orig/configure.ac xmodmap/configure.ac
+--- xmodmap.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xmodmap/configure.ac 2004-08-31 20:27:03.000000000 +0200
+@@ -0,0 +1,41 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xmodmap],4.4.0,[],xmodmap)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XMODMAP, x11)
++
++AC_OUTPUT([Makefile])
diff --git a/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb
new file mode 100644
index 0000000..17bbc7e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ea78b3e32e27c3662f86ea68b3aec22f"
+SRC_URI[archive.sha256sum] = "4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44"
diff --git a/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb
new file mode 100644
index 0000000..ab245b3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "626731003ec22a74ecf9e44ed098bbdf"
+SRC_URI[archive.sha256sum] = "c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f"
diff --git a/recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb
new file mode 100644
index 0000000..5e70d01
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "01c0a14755fc91369e8c011c9f881d5d"
+SRC_URI[archive.sha256sum] = "b871221d23dc4fc50398e9fe0e2a6a4e951aa6c9df2c5671d069ad88f0fd6249"
diff --git a/recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb
new file mode 100644
index 0000000..f117bd8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "print an X window dump"
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6b3a6896081f628bf5a2c9129417c86f"
+SRC_URI[archive.sha256sum] = "c325a9896d1cda43a681f1c2a6a2bbb1c580ade57a882b0a8f84ffa359238adf"
diff --git a/recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch
new file mode 100644
index 0000000..2526d95
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch
@@ -0,0 +1,157 @@
+diff -urN xprop.orig/Makefile.am xprop/Makefile.am
+--- xprop.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xprop/Makefile.am 2004-08-15 18:49:43.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XPROP_CFLAGS@
++
++bin_PROGRAMS = xprop
++
++xprop_SOURCES = dsimple.c dsimple.h xprop.c
++
++xprop_LDADD = @XPROP_LIBS@
++
++man5_MANS=xprop.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xprop.orig/configure.ac xprop/configure.ac
+--- xprop.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xprop/configure.ac 2004-08-15 19:00:43.000000000 +0200
+@@ -0,0 +1,44 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xprop],4.4.0,[],xprop)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XPROP, xext xmuu x11)
++
++AC_CHECK_HEADERS([wchar.h])
++AC_CHECK_HEADERS([wctype.h])
++
++AC_OUTPUT([Makefile])
+diff -urN xprop.orig/dsimple.c xprop/dsimple.c
+--- xprop.orig/dsimple.c 2003-11-14 16:54:54.000000000 +0100
++++ xprop/dsimple.c 2004-08-15 19:19:32.000000000 +0200
+@@ -27,11 +27,16 @@
+
+ */
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ /*
+ * Other_stuff.h: Definitions of routines in other_stuff.
+ *
+@@ -69,7 +74,7 @@
+ char *Malloc(size)
+ unsigned size;
+ {
+- char *data, *malloc();
++ char *data;
+
+ if (!(data = malloc(size)))
+ Fatal_Error("Out of memory!");
+@@ -85,7 +90,7 @@
+ char *ptr;
+ int size;
+ {
+- char *new_ptr, *realloc();
++ char *new_ptr;
+
+ if (!ptr)
+ return(Malloc(size));
+diff -urN xprop.orig/xprop.c xprop/xprop.c
+--- xprop.orig/xprop.c 2004-04-23 21:55:03.000000000 +0200
++++ xprop/xprop.c 2004-08-15 19:23:13.000000000 +0200
+@@ -30,6 +30,10 @@
+ /* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */
+
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xlib.h>
+ #include <X11/Xos.h>
+ #include <X11/Xfuncs.h>
diff --git a/recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb
new file mode 100644
index 0000000..f57c8de
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5b6f02a3b1cda0cadc35f84814fe53d4"
+SRC_URI[archive.sha256sum] = "88b1e65703c68f14ac6cb735737d1a0e52751a18fdc8a39d2d1e5eaa07875ca0"
diff --git a/recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb
new file mode 100644
index 0000000..526db7b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "a property displayer for X"
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "48aa8fd78802f477dcbf9ef0dfd9f783"
+SRC_URI[archive.sha256sum] = "daa47cba7d5a919ca1bd053d8a8b6af4904f77eded4bdb055cd915aa5f5cd772"
diff --git a/recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb b/recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb
new file mode 100644
index 0000000..b09b16b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE = "BSD-X"
+DEPENDS += "libxrandr libxrender"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://resolve_symbol_clash.patch"
+SRC_URI[archive.md5sum] = "c6ec9dc42396e3b3a2da932f3feca6ec"
+SRC_URI[archive.sha256sum] = "632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303"
diff --git a/recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb b/recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb
new file mode 100644
index 0000000..6923ce3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE = "BSD-X"
+DEPENDS += "libxrandr libxrender"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://resolve_symbol_clash.patch"
+SRC_URI[archive.md5sum] = "41a9d0cc073fa6165a31fbf9e85f68a6"
+SRC_URI[archive.sha256sum] = "ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207"
diff --git a/recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch
new file mode 100644
index 0000000..b30a46b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch
@@ -0,0 +1,132 @@
+diff -urN xrdb.orig/Imakefile xrdb/Imakefile
+--- xrdb.orig/Imakefile 2004-04-23 21:55:03.000000000 +0200
++++ xrdb/Imakefile 1970-01-01 01:00:00.000000000 +0100
+@@ -1,19 +0,0 @@
+-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $
+-
+-
+-
+-
+-XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.6tsi Exp $
+-
+-#ifdef PatheticCpp
+- CPPDEFS = -DPATHETICCPP
+-#endif
+-#if HasMkstemp
+- CPPDEFS = -DHAS_MKSTEMP
+-#endif
+-XCOMM Due to ill make parsing the cpp is passed directly in source file
+- DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS)
+- DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB)
+-LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB)
+-
+-SimpleProgramTarget(xrdb)
+diff -urN xrdb.orig/Makefile.am xrdb/Makefile.am
+--- xrdb.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xrdb/Makefile.am 2004-08-14 16:05:01.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XRDB_CFLAGS@
++
++bin_PROGRAMS = xrdb
++
++xrdb_SOURCES = xrdb.c
++
++xrdb_LDADD = @XRDB_LIBS@
++
++man5_MANS=xrdb.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xrdb.orig/autogen.sh xrdb/autogen.sh
+--- xrdb.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xrdb/autogen.sh 2004-08-14 15:57:35.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xrdb.orig/configure.ac xrdb/configure.ac
+--- xrdb.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xrdb/configure.ac 2004-08-14 16:03:31.000000000 +0200
+@@ -0,0 +1,41 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xrdb],4.4.0,[],xrdb)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XRDB, xext xmuu x11)
++
++AC_OUTPUT([Makefile])
diff --git a/recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb
new file mode 100644
index 0000000..6c4d86d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "380b2ef545306354cc150834de567be7"
+SRC_URI[archive.sha256sum] = "a4a3b8cd821adc201a072f8c0214d73ee6a7e7b898de90e18f7d89a4453fb12c"
diff --git a/recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb
new file mode 100644
index 0000000..7181dc9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "34eb2311a0c5279e7b4f492e826f63d1"
+SRC_URI[archive.sha256sum] = "3f8cde77e8cbeb6d0a5f232b7a2ee51dd49b677916d52ab0986d320a5f9e8000"
diff --git a/recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb
new file mode 100644
index 0000000..d474dc8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9c30b8e1709d5367beb7706146640c07"
+SRC_URI[archive.sha256sum] = "c24d08939250f10238fd1b984707bfa0901ba9c55fa36b67d91eb12b500500aa"
diff --git a/recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb
new file mode 100644
index 0000000..a97f1af
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1228f890f86148e4e6ae22aa73118cbb"
+SRC_URI[archive.sha256sum] = "522831fd29c0b250f29735a01b02e96e311f200a675e45c8b3d187b6f86b32f5"
diff --git a/recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb
new file mode 100644
index 0000000..25f0c80
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt libxext xtrans xproxymngproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5f65e24f8a225e255beb2059e33d6b37"
+SRC_URI[archive.sha256sum] = "a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4"
diff --git a/recipes/obsolete/xorg/xorg-app/xset/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xset/autofoo.patch
new file mode 100644
index 0000000..039d131
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset/autofoo.patch
@@ -0,0 +1,109 @@
+diff -urN xset.orig/Makefile.am xset/Makefile.am
+--- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xset/Makefile.am 2004-08-14 16:32:10.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XSET_CFLAGS@
++
++bin_PROGRAMS = xset
++
++xset_SOURCES = xset.c
++
++xset_LDADD = @XSET_LIBS@
++
++man5_MANS=xset.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xset.orig/autogen.sh xset/autogen.sh
+--- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xset.orig/configure.ac xset/configure.ac
+--- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xset/configure.ac 2004-08-17 14:21:25.000000000 +0200
+@@ -0,0 +1,41 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xset],4.4.0,[],xset)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XSET, xext xextensions xmuu x11)
++
++AC_OUTPUT([Makefile])
diff --git a/recipes/obsolete/xorg/xorg-app/xset/disable-xkb.patch b/recipes/obsolete/xorg/xorg-app/xset/disable-xkb.patch
new file mode 100644
index 0000000..6060fbb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset/disable-xkb.patch
@@ -0,0 +1,18 @@
+--- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100
++++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100
+@@ -42,11 +42,15 @@
+ AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+
++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
++ XKB="$enableval", XKB="yes")
++if test "x$XKB" = "xyes" ; then
+ PKG_CHECK_MODULES(SET_XKB, x11,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
+ AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
++fi
+
+ PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb
new file mode 100644
index 0000000..35aebe5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb
@@ -0,0 +1,14 @@
+require xorg-app-common.inc
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "1b781a0802c7b8fb9619a6665607b3f0"
+SRC_URI[archive.sha256sum] = "ce1e17c513a4499526e648a59c39ba01777c99c86093433cf392f27654b795c9"
+
+EXTRA_OECONF = "--disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb
new file mode 100644
index 0000000..c37b4bb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb
@@ -0,0 +1,14 @@
+require xorg-app-common.inc
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "657bbb43ce5470c33665d187c1740566"
+SRC_URI[archive.sha256sum] = "0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11"
+
+EXTRA_OECONF = "--disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb
new file mode 100644
index 0000000..24c35e0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb
@@ -0,0 +1,14 @@
+require xorg-app-common.inc
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "2f41fd983ba4d89419204854936025e2"
+SRC_URI[archive.sha256sum] = "6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad"
+
+EXTRA_OECONF = "--disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb b/recipes/obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb
new file mode 100644
index 0000000..409ea16
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxi "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c94ea103e27e370e4e5030e50c5d5d69"
+SRC_URI[archive.sha256sum] = "7d65f450420b4f764dcf38e4ccee9d608b5a5874706e716cb861bfe2586b7d4a"
diff --git a/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb
new file mode 100644
index 0000000..c81a319
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fc7eeb7130bb54345671a9dbaab567ac"
+SRC_URI[archive.sha256sum] = "897d77acd3f4a366472386139827eaac24cc423c811ef0e65e0d5eca099a3155"
diff --git a/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb
new file mode 100644
index 0000000..dc79d52
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9af7db9f3052aef0b11636720b3101dd"
+SRC_URI[archive.sha256sum] = "4f9a751f4830d479fae8ccb68ed04896dc99612789310b7917bd15c04aa3351d"
diff --git a/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb
new file mode 100644
index 0000000..ee77b80
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "Print out X-Video extension adaptor information"
+DEPENDS += " libxv"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0a5bd8e43de6eb8ff5b5bc673204401d"
+SRC_URI[archive.sha256sum] = "439b3c7ad96fc7b1ef9156c716e10b607883a9a58b777f8dc02f03284eb33fb3"
diff --git a/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb
new file mode 100644
index 0000000..8422d34
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "Print out X-Video extension adaptor information"
+DEPENDS += " libxv"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e1e318436f49e2f0f3764593dadd9ad2"
+SRC_URI[archive.sha256sum] = "126e2a612ac723f9688904fcfa612688d62e520ce55c56eb34eb5390074cf150"
diff --git a/recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb
new file mode 100644
index 0000000..bfe181b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "911addfb7fa402217ddac63e5c1d97c7"
+SRC_URI[archive.sha256sum] = "c8bd9bcd64df439c2cd09eaa3e83a1297fbfed5c7d3dd8117342b3a25eeae131"
diff --git a/recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb
new file mode 100644
index 0000000..597aa05
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0a6ef08a2ac08ad5c4dd1522eb3788a3"
+SRC_URI[archive.sha256sum] = "ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61"
diff --git a/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb
new file mode 100644
index 0000000..288af54
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu libxext "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e5dbc8866a55958297f5f38205b6be1e"
+SRC_URI[archive.sha256sum] = "9fdfd3259b335531cdba831872ec0e32c5f6df01e14b87c3187b494be75b7b66"
diff --git a/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb
new file mode 100644
index 0000000..01f6c9b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "window information utility for X"
+DEPENDS += " libxmu libxext "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "721f84332c98c33152460bb22ba9ded6"
+SRC_URI[archive.sha256sum] = "fbe3a1aafbc6fa113e58971ff2a82605a7e106af8b810eea4b7512de58a5478a"
diff --git a/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb
new file mode 100644
index 0000000..317aa1d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu libxext "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e2a9bf5ab7f2a0866700a3b49dd8c6bf"
+SRC_URI[archive.sha256sum] = "df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4"
diff --git a/recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb
new file mode 100644
index 0000000..53d06df
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6e3c5d0297d88e890b6f5df31f73dd60"
+SRC_URI[archive.sha256sum] = "d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c"
diff --git a/recipes/xorg-app/appres_1.0.1.bb b/recipes/xorg-app/appres_1.0.1.bb
deleted file mode 100644
index 698b7c4..0000000
--- a/recipes/xorg-app/appres_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The appres program prints the resources seen by an application."
-DEPENDS += " libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "420e6cdf38bb771ec8b00228bf09e8ff"
-SRC_URI[archive.sha256sum] = "15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962"
diff --git a/recipes/xorg-app/bdftopcf_1.0.1.bb b/recipes/xorg-app/bdftopcf_1.0.1.bb
deleted file mode 100644
index d5ddd50..0000000
--- a/recipes/xorg-app/bdftopcf_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "converts BDF fonts to PCF fonts"
-DEPENDS += " libxfont"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "9685fab33d39954ab8a0d22e0969d5a4"
-SRC_URI[archive.sha256sum] = "aaaa45ab361781aebda2093fdc7eb5c187f6215b4ba308dd6b9ff2b727e805d3"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/beforelight_1.0.2.bb b/recipes/xorg-app/beforelight_1.0.2.bb
deleted file mode 100644
index 09852db..0000000
--- a/recipes/xorg-app/beforelight_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxscrnsaver libxt libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8bc2e35cdcd2e6a80eab1b77c41f2a46"
-SRC_URI[archive.sha256sum] = "00e217559c93779fe04fd948017820af118a3981d6b4371ace95107cb3b047a7"
diff --git a/recipes/xorg-app/bitmap_1.0.2.bb b/recipes/xorg-app/bitmap_1.0.2.bb
deleted file mode 100644
index 70be2aa..0000000
--- a/recipes/xorg-app/bitmap_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu xbitmaps libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "78e8ab5c1830e2cdfbff7a952162a5a7"
-SRC_URI[archive.sha256sum] = "83719927ac4309f42e3cadde125a52cfba2e9c951115ac4c017f292f6e4c14bc"
diff --git a/recipes/xorg-app/bitmap_1.0.3.bb b/recipes/xorg-app/bitmap_1.0.3.bb
deleted file mode 100644
index 9a83106..0000000
--- a/recipes/xorg-app/bitmap_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu xbitmaps libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "98200c358e5401d648b980564d9ae39d"
-SRC_URI[archive.sha256sum] = "863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41"
diff --git a/recipes/xorg-app/constype_1.0.1.bb b/recipes/xorg-app/constype_1.0.1.bb
deleted file mode 100644
index d8a957b..0000000
--- a/recipes/xorg-app/constype_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "print an X window dump"
-DEPENDS += " libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9f99bee77ff3c565b4898663810fbef5"
-SRC_URI[archive.sha256sum] = "11403054cb407cdf31da48216f55d1b5943798cb442bcab69faa0a3d7d167541"
diff --git a/recipes/xorg-app/editres_1.0.2.bb b/recipes/xorg-app/editres_1.0.2.bb
deleted file mode 100644
index 23956d3..0000000
--- a/recipes/xorg-app/editres_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt libxmu libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9db49742bd4c17966fff7d76ac566d31"
-SRC_URI[archive.sha256sum] = "978fbc134eef3da8a5f363c9e93494a3d7399e8f2b435ac6b1f2c63f09c167df"
diff --git a/recipes/xorg-app/editres_1.0.3.bb b/recipes/xorg-app/editres_1.0.3.bb
deleted file mode 100644
index 56cadc1..0000000
--- a/recipes/xorg-app/editres_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt libxmu libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a25f931cc6c8d03daaed434f5db5df2d"
-SRC_URI[archive.sha256sum] = "a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae"
diff --git a/recipes/xorg-app/fonttosfnt_1.0.3.bb b/recipes/xorg-app/fonttosfnt_1.0.3.bb
deleted file mode 100644
index 71e147c..0000000
--- a/recipes/xorg-app/fonttosfnt_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " xproto freetype libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b0ebd86029571239b9d7b0c61191b591"
-SRC_URI[archive.sha256sum] = "9d2b0149ea49a097ab6c563801c06af9975e98f9fa4c8af1a8ac3238e4fd5243"
diff --git a/recipes/xorg-app/fslsfonts_1.0.1.bb b/recipes/xorg-app/fslsfonts_1.0.1.bb
deleted file mode 100644
index c1040ad..0000000
--- a/recipes/xorg-app/fslsfonts_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libfs"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c7b2f8a938749d41dc86db6bd1e6a4ca"
-SRC_URI[archive.sha256sum] = "3feb006a25f36856924e26249fe84b27142678f97175780960f085e1e263a62e"
diff --git a/recipes/xorg-app/fstobdf_1.0.2.bb b/recipes/xorg-app/fstobdf_1.0.2.bb
deleted file mode 100644
index 6c3148c..0000000
--- a/recipes/xorg-app/fstobdf_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libfs"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "99144743ab3cbb9cf37090fdc9e747db"
-SRC_URI[archive.sha256sum] = "690e45b252cd96036dd9b89af8624eb423e16d4bd662b07d264a3f876ce7ac22"
diff --git a/recipes/xorg-app/iceauth_1.0.2.bb b/recipes/xorg-app/iceauth_1.0.2.bb
deleted file mode 100644
index bcda802..0000000
--- a/recipes/xorg-app/iceauth_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a tool for manipulating ICE protocol authorization records"
-DEPENDS += " libice"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7ab8b64edf0212a9d9a3c8129901a450"
-SRC_URI[archive.sha256sum] = "06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb"
diff --git a/recipes/xorg-app/lbxproxy_1.0.1.bb b/recipes/xorg-app/lbxproxy_1.0.1.bb
deleted file mode 100644
index 7b35f1b..0000000
--- a/recipes/xorg-app/lbxproxy_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Applications that would like to take advantage of the Low Bandwidth \
-extension to X (LBX) must make their connections to an lbxproxy."
-DEPENDS += " xtrans libxext liblbxutil libice xproxymngproto bigreqsproto zlib"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9d5045a5c76b1fe360221b967a5aa0e9"
-SRC_URI[archive.sha256sum] = "e2e757986724a5d2ee299aa7616a3d9985af45e363021b486b7abbcac4ca01c2"
diff --git a/recipes/xorg-app/luit_1.0.2.bb b/recipes/xorg-app/luit_1.0.2.bb
deleted file mode 100644
index d8c3475..0000000
--- a/recipes/xorg-app/luit_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " zlib zlib libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "aacda46598ce3af8ca16e2a8132db1b2"
-SRC_URI[archive.sha256sum] = "c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c"
diff --git a/recipes/xorg-app/luit_1.0.3.bb b/recipes/xorg-app/luit_1.0.3.bb
deleted file mode 100644
index 4baac79..0000000
--- a/recipes/xorg-app/luit_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals"
-DEPENDS += " zlib zlib libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b01e4f71c20fc1c79ed727759c1df40c"
-SRC_URI[archive.sha256sum] = "2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7"
diff --git a/recipes/xorg-app/mkcomposecache_1.2.bb b/recipes/xorg-app/mkcomposecache_1.2.bb
deleted file mode 100644
index 8de1fad..0000000
--- a/recipes/xorg-app/mkcomposecache_1.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "used for creating global (system-wide) Compose cache files"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c8237b4aea1ae0c15441deab6b12c5c0"
-SRC_URI[archive.sha256sum] = "8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb"
diff --git a/recipes/xorg-app/mkfontdir_1.0.3.bb b/recipes/xorg-app/mkfontdir_1.0.3.bb
deleted file mode 100644
index e3d1782..0000000
--- a/recipes/xorg-app/mkfontdir_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of X font files in a directory"
-RDEPENDS_${PN} += "mkfontscale"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "4d0f89a23f77e22f1671a77bf0898955"
-SRC_URI[archive.sha256sum] = "2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/mkfontdir_1.0.4.bb b/recipes/xorg-app/mkfontdir_1.0.4.bb
deleted file mode 100644
index dbc0884..0000000
--- a/recipes/xorg-app/mkfontdir_1.0.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of X font files in a directory"
-RDEPENDS_${PN} += "mkfontscale"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "35394bf3f746a57fba624dba52fdbba3"
-SRC_URI[archive.sha256sum] = "6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/mkfontscale_1.0.3.bb b/recipes/xorg-app/mkfontscale_1.0.3.bb
deleted file mode 100644
index 10d511f..0000000
--- a/recipes/xorg-app/mkfontscale_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of scalable font files for X"
-DEPENDS += " zlib libfontenc freetype "
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "1d608771aca9695b828cec1e34178fd1"
-SRC_URI[archive.sha256sum] = "0458a3a5525b4ab458a018648ef8575afc191f904364c00e27876a7bd53af020"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/mkfontscale_1.0.4.bb b/recipes/xorg-app/mkfontscale_1.0.4.bb
deleted file mode 100644
index 6a29088..0000000
--- a/recipes/xorg-app/mkfontscale_1.0.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of scalable font files for X"
-DEPENDS += " zlib libfontenc freetype "
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "e5d7373c4266973b3b13aac5d1a4655b"
-SRC_URI[archive.sha256sum] = "dc9b946cc23490c960fbca8b32e4bba4bc23ce404a8d7e1c0e916894c83b4227"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/mkfontscale_1.0.5.bb b/recipes/xorg-app/mkfontscale_1.0.5.bb
deleted file mode 100644
index 5e37e8e..0000000
--- a/recipes/xorg-app/mkfontscale_1.0.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of scalable font files for X"
-DEPENDS += " zlib libfontenc freetype "
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "5e6e210b70adfef1264b0212aab1f758"
-SRC_URI[archive.sha256sum] = "f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/rgb_1.0.1.bb b/recipes/xorg-app/rgb_1.0.1.bb
deleted file mode 100644
index c78047f..0000000
--- a/recipes/xorg-app/rgb_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " xproto util-macros"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "255222b3ab3af671289a6b4844e9f393"
-SRC_URI[archive.sha256sum] = "f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad"
-
-FILES_${PN} += "${datadir}/X11"
diff --git a/recipes/xorg-app/rstart_1.0.2.bb b/recipes/xorg-app/rstart_1.0.2.bb
deleted file mode 100644
index 2f17f8a..0000000
--- a/recipes/xorg-app/rstart_1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "99aea04a27197056368a4431f30f9cdb"
-SRC_URI[archive.sha256sum] = "02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596"
diff --git a/recipes/xorg-app/sessreg_1.0.2.bb b/recipes/xorg-app/sessreg_1.0.2.bb
deleted file mode 100644
index e7bede7..0000000
--- a/recipes/xorg-app/sessreg_1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "bee5d87d40615e67c84ab0b0c65049ba"
-SRC_URI[archive.sha256sum] = "c23c12259854c7cec6d19bf397afff4a542a22170b14de73b321aa8cafcf3a86"
diff --git a/recipes/xorg-app/sessreg_1.0.3.bb b/recipes/xorg-app/sessreg_1.0.3.bb
deleted file mode 100644
index 5482af9..0000000
--- a/recipes/xorg-app/sessreg_1.0.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "07665816f2623ec82e665fb7d31c6cef"
-SRC_URI[archive.sha256sum] = "7d0c145d53246ddf09fc749f91324897ed9a3da0064808f99b789c37470080dc"
diff --git a/recipes/xorg-app/sessreg_1.0.4.bb b/recipes/xorg-app/sessreg_1.0.4.bb
deleted file mode 100644
index 9738608..0000000
--- a/recipes/xorg-app/sessreg_1.0.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a simple program for managing utmp/wtmp entries"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "839e968d7197b9563f0fd8a5a3aac2e3"
-SRC_URI[archive.sha256sum] = "23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802"
diff --git a/recipes/xorg-app/setxkbmap_1.0.3.bb b/recipes/xorg-app/setxkbmap_1.0.3.bb
deleted file mode 100644
index f9434d7..0000000
--- a/recipes/xorg-app/setxkbmap_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxkbfile "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2b53542095a35a8a5731164118643883"
-SRC_URI[archive.sha256sum] = "086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508"
diff --git a/recipes/xorg-app/setxkbmap_1.0.4.bb b/recipes/xorg-app/setxkbmap_1.0.4.bb
deleted file mode 100644
index 8a9558b..0000000
--- a/recipes/xorg-app/setxkbmap_1.0.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxkbfile "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6fab3bb176be9e510c5613d054ef1ca4"
-SRC_URI[archive.sha256sum] = "9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac"
diff --git a/recipes/xorg-app/showfont_1.0.1.bb b/recipes/xorg-app/showfont_1.0.1.bb
deleted file mode 100644
index a5ffa3a..0000000
--- a/recipes/xorg-app/showfont_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libfs"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "339b2faf1ca5114fda414338e15b6e21"
-SRC_URI[archive.sha256sum] = "87db3cf12914abc6b074d12b35c7f39c8fd7b5d3933b339e2c1260a51061760c"
diff --git a/recipes/xorg-app/smproxy_1.0.2.bb b/recipes/xorg-app/smproxy_1.0.2.bb
deleted file mode 100644
index 0ef6033..0000000
--- a/recipes/xorg-app/smproxy_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "31da204a0255ba8c6a65386e65dc1c90"
-SRC_URI[archive.sha256sum] = "76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2"
diff --git a/recipes/xorg-app/twm_1.0.3.bb b/recipes/xorg-app/twm_1.0.3.bb
deleted file mode 100644
index feaebdd..0000000
--- a/recipes/xorg-app/twm_1.0.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "tiny window manager"
-DEPENDS += " libxext libxt libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a56b71dc40249195b32b304633c28a3e"
-SRC_URI[archive.sha256sum] = "5b41550477a893bf2b82ab73fc7fb6c839ba52d0deac059be1a473dd7bb92a4e"
-
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/twm"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "1"
diff --git a/recipes/xorg-app/x11perf_1.4.1.bb b/recipes/xorg-app/x11perf_1.4.1.bb
deleted file mode 100644
index 7c61228..0000000
--- a/recipes/xorg-app/x11perf_1.4.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X11 server performance test program"
-DEPENDS += "libxmu libxrender libxft libxext fontconfig"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fd06c8b8e3572a0e14af65a49e0dd7d1"
-SRC_URI[archive.sha256sum] = "c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064"
diff --git a/recipes/xorg-app/x11perf_1.5.bb b/recipes/xorg-app/x11perf_1.5.bb
deleted file mode 100644
index 9cff277..0000000
--- a/recipes/xorg-app/x11perf_1.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X11 server performance test program"
-DEPENDS += "libxmu libxrender libxft libxext fontconfig"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "31283bfc3c78718ac1bd71e510d4e774"
-SRC_URI[archive.sha256sum] = "4729da53dde0b7e1748db4bb771f9b7aaf2e2b1e67293a3a5b96d54043ce1233"
-
-FILES_${PN} += "/usr/lib/X11/x11perfcomp/*"
diff --git a/recipes/xorg-app/xauth_1.0.2.bb b/recipes/xorg-app/xauth_1.0.2.bb
deleted file mode 100644
index bd391a2..0000000
--- a/recipes/xorg-app/xauth_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X authority file utility"
-DEPENDS += "libxau libxext libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "31b956edaeb453ddaa640420e97b25b2"
-SRC_URI[archive.sha256sum] = "569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17"
diff --git a/recipes/xorg-app/xauth_1.0.3.bb b/recipes/xorg-app/xauth_1.0.3.bb
deleted file mode 100644
index 7adb51d..0000000
--- a/recipes/xorg-app/xauth_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X authority file utility"
-DEPENDS += "libxau libxext libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e91e10ace1df0d5f2cbc74ead256407a"
-SRC_URI[archive.sha256sum] = "1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c"
diff --git a/recipes/xorg-app/xbacklight_1.1.bb b/recipes/xorg-app/xbacklight_1.1.bb
deleted file mode 100644
index 287b2b1..0000000
--- a/recipes/xorg-app/xbacklight_1.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "adjust backlight brightness using RandR extension"
-DEPENDS += " libxrender libxrandr"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "51b4a1c0ae2b3bd77417306fd78a3e94"
-SRC_URI[archive.sha256sum] = "c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4"
diff --git a/recipes/xorg-app/xcalc_1.0.1.bb b/recipes/xorg-app/xcalc_1.0.1.bb
deleted file mode 100644
index ff042f0..0000000
--- a/recipes/xorg-app/xcalc_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "07b948cf671fde88df1a59bfb0cab3b8"
-SRC_URI[archive.sha256sum] = "17484e5fec0ebe7dd8df7218fde1449c52be3f4c6377a85a9fd86e377a7f4248"
diff --git a/recipes/xorg-app/xclipboard_1.0.1.bb b/recipes/xorg-app/xclipboard_1.0.1.bb
deleted file mode 100644
index 06aeda2..0000000
--- a/recipes/xorg-app/xclipboard_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2c6ecedb10dc51adbb64c95f22fd99c2"
-SRC_URI[archive.sha256sum] = "3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc"
diff --git a/recipes/xorg-app/xclock_1.0.2.bb b/recipes/xorg-app/xclock_1.0.2.bb
deleted file mode 100644
index 0bf6117..0000000
--- a/recipes/xorg-app/xclock_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6b930326f71993fb54b7203902b387cd"
-SRC_URI[archive.sha256sum] = "ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d"
diff --git a/recipes/xorg-app/xclock_1.0.3.bb b/recipes/xorg-app/xclock_1.0.3.bb
deleted file mode 100644
index 73ac39c..0000000
--- a/recipes/xorg-app/xclock_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "analog / digital clock for X"
-DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2b1a3d030d87e62a591db8ee4c0072e6"
-SRC_URI[archive.sha256sum] = "10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f"
diff --git a/recipes/xorg-app/xcmsdb_1.0.1.bb b/recipes/xorg-app/xcmsdb_1.0.1.bb
deleted file mode 100644
index 770db7e..0000000
--- a/recipes/xorg-app/xcmsdb_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8579d5f50ba7f0c4a5bf16b9670fea01"
-SRC_URI[archive.sha256sum] = "e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e"
diff --git a/recipes/xorg-app/xconsole_1.0.2.bb b/recipes/xorg-app/xconsole_1.0.2.bb
deleted file mode 100644
index a7eacc3..0000000
--- a/recipes/xorg-app/xconsole_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8678ddd23573022d68dcd883ae239be8"
-SRC_URI[archive.sha256sum] = "45db847e810a932bb962041a4c242f97779142f7e36feec64ec5f9073bd9b377"
diff --git a/recipes/xorg-app/xcursorgen_1.0.1.bb b/recipes/xorg-app/xcursorgen_1.0.1.bb
deleted file mode 100644
index 39c6aa2..0000000
--- a/recipes/xorg-app/xcursorgen_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxcursor libpng"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "39e1e62f5bd92603b0230b8b948c2fc4"
-SRC_URI[archive.sha256sum] = "18d3e0d64853089c2154f1f867df087fc15f87e03e09fabc98ee5e265d8a53ef"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xcursorgen_1.0.2.bb b/recipes/xorg-app/xcursorgen_1.0.2.bb
deleted file mode 100644
index a058a88..0000000
--- a/recipes/xorg-app/xcursorgen_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "create an X cursor file from a collection of PNG images"
-DEPENDS += " libxcursor libpng"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "6fc90896b8c786cb1a2100b4167f7874"
-SRC_URI[archive.sha256sum] = "e009322bd2afef8d4ad91bcb6b17874e1cd00b1aaf397e7019a82cc44f3c174e"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xdm_1.1.3.bb b/recipes/xorg-app/xdm_1.1.3.bb
deleted file mode 100644
index 02df29e..0000000
--- a/recipes/xorg-app/xdm_1.1.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "619d0549c6c20ca15aa77769f2fbabe2"
-SRC_URI[archive.sha256sum] = "9e640974c132ef1faafedc77e4602d55457b2791006b677cec071ee8afbf9a74"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/recipes/xorg-app/xdm_1.1.4.bb b/recipes/xorg-app/xdm_1.1.4.bb
deleted file mode 100644
index c0268c5..0000000
--- a/recipes/xorg-app/xdm_1.1.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a2b4c280f3e324d081a0d9ed76a8a123"
-SRC_URI[archive.sha256sum] = "928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/recipes/xorg-app/xdm_1.1.6.bb b/recipes/xorg-app/xdm_1.1.6.bb
deleted file mode 100644
index 9a4d7d3..0000000
--- a/recipes/xorg-app/xdm_1.1.6.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c89f8bc74fda4d19e5f374f59c88810f"
-SRC_URI[archive.sha256sum] = "c41ac89d9da5c3f5424e9c4871d363ff17acf0fd2a46830931c447ba0b5a8bcd"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
-
-FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/xorg-app/xdm_1.1.7.bb b/recipes/xorg-app/xdm_1.1.7.bb
deleted file mode 100644
index 844413c..0000000
--- a/recipes/xorg-app/xdm_1.1.7.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "92effdb698d9ecc9113fe4f49294bd90"
-SRC_URI[archive.sha256sum] = "6a7bceccb1eb9ce3d14259be7a6cc8268bc9e1f127298480b9322ceb6f032d6d"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
-
-FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/xorg-app/xdm_1.1.8.bb b/recipes/xorg-app/xdm_1.1.8.bb
deleted file mode 100644
index fc8fa99..0000000
--- a/recipes/xorg-app/xdm_1.1.8.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "cc1816bc62a3722ad509373b0b7f30fe"
-SRC_URI[archive.sha256sum] = "e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
-
-FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/xorg-app/xdpyinfo_1.0.2.bb b/recipes/xorg-app/xdpyinfo_1.0.2.bb
deleted file mode 100644
index 80f4bf7..0000000
--- a/recipes/xorg-app/xdpyinfo_1.0.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-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"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "c9ee60ae52c97c51d4ca327e53f0cb61"
-SRC_URI[archive.sha256sum] = "c9927fc33e8a4422d74b1ebee0d19dd5a16d9ebc435e8f47f0aa546501ccfed3"
-
-EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-app/xdpyinfo_1.0.3.bb b/recipes/xorg-app/xdpyinfo_1.0.3.bb
deleted file mode 100644
index eff9c09..0000000
--- a/recipes/xorg-app/xdpyinfo_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-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"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "b7cbab6cbcd12bf7ad65dbc12d86e104"
-SRC_URI[archive.sha256sum] = "4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962"
-
-EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-app/xdriinfo_1.0.1.bb b/recipes/xorg-app/xdriinfo_1.0.1.bb
deleted file mode 100644
index 8a349d9..0000000
--- a/recipes/xorg-app/xdriinfo_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " glproto virtual/libgl"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "be3c5a9b242a57226b5bb5f22ec341ca"
-SRC_URI[archive.sha256sum] = "f693977bdaea7eb6b095a6b6bc60b8a62110ecdef4c455211346e592f59c3772"
diff --git a/recipes/xorg-app/xdriinfo_1.0.2.bb b/recipes/xorg-app/xdriinfo_1.0.2.bb
deleted file mode 100644
index 6f27ff2..0000000
--- a/recipes/xorg-app/xdriinfo_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "query configuration information of DRI drivers"
-DEPENDS += " glproto virtual/libgl"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a5ec51ed9f0a55dc3462d90d52ff899c"
-SRC_URI[archive.sha256sum] = "7b03ac095b6c79688c20ad61e3576d4698e3f16c09a7f3f1e7c50826814e7265"
diff --git a/recipes/xorg-app/xedit_1.0.2.bb b/recipes/xorg-app/xedit_1.0.2.bb
deleted file mode 100644
index 001cbcd..0000000
--- a/recipes/xorg-app/xedit_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxprintutil libxp libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c56160e93c24ddf17e69891ed50deb72"
-SRC_URI[archive.sha256sum] = "2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df"
diff --git a/recipes/xorg-app/xev_1.0.2.bb b/recipes/xorg-app/xev_1.0.2.bb
deleted file mode 100644
index 402db0b..0000000
--- a/recipes/xorg-app/xev_1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Event Viewer"
-LICENSE = "MIT"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://diet-x11.patch"
-SRC_URI[archive.md5sum] = "e3008eb0655da3026c162a5597d70869"
-SRC_URI[archive.sha256sum] = "cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053"
diff --git a/recipes/xorg-app/xev_1.0.3.bb b/recipes/xorg-app/xev_1.0.3.bb
deleted file mode 100644
index a0990d2..0000000
--- a/recipes/xorg-app/xev_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Event Viewer"
-LICENSE = "MIT"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://diet-x11.patch"
-SRC_URI[archive.md5sum] = "a9532c3d1683c99bb5df1895cb3a60b1"
-SRC_URI[archive.sha256sum] = "d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a"
diff --git a/recipes/xorg-app/xeyes_1.0.1.bb b/recipes/xorg-app/xeyes_1.0.1.bb
deleted file mode 100644
index 6382df4..0000000
--- a/recipes/xorg-app/xeyes_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxau libxt libxext libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "033f14f7c4e30d1f4edbb22d5ef86883"
-SRC_URI[archive.sha256sum] = "530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029"
diff --git a/recipes/xorg-app/xfs_1.0.4.bb b/recipes/xorg-app/xfs_1.0.4.bb
deleted file mode 100644
index f50eaf4..0000000
--- a/recipes/xorg-app/xfs_1.0.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X fontserver"
-DEPENDS += " libfs libxfont xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f43cb64d623b748208dfd9012d17b654"
-SRC_URI[archive.sha256sum] = "452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b"
diff --git a/recipes/xorg-app/xfs_1.0.5.bb b/recipes/xorg-app/xfs_1.0.5.bb
deleted file mode 100644
index 1d31d21..0000000
--- a/recipes/xorg-app/xfs_1.0.5.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X fontserver"
-DEPENDS += " libfs libxfont xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3fc73b5e39a1fe8b8d96563c8144cffe"
-SRC_URI[archive.sha256sum] = "f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9"
diff --git a/recipes/xorg-app/xfs_1.0.6.bb b/recipes/xorg-app/xfs_1.0.6.bb
deleted file mode 100644
index 24028ac..0000000
--- a/recipes/xorg-app/xfs_1.0.6.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X fontserver"
-DEPENDS += " libfs libxfont xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a62ea490a8b97f74b53732df8fc309d8"
-SRC_URI[archive.sha256sum] = "5a3ad18fdc67e261454740217f7c02d1b6825013abcebdcd778a4865fd823353"
diff --git a/recipes/xorg-app/xfs_1.0.8.bb b/recipes/xorg-app/xfs_1.0.8.bb
deleted file mode 100644
index 6324d81..0000000
--- a/recipes/xorg-app/xfs_1.0.8.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X fontserver"
-DEPENDS += " libfs libxfont xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f10717e45535b64eb45226aac571dac2"
-SRC_URI[archive.sha256sum] = "34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482"
diff --git a/recipes/xorg-app/xfsinfo_1.0.1.bb b/recipes/xorg-app/xfsinfo_1.0.1.bb
deleted file mode 100644
index 2df9b2a..0000000
--- a/recipes/xorg-app/xfsinfo_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libfs"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e98b18fbce1261de30b1de819d86f48a"
-SRC_URI[archive.sha256sum] = "adc33443b3a7f334d2407de702004a0491f24708e0e1abe74cd8ae114cd60cd9"
diff --git a/recipes/xorg-app/xgamma_1.0.1.bb b/recipes/xorg-app/xgamma_1.0.1.bb
deleted file mode 100644
index d6245ee..0000000
--- a/recipes/xorg-app/xgamma_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxxf86vm"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "45d8fa3c85d4bfda87251798fd605a45"
-SRC_URI[archive.sha256sum] = "085330064fdb90a152d2d44474fa20bb81ccb6c587c144f5f9c323cb9cc31eee"
diff --git a/recipes/xorg-app/xgamma_1.0.2.bb b/recipes/xorg-app/xgamma_1.0.2.bb
deleted file mode 100644
index 2b11285..0000000
--- a/recipes/xorg-app/xgamma_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Alter a monitor's gamma correction through the X server"
-DEPENDS += " libxxf86vm"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f13ddedaa63a608d3b025d326f4f5b5d"
-SRC_URI[archive.sha256sum] = "5d3d5b230fc60aefae8f4865c17add133b5fb11377fd61c80897ef94fcccf41e"
diff --git a/recipes/xorg-app/xhost_1.0.2.bb b/recipes/xorg-app/xhost_1.0.2.bb
deleted file mode 100644
index 1a42fb1..0000000
--- a/recipes/xorg-app/xhost_1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Server access control program for X"
-LICENSE = "MIT"
-DEPENDS += "libxmu libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f746aba36f075ae4cae313d849a94f4e"
-SRC_URI[archive.sha256sum] = "edab2cc49d230f58e54c0f7b83fd726fec5fc31356668a11589649f19ba90db6"
diff --git a/recipes/xorg-app/xinit_1.0.3.bb b/recipes/xorg-app/xinit_1.0.3.bb
deleted file mode 100644
index 703f825..0000000
--- a/recipes/xorg-app/xinit_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f04a903cc0e18b3c338f58eb90f6caf8"
-SRC_URI[archive.sha256sum] = "c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186"
-
-FILES_${PN} += " /usr/lib/X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.4.bb b/recipes/xorg-app/xinit_1.0.4.bb
deleted file mode 100644
index 2ff99ce..0000000
--- a/recipes/xorg-app/xinit_1.0.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9df52a504dc04313a6650fae364ae04a"
-SRC_URI[archive.sha256sum] = "1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.5.bb b/recipes/xorg-app/xinit_1.0.5.bb
deleted file mode 100644
index 120f42f..0000000
--- a/recipes/xorg-app/xinit_1.0.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9a2aad51042141a0e6ad066015397595"
-SRC_URI[archive.sha256sum] = "95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.7.bb b/recipes/xorg-app/xinit_1.0.7.bb
deleted file mode 100644
index 50c4270..0000000
--- a/recipes/xorg-app/xinit_1.0.7.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8b882d9e2deed9d85469a3beaec566a3"
-SRC_URI[archive.sha256sum] = "15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.8.bb b/recipes/xorg-app/xinit_1.0.8.bb
deleted file mode 100644
index 1771578..0000000
--- a/recipes/xorg-app/xinit_1.0.8.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "521574088fbd688edbf91e6bae674265"
-SRC_URI[archive.sha256sum] = "06c1049f6b63d1c368a1e03e2392097919b22ff24899e190de3577bffe6fe524"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.9.bb b/recipes/xorg-app/xinit_1.0.9.bb
deleted file mode 100644
index 7d8270a..0000000
--- a/recipes/xorg-app/xinit_1.0.9.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "224c36057e4416205d4e421af01a2f15"
-SRC_URI[archive.sha256sum] = "b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.1.0.bb b/recipes/xorg-app/xinit_1.1.0.bb
deleted file mode 100644
index 1829819..0000000
--- a/recipes/xorg-app/xinit_1.1.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9144097186c3d2454beffe8ac3b53c6e"
-SRC_URI[archive.sha256sum] = "c79ec1a4d60404715a626f2832f1b62f43b9d52a1e4642b40af743ee41362590"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.2.0.bb b/recipes/xorg-app/xinit_1.2.0.bb
deleted file mode 100644
index fc5ca59..0000000
--- a/recipes/xorg-app/xinit_1.2.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-DEPENDS += "util-linux-ng"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fe1696cab2fbed6fa059d0cd1c53ac13"
-SRC_URI[archive.sha256sum] = "ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinput_1.3.0.bb b/recipes/xorg-app/xinput_1.3.0.bb
deleted file mode 100644
index dac3150..0000000
--- a/recipes/xorg-app/xinput_1.3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a utility to configure and test XInput devices"
-DEPENDS += " libxi"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "977d657e8d7b59f7d82c98ebef444b28"
-SRC_URI[archive.sha256sum] = "330c3e5188abf256131c162c456060804f369349e9a0e7aa3efbc54add802e45"
diff --git a/recipes/xorg-app/xinput_1.4.2.bb b/recipes/xorg-app/xinput_1.4.2.bb
deleted file mode 100644
index 9e58205..0000000
--- a/recipes/xorg-app/xinput_1.4.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a utility to configure and test XInput devices"
-DEPENDS += " libxi"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "58e619576cbf4b6057eebb7a97fe2ddf"
-SRC_URI[archive.sha256sum] = "3195916b6cebf109eb571b939d7cea7075ef1933782526a6d8fbbb353bc3924b"
diff --git a/recipes/xorg-app/xinput_1.5.1.bb b/recipes/xorg-app/xinput_1.5.1.bb
deleted file mode 100644
index 9b990b0..0000000
--- a/recipes/xorg-app/xinput_1.5.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a utility to configure and test XInput devices"
-DEPENDS += " libxi"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "82400f0ba63217df9b00d825532cea7d"
-SRC_URI[archive.sha256sum] = "e33c8361c2b6cb13db9a7157753d417c168c8203c8b7027e9dda2fbeef00fd33"
diff --git a/recipes/xorg-app/xkbcomp_1.0.3.bb b/recipes/xorg-app/xkbcomp_1.0.3.bb
deleted file mode 100644
index ebc8375..0000000
--- a/recipes/xorg-app/xkbcomp_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-DEPENDS += " libxkbfile"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "2fbcae1323c266edf5b6c61751f2e343"
-SRC_URI[archive.sha256sum] = "0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xkbcomp_1.0.4.bb b/recipes/xorg-app/xkbcomp_1.0.4.bb
deleted file mode 100644
index 64b2370..0000000
--- a/recipes/xorg-app/xkbcomp_1.0.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-DEPENDS += " libxkbfile"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "d5122f1d5a91725a81c843f3bd388244"
-SRC_URI[archive.sha256sum] = "fefc574bf639d64348939edf9654306af2bb3c20447be9cff493cb06d87cb672"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xkbcomp_1.0.5.bb b/recipes/xorg-app/xkbcomp_1.0.5.bb
deleted file mode 100644
index bcd1455..0000000
--- a/recipes/xorg-app/xkbcomp_1.0.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-DEPENDS += " libxkbfile"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "6cc96c3e4ed5d9802fe717beac008f19"
-SRC_URI[archive.sha256sum] = "204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xkbevd_1.0.2.bb b/recipes/xorg-app/xkbevd_1.0.2.bb
deleted file mode 100644
index 66b6937..0000000
--- a/recipes/xorg-app/xkbevd_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxkbfile "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "68f2a143716c23b566f8509d9498f516"
-SRC_URI[archive.sha256sum] = "4b78e316ecf9a9498291f634a7e9ee712ba429d5606f300c0a27eacdaaa1f72b"
diff --git a/recipes/xorg-app/xkbutils_1.0.1.bb b/recipes/xorg-app/xkbutils_1.0.1.bb
deleted file mode 100644
index 7547e96..0000000
--- a/recipes/xorg-app/xkbutils_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxkbfile "
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "84396a3dd75337caaae29d8fa5616fb1"
-SRC_URI[archive.sha256sum] = "aaad73ed8db764978a18bc6ba774d38a4c1330c86622c0b47ae3ced09c175856"
diff --git a/recipes/xorg-app/xkill_1.0.1.bb b/recipes/xorg-app/xkill_1.0.1.bb
deleted file mode 100644
index ba95dbe..0000000
--- a/recipes/xorg-app/xkill_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f66d76abb0f75514ca32272e23cca757"
-SRC_URI[archive.sha256sum] = "77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de"
diff --git a/recipes/xorg-app/xload_1.0.1.bb b/recipes/xorg-app/xload_1.0.1.bb
deleted file mode 100644
index 9b72817..0000000
--- a/recipes/xorg-app/xload_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ba013813f9c21eb015559466f8d02a44"
-SRC_URI[archive.sha256sum] = "8d51184d6b18eea2f64e0c5b88cd95edff8353ce6529e780f95b1f2347babbf2"
diff --git a/recipes/xorg-app/xlsatoms_1.0.1.bb b/recipes/xorg-app/xlsatoms_1.0.1.bb
deleted file mode 100644
index 3acd54f..0000000
--- a/recipes/xorg-app/xlsatoms_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "69adcda848479acc3b82b3928812d191"
-SRC_URI[archive.sha256sum] = "456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a"
diff --git a/recipes/xorg-app/xlsclients_1.0.1.bb b/recipes/xorg-app/xlsclients_1.0.1.bb
deleted file mode 100644
index 9b32088..0000000
--- a/recipes/xorg-app/xlsclients_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "44473b880d26bfbe8b3d4d72b183cba7"
-SRC_URI[archive.sha256sum] = "988c71c6dc3519523fe5844ee3e49d91f843a83c783dd0baa20526d9d2981698"
diff --git a/recipes/xorg-app/xlsfonts_1.0.1.bb b/recipes/xorg-app/xlsfonts_1.0.1.bb
deleted file mode 100644
index 5a88403..0000000
--- a/recipes/xorg-app/xlsfonts_1.0.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ca9c6c88d0b83360b7b5092615fbf591"
-SRC_URI[archive.sha256sum] = "c8d826194299b2b8e3c6edce7070f05421465b0118ed47135a0195d12fe8a720"
diff --git a/recipes/xorg-app/xmag_1.0.1.bb b/recipes/xorg-app/xmag_1.0.1.bb
deleted file mode 100644
index c09140d..0000000
--- a/recipes/xorg-app/xmag_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "058d168d1c7c991b8d12158433ea5f63"
-SRC_URI[archive.sha256sum] = "1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02"
diff --git a/recipes/xorg-app/xmag_1.0.2.bb b/recipes/xorg-app/xmag_1.0.2.bb
deleted file mode 100644
index 2856093..0000000
--- a/recipes/xorg-app/xmag_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "magnify parts of the screen"
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7c6a783e42c88360ac31d259a864a19d"
-SRC_URI[archive.sha256sum] = "51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43"
diff --git a/recipes/xorg-app/xman_1.0.2.bb b/recipes/xorg-app/xman_1.0.2.bb
deleted file mode 100644
index 1844180..0000000
--- a/recipes/xorg-app/xman_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxprintutil libxp libxt"
-RDEPENDS_${PN} = " man"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "855f2dbfa2aff58b8b9cd6a1c1120fad"
-SRC_URI[archive.sha256sum] = "00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2"
-
-FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/xorg-app/xman_1.0.3.bb b/recipes/xorg-app/xman_1.0.3.bb
deleted file mode 100644
index d1dcf65..0000000
--- a/recipes/xorg-app/xman_1.0.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "manual page browser for X"
-DEPENDS += " libxaw libxprintutil libxp libxt"
-RDEPENDS_${PN} = " man"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3d3a4b310a65ccce82472ef83acbbf97"
-SRC_URI[archive.sha256sum] = "38e03bfa2d3d109d55342e3539be952268e405fb458fb8c4f87739594a25394a"
-
-FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/xorg-app/xmessage_1.0.1.bb b/recipes/xorg-app/xmessage_1.0.1.bb
deleted file mode 100644
index 5ecfae0..0000000
--- a/recipes/xorg-app/xmessage_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "xmessage displays a message or query in a window."
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b3674c3a00a089764d86aa94e257ccec"
-SRC_URI[archive.sha256sum] = "b921aef62c2a2f5c32048502cd96630e9d42493cd39d1841fde247274f24bbda"
diff --git a/recipes/xorg-app/xmodmap/autofoo.patch b/recipes/xorg-app/xmodmap/autofoo.patch
deleted file mode 100644
index f309add..0000000
--- a/recipes/xorg-app/xmodmap/autofoo.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -urN xmodmap.orig/Makefile.am xmodmap/Makefile.am
---- xmodmap.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xmodmap/Makefile.am 2004-08-31 19:49:33.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XMODMAP_CFLAGS@
-+
-+bin_PROGRAMS = xmodmap
-+
-+xmodmap_SOURCES = exec.c handle.c pf.c wq.h xmodmap.c xmodmap.h
-+
-+xmodmap_LDADD = @XMODMAP_LIBS@
-+
-+man5_MANS=xmodmap.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xmodmap.orig/autogen.sh xmodmap/autogen.sh
---- xmodmap.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xmodmap/autogen.sh 2004-08-31 19:46:14.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xmodmap.orig/configure.ac xmodmap/configure.ac
---- xmodmap.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xmodmap/configure.ac 2004-08-31 20:27:03.000000000 +0200
-@@ -0,0 +1,41 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xmodmap],4.4.0,[],xmodmap)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XMODMAP, x11)
-+
-+AC_OUTPUT([Makefile])
diff --git a/recipes/xorg-app/xmodmap_1.0.2.bb b/recipes/xorg-app/xmodmap_1.0.2.bb
deleted file mode 100644
index 17bbc7e..0000000
--- a/recipes/xorg-app/xmodmap_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-LICENSE = "MIT"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ea78b3e32e27c3662f86ea68b3aec22f"
-SRC_URI[archive.sha256sum] = "4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44"
diff --git a/recipes/xorg-app/xmodmap_1.0.3.bb b/recipes/xorg-app/xmodmap_1.0.3.bb
deleted file mode 100644
index ab245b3..0000000
--- a/recipes/xorg-app/xmodmap_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-LICENSE = "MIT"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "626731003ec22a74ecf9e44ed098bbdf"
-SRC_URI[archive.sha256sum] = "c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f"
diff --git a/recipes/xorg-app/xpr_1.0.1.bb b/recipes/xorg-app/xpr_1.0.1.bb
deleted file mode 100644
index 5e70d01..0000000
--- a/recipes/xorg-app/xpr_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "01c0a14755fc91369e8c011c9f881d5d"
-SRC_URI[archive.sha256sum] = "b871221d23dc4fc50398e9fe0e2a6a4e951aa6c9df2c5671d069ad88f0fd6249"
diff --git a/recipes/xorg-app/xpr_1.0.2.bb b/recipes/xorg-app/xpr_1.0.2.bb
deleted file mode 100644
index f117bd8..0000000
--- a/recipes/xorg-app/xpr_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "print an X window dump"
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6b3a6896081f628bf5a2c9129417c86f"
-SRC_URI[archive.sha256sum] = "c325a9896d1cda43a681f1c2a6a2bbb1c580ade57a882b0a8f84ffa359238adf"
diff --git a/recipes/xorg-app/xprop/autofoo.patch b/recipes/xorg-app/xprop/autofoo.patch
deleted file mode 100644
index 2526d95..0000000
--- a/recipes/xorg-app/xprop/autofoo.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -urN xprop.orig/Makefile.am xprop/Makefile.am
---- xprop.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xprop/Makefile.am 2004-08-15 18:49:43.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XPROP_CFLAGS@
-+
-+bin_PROGRAMS = xprop
-+
-+xprop_SOURCES = dsimple.c dsimple.h xprop.c
-+
-+xprop_LDADD = @XPROP_LIBS@
-+
-+man5_MANS=xprop.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xprop.orig/configure.ac xprop/configure.ac
---- xprop.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xprop/configure.ac 2004-08-15 19:00:43.000000000 +0200
-@@ -0,0 +1,44 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xprop],4.4.0,[],xprop)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XPROP, xext xmuu x11)
-+
-+AC_CHECK_HEADERS([wchar.h])
-+AC_CHECK_HEADERS([wctype.h])
-+
-+AC_OUTPUT([Makefile])
-diff -urN xprop.orig/dsimple.c xprop/dsimple.c
---- xprop.orig/dsimple.c 2003-11-14 16:54:54.000000000 +0100
-+++ xprop/dsimple.c 2004-08-15 19:19:32.000000000 +0200
-@@ -27,11 +27,16 @@
-
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xos.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
- #include <stdio.h>
-+#include <stdlib.h>
- /*
- * Other_stuff.h: Definitions of routines in other_stuff.
- *
-@@ -69,7 +74,7 @@
- char *Malloc(size)
- unsigned size;
- {
-- char *data, *malloc();
-+ char *data;
-
- if (!(data = malloc(size)))
- Fatal_Error("Out of memory!");
-@@ -85,7 +90,7 @@
- char *ptr;
- int size;
- {
-- char *new_ptr, *realloc();
-+ char *new_ptr;
-
- if (!ptr)
- return(Malloc(size));
-diff -urN xprop.orig/xprop.c xprop/xprop.c
---- xprop.orig/xprop.c 2004-04-23 21:55:03.000000000 +0200
-+++ xprop/xprop.c 2004-08-15 19:23:13.000000000 +0200
-@@ -30,6 +30,10 @@
- /* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */
-
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xlib.h>
- #include <X11/Xos.h>
- #include <X11/Xfuncs.h>
diff --git a/recipes/xorg-app/xprop_1.0.2.bb b/recipes/xorg-app/xprop_1.0.2.bb
deleted file mode 100644
index f57c8de..0000000
--- a/recipes/xorg-app/xprop_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5b6f02a3b1cda0cadc35f84814fe53d4"
-SRC_URI[archive.sha256sum] = "88b1e65703c68f14ac6cb735737d1a0e52751a18fdc8a39d2d1e5eaa07875ca0"
diff --git a/recipes/xorg-app/xprop_1.0.4.bb b/recipes/xorg-app/xprop_1.0.4.bb
deleted file mode 100644
index 526db7b..0000000
--- a/recipes/xorg-app/xprop_1.0.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a property displayer for X"
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "48aa8fd78802f477dcbf9ef0dfd9f783"
-SRC_URI[archive.sha256sum] = "daa47cba7d5a919ca1bd053d8a8b6af4904f77eded4bdb055cd915aa5f5cd772"
diff --git a/recipes/xorg-app/xrandr_1.2.2.bb b/recipes/xorg-app/xrandr_1.2.2.bb
deleted file mode 100644
index b09b16b..0000000
--- a/recipes/xorg-app/xrandr_1.2.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Resize and Rotate extension command."
-LICENSE = "BSD-X"
-DEPENDS += "libxrandr libxrender"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://resolve_symbol_clash.patch"
-SRC_URI[archive.md5sum] = "c6ec9dc42396e3b3a2da932f3feca6ec"
-SRC_URI[archive.sha256sum] = "632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303"
diff --git a/recipes/xorg-app/xrandr_1.2.3.bb b/recipes/xorg-app/xrandr_1.2.3.bb
deleted file mode 100644
index 6923ce3..0000000
--- a/recipes/xorg-app/xrandr_1.2.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Resize and Rotate extension command."
-LICENSE = "BSD-X"
-DEPENDS += "libxrandr libxrender"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://resolve_symbol_clash.patch"
-SRC_URI[archive.md5sum] = "41a9d0cc073fa6165a31fbf9e85f68a6"
-SRC_URI[archive.sha256sum] = "ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207"
diff --git a/recipes/xorg-app/xrdb/autofoo.patch b/recipes/xorg-app/xrdb/autofoo.patch
deleted file mode 100644
index b30a46b..0000000
--- a/recipes/xorg-app/xrdb/autofoo.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -urN xrdb.orig/Imakefile xrdb/Imakefile
---- xrdb.orig/Imakefile 2004-04-23 21:55:03.000000000 +0200
-+++ xrdb/Imakefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,19 +0,0 @@
--XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $
--
--
--
--
--XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.6tsi Exp $
--
--#ifdef PatheticCpp
-- CPPDEFS = -DPATHETICCPP
--#endif
--#if HasMkstemp
-- CPPDEFS = -DHAS_MKSTEMP
--#endif
--XCOMM Due to ill make parsing the cpp is passed directly in source file
-- DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS)
-- DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB)
--LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB)
--
--SimpleProgramTarget(xrdb)
-diff -urN xrdb.orig/Makefile.am xrdb/Makefile.am
---- xrdb.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xrdb/Makefile.am 2004-08-14 16:05:01.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XRDB_CFLAGS@
-+
-+bin_PROGRAMS = xrdb
-+
-+xrdb_SOURCES = xrdb.c
-+
-+xrdb_LDADD = @XRDB_LIBS@
-+
-+man5_MANS=xrdb.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xrdb.orig/autogen.sh xrdb/autogen.sh
---- xrdb.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xrdb/autogen.sh 2004-08-14 15:57:35.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xrdb.orig/configure.ac xrdb/configure.ac
---- xrdb.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xrdb/configure.ac 2004-08-14 16:03:31.000000000 +0200
-@@ -0,0 +1,41 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xrdb],4.4.0,[],xrdb)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XRDB, xext xmuu x11)
-+
-+AC_OUTPUT([Makefile])
diff --git a/recipes/xorg-app/xrdb_1.0.3.bb b/recipes/xorg-app/xrdb_1.0.3.bb
deleted file mode 100644
index 6c4d86d..0000000
--- a/recipes/xorg-app/xrdb_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-DEPENDS += "libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "380b2ef545306354cc150834de567be7"
-SRC_URI[archive.sha256sum] = "a4a3b8cd821adc201a072f8c0214d73ee6a7e7b898de90e18f7d89a4453fb12c"
diff --git a/recipes/xorg-app/xrdb_1.0.4.bb b/recipes/xorg-app/xrdb_1.0.4.bb
deleted file mode 100644
index 7181dc9..0000000
--- a/recipes/xorg-app/xrdb_1.0.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-DEPENDS += "libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "34eb2311a0c5279e7b4f492e826f63d1"
-SRC_URI[archive.sha256sum] = "3f8cde77e8cbeb6d0a5f232b7a2ee51dd49b677916d52ab0986d320a5f9e8000"
diff --git a/recipes/xorg-app/xrdb_1.0.5.bb b/recipes/xorg-app/xrdb_1.0.5.bb
deleted file mode 100644
index d474dc8..0000000
--- a/recipes/xorg-app/xrdb_1.0.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-DEPENDS += "libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9c30b8e1709d5367beb7706146640c07"
-SRC_URI[archive.sha256sum] = "c24d08939250f10238fd1b984707bfa0901ba9c55fa36b67d91eb12b500500aa"
diff --git a/recipes/xorg-app/xrefresh_1.0.2.bb b/recipes/xorg-app/xrefresh_1.0.2.bb
deleted file mode 100644
index a97f1af..0000000
--- a/recipes/xorg-app/xrefresh_1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1228f890f86148e4e6ae22aa73118cbb"
-SRC_URI[archive.sha256sum] = "522831fd29c0b250f29735a01b02e96e311f200a675e45c8b3d187b6f86b32f5"
diff --git a/recipes/xorg-app/xrx_1.0.1.bb b/recipes/xorg-app/xrx_1.0.1.bb
deleted file mode 100644
index 25f0c80..0000000
--- a/recipes/xorg-app/xrx_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt libxext xtrans xproxymngproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5f65e24f8a225e255beb2059e33d6b37"
-SRC_URI[archive.sha256sum] = "a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4"
diff --git a/recipes/xorg-app/xset/autofoo.patch b/recipes/xorg-app/xset/autofoo.patch
deleted file mode 100644
index 039d131..0000000
--- a/recipes/xorg-app/xset/autofoo.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -urN xset.orig/Makefile.am xset/Makefile.am
---- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xset/Makefile.am 2004-08-14 16:32:10.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XSET_CFLAGS@
-+
-+bin_PROGRAMS = xset
-+
-+xset_SOURCES = xset.c
-+
-+xset_LDADD = @XSET_LIBS@
-+
-+man5_MANS=xset.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xset.orig/autogen.sh xset/autogen.sh
---- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xset.orig/configure.ac xset/configure.ac
---- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xset/configure.ac 2004-08-17 14:21:25.000000000 +0200
-@@ -0,0 +1,41 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xset],4.4.0,[],xset)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XSET, xext xextensions xmuu x11)
-+
-+AC_OUTPUT([Makefile])
diff --git a/recipes/xorg-app/xset/disable-xkb.patch b/recipes/xorg-app/xset/disable-xkb.patch
deleted file mode 100644
index 6060fbb..0000000
--- a/recipes/xorg-app/xset/disable-xkb.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100
-+++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100
-@@ -42,11 +42,15 @@
- AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
- CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-
-+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
-+ XKB="$enableval", XKB="yes")
-+if test "x$XKB" = "xyes" ; then
- PKG_CHECK_MODULES(SET_XKB, x11,
- [SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
- AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
- CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-+fi
-
- PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
- [SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/recipes/xorg-app/xset_1.0.2.bb b/recipes/xorg-app/xset_1.0.2.bb
deleted file mode 100644
index 35aebe5..0000000
--- a/recipes/xorg-app/xset_1.0.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "1b781a0802c7b8fb9619a6665607b3f0"
-SRC_URI[archive.sha256sum] = "ce1e17c513a4499526e648a59c39ba01777c99c86093433cf392f27654b795c9"
-
-EXTRA_OECONF = "--disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-app/xset_1.0.3.bb b/recipes/xorg-app/xset_1.0.3.bb
deleted file mode 100644
index c37b4bb..0000000
--- a/recipes/xorg-app/xset_1.0.3.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "657bbb43ce5470c33665d187c1740566"
-SRC_URI[archive.sha256sum] = "0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11"
-
-EXTRA_OECONF = "--disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-app/xset_1.0.4.bb b/recipes/xorg-app/xset_1.0.4.bb
deleted file mode 100644
index 24c35e0..0000000
--- a/recipes/xorg-app/xset_1.0.4.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "2f41fd983ba4d89419204854936025e2"
-SRC_URI[archive.sha256sum] = "6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad"
-
-EXTRA_OECONF = "--disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-app/xsetpointer_1.0.0.bb b/recipes/xorg-app/xsetpointer_1.0.0.bb
deleted file mode 100644
index 409ea16..0000000
--- a/recipes/xorg-app/xsetpointer_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxi "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c94ea103e27e370e4e5030e50c5d5d69"
-SRC_URI[archive.sha256sum] = "7d65f450420b4f764dcf38e4ccee9d608b5a5874706e716cb861bfe2586b7d4a"
diff --git a/recipes/xorg-app/xsetroot_1.0.1.bb b/recipes/xorg-app/xsetroot_1.0.1.bb
deleted file mode 100644
index c81a319..0000000
--- a/recipes/xorg-app/xsetroot_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Sets the visual appearance of the X root window"
-LICENSE = "MIT"
-DEPENDS += "libxmu xbitmaps"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fc7eeb7130bb54345671a9dbaab567ac"
-SRC_URI[archive.sha256sum] = "897d77acd3f4a366472386139827eaac24cc423c811ef0e65e0d5eca099a3155"
diff --git a/recipes/xorg-app/xsetroot_1.0.2.bb b/recipes/xorg-app/xsetroot_1.0.2.bb
deleted file mode 100644
index dc79d52..0000000
--- a/recipes/xorg-app/xsetroot_1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Sets the visual appearance of the X root window"
-LICENSE = "MIT"
-DEPENDS += "libxmu xbitmaps"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9af7db9f3052aef0b11636720b3101dd"
-SRC_URI[archive.sha256sum] = "4f9a751f4830d479fae8ccb68ed04896dc99612789310b7917bd15c04aa3351d"
diff --git a/recipes/xorg-app/xvinfo_1.0.1.bb b/recipes/xorg-app/xvinfo_1.0.1.bb
deleted file mode 100644
index ee77b80..0000000
--- a/recipes/xorg-app/xvinfo_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Print out X-Video extension adaptor information"
-DEPENDS += " libxv"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0a5bd8e43de6eb8ff5b5bc673204401d"
-SRC_URI[archive.sha256sum] = "439b3c7ad96fc7b1ef9156c716e10b607883a9a58b777f8dc02f03284eb33fb3"
diff --git a/recipes/xorg-app/xvinfo_1.0.2.bb b/recipes/xorg-app/xvinfo_1.0.2.bb
deleted file mode 100644
index 8422d34..0000000
--- a/recipes/xorg-app/xvinfo_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Print out X-Video extension adaptor information"
-DEPENDS += " libxv"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e1e318436f49e2f0f3764593dadd9ad2"
-SRC_URI[archive.sha256sum] = "126e2a612ac723f9688904fcfa612688d62e520ce55c56eb34eb5390074cf150"
diff --git a/recipes/xorg-app/xwd_1.0.1.bb b/recipes/xorg-app/xwd_1.0.1.bb
deleted file mode 100644
index bfe181b..0000000
--- a/recipes/xorg-app/xwd_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "911addfb7fa402217ddac63e5c1d97c7"
-SRC_URI[archive.sha256sum] = "c8bd9bcd64df439c2cd09eaa3e83a1297fbfed5c7d3dd8117342b3a25eeae131"
diff --git a/recipes/xorg-app/xwd_1.0.2.bb b/recipes/xorg-app/xwd_1.0.2.bb
deleted file mode 100644
index 597aa05..0000000
--- a/recipes/xorg-app/xwd_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0a6ef08a2ac08ad5c4dd1522eb3788a3"
-SRC_URI[archive.sha256sum] = "ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61"
diff --git a/recipes/xorg-app/xwininfo_1.0.2.bb b/recipes/xorg-app/xwininfo_1.0.2.bb
deleted file mode 100644
index 288af54..0000000
--- a/recipes/xorg-app/xwininfo_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu libxext "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e5dbc8866a55958297f5f38205b6be1e"
-SRC_URI[archive.sha256sum] = "9fdfd3259b335531cdba831872ec0e32c5f6df01e14b87c3187b494be75b7b66"
diff --git a/recipes/xorg-app/xwininfo_1.0.3.bb b/recipes/xorg-app/xwininfo_1.0.3.bb
deleted file mode 100644
index 01f6c9b..0000000
--- a/recipes/xorg-app/xwininfo_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "window information utility for X"
-DEPENDS += " libxmu libxext "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "721f84332c98c33152460bb22ba9ded6"
-SRC_URI[archive.sha256sum] = "fbe3a1aafbc6fa113e58971ff2a82605a7e106af8b810eea4b7512de58a5478a"
diff --git a/recipes/xorg-app/xwininfo_1.0.4.bb b/recipes/xorg-app/xwininfo_1.0.4.bb
deleted file mode 100644
index 317aa1d..0000000
--- a/recipes/xorg-app/xwininfo_1.0.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu libxext "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e2a9bf5ab7f2a0866700a3b49dd8c6bf"
-SRC_URI[archive.sha256sum] = "df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4"
diff --git a/recipes/xorg-app/xwud_1.0.1.bb b/recipes/xorg-app/xwud_1.0.1.bb
deleted file mode 100644
index 53d06df..0000000
--- a/recipes/xorg-app/xwud_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6e3c5d0297d88e890b6f5df31f73dd60"
-SRC_URI[archive.sha256sum] = "d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c"
--
1.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 1/9] xorg-app: move older not pinned versions to obsolete dir
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
` (10 preceding siblings ...)
2010-08-16 19:49 ` [PATCH 1/9] xorg-app: move older not pinned versions to obsolete dir Martin Jansa
@ 2010-08-16 19:49 ` Martin Jansa
2010-08-16 19:50 ` [PATCH 2/9] xorg-lib: " Martin Jansa
12 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 19:49 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb | 10 ++
.../obsolete/xorg/xorg-app/beforelight_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb | 7 +
recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb | 7 +
recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb | 7 +
recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb | 9 +
recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb | 8 +
.../obsolete/xorg/xorg-app/mkcomposecache_1.2.bb | 6 +
recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb | 10 ++
recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb | 10 ++
.../obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb | 9 +
.../obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb | 9 +
.../obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb | 9 +
recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb | 9 +
recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb | 6 +
recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb | 6 +
recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb | 6 +
recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb | 7 +
recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb | 7 +
recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb | 7 +
recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb | 13 ++
recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb | 6 +
recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb | 9 +
recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb | 12 ++
recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb | 9 +
recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb | 9 +
recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb | 8 +
recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb | 8 +
recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb | 8 +
recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb | 8 +
recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb | 9 +
recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb | 7 +
recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb | 9 +
recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb | 9 +
recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb | 9 +
recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb | 6 +
recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb | 5 +
recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb | 11 ++
recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb | 8 +
.../obsolete/xorg/xorg-app/xmodmap/autofoo.patch | 109 ++++++++++++++
recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch | 157 ++++++++++++++++++++
recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb | 8 +
recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb | 10 ++
recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch | 132 ++++++++++++++++
recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb | 9 +
recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb | 9 +
recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb | 9 +
recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb | 6 +
recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xset/autofoo.patch | 109 ++++++++++++++
.../obsolete/xorg/xorg-app/xset/disable-xkb.patch | 18 +++
recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb | 14 ++
recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb | 14 ++
recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb | 14 ++
.../obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb | 7 +
recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb | 9 +
recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb | 9 +
recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb | 8 +
recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb | 7 +
recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb | 7 +
recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb | 8 +
recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb | 7 +
recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb | 6 +
recipes/xorg-app/appres_1.0.1.bb | 8 -
recipes/xorg-app/bdftopcf_1.0.1.bb | 10 --
recipes/xorg-app/beforelight_1.0.2.bb | 7 -
recipes/xorg-app/bitmap_1.0.2.bb | 7 -
recipes/xorg-app/bitmap_1.0.3.bb | 7 -
recipes/xorg-app/constype_1.0.1.bb | 8 -
recipes/xorg-app/editres_1.0.2.bb | 7 -
recipes/xorg-app/editres_1.0.3.bb | 7 -
recipes/xorg-app/fonttosfnt_1.0.3.bb | 7 -
recipes/xorg-app/fslsfonts_1.0.1.bb | 7 -
recipes/xorg-app/fstobdf_1.0.2.bb | 7 -
recipes/xorg-app/iceauth_1.0.2.bb | 8 -
recipes/xorg-app/lbxproxy_1.0.1.bb | 9 -
recipes/xorg-app/luit_1.0.2.bb | 7 -
recipes/xorg-app/luit_1.0.3.bb | 8 -
recipes/xorg-app/mkcomposecache_1.2.bb | 6 -
recipes/xorg-app/mkfontdir_1.0.3.bb | 10 --
recipes/xorg-app/mkfontdir_1.0.4.bb | 10 --
recipes/xorg-app/mkfontscale_1.0.3.bb | 9 -
recipes/xorg-app/mkfontscale_1.0.4.bb | 9 -
recipes/xorg-app/mkfontscale_1.0.5.bb | 9 -
recipes/xorg-app/rgb_1.0.1.bb | 9 -
recipes/xorg-app/rstart_1.0.2.bb | 6 -
recipes/xorg-app/sessreg_1.0.2.bb | 6 -
recipes/xorg-app/sessreg_1.0.3.bb | 6 -
recipes/xorg-app/sessreg_1.0.4.bb | 7 -
recipes/xorg-app/setxkbmap_1.0.3.bb | 7 -
recipes/xorg-app/setxkbmap_1.0.4.bb | 7 -
recipes/xorg-app/showfont_1.0.1.bb | 7 -
recipes/xorg-app/smproxy_1.0.2.bb | 7 -
recipes/xorg-app/twm_1.0.3.bb | 13 --
recipes/xorg-app/x11perf_1.4.1.bb | 8 -
recipes/xorg-app/x11perf_1.5.bb | 10 --
recipes/xorg-app/xauth_1.0.2.bb | 8 -
recipes/xorg-app/xauth_1.0.3.bb | 8 -
recipes/xorg-app/xbacklight_1.1.bb | 8 -
recipes/xorg-app/xcalc_1.0.1.bb | 7 -
recipes/xorg-app/xclipboard_1.0.1.bb | 7 -
recipes/xorg-app/xclock_1.0.2.bb | 7 -
recipes/xorg-app/xclock_1.0.3.bb | 8 -
recipes/xorg-app/xcmsdb_1.0.1.bb | 6 -
recipes/xorg-app/xconsole_1.0.2.bb | 7 -
recipes/xorg-app/xcursorgen_1.0.1.bb | 9 -
recipes/xorg-app/xcursorgen_1.0.2.bb | 10 --
recipes/xorg-app/xdm_1.1.3.bb | 10 --
recipes/xorg-app/xdm_1.1.4.bb | 10 --
recipes/xorg-app/xdm_1.1.6.bb | 12 --
recipes/xorg-app/xdm_1.1.7.bb | 12 --
recipes/xorg-app/xdm_1.1.8.bb | 12 --
recipes/xorg-app/xdpyinfo_1.0.2.bb | 12 --
recipes/xorg-app/xdpyinfo_1.0.3.bb | 12 --
recipes/xorg-app/xdriinfo_1.0.1.bb | 7 -
recipes/xorg-app/xdriinfo_1.0.2.bb | 8 -
recipes/xorg-app/xedit_1.0.2.bb | 7 -
recipes/xorg-app/xev_1.0.2.bb | 9 -
recipes/xorg-app/xev_1.0.3.bb | 9 -
recipes/xorg-app/xeyes_1.0.1.bb | 7 -
recipes/xorg-app/xfs_1.0.4.bb | 8 -
recipes/xorg-app/xfs_1.0.5.bb | 8 -
recipes/xorg-app/xfs_1.0.6.bb | 8 -
recipes/xorg-app/xfs_1.0.8.bb | 8 -
recipes/xorg-app/xfsinfo_1.0.1.bb | 7 -
recipes/xorg-app/xgamma_1.0.1.bb | 7 -
recipes/xorg-app/xgamma_1.0.2.bb | 8 -
recipes/xorg-app/xhost_1.0.2.bb | 9 -
recipes/xorg-app/xinit_1.0.3.bb | 8 -
recipes/xorg-app/xinit_1.0.4.bb | 9 -
recipes/xorg-app/xinit_1.0.5.bb | 9 -
recipes/xorg-app/xinit_1.0.7.bb | 9 -
recipes/xorg-app/xinit_1.0.8.bb | 9 -
recipes/xorg-app/xinit_1.0.9.bb | 9 -
recipes/xorg-app/xinit_1.1.0.bb | 9 -
recipes/xorg-app/xinit_1.2.0.bb | 10 --
recipes/xorg-app/xinput_1.3.0.bb | 7 -
recipes/xorg-app/xinput_1.4.2.bb | 7 -
recipes/xorg-app/xinput_1.5.1.bb | 7 -
recipes/xorg-app/xkbcomp_1.0.3.bb | 9 -
recipes/xorg-app/xkbcomp_1.0.4.bb | 9 -
recipes/xorg-app/xkbcomp_1.0.5.bb | 9 -
recipes/xorg-app/xkbevd_1.0.2.bb | 7 -
recipes/xorg-app/xkbutils_1.0.1.bb | 6 -
recipes/xorg-app/xkill_1.0.1.bb | 7 -
recipes/xorg-app/xload_1.0.1.bb | 7 -
recipes/xorg-app/xlsatoms_1.0.1.bb | 7 -
recipes/xorg-app/xlsclients_1.0.1.bb | 7 -
recipes/xorg-app/xlsfonts_1.0.1.bb | 5 -
recipes/xorg-app/xmag_1.0.1.bb | 7 -
recipes/xorg-app/xmag_1.0.2.bb | 8 -
recipes/xorg-app/xman_1.0.2.bb | 10 --
recipes/xorg-app/xman_1.0.3.bb | 11 --
recipes/xorg-app/xmessage_1.0.1.bb | 8 -
recipes/xorg-app/xmodmap/autofoo.patch | 109 --------------
recipes/xorg-app/xmodmap_1.0.2.bb | 8 -
recipes/xorg-app/xmodmap_1.0.3.bb | 8 -
recipes/xorg-app/xpr_1.0.1.bb | 7 -
recipes/xorg-app/xpr_1.0.2.bb | 8 -
recipes/xorg-app/xprop/autofoo.patch | 157 --------------------
recipes/xorg-app/xprop_1.0.2.bb | 7 -
recipes/xorg-app/xprop_1.0.4.bb | 8 -
recipes/xorg-app/xrandr_1.2.2.bb | 10 --
recipes/xorg-app/xrandr_1.2.3.bb | 10 --
recipes/xorg-app/xrdb/autofoo.patch | 132 ----------------
recipes/xorg-app/xrdb_1.0.3.bb | 9 -
recipes/xorg-app/xrdb_1.0.4.bb | 9 -
recipes/xorg-app/xrdb_1.0.5.bb | 9 -
recipes/xorg-app/xrefresh_1.0.2.bb | 6 -
recipes/xorg-app/xrx_1.0.1.bb | 7 -
recipes/xorg-app/xset/autofoo.patch | 109 --------------
recipes/xorg-app/xset/disable-xkb.patch | 18 ---
recipes/xorg-app/xset_1.0.2.bb | 14 --
recipes/xorg-app/xset_1.0.3.bb | 14 --
recipes/xorg-app/xset_1.0.4.bb | 14 --
recipes/xorg-app/xsetpointer_1.0.0.bb | 7 -
recipes/xorg-app/xsetroot_1.0.1.bb | 9 -
recipes/xorg-app/xsetroot_1.0.2.bb | 9 -
recipes/xorg-app/xvinfo_1.0.1.bb | 8 -
recipes/xorg-app/xvinfo_1.0.2.bb | 8 -
recipes/xorg-app/xwd_1.0.1.bb | 7 -
recipes/xorg-app/xwd_1.0.2.bb | 7 -
recipes/xorg-app/xwininfo_1.0.2.bb | 7 -
recipes/xorg-app/xwininfo_1.0.3.bb | 8 -
recipes/xorg-app/xwininfo_1.0.4.bb | 7 -
recipes/xorg-app/xwud_1.0.1.bb | 6 -
246 files changed, 1501 insertions(+), 1501 deletions(-)
create mode 100644 recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/beforelight_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkcomposecache_1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmodmap/autofoo.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xset/autofoo.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xset/disable-xkb.patch
create mode 100644 recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb
delete mode 100644 recipes/xorg-app/appres_1.0.1.bb
delete mode 100644 recipes/xorg-app/bdftopcf_1.0.1.bb
delete mode 100644 recipes/xorg-app/beforelight_1.0.2.bb
delete mode 100644 recipes/xorg-app/bitmap_1.0.2.bb
delete mode 100644 recipes/xorg-app/bitmap_1.0.3.bb
delete mode 100644 recipes/xorg-app/constype_1.0.1.bb
delete mode 100644 recipes/xorg-app/editres_1.0.2.bb
delete mode 100644 recipes/xorg-app/editres_1.0.3.bb
delete mode 100644 recipes/xorg-app/fonttosfnt_1.0.3.bb
delete mode 100644 recipes/xorg-app/fslsfonts_1.0.1.bb
delete mode 100644 recipes/xorg-app/fstobdf_1.0.2.bb
delete mode 100644 recipes/xorg-app/iceauth_1.0.2.bb
delete mode 100644 recipes/xorg-app/lbxproxy_1.0.1.bb
delete mode 100644 recipes/xorg-app/luit_1.0.2.bb
delete mode 100644 recipes/xorg-app/luit_1.0.3.bb
delete mode 100644 recipes/xorg-app/mkcomposecache_1.2.bb
delete mode 100644 recipes/xorg-app/mkfontdir_1.0.3.bb
delete mode 100644 recipes/xorg-app/mkfontdir_1.0.4.bb
delete mode 100644 recipes/xorg-app/mkfontscale_1.0.3.bb
delete mode 100644 recipes/xorg-app/mkfontscale_1.0.4.bb
delete mode 100644 recipes/xorg-app/mkfontscale_1.0.5.bb
delete mode 100644 recipes/xorg-app/rgb_1.0.1.bb
delete mode 100644 recipes/xorg-app/rstart_1.0.2.bb
delete mode 100644 recipes/xorg-app/sessreg_1.0.2.bb
delete mode 100644 recipes/xorg-app/sessreg_1.0.3.bb
delete mode 100644 recipes/xorg-app/sessreg_1.0.4.bb
delete mode 100644 recipes/xorg-app/setxkbmap_1.0.3.bb
delete mode 100644 recipes/xorg-app/setxkbmap_1.0.4.bb
delete mode 100644 recipes/xorg-app/showfont_1.0.1.bb
delete mode 100644 recipes/xorg-app/smproxy_1.0.2.bb
delete mode 100644 recipes/xorg-app/twm_1.0.3.bb
delete mode 100644 recipes/xorg-app/x11perf_1.4.1.bb
delete mode 100644 recipes/xorg-app/x11perf_1.5.bb
delete mode 100644 recipes/xorg-app/xauth_1.0.2.bb
delete mode 100644 recipes/xorg-app/xauth_1.0.3.bb
delete mode 100644 recipes/xorg-app/xbacklight_1.1.bb
delete mode 100644 recipes/xorg-app/xcalc_1.0.1.bb
delete mode 100644 recipes/xorg-app/xclipboard_1.0.1.bb
delete mode 100644 recipes/xorg-app/xclock_1.0.2.bb
delete mode 100644 recipes/xorg-app/xclock_1.0.3.bb
delete mode 100644 recipes/xorg-app/xcmsdb_1.0.1.bb
delete mode 100644 recipes/xorg-app/xconsole_1.0.2.bb
delete mode 100644 recipes/xorg-app/xcursorgen_1.0.1.bb
delete mode 100644 recipes/xorg-app/xcursorgen_1.0.2.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.3.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.4.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.6.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.7.bb
delete mode 100644 recipes/xorg-app/xdm_1.1.8.bb
delete mode 100644 recipes/xorg-app/xdpyinfo_1.0.2.bb
delete mode 100644 recipes/xorg-app/xdpyinfo_1.0.3.bb
delete mode 100644 recipes/xorg-app/xdriinfo_1.0.1.bb
delete mode 100644 recipes/xorg-app/xdriinfo_1.0.2.bb
delete mode 100644 recipes/xorg-app/xedit_1.0.2.bb
delete mode 100644 recipes/xorg-app/xev_1.0.2.bb
delete mode 100644 recipes/xorg-app/xev_1.0.3.bb
delete mode 100644 recipes/xorg-app/xeyes_1.0.1.bb
delete mode 100644 recipes/xorg-app/xfs_1.0.4.bb
delete mode 100644 recipes/xorg-app/xfs_1.0.5.bb
delete mode 100644 recipes/xorg-app/xfs_1.0.6.bb
delete mode 100644 recipes/xorg-app/xfs_1.0.8.bb
delete mode 100644 recipes/xorg-app/xfsinfo_1.0.1.bb
delete mode 100644 recipes/xorg-app/xgamma_1.0.1.bb
delete mode 100644 recipes/xorg-app/xgamma_1.0.2.bb
delete mode 100644 recipes/xorg-app/xhost_1.0.2.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.3.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.4.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.5.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.7.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.8.bb
delete mode 100644 recipes/xorg-app/xinit_1.0.9.bb
delete mode 100644 recipes/xorg-app/xinit_1.1.0.bb
delete mode 100644 recipes/xorg-app/xinit_1.2.0.bb
delete mode 100644 recipes/xorg-app/xinput_1.3.0.bb
delete mode 100644 recipes/xorg-app/xinput_1.4.2.bb
delete mode 100644 recipes/xorg-app/xinput_1.5.1.bb
delete mode 100644 recipes/xorg-app/xkbcomp_1.0.3.bb
delete mode 100644 recipes/xorg-app/xkbcomp_1.0.4.bb
delete mode 100644 recipes/xorg-app/xkbcomp_1.0.5.bb
delete mode 100644 recipes/xorg-app/xkbevd_1.0.2.bb
delete mode 100644 recipes/xorg-app/xkbutils_1.0.1.bb
delete mode 100644 recipes/xorg-app/xkill_1.0.1.bb
delete mode 100644 recipes/xorg-app/xload_1.0.1.bb
delete mode 100644 recipes/xorg-app/xlsatoms_1.0.1.bb
delete mode 100644 recipes/xorg-app/xlsclients_1.0.1.bb
delete mode 100644 recipes/xorg-app/xlsfonts_1.0.1.bb
delete mode 100644 recipes/xorg-app/xmag_1.0.1.bb
delete mode 100644 recipes/xorg-app/xmag_1.0.2.bb
delete mode 100644 recipes/xorg-app/xman_1.0.2.bb
delete mode 100644 recipes/xorg-app/xman_1.0.3.bb
delete mode 100644 recipes/xorg-app/xmessage_1.0.1.bb
delete mode 100644 recipes/xorg-app/xmodmap/autofoo.patch
delete mode 100644 recipes/xorg-app/xmodmap_1.0.2.bb
delete mode 100644 recipes/xorg-app/xmodmap_1.0.3.bb
delete mode 100644 recipes/xorg-app/xpr_1.0.1.bb
delete mode 100644 recipes/xorg-app/xpr_1.0.2.bb
delete mode 100644 recipes/xorg-app/xprop/autofoo.patch
delete mode 100644 recipes/xorg-app/xprop_1.0.2.bb
delete mode 100644 recipes/xorg-app/xprop_1.0.4.bb
delete mode 100644 recipes/xorg-app/xrandr_1.2.2.bb
delete mode 100644 recipes/xorg-app/xrandr_1.2.3.bb
delete mode 100644 recipes/xorg-app/xrdb/autofoo.patch
delete mode 100644 recipes/xorg-app/xrdb_1.0.3.bb
delete mode 100644 recipes/xorg-app/xrdb_1.0.4.bb
delete mode 100644 recipes/xorg-app/xrdb_1.0.5.bb
delete mode 100644 recipes/xorg-app/xrefresh_1.0.2.bb
delete mode 100644 recipes/xorg-app/xrx_1.0.1.bb
delete mode 100644 recipes/xorg-app/xset/autofoo.patch
delete mode 100644 recipes/xorg-app/xset/disable-xkb.patch
delete mode 100644 recipes/xorg-app/xset_1.0.2.bb
delete mode 100644 recipes/xorg-app/xset_1.0.3.bb
delete mode 100644 recipes/xorg-app/xset_1.0.4.bb
delete mode 100644 recipes/xorg-app/xsetpointer_1.0.0.bb
delete mode 100644 recipes/xorg-app/xsetroot_1.0.1.bb
delete mode 100644 recipes/xorg-app/xsetroot_1.0.2.bb
delete mode 100644 recipes/xorg-app/xvinfo_1.0.1.bb
delete mode 100644 recipes/xorg-app/xvinfo_1.0.2.bb
delete mode 100644 recipes/xorg-app/xwd_1.0.1.bb
delete mode 100644 recipes/xorg-app/xwd_1.0.2.bb
delete mode 100644 recipes/xorg-app/xwininfo_1.0.2.bb
delete mode 100644 recipes/xorg-app/xwininfo_1.0.3.bb
delete mode 100644 recipes/xorg-app/xwininfo_1.0.4.bb
delete mode 100644 recipes/xorg-app/xwud_1.0.1.bb
diff --git a/recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb
new file mode 100644
index 0000000..698b7c4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/appres_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "The appres program prints the resources seen by an application."
+DEPENDS += " libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "420e6cdf38bb771ec8b00228bf09e8ff"
+SRC_URI[archive.sha256sum] = "15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962"
diff --git a/recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb
new file mode 100644
index 0000000..d5ddd50
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/bdftopcf_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "converts BDF fonts to PCF fonts"
+DEPENDS += " libxfont"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "9685fab33d39954ab8a0d22e0969d5a4"
+SRC_URI[archive.sha256sum] = "aaaa45ab361781aebda2093fdc7eb5c187f6215b4ba308dd6b9ff2b727e805d3"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/beforelight_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/beforelight_1.0.2.bb
new file mode 100644
index 0000000..09852db
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/beforelight_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxscrnsaver libxt libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8bc2e35cdcd2e6a80eab1b77c41f2a46"
+SRC_URI[archive.sha256sum] = "00e217559c93779fe04fd948017820af118a3981d6b4371ace95107cb3b047a7"
diff --git a/recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb
new file mode 100644
index 0000000..70be2aa
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/bitmap_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu xbitmaps libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "78e8ab5c1830e2cdfbff7a952162a5a7"
+SRC_URI[archive.sha256sum] = "83719927ac4309f42e3cadde125a52cfba2e9c951115ac4c017f292f6e4c14bc"
diff --git a/recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb
new file mode 100644
index 0000000..9a83106
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/bitmap_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu xbitmaps libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "98200c358e5401d648b980564d9ae39d"
+SRC_URI[archive.sha256sum] = "863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41"
diff --git a/recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb
new file mode 100644
index 0000000..d8a957b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/constype_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "print an X window dump"
+DEPENDS += " libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9f99bee77ff3c565b4898663810fbef5"
+SRC_URI[archive.sha256sum] = "11403054cb407cdf31da48216f55d1b5943798cb442bcab69faa0a3d7d167541"
diff --git a/recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb
new file mode 100644
index 0000000..23956d3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/editres_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt libxmu libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9db49742bd4c17966fff7d76ac566d31"
+SRC_URI[archive.sha256sum] = "978fbc134eef3da8a5f363c9e93494a3d7399e8f2b435ac6b1f2c63f09c167df"
diff --git a/recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb
new file mode 100644
index 0000000..56cadc1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/editres_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt libxmu libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a25f931cc6c8d03daaed434f5db5df2d"
+SRC_URI[archive.sha256sum] = "a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae"
diff --git a/recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb
new file mode 100644
index 0000000..71e147c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/fonttosfnt_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " xproto freetype libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b0ebd86029571239b9d7b0c61191b591"
+SRC_URI[archive.sha256sum] = "9d2b0149ea49a097ab6c563801c06af9975e98f9fa4c8af1a8ac3238e4fd5243"
diff --git a/recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb
new file mode 100644
index 0000000..c1040ad
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/fslsfonts_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c7b2f8a938749d41dc86db6bd1e6a4ca"
+SRC_URI[archive.sha256sum] = "3feb006a25f36856924e26249fe84b27142678f97175780960f085e1e263a62e"
diff --git a/recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb
new file mode 100644
index 0000000..6c3148c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/fstobdf_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "99144743ab3cbb9cf37090fdc9e747db"
+SRC_URI[archive.sha256sum] = "690e45b252cd96036dd9b89af8624eb423e16d4bd662b07d264a3f876ce7ac22"
diff --git a/recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb
new file mode 100644
index 0000000..bcda802
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/iceauth_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "a tool for manipulating ICE protocol authorization records"
+DEPENDS += " libice"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7ab8b64edf0212a9d9a3c8129901a450"
+SRC_URI[archive.sha256sum] = "06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb"
diff --git a/recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb
new file mode 100644
index 0000000..7b35f1b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/lbxproxy_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Applications that would like to take advantage of the Low Bandwidth \
+extension to X (LBX) must make their connections to an lbxproxy."
+DEPENDS += " xtrans libxext liblbxutil libice xproxymngproto bigreqsproto zlib"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9d5045a5c76b1fe360221b967a5aa0e9"
+SRC_URI[archive.sha256sum] = "e2e757986724a5d2ee299aa7616a3d9985af45e363021b486b7abbcac4ca01c2"
diff --git a/recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb
new file mode 100644
index 0000000..d8c3475
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/luit_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " zlib zlib libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "aacda46598ce3af8ca16e2a8132db1b2"
+SRC_URI[archive.sha256sum] = "c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c"
diff --git a/recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb
new file mode 100644
index 0000000..4baac79
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/luit_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals"
+DEPENDS += " zlib zlib libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b01e4f71c20fc1c79ed727759c1df40c"
+SRC_URI[archive.sha256sum] = "2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7"
diff --git a/recipes/obsolete/xorg/xorg-app/mkcomposecache_1.2.bb b/recipes/obsolete/xorg/xorg-app/mkcomposecache_1.2.bb
new file mode 100644
index 0000000..8de1fad
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkcomposecache_1.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+DESCRIPTION = "used for creating global (system-wide) Compose cache files"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c8237b4aea1ae0c15441deab6b12c5c0"
+SRC_URI[archive.sha256sum] = "8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb
new file mode 100644
index 0000000..e3d1782
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of X font files in a directory"
+RDEPENDS_${PN} += "mkfontscale"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "4d0f89a23f77e22f1671a77bf0898955"
+SRC_URI[archive.sha256sum] = "2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb
new file mode 100644
index 0000000..dbc0884
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontdir_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of X font files in a directory"
+RDEPENDS_${PN} += "mkfontscale"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "35394bf3f746a57fba624dba52fdbba3"
+SRC_URI[archive.sha256sum] = "6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb
new file mode 100644
index 0000000..10d511f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of scalable font files for X"
+DEPENDS += " zlib libfontenc freetype "
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "1d608771aca9695b828cec1e34178fd1"
+SRC_URI[archive.sha256sum] = "0458a3a5525b4ab458a018648ef8575afc191f904364c00e27876a7bd53af020"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb
new file mode 100644
index 0000000..6a29088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of scalable font files for X"
+DEPENDS += " zlib libfontenc freetype "
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "e5d7373c4266973b3b13aac5d1a4655b"
+SRC_URI[archive.sha256sum] = "dc9b946cc23490c960fbca8b32e4bba4bc23ce404a8d7e1c0e916894c83b4227"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb
new file mode 100644
index 0000000..5e37e8e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/mkfontscale_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "a program to create an index of scalable font files for X"
+DEPENDS += " zlib libfontenc freetype "
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "5e6e210b70adfef1264b0212aab1f758"
+SRC_URI[archive.sha256sum] = "f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb
new file mode 100644
index 0000000..c78047f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/rgb_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DEPENDS += " xproto util-macros"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "255222b3ab3af671289a6b4844e9f393"
+SRC_URI[archive.sha256sum] = "f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad"
+
+FILES_${PN} += "${datadir}/X11"
diff --git a/recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb
new file mode 100644
index 0000000..2f17f8a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/rstart_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "99aea04a27197056368a4431f30f9cdb"
+SRC_URI[archive.sha256sum] = "02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596"
diff --git a/recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb
new file mode 100644
index 0000000..e7bede7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "bee5d87d40615e67c84ab0b0c65049ba"
+SRC_URI[archive.sha256sum] = "c23c12259854c7cec6d19bf397afff4a542a22170b14de73b321aa8cafcf3a86"
diff --git a/recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb
new file mode 100644
index 0000000..5482af9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.3.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "07665816f2623ec82e665fb7d31c6cef"
+SRC_URI[archive.sha256sum] = "7d0c145d53246ddf09fc749f91324897ed9a3da0064808f99b789c37470080dc"
diff --git a/recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb
new file mode 100644
index 0000000..9738608
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/sessreg_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a simple program for managing utmp/wtmp entries"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "839e968d7197b9563f0fd8a5a3aac2e3"
+SRC_URI[archive.sha256sum] = "23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802"
diff --git a/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb
new file mode 100644
index 0000000..f9434d7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxkbfile "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2b53542095a35a8a5731164118643883"
+SRC_URI[archive.sha256sum] = "086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508"
diff --git a/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb
new file mode 100644
index 0000000..8a9558b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/setxkbmap_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxkbfile "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6fab3bb176be9e510c5613d054ef1ca4"
+SRC_URI[archive.sha256sum] = "9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac"
diff --git a/recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb
new file mode 100644
index 0000000..a5ffa3a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/showfont_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "339b2faf1ca5114fda414338e15b6e21"
+SRC_URI[archive.sha256sum] = "87db3cf12914abc6b074d12b35c7f39c8fd7b5d3933b339e2c1260a51061760c"
diff --git a/recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb
new file mode 100644
index 0000000..0ef6033
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/smproxy_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "31da204a0255ba8c6a65386e65dc1c90"
+SRC_URI[archive.sha256sum] = "76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2"
diff --git a/recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb
new file mode 100644
index 0000000..feaebdd
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/twm_1.0.3.bb
@@ -0,0 +1,13 @@
+require xorg-app-common.inc
+DESCRIPTION = "tiny window manager"
+DEPENDS += " libxext libxt libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a56b71dc40249195b32b304633c28a3e"
+SRC_URI[archive.sha256sum] = "5b41550477a893bf2b82ab73fc7fb6c839ba52d0deac059be1a473dd7bb92a4e"
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/twm"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "1"
diff --git a/recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb b/recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb
new file mode 100644
index 0000000..7c61228
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/x11perf_1.4.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X11 server performance test program"
+DEPENDS += "libxmu libxrender libxft libxext fontconfig"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fd06c8b8e3572a0e14af65a49e0dd7d1"
+SRC_URI[archive.sha256sum] = "c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064"
diff --git a/recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb b/recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb
new file mode 100644
index 0000000..9cff277
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/x11perf_1.5.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X11 server performance test program"
+DEPENDS += "libxmu libxrender libxft libxext fontconfig"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "31283bfc3c78718ac1bd71e510d4e774"
+SRC_URI[archive.sha256sum] = "4729da53dde0b7e1748db4bb771f9b7aaf2e2b1e67293a3a5b96d54043ce1233"
+
+FILES_${PN} += "/usr/lib/X11/x11perfcomp/*"
diff --git a/recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb
new file mode 100644
index 0000000..bd391a2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xauth_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X authority file utility"
+DEPENDS += "libxau libxext libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "31b956edaeb453ddaa640420e97b25b2"
+SRC_URI[archive.sha256sum] = "569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17"
diff --git a/recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb
new file mode 100644
index 0000000..7adb51d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xauth_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X authority file utility"
+DEPENDS += "libxau libxext libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e91e10ace1df0d5f2cbc74ead256407a"
+SRC_URI[archive.sha256sum] = "1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c"
diff --git a/recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb b/recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb
new file mode 100644
index 0000000..287b2b1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xbacklight_1.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "adjust backlight brightness using RandR extension"
+DEPENDS += " libxrender libxrandr"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "51b4a1c0ae2b3bd77417306fd78a3e94"
+SRC_URI[archive.sha256sum] = "c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4"
diff --git a/recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb
new file mode 100644
index 0000000..ff042f0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xcalc_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "07b948cf671fde88df1a59bfb0cab3b8"
+SRC_URI[archive.sha256sum] = "17484e5fec0ebe7dd8df7218fde1449c52be3f4c6377a85a9fd86e377a7f4248"
diff --git a/recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb
new file mode 100644
index 0000000..06aeda2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xclipboard_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2c6ecedb10dc51adbb64c95f22fd99c2"
+SRC_URI[archive.sha256sum] = "3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc"
diff --git a/recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb
new file mode 100644
index 0000000..0bf6117
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xclock_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6b930326f71993fb54b7203902b387cd"
+SRC_URI[archive.sha256sum] = "ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d"
diff --git a/recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb
new file mode 100644
index 0000000..73ac39c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xclock_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "analog / digital clock for X"
+DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2b1a3d030d87e62a591db8ee4c0072e6"
+SRC_URI[archive.sha256sum] = "10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f"
diff --git a/recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb
new file mode 100644
index 0000000..770db7e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xcmsdb_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8579d5f50ba7f0c4a5bf16b9670fea01"
+SRC_URI[archive.sha256sum] = "e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e"
diff --git a/recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb
new file mode 100644
index 0000000..a7eacc3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xconsole_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8678ddd23573022d68dcd883ae239be8"
+SRC_URI[archive.sha256sum] = "45db847e810a932bb962041a4c242f97779142f7e36feec64ec5f9073bd9b377"
diff --git a/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb
new file mode 100644
index 0000000..39c6aa2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DEPENDS += " libxcursor libpng"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "39e1e62f5bd92603b0230b8b948c2fc4"
+SRC_URI[archive.sha256sum] = "18d3e0d64853089c2154f1f867df087fc15f87e03e09fabc98ee5e265d8a53ef"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb
new file mode 100644
index 0000000..a058a88
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xcursorgen_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "create an X cursor file from a collection of PNG images"
+DEPENDS += " libxcursor libpng"
+PE = "1"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "6fc90896b8c786cb1a2100b4167f7874"
+SRC_URI[archive.sha256sum] = "e009322bd2afef8d4ad91bcb6b17874e1cd00b1aaf397e7019a82cc44f3c174e"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb
new file mode 100644
index 0000000..02df29e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.3.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "619d0549c6c20ca15aa77769f2fbabe2"
+SRC_URI[archive.sha256sum] = "9e640974c132ef1faafedc77e4602d55457b2791006b677cec071ee8afbf9a74"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb
new file mode 100644
index 0000000..c0268c5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.4.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a2b4c280f3e324d081a0d9ed76a8a123"
+SRC_URI[archive.sha256sum] = "928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb
new file mode 100644
index 0000000..9a4d7d3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.6.bb
@@ -0,0 +1,12 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c89f8bc74fda4d19e5f374f59c88810f"
+SRC_URI[archive.sha256sum] = "c41ac89d9da5c3f5424e9c4871d363ff17acf0fd2a46830931c447ba0b5a8bcd"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
+
+FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb
new file mode 100644
index 0000000..844413c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.7.bb
@@ -0,0 +1,12 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "92effdb698d9ecc9113fe4f49294bd90"
+SRC_URI[archive.sha256sum] = "6a7bceccb1eb9ce3d14259be7a6cc8268bc9e1f127298480b9322ceb6f032d6d"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
+
+FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb b/recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb
new file mode 100644
index 0000000..fc8fa99
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdm_1.1.8.bb
@@ -0,0 +1,12 @@
+require xorg-app-common.inc
+DESCRIPTION = "X display manager"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "cc1816bc62a3722ad509373b0b7f30fe"
+SRC_URI[archive.sha256sum] = "e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
+
+FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb
new file mode 100644
index 0000000..80f4bf7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.2.bb
@@ -0,0 +1,12 @@
+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"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "c9ee60ae52c97c51d4ca327e53f0cb61"
+SRC_URI[archive.sha256sum] = "c9927fc33e8a4422d74b1ebee0d19dd5a16d9ebc435e8f47f0aa546501ccfed3"
+
+EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb
new file mode 100644
index 0000000..eff9c09
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdpyinfo_1.0.3.bb
@@ -0,0 +1,12 @@
+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"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "b7cbab6cbcd12bf7ad65dbc12d86e104"
+SRC_URI[archive.sha256sum] = "4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962"
+
+EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb
new file mode 100644
index 0000000..8a349d9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " glproto virtual/libgl"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "be3c5a9b242a57226b5bb5f22ec341ca"
+SRC_URI[archive.sha256sum] = "f693977bdaea7eb6b095a6b6bc60b8a62110ecdef4c455211346e592f59c3772"
diff --git a/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb
new file mode 100644
index 0000000..6f27ff2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xdriinfo_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "query configuration information of DRI drivers"
+DEPENDS += " glproto virtual/libgl"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a5ec51ed9f0a55dc3462d90d52ff899c"
+SRC_URI[archive.sha256sum] = "7b03ac095b6c79688c20ad61e3576d4698e3f16c09a7f3f1e7c50826814e7265"
diff --git a/recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb
new file mode 100644
index 0000000..001cbcd
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xedit_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxprintutil libxp libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c56160e93c24ddf17e69891ed50deb72"
+SRC_URI[archive.sha256sum] = "2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df"
diff --git a/recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb
new file mode 100644
index 0000000..402db0b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xev_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Event Viewer"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://diet-x11.patch"
+SRC_URI[archive.md5sum] = "e3008eb0655da3026c162a5597d70869"
+SRC_URI[archive.sha256sum] = "cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053"
diff --git a/recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb
new file mode 100644
index 0000000..a0990d2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xev_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Event Viewer"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://diet-x11.patch"
+SRC_URI[archive.md5sum] = "a9532c3d1683c99bb5df1895cb3a60b1"
+SRC_URI[archive.sha256sum] = "d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a"
diff --git a/recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb
new file mode 100644
index 0000000..6382df4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xeyes_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxau libxt libxext libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "033f14f7c4e30d1f4edbb22d5ef86883"
+SRC_URI[archive.sha256sum] = "530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029"
diff --git a/recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb
new file mode 100644
index 0000000..f50eaf4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfs_1.0.4.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f43cb64d623b748208dfd9012d17b654"
+SRC_URI[archive.sha256sum] = "452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b"
diff --git a/recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb
new file mode 100644
index 0000000..1d31d21
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfs_1.0.5.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3fc73b5e39a1fe8b8d96563c8144cffe"
+SRC_URI[archive.sha256sum] = "f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9"
diff --git a/recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb b/recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb
new file mode 100644
index 0000000..24028ac
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfs_1.0.6.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a62ea490a8b97f74b53732df8fc309d8"
+SRC_URI[archive.sha256sum] = "5a3ad18fdc67e261454740217f7c02d1b6825013abcebdcd778a4865fd823353"
diff --git a/recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb b/recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb
new file mode 100644
index 0000000..6324d81
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfs_1.0.8.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f10717e45535b64eb45226aac571dac2"
+SRC_URI[archive.sha256sum] = "34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482"
diff --git a/recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb
new file mode 100644
index 0000000..2df9b2a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xfsinfo_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libfs"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e98b18fbce1261de30b1de819d86f48a"
+SRC_URI[archive.sha256sum] = "adc33443b3a7f334d2407de702004a0491f24708e0e1abe74cd8ae114cd60cd9"
diff --git a/recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb
new file mode 100644
index 0000000..d6245ee
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xgamma_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxxf86vm"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "45d8fa3c85d4bfda87251798fd605a45"
+SRC_URI[archive.sha256sum] = "085330064fdb90a152d2d44474fa20bb81ccb6c587c144f5f9c323cb9cc31eee"
diff --git a/recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb
new file mode 100644
index 0000000..2b11285
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xgamma_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "Alter a monitor's gamma correction through the X server"
+DEPENDS += " libxxf86vm"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f13ddedaa63a608d3b025d326f4f5b5d"
+SRC_URI[archive.sha256sum] = "5d3d5b230fc60aefae8f4865c17add133b5fb11377fd61c80897ef94fcccf41e"
diff --git a/recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb
new file mode 100644
index 0000000..1a42fb1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xhost_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Server access control program for X"
+LICENSE = "MIT"
+DEPENDS += "libxmu libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f746aba36f075ae4cae313d849a94f4e"
+SRC_URI[archive.sha256sum] = "edab2cc49d230f58e54c0f7b83fd726fec5fc31356668a11589649f19ba90db6"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb
new file mode 100644
index 0000000..703f825
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f04a903cc0e18b3c338f58eb90f6caf8"
+SRC_URI[archive.sha256sum] = "c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186"
+
+FILES_${PN} += " /usr/lib/X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb
new file mode 100644
index 0000000..2ff99ce
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9df52a504dc04313a6650fae364ae04a"
+SRC_URI[archive.sha256sum] = "1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb
new file mode 100644
index 0000000..120f42f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9a2aad51042141a0e6ad066015397595"
+SRC_URI[archive.sha256sum] = "95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb
new file mode 100644
index 0000000..50c4270
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.7.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8b882d9e2deed9d85469a3beaec566a3"
+SRC_URI[archive.sha256sum] = "15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb
new file mode 100644
index 0000000..1771578
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.8.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "521574088fbd688edbf91e6bae674265"
+SRC_URI[archive.sha256sum] = "06c1049f6b63d1c368a1e03e2392097919b22ff24899e190de3577bffe6fe524"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb
new file mode 100644
index 0000000..7d8270a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.0.9.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "224c36057e4416205d4e421af01a2f15"
+SRC_URI[archive.sha256sum] = "b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb
new file mode 100644
index 0000000..1829819
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.1.0.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9144097186c3d2454beffe8ac3b53c6e"
+SRC_URI[archive.sha256sum] = "c79ec1a4d60404715a626f2832f1b62f43b9d52a1e4642b40af743ee41362590"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb b/recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb
new file mode 100644
index 0000000..fc5ca59
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinit_1.2.0.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Window System initializer"
+DEPENDS += "util-linux-ng"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fe1696cab2fbed6fa059d0cd1c53ac13"
+SRC_URI[archive.sha256sum] = "ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f"
+
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb b/recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb
new file mode 100644
index 0000000..dac3150
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinput_1.3.0.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "977d657e8d7b59f7d82c98ebef444b28"
+SRC_URI[archive.sha256sum] = "330c3e5188abf256131c162c456060804f369349e9a0e7aa3efbc54add802e45"
diff --git a/recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb b/recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb
new file mode 100644
index 0000000..9e58205
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinput_1.4.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "58e619576cbf4b6057eebb7a97fe2ddf"
+SRC_URI[archive.sha256sum] = "3195916b6cebf109eb571b939d7cea7075ef1933782526a6d8fbbb353bc3924b"
diff --git a/recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb b/recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb
new file mode 100644
index 0000000..9b990b0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xinput_1.5.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "82400f0ba63217df9b00d825532cea7d"
+SRC_URI[archive.sha256sum] = "e33c8361c2b6cb13db9a7157753d417c168c8203c8b7027e9dda2fbeef00fd33"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb
new file mode 100644
index 0000000..ebc8375
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+DEPENDS += " libxkbfile"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "2fbcae1323c266edf5b6c61751f2e343"
+SRC_URI[archive.sha256sum] = "0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb
new file mode 100644
index 0000000..64b2370
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+DEPENDS += " libxkbfile"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "d5122f1d5a91725a81c843f3bd388244"
+SRC_URI[archive.sha256sum] = "fefc574bf639d64348939edf9654306af2bb3c20447be9cff493cb06d87cb672"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb
new file mode 100644
index 0000000..bcd1455
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbcomp_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+DEPENDS += " libxkbfile"
+PR = "${INC_PR}.1"
+
+SRC_URI[archive.md5sum] = "6cc96c3e4ed5d9802fe717beac008f19"
+SRC_URI[archive.sha256sum] = "204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb
new file mode 100644
index 0000000..66b6937
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbevd_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxkbfile "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "68f2a143716c23b566f8509d9498f516"
+SRC_URI[archive.sha256sum] = "4b78e316ecf9a9498291f634a7e9ee712ba429d5606f300c0a27eacdaaa1f72b"
diff --git a/recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb
new file mode 100644
index 0000000..7547e96
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkbutils_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxkbfile "
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "84396a3dd75337caaae29d8fa5616fb1"
+SRC_URI[archive.sha256sum] = "aaad73ed8db764978a18bc6ba774d38a4c1330c86622c0b47ae3ced09c175856"
diff --git a/recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb
new file mode 100644
index 0000000..ba95dbe
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xkill_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f66d76abb0f75514ca32272e23cca757"
+SRC_URI[archive.sha256sum] = "77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de"
diff --git a/recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb
new file mode 100644
index 0000000..9b72817
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xload_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ba013813f9c21eb015559466f8d02a44"
+SRC_URI[archive.sha256sum] = "8d51184d6b18eea2f64e0c5b88cd95edff8353ce6529e780f95b1f2347babbf2"
diff --git a/recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb
new file mode 100644
index 0000000..3acd54f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xlsatoms_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "69adcda848479acc3b82b3928812d191"
+SRC_URI[archive.sha256sum] = "456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a"
diff --git a/recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb
new file mode 100644
index 0000000..9b32088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xlsclients_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "44473b880d26bfbe8b3d4d72b183cba7"
+SRC_URI[archive.sha256sum] = "988c71c6dc3519523fe5844ee3e49d91f843a83c783dd0baa20526d9d2981698"
diff --git a/recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb
new file mode 100644
index 0000000..5a88403
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xlsfonts_1.0.1.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ca9c6c88d0b83360b7b5092615fbf591"
+SRC_URI[archive.sha256sum] = "c8d826194299b2b8e3c6edce7070f05421465b0118ed47135a0195d12fe8a720"
diff --git a/recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb
new file mode 100644
index 0000000..c09140d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmag_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "058d168d1c7c991b8d12158433ea5f63"
+SRC_URI[archive.sha256sum] = "1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02"
diff --git a/recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb
new file mode 100644
index 0000000..2856093
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmag_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "magnify parts of the screen"
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7c6a783e42c88360ac31d259a864a19d"
+SRC_URI[archive.sha256sum] = "51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43"
diff --git a/recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb
new file mode 100644
index 0000000..1844180
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xman_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxprintutil libxp libxt"
+RDEPENDS_${PN} = " man"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "855f2dbfa2aff58b8b9cd6a1c1120fad"
+SRC_URI[archive.sha256sum] = "00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2"
+
+FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb
new file mode 100644
index 0000000..d1dcf65
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xman_1.0.3.bb
@@ -0,0 +1,11 @@
+require xorg-app-common.inc
+DESCRIPTION = "manual page browser for X"
+DEPENDS += " libxaw libxprintutil libxp libxt"
+RDEPENDS_${PN} = " man"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "3d3a4b310a65ccce82472ef83acbbf97"
+SRC_URI[archive.sha256sum] = "38e03bfa2d3d109d55342e3539be952268e405fb458fb8c4f87739594a25394a"
+
+FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb
new file mode 100644
index 0000000..5ecfae0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmessage_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "xmessage displays a message or query in a window."
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b3674c3a00a089764d86aa94e257ccec"
+SRC_URI[archive.sha256sum] = "b921aef62c2a2f5c32048502cd96630e9d42493cd39d1841fde247274f24bbda"
diff --git a/recipes/obsolete/xorg/xorg-app/xmodmap/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xmodmap/autofoo.patch
new file mode 100644
index 0000000..f309add
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmodmap/autofoo.patch
@@ -0,0 +1,109 @@
+diff -urN xmodmap.orig/Makefile.am xmodmap/Makefile.am
+--- xmodmap.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xmodmap/Makefile.am 2004-08-31 19:49:33.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XMODMAP_CFLAGS@
++
++bin_PROGRAMS = xmodmap
++
++xmodmap_SOURCES = exec.c handle.c pf.c wq.h xmodmap.c xmodmap.h
++
++xmodmap_LDADD = @XMODMAP_LIBS@
++
++man5_MANS=xmodmap.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xmodmap.orig/autogen.sh xmodmap/autogen.sh
+--- xmodmap.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xmodmap/autogen.sh 2004-08-31 19:46:14.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xmodmap.orig/configure.ac xmodmap/configure.ac
+--- xmodmap.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xmodmap/configure.ac 2004-08-31 20:27:03.000000000 +0200
+@@ -0,0 +1,41 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xmodmap],4.4.0,[],xmodmap)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XMODMAP, x11)
++
++AC_OUTPUT([Makefile])
diff --git a/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb
new file mode 100644
index 0000000..17bbc7e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ea78b3e32e27c3662f86ea68b3aec22f"
+SRC_URI[archive.sha256sum] = "4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44"
diff --git a/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb
new file mode 100644
index 0000000..ab245b3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xmodmap_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+LICENSE = "MIT"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "626731003ec22a74ecf9e44ed098bbdf"
+SRC_URI[archive.sha256sum] = "c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f"
diff --git a/recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb
new file mode 100644
index 0000000..5e70d01
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xpr_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "01c0a14755fc91369e8c011c9f881d5d"
+SRC_URI[archive.sha256sum] = "b871221d23dc4fc50398e9fe0e2a6a4e951aa6c9df2c5671d069ad88f0fd6249"
diff --git a/recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb
new file mode 100644
index 0000000..f117bd8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xpr_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "print an X window dump"
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6b3a6896081f628bf5a2c9129417c86f"
+SRC_URI[archive.sha256sum] = "c325a9896d1cda43a681f1c2a6a2bbb1c580ade57a882b0a8f84ffa359238adf"
diff --git a/recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch
new file mode 100644
index 0000000..2526d95
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xprop/autofoo.patch
@@ -0,0 +1,157 @@
+diff -urN xprop.orig/Makefile.am xprop/Makefile.am
+--- xprop.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xprop/Makefile.am 2004-08-15 18:49:43.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XPROP_CFLAGS@
++
++bin_PROGRAMS = xprop
++
++xprop_SOURCES = dsimple.c dsimple.h xprop.c
++
++xprop_LDADD = @XPROP_LIBS@
++
++man5_MANS=xprop.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xprop.orig/configure.ac xprop/configure.ac
+--- xprop.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xprop/configure.ac 2004-08-15 19:00:43.000000000 +0200
+@@ -0,0 +1,44 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xprop],4.4.0,[],xprop)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XPROP, xext xmuu x11)
++
++AC_CHECK_HEADERS([wchar.h])
++AC_CHECK_HEADERS([wctype.h])
++
++AC_OUTPUT([Makefile])
+diff -urN xprop.orig/dsimple.c xprop/dsimple.c
+--- xprop.orig/dsimple.c 2003-11-14 16:54:54.000000000 +0100
++++ xprop/dsimple.c 2004-08-15 19:19:32.000000000 +0200
+@@ -27,11 +27,16 @@
+
+ */
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ /*
+ * Other_stuff.h: Definitions of routines in other_stuff.
+ *
+@@ -69,7 +74,7 @@
+ char *Malloc(size)
+ unsigned size;
+ {
+- char *data, *malloc();
++ char *data;
+
+ if (!(data = malloc(size)))
+ Fatal_Error("Out of memory!");
+@@ -85,7 +90,7 @@
+ char *ptr;
+ int size;
+ {
+- char *new_ptr, *realloc();
++ char *new_ptr;
+
+ if (!ptr)
+ return(Malloc(size));
+diff -urN xprop.orig/xprop.c xprop/xprop.c
+--- xprop.orig/xprop.c 2004-04-23 21:55:03.000000000 +0200
++++ xprop/xprop.c 2004-08-15 19:23:13.000000000 +0200
+@@ -30,6 +30,10 @@
+ /* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */
+
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xlib.h>
+ #include <X11/Xos.h>
+ #include <X11/Xfuncs.h>
diff --git a/recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb
new file mode 100644
index 0000000..f57c8de
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xprop_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5b6f02a3b1cda0cadc35f84814fe53d4"
+SRC_URI[archive.sha256sum] = "88b1e65703c68f14ac6cb735737d1a0e52751a18fdc8a39d2d1e5eaa07875ca0"
diff --git a/recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb
new file mode 100644
index 0000000..526db7b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xprop_1.0.4.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "a property displayer for X"
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "48aa8fd78802f477dcbf9ef0dfd9f783"
+SRC_URI[archive.sha256sum] = "daa47cba7d5a919ca1bd053d8a8b6af4904f77eded4bdb055cd915aa5f5cd772"
diff --git a/recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb b/recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb
new file mode 100644
index 0000000..b09b16b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrandr_1.2.2.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE = "BSD-X"
+DEPENDS += "libxrandr libxrender"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://resolve_symbol_clash.patch"
+SRC_URI[archive.md5sum] = "c6ec9dc42396e3b3a2da932f3feca6ec"
+SRC_URI[archive.sha256sum] = "632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303"
diff --git a/recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb b/recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb
new file mode 100644
index 0000000..6923ce3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrandr_1.2.3.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE = "BSD-X"
+DEPENDS += "libxrandr libxrender"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://resolve_symbol_clash.patch"
+SRC_URI[archive.md5sum] = "41a9d0cc073fa6165a31fbf9e85f68a6"
+SRC_URI[archive.sha256sum] = "ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207"
diff --git a/recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch
new file mode 100644
index 0000000..b30a46b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrdb/autofoo.patch
@@ -0,0 +1,132 @@
+diff -urN xrdb.orig/Imakefile xrdb/Imakefile
+--- xrdb.orig/Imakefile 2004-04-23 21:55:03.000000000 +0200
++++ xrdb/Imakefile 1970-01-01 01:00:00.000000000 +0100
+@@ -1,19 +0,0 @@
+-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $
+-
+-
+-
+-
+-XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.6tsi Exp $
+-
+-#ifdef PatheticCpp
+- CPPDEFS = -DPATHETICCPP
+-#endif
+-#if HasMkstemp
+- CPPDEFS = -DHAS_MKSTEMP
+-#endif
+-XCOMM Due to ill make parsing the cpp is passed directly in source file
+- DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS)
+- DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB)
+-LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB)
+-
+-SimpleProgramTarget(xrdb)
+diff -urN xrdb.orig/Makefile.am xrdb/Makefile.am
+--- xrdb.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xrdb/Makefile.am 2004-08-14 16:05:01.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XRDB_CFLAGS@
++
++bin_PROGRAMS = xrdb
++
++xrdb_SOURCES = xrdb.c
++
++xrdb_LDADD = @XRDB_LIBS@
++
++man5_MANS=xrdb.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xrdb.orig/autogen.sh xrdb/autogen.sh
+--- xrdb.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xrdb/autogen.sh 2004-08-14 15:57:35.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xrdb.orig/configure.ac xrdb/configure.ac
+--- xrdb.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xrdb/configure.ac 2004-08-14 16:03:31.000000000 +0200
+@@ -0,0 +1,41 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xrdb],4.4.0,[],xrdb)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XRDB, xext xmuu x11)
++
++AC_OUTPUT([Makefile])
diff --git a/recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb
new file mode 100644
index 0000000..6c4d86d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "380b2ef545306354cc150834de567be7"
+SRC_URI[archive.sha256sum] = "a4a3b8cd821adc201a072f8c0214d73ee6a7e7b898de90e18f7d89a4453fb12c"
diff --git a/recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb
new file mode 100644
index 0000000..7181dc9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "34eb2311a0c5279e7b4f492e826f63d1"
+SRC_URI[archive.sha256sum] = "3f8cde77e8cbeb6d0a5f232b7a2ee51dd49b677916d52ab0986d320a5f9e8000"
diff --git a/recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb
new file mode 100644
index 0000000..d474dc8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrdb_1.0.5.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9c30b8e1709d5367beb7706146640c07"
+SRC_URI[archive.sha256sum] = "c24d08939250f10238fd1b984707bfa0901ba9c55fa36b67d91eb12b500500aa"
diff --git a/recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb
new file mode 100644
index 0000000..a97f1af
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrefresh_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1228f890f86148e4e6ae22aa73118cbb"
+SRC_URI[archive.sha256sum] = "522831fd29c0b250f29735a01b02e96e311f200a675e45c8b3d187b6f86b32f5"
diff --git a/recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb
new file mode 100644
index 0000000..25f0c80
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xrx_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxaw libxt libxext xtrans xproxymngproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5f65e24f8a225e255beb2059e33d6b37"
+SRC_URI[archive.sha256sum] = "a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4"
diff --git a/recipes/obsolete/xorg/xorg-app/xset/autofoo.patch b/recipes/obsolete/xorg/xorg-app/xset/autofoo.patch
new file mode 100644
index 0000000..039d131
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset/autofoo.patch
@@ -0,0 +1,109 @@
+diff -urN xset.orig/Makefile.am xset/Makefile.am
+--- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xset/Makefile.am 2004-08-14 16:32:10.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XSET_CFLAGS@
++
++bin_PROGRAMS = xset
++
++xset_SOURCES = xset.c
++
++xset_LDADD = @XSET_LIBS@
++
++man5_MANS=xset.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xset.orig/autogen.sh xset/autogen.sh
+--- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xset.orig/configure.ac xset/configure.ac
+--- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xset/configure.ac 2004-08-17 14:21:25.000000000 +0200
+@@ -0,0 +1,41 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xset],4.4.0,[],xset)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XSET, xext xextensions xmuu x11)
++
++AC_OUTPUT([Makefile])
diff --git a/recipes/obsolete/xorg/xorg-app/xset/disable-xkb.patch b/recipes/obsolete/xorg/xorg-app/xset/disable-xkb.patch
new file mode 100644
index 0000000..6060fbb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset/disable-xkb.patch
@@ -0,0 +1,18 @@
+--- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100
++++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100
+@@ -42,11 +42,15 @@
+ AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+
++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
++ XKB="$enableval", XKB="yes")
++if test "x$XKB" = "xyes" ; then
+ PKG_CHECK_MODULES(SET_XKB, x11,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
+ AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
++fi
+
+ PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb
new file mode 100644
index 0000000..35aebe5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset_1.0.2.bb
@@ -0,0 +1,14 @@
+require xorg-app-common.inc
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "1b781a0802c7b8fb9619a6665607b3f0"
+SRC_URI[archive.sha256sum] = "ce1e17c513a4499526e648a59c39ba01777c99c86093433cf392f27654b795c9"
+
+EXTRA_OECONF = "--disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb
new file mode 100644
index 0000000..c37b4bb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset_1.0.3.bb
@@ -0,0 +1,14 @@
+require xorg-app-common.inc
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "657bbb43ce5470c33665d187c1740566"
+SRC_URI[archive.sha256sum] = "0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11"
+
+EXTRA_OECONF = "--disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb
new file mode 100644
index 0000000..24c35e0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xset_1.0.4.bb
@@ -0,0 +1,14 @@
+require xorg-app-common.inc
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://disable-xkb.patch"
+SRC_URI[archive.md5sum] = "2f41fd983ba4d89419204854936025e2"
+SRC_URI[archive.sha256sum] = "6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad"
+
+EXTRA_OECONF = "--disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb b/recipes/obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb
new file mode 100644
index 0000000..409ea16
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xsetpointer_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxi "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c94ea103e27e370e4e5030e50c5d5d69"
+SRC_URI[archive.sha256sum] = "7d65f450420b4f764dcf38e4ccee9d608b5a5874706e716cb861bfe2586b7d4a"
diff --git a/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb
new file mode 100644
index 0000000..c81a319
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fc7eeb7130bb54345671a9dbaab567ac"
+SRC_URI[archive.sha256sum] = "897d77acd3f4a366472386139827eaac24cc423c811ef0e65e0d5eca099a3155"
diff --git a/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb
new file mode 100644
index 0000000..dc79d52
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xsetroot_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9af7db9f3052aef0b11636720b3101dd"
+SRC_URI[archive.sha256sum] = "4f9a751f4830d479fae8ccb68ed04896dc99612789310b7917bd15c04aa3351d"
diff --git a/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb
new file mode 100644
index 0000000..ee77b80
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "Print out X-Video extension adaptor information"
+DEPENDS += " libxv"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0a5bd8e43de6eb8ff5b5bc673204401d"
+SRC_URI[archive.sha256sum] = "439b3c7ad96fc7b1ef9156c716e10b607883a9a58b777f8dc02f03284eb33fb3"
diff --git a/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb
new file mode 100644
index 0000000..8422d34
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xvinfo_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "Print out X-Video extension adaptor information"
+DEPENDS += " libxv"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e1e318436f49e2f0f3764593dadd9ad2"
+SRC_URI[archive.sha256sum] = "126e2a612ac723f9688904fcfa612688d62e520ce55c56eb34eb5390074cf150"
diff --git a/recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb
new file mode 100644
index 0000000..bfe181b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwd_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "911addfb7fa402217ddac63e5c1d97c7"
+SRC_URI[archive.sha256sum] = "c8bd9bcd64df439c2cd09eaa3e83a1297fbfed5c7d3dd8117342b3a25eeae131"
diff --git a/recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb
new file mode 100644
index 0000000..597aa05
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwd_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0a6ef08a2ac08ad5c4dd1522eb3788a3"
+SRC_URI[archive.sha256sum] = "ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61"
diff --git a/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb
new file mode 100644
index 0000000..288af54
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu libxext "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e5dbc8866a55958297f5f38205b6be1e"
+SRC_URI[archive.sha256sum] = "9fdfd3259b335531cdba831872ec0e32c5f6df01e14b87c3187b494be75b7b66"
diff --git a/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb
new file mode 100644
index 0000000..01f6c9b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+DESCRIPTION = "window information utility for X"
+DEPENDS += " libxmu libxext "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "721f84332c98c33152460bb22ba9ded6"
+SRC_URI[archive.sha256sum] = "fbe3a1aafbc6fa113e58971ff2a82605a7e106af8b810eea4b7512de58a5478a"
diff --git a/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb
new file mode 100644
index 0000000..317aa1d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwininfo_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DEPENDS += " libxmu libxext "
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e2a9bf5ab7f2a0866700a3b49dd8c6bf"
+SRC_URI[archive.sha256sum] = "df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4"
diff --git a/recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb b/recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb
new file mode 100644
index 0000000..53d06df
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-app/xwud_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6e3c5d0297d88e890b6f5df31f73dd60"
+SRC_URI[archive.sha256sum] = "d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c"
diff --git a/recipes/xorg-app/appres_1.0.1.bb b/recipes/xorg-app/appres_1.0.1.bb
deleted file mode 100644
index 698b7c4..0000000
--- a/recipes/xorg-app/appres_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The appres program prints the resources seen by an application."
-DEPENDS += " libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "420e6cdf38bb771ec8b00228bf09e8ff"
-SRC_URI[archive.sha256sum] = "15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962"
diff --git a/recipes/xorg-app/bdftopcf_1.0.1.bb b/recipes/xorg-app/bdftopcf_1.0.1.bb
deleted file mode 100644
index d5ddd50..0000000
--- a/recipes/xorg-app/bdftopcf_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "converts BDF fonts to PCF fonts"
-DEPENDS += " libxfont"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "9685fab33d39954ab8a0d22e0969d5a4"
-SRC_URI[archive.sha256sum] = "aaaa45ab361781aebda2093fdc7eb5c187f6215b4ba308dd6b9ff2b727e805d3"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/beforelight_1.0.2.bb b/recipes/xorg-app/beforelight_1.0.2.bb
deleted file mode 100644
index 09852db..0000000
--- a/recipes/xorg-app/beforelight_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxscrnsaver libxt libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8bc2e35cdcd2e6a80eab1b77c41f2a46"
-SRC_URI[archive.sha256sum] = "00e217559c93779fe04fd948017820af118a3981d6b4371ace95107cb3b047a7"
diff --git a/recipes/xorg-app/bitmap_1.0.2.bb b/recipes/xorg-app/bitmap_1.0.2.bb
deleted file mode 100644
index 70be2aa..0000000
--- a/recipes/xorg-app/bitmap_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu xbitmaps libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "78e8ab5c1830e2cdfbff7a952162a5a7"
-SRC_URI[archive.sha256sum] = "83719927ac4309f42e3cadde125a52cfba2e9c951115ac4c017f292f6e4c14bc"
diff --git a/recipes/xorg-app/bitmap_1.0.3.bb b/recipes/xorg-app/bitmap_1.0.3.bb
deleted file mode 100644
index 9a83106..0000000
--- a/recipes/xorg-app/bitmap_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu xbitmaps libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "98200c358e5401d648b980564d9ae39d"
-SRC_URI[archive.sha256sum] = "863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41"
diff --git a/recipes/xorg-app/constype_1.0.1.bb b/recipes/xorg-app/constype_1.0.1.bb
deleted file mode 100644
index d8a957b..0000000
--- a/recipes/xorg-app/constype_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "print an X window dump"
-DEPENDS += " libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9f99bee77ff3c565b4898663810fbef5"
-SRC_URI[archive.sha256sum] = "11403054cb407cdf31da48216f55d1b5943798cb442bcab69faa0a3d7d167541"
diff --git a/recipes/xorg-app/editres_1.0.2.bb b/recipes/xorg-app/editres_1.0.2.bb
deleted file mode 100644
index 23956d3..0000000
--- a/recipes/xorg-app/editres_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt libxmu libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9db49742bd4c17966fff7d76ac566d31"
-SRC_URI[archive.sha256sum] = "978fbc134eef3da8a5f363c9e93494a3d7399e8f2b435ac6b1f2c63f09c167df"
diff --git a/recipes/xorg-app/editres_1.0.3.bb b/recipes/xorg-app/editres_1.0.3.bb
deleted file mode 100644
index 56cadc1..0000000
--- a/recipes/xorg-app/editres_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt libxmu libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a25f931cc6c8d03daaed434f5db5df2d"
-SRC_URI[archive.sha256sum] = "a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae"
diff --git a/recipes/xorg-app/fonttosfnt_1.0.3.bb b/recipes/xorg-app/fonttosfnt_1.0.3.bb
deleted file mode 100644
index 71e147c..0000000
--- a/recipes/xorg-app/fonttosfnt_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " xproto freetype libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b0ebd86029571239b9d7b0c61191b591"
-SRC_URI[archive.sha256sum] = "9d2b0149ea49a097ab6c563801c06af9975e98f9fa4c8af1a8ac3238e4fd5243"
diff --git a/recipes/xorg-app/fslsfonts_1.0.1.bb b/recipes/xorg-app/fslsfonts_1.0.1.bb
deleted file mode 100644
index c1040ad..0000000
--- a/recipes/xorg-app/fslsfonts_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libfs"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c7b2f8a938749d41dc86db6bd1e6a4ca"
-SRC_URI[archive.sha256sum] = "3feb006a25f36856924e26249fe84b27142678f97175780960f085e1e263a62e"
diff --git a/recipes/xorg-app/fstobdf_1.0.2.bb b/recipes/xorg-app/fstobdf_1.0.2.bb
deleted file mode 100644
index 6c3148c..0000000
--- a/recipes/xorg-app/fstobdf_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libfs"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "99144743ab3cbb9cf37090fdc9e747db"
-SRC_URI[archive.sha256sum] = "690e45b252cd96036dd9b89af8624eb423e16d4bd662b07d264a3f876ce7ac22"
diff --git a/recipes/xorg-app/iceauth_1.0.2.bb b/recipes/xorg-app/iceauth_1.0.2.bb
deleted file mode 100644
index bcda802..0000000
--- a/recipes/xorg-app/iceauth_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a tool for manipulating ICE protocol authorization records"
-DEPENDS += " libice"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7ab8b64edf0212a9d9a3c8129901a450"
-SRC_URI[archive.sha256sum] = "06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb"
diff --git a/recipes/xorg-app/lbxproxy_1.0.1.bb b/recipes/xorg-app/lbxproxy_1.0.1.bb
deleted file mode 100644
index 7b35f1b..0000000
--- a/recipes/xorg-app/lbxproxy_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Applications that would like to take advantage of the Low Bandwidth \
-extension to X (LBX) must make their connections to an lbxproxy."
-DEPENDS += " xtrans libxext liblbxutil libice xproxymngproto bigreqsproto zlib"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9d5045a5c76b1fe360221b967a5aa0e9"
-SRC_URI[archive.sha256sum] = "e2e757986724a5d2ee299aa7616a3d9985af45e363021b486b7abbcac4ca01c2"
diff --git a/recipes/xorg-app/luit_1.0.2.bb b/recipes/xorg-app/luit_1.0.2.bb
deleted file mode 100644
index d8c3475..0000000
--- a/recipes/xorg-app/luit_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " zlib zlib libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "aacda46598ce3af8ca16e2a8132db1b2"
-SRC_URI[archive.sha256sum] = "c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c"
diff --git a/recipes/xorg-app/luit_1.0.3.bb b/recipes/xorg-app/luit_1.0.3.bb
deleted file mode 100644
index 4baac79..0000000
--- a/recipes/xorg-app/luit_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals"
-DEPENDS += " zlib zlib libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b01e4f71c20fc1c79ed727759c1df40c"
-SRC_URI[archive.sha256sum] = "2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7"
diff --git a/recipes/xorg-app/mkcomposecache_1.2.bb b/recipes/xorg-app/mkcomposecache_1.2.bb
deleted file mode 100644
index 8de1fad..0000000
--- a/recipes/xorg-app/mkcomposecache_1.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "used for creating global (system-wide) Compose cache files"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c8237b4aea1ae0c15441deab6b12c5c0"
-SRC_URI[archive.sha256sum] = "8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb"
diff --git a/recipes/xorg-app/mkfontdir_1.0.3.bb b/recipes/xorg-app/mkfontdir_1.0.3.bb
deleted file mode 100644
index e3d1782..0000000
--- a/recipes/xorg-app/mkfontdir_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of X font files in a directory"
-RDEPENDS_${PN} += "mkfontscale"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "4d0f89a23f77e22f1671a77bf0898955"
-SRC_URI[archive.sha256sum] = "2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/mkfontdir_1.0.4.bb b/recipes/xorg-app/mkfontdir_1.0.4.bb
deleted file mode 100644
index dbc0884..0000000
--- a/recipes/xorg-app/mkfontdir_1.0.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of X font files in a directory"
-RDEPENDS_${PN} += "mkfontscale"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "35394bf3f746a57fba624dba52fdbba3"
-SRC_URI[archive.sha256sum] = "6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/mkfontscale_1.0.3.bb b/recipes/xorg-app/mkfontscale_1.0.3.bb
deleted file mode 100644
index 10d511f..0000000
--- a/recipes/xorg-app/mkfontscale_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of scalable font files for X"
-DEPENDS += " zlib libfontenc freetype "
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "1d608771aca9695b828cec1e34178fd1"
-SRC_URI[archive.sha256sum] = "0458a3a5525b4ab458a018648ef8575afc191f904364c00e27876a7bd53af020"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/mkfontscale_1.0.4.bb b/recipes/xorg-app/mkfontscale_1.0.4.bb
deleted file mode 100644
index 6a29088..0000000
--- a/recipes/xorg-app/mkfontscale_1.0.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of scalable font files for X"
-DEPENDS += " zlib libfontenc freetype "
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "e5d7373c4266973b3b13aac5d1a4655b"
-SRC_URI[archive.sha256sum] = "dc9b946cc23490c960fbca8b32e4bba4bc23ce404a8d7e1c0e916894c83b4227"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/mkfontscale_1.0.5.bb b/recipes/xorg-app/mkfontscale_1.0.5.bb
deleted file mode 100644
index 5e37e8e..0000000
--- a/recipes/xorg-app/mkfontscale_1.0.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a program to create an index of scalable font files for X"
-DEPENDS += " zlib libfontenc freetype "
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "5e6e210b70adfef1264b0212aab1f758"
-SRC_URI[archive.sha256sum] = "f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/rgb_1.0.1.bb b/recipes/xorg-app/rgb_1.0.1.bb
deleted file mode 100644
index c78047f..0000000
--- a/recipes/xorg-app/rgb_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " xproto util-macros"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "255222b3ab3af671289a6b4844e9f393"
-SRC_URI[archive.sha256sum] = "f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad"
-
-FILES_${PN} += "${datadir}/X11"
diff --git a/recipes/xorg-app/rstart_1.0.2.bb b/recipes/xorg-app/rstart_1.0.2.bb
deleted file mode 100644
index 2f17f8a..0000000
--- a/recipes/xorg-app/rstart_1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "99aea04a27197056368a4431f30f9cdb"
-SRC_URI[archive.sha256sum] = "02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596"
diff --git a/recipes/xorg-app/sessreg_1.0.2.bb b/recipes/xorg-app/sessreg_1.0.2.bb
deleted file mode 100644
index e7bede7..0000000
--- a/recipes/xorg-app/sessreg_1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "bee5d87d40615e67c84ab0b0c65049ba"
-SRC_URI[archive.sha256sum] = "c23c12259854c7cec6d19bf397afff4a542a22170b14de73b321aa8cafcf3a86"
diff --git a/recipes/xorg-app/sessreg_1.0.3.bb b/recipes/xorg-app/sessreg_1.0.3.bb
deleted file mode 100644
index 5482af9..0000000
--- a/recipes/xorg-app/sessreg_1.0.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "07665816f2623ec82e665fb7d31c6cef"
-SRC_URI[archive.sha256sum] = "7d0c145d53246ddf09fc749f91324897ed9a3da0064808f99b789c37470080dc"
diff --git a/recipes/xorg-app/sessreg_1.0.4.bb b/recipes/xorg-app/sessreg_1.0.4.bb
deleted file mode 100644
index 9738608..0000000
--- a/recipes/xorg-app/sessreg_1.0.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a simple program for managing utmp/wtmp entries"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "839e968d7197b9563f0fd8a5a3aac2e3"
-SRC_URI[archive.sha256sum] = "23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802"
diff --git a/recipes/xorg-app/setxkbmap_1.0.3.bb b/recipes/xorg-app/setxkbmap_1.0.3.bb
deleted file mode 100644
index f9434d7..0000000
--- a/recipes/xorg-app/setxkbmap_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxkbfile "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2b53542095a35a8a5731164118643883"
-SRC_URI[archive.sha256sum] = "086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508"
diff --git a/recipes/xorg-app/setxkbmap_1.0.4.bb b/recipes/xorg-app/setxkbmap_1.0.4.bb
deleted file mode 100644
index 8a9558b..0000000
--- a/recipes/xorg-app/setxkbmap_1.0.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxkbfile "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6fab3bb176be9e510c5613d054ef1ca4"
-SRC_URI[archive.sha256sum] = "9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac"
diff --git a/recipes/xorg-app/showfont_1.0.1.bb b/recipes/xorg-app/showfont_1.0.1.bb
deleted file mode 100644
index a5ffa3a..0000000
--- a/recipes/xorg-app/showfont_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libfs"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "339b2faf1ca5114fda414338e15b6e21"
-SRC_URI[archive.sha256sum] = "87db3cf12914abc6b074d12b35c7f39c8fd7b5d3933b339e2c1260a51061760c"
diff --git a/recipes/xorg-app/smproxy_1.0.2.bb b/recipes/xorg-app/smproxy_1.0.2.bb
deleted file mode 100644
index 0ef6033..0000000
--- a/recipes/xorg-app/smproxy_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "31da204a0255ba8c6a65386e65dc1c90"
-SRC_URI[archive.sha256sum] = "76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2"
diff --git a/recipes/xorg-app/twm_1.0.3.bb b/recipes/xorg-app/twm_1.0.3.bb
deleted file mode 100644
index feaebdd..0000000
--- a/recipes/xorg-app/twm_1.0.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "tiny window manager"
-DEPENDS += " libxext libxt libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a56b71dc40249195b32b304633c28a3e"
-SRC_URI[archive.sha256sum] = "5b41550477a893bf2b82ab73fc7fb6c839ba52d0deac059be1a473dd7bb92a4e"
-
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/twm"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "1"
diff --git a/recipes/xorg-app/x11perf_1.4.1.bb b/recipes/xorg-app/x11perf_1.4.1.bb
deleted file mode 100644
index 7c61228..0000000
--- a/recipes/xorg-app/x11perf_1.4.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X11 server performance test program"
-DEPENDS += "libxmu libxrender libxft libxext fontconfig"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fd06c8b8e3572a0e14af65a49e0dd7d1"
-SRC_URI[archive.sha256sum] = "c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064"
diff --git a/recipes/xorg-app/x11perf_1.5.bb b/recipes/xorg-app/x11perf_1.5.bb
deleted file mode 100644
index 9cff277..0000000
--- a/recipes/xorg-app/x11perf_1.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X11 server performance test program"
-DEPENDS += "libxmu libxrender libxft libxext fontconfig"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "31283bfc3c78718ac1bd71e510d4e774"
-SRC_URI[archive.sha256sum] = "4729da53dde0b7e1748db4bb771f9b7aaf2e2b1e67293a3a5b96d54043ce1233"
-
-FILES_${PN} += "/usr/lib/X11/x11perfcomp/*"
diff --git a/recipes/xorg-app/xauth_1.0.2.bb b/recipes/xorg-app/xauth_1.0.2.bb
deleted file mode 100644
index bd391a2..0000000
--- a/recipes/xorg-app/xauth_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X authority file utility"
-DEPENDS += "libxau libxext libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "31b956edaeb453ddaa640420e97b25b2"
-SRC_URI[archive.sha256sum] = "569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17"
diff --git a/recipes/xorg-app/xauth_1.0.3.bb b/recipes/xorg-app/xauth_1.0.3.bb
deleted file mode 100644
index 7adb51d..0000000
--- a/recipes/xorg-app/xauth_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X authority file utility"
-DEPENDS += "libxau libxext libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e91e10ace1df0d5f2cbc74ead256407a"
-SRC_URI[archive.sha256sum] = "1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c"
diff --git a/recipes/xorg-app/xbacklight_1.1.bb b/recipes/xorg-app/xbacklight_1.1.bb
deleted file mode 100644
index 287b2b1..0000000
--- a/recipes/xorg-app/xbacklight_1.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "adjust backlight brightness using RandR extension"
-DEPENDS += " libxrender libxrandr"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "51b4a1c0ae2b3bd77417306fd78a3e94"
-SRC_URI[archive.sha256sum] = "c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4"
diff --git a/recipes/xorg-app/xcalc_1.0.1.bb b/recipes/xorg-app/xcalc_1.0.1.bb
deleted file mode 100644
index ff042f0..0000000
--- a/recipes/xorg-app/xcalc_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "07b948cf671fde88df1a59bfb0cab3b8"
-SRC_URI[archive.sha256sum] = "17484e5fec0ebe7dd8df7218fde1449c52be3f4c6377a85a9fd86e377a7f4248"
diff --git a/recipes/xorg-app/xclipboard_1.0.1.bb b/recipes/xorg-app/xclipboard_1.0.1.bb
deleted file mode 100644
index 06aeda2..0000000
--- a/recipes/xorg-app/xclipboard_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2c6ecedb10dc51adbb64c95f22fd99c2"
-SRC_URI[archive.sha256sum] = "3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc"
diff --git a/recipes/xorg-app/xclock_1.0.2.bb b/recipes/xorg-app/xclock_1.0.2.bb
deleted file mode 100644
index 0bf6117..0000000
--- a/recipes/xorg-app/xclock_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6b930326f71993fb54b7203902b387cd"
-SRC_URI[archive.sha256sum] = "ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d"
diff --git a/recipes/xorg-app/xclock_1.0.3.bb b/recipes/xorg-app/xclock_1.0.3.bb
deleted file mode 100644
index 73ac39c..0000000
--- a/recipes/xorg-app/xclock_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "analog / digital clock for X"
-DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2b1a3d030d87e62a591db8ee4c0072e6"
-SRC_URI[archive.sha256sum] = "10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f"
diff --git a/recipes/xorg-app/xcmsdb_1.0.1.bb b/recipes/xorg-app/xcmsdb_1.0.1.bb
deleted file mode 100644
index 770db7e..0000000
--- a/recipes/xorg-app/xcmsdb_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8579d5f50ba7f0c4a5bf16b9670fea01"
-SRC_URI[archive.sha256sum] = "e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e"
diff --git a/recipes/xorg-app/xconsole_1.0.2.bb b/recipes/xorg-app/xconsole_1.0.2.bb
deleted file mode 100644
index a7eacc3..0000000
--- a/recipes/xorg-app/xconsole_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8678ddd23573022d68dcd883ae239be8"
-SRC_URI[archive.sha256sum] = "45db847e810a932bb962041a4c242f97779142f7e36feec64ec5f9073bd9b377"
diff --git a/recipes/xorg-app/xcursorgen_1.0.1.bb b/recipes/xorg-app/xcursorgen_1.0.1.bb
deleted file mode 100644
index 39c6aa2..0000000
--- a/recipes/xorg-app/xcursorgen_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxcursor libpng"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "39e1e62f5bd92603b0230b8b948c2fc4"
-SRC_URI[archive.sha256sum] = "18d3e0d64853089c2154f1f867df087fc15f87e03e09fabc98ee5e265d8a53ef"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xcursorgen_1.0.2.bb b/recipes/xorg-app/xcursorgen_1.0.2.bb
deleted file mode 100644
index a058a88..0000000
--- a/recipes/xorg-app/xcursorgen_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "create an X cursor file from a collection of PNG images"
-DEPENDS += " libxcursor libpng"
-PE = "1"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "6fc90896b8c786cb1a2100b4167f7874"
-SRC_URI[archive.sha256sum] = "e009322bd2afef8d4ad91bcb6b17874e1cd00b1aaf397e7019a82cc44f3c174e"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xdm_1.1.3.bb b/recipes/xorg-app/xdm_1.1.3.bb
deleted file mode 100644
index 02df29e..0000000
--- a/recipes/xorg-app/xdm_1.1.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "619d0549c6c20ca15aa77769f2fbabe2"
-SRC_URI[archive.sha256sum] = "9e640974c132ef1faafedc77e4602d55457b2791006b677cec071ee8afbf9a74"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/recipes/xorg-app/xdm_1.1.4.bb b/recipes/xorg-app/xdm_1.1.4.bb
deleted file mode 100644
index c0268c5..0000000
--- a/recipes/xorg-app/xdm_1.1.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a2b4c280f3e324d081a0d9ed76a8a123"
-SRC_URI[archive.sha256sum] = "928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/recipes/xorg-app/xdm_1.1.6.bb b/recipes/xorg-app/xdm_1.1.6.bb
deleted file mode 100644
index 9a4d7d3..0000000
--- a/recipes/xorg-app/xdm_1.1.6.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c89f8bc74fda4d19e5f374f59c88810f"
-SRC_URI[archive.sha256sum] = "c41ac89d9da5c3f5424e9c4871d363ff17acf0fd2a46830931c447ba0b5a8bcd"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
-
-FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/xorg-app/xdm_1.1.7.bb b/recipes/xorg-app/xdm_1.1.7.bb
deleted file mode 100644
index 844413c..0000000
--- a/recipes/xorg-app/xdm_1.1.7.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "92effdb698d9ecc9113fe4f49294bd90"
-SRC_URI[archive.sha256sum] = "6a7bceccb1eb9ce3d14259be7a6cc8268bc9e1f127298480b9322ceb6f032d6d"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
-
-FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/xorg-app/xdm_1.1.8.bb b/recipes/xorg-app/xdm_1.1.8.bb
deleted file mode 100644
index fc8fa99..0000000
--- a/recipes/xorg-app/xdm_1.1.8.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libxext libxdmcp libxt libxaw"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "cc1816bc62a3722ad509373b0b7f30fe"
-SRC_URI[archive.sha256sum] = "e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9"
-
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
-
-FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/xorg-app/xdpyinfo_1.0.2.bb b/recipes/xorg-app/xdpyinfo_1.0.2.bb
deleted file mode 100644
index 80f4bf7..0000000
--- a/recipes/xorg-app/xdpyinfo_1.0.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-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"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "c9ee60ae52c97c51d4ca327e53f0cb61"
-SRC_URI[archive.sha256sum] = "c9927fc33e8a4422d74b1ebee0d19dd5a16d9ebc435e8f47f0aa546501ccfed3"
-
-EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-app/xdpyinfo_1.0.3.bb b/recipes/xorg-app/xdpyinfo_1.0.3.bb
deleted file mode 100644
index eff9c09..0000000
--- a/recipes/xorg-app/xdpyinfo_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-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"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "b7cbab6cbcd12bf7ad65dbc12d86e104"
-SRC_URI[archive.sha256sum] = "4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962"
-
-EXTRA_OECONF = "--disable-xkb"
diff --git a/recipes/xorg-app/xdriinfo_1.0.1.bb b/recipes/xorg-app/xdriinfo_1.0.1.bb
deleted file mode 100644
index 8a349d9..0000000
--- a/recipes/xorg-app/xdriinfo_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " glproto virtual/libgl"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "be3c5a9b242a57226b5bb5f22ec341ca"
-SRC_URI[archive.sha256sum] = "f693977bdaea7eb6b095a6b6bc60b8a62110ecdef4c455211346e592f59c3772"
diff --git a/recipes/xorg-app/xdriinfo_1.0.2.bb b/recipes/xorg-app/xdriinfo_1.0.2.bb
deleted file mode 100644
index 6f27ff2..0000000
--- a/recipes/xorg-app/xdriinfo_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "query configuration information of DRI drivers"
-DEPENDS += " glproto virtual/libgl"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a5ec51ed9f0a55dc3462d90d52ff899c"
-SRC_URI[archive.sha256sum] = "7b03ac095b6c79688c20ad61e3576d4698e3f16c09a7f3f1e7c50826814e7265"
diff --git a/recipes/xorg-app/xedit_1.0.2.bb b/recipes/xorg-app/xedit_1.0.2.bb
deleted file mode 100644
index 001cbcd..0000000
--- a/recipes/xorg-app/xedit_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxprintutil libxp libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c56160e93c24ddf17e69891ed50deb72"
-SRC_URI[archive.sha256sum] = "2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df"
diff --git a/recipes/xorg-app/xev_1.0.2.bb b/recipes/xorg-app/xev_1.0.2.bb
deleted file mode 100644
index 402db0b..0000000
--- a/recipes/xorg-app/xev_1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Event Viewer"
-LICENSE = "MIT"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://diet-x11.patch"
-SRC_URI[archive.md5sum] = "e3008eb0655da3026c162a5597d70869"
-SRC_URI[archive.sha256sum] = "cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053"
diff --git a/recipes/xorg-app/xev_1.0.3.bb b/recipes/xorg-app/xev_1.0.3.bb
deleted file mode 100644
index a0990d2..0000000
--- a/recipes/xorg-app/xev_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Event Viewer"
-LICENSE = "MIT"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://diet-x11.patch"
-SRC_URI[archive.md5sum] = "a9532c3d1683c99bb5df1895cb3a60b1"
-SRC_URI[archive.sha256sum] = "d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a"
diff --git a/recipes/xorg-app/xeyes_1.0.1.bb b/recipes/xorg-app/xeyes_1.0.1.bb
deleted file mode 100644
index 6382df4..0000000
--- a/recipes/xorg-app/xeyes_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxau libxt libxext libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "033f14f7c4e30d1f4edbb22d5ef86883"
-SRC_URI[archive.sha256sum] = "530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029"
diff --git a/recipes/xorg-app/xfs_1.0.4.bb b/recipes/xorg-app/xfs_1.0.4.bb
deleted file mode 100644
index f50eaf4..0000000
--- a/recipes/xorg-app/xfs_1.0.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X fontserver"
-DEPENDS += " libfs libxfont xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f43cb64d623b748208dfd9012d17b654"
-SRC_URI[archive.sha256sum] = "452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b"
diff --git a/recipes/xorg-app/xfs_1.0.5.bb b/recipes/xorg-app/xfs_1.0.5.bb
deleted file mode 100644
index 1d31d21..0000000
--- a/recipes/xorg-app/xfs_1.0.5.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X fontserver"
-DEPENDS += " libfs libxfont xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3fc73b5e39a1fe8b8d96563c8144cffe"
-SRC_URI[archive.sha256sum] = "f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9"
diff --git a/recipes/xorg-app/xfs_1.0.6.bb b/recipes/xorg-app/xfs_1.0.6.bb
deleted file mode 100644
index 24028ac..0000000
--- a/recipes/xorg-app/xfs_1.0.6.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X fontserver"
-DEPENDS += " libfs libxfont xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a62ea490a8b97f74b53732df8fc309d8"
-SRC_URI[archive.sha256sum] = "5a3ad18fdc67e261454740217f7c02d1b6825013abcebdcd778a4865fd823353"
diff --git a/recipes/xorg-app/xfs_1.0.8.bb b/recipes/xorg-app/xfs_1.0.8.bb
deleted file mode 100644
index 6324d81..0000000
--- a/recipes/xorg-app/xfs_1.0.8.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X fontserver"
-DEPENDS += " libfs libxfont xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f10717e45535b64eb45226aac571dac2"
-SRC_URI[archive.sha256sum] = "34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482"
diff --git a/recipes/xorg-app/xfsinfo_1.0.1.bb b/recipes/xorg-app/xfsinfo_1.0.1.bb
deleted file mode 100644
index 2df9b2a..0000000
--- a/recipes/xorg-app/xfsinfo_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libfs"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e98b18fbce1261de30b1de819d86f48a"
-SRC_URI[archive.sha256sum] = "adc33443b3a7f334d2407de702004a0491f24708e0e1abe74cd8ae114cd60cd9"
diff --git a/recipes/xorg-app/xgamma_1.0.1.bb b/recipes/xorg-app/xgamma_1.0.1.bb
deleted file mode 100644
index d6245ee..0000000
--- a/recipes/xorg-app/xgamma_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxxf86vm"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "45d8fa3c85d4bfda87251798fd605a45"
-SRC_URI[archive.sha256sum] = "085330064fdb90a152d2d44474fa20bb81ccb6c587c144f5f9c323cb9cc31eee"
diff --git a/recipes/xorg-app/xgamma_1.0.2.bb b/recipes/xorg-app/xgamma_1.0.2.bb
deleted file mode 100644
index 2b11285..0000000
--- a/recipes/xorg-app/xgamma_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Alter a monitor's gamma correction through the X server"
-DEPENDS += " libxxf86vm"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f13ddedaa63a608d3b025d326f4f5b5d"
-SRC_URI[archive.sha256sum] = "5d3d5b230fc60aefae8f4865c17add133b5fb11377fd61c80897ef94fcccf41e"
diff --git a/recipes/xorg-app/xhost_1.0.2.bb b/recipes/xorg-app/xhost_1.0.2.bb
deleted file mode 100644
index 1a42fb1..0000000
--- a/recipes/xorg-app/xhost_1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Server access control program for X"
-LICENSE = "MIT"
-DEPENDS += "libxmu libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f746aba36f075ae4cae313d849a94f4e"
-SRC_URI[archive.sha256sum] = "edab2cc49d230f58e54c0f7b83fd726fec5fc31356668a11589649f19ba90db6"
diff --git a/recipes/xorg-app/xinit_1.0.3.bb b/recipes/xorg-app/xinit_1.0.3.bb
deleted file mode 100644
index 703f825..0000000
--- a/recipes/xorg-app/xinit_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f04a903cc0e18b3c338f58eb90f6caf8"
-SRC_URI[archive.sha256sum] = "c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186"
-
-FILES_${PN} += " /usr/lib/X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.4.bb b/recipes/xorg-app/xinit_1.0.4.bb
deleted file mode 100644
index 2ff99ce..0000000
--- a/recipes/xorg-app/xinit_1.0.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9df52a504dc04313a6650fae364ae04a"
-SRC_URI[archive.sha256sum] = "1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.5.bb b/recipes/xorg-app/xinit_1.0.5.bb
deleted file mode 100644
index 120f42f..0000000
--- a/recipes/xorg-app/xinit_1.0.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9a2aad51042141a0e6ad066015397595"
-SRC_URI[archive.sha256sum] = "95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.7.bb b/recipes/xorg-app/xinit_1.0.7.bb
deleted file mode 100644
index 50c4270..0000000
--- a/recipes/xorg-app/xinit_1.0.7.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8b882d9e2deed9d85469a3beaec566a3"
-SRC_URI[archive.sha256sum] = "15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.8.bb b/recipes/xorg-app/xinit_1.0.8.bb
deleted file mode 100644
index 1771578..0000000
--- a/recipes/xorg-app/xinit_1.0.8.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "521574088fbd688edbf91e6bae674265"
-SRC_URI[archive.sha256sum] = "06c1049f6b63d1c368a1e03e2392097919b22ff24899e190de3577bffe6fe524"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.0.9.bb b/recipes/xorg-app/xinit_1.0.9.bb
deleted file mode 100644
index 7d8270a..0000000
--- a/recipes/xorg-app/xinit_1.0.9.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "224c36057e4416205d4e421af01a2f15"
-SRC_URI[archive.sha256sum] = "b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.1.0.bb b/recipes/xorg-app/xinit_1.1.0.bb
deleted file mode 100644
index 1829819..0000000
--- a/recipes/xorg-app/xinit_1.1.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9144097186c3d2454beffe8ac3b53c6e"
-SRC_URI[archive.sha256sum] = "c79ec1a4d60404715a626f2832f1b62f43b9d52a1e4642b40af743ee41362590"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.2.0.bb b/recipes/xorg-app/xinit_1.2.0.bb
deleted file mode 100644
index fc5ca59..0000000
--- a/recipes/xorg-app/xinit_1.2.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Window System initializer"
-DEPENDS += "util-linux-ng"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fe1696cab2fbed6fa059d0cd1c53ac13"
-SRC_URI[archive.sha256sum] = "ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f"
-
-FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinput_1.3.0.bb b/recipes/xorg-app/xinput_1.3.0.bb
deleted file mode 100644
index dac3150..0000000
--- a/recipes/xorg-app/xinput_1.3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a utility to configure and test XInput devices"
-DEPENDS += " libxi"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "977d657e8d7b59f7d82c98ebef444b28"
-SRC_URI[archive.sha256sum] = "330c3e5188abf256131c162c456060804f369349e9a0e7aa3efbc54add802e45"
diff --git a/recipes/xorg-app/xinput_1.4.2.bb b/recipes/xorg-app/xinput_1.4.2.bb
deleted file mode 100644
index 9e58205..0000000
--- a/recipes/xorg-app/xinput_1.4.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a utility to configure and test XInput devices"
-DEPENDS += " libxi"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "58e619576cbf4b6057eebb7a97fe2ddf"
-SRC_URI[archive.sha256sum] = "3195916b6cebf109eb571b939d7cea7075ef1933782526a6d8fbbb353bc3924b"
diff --git a/recipes/xorg-app/xinput_1.5.1.bb b/recipes/xorg-app/xinput_1.5.1.bb
deleted file mode 100644
index 9b990b0..0000000
--- a/recipes/xorg-app/xinput_1.5.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a utility to configure and test XInput devices"
-DEPENDS += " libxi"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "82400f0ba63217df9b00d825532cea7d"
-SRC_URI[archive.sha256sum] = "e33c8361c2b6cb13db9a7157753d417c168c8203c8b7027e9dda2fbeef00fd33"
diff --git a/recipes/xorg-app/xkbcomp_1.0.3.bb b/recipes/xorg-app/xkbcomp_1.0.3.bb
deleted file mode 100644
index ebc8375..0000000
--- a/recipes/xorg-app/xkbcomp_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-DEPENDS += " libxkbfile"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "2fbcae1323c266edf5b6c61751f2e343"
-SRC_URI[archive.sha256sum] = "0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xkbcomp_1.0.4.bb b/recipes/xorg-app/xkbcomp_1.0.4.bb
deleted file mode 100644
index 64b2370..0000000
--- a/recipes/xorg-app/xkbcomp_1.0.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-DEPENDS += " libxkbfile"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "d5122f1d5a91725a81c843f3bd388244"
-SRC_URI[archive.sha256sum] = "fefc574bf639d64348939edf9654306af2bb3c20447be9cff493cb06d87cb672"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xkbcomp_1.0.5.bb b/recipes/xorg-app/xkbcomp_1.0.5.bb
deleted file mode 100644
index bcd1455..0000000
--- a/recipes/xorg-app/xkbcomp_1.0.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-DEPENDS += " libxkbfile"
-PR = "${INC_PR}.1"
-
-SRC_URI[archive.md5sum] = "6cc96c3e4ed5d9802fe717beac008f19"
-SRC_URI[archive.sha256sum] = "204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-app/xkbevd_1.0.2.bb b/recipes/xorg-app/xkbevd_1.0.2.bb
deleted file mode 100644
index 66b6937..0000000
--- a/recipes/xorg-app/xkbevd_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxkbfile "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "68f2a143716c23b566f8509d9498f516"
-SRC_URI[archive.sha256sum] = "4b78e316ecf9a9498291f634a7e9ee712ba429d5606f300c0a27eacdaaa1f72b"
diff --git a/recipes/xorg-app/xkbutils_1.0.1.bb b/recipes/xorg-app/xkbutils_1.0.1.bb
deleted file mode 100644
index 7547e96..0000000
--- a/recipes/xorg-app/xkbutils_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxkbfile "
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "84396a3dd75337caaae29d8fa5616fb1"
-SRC_URI[archive.sha256sum] = "aaad73ed8db764978a18bc6ba774d38a4c1330c86622c0b47ae3ced09c175856"
diff --git a/recipes/xorg-app/xkill_1.0.1.bb b/recipes/xorg-app/xkill_1.0.1.bb
deleted file mode 100644
index ba95dbe..0000000
--- a/recipes/xorg-app/xkill_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f66d76abb0f75514ca32272e23cca757"
-SRC_URI[archive.sha256sum] = "77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de"
diff --git a/recipes/xorg-app/xload_1.0.1.bb b/recipes/xorg-app/xload_1.0.1.bb
deleted file mode 100644
index 9b72817..0000000
--- a/recipes/xorg-app/xload_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ba013813f9c21eb015559466f8d02a44"
-SRC_URI[archive.sha256sum] = "8d51184d6b18eea2f64e0c5b88cd95edff8353ce6529e780f95b1f2347babbf2"
diff --git a/recipes/xorg-app/xlsatoms_1.0.1.bb b/recipes/xorg-app/xlsatoms_1.0.1.bb
deleted file mode 100644
index 3acd54f..0000000
--- a/recipes/xorg-app/xlsatoms_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "69adcda848479acc3b82b3928812d191"
-SRC_URI[archive.sha256sum] = "456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a"
diff --git a/recipes/xorg-app/xlsclients_1.0.1.bb b/recipes/xorg-app/xlsclients_1.0.1.bb
deleted file mode 100644
index 9b32088..0000000
--- a/recipes/xorg-app/xlsclients_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "44473b880d26bfbe8b3d4d72b183cba7"
-SRC_URI[archive.sha256sum] = "988c71c6dc3519523fe5844ee3e49d91f843a83c783dd0baa20526d9d2981698"
diff --git a/recipes/xorg-app/xlsfonts_1.0.1.bb b/recipes/xorg-app/xlsfonts_1.0.1.bb
deleted file mode 100644
index 5a88403..0000000
--- a/recipes/xorg-app/xlsfonts_1.0.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ca9c6c88d0b83360b7b5092615fbf591"
-SRC_URI[archive.sha256sum] = "c8d826194299b2b8e3c6edce7070f05421465b0118ed47135a0195d12fe8a720"
diff --git a/recipes/xorg-app/xmag_1.0.1.bb b/recipes/xorg-app/xmag_1.0.1.bb
deleted file mode 100644
index c09140d..0000000
--- a/recipes/xorg-app/xmag_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "058d168d1c7c991b8d12158433ea5f63"
-SRC_URI[archive.sha256sum] = "1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02"
diff --git a/recipes/xorg-app/xmag_1.0.2.bb b/recipes/xorg-app/xmag_1.0.2.bb
deleted file mode 100644
index 2856093..0000000
--- a/recipes/xorg-app/xmag_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "magnify parts of the screen"
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7c6a783e42c88360ac31d259a864a19d"
-SRC_URI[archive.sha256sum] = "51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43"
diff --git a/recipes/xorg-app/xman_1.0.2.bb b/recipes/xorg-app/xman_1.0.2.bb
deleted file mode 100644
index 1844180..0000000
--- a/recipes/xorg-app/xman_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxprintutil libxp libxt"
-RDEPENDS_${PN} = " man"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "855f2dbfa2aff58b8b9cd6a1c1120fad"
-SRC_URI[archive.sha256sum] = "00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2"
-
-FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/xorg-app/xman_1.0.3.bb b/recipes/xorg-app/xman_1.0.3.bb
deleted file mode 100644
index d1dcf65..0000000
--- a/recipes/xorg-app/xman_1.0.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "manual page browser for X"
-DEPENDS += " libxaw libxprintutil libxp libxt"
-RDEPENDS_${PN} = " man"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "3d3a4b310a65ccce82472ef83acbbf97"
-SRC_URI[archive.sha256sum] = "38e03bfa2d3d109d55342e3539be952268e405fb458fb8c4f87739594a25394a"
-
-FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/recipes/xorg-app/xmessage_1.0.1.bb b/recipes/xorg-app/xmessage_1.0.1.bb
deleted file mode 100644
index 5ecfae0..0000000
--- a/recipes/xorg-app/xmessage_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "xmessage displays a message or query in a window."
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b3674c3a00a089764d86aa94e257ccec"
-SRC_URI[archive.sha256sum] = "b921aef62c2a2f5c32048502cd96630e9d42493cd39d1841fde247274f24bbda"
diff --git a/recipes/xorg-app/xmodmap/autofoo.patch b/recipes/xorg-app/xmodmap/autofoo.patch
deleted file mode 100644
index f309add..0000000
--- a/recipes/xorg-app/xmodmap/autofoo.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -urN xmodmap.orig/Makefile.am xmodmap/Makefile.am
---- xmodmap.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xmodmap/Makefile.am 2004-08-31 19:49:33.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XMODMAP_CFLAGS@
-+
-+bin_PROGRAMS = xmodmap
-+
-+xmodmap_SOURCES = exec.c handle.c pf.c wq.h xmodmap.c xmodmap.h
-+
-+xmodmap_LDADD = @XMODMAP_LIBS@
-+
-+man5_MANS=xmodmap.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xmodmap.orig/autogen.sh xmodmap/autogen.sh
---- xmodmap.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xmodmap/autogen.sh 2004-08-31 19:46:14.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xmodmap.orig/configure.ac xmodmap/configure.ac
---- xmodmap.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xmodmap/configure.ac 2004-08-31 20:27:03.000000000 +0200
-@@ -0,0 +1,41 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xmodmap],4.4.0,[],xmodmap)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XMODMAP, x11)
-+
-+AC_OUTPUT([Makefile])
diff --git a/recipes/xorg-app/xmodmap_1.0.2.bb b/recipes/xorg-app/xmodmap_1.0.2.bb
deleted file mode 100644
index 17bbc7e..0000000
--- a/recipes/xorg-app/xmodmap_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-LICENSE = "MIT"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ea78b3e32e27c3662f86ea68b3aec22f"
-SRC_URI[archive.sha256sum] = "4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44"
diff --git a/recipes/xorg-app/xmodmap_1.0.3.bb b/recipes/xorg-app/xmodmap_1.0.3.bb
deleted file mode 100644
index ab245b3..0000000
--- a/recipes/xorg-app/xmodmap_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-LICENSE = "MIT"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "626731003ec22a74ecf9e44ed098bbdf"
-SRC_URI[archive.sha256sum] = "c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f"
diff --git a/recipes/xorg-app/xpr_1.0.1.bb b/recipes/xorg-app/xpr_1.0.1.bb
deleted file mode 100644
index 5e70d01..0000000
--- a/recipes/xorg-app/xpr_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "01c0a14755fc91369e8c011c9f881d5d"
-SRC_URI[archive.sha256sum] = "b871221d23dc4fc50398e9fe0e2a6a4e951aa6c9df2c5671d069ad88f0fd6249"
diff --git a/recipes/xorg-app/xpr_1.0.2.bb b/recipes/xorg-app/xpr_1.0.2.bb
deleted file mode 100644
index f117bd8..0000000
--- a/recipes/xorg-app/xpr_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "print an X window dump"
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6b3a6896081f628bf5a2c9129417c86f"
-SRC_URI[archive.sha256sum] = "c325a9896d1cda43a681f1c2a6a2bbb1c580ade57a882b0a8f84ffa359238adf"
diff --git a/recipes/xorg-app/xprop/autofoo.patch b/recipes/xorg-app/xprop/autofoo.patch
deleted file mode 100644
index 2526d95..0000000
--- a/recipes/xorg-app/xprop/autofoo.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -urN xprop.orig/Makefile.am xprop/Makefile.am
---- xprop.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xprop/Makefile.am 2004-08-15 18:49:43.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XPROP_CFLAGS@
-+
-+bin_PROGRAMS = xprop
-+
-+xprop_SOURCES = dsimple.c dsimple.h xprop.c
-+
-+xprop_LDADD = @XPROP_LIBS@
-+
-+man5_MANS=xprop.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xprop.orig/configure.ac xprop/configure.ac
---- xprop.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xprop/configure.ac 2004-08-15 19:00:43.000000000 +0200
-@@ -0,0 +1,44 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xprop],4.4.0,[],xprop)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XPROP, xext xmuu x11)
-+
-+AC_CHECK_HEADERS([wchar.h])
-+AC_CHECK_HEADERS([wctype.h])
-+
-+AC_OUTPUT([Makefile])
-diff -urN xprop.orig/dsimple.c xprop/dsimple.c
---- xprop.orig/dsimple.c 2003-11-14 16:54:54.000000000 +0100
-+++ xprop/dsimple.c 2004-08-15 19:19:32.000000000 +0200
-@@ -27,11 +27,16 @@
-
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xos.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
- #include <stdio.h>
-+#include <stdlib.h>
- /*
- * Other_stuff.h: Definitions of routines in other_stuff.
- *
-@@ -69,7 +74,7 @@
- char *Malloc(size)
- unsigned size;
- {
-- char *data, *malloc();
-+ char *data;
-
- if (!(data = malloc(size)))
- Fatal_Error("Out of memory!");
-@@ -85,7 +90,7 @@
- char *ptr;
- int size;
- {
-- char *new_ptr, *realloc();
-+ char *new_ptr;
-
- if (!ptr)
- return(Malloc(size));
-diff -urN xprop.orig/xprop.c xprop/xprop.c
---- xprop.orig/xprop.c 2004-04-23 21:55:03.000000000 +0200
-+++ xprop/xprop.c 2004-08-15 19:23:13.000000000 +0200
-@@ -30,6 +30,10 @@
- /* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */
-
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xlib.h>
- #include <X11/Xos.h>
- #include <X11/Xfuncs.h>
diff --git a/recipes/xorg-app/xprop_1.0.2.bb b/recipes/xorg-app/xprop_1.0.2.bb
deleted file mode 100644
index f57c8de..0000000
--- a/recipes/xorg-app/xprop_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5b6f02a3b1cda0cadc35f84814fe53d4"
-SRC_URI[archive.sha256sum] = "88b1e65703c68f14ac6cb735737d1a0e52751a18fdc8a39d2d1e5eaa07875ca0"
diff --git a/recipes/xorg-app/xprop_1.0.4.bb b/recipes/xorg-app/xprop_1.0.4.bb
deleted file mode 100644
index 526db7b..0000000
--- a/recipes/xorg-app/xprop_1.0.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "a property displayer for X"
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "48aa8fd78802f477dcbf9ef0dfd9f783"
-SRC_URI[archive.sha256sum] = "daa47cba7d5a919ca1bd053d8a8b6af4904f77eded4bdb055cd915aa5f5cd772"
diff --git a/recipes/xorg-app/xrandr_1.2.2.bb b/recipes/xorg-app/xrandr_1.2.2.bb
deleted file mode 100644
index b09b16b..0000000
--- a/recipes/xorg-app/xrandr_1.2.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Resize and Rotate extension command."
-LICENSE = "BSD-X"
-DEPENDS += "libxrandr libxrender"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://resolve_symbol_clash.patch"
-SRC_URI[archive.md5sum] = "c6ec9dc42396e3b3a2da932f3feca6ec"
-SRC_URI[archive.sha256sum] = "632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303"
diff --git a/recipes/xorg-app/xrandr_1.2.3.bb b/recipes/xorg-app/xrandr_1.2.3.bb
deleted file mode 100644
index 6923ce3..0000000
--- a/recipes/xorg-app/xrandr_1.2.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X Resize and Rotate extension command."
-LICENSE = "BSD-X"
-DEPENDS += "libxrandr libxrender"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://resolve_symbol_clash.patch"
-SRC_URI[archive.md5sum] = "41a9d0cc073fa6165a31fbf9e85f68a6"
-SRC_URI[archive.sha256sum] = "ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207"
diff --git a/recipes/xorg-app/xrdb/autofoo.patch b/recipes/xorg-app/xrdb/autofoo.patch
deleted file mode 100644
index b30a46b..0000000
--- a/recipes/xorg-app/xrdb/autofoo.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -urN xrdb.orig/Imakefile xrdb/Imakefile
---- xrdb.orig/Imakefile 2004-04-23 21:55:03.000000000 +0200
-+++ xrdb/Imakefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,19 +0,0 @@
--XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $
--
--
--
--
--XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.6tsi Exp $
--
--#ifdef PatheticCpp
-- CPPDEFS = -DPATHETICCPP
--#endif
--#if HasMkstemp
-- CPPDEFS = -DHAS_MKSTEMP
--#endif
--XCOMM Due to ill make parsing the cpp is passed directly in source file
-- DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS)
-- DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB)
--LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB)
--
--SimpleProgramTarget(xrdb)
-diff -urN xrdb.orig/Makefile.am xrdb/Makefile.am
---- xrdb.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xrdb/Makefile.am 2004-08-14 16:05:01.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XRDB_CFLAGS@
-+
-+bin_PROGRAMS = xrdb
-+
-+xrdb_SOURCES = xrdb.c
-+
-+xrdb_LDADD = @XRDB_LIBS@
-+
-+man5_MANS=xrdb.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xrdb.orig/autogen.sh xrdb/autogen.sh
---- xrdb.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xrdb/autogen.sh 2004-08-14 15:57:35.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xrdb.orig/configure.ac xrdb/configure.ac
---- xrdb.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xrdb/configure.ac 2004-08-14 16:03:31.000000000 +0200
-@@ -0,0 +1,41 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xrdb],4.4.0,[],xrdb)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XRDB, xext xmuu x11)
-+
-+AC_OUTPUT([Makefile])
diff --git a/recipes/xorg-app/xrdb_1.0.3.bb b/recipes/xorg-app/xrdb_1.0.3.bb
deleted file mode 100644
index 6c4d86d..0000000
--- a/recipes/xorg-app/xrdb_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-DEPENDS += "libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "380b2ef545306354cc150834de567be7"
-SRC_URI[archive.sha256sum] = "a4a3b8cd821adc201a072f8c0214d73ee6a7e7b898de90e18f7d89a4453fb12c"
diff --git a/recipes/xorg-app/xrdb_1.0.4.bb b/recipes/xorg-app/xrdb_1.0.4.bb
deleted file mode 100644
index 7181dc9..0000000
--- a/recipes/xorg-app/xrdb_1.0.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-DEPENDS += "libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "34eb2311a0c5279e7b4f492e826f63d1"
-SRC_URI[archive.sha256sum] = "3f8cde77e8cbeb6d0a5f232b7a2ee51dd49b677916d52ab0986d320a5f9e8000"
diff --git a/recipes/xorg-app/xrdb_1.0.5.bb b/recipes/xorg-app/xrdb_1.0.5.bb
deleted file mode 100644
index d474dc8..0000000
--- a/recipes/xorg-app/xrdb_1.0.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-DEPENDS += "libxmu"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9c30b8e1709d5367beb7706146640c07"
-SRC_URI[archive.sha256sum] = "c24d08939250f10238fd1b984707bfa0901ba9c55fa36b67d91eb12b500500aa"
diff --git a/recipes/xorg-app/xrefresh_1.0.2.bb b/recipes/xorg-app/xrefresh_1.0.2.bb
deleted file mode 100644
index a97f1af..0000000
--- a/recipes/xorg-app/xrefresh_1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1228f890f86148e4e6ae22aa73118cbb"
-SRC_URI[archive.sha256sum] = "522831fd29c0b250f29735a01b02e96e311f200a675e45c8b3d187b6f86b32f5"
diff --git a/recipes/xorg-app/xrx_1.0.1.bb b/recipes/xorg-app/xrx_1.0.1.bb
deleted file mode 100644
index 25f0c80..0000000
--- a/recipes/xorg-app/xrx_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxaw libxt libxext xtrans xproxymngproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5f65e24f8a225e255beb2059e33d6b37"
-SRC_URI[archive.sha256sum] = "a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4"
diff --git a/recipes/xorg-app/xset/autofoo.patch b/recipes/xorg-app/xset/autofoo.patch
deleted file mode 100644
index 039d131..0000000
--- a/recipes/xorg-app/xset/autofoo.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -urN xset.orig/Makefile.am xset/Makefile.am
---- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xset/Makefile.am 2004-08-14 16:32:10.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# Permission to use, copy, modify, distribute, and sell this software and its
-+# documentation for any purpose is hereby granted without fee, provided that
-+# the above copyright notice appear in all copies and that both that
-+# copyright notice and this permission notice appear in supporting
-+# documentation, and that the name of Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+# PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XSET_CFLAGS@
-+
-+bin_PROGRAMS = xset
-+
-+xset_SOURCES = xset.c
-+
-+xset_LDADD = @XSET_LIBS@
-+
-+man5_MANS=xset.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xset.orig/autogen.sh xset/autogen.sh
---- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xset.orig/configure.ac xset/configure.ac
---- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xset/configure.ac 2004-08-17 14:21:25.000000000 +0200
-@@ -0,0 +1,41 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xset],4.4.0,[],xset)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XSET, xext xextensions xmuu x11)
-+
-+AC_OUTPUT([Makefile])
diff --git a/recipes/xorg-app/xset/disable-xkb.patch b/recipes/xorg-app/xset/disable-xkb.patch
deleted file mode 100644
index 6060fbb..0000000
--- a/recipes/xorg-app/xset/disable-xkb.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100
-+++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100
-@@ -42,11 +42,15 @@
- AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
- CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-
-+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
-+ XKB="$enableval", XKB="yes")
-+if test "x$XKB" = "xyes" ; then
- PKG_CHECK_MODULES(SET_XKB, x11,
- [SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
- AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
- CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-+fi
-
- PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
- [SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/recipes/xorg-app/xset_1.0.2.bb b/recipes/xorg-app/xset_1.0.2.bb
deleted file mode 100644
index 35aebe5..0000000
--- a/recipes/xorg-app/xset_1.0.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "1b781a0802c7b8fb9619a6665607b3f0"
-SRC_URI[archive.sha256sum] = "ce1e17c513a4499526e648a59c39ba01777c99c86093433cf392f27654b795c9"
-
-EXTRA_OECONF = "--disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-app/xset_1.0.3.bb b/recipes/xorg-app/xset_1.0.3.bb
deleted file mode 100644
index c37b4bb..0000000
--- a/recipes/xorg-app/xset_1.0.3.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "657bbb43ce5470c33665d187c1740566"
-SRC_URI[archive.sha256sum] = "0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11"
-
-EXTRA_OECONF = "--disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-app/xset_1.0.4.bb b/recipes/xorg-app/xset_1.0.4.bb
deleted file mode 100644
index 24c35e0..0000000
--- a/recipes/xorg-app/xset_1.0.4.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://disable-xkb.patch"
-SRC_URI[archive.md5sum] = "2f41fd983ba4d89419204854936025e2"
-SRC_URI[archive.sha256sum] = "6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad"
-
-EXTRA_OECONF = "--disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-app/xsetpointer_1.0.0.bb b/recipes/xorg-app/xsetpointer_1.0.0.bb
deleted file mode 100644
index 409ea16..0000000
--- a/recipes/xorg-app/xsetpointer_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxi "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c94ea103e27e370e4e5030e50c5d5d69"
-SRC_URI[archive.sha256sum] = "7d65f450420b4f764dcf38e4ccee9d608b5a5874706e716cb861bfe2586b7d4a"
diff --git a/recipes/xorg-app/xsetroot_1.0.1.bb b/recipes/xorg-app/xsetroot_1.0.1.bb
deleted file mode 100644
index c81a319..0000000
--- a/recipes/xorg-app/xsetroot_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Sets the visual appearance of the X root window"
-LICENSE = "MIT"
-DEPENDS += "libxmu xbitmaps"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fc7eeb7130bb54345671a9dbaab567ac"
-SRC_URI[archive.sha256sum] = "897d77acd3f4a366472386139827eaac24cc423c811ef0e65e0d5eca099a3155"
diff --git a/recipes/xorg-app/xsetroot_1.0.2.bb b/recipes/xorg-app/xsetroot_1.0.2.bb
deleted file mode 100644
index dc79d52..0000000
--- a/recipes/xorg-app/xsetroot_1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Sets the visual appearance of the X root window"
-LICENSE = "MIT"
-DEPENDS += "libxmu xbitmaps"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9af7db9f3052aef0b11636720b3101dd"
-SRC_URI[archive.sha256sum] = "4f9a751f4830d479fae8ccb68ed04896dc99612789310b7917bd15c04aa3351d"
diff --git a/recipes/xorg-app/xvinfo_1.0.1.bb b/recipes/xorg-app/xvinfo_1.0.1.bb
deleted file mode 100644
index ee77b80..0000000
--- a/recipes/xorg-app/xvinfo_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Print out X-Video extension adaptor information"
-DEPENDS += " libxv"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0a5bd8e43de6eb8ff5b5bc673204401d"
-SRC_URI[archive.sha256sum] = "439b3c7ad96fc7b1ef9156c716e10b607883a9a58b777f8dc02f03284eb33fb3"
diff --git a/recipes/xorg-app/xvinfo_1.0.2.bb b/recipes/xorg-app/xvinfo_1.0.2.bb
deleted file mode 100644
index 8422d34..0000000
--- a/recipes/xorg-app/xvinfo_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "Print out X-Video extension adaptor information"
-DEPENDS += " libxv"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e1e318436f49e2f0f3764593dadd9ad2"
-SRC_URI[archive.sha256sum] = "126e2a612ac723f9688904fcfa612688d62e520ce55c56eb34eb5390074cf150"
diff --git a/recipes/xorg-app/xwd_1.0.1.bb b/recipes/xorg-app/xwd_1.0.1.bb
deleted file mode 100644
index bfe181b..0000000
--- a/recipes/xorg-app/xwd_1.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "911addfb7fa402217ddac63e5c1d97c7"
-SRC_URI[archive.sha256sum] = "c8bd9bcd64df439c2cd09eaa3e83a1297fbfed5c7d3dd8117342b3a25eeae131"
diff --git a/recipes/xorg-app/xwd_1.0.2.bb b/recipes/xorg-app/xwd_1.0.2.bb
deleted file mode 100644
index 597aa05..0000000
--- a/recipes/xorg-app/xwd_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0a6ef08a2ac08ad5c4dd1522eb3788a3"
-SRC_URI[archive.sha256sum] = "ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61"
diff --git a/recipes/xorg-app/xwininfo_1.0.2.bb b/recipes/xorg-app/xwininfo_1.0.2.bb
deleted file mode 100644
index 288af54..0000000
--- a/recipes/xorg-app/xwininfo_1.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu libxext "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e5dbc8866a55958297f5f38205b6be1e"
-SRC_URI[archive.sha256sum] = "9fdfd3259b335531cdba831872ec0e32c5f6df01e14b87c3187b494be75b7b66"
diff --git a/recipes/xorg-app/xwininfo_1.0.3.bb b/recipes/xorg-app/xwininfo_1.0.3.bb
deleted file mode 100644
index 01f6c9b..0000000
--- a/recipes/xorg-app/xwininfo_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "window information utility for X"
-DEPENDS += " libxmu libxext "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "721f84332c98c33152460bb22ba9ded6"
-SRC_URI[archive.sha256sum] = "fbe3a1aafbc6fa113e58971ff2a82605a7e106af8b810eea4b7512de58a5478a"
diff --git a/recipes/xorg-app/xwininfo_1.0.4.bb b/recipes/xorg-app/xwininfo_1.0.4.bb
deleted file mode 100644
index 317aa1d..0000000
--- a/recipes/xorg-app/xwininfo_1.0.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-DEPENDS += " libxmu libxext "
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "e2a9bf5ab7f2a0866700a3b49dd8c6bf"
-SRC_URI[archive.sha256sum] = "df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4"
diff --git a/recipes/xorg-app/xwud_1.0.1.bb b/recipes/xorg-app/xwud_1.0.1.bb
deleted file mode 100644
index 53d06df..0000000
--- a/recipes/xorg-app/xwud_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6e3c5d0297d88e890b6f5df31f73dd60"
-SRC_URI[archive.sha256sum] = "d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c"
--
1.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 2/9] xorg-lib: move older not pinned versions to obsolete dir
2010-08-16 15:30 xorg recipes cleanup Martin Jansa
` (11 preceding siblings ...)
2010-08-16 19:49 ` Martin Jansa
@ 2010-08-16 19:50 ` Martin Jansa
12 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2010-08-16 19:50 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.1.bb | 12 +
recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.2.bb | 10 +
recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.3.bb | 10 +
recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.4.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libapplewm_1.0.0.bb | 9 +
recipes/obsolete/xorg/xorg-lib/libdmx_1.0.2.bb | 8 +
recipes/obsolete/xorg/xorg-lib/libfontenc_1.0.4.bb | 11 +
recipes/obsolete/xorg/xorg-lib/libfs_1.0.0.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libfs_1.0.1.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libice_1.0.3.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libice_1.0.4.bb | 12 +
.../xorg/xorg-lib/liblbxutil/mkg3states.patch | 51 +
recipes/obsolete/xorg/xorg-lib/liblbxutil_1.0.1.bb | 11 +
.../xorg-lib/libpciaccess/fix-mtrr-check.patch | 19 +
.../obsolete/xorg/xorg-lib/libpciaccess_0.10.3.bb | 7 +
.../obsolete/xorg/xorg-lib/libpciaccess_0.11.0.bb | 6 +
recipes/obsolete/xorg/xorg-lib/libsm_1.0.2.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libsm_1.0.3.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libsm_1.1.0.bb | 12 +
.../obsolete/xorg/xorg-lib/libwindowswm_1.0.0.bb | 9 +
.../xorg-lib/libx11-1.0.1/keysymdef_include.patch | 62 +
.../libx11-1.0.1/x11_disable_makekeys.patch | 15 +
.../xorg-lib/libx11-1.0.3/keysymdef_include.patch | 62 +
.../libx11-1.0.3/x11_disable_makekeys.patch | 15 +
.../xorg-lib/libx11-1.1.1/keysymdef_include.patch | 62 +
.../xorg-lib/libx11-1.1.2/keysymdef_include.patch | 62 +
.../xorg-lib/libx11-1.1.3/keysymdef_include.patch | 62 +
.../xorg-lib/libx11-1.1.4/keysymdef_include.patch | 62 +
.../xorg-lib/libx11-1.2/x11_disable_makekeys.patch | 23 +
.../xorg/xorg-lib/libx11-1.3.3+git/dolt-fix.patch | 22 +
.../libx11-1.3.3+git/keysymdef_include.patch | 29 +
.../libx11-1.3.3+git/x11_disable_makekeys.patch | 26 +
.../libx11-1.3.3/x11_disable_makekeys.patch | 23 +
.../xorg/xorg-lib/libx11-1.3.4/dolt-fix.patch | 22 +
.../xorg-lib/libx11-1.3.4/keysymdef_include.patch | 21 +
.../libx11-1.3.4/x11_disable_makekeys.patch | 29 +
recipes/obsolete/xorg/xorg-lib/libx11/ruutf8.patch | 12 +
.../obsolete/xorg/xorg-lib/libx11/xchar2b.patch | 13 +
recipes/obsolete/xorg/xorg-lib/libx11/xim.patch | 55 +
recipes/obsolete/xorg/xorg-lib/libx11_1.0.1.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libx11_1.0.3.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libx11_1.1.1.bb | 9 +
recipes/obsolete/xorg/xorg-lib/libx11_1.1.2.bb | 8 +
recipes/obsolete/xorg/xorg-lib/libx11_1.1.3.bb | 8 +
recipes/obsolete/xorg/xorg-lib/libx11_1.1.4.bb | 8 +
recipes/obsolete/xorg/xorg-lib/libx11_1.2.bb | 9 +
recipes/obsolete/xorg/xorg-lib/libx11_1.3.3.bb | 6 +
recipes/obsolete/xorg/xorg-lib/libx11_1.3.4.bb | 6 +
recipes/obsolete/xorg/xorg-lib/libx11_git.bb | 14 +
recipes/obsolete/xorg/xorg-lib/libxau_1.0.3.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxau_1.0.4.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxaw_1.0.3.bb | 22 +
recipes/obsolete/xorg/xorg-lib/libxaw_1.0.4.bb | 22 +
.../libxcomposite/change-include-order.patch | 14 +
.../obsolete/xorg/xorg-lib/libxcomposite_0.3.1.bb | 12 +
.../obsolete/xorg/xorg-lib/libxcomposite_0.4.0.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.8.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.9.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxdamage_1.0.4.bb | 11 +
recipes/obsolete/xorg/xorg-lib/libxdamage_1.1.1.bb | 11 +
recipes/obsolete/xorg/xorg-lib/libxdmcp_1.0.2.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxext_1.0.2.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxext_1.0.3.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxext_1.0.4.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxext_1.0.5.bb | 12 +
recipes/obsolete/xorg/xorg-lib/libxfixes_4.0.3.bb | 13 +
.../builtinreaddirectory-no-side-effect.patch | 188 +++
.../xorg/xorg-lib/libxfont/no-scalable-crash.patch | 22 +
recipes/obsolete/xorg/xorg-lib/libxfont_1.2.7.bb | 15 +
recipes/obsolete/xorg/xorg-lib/libxfont_1.2.8.bb | 15 +
recipes/obsolete/xorg/xorg-lib/libxfont_1.3.0.bb | 15 +
recipes/obsolete/xorg/xorg-lib/libxfont_1.3.1.bb | 14 +
recipes/obsolete/xorg/xorg-lib/libxfont_1.3.2.bb | 14 +
recipes/obsolete/xorg/xorg-lib/libxfont_1.3.3.bb | 13 +
.../obsolete/xorg/xorg-lib/libxfontcache_1.0.4.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxft_2.1.12.bb | 21 +
recipes/obsolete/xorg/xorg-lib/libxft_2.1.13.bb | 21 +
recipes/obsolete/xorg/xorg-lib/libxi_1.0.2.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxi_1.1.0.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxi_1.1.2.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxi_1.1.3.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxi_1.2.0.bb | 10 +
.../obsolete/xorg/xorg-lib/libxinerama_1.0.2.bb | 10 +
.../obsolete/xorg/xorg-lib/libxinerama_1.0.3.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.4.bb | 11 +
recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.5.bb | 11 +
recipes/obsolete/xorg/xorg-lib/libxmu_1.0.3.bb | 17 +
recipes/obsolete/xorg/xorg-lib/libxmu_1.0.4.bb | 17 +
recipes/obsolete/xorg/xorg-lib/libxpm_3.5.6.bb | 16 +
recipes/obsolete/xorg/xorg-lib/libxpm_3.5.7.bb | 16 +
recipes/obsolete/xorg/xorg-lib/libxrandr_1.1.2.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.2.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.3.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxrender_0.9.2.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxrender_0.9.3.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxrender_0.9.4.bb | 13 +
recipes/obsolete/xorg/xorg-lib/libxres_1.0.3.bb | 10 +
.../obsolete/xorg/xorg-lib/libxscrnsaver_1.1.2.bb | 13 +
.../obsolete/xorg/xorg-lib/libxscrnsaver_1.1.3.bb | 13 +
| 512 ++++++
recipes/obsolete/xorg/xorg-lib/libxt_1.0.4.bb | 24 +
recipes/obsolete/xorg/xorg-lib/libxt_1.0.5.bb | 23 +
recipes/obsolete/xorg/xorg-lib/libxtst_1.0.2.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxtst_1.0.3.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxv_1.0.3.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxv_1.0.4.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxvmc/drm.patch | 9 +
recipes/obsolete/xorg/xorg-lib/libxvmc/true.patch | 11 +
recipes/obsolete/xorg/xorg-lib/libxvmc/via.patch | 23 +
recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.4.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.5.bb | 10 +
.../obsolete/xorg/xorg-lib/libxxf86dga_1.0.1.bb | 10 +
.../obsolete/xorg/xorg-lib/libxxf86dga_1.0.2.bb | 10 +
.../obsolete/xorg/xorg-lib/libxxf86misc_1.0.1.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.1.bb | 10 +
recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.2.bb | 10 +
...mplementation-of-pixman_blt-with-overlapp.patch | 114 ++
...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 ++
...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 ++
...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 ++
.../xorg/xorg-lib/pixman-0.17.8/1-composite.patch | 161 ++
.../xorg/xorg-lib/pixman-0.17.8/2-composite.patch | 102 ++
.../xorg/xorg-lib/pixman-0.17.8/3-composite.patch | 108 ++
...mplementation-of-pixman_blt-with-overlapp.patch | 114 ++
...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 ++
...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 ++
...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 ++
...EON-optimizations-for-fetch-store-r5g6b5-.patch | 169 ++
.../xorg/xorg-lib/pixman-0.18.0/565-scanline.patch | 257 +++
.../pixman-0.18.0/missing-cache-preload.diff | 28 +
.../dont-copy-unused-bits-to-alpha-channel.patch | 29 +
...mplementation-of-pixman_blt-with-overlapp.patch | 114 ++
...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 ++
...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 ++
...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 ++
...EON-optimizations-for-fetch-store-r5g6b5-.patch | 169 ++
...SIMD-Try-without-any-CFLAGS-before-forcin.patch | 53 +
recipes/obsolete/xorg/xorg-lib/pixman/calloc.patch | 23 +
.../xorg/xorg-lib/pixman/nearest-neighbour.patch | 1040 ++++++++++++
.../xorg/xorg-lib/pixman/over-n-8-0565.patch | 231 +++
.../xorg/xorg-lib/pixman/pixman-28986.patch | 32 +
.../obsolete/xorg/xorg-lib/pixman/prefetch.patch | 298 ++++
.../xorg/xorg-lib/pixman/remove-broken.patch | 826 ++++++++++
.../xorg/xorg-lib/pixman/src-8888-0565.patch | 324 ++++
recipes/obsolete/xorg/xorg-lib/pixman/tls.patch | 59 +
recipes/obsolete/xorg/xorg-lib/pixman_0.10.0.bb | 5 +
recipes/obsolete/xorg/xorg-lib/pixman_0.11.4.bb | 7 +
recipes/obsolete/xorg/xorg-lib/pixman_0.11.8.bb | 9 +
recipes/obsolete/xorg/xorg-lib/pixman_0.15.18.bb | 7 +
recipes/obsolete/xorg/xorg-lib/pixman_0.15.6.bb | 7 +
recipes/obsolete/xorg/xorg-lib/pixman_0.17.12.bb | 24 +
recipes/obsolete/xorg/xorg-lib/pixman_0.17.8.bb | 23 +
recipes/obsolete/xorg/xorg-lib/pixman_0.18.0.bb | 24 +
recipes/obsolete/xorg/xorg-lib/pixman_0.9.4.bb | 7 +
recipes/obsolete/xorg/xorg-lib/pixman_0.9.5.bb | 8 +
recipes/obsolete/xorg/xorg-lib/pixman_git.bb | 27 +
.../xorg-lib/xtrans/fix-missing-includepath.patch | 13 +
recipes/obsolete/xorg/xorg-lib/xtrans_1.0.3.bb | 15 +
recipes/obsolete/xorg/xorg-lib/xtrans_1.0.4.bb | 15 +
recipes/obsolete/xorg/xorg-lib/xtrans_1.1.bb | 15 +
recipes/obsolete/xorg/xorg-lib/xtrans_1.2.1.bb | 15 +
recipes/obsolete/xorg/xorg-lib/xtrans_1.2.3.bb | 15 +
recipes/obsolete/xorg/xorg-lib/xtrans_1.2.bb | 15 +
recipes/xorg-lib/diet-x11_1.1.1.bb | 12 -
recipes/xorg-lib/diet-x11_1.1.2.bb | 10 -
recipes/xorg-lib/diet-x11_1.1.3.bb | 10 -
recipes/xorg-lib/diet-x11_1.1.4.bb | 10 -
recipes/xorg-lib/libapplewm_1.0.0.bb | 9 -
recipes/xorg-lib/libdmx_1.0.2.bb | 8 -
recipes/xorg-lib/libfontenc_1.0.4.bb | 11 -
recipes/xorg-lib/libfs_1.0.0.bb | 10 -
recipes/xorg-lib/libfs_1.0.1.bb | 10 -
recipes/xorg-lib/libice_1.0.3.bb | 12 -
recipes/xorg-lib/libice_1.0.4.bb | 12 -
.../xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch | 55 +
recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch | 55 -
recipes/xorg-lib/liblbxutil/mkg3states.patch | 51 -
recipes/xorg-lib/liblbxutil_1.0.1.bb | 11 -
recipes/xorg-lib/libpciaccess/fix-mtrr-check.patch | 19 -
recipes/xorg-lib/libpciaccess_0.10.3.bb | 7 -
recipes/xorg-lib/libpciaccess_0.11.0.bb | 6 -
recipes/xorg-lib/libsm_1.0.2.bb | 13 -
recipes/xorg-lib/libsm_1.0.3.bb | 12 -
recipes/xorg-lib/libsm_1.1.0.bb | 12 -
recipes/xorg-lib/libwindowswm_1.0.0.bb | 9 -
.../xorg-lib/libx11-1.0.1/keysymdef_include.patch | 62 -
.../libx11-1.0.1/x11_disable_makekeys.patch | 15 -
.../xorg-lib/libx11-1.0.3/keysymdef_include.patch | 62 -
.../libx11-1.0.3/x11_disable_makekeys.patch | 15 -
.../xorg-lib/libx11-1.1.1/keysymdef_include.patch | 62 -
.../xorg-lib/libx11-1.1.2/keysymdef_include.patch | 62 -
.../xorg-lib/libx11-1.1.3/keysymdef_include.patch | 62 -
.../xorg-lib/libx11-1.1.4/keysymdef_include.patch | 62 -
recipes/xorg-lib/libx11-1.1.5/X18NCMSstubs.diff | 528 ++++++
recipes/xorg-lib/libx11-1.1.5/dolt-fix.patch | 21 +
.../xorg-lib/libx11-1.1.5/fix-disable-xlocale.diff | 14 +
.../libx11-1.1.5/fix-utf8-wrong-define.patch | 16 +
.../xorg-lib/libx11-1.1.5/keysymdef_include.patch | 29 +
.../xorg-lib/libx11-1.1.5/makekeys-update.patch | 87 +
.../libx11-1.1.5/x11_disable_makekeys.patch | 30 +
.../xorg-lib/libx11-1.2/x11_disable_makekeys.patch | 23 -
recipes/xorg-lib/libx11-1.3.2/dolt-fix.patch | 21 +
.../xorg-lib/libx11-1.3.2/keysymdef_include.patch | 29 +
recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch | 22 -
.../libx11-1.3.3+git/keysymdef_include.patch | 29 -
.../libx11-1.3.3+git/x11_disable_makekeys.patch | 26 -
.../libx11-1.3.3/x11_disable_makekeys.patch | 23 -
recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch | 22 -
.../xorg-lib/libx11-1.3.4/keysymdef_include.patch | 21 -
.../libx11-1.3.4/x11_disable_makekeys.patch | 29 -
recipes/xorg-lib/libx11/X18NCMSstubs.diff | 528 ------
recipes/xorg-lib/libx11/dolt-fix.patch | 21 -
recipes/xorg-lib/libx11/fix-disable-xlocale.diff | 14 -
.../xorg-lib/libx11/fix-utf8-wrong-define.patch | 16 -
recipes/xorg-lib/libx11/keysymdef_include.patch | 29 -
recipes/xorg-lib/libx11/makekeys-update.patch | 87 -
recipes/xorg-lib/libx11/ruutf8.patch | 12 -
recipes/xorg-lib/libx11/x11_disable_makekeys.patch | 30 -
recipes/xorg-lib/libx11/xchar2b.patch | 13 -
recipes/xorg-lib/libx11/xim.patch | 55 -
recipes/xorg-lib/libx11_1.0.1.bb | 10 -
recipes/xorg-lib/libx11_1.0.3.bb | 10 -
recipes/xorg-lib/libx11_1.1.1.bb | 9 -
recipes/xorg-lib/libx11_1.1.2.bb | 8 -
recipes/xorg-lib/libx11_1.1.3.bb | 8 -
recipes/xorg-lib/libx11_1.1.4.bb | 8 -
recipes/xorg-lib/libx11_1.2.bb | 9 -
recipes/xorg-lib/libx11_1.3.3.bb | 6 -
recipes/xorg-lib/libx11_1.3.4.bb | 6 -
recipes/xorg-lib/libx11_git.bb | 14 -
recipes/xorg-lib/libxau_1.0.3.bb | 12 -
recipes/xorg-lib/libxau_1.0.4.bb | 12 -
recipes/xorg-lib/libxaw_1.0.3.bb | 22 -
recipes/xorg-lib/libxaw_1.0.4.bb | 22 -
.../libxcomposite/change-include-order.patch | 14 -
recipes/xorg-lib/libxcomposite_0.3.1.bb | 12 -
recipes/xorg-lib/libxcomposite_0.4.0.bb | 12 -
recipes/xorg-lib/libxcursor_1.1.8.bb | 13 -
recipes/xorg-lib/libxcursor_1.1.9.bb | 13 -
recipes/xorg-lib/libxdamage_1.0.4.bb | 11 -
recipes/xorg-lib/libxdamage_1.1.1.bb | 11 -
recipes/xorg-lib/libxdmcp_1.0.2.bb | 12 -
recipes/xorg-lib/libxext_1.0.2.bb | 13 -
recipes/xorg-lib/libxext_1.0.3.bb | 12 -
recipes/xorg-lib/libxext_1.0.4.bb | 12 -
recipes/xorg-lib/libxext_1.0.5.bb | 12 -
recipes/xorg-lib/libxfixes_4.0.3.bb | 13 -
.../builtinreaddirectory-no-side-effect.patch | 188 ---
recipes/xorg-lib/libxfont/no-scalable-crash.patch | 22 -
recipes/xorg-lib/libxfont_1.2.7.bb | 15 -
recipes/xorg-lib/libxfont_1.2.8.bb | 15 -
recipes/xorg-lib/libxfont_1.3.0.bb | 15 -
recipes/xorg-lib/libxfont_1.3.1.bb | 14 -
recipes/xorg-lib/libxfont_1.3.2.bb | 14 -
recipes/xorg-lib/libxfont_1.3.3.bb | 13 -
recipes/xorg-lib/libxfontcache_1.0.4.bb | 10 -
recipes/xorg-lib/libxft_2.1.12.bb | 21 -
recipes/xorg-lib/libxft_2.1.13.bb | 21 -
recipes/xorg-lib/libxi_1.0.2.bb | 10 -
recipes/xorg-lib/libxi_1.1.0.bb | 10 -
recipes/xorg-lib/libxi_1.1.2.bb | 10 -
recipes/xorg-lib/libxi_1.1.3.bb | 10 -
recipes/xorg-lib/libxi_1.2.0.bb | 10 -
recipes/xorg-lib/libxinerama_1.0.2.bb | 10 -
recipes/xorg-lib/libxinerama_1.0.3.bb | 10 -
recipes/xorg-lib/libxkbfile_1.0.4.bb | 11 -
recipes/xorg-lib/libxkbfile_1.0.5.bb | 11 -
recipes/xorg-lib/libxmu_1.0.3.bb | 17 -
recipes/xorg-lib/libxmu_1.0.4.bb | 17 -
recipes/xorg-lib/libxpm_3.5.6.bb | 16 -
recipes/xorg-lib/libxpm_3.5.7.bb | 16 -
recipes/xorg-lib/libxrandr_1.1.2.bb | 13 -
recipes/xorg-lib/libxrandr_1.2.2.bb | 13 -
recipes/xorg-lib/libxrandr_1.2.3.bb | 13 -
recipes/xorg-lib/libxrender_0.9.2.bb | 13 -
recipes/xorg-lib/libxrender_0.9.3.bb | 13 -
recipes/xorg-lib/libxrender_0.9.4.bb | 13 -
recipes/xorg-lib/libxres_1.0.3.bb | 10 -
recipes/xorg-lib/libxscrnsaver_1.1.2.bb | 13 -
recipes/xorg-lib/libxscrnsaver_1.1.3.bb | 13 -
| 512 ------
recipes/xorg-lib/libxt_1.0.4.bb | 24 -
recipes/xorg-lib/libxt_1.0.5.bb | 23 -
recipes/xorg-lib/libxtst_1.0.2.bb | 10 -
recipes/xorg-lib/libxtst_1.0.3.bb | 10 -
recipes/xorg-lib/libxv_1.0.3.bb | 10 -
recipes/xorg-lib/libxv_1.0.4.bb | 10 -
recipes/xorg-lib/libxvmc/drm.patch | 9 -
recipes/xorg-lib/libxvmc/true.patch | 11 -
recipes/xorg-lib/libxvmc/via.patch | 23 -
recipes/xorg-lib/libxvmc_1.0.4.bb | 10 -
recipes/xorg-lib/libxvmc_1.0.5.bb | 10 -
recipes/xorg-lib/libxxf86dga_1.0.1.bb | 10 -
recipes/xorg-lib/libxxf86dga_1.0.2.bb | 10 -
recipes/xorg-lib/libxxf86misc_1.0.1.bb | 10 -
recipes/xorg-lib/libxxf86vm_1.0.1.bb | 10 -
recipes/xorg-lib/libxxf86vm_1.0.2.bb | 10 -
recipes/xorg-lib/pixman-0.12.0/pixman-arm.patch | 632 ++++++++
.../xorg-lib/pixman-0.12.0/pixman-x888-565.patch | 68 +
.../pixman-0.13.2/pixman-0.13.2-neon1.patch | 1702 ++++++++++++++++++++
...mplementation-of-pixman_blt-with-overlapp.patch | 114 --
...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 --
...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 --
...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 --
recipes/xorg-lib/pixman-0.17.8/1-composite.patch | 161 --
recipes/xorg-lib/pixman-0.17.8/2-composite.patch | 102 --
recipes/xorg-lib/pixman-0.17.8/3-composite.patch | 108 --
...mplementation-of-pixman_blt-with-overlapp.patch | 114 --
...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 --
...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 --
...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 --
...EON-optimizations-for-fetch-store-r5g6b5-.patch | 169 --
recipes/xorg-lib/pixman-0.18.0/565-scanline.patch | 257 ---
.../pixman-0.18.0/missing-cache-preload.diff | 28 -
.../dont-copy-unused-bits-to-alpha-channel.patch | 29 -
...mplementation-of-pixman_blt-with-overlapp.patch | 114 --
...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 --
...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 --
...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 --
...EON-optimizations-for-fetch-store-r5g6b5-.patch | 169 --
...SIMD-Try-without-any-CFLAGS-before-forcin.patch | 53 -
recipes/xorg-lib/pixman/calloc.patch | 23 -
recipes/xorg-lib/pixman/nearest-neighbour.patch | 1040 ------------
recipes/xorg-lib/pixman/over-n-8-0565.patch | 231 ---
recipes/xorg-lib/pixman/pixman-0.13.2-neon1.patch | 1702 --------------------
recipes/xorg-lib/pixman/pixman-28986.patch | 32 -
recipes/xorg-lib/pixman/pixman-arm.patch | 632 --------
recipes/xorg-lib/pixman/pixman-x888-565.patch | 68 -
recipes/xorg-lib/pixman/prefetch.patch | 298 ----
recipes/xorg-lib/pixman/remove-broken.patch | 826 ----------
recipes/xorg-lib/pixman/src-8888-0565.patch | 324 ----
recipes/xorg-lib/pixman/tls.patch | 59 -
recipes/xorg-lib/pixman_0.10.0.bb | 5 -
recipes/xorg-lib/pixman_0.11.4.bb | 7 -
recipes/xorg-lib/pixman_0.11.8.bb | 9 -
recipes/xorg-lib/pixman_0.15.18.bb | 7 -
recipes/xorg-lib/pixman_0.15.6.bb | 7 -
recipes/xorg-lib/pixman_0.17.12.bb | 24 -
recipes/xorg-lib/pixman_0.17.8.bb | 23 -
recipes/xorg-lib/pixman_0.18.0.bb | 24 -
recipes/xorg-lib/pixman_0.9.4.bb | 7 -
recipes/xorg-lib/pixman_0.9.5.bb | 8 -
recipes/xorg-lib/pixman_git.bb | 27 -
.../xorg-lib/xtrans/fix-missing-includepath.patch | 13 -
recipes/xorg-lib/xtrans_1.0.3.bb | 15 -
recipes/xorg-lib/xtrans_1.0.4.bb | 15 -
recipes/xorg-lib/xtrans_1.1.bb | 15 -
recipes/xorg-lib/xtrans_1.2.1.bb | 15 -
recipes/xorg-lib/xtrans_1.2.3.bb | 15 -
recipes/xorg-lib/xtrans_1.2.bb | 15 -
350 files changed, 11141 insertions(+), 11091 deletions(-)
create mode 100644 recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libapplewm_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libdmx_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libfontenc_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libfs_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libfs_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libice_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libice_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/liblbxutil/mkg3states.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/liblbxutil_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libpciaccess/fix-mtrr-check.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libpciaccess_0.10.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libpciaccess_0.11.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libsm_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libsm_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libsm_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libwindowswm_1.0.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.1.1/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.1.2/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.1.3/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.1.4/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.2/x11_disable_makekeys.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/dolt-fix.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/keysymdef_include.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11/ruutf8.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11/xchar2b.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11/xim.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.1.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.3.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_1.3.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libx11_git.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxau_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxau_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxaw_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxaw_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxcomposite/change-include-order.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxcomposite_0.3.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxcomposite_0.4.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.9.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxdamage_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxdamage_1.1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxdmcp_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxext_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxext_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxext_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxext_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfixes_4.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont/no-scalable-crash.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont_1.2.7.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont_1.2.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont_1.3.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont_1.3.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont_1.3.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfont_1.3.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxfontcache_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxft_2.1.12.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxft_2.1.13.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxi_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxi_1.1.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxi_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxi_1.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxi_1.2.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxmu_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxmu_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxpm_3.5.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxpm_3.5.7.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxrandr_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxrender_0.9.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxrender_0.9.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxrender_0.9.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxres_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxt/pr10970-header-fix.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxt_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxt_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxtst_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxtst_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxv_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxv_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxvmc/drm.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxvmc/true.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxvmc/via.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxxf86misc_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.2.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/1-composite.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/2-composite.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/3-composite.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/565-scanline.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/calloc.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/nearest-neighbour.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/over-n-8-0565.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/pixman-28986.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/prefetch.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/remove-broken.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/src-8888-0565.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman/tls.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.10.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.11.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.11.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.15.18.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.15.6.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.17.12.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.17.8.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.18.0.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.9.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_0.9.5.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/pixman_git.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans/fix-missing-includepath.patch
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans_1.0.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans_1.0.4.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans_1.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans_1.2.1.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans_1.2.3.bb
create mode 100644 recipes/obsolete/xorg/xorg-lib/xtrans_1.2.bb
delete mode 100644 recipes/xorg-lib/diet-x11_1.1.1.bb
delete mode 100644 recipes/xorg-lib/diet-x11_1.1.2.bb
delete mode 100644 recipes/xorg-lib/diet-x11_1.1.3.bb
delete mode 100644 recipes/xorg-lib/diet-x11_1.1.4.bb
delete mode 100644 recipes/xorg-lib/libapplewm_1.0.0.bb
delete mode 100644 recipes/xorg-lib/libdmx_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libfontenc_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libfs_1.0.0.bb
delete mode 100644 recipes/xorg-lib/libfs_1.0.1.bb
delete mode 100644 recipes/xorg-lib/libice_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libice_1.0.4.bb
create mode 100644 recipes/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch
delete mode 100644 recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch
delete mode 100644 recipes/xorg-lib/liblbxutil/mkg3states.patch
delete mode 100644 recipes/xorg-lib/liblbxutil_1.0.1.bb
delete mode 100644 recipes/xorg-lib/libpciaccess/fix-mtrr-check.patch
delete mode 100644 recipes/xorg-lib/libpciaccess_0.10.3.bb
delete mode 100644 recipes/xorg-lib/libpciaccess_0.11.0.bb
delete mode 100644 recipes/xorg-lib/libsm_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libsm_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libsm_1.1.0.bb
delete mode 100644 recipes/xorg-lib/libwindowswm_1.0.0.bb
delete mode 100644 recipes/xorg-lib/libx11-1.0.1/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11-1.0.3/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11-1.1.1/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.1.2/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.1.3/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.1.4/keysymdef_include.patch
create mode 100644 recipes/xorg-lib/libx11-1.1.5/X18NCMSstubs.diff
create mode 100644 recipes/xorg-lib/libx11-1.1.5/dolt-fix.patch
create mode 100644 recipes/xorg-lib/libx11-1.1.5/fix-disable-xlocale.diff
create mode 100644 recipes/xorg-lib/libx11-1.1.5/fix-utf8-wrong-define.patch
create mode 100644 recipes/xorg-lib/libx11-1.1.5/keysymdef_include.patch
create mode 100644 recipes/xorg-lib/libx11-1.1.5/makekeys-update.patch
create mode 100644 recipes/xorg-lib/libx11-1.1.5/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch
create mode 100644 recipes/xorg-lib/libx11-1.3.2/dolt-fix.patch
create mode 100644 recipes/xorg-lib/libx11-1.3.2/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.4/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11/X18NCMSstubs.diff
delete mode 100644 recipes/xorg-lib/libx11/dolt-fix.patch
delete mode 100644 recipes/xorg-lib/libx11/fix-disable-xlocale.diff
delete mode 100644 recipes/xorg-lib/libx11/fix-utf8-wrong-define.patch
delete mode 100644 recipes/xorg-lib/libx11/keysymdef_include.patch
delete mode 100644 recipes/xorg-lib/libx11/makekeys-update.patch
delete mode 100644 recipes/xorg-lib/libx11/ruutf8.patch
delete mode 100644 recipes/xorg-lib/libx11/x11_disable_makekeys.patch
delete mode 100644 recipes/xorg-lib/libx11/xchar2b.patch
delete mode 100644 recipes/xorg-lib/libx11/xim.patch
delete mode 100644 recipes/xorg-lib/libx11_1.0.1.bb
delete mode 100644 recipes/xorg-lib/libx11_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libx11_1.1.1.bb
delete mode 100644 recipes/xorg-lib/libx11_1.1.2.bb
delete mode 100644 recipes/xorg-lib/libx11_1.1.3.bb
delete mode 100644 recipes/xorg-lib/libx11_1.1.4.bb
delete mode 100644 recipes/xorg-lib/libx11_1.2.bb
delete mode 100644 recipes/xorg-lib/libx11_1.3.3.bb
delete mode 100644 recipes/xorg-lib/libx11_1.3.4.bb
delete mode 100644 recipes/xorg-lib/libx11_git.bb
delete mode 100644 recipes/xorg-lib/libxau_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxau_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxaw_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxaw_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxcomposite/change-include-order.patch
delete mode 100644 recipes/xorg-lib/libxcomposite_0.3.1.bb
delete mode 100644 recipes/xorg-lib/libxcomposite_0.4.0.bb
delete mode 100644 recipes/xorg-lib/libxcursor_1.1.8.bb
delete mode 100644 recipes/xorg-lib/libxcursor_1.1.9.bb
delete mode 100644 recipes/xorg-lib/libxdamage_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxdamage_1.1.1.bb
delete mode 100644 recipes/xorg-lib/libxdmcp_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libxext_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libxext_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxext_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxext_1.0.5.bb
delete mode 100644 recipes/xorg-lib/libxfixes_4.0.3.bb
delete mode 100644 recipes/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
delete mode 100644 recipes/xorg-lib/libxfont/no-scalable-crash.patch
delete mode 100644 recipes/xorg-lib/libxfont_1.2.7.bb
delete mode 100644 recipes/xorg-lib/libxfont_1.2.8.bb
delete mode 100644 recipes/xorg-lib/libxfont_1.3.0.bb
delete mode 100644 recipes/xorg-lib/libxfont_1.3.1.bb
delete mode 100644 recipes/xorg-lib/libxfont_1.3.2.bb
delete mode 100644 recipes/xorg-lib/libxfont_1.3.3.bb
delete mode 100644 recipes/xorg-lib/libxfontcache_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxft_2.1.12.bb
delete mode 100644 recipes/xorg-lib/libxft_2.1.13.bb
delete mode 100644 recipes/xorg-lib/libxi_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libxi_1.1.0.bb
delete mode 100644 recipes/xorg-lib/libxi_1.1.2.bb
delete mode 100644 recipes/xorg-lib/libxi_1.1.3.bb
delete mode 100644 recipes/xorg-lib/libxi_1.2.0.bb
delete mode 100644 recipes/xorg-lib/libxinerama_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libxinerama_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxkbfile_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxkbfile_1.0.5.bb
delete mode 100644 recipes/xorg-lib/libxmu_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxmu_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxpm_3.5.6.bb
delete mode 100644 recipes/xorg-lib/libxpm_3.5.7.bb
delete mode 100644 recipes/xorg-lib/libxrandr_1.1.2.bb
delete mode 100644 recipes/xorg-lib/libxrandr_1.2.2.bb
delete mode 100644 recipes/xorg-lib/libxrandr_1.2.3.bb
delete mode 100644 recipes/xorg-lib/libxrender_0.9.2.bb
delete mode 100644 recipes/xorg-lib/libxrender_0.9.3.bb
delete mode 100644 recipes/xorg-lib/libxrender_0.9.4.bb
delete mode 100644 recipes/xorg-lib/libxres_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxscrnsaver_1.1.2.bb
delete mode 100644 recipes/xorg-lib/libxscrnsaver_1.1.3.bb
delete mode 100644 recipes/xorg-lib/libxt/pr10970-header-fix.patch
delete mode 100644 recipes/xorg-lib/libxt_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxt_1.0.5.bb
delete mode 100644 recipes/xorg-lib/libxtst_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libxtst_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxv_1.0.3.bb
delete mode 100644 recipes/xorg-lib/libxv_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxvmc/drm.patch
delete mode 100644 recipes/xorg-lib/libxvmc/true.patch
delete mode 100644 recipes/xorg-lib/libxvmc/via.patch
delete mode 100644 recipes/xorg-lib/libxvmc_1.0.4.bb
delete mode 100644 recipes/xorg-lib/libxvmc_1.0.5.bb
delete mode 100644 recipes/xorg-lib/libxxf86dga_1.0.1.bb
delete mode 100644 recipes/xorg-lib/libxxf86dga_1.0.2.bb
delete mode 100644 recipes/xorg-lib/libxxf86misc_1.0.1.bb
delete mode 100644 recipes/xorg-lib/libxxf86vm_1.0.1.bb
delete mode 100644 recipes/xorg-lib/libxxf86vm_1.0.2.bb
create mode 100644 recipes/xorg-lib/pixman-0.12.0/pixman-arm.patch
create mode 100644 recipes/xorg-lib/pixman-0.12.0/pixman-x888-565.patch
create mode 100644 recipes/xorg-lib/pixman-0.13.2/pixman-0.13.2-neon1.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/1-composite.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/2-composite.patch
delete mode 100644 recipes/xorg-lib/pixman-0.17.8/3-composite.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/565-scanline.patch
delete mode 100644 recipes/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
delete mode 100644 recipes/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
delete mode 100644 recipes/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
delete mode 100644 recipes/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
delete mode 100644 recipes/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
delete mode 100644 recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
delete mode 100644 recipes/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
delete mode 100644 recipes/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch
delete mode 100644 recipes/xorg-lib/pixman/calloc.patch
delete mode 100644 recipes/xorg-lib/pixman/nearest-neighbour.patch
delete mode 100644 recipes/xorg-lib/pixman/over-n-8-0565.patch
delete mode 100644 recipes/xorg-lib/pixman/pixman-0.13.2-neon1.patch
delete mode 100644 recipes/xorg-lib/pixman/pixman-28986.patch
delete mode 100644 recipes/xorg-lib/pixman/pixman-arm.patch
delete mode 100644 recipes/xorg-lib/pixman/pixman-x888-565.patch
delete mode 100644 recipes/xorg-lib/pixman/prefetch.patch
delete mode 100644 recipes/xorg-lib/pixman/remove-broken.patch
delete mode 100644 recipes/xorg-lib/pixman/src-8888-0565.patch
delete mode 100644 recipes/xorg-lib/pixman/tls.patch
delete mode 100644 recipes/xorg-lib/pixman_0.10.0.bb
delete mode 100644 recipes/xorg-lib/pixman_0.11.4.bb
delete mode 100644 recipes/xorg-lib/pixman_0.11.8.bb
delete mode 100644 recipes/xorg-lib/pixman_0.15.18.bb
delete mode 100644 recipes/xorg-lib/pixman_0.15.6.bb
delete mode 100644 recipes/xorg-lib/pixman_0.17.12.bb
delete mode 100644 recipes/xorg-lib/pixman_0.17.8.bb
delete mode 100644 recipes/xorg-lib/pixman_0.18.0.bb
delete mode 100644 recipes/xorg-lib/pixman_0.9.4.bb
delete mode 100644 recipes/xorg-lib/pixman_0.9.5.bb
delete mode 100644 recipes/xorg-lib/pixman_git.bb
delete mode 100644 recipes/xorg-lib/xtrans/fix-missing-includepath.patch
delete mode 100644 recipes/xorg-lib/xtrans_1.0.3.bb
delete mode 100644 recipes/xorg-lib/xtrans_1.0.4.bb
delete mode 100644 recipes/xorg-lib/xtrans_1.1.bb
delete mode 100644 recipes/xorg-lib/xtrans_1.2.1.bb
delete mode 100644 recipes/xorg-lib/xtrans_1.2.3.bb
delete mode 100644 recipes/xorg-lib/xtrans_1.2.bb
diff --git a/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.1.bb b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.1.bb
new file mode 100644
index 0000000..593ba34
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.1.bb
@@ -0,0 +1,12 @@
+require libx11_${PV}.bb
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://X18NCMSstubs.diff \
+ file://fix-disable-xlocale.diff \
+ file://fix-utf8-wrong-define.patch \
+ file://xim.patch \
+ file://xchar2b.patch"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --enable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.2.bb b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.2.bb
new file mode 100644
index 0000000..f6291a9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.2.bb
@@ -0,0 +1,10 @@
+require libx11_${PV}.bb
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://X18NCMSstubs.diff \
+ file://fix-disable-xlocale.diff \
+ file://fix-utf8-wrong-define.patch"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.3.bb b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.3.bb
new file mode 100644
index 0000000..f6291a9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.3.bb
@@ -0,0 +1,10 @@
+require libx11_${PV}.bb
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://X18NCMSstubs.diff \
+ file://fix-disable-xlocale.diff \
+ file://fix-utf8-wrong-define.patch"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.4.bb b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.4.bb
new file mode 100644
index 0000000..f6291a9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/diet-x11_1.1.4.bb
@@ -0,0 +1,10 @@
+require libx11_${PV}.bb
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://X18NCMSstubs.diff \
+ file://fix-disable-xlocale.diff \
+ file://fix-utf8-wrong-define.patch"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/obsolete/xorg/xorg-lib/libapplewm_1.0.0.bb b/recipes/obsolete/xorg/xorg-lib/libapplewm_1.0.0.bb
new file mode 100644
index 0000000..6e746b4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libapplewm_1.0.0.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DEPENDS += "libxext applewmproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "48a403c45be2206ee900729ced3a0e62"
+SRC_URI[archive.sha256sum] = "ecd2ff407a418eb4ac673f48b4d0a9c5b6860a13cef7211a32fe8f3d3db0407e"
+
+XORG_PN = "libAppleWM"
diff --git a/recipes/obsolete/xorg/xorg-lib/libdmx_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libdmx_1.0.2.bb
new file mode 100644
index 0000000..7d6e025
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libdmx_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Distributed Multihead extension library"
+DEPENDS += "libxext dmxproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4d866967210d06098fc9f302ed4c79b1"
+SRC_URI[archive.sha256sum] = "fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4"
diff --git a/recipes/obsolete/xorg/xorg-lib/libfontenc_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libfontenc_1.0.4.bb
new file mode 100644
index 0000000..f16cb77
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libfontenc_1.0.4.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 font encoding library"
+LICENSE = "BSD-X"
+DEPENDS += "zlib xproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5cd16a2e51ca7b96a3081c7486ff98b9"
+SRC_URI[archive.sha256sum] = "b993aa3d17e845a12a49160b5d96993059ce919c7ba902005b910b867b6258c8"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-lib/libfs_1.0.0.bb b/recipes/obsolete/xorg/xorg-lib/libfs_1.0.0.bb
new file mode 100644
index 0000000..7f81054
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libfs_1.0.0.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Font Services library"
+DEPENDS += "xproto fontsproto xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "dfd5de47e232db0891410bec8ee6707b"
+SRC_URI[archive.sha256sum] = "2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde"
+
+XORG_PN = "libFS"
diff --git a/recipes/obsolete/xorg/xorg-lib/libfs_1.0.1.bb b/recipes/obsolete/xorg/xorg-lib/libfs_1.0.1.bb
new file mode 100644
index 0000000..fe1f774
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libfs_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Font Services library"
+DEPENDS += "xproto fontsproto xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "81521249353fa33be7a4bb0062c2fbb9"
+SRC_URI[archive.sha256sum] = "9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5"
+
+XORG_PN = "libFS"
diff --git a/recipes/obsolete/xorg/xorg-lib/libice_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libice_1.0.3.bb
new file mode 100644
index 0000000..52c9de0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libice_1.0.3.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Inter-Client Exchange library"
+DEPENDS += "xproto xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "071f96648ac25c8e87a3de11a7de2d8a"
+SRC_URI[archive.sha256sum] = "ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libICE"
diff --git a/recipes/obsolete/xorg/xorg-lib/libice_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libice_1.0.4.bb
new file mode 100644
index 0000000..29303c1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libice_1.0.4.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Inter-Client Exchange library"
+DEPENDS += "xproto xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4ab4e67e0b8845aa201e984153087f4a"
+SRC_URI[archive.sha256sum] = "13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libICE"
diff --git a/recipes/obsolete/xorg/xorg-lib/liblbxutil/mkg3states.patch b/recipes/obsolete/xorg/xorg-lib/liblbxutil/mkg3states.patch
new file mode 100644
index 0000000..58463db
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/liblbxutil/mkg3states.patch
@@ -0,0 +1,51 @@
+--- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500
++++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500
+@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION
+
+ AC_OUTPUT([Makefile
+ src/Makefile
++ src/image/Makefile
+ lbxutil.pc])
+--- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500
++++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500
+@@ -1,9 +1,6 @@
+ lib_LTLIBRARIES = liblbxutil.la
+
+-noinst_PROGRAMS = mkg3states
+-
+-mkg3states_SOURCES = \
+- $(srcdir)/image/mkg3states.c
++SUBDIRS = image
+
+ liblbxutil_la_SOURCES = \
+ $(srcdir)/lbx_zlib/reqstats.h \
+@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@
+
+ $(srcdir)/image/dfaxg42d.c: g3states.h
+
+-g3states.h: mkg3states
+- -rm -f g3states.h
+- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
++g3states.h: image/mkg3states
++ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
+
+ liblbxutil_la_LDFLAGS = -version-number 1:0:0
+
+--- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500
++++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500
+@@ -0,0 +1,15 @@
++# evil hack
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
++
++CC=$(CC_FOR_BUILD)
++LIBTOOL = @LIBTOOL@ --tag=CC
++
++noinst_PROGRAMS = mkg3states
++
++mkg3states_SOURCES = \
++ mkg3states.c
++
++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/recipes/obsolete/xorg/xorg-lib/liblbxutil_1.0.1.bb b/recipes/obsolete/xorg/xorg-lib/liblbxutil_1.0.1.bb
new file mode 100644
index 0000000..f51d5ab
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/liblbxutil_1.0.1.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "XFIXES Extension"
+DEPENDS += " xextproto xproto zlib"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://mkg3states.patch"
+SRC_URI[archive.md5sum] = "b73cbd5bc3cd268722a624a5f1318fde"
+SRC_URI[archive.sha256sum] = "94c31c7090106d3a95e2a7c083961efca1321b970118fe103ab06e5d927b7258"
+
+export CC_FOR_BUILD = "gcc"
diff --git a/recipes/obsolete/xorg/xorg-lib/libpciaccess/fix-mtrr-check.patch b/recipes/obsolete/xorg/xorg-lib/libpciaccess/fix-mtrr-check.patch
new file mode 100644
index 0000000..e2d9f62
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libpciaccess/fix-mtrr-check.patch
@@ -0,0 +1,19 @@
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- libpciaccess-0.10.3.orig/configure.ac
++++ libpciaccess-0.10.3/configure.ac
+@@ -89,12 +89,10 @@ esac
+ AM_CONDITIONAL(LINUX, [test "x$linux" = xyes])
+ AM_CONDITIONAL(FREEBSD, [test "x$freebsd" = xyes])
+ AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
+ AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
+
+-AC_CHECK_FILE([/usr/include/asm/mtrr.h],
+- [have_mtrr_h="yes"], [have_mtrr_h="no"])
+ if test "x$have_mtrr_h" = xyes; then
+ AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
+ fi
+
+ AC_SUBST(PCIACCESS_CFLAGS)
diff --git a/recipes/obsolete/xorg/xorg-lib/libpciaccess_0.10.3.bb b/recipes/obsolete/xorg/xorg-lib/libpciaccess_0.10.3.bb
new file mode 100644
index 0000000..c594dc0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libpciaccess_0.10.3.bb
@@ -0,0 +1,7 @@
+require xorg-lib-common.inc
+DEPENDS += "xproto virtual/libx11"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-mtrr-check.patch"
+SRC_URI[archive.md5sum] = "6d5468debf76fac84576ca26c9535821"
+SRC_URI[archive.sha256sum] = "2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc"
diff --git a/recipes/obsolete/xorg/xorg-lib/libpciaccess_0.11.0.bb b/recipes/obsolete/xorg/xorg-lib/libpciaccess_0.11.0.bb
new file mode 100644
index 0000000..aca0a2f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libpciaccess_0.11.0.bb
@@ -0,0 +1,6 @@
+require xorg-lib-common.inc
+DEPENDS += "xproto virtual/libx11"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "686320dcec98daad0bdfb8894d4f2a2b"
+SRC_URI[archive.sha256sum] = "6e38be12b656c83c66a6fd8ba56c041d8188218278219c88ee635242ec1c7dab"
diff --git a/recipes/obsolete/xorg/xorg-lib/libsm_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libsm_1.0.2.bb
new file mode 100644
index 0000000..ee2ff16
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libsm_1.0.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Session management library"
+PRIORITY = "optional"
+DEPENDS += " libice xproto xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a254771550c01db372e88d1a1dc2e13a"
+SRC_URI[archive.sha256sum] = "e290614797bd626c1b92bac8f83e8954b99bd66e6ecdaa1e935e176df099eba8"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libSM"
diff --git a/recipes/obsolete/xorg/xorg-lib/libsm_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libsm_1.0.3.bb
new file mode 100644
index 0000000..8ca90fe
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libsm_1.0.3.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Session management library"
+DEPENDS += "libice xproto xtrans"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "184cbf502b3cd5d7ba5f9d1290a99606"
+SRC_URI[archive.sha256sum] = "57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libSM"
diff --git a/recipes/obsolete/xorg/xorg-lib/libsm_1.1.0.bb b/recipes/obsolete/xorg/xorg-lib/libsm_1.1.0.bb
new file mode 100644
index 0000000..1b51b89
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libsm_1.1.0.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Session management library"
+DEPENDS += "libice xproto xtrans util-linux-ng"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "05a04c2b6382fb0054f6c70494e22733"
+SRC_URI[archive.sha256sum] = "7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libSM"
diff --git a/recipes/obsolete/xorg/xorg-lib/libwindowswm_1.0.0.bb b/recipes/obsolete/xorg/xorg-lib/libwindowswm_1.0.0.bb
new file mode 100644
index 0000000..35457cb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libwindowswm_1.0.0.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+DEPENDS += "libxext windowswmproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "337b379fd00a67345b083100c4e6ba95"
+SRC_URI[archive.sha256sum] = "6ad87266173d21ba7e0e4506db0c094769fd58c3f0b741b37f30c297deec166a"
+
+XORG_PN = "libWindowsWM"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/keysymdef_include.patch
new file mode 100644
index 0000000..5653088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ for flag in $XPROTO_CFLAGS -I/usr/include; do
++ case "$KEYSYMDEF" in
++ "")
++ case "$flag" in
++ *-I*)
++ dir=`echo "$flag" | sed 's/ *-I//'`
++ file="$dir/X11/keysymdef.h"
++ if test -f "$file"; then
++ KEYSYMDEF="$file"
++ fi
++ ;;
++ esac
+ ;;
+ esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+- AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
++ done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++else
++ AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AC_ARG_ENABLE(udc,
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
new file mode 100644
index 0000000..ad8b6fc
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
@@ -0,0 +1,15 @@
+Index: libX11-1.0.1/src/util/Makefile.am
+===================================================================
+--- libX11-1.0.1.old/src/util/Makefile.am
++++ libX11-1.0.1/src/util/Makefile.am
+@@ -1,10 +1 @@
+-# $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)
+-
+-#override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-
+ EXTRA_DIST = mkks.sh
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/keysymdef_include.patch
new file mode 100644
index 0000000..5653088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ for flag in $XPROTO_CFLAGS -I/usr/include; do
++ case "$KEYSYMDEF" in
++ "")
++ case "$flag" in
++ *-I*)
++ dir=`echo "$flag" | sed 's/ *-I//'`
++ file="$dir/X11/keysymdef.h"
++ if test -f "$file"; then
++ KEYSYMDEF="$file"
++ fi
++ ;;
++ esac
+ ;;
+ esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+- AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
++ done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++else
++ AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AC_ARG_ENABLE(udc,
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
new file mode 100644
index 0000000..ad8b6fc
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
@@ -0,0 +1,15 @@
+Index: libX11-1.0.1/src/util/Makefile.am
+===================================================================
+--- libX11-1.0.1.old/src/util/Makefile.am
++++ libX11-1.0.1/src/util/Makefile.am
+@@ -1,10 +1 @@
+-# $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)
+-
+-#override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-
+ EXTRA_DIST = mkks.sh
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.1.1/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.1/keysymdef_include.patch
new file mode 100644
index 0000000..5653088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.1/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ for flag in $XPROTO_CFLAGS -I/usr/include; do
++ case "$KEYSYMDEF" in
++ "")
++ case "$flag" in
++ *-I*)
++ dir=`echo "$flag" | sed 's/ *-I//'`
++ file="$dir/X11/keysymdef.h"
++ if test -f "$file"; then
++ KEYSYMDEF="$file"
++ fi
++ ;;
++ esac
+ ;;
+ esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+- AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
++ done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++else
++ AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AC_ARG_ENABLE(udc,
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.1.2/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.2/keysymdef_include.patch
new file mode 100644
index 0000000..5653088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.2/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ for flag in $XPROTO_CFLAGS -I/usr/include; do
++ case "$KEYSYMDEF" in
++ "")
++ case "$flag" in
++ *-I*)
++ dir=`echo "$flag" | sed 's/ *-I//'`
++ file="$dir/X11/keysymdef.h"
++ if test -f "$file"; then
++ KEYSYMDEF="$file"
++ fi
++ ;;
++ esac
+ ;;
+ esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+- AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
++ done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++else
++ AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AC_ARG_ENABLE(udc,
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.1.3/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.3/keysymdef_include.patch
new file mode 100644
index 0000000..5653088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.3/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ for flag in $XPROTO_CFLAGS -I/usr/include; do
++ case "$KEYSYMDEF" in
++ "")
++ case "$flag" in
++ *-I*)
++ dir=`echo "$flag" | sed 's/ *-I//'`
++ file="$dir/X11/keysymdef.h"
++ if test -f "$file"; then
++ KEYSYMDEF="$file"
++ fi
++ ;;
++ esac
+ ;;
+ esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+- AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
++ done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++else
++ AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AC_ARG_ENABLE(udc,
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.1.4/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.4/keysymdef_include.patch
new file mode 100644
index 0000000..5653088
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.1.4/keysymdef_include.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+- case "$KEYSYMDEF" in
+- "")
+- case "$flag" in
+- *-I*)
+- dir=`echo "$flag" | sed 's/ *-I//'`
+- file="$dir/X11/keysymdef.h"
+- if test -f "$file"; then
+- KEYSYMDEF="$file"
+- fi
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ for flag in $XPROTO_CFLAGS -I/usr/include; do
++ case "$KEYSYMDEF" in
++ "")
++ case "$flag" in
++ *-I*)
++ dir=`echo "$flag" | sed 's/ *-I//'`
++ file="$dir/X11/keysymdef.h"
++ if test -f "$file"; then
++ KEYSYMDEF="$file"
++ fi
++ ;;
++ esac
+ ;;
+ esac
+- ;;
+- esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+- AC_MSG_ERROR([Cannot find keysymdef.h])
+- ;;
+-*)
++ done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+- ;;
+-esac
++else
++ AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+
+ AC_ARG_ENABLE(udc,
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.2/x11_disable_makekeys.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.2/x11_disable_makekeys.patch
new file mode 100644
index 0000000..9e9e75e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.2/x11_disable_makekeys.patch
@@ -0,0 +1,23 @@
+--- /tmp/Makefile.am 2009-05-27 22:19:39.000000000 +0200
++++ libX11-1.2/src/util/Makefile.am 2009-05-27 22:21:31.000000000 +0200
+@@ -1,20 +1 @@
+-# $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
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/dolt-fix.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
new file mode 100644
index 0000000..7e96075
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
@@ -0,0 +1,22 @@
+Index: libX11-1.3.4/m4/dolt.m4
+===================================================================
+--- libX11-1.3.4/m4/dolt.m4
++++ libX11-1.3.4/m4/dolt.m4
+@@ -155,7 +155,7 @@ dnl without '=', because automake does n
+ 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=()
+@@ -171,7 +171,7 @@ done
+ 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__
+
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
new file mode 100644
index 0000000..07487b6
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.1.5/configure.ac
+===================================================================
+--- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000
++++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000
+@@ -221,13 +221,21 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ dir=`pkg-config --variable=includedir xproto`
++ KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
++
+ if test -f "$KEYSYMDEF"; then
+- AC_MSG_RESULT([$KEYSYMDEF])
++ AC_MSG_RESULT([$KEYSYMDEF])
+ else
+ AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
++
+ AC_SUBST(KEYSYMDEF)
+
+ AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
new file mode 100644
index 0000000..0739632
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
@@ -0,0 +1,26 @@
+Index: git/src/util/Makefile.am
+===================================================================
+--- git.orig/src/util/Makefile.am
++++ git/src/util/Makefile.am
+@@ -1,21 +1 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS = \
+- $(X11_CFLAGS) \
+- $(CWARNFLAGS)
+-
+-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
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
new file mode 100644
index 0000000..5d0a24c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
@@ -0,0 +1,23 @@
+diff -uNr libX11-1.3.3.orig/src/util/Makefile.am libX11-1.3.3/src/util/Makefile.am
+--- libX11-1.3.3.orig/src/util/Makefile.am 2010-01-15 02:11:36.000000000 +0100
++++ libX11-1.3.3/src/util/Makefile.am 2010-01-18 14:48:27.000000000 +0100
+@@ -1,19 +1 @@
+-
+-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
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/dolt-fix.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/dolt-fix.patch
new file mode 100644
index 0000000..7e96075
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/dolt-fix.patch
@@ -0,0 +1,22 @@
+Index: libX11-1.3.4/m4/dolt.m4
+===================================================================
+--- libX11-1.3.4/m4/dolt.m4
++++ libX11-1.3.4/m4/dolt.m4
+@@ -155,7 +155,7 @@ dnl without '=', because automake does n
+ 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=()
+@@ -171,7 +171,7 @@ done
+ 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__
+
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/keysymdef_include.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/keysymdef_include.patch
new file mode 100644
index 0000000..0cab165
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/keysymdef_include.patch
@@ -0,0 +1,21 @@
+Index: libX11-1.3.4/configure.ac
+===================================================================
+--- libX11-1.3.4.orig/configure.ac
++++ libX11-1.3.4/configure.ac
+@@ -355,8 +355,14 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`$PKG_CONFIG --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ dir=`${PKG_CONFIG} --variable=includedir xproto`
++ KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
+ if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+ else
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
new file mode 100644
index 0000000..9763313
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.3.4/src/util/Makefile.am
+===================================================================
+--- libX11-1.3.4.orig/src/util/Makefile.am
++++ libX11-1.3.4/src/util/Makefile.am
+@@ -1,24 +1 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS = \
+- $(X11_CFLAGS) \
+- $(CWARNFLAGS)
+-
+-CC = @CC_FOR_BUILD@
+-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+-CFLAGS = @CFLAGS_FOR_BUILD@
+-LDFLAGS = @LDFLAGS_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
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11/ruutf8.patch b/recipes/obsolete/xorg/xorg-lib/libx11/ruutf8.patch
new file mode 100644
index 0000000..0822b30
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11/ruutf8.patch
@@ -0,0 +1,12 @@
+diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
+index a74ca75..ff5bc3f 100644
+--- a/nls/locale.alias.pre
++++ b/nls/locale.alias.pre
+@@ -898,6 +898,7 @@ ru_RU.cp1251: ru_RU.CP1251
+ ru_RU.microsoftcp1251: ru_RU.CP1251
+ ru_RU.microsoft-cp1251: ru_RU.CP1251
+ ru_RU.MICROSOFT-CP1251: ru_RU.CP1251
++ru_RU.utf8: ru_RU.UTF-8
+ #if defined(INCLUDE_ru_SU)
+ XCOMM ru_SU is redundant now
+ ru_SU: ru_RU.KOI8-R
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11/xchar2b.patch b/recipes/obsolete/xorg/xorg-lib/libx11/xchar2b.patch
new file mode 100644
index 0000000..31da58f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11/xchar2b.patch
@@ -0,0 +1,13 @@
+http://www.koka-in.org/~kensyu/zaurus/diary/20030618.html
+
+--- /tmp/Xlib.h 2006-12-01 14:40:27.000000000 +0100
++++ libX11-X11R7.1-1.0.1/include/X11/Xlib.h 2006-12-01 14:40:56.948254000 +0100
+@@ -1067,7 +1067,7 @@
+ typedef struct { /* normal 16 bit characters are two bytes */
+ unsigned char byte1;
+ unsigned char byte2;
+-} XChar2b;
++} __attribute__ ((packed)) XChar2b;
+
+ typedef struct {
+ XChar2b *chars; /* two byte characters */
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11/xim.patch b/recipes/obsolete/xorg/xorg-lib/libx11/xim.patch
new file mode 100644
index 0000000..0eab197
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11/xim.patch
@@ -0,0 +1,55 @@
+--- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000
++++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
+@@ -90,6 +90,52 @@
+ return;
+ }
+
++XIM
++XOpenIM (
++ Display* display,
++ struct _XrmHashBucketRec* rdb,
++ char* res_name,
++ char* res_class)
++{
++ return (XIM) NULL;
++}
++
++Status
++XCloseIM ( XIM im )
++{
++ return NULL;
++}
++
++XIC
++XCreateIC ( XIM im, ...)
++{
++ return NULL;
++}
++
++void
++XDestroyIC ( XIC ic )
++{
++ return;
++}
++
++int
++XmbLookupString (
++ XIC ic,
++ XKeyPressedEvent* ev,
++ char* buffer,
++ int nbytes,
++ KeySym* keysym,
++ Status* status)
++{
++ return XLookupNone;
++}
++
++char *
++XGetICValues( XIC ic, ...)
++{
++ return (char *) NULL;
++}
++
+ XPointer
+ _XimGetLocaleCode ( _Xconst char* encoding_name )
+ {
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.0.1.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.0.1.bb
new file mode 100644
index 0000000..734a31d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.0.1.bb
@@ -0,0 +1,10 @@
+require libx11.inc
+LICENSE = "XFree86"
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://ruutf8.patch"
+SRC_URI[archive.md5sum] = "58f0537f21183e27149cf906a1b6bef9"
+SRC_URI[archive.sha256sum] = "f99e4ce6d8e3b8833957978fe22223897b0e636c83580f2b07eff0388eb75294"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.0.3.bb
new file mode 100644
index 0000000..40cbeb5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.0.3.bb
@@ -0,0 +1,10 @@
+require libx11.inc
+LICENSE = "XFree86"
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://ruutf8.patch"
+SRC_URI[archive.md5sum] = "60b787a812c92d33f71860e4e19cb59d"
+SRC_URI[archive.sha256sum] = "fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.1.1.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.1.bb
new file mode 100644
index 0000000..368dd7b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.1.bb
@@ -0,0 +1,9 @@
+require libx11.inc
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://ruutf8.patch"
+SRC_URI[archive.md5sum] = "848b80f77b20ae1fa5c882bbfa531ebc"
+SRC_URI[archive.sha256sum] = "5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.1.2.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.2.bb
new file mode 100644
index 0000000..60093c1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.2.bb
@@ -0,0 +1,8 @@
+require libx11.inc
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "710bf38a9477a5a1b235bc94f1d0593c"
+SRC_URI[archive.sha256sum] = "b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.1.3.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.3.bb
new file mode 100644
index 0000000..d6aa199
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.3.bb
@@ -0,0 +1,8 @@
+require libx11.inc
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4d43d3e472c552d2f191ecdd4e75112c"
+SRC_URI[archive.sha256sum] = "4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.1.4.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.4.bb
new file mode 100644
index 0000000..3eeeece
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.1.4.bb
@@ -0,0 +1,8 @@
+require libx11.inc
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1469a5a8aa8d288dce6f4c45d2f68dc3"
+SRC_URI[archive.sha256sum] = "bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.2.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.2.bb
new file mode 100644
index 0000000..0cea5f8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.2.bb
@@ -0,0 +1,9 @@
+require libx11.inc
+DEPENDS = "${COMMON_DEPENDS}"
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://dolt-fix.patch"
+SRC_URI[archive.md5sum] = "c6265b59ea2b594fd68e33f9125b4d20"
+SRC_URI[archive.sha256sum] = "e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.3.3.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.3.3.bb
new file mode 100644
index 0000000..8c40a99
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.3.3.bb
@@ -0,0 +1,6 @@
+require libx11.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://dolt-fix.patch"
+SRC_URI[archive.md5sum] = "5d74971360f194ce33d2bd2e4d9b066c"
+SRC_URI[archive.sha256sum] = "8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_1.3.4.bb b/recipes/obsolete/xorg/xorg-lib/libx11_1.3.4.bb
new file mode 100644
index 0000000..e55d720
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_1.3.4.bb
@@ -0,0 +1,6 @@
+require libx11.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://dolt-fix.patch"
+SRC_URI[archive.md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
+SRC_URI[archive.sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
diff --git a/recipes/obsolete/xorg/xorg-lib/libx11_git.bb b/recipes/obsolete/xorg/xorg-lib/libx11_git.bb
new file mode 100644
index 0000000..eac68d8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libx11_git.bb
@@ -0,0 +1,14 @@
+require libx11.inc
+PV = "1.3.3+git"
+PR = "${INC_PR}.0"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
+SRC_URI += " file://keysymdef_include.patch \
+ file://x11_disable_makekeys.patch \
+ file://dolt-fix.patch \
+"
+
+SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d"
+S = "${WORKDIR}/git"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxau_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxau_1.0.3.bb
new file mode 100644
index 0000000..cd4f79b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxau_1.0.3.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "A Sample Authorization Protocol for X"
+DEPENDS += " xproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "75a9f2b85cd1617b5ca98c9095323853"
+SRC_URI[archive.sha256sum] = "d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXau"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxau_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxau_1.0.4.bb
new file mode 100644
index 0000000..293fc63
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxau_1.0.4.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "A Sample Authorization Protocol for X"
+DEPENDS += " xproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0f2b88d857e0a3f5898e4759c541af46"
+SRC_URI[archive.sha256sum] = "10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXau"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxaw_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxaw_1.0.3.bb
new file mode 100644
index 0000000..87ec70e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxaw_1.0.3.bb
@@ -0,0 +1,22 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Athena Widget Set"
+DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ee215536ea78798268ab3a444d10135a"
+SRC_URI[archive.sha256sum] = "45ca55bdac904a07b8118618c65ddb5bf8826e626c4c927e3c2508c58e231514"
+
+do_install_append () {
+ ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
+ ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
+ ln -sf libXaw7.so.7 ${D}${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*"
+
+XORG_PN = "libXaw"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxaw_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxaw_1.0.4.bb
new file mode 100644
index 0000000..2ed715d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxaw_1.0.4.bb
@@ -0,0 +1,22 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Athena Widget Set"
+DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "73671d8f1cf36fdd81395328cc3539c9"
+SRC_URI[archive.sha256sum] = "11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9"
+
+do_install_append () {
+ ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
+ ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
+ ln -sf libXaw7.so.7 ${D}${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*"
+
+XORG_PN = "libXaw"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxcomposite/change-include-order.patch b/recipes/obsolete/xorg/xorg-lib/libxcomposite/change-include-order.patch
new file mode 100644
index 0000000..630b881
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxcomposite/change-include-order.patch
@@ -0,0 +1,14 @@
+This patch makes the build use its own Xcomposite.h over rather than an
+older Xcomposite.h that might already be installed in the staging dir.
+
+--- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100
++++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100
+@@ -21,7 +21,7 @@
+ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ # PERFORMANCE OF THIS SOFTWARE.
+
+-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
++AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+
+ lib_LTLIBRARIES = libXcomposite.la
+
diff --git a/recipes/obsolete/xorg/xorg-lib/libxcomposite_0.3.1.bb b/recipes/obsolete/xorg/xorg-lib/libxcomposite_0.3.1.bb
new file mode 100644
index 0000000..d7f8beb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxcomposite_0.3.1.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Composite extension library."
+LICENSE = "BSD-X"
+DEPENDS += " compositeproto virtual/libx11 libxfixes"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://change-include-order.patch"
+SRC_URI[archive.md5sum] = "a80650d660486ea7bb2e5fd84a83799a"
+SRC_URI[archive.sha256sum] = "d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b"
+
+XORG_PN = "libXcomposite"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxcomposite_0.4.0.bb b/recipes/obsolete/xorg/xorg-lib/libxcomposite_0.4.0.bb
new file mode 100644
index 0000000..2dff14a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxcomposite_0.4.0.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Composite extension library."
+LICENSE = "BSD-X"
+DEPENDS += " compositeproto virtual/libx11 libxfixes libxext"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += " file://change-include-order.patch"
+SRC_URI[archive.md5sum] = "7e95395dea89be21bae929b9b7f16641"
+SRC_URI[archive.sha256sum] = "7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510"
+
+XORG_PN = "libXcomposite"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.8.bb b/recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.8.bb
new file mode 100644
index 0000000..3f175e8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.8.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X cursor management library"
+LICENSE = "BSD-X"
+DEPENDS += "libxrender libxfixes"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ec2acd10a7736a85dd1e1ed9ea5bec96"
+SRC_URI[archive.sha256sum] = "8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXcursor"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.9.bb b/recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.9.bb
new file mode 100644
index 0000000..2b363a5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxcursor_1.1.9.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X cursor management library"
+LICENSE = "BSD-X"
+DEPENDS += "libxrender libxfixes"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "99b7554037a92b260891091e81815a0a"
+SRC_URI[archive.sha256sum] = "1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXcursor"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxdamage_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxdamage_1.0.4.bb
new file mode 100644
index 0000000..452c634
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxdamage_1.0.4.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Damage extension library."
+LICENSE = "BSD-X"
+DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4d0eece7a8372a7754db1de08c2be324"
+SRC_URI[archive.sha256sum] = "5df90f0efa77e1d6f9e1768a2b0adfc896d09c7a3d8680ed0980511b3625c636"
+
+XORG_PN = "libXdamage"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxdamage_1.1.1.bb b/recipes/obsolete/xorg/xorg-lib/libxdamage_1.1.1.bb
new file mode 100644
index 0000000..cb7eca1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxdamage_1.1.1.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 damaged region extension library"
+LICENSE = "BSD-X"
+DEPENDS += "damageproto libxfixes"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ac0ce6b0063a9858c8f24ddb4c60487d"
+SRC_URI[archive.sha256sum] = "0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e"
+
+XORG_PN = "libXdamage"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxdmcp_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxdmcp_1.0.2.bb
new file mode 100644
index 0000000..1226afb
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxdmcp_1.0.2.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Display Manager Control Protocol library"
+DEPENDS += "xproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "10facf2bc7cbd5e5c1a698b8a210a582"
+SRC_URI[archive.sha256sum] = "f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXdmcp"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxext_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.2.bb
new file mode 100644
index 0000000..02326de
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Server Extension library"
+PRIORITY = "optional"
+DEPENDS += " xproto virtual/libx11 xextproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "cce89c5b941a493512b534f4847c6111"
+SRC_URI[archive.sha256sum] = "368e4cf5117febd998e6fc40d096b3af19a571adccc5ed49b9d16e482b3a8f8e"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXext"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxext_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.3.bb
new file mode 100644
index 0000000..f8d76b4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.3.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1bf6fa1c26f9957d7cc0bd90b038dfa6"
+SRC_URI[archive.sha256sum] = "2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXext"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxext_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.4.bb
new file mode 100644
index 0000000..1317e5c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.4.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "a91f1f722ac80c597cf0b75dcb8b48c0"
+SRC_URI[archive.sha256sum] = "2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXext"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxext_1.0.5.bb b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.5.bb
new file mode 100644
index 0000000..40dbece
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxext_1.0.5.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "aa11d859cc8e9a0bad3bb55e1666547b"
+SRC_URI[archive.sha256sum] = "1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXext"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfixes_4.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxfixes_4.0.3.bb
new file mode 100644
index 0000000..d574764
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfixes_4.0.3.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Fixes extension library."
+LICENSE = "BSD-X"
+DEPENDS += "virtual/libx11 xproto fixesproto xextproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1990d19725a3c7f32290037f02d3737f"
+SRC_URI[archive.sha256sum] = "547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfixes"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch b/recipes/obsolete/xorg/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
new file mode 100644
index 0000000..dd30743
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
@@ -0,0 +1,188 @@
+commit 7670d4a2720c61fbc7b989fed14c676f04ac3ad1
+Author: Dodji Seketeli <dodji@openedhand.com>
+Date: Mon Jul 16 12:24:34 2007 +0200
+
+ Remove side effects from BuiltinReadDirectory()
+
+ The first time BuiltinReadDirectory() is called,
+ save the content of builtin_dir and builtin_alias,
+ before calling FontFileAddFontFile(), because that fonction
+ will modify those.
+
+ Then, in subsequent calls to BuiltinReadDirectory(), restore
+ builtin_dir and builtin_alias so that the side effect incurred
+ by the first call disappears.
+
+diff --git a/src/builtins/dir.c b/src/builtins/dir.c
+index c272449..97f1e1e 100644
+--- a/src/builtins/dir.c
++++ b/src/builtins/dir.c
+@@ -29,6 +29,133 @@
+ #endif
+ #include "builtin.h"
+
++BuiltinDirPtr
++BuiltinDirsDup (const BuiltinDirPtr a_dirs,
++ int a_dirs_len)
++{
++ BuiltinDirPtr dirs=NULL ;
++ int i=0 ;
++
++ if (!a_dirs)
++ return NULL ;
++
++ dirs = xcalloc (a_dirs_len, sizeof (BuiltinDirRec)) ;
++ if (!dirs)
++ return NULL ;
++
++ for (i=0; i < a_dirs_len; i++) {
++ int len = strlen (a_dirs[i].file_name) ;
++ dirs[i].file_name = xcalloc (1, len) ;
++ memmove (dirs[i].file_name, a_dirs[i].file_name, len);
++ len = strlen (a_dirs[i].font_name) ;
++ dirs[i].font_name = xcalloc (1, len) ;
++ memmove (dirs[i].font_name, a_dirs[i].font_name, len);
++ }
++ return dirs ;
++}
++
++/**
++ * Copy a_save back into a_cur
++ * @param a_cur the instance of BuiltinDir to restore
++ * @param a_saved the saved instance of BuiltinDir to copy into a_cur
++ * @return 0 if went okay, 1 otherwise.
++ */
++int
++BuiltinDirRestore (BuiltinDirPtr a_cur,
++ const BuiltinDirPtr a_saved)
++{
++ if (!a_cur)
++ return 1 ;
++ if (!a_saved)
++ return 0 ;
++
++ if (a_saved->font_name)
++ memmove (a_cur->font_name, a_saved->font_name, strlen (a_saved->font_name)) ;
++ return 0 ;
++}
++
++
++int
++BuiltinDirsRestore (BuiltinDirPtr a_cur_tab,
++ const BuiltinDirPtr a_saved_tab,
++ int a_tab_len)
++{
++ int i=0 ;
++
++ if (!a_cur_tab)
++ return 1 ;
++ if (!a_saved_tab)
++ return 0 ;
++
++ for (i=0 ; i < a_tab_len; i++) {
++ if (BuiltinDirRestore (&a_cur_tab[i], &a_saved_tab[i]))
++ return 1 ;
++ }
++ return 0 ;
++}
++
++BuiltinAliasPtr
++BuiltinAliasesDup (const BuiltinAliasPtr a_aliases,
++ int a_aliases_len)
++{
++ BuiltinAliasPtr aliases=NULL ;
++ int i=0 ;
++
++ if (!a_aliases)
++ return NULL ;
++
++ aliases = xcalloc (a_aliases_len, sizeof (BuiltinAliasRec)) ;
++ if (!aliases)
++ return NULL ;
++
++ for (i=0; i < a_aliases_len; i++) {
++ int len = strlen (a_aliases[i].font_name) ;
++ aliases[i].font_name = xcalloc (1, len) ;
++ memmove (aliases[i].font_name, a_aliases[i].font_name, len);
++ }
++ return aliases ;
++}
++
++/**
++ * Copy a_save back into a_cur
++ * @param a_cur the instance of BuiltinAlias to restore
++ * @param a_saved the saved instance of BuiltinAlias to copy into a_cur
++ * @return 0 if went okay, 1 otherwise.
++ */
++int
++BuiltinAliasRestore (BuiltinAliasPtr a_cur,
++ const BuiltinAliasPtr a_save)
++{
++ if (!a_cur)
++ return 1 ;
++ if (!a_save)
++ return 0 ;
++ if (a_save->alias_name)
++ memmove (a_cur->alias_name, a_save->alias_name, strlen (a_save->alias_name)) ;
++ if (a_save->font_name)
++ memmove (a_cur->font_name, a_save->font_name, strlen (a_save->font_name)) ;
++ return 0 ;
++}
++
++int
++BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab,
++ const BuiltinAliasPtr a_saved_tab,
++ int a_tab_len)
++{
++ int i=0 ;
++
++ if (!a_cur_tab)
++ return 1 ;
++ if (!a_saved_tab)
++ return 0 ;
++
++ for (i=0 ; i < a_tab_len; i++) {
++ if (BuiltinAliasRestore (&a_cur_tab[i], &a_saved_tab[i]))
++ return 1 ;
++ }
++ return 0 ;
++}
++
+ int
+ BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
+ {
+@@ -36,6 +163,34 @@ BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
+ int i;
+
+ dir = FontFileMakeDir ("", builtin_dir_count);
++ static BuiltinDirPtr saved_builtin_dir ;
++ static BuiltinAliasPtr saved_builtin_alias ;
++
++
++ if (saved_builtin_dir)
++ {
++ BuiltinDirsRestore ((BuiltinDirPtr) builtin_dir,
++ saved_builtin_dir,
++ builtin_dir_count) ;
++ }
++ else
++ {
++ saved_builtin_dir = BuiltinDirsDup ((const BuiltinDirPtr) builtin_dir,
++ builtin_dir_count) ;
++ }
++
++ if (saved_builtin_alias)
++ {
++ BuiltinAliasesRestore ((BuiltinAliasPtr) builtin_alias,
++ saved_builtin_alias,
++ builtin_alias_count) ;
++ }
++ else
++ {
++ saved_builtin_alias = BuiltinAliasesDup ((const BuiltinAliasPtr) builtin_alias,
++ builtin_alias_count) ;
++ }
++
+ for (i = 0; i < builtin_dir_count; i++)
+ {
+ if (!FontFileAddFontFile (dir,
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont/no-scalable-crash.patch b/recipes/obsolete/xorg/xorg-lib/libxfont/no-scalable-crash.patch
new file mode 100644
index 0000000..90bded6
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont/no-scalable-crash.patch
@@ -0,0 +1,22 @@
+--- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200
++++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200
+@@ -695,6 +695,11 @@
+ */
+ if (isscale)
+ {
++ /* If the fontname says it is scalable, make sure that the
++ * renderer supports OpenScalable and GetInfoScalable.
++ */
++ if (renderer->OpenScalable && renderer->GetInfoScalable)
++ {
+ if (vals.values_supplied & SIZE_SPECIFY_MASK)
+ {
+ bzero((char *)&zeroVals, sizeof(zeroVals));
+@@ -794,6 +799,7 @@
+ bitmap->name.name);
+ }
+ }
++ }
+ }
+ return TRUE;
+ }
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont_1.2.7.bb b/recipes/obsolete/xorg/xorg-lib/libxfont_1.2.7.bb
new file mode 100644
index 0000000..b470c8b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont_1.2.7.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X font library (used by the X server)."
+PRIORITY = "optional"
+LICENSE = "BSD-X"
+DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-scalable-crash.patch"
+SRC_URI[archive.md5sum] = "2f2085310f75900044d9dcd469637d26"
+SRC_URI[archive.sha256sum] = "2f8c004c0b914d460e6fd2b48d8b425cf4778d415467fc1f1d938b200462d18b"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfont"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont_1.2.8.bb b/recipes/obsolete/xorg/xorg-lib/libxfont_1.2.8.bb
new file mode 100644
index 0000000..3794cf2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont_1.2.8.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X font library (used by the X server)."
+PRIORITY = "optional"
+LICENSE = "BSD-X"
+DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-scalable-crash.patch"
+SRC_URI[archive.md5sum] = "83b8e21f6ee22512a8f72ba51e2d74f6"
+SRC_URI[archive.sha256sum] = "374a2ca12f62a4d9f09a17a34765a5289cefa9db7f9f0913e1c3731b4088aad8"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfont"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.0.bb b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.0.bb
new file mode 100644
index 0000000..c3c9377
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.0.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 font rasterisation library"
+LICENSE = "BSD-X"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-scalable-crash.patch \
+ file://builtinreaddirectory-no-side-effect.patch"
+SRC_URI[archive.md5sum] = "d1d3fa170d74b066f1f23ca8574e7c90"
+SRC_URI[archive.sha256sum] = "07567b9880f28d1a404389c024a185419bfe81136aef3d9eda52407f34c3d3dd"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfont"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.1.bb b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.1.bb
new file mode 100644
index 0000000..671fd58
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.1.bb
@@ -0,0 +1,14 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 font rasterisation library"
+LICENSE = "BSD-X"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-scalable-crash.patch"
+SRC_URI[archive.md5sum] = "b2f396b62633819bbdd9748383876e21"
+SRC_URI[archive.sha256sum] = "dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfont"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.2.bb b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.2.bb
new file mode 100644
index 0000000..250433a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.2.bb
@@ -0,0 +1,14 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 font rasterisation library"
+LICENSE = "BSD-X"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://no-scalable-crash.patch"
+SRC_URI[archive.md5sum] = "64f510ebf9679f3a97a3d633cbee4f50"
+SRC_URI[archive.sha256sum] = "c167cfd529b7c67f496ee0bed3c0b43e0107de0f689d387c1c0e23ef7cf3d2f2"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfont"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.3.bb b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.3.bb
new file mode 100644
index 0000000..65b5415
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfont_1.3.3.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 font rasterisation library"
+LICENSE = "BSD-X"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4f174b9613f87cf00d731da428a1b194"
+SRC_URI[archive.sha256sum] = "6171e6bca4bd6333611bd9c63cccc8e8e412d876c72097f0dddc490a9df51d5a"
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXfont"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxfontcache_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxfontcache_1.0.4.bb
new file mode 100644
index 0000000..f4a079e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxfontcache_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X-TrueType font cache extension client library"
+DEPENDS += "libxext fontcacheproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1adca018aa7bf2d215f20a69c10828ad"
+SRC_URI[archive.sha256sum] = "ffe747cfbf81cdd862af1b05d021ad1ab83b623eab5b32b0a618efb4c0f3e01c"
+
+XORG_PN = "libXfontcache"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxft_2.1.12.bb b/recipes/obsolete/xorg/xorg-lib/libxft_2.1.12.bb
new file mode 100644
index 0000000..14beef39
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxft_2.1.12.bb
@@ -0,0 +1,21 @@
+require xorg-lib-common.inc
+DESCRIPTION = "FreeType-based font drawing library for X"
+DEPENDS += "libxrender freetype fontconfig"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1309301e2d979bd475dc58325cb8c056"
+SRC_URI[archive.sha256sum] = "68b46f85caaf0b30c876bd983abe144c25755bee7532e8738ab7ebe29a428986"
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+ ${libdir}/*.a ${libdir}/pkgconfig \
+ ${datadir}/aclocal ${bindir} ${sbindir}"
+
+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)
+}
+
+XORG_PN = "libXft"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxft_2.1.13.bb b/recipes/obsolete/xorg/xorg-lib/libxft_2.1.13.bb
new file mode 100644
index 0000000..a2219c9
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxft_2.1.13.bb
@@ -0,0 +1,21 @@
+require xorg-lib-common.inc
+DESCRIPTION = "FreeType-based font drawing library for X"
+DEPENDS += "libxrender freetype fontconfig"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "bc8881851f3bd8dcc625fac37350a1c6"
+SRC_URI[archive.sha256sum] = "ce7688258af34c14af421bcfb306d4310245b727d2417ac968b7f6b2facfde8c"
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+ ${libdir}/*.a ${libdir}/pkgconfig \
+ ${datadir}/aclocal ${bindir} ${sbindir}"
+
+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)
+}
+
+XORG_PN = "libXft"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxi_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxi_1.0.2.bb
new file mode 100644
index 0000000..12e49f0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxi_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Input extension library."
+DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4a5207a29a6b220e5462129854689844"
+SRC_URI[archive.sha256sum] = "7e6339539d3d0a4fc95cc23ca2b13ae67dd783e011b3cc5ca76040e376bff57f"
+
+XORG_PN = "libXi"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxi_1.1.0.bb b/recipes/obsolete/xorg/xorg-lib/libxi_1.1.0.bb
new file mode 100644
index 0000000..3ad5dfc
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxi_1.1.0.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Input extension library."
+DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c25abbe604029855eb11a3a75fb1f386"
+SRC_URI[archive.sha256sum] = "0f90d7e27d8a7d6bccf9350b6283ffe122e5347fa51d4ea9055653b297339989"
+
+XORG_PN = "libXi"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxi_1.1.2.bb b/recipes/obsolete/xorg/xorg-lib/libxi_1.1.2.bb
new file mode 100644
index 0000000..bff8ba4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxi_1.1.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Input extension library"
+DEPENDS += "libxext inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9c4dd85f3e2a75bfb60bd288502bc288"
+SRC_URI[archive.sha256sum] = "4deda13613f03e4524d3cf0ac14b9e20be5044d415cb8478713ecbe47f4de862"
+
+XORG_PN = "libXi"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxi_1.1.3.bb b/recipes/obsolete/xorg/xorg-lib/libxi_1.1.3.bb
new file mode 100644
index 0000000..039bfc8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxi_1.1.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Input extension library"
+DEPENDS += "libxext inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7c510abb0cad8dc20493fb27ff7859d8"
+SRC_URI[archive.sha256sum] = "c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f"
+
+XORG_PN = "libXi"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxi_1.2.0.bb b/recipes/obsolete/xorg/xorg-lib/libxi_1.2.0.bb
new file mode 100644
index 0000000..e6b3da7
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxi_1.2.0.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Input extension library"
+DEPENDS += "libxext inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "4b88e07d7dd77ca1e786f09066b58c02"
+SRC_URI[archive.sha256sum] = "7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a"
+
+XORG_PN = "libXi"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.2.bb
new file mode 100644
index 0000000..786c294
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Xinerama extension library"
+DEPENDS += "libxext xineramaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f6fb08eafd3c2909d515f1a07bfca8fd"
+SRC_URI[archive.sha256sum] = "d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d"
+
+XORG_PN = "libXinerama"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.3.bb
new file mode 100644
index 0000000..4e7cc91
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxinerama_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Xinerama extension library"
+DEPENDS += "libxext xineramaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "cd9f7c46439ac40e0517a302d2434d2c"
+SRC_URI[archive.sha256sum] = "07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219"
+
+XORG_PN = "libXinerama"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.4.bb
new file mode 100644
index 0000000..d02cec5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.4.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 keyboard file manipulation library"
+LICENSE = "GPL"
+DEPENDS += "virtual/libx11 kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "12b4ceb5d42b520228b5fb40a96ae6c5"
+SRC_URI[archive.sha256sum] = "468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.5.bb b/recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.5.bb
new file mode 100644
index 0000000..60d3a1b
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxkbfile_1.0.5.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 keyboard file manipulation library"
+LICENSE = "GPL"
+DEPENDS += "virtual/libx11 kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "0726a845fe5a56551de2718c9f6b0e35"
+SRC_URI[archive.sha256sum] = "0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f"
+
+BBCLASSEXTEND = "native"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxmu_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxmu_1.0.3.bb
new file mode 100644
index 0000000..b5bc535
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxmu_1.0.3.bb
@@ -0,0 +1,17 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 miscellaneous utility library"
+DEPENDS += "libxt libxext"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b926b95b811ece3e19cd590db85ee615"
+SRC_URI[archive.sha256sum] = "b56e308e36da8d9cb48433ddb81fd04e26b4f1c695586ac8106ac48a35466d66"
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
+
+XORG_PN = "libXmu"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxmu_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxmu_1.0.4.bb
new file mode 100644
index 0000000..7ebe4c8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxmu_1.0.4.bb
@@ -0,0 +1,17 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 miscellaneous utility library"
+DEPENDS += "libxt libxext"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fb372a5f3ab42b5ba16d7af4d833a0cb"
+SRC_URI[archive.sha256sum] = "f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0"
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
+
+XORG_PN = "libXmu"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxpm_3.5.6.bb b/recipes/obsolete/xorg/xorg-lib/libxpm_3.5.6.bb
new file mode 100644
index 0000000..977f015
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxpm_3.5.6.bb
@@ -0,0 +1,16 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Pixmap library"
+LICENSE = "X-BSD"
+DEPENDS += "libxext libsm libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "37b7d1826c6a02107269632a93b8791f"
+SRC_URI[archive.sha256sum] = "2d5c5242b8417db6aa758e5be387de33385d9960ff21c801af7d6a4730b4fd0d"
+
+PACKAGES =+ "sxpm cxpm"
+
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
+
+XORG_PN = "libXpm"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxpm_3.5.7.bb b/recipes/obsolete/xorg/xorg-lib/libxpm_3.5.7.bb
new file mode 100644
index 0000000..b8ed813
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxpm_3.5.7.bb
@@ -0,0 +1,16 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Pixmap library"
+LICENSE = "X-BSD"
+DEPENDS += "libxext libsm libxt"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "cd15ee542d9f515538b4462a6f79d977"
+SRC_URI[archive.sha256sum] = "64701ae67ce5b0797307b75d8255bec3a0d371d0c50715ea618f5a68bcc92baa"
+
+PACKAGES =+ "sxpm cxpm"
+
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
+
+XORG_PN = "libXpm"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxrandr_1.1.2.bb b/recipes/obsolete/xorg/xorg-lib/libxrandr_1.1.2.bb
new file mode 100644
index 0000000..4fb614c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxrandr_1.1.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Resize and Rotate extension library."
+LICENSE = "BSD-X"
+DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "962946952a01650bb43206043a3c0e12"
+SRC_URI[archive.sha256sum] = "ba5adedc37da835a5c9e5a5d457dce13feead64fc364bc4719c41720ca0a3c50"
+
+BBCLASSEXTEND = "nativesdk"
+
+XORG_PN = "libXrandr"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.2.bb b/recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.2.bb
new file mode 100644
index 0000000..2038f8a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Resize and Rotate extension library"
+LICENSE = "BSD-X"
+DEPENDS += "randrproto libxrender libxext"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "1b244b5d19f0ccab01d7083436cd3558"
+SRC_URI[archive.sha256sum] = "206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98"
+
+BBCLASSEXTEND = "nativesdk"
+
+XORG_PN = "libXrandr"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.3.bb b/recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.3.bb
new file mode 100644
index 0000000..22ab29d
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxrandr_1.2.3.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Resize and Rotate extension library"
+LICENSE = "BSD-X"
+DEPENDS += "randrproto libxrender libxext"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5cd67cc02a50c9644ba0a1846ea3b08e"
+SRC_URI[archive.sha256sum] = "f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267"
+
+BBCLASSEXTEND = "nativesdk"
+
+XORG_PN = "libXrandr"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.2.bb b/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.2.bb
new file mode 100644
index 0000000..c67495a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Rendering Extension client library"
+LICENSE = "BSD-X"
+DEPENDS += "virtual/libx11 renderproto xproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2f1b2c6e8dcbcb6d760e59f445abd92c"
+SRC_URI[archive.sha256sum] = "0f749183ab1a0ece14d33c3299b3f70893122349c0bfa9d7bd0e66ce19d1802a"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXrender"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.3.bb b/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.3.bb
new file mode 100644
index 0000000..82b0143
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.3.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Rendering Extension client library"
+LICENSE = "BSD-X"
+DEPENDS += "virtual/libx11 renderproto xproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "307132fce2e551ad2c641bddf8480f16"
+SRC_URI[archive.sha256sum] = "9882ba2d74e9ca5cfd0c2231ac8eba14d8fc59d538c787fa639f8d77c996bbef"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXrender"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.4.bb b/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.4.bb
new file mode 100644
index 0000000..4543a9e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxrender_0.9.4.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Rendering Extension client library"
+LICENSE = "BSD-X"
+DEPENDS += "virtual/libx11 renderproto xproto libxdmcp"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "dc266e850c51368f964e0d67bf5fb5e6"
+SRC_URI[archive.sha256sum] = "5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec"
+
+BBCLASSEXTEND = "native nativesdk"
+
+XORG_PN = "libXrender"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxres_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxres_1.0.3.bb
new file mode 100644
index 0000000..9a1aa01
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxres_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Resource extension library"
+DEPENDS += "libxext resourceproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "de66ffb657aba64c9d6dbdeabb757f3e"
+SRC_URI[archive.sha256sum] = "a6d5ba7573f5ec0f091095f01b51d1e671dd0f14acb5b8559cdf366e398a0230"
+
+XORG_PN = "libXres"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.2.bb b/recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.2.bb
new file mode 100644
index 0000000..db164d2
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.2.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Screen Saver extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext scrnsaverproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "ac2d697dd02f51e5c15f7104f4be5328"
+SRC_URI[archive.sha256sum] = "6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67"
+
+RREPLACES_${PN} = "libxss"
+
+XORG_PN = "libXScrnSaver"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.3.bb b/recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.3.bb
new file mode 100644
index 0000000..2cc2c81
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxscrnsaver_1.1.3.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Screen Saver extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext scrnsaverproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "93f84b6797f2f29cae1ce23b0355d00d"
+SRC_URI[archive.sha256sum] = "4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988"
+
+RREPLACES_${PN} = "libxss"
+
+XORG_PN = "libXScrnSaver"
--git a/recipes/obsolete/xorg/xorg-lib/libxt/pr10970-header-fix.patch b/recipes/obsolete/xorg/xorg-lib/libxt/pr10970-header-fix.patch
new file mode 100644
index 0000000..2acafb8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxt/pr10970-header-fix.patch
@@ -0,0 +1,512 @@
+diff --git a/include/X11/CallbackI.h b/include/X11/CallbackI.h
+index 4ae08ab..64e8152 100644
+--- a/include/X11/CallbackI.h
++++ b/include/X11/CallbackI.h
+@@ -58,6 +58,8 @@ typedef XrmResource **CallbackTable;
+ #define _XtCBCalling 1
+ #define _XtCBFreeAfterCalling 2
+
++_XFUNCPROTOBEGIN
++
+ typedef struct internalCallbackRec {
+ unsigned short count;
+ char is_padded; /* contains NULL padding for external form */
+@@ -115,3 +117,5 @@ extern void _XtCallConditionalCallbackList(
+ XtPointer /* call_data */,
+ _XtConditionProc /* cond_proc */
+ );
++
++_XFUNCPROTOEND
+diff --git a/include/X11/CompositeP.h b/include/X11/CompositeP.h
+index ed055b2..e93275a 100644
+--- a/include/X11/CompositeP.h
++++ b/include/X11/CompositeP.h
+@@ -52,6 +52,8 @@ SOFTWARE.
+
+ #include <X11/Composite.h>
+
++_XFUNCPROTOBEGIN
++
+ /************************************************************************
+ *
+ * Additional instance fields for widgets of (sub)class 'Composite'
+@@ -101,6 +103,8 @@ typedef struct _CompositeClassRec {
+
+ externalref CompositeClassRec compositeClassRec;
+
++_XFUNCPROTOEND
++
+ #define XtCompositeExtensionVersion 2L
+ #define XtInheritGeometryManager ((XtGeometryHandler) _XtInherit)
+ #define XtInheritChangeManaged ((XtWidgetProc) _XtInherit)
+diff --git a/include/X11/ConstrainP.h b/include/X11/ConstrainP.h
+index a90d19a..7030a34 100644
+--- a/include/X11/ConstrainP.h
++++ b/include/X11/ConstrainP.h
+@@ -52,6 +52,8 @@ SOFTWARE.
+
+ #include <X11/Constraint.h>
+
++_XFUNCPROTOBEGIN
++
+ typedef struct _ConstraintPart {
+ XtPointer mumble; /* No new fields, keep C compiler happy */
+ } ConstraintPart;
+@@ -88,6 +90,8 @@ typedef struct _ConstraintClassRec {
+
+ externalref ConstraintClassRec constraintClassRec;
+
++_XFUNCPROTOEND
++
+ #define XtConstraintExtensionVersion 1L
+
+ #endif /* _XtConstraintP_h */
+diff --git a/include/X11/Constraint.h b/include/X11/Constraint.h
+index 9bb962e..b8bd902 100644
+--- a/include/X11/Constraint.h
++++ b/include/X11/Constraint.h
+@@ -50,11 +50,15 @@ SOFTWARE.
+ #ifndef _XtConstraint_h
+ #define _XtConstraint_h
+
++_XFUNCPROTOBEGIN
++
+ typedef struct _ConstraintClassRec *ConstraintWidgetClass;
+
+ #ifndef CONSTRAINT
+ externalref WidgetClass constraintWidgetClass;
+ #endif
+
++_XFUNCPROTOEND
++
+ #endif /* _XtConstraint_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/ConvertI.h b/include/X11/ConvertI.h
+index 02c0e5c..f3f7fb0 100644
+--- a/include/X11/ConvertI.h
++++ b/include/X11/ConvertI.h
+@@ -48,6 +48,8 @@ SOFTWARE.
+ ******************************************************************/
+ /* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */
+
++_XFUNCPROTOBEGIN
++
+ /* Representation types */
+
+ extern XrmQuark _XtQString;
+@@ -94,3 +96,4 @@ extern Boolean _XtConvert(
+
+ void _XtConvertInitialize(void);
+
++_XFUNCPROTOEND
+diff --git a/include/X11/Core.h b/include/X11/Core.h
+index ff6cb75..e1a7c28 100644
+--- a/include/X11/Core.h
++++ b/include/X11/Core.h
+@@ -53,6 +53,8 @@ SOFTWARE.
+ #ifndef _XtCore_h
+ #define _XtCore_h
+
++_XFUNCPROTOBEGIN
++
+ typedef struct _WidgetClassRec *CoreWidgetClass;
+ typedef struct _WidgetRec *CoreWidget;
+ externalref WidgetClass coreWidgetClass;
+@@ -62,5 +64,7 @@ externalref WidgetClass widgetClass;
+
+ #endif
+
++_XFUNCPROTOEND
++
+ #endif /* _XtCore_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/CoreP.h b/include/X11/CoreP.h
+index e07f085..57836e6 100644
+--- a/include/X11/CoreP.h
++++ b/include/X11/CoreP.h
+@@ -55,6 +55,8 @@ SOFTWARE.
+
+ #include <X11/Core.h>
+
++_XFUNCPROTOBEGIN
++
+ externalref int _XtInheritTranslations;
+
+ #define XtInheritTranslations ((String) &_XtInheritTranslations)
+@@ -167,5 +169,7 @@ typedef struct _WidgetClassRec {
+ externalref WidgetClassRec widgetClassRec;
+ #define coreClassRec widgetClassRec
+
++_XFUNCPROTOEND
++
+ #endif /* _XtCoreP_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/CreateI.h b/include/X11/CreateI.h
+index 87abb1d..e0ca9a3 100644
+--- a/include/X11/CreateI.h
++++ b/include/X11/CreateI.h
+@@ -3,6 +3,8 @@
+ #ifndef _XtcreateI_h
+ #define _XtcreateI_h
+
++_XFUNCPROTOBEGIN
++
+ extern Widget _XtCreateWidget(String name, WidgetClass widget_class,
+ Widget parent, ArgList args, Cardinal num_args,
+ XtTypedArgList typed_args,
+@@ -18,9 +20,12 @@ extern Widget _XtAppCreateShell(String name, String class,
+ Cardinal num_typed_args);
+ extern Widget _XtCreateHookObj(Screen *screen);
+
++_XFUNCPROTOEND
+
+ #include <stdarg.h>
+
++_XFUNCPROTOBEGIN
++
+ /* VarCreate.c */
+ extern Widget _XtVaOpenApplication(XtAppContext *app_context_return,
+ _Xconst char* application_class,
+@@ -34,4 +39,6 @@ extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,
+ int *argc_in_out, String *argv_in_out,
+ String *fallback_resources, va_list var_args);
+
++_XFUNCPROTOEND
++
+ #endif /* _XtcreateI_h */
+diff --git a/include/X11/EventI.h b/include/X11/EventI.h
+index 00858e7..d2d1d0f 100644
+--- a/include/X11/EventI.h
++++ b/include/X11/EventI.h
+@@ -65,6 +65,8 @@ typedef struct _XtGrabRec *XtGrabList;
+
+ #include "PassivGraI.h"
+
++_XFUNCPROTOBEGIN
++
+ extern void _XtEventInitialize(
+ void
+ );
+@@ -131,4 +133,6 @@ extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr,
+ /* NextEvent.c */
+ extern Boolean XtAppPeekEvent_SkipTimer;
+
++_XFUNCPROTOEND
++
+ #endif /* _Event_h_ */
+diff --git a/include/X11/HookObjI.h b/include/X11/HookObjI.h
+index c9a22a2..c0858c2 100644
+--- a/include/X11/HookObjI.h
++++ b/include/X11/HookObjI.h
+@@ -29,6 +29,8 @@ in this Software without prior written authorization from The Open Group.
+ #ifndef _XtHookObjI_h
+ #define _XtHookObjI_h
+
++_XFUNCPROTOBEGIN
++
+ /* This object is implementation-dependent and private to the library. */
+
+ typedef struct _HookObjRec *HookObject;
+@@ -66,6 +68,8 @@ typedef struct _HookObjClassRec {
+
+ externalref HookObjClassRec hookObjClassRec;
+
++_XFUNCPROTOEND
++
+ #endif /* ifndef _Xt_HookObjI_h */
+
+
+diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h
+index c2fe47c..2ae9b74 100644
+--- a/include/X11/InitialI.h
++++ b/include/X11/InitialI.h
+@@ -84,6 +84,8 @@ SOFTWARE.
+ #include <X11/Xos.h>
+ #include <X11/Xpoll.h>
+
++_XFUNCPROTOBEGIN
++
+ typedef struct _TimerEventRec {
+ struct timeval te_timer_value;
+ struct _TimerEventRec *te_next;
+@@ -426,4 +428,6 @@ extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
+ String *applName, String *displayName,
+ String *language);
+
++_XFUNCPROTOEND
++
+ #endif /* _XtinitialI_h */
+diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h
+index d749867..d88166f 100644
+--- a/include/X11/IntrinsicI.h
++++ b/include/X11/IntrinsicI.h
+@@ -194,6 +194,8 @@ SOFTWARE.
+ #define ERRORDB "/usr/lib/X11/XtErrorDB"
+ #endif
+
++_XFUNCPROTOBEGIN
++
+ extern String XtCXtToolkitError;
+
+ extern void _XtAllocError(
+@@ -257,5 +259,7 @@ extern char* __XtCalloc (
+ #define __XtCalloc XtCalloc
+ #endif
+
++_XFUNCPROTOEND
++
+ #endif /* _XtintrinsicI_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/Object.h b/include/X11/Object.h
+index 96723b1..2c84aaf 100644
+--- a/include/X11/Object.h
++++ b/include/X11/Object.h
+@@ -50,11 +50,16 @@ SOFTWARE.
+ #ifndef _XtObject_h
+ #define _XtObject_h
+
++_XFUNCPROTOBEGIN
++
+ typedef struct _ObjectRec *Object;
+ typedef struct _ObjectClassRec *ObjectClass;
+
+ #ifndef OBJECT
+ externalref WidgetClass objectClass;
+ #endif
++
++_XFUNCPROTOEND
++
+ #endif /* _XtObject_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/ObjectP.h b/include/X11/ObjectP.h
+index a24564e..0f484d2 100644
+--- a/include/X11/ObjectP.h
++++ b/include/X11/ObjectP.h
+@@ -52,6 +52,8 @@ SOFTWARE.
+
+ #include <X11/Object.h>
+
++_XFUNCPROTOBEGIN
++
+ /**********************************************************
+ * Object Instance Data Structures
+ *
+@@ -132,6 +134,8 @@ typedef struct _ObjectClassRec {
+
+ externalref ObjectClassRec objectClassRec;
+
++_XFUNCPROTOEND
++
+ #define XtObjectExtensionVersion 1L
+ #define XtInheritAllocate ((XtAllocateProc) _XtInherit)
+ #define XtInheritDeallocate ((XtDeallocateProc) _XtInherit)
+diff --git a/include/X11/PassivGraI.h b/include/X11/PassivGraI.h
+index 02e2964..10591ac 100644
+--- a/include/X11/PassivGraI.h
++++ b/include/X11/PassivGraI.h
+@@ -60,6 +60,8 @@ in this Software without prior written authorization from The Open Group.
+ #define KEYBOARD TRUE
+ #define POINTER FALSE
+
++_XFUNCPROTOBEGIN
++
+ typedef enum {
+ XtNoServerGrab,
+ XtPassiveServerGrab,
+@@ -183,4 +185,6 @@ extern void _XtClearAncestorCache(
+ Widget /* widget */
+ );
+
++_XFUNCPROTOEND
++
+ #endif /* _PDI_h_ */
+diff --git a/include/X11/RectObj.h b/include/X11/RectObj.h
+index 07615fa..dced5c3 100644
+--- a/include/X11/RectObj.h
++++ b/include/X11/RectObj.h
+@@ -50,11 +50,16 @@ SOFTWARE.
+ #ifndef _XtRect_h
+ #define _XtRect_h
+
++_XFUNCPROTOBEGIN
++
+ typedef struct _RectObjRec *RectObj;
+ typedef struct _RectObjClassRec *RectObjClass;
+
+ #ifndef RECTOBJ
+ externalref WidgetClass rectObjClass;
+ #endif
++
++_XFUNCPROTOEND
++
+ #endif /* _XtRect_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/RectObjP.h b/include/X11/RectObjP.h
+index ca3b8ad..d6ffb78 100644
+--- a/include/X11/RectObjP.h
++++ b/include/X11/RectObjP.h
+@@ -53,6 +53,8 @@ SOFTWARE.
+ #include <X11/RectObj.h>
+ #include <X11/ObjectP.h>
+
++_XFUNCPROTOBEGIN
++
+ /**********************************************************
+ * Rectangle Object Instance Data Structures
+ *
+@@ -126,4 +128,6 @@ typedef struct _RectObjClassRec {
+
+ externalref RectObjClassRec rectObjClassRec;
+
++_XFUNCPROTOEND
++
+ #endif /*_Xt_RectObjP_h_*/
+diff --git a/include/X11/ResourceI.h b/include/X11/ResourceI.h
+index d6ed1df..3db97f8 100644
+--- a/include/X11/ResourceI.h
++++ b/include/X11/ResourceI.h
+@@ -61,6 +61,8 @@ SOFTWARE.
+ #define StringToName(string) XrmStringToName(string)
+ #define StringToClass(string) XrmStringToClass(string)
+
++_XFUNCPROTOBEGIN
++
+ extern void _XtDependencies(
+ XtResourceList * /* class_resp */,
+ Cardinal * /* class_num_resp */,
+@@ -96,5 +98,6 @@ extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources,
+ Cardinal num_resources);
+ extern void _XtResourceListInitialize(void);
+
++_XFUNCPROTOEND
+
+ #endif /* _XtresourceI_h */
+diff --git a/include/X11/ShellP.h b/include/X11/ShellP.h
+index 2b08c3f..7297d33 100644
+--- a/include/X11/ShellP.h
++++ b/include/X11/ShellP.h
+@@ -67,6 +67,8 @@ SOFTWARE.
+ * *****
+ */
+
++_XFUNCPROTOBEGIN
++
+ /***********************************************************************
+ *
+ * Shell Widget Private Data
+@@ -214,8 +216,12 @@ typedef struct {
+ WMShellPart wm;
+ } WMShellRec, *WMShellWidget;
+
++_XFUNCPROTOEND
++
+ #include <X11/VendorP.h>
+
++_XFUNCPROTOBEGIN
++
+ /***********************************************************************
+ *
+ * TransientShell Widget Private Data
+@@ -425,4 +431,6 @@ typedef struct {
+ SessionShellPart session;
+ } SessionShellRec, *SessionShellWidget;
+
++_XFUNCPROTOEND
++
+ #endif /* _XtShellPrivate_h */
+diff --git a/include/X11/ThreadsI.h b/include/X11/ThreadsI.h
+index 1492d77..28cbc98 100644
+--- a/include/X11/ThreadsI.h
++++ b/include/X11/ThreadsI.h
+@@ -81,6 +81,8 @@ typedef void (*ThreadAppRestoreLockProc)(
+ Boolean* /* pushed_thread */
+ );
+
++_XFUNCPROTOBEGIN
++
+ extern void (*_XtProcessLock)(
+ void
+ );
+@@ -93,6 +95,8 @@ extern void (*_XtInitAppLock)(
+ XtAppContext /* app */
+ );
+
++_XFUNCPROTOEND
++
+ #define INIT_APP_LOCK(app) if(_XtInitAppLock) (*_XtInitAppLock)(app)
+ #define FREE_APP_LOCK(app) if(app && app->free_lock)(*app->free_lock)(app)
+
+diff --git a/include/X11/TranslateI.h b/include/X11/TranslateI.h
+index 1224875..6cc3099 100644
+--- a/include/X11/TranslateI.h
++++ b/include/X11/TranslateI.h
+@@ -342,6 +342,8 @@ typedef struct _TMGlobalRec{
+ #endif /* TRACE_TM */
+ }TMGlobalRec;
+
++_XFUNCPROTOBEGIN
++
+ extern TMGlobalRec _XtGlobalTM;
+
+ #define TM_MOD_SEGMENT_SIZE 16
+@@ -604,3 +606,4 @@ extern void _XtUnmergeTranslations(
+ /* TMKey.c */
+ extern void _XtAllocTMContext(XtPerDisplay pd);
+
++_XFUNCPROTOEND
+diff --git a/include/X11/VarargsI.h b/include/X11/VarargsI.h
+index e15404a..76ce9bc 100644
+--- a/include/X11/VarargsI.h
++++ b/include/X11/VarargsI.h
+@@ -34,6 +34,8 @@ in this Software without prior written authorization from The Open Group.
+
+ /* private routines */
+
++_XFUNCPROTOBEGIN
++
+ extern void _XtCountVaList(
+ va_list /*var*/, int* /*total_count*/, int* /*typed_count*/
+ );
+@@ -62,4 +64,6 @@ extern void _XtGetSubresources(
+ Widget /*w*/, XtPointer /*base*/, const char* /*name*/, const char* /*class*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/
+ );
+
++_XFUNCPROTOEND
++
+ #endif /* _VarargsI_h_ */
+diff --git a/include/X11/Vendor.h b/include/X11/Vendor.h
+index 65e7c38..633d17a 100644
+--- a/include/X11/Vendor.h
++++ b/include/X11/Vendor.h
+@@ -65,7 +65,11 @@ SOFTWARE.
+
+ typedef struct _VendorShellClassRec *VendorShellWidgetClass;
+
++_XFUNCPROTOBEGIN
++
+ externalref WidgetClass vendorShellWidgetClass;
+
++_XFUNCPROTOEND
++
+ #endif /* _XtVendor_h */
+ /* DON'T ADD STUFF AFTER THIS #endif */
+diff --git a/include/X11/VendorP.h b/include/X11/VendorP.h
+index 08bf689..e60857d 100644
+--- a/include/X11/VendorP.h
++++ b/include/X11/VendorP.h
+@@ -72,6 +72,8 @@ SOFTWARE.
+
+ /* New fields for the VendorShell widget class record */
+
++_XFUNCPROTOBEGIN
++
+ typedef struct {
+ XtPointer extension; /* pointer to extension record */
+ } VendorShellClassPart;
+@@ -100,4 +102,6 @@ typedef struct {
+ VendorShellPart vendor;
+ } VendorShellRec, *VendorShellWidget;
+
++_XFUNCPROTOEND
++
+ #endif /* _XtVendorPrivate_h */
diff --git a/recipes/obsolete/xorg/xorg-lib/libxt_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxt_1.0.4.bb
new file mode 100644
index 0000000..7dd9863
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxt_1.0.4.bb
@@ -0,0 +1,24 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Toolkit Intrinsics"
+PRIORITY = "optional"
+DEPENDS += " libsm virtual/libx11 xproto kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://pr10970-header-fix.patch"
+SRC_URI[archive.md5sum] = "937735f342c046db239852fec0413f6c"
+SRC_URI[archive.sha256sum] = "ec7088b2ffe8f56c177525283601fb048decaf6f175d9ee5db01e12810a4d345"
+
+EXTRA_OECONF = "--enable-malloc0returnsnull --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 ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+ ) || exit 1
+ oe_runmake
+}
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXt"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxt_1.0.5.bb b/recipes/obsolete/xorg/xorg-lib/libxt_1.0.5.bb
new file mode 100644
index 0000000..7bdf252
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxt_1.0.5.bb
@@ -0,0 +1,23 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 toolkit intrinsics library"
+DEPENDS += "libsm virtual/libx11 kbproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://pr10970-header-fix.patch"
+SRC_URI[archive.md5sum] = "f3bdd67785ace8cd0b23249e9d8c9975"
+SRC_URI[archive.sha256sum] = "43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4"
+
+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
+}
+
+BBCLASSEXTEND = "native"
+
+XORG_PN = "libXt"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxtst_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxtst_1.0.2.bb
new file mode 100644
index 0000000..ff87f7c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxtst_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Test Extension: client side library"
+DEPENDS += "libxext recordproto inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "032d5c1d3914fc0224837328c88aef96"
+SRC_URI[archive.sha256sum] = "eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b"
+
+XORG_PN = "libXtst"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxtst_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxtst_1.0.3.bb
new file mode 100644
index 0000000..56dfae5
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxtst_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Test Extension: client side library"
+DEPENDS += "libxext recordproto inputproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "090c1ad04e34982eada5cf3b1a0792fd"
+SRC_URI[archive.sha256sum] = "b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905"
+
+XORG_PN = "libXtst"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxv_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/libxv_1.0.3.bb
new file mode 100644
index 0000000..4f19126
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxv_1.0.3.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Video extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext videoproto"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f1c4109fa804aeaf7188b66c5cdd9f57"
+SRC_URI[archive.sha256sum] = "f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b"
+
+XORG_PN = "libXv"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxv_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxv_1.0.4.bb
new file mode 100644
index 0000000..be5a50c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxv_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Video extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext videoproto"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "723a0275227165383e967a1ca8899b52"
+SRC_URI[archive.sha256sum] = "4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8"
+
+XORG_PN = "libXv"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxvmc/drm.patch b/recipes/obsolete/xorg/xorg-lib/libxvmc/drm.patch
new file mode 100644
index 0000000..d48cdb3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxvmc/drm.patch
@@ -0,0 +1,9 @@
+--- XvMC/hw/via/Makefile.am.old 2005-03-06 11:25:11.000000000 +0000
++++ XvMC/hw/via/Makefile.am 2005-03-06 11:25:22.000000000 +0000
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(XVMC_CFLAGS)
+-libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm
+
+ lib_LTLIBRARIES = libviaXvMC.la
+
diff --git a/recipes/obsolete/xorg/xorg-lib/libxvmc/true.patch b/recipes/obsolete/xorg/xorg-lib/libxvmc/true.patch
new file mode 100644
index 0000000..7059295
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxvmc/true.patch
@@ -0,0 +1,11 @@
+--- XvMC/hw/via/viaXvMC.c.old 2004-10-18 20:54:49.000000000 +0100
++++ XvMC/hw/via/viaXvMC.c 2004-10-18 20:55:03.000000000 +0100
+@@ -43,6 +43,8 @@
+ #include <xf86drm.h>
+ #include <pthread.h>
+ #include "vldXvMC.h"
++
++#define TRUE 1
+
+ #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \
+ (((CARD8 *)(ctx)->sAreaAddress) + \
diff --git a/recipes/obsolete/xorg/xorg-lib/libxvmc/via.patch b/recipes/obsolete/xorg/xorg-lib/libxvmc/via.patch
new file mode 100644
index 0000000..21cdfbd
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxvmc/via.patch
@@ -0,0 +1,23 @@
+--- XvMC/configure.ac.old 2004-09-18 13:16:31.000000000 +0100
++++ XvMC/configure.ac 2004-09-18 13:16:32.000000000 +0100
+@@ -14,4 +14,5 @@
+ AC_OUTPUT([Makefile
+ hw/Makefile
+ hw/i810/Makefile
++ hw/via/Makefile
+ xvmc.pc])
+--- /dev/null 2004-06-13 02:32:19.000000000 +0100
++++ XvMC/hw/via/Makefile.am 2004-09-18 13:16:01.000000000 +0100
+@@ -0,0 +1,7 @@
++AM_CFLAGS = $(XVMC_CFLAGS)
++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
++
++lib_LTLIBRARIES = libviaXvMC.la
++
++libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \
++ viaXvMCPriv.h
+--- XvMC/hw/Makefile.am.old 2004-10-17 22:34:27.000000000 +0100
++++ XvMC/hw/Makefile.am 2004-10-17 22:34:31.000000000 +0100
+@@ -1 +1 @@
+-SUBDIRS = i810
++SUBDIRS = i810 via
diff --git a/recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.4.bb
new file mode 100644
index 0000000..003c5be
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Video Motion Compensation extension library"
+DEPENDS += "libxext libxv videoproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "b54600573daf9d1a29b952e8d35b389e"
+SRC_URI[archive.sha256sum] = "1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb"
+
+XORG_PN = "libXvMC"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.5.bb b/recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.5.bb
new file mode 100644
index 0000000..cdd965a
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxvmc_1.0.5.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X Video Motion Compensation extension library"
+DEPENDS += "libxext libxv videoproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "16c3a11add14979beb7510e44623cac6"
+SRC_URI[archive.sha256sum] = "0644c768d28343af0efe0cb09fc9e0220b8ad755642bb498a3038cee328fde7f"
+
+XORG_PN = "libXvMC"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.1.bb b/recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.1.bb
new file mode 100644
index 0000000..6d51967
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Direct Graphics Access extension library"
+DEPENDS += "libxext xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "5b0e752c71a23e9d1290cad44a7c7c75"
+SRC_URI[archive.sha256sum] = "8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9"
+
+XORG_PN = "libXxf86dga"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.2.bb
new file mode 100644
index 0000000..b311537
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxxf86dga_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 Direct Graphics Access extension library"
+DEPENDS += "libxext xf86dgaproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "6f5f621804ee652b6cc6f2025c517c78"
+SRC_URI[archive.sha256sum] = "59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25"
+
+XORG_PN = "libXxf86dga"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxxf86misc_1.0.1.bb b/recipes/obsolete/xorg/xorg-lib/libxxf86misc_1.0.1.bb
new file mode 100644
index 0000000..91a7123
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxxf86misc_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 XFree86 miscellaneous extension library"
+DEPENDS += "libxext xf86miscproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "7cee0df63903cef7f7a3fb68cdd99eef"
+SRC_URI[archive.sha256sum] = "2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289"
+
+XORG_PN = "libXxf86misc"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.1.bb b/recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.1.bb
new file mode 100644
index 0000000..b13707c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.1.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 XFree86 video mode extension library"
+DEPENDS += "libxext xf86vidmodeproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8de1ca6c55aaad7d8cae19b4f0b3da32"
+SRC_URI[archive.sha256sum] = "e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a"
+
+XORG_PN = "libXxf86vm"
diff --git a/recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.2.bb b/recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.2.bb
new file mode 100644
index 0000000..e693362
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/libxxf86vm_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+DESCRIPTION = "X11 XFree86 video mode extension library"
+DEPENDS += "libxext xf86vidmodeproto"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "304d37bd0a10d9b58aa9b64469ad73e5"
+SRC_URI[archive.sha256sum] = "3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de"
+
+XORG_PN = "libXxf86vm"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
new file mode 100644
index 0000000..25ce7ee
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
@@ -0,0 +1,114 @@
+From c29c9fa826b7112156fd6150b5f1564227935c05 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:27:33 +0300
+Subject: [PATCH 3/6] Generic C implementation of pixman_blt with overlapping support
+
+Uses memcpy/memmove functions to copy pixels, can handle the
+case when both source and destination areas are in the same
+image (this is useful for scrolling).
+
+It is assumed that copying direction is only important when
+using the same image for both source and destination (and
+src_stride == dst_stride). Copying direction is undefined
+for the images with different source and destination stride
+which happen to be in the overlapped areas (but this is an
+unrealistic case anyway).
+---
+ pixman/pixman-general.c | 21 ++++++++++++++++++---
+ pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+), 3 deletions(-)
+
+diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
+index c96a3f9..d71a299 100644
+--- a/pixman/pixman-general.c
++++ b/pixman/pixman-general.c
+@@ -300,9 +300,24 @@ general_blt (pixman_implementation_t *imp,
+ int width,
+ int height)
+ {
+- /* We can't blit unless we have sse2 or mmx */
+-
+- return FALSE;
++ uint8_t *dst_bytes = (uint8_t *)dst_bits;
++ uint8_t *src_bytes = (uint8_t *)src_bits;
++ int bpp;
++
++ if (src_bpp != dst_bpp || src_bpp & 7)
++ return FALSE;
++
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
++ dst_bytes + dst_y * dst_stride + dst_x * bpp,
++ src_stride,
++ dst_stride,
++ width,
++ height);
++ return TRUE;
+ }
+
+ static pixman_bool_t
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index 5000f91..8c5d4fd 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -10,6 +10,7 @@
+
+ #include "pixman.h"
+ #include <time.h>
++#include <string.h>
+ #include <assert.h>
+
+ #include "pixman-compiler.h"
+@@ -794,4 +795,46 @@ void pixman_timer_register (pixman_timer_t *timer);
+
+ #endif /* PIXMAN_TIMERS */
+
++/* a helper function, can blit 8-bit images with src/dst overlapping support */
++static inline void
++pixman_blt_helper (uint8_t *src_bytes,
++ uint8_t *dst_bytes,
++ int src_stride,
++ int dst_stride,
++ int width,
++ int height)
++{
++ /*
++ * The second part of this check is not strictly needed, but it prevents
++ * unnecessary upside-down processing of areas which belong to different
++ * images. Upside-down processing can be slower with fixed-distance-ahead
++ * prefetch and perceived as having more tearing.
++ */
++ if (src_bytes < dst_bytes + width &&
++ src_bytes + src_stride * height > dst_bytes)
++ {
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++ /* Horizontal scrolling to the left needs memmove */
++ if (src_bytes + width > dst_bytes)
++ {
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return;
++ }
++ }
++ while (--height >= 0)
++ {
++ memcpy (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++}
++
+ #endif /* PIXMAN_PRIVATE_H */
+--
+1.6.2.4
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
new file mode 100644
index 0000000..74c7b45
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
@@ -0,0 +1,91 @@
+From 7ca32542c957ff308a6ca7e3715e6552a65ae395 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:47 +0300
+Subject: [PATCH 4/6] Support of overlapping src/dst for pixman_blt_mmx
+
+---
+ pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++---------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
+index 819e3a0..dcccadb 100644
+--- a/pixman/pixman-mmx.c
++++ b/pixman/pixman-mmx.c
+@@ -3002,34 +3002,43 @@ pixman_blt_mmx (uint32_t *src_bits,
+ {
+ uint8_t * src_bytes;
+ uint8_t * dst_bytes;
+- int byte_width;
++ int bpp;
+
+- if (src_bpp != dst_bpp)
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
+- if (src_bpp == 16)
+- {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 2 * width;
+- src_stride *= 2;
+- dst_stride *= 2;
+- }
+- else if (src_bpp == 32)
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
+ {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 4 * width;
+- src_stride *= 4;
+- dst_stride *= 4;
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
+ }
+- else
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+ {
+- return FALSE;
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using MMX */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
+ }
+
+ while (height--)
+@@ -3039,7 +3048,7 @@ pixman_blt_mmx (uint32_t *src_bits,
+ uint8_t *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+- w = byte_width;
++ w = width;
+
+ while (w >= 2 && ((unsigned long)d & 3))
+ {
+--
+1.6.2.4
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
new file mode 100644
index 0000000..3704fbf
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
@@ -0,0 +1,91 @@
+From edc80b41c6480b7c80ec5f7c835c92b2debb3774 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:54 +0300
+Subject: [PATCH 5/6] Support of overlapping src/dst for pixman_blt_sse2
+
+---
+ pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++--------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
+index 78b0ad1..b84636b 100644
+--- a/pixman/pixman-sse2.c
++++ b/pixman/pixman-sse2.c
+@@ -5300,34 +5300,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ {
+ uint8_t * src_bytes;
+ uint8_t * dst_bytes;
+- int byte_width;
++ int bpp;
+
+- if (src_bpp != dst_bpp)
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
+- if (src_bpp == 16)
+- {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 2 * width;
+- src_stride *= 2;
+- dst_stride *= 2;
+- }
+- else if (src_bpp == 32)
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
+ {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 4 * width;
+- src_stride *= 4;
+- dst_stride *= 4;
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
+ }
+- else
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+ {
+- return FALSE;
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using SSE2 */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
+ }
+
+ cache_prefetch ((__m128i*)src_bytes);
+@@ -5340,7 +5349,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ uint8_t *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+- w = byte_width;
++ w = width;
+
+ cache_prefetch_next ((__m128i*)s);
+ cache_prefetch_next ((__m128i*)d);
+--
+1.6.2.4
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
new file mode 100644
index 0000000..7c22483
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
@@ -0,0 +1,94 @@
+From 86870ff530b5e435034bd80207e5758466d96cff Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Wed, 18 Nov 2009 06:08:48 +0200
+Subject: [PATCH 6/6] Support of overlapping src/dst for pixman_blt_neon
+
+---
+ pixman/pixman-arm-neon.c | 63 ++++++++++++++++++++++++++++++++++++++-------
+ 1 files changed, 53 insertions(+), 10 deletions(-)
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 495fda4..c632ff5 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -357,26 +357,66 @@
+ int width,
+ int height)
+ {
+- if (src_bpp != dst_bpp)
++ uint8_t * src_bytes;
++ uint8_t * dst_bytes;
++ int bpp;
++
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
++ {
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
++ }
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
++ {
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using NEON */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
++ }
++
+ switch (src_bpp)
+ {
+ case 16:
+ pixman_composite_src_0565_0565_asm_neon (
+- width, height,
+- (uint16_t *)(((char *) dst_bits) +
+- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
+- (uint16_t *)(((char *) src_bits) +
+- src_y * src_stride * 4 + src_x * 2), src_stride * 2);
++ width >> 1,
++ height,
++ (uint16_t *) dst_bytes,
++ dst_stride >> 1,
++ (uint16_t *) src_bytes,
++ src_stride >> 1);
+ return TRUE;
+ case 32:
+ pixman_composite_src_8888_8888_asm_neon (
+- width, height,
+- (uint32_t *)(((char *) dst_bits) +
+- dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
+- (uint32_t *)(((char *) src_bits) +
+- src_y * src_stride * 4 + src_x * 4), src_stride);
++ width >> 2,
++ height,
++ (uint32_t *) dst_bytes,
++ dst_stride >> 2,
++ (uint32_t *) src_bytes,
++ src_stride >> 2);
+ return TRUE;
+ default:
+ return FALSE;
+--
+1.6.2.4
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/1-composite.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/1-composite.patch
new file mode 100644
index 0000000..31bfa39
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/1-composite.patch
@@ -0,0 +1,161 @@
+From 78652135f48c6a304fc2e75bc0e440b8b2034a4d Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Tue, 23 Feb 2010 23:44:00 +0000
+Subject: ARM: added 'neon_composite_over_n_8888_8888_ca' fast path
+
+This fast path function improves performance of 'firefox-talos-gfx'
+cairo-perf trace.
+
+Benchmark from ARM Cortex-A8 @720MHz
+
+before:
+
+[ # ] backend test min(s) median(s) stddev. count
+[ 0] image firefox-talos-gfx 139.969 141.176 0.35% 6/6
+
+after:
+
+[ # ] backend test min(s) median(s) stddev. count
+[ 0] image firefox-talos-gfx 111.810 112.196 0.23% 6/6
+---
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index 2986884..e90d662 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -1026,6 +1026,111 @@ generate_composite_function \
+
+ /******************************************************************************/
+
++.macro pixman_composite_over_n_8888_8888_ca_process_pixblock_head
++ /*
++ * 'combine_mask_ca' replacement
++ *
++ * input: solid src (n) in {d8, d9, d10, d11}
++ * dest in {d4, d5, d6, d7 }
++ * mask in {d24, d25, d26, d27}
++ * output: updated src in {d0, d1, d2, d3 }
++ * updated mask in {d24, d25, d26, d3 }
++ */
++ vmull.u8 q0, d24, d8
++ vmull.u8 q1, d25, d9
++ vmull.u8 q6, d26, d10
++ vmull.u8 q7, d27, d11
++ vmull.u8 q9, d11, d25
++ vmull.u8 q12, d11, d24
++ vmull.u8 q13, d11, d26
++ vrshr.u16 q8, q0, #8
++ vrshr.u16 q10, q1, #8
++ vrshr.u16 q11, q6, #8
++ vraddhn.u16 d0, q0, q8
++ vraddhn.u16 d1, q1, q10
++ vraddhn.u16 d2, q6, q11
++ vrshr.u16 q11, q12, #8
++ vrshr.u16 q8, q9, #8
++ vrshr.u16 q6, q13, #8
++ vrshr.u16 q10, q7, #8
++ vraddhn.u16 d24, q12, q11
++ vraddhn.u16 d25, q9, q8
++ vraddhn.u16 d26, q13, q6
++ vraddhn.u16 d3, q7, q10
++ /*
++ * 'combine_over_ca' replacement
++ *
++ * output: updated dest in {d28, d29, d30, d31}
++ */
++ vmvn.8 d24, d24
++ vmvn.8 d25, d25
++ vmull.u8 q8, d24, d4
++ vmull.u8 q9, d25, d5
++ vmvn.8 d26, d26
++ vmvn.8 d27, d3
++ vmull.u8 q10, d26, d6
++ vmull.u8 q11, d27, d7
++.endm
++
++.macro pixman_composite_over_n_8888_8888_ca_process_pixblock_tail
++ /* ... continue 'combine_over_ca' replacement */
++ vrshr.u16 q14, q8, #8
++ vrshr.u16 q15, q9, #8
++ vrshr.u16 q6, q10, #8
++ vrshr.u16 q7, q11, #8
++ vraddhn.u16 d28, q14, q8
++ vraddhn.u16 d29, q15, q9
++ vraddhn.u16 d30, q6, q10
++ vraddhn.u16 d31, q7, q11
++ vqadd.u8 q14, q0, q14
++ vqadd.u8 q15, q1, q15
++.endm
++
++.macro pixman_composite_over_n_8888_8888_ca_process_pixblock_tail_head
++ vrshr.u16 q14, q8, #8
++ vrshr.u16 q15, q9, #8
++ vld4.8 {d4, d5, d6, d7}, [DST_R, :128]!
++ vrshr.u16 q6, q10, #8
++ vrshr.u16 q7, q11, #8
++ vraddhn.u16 d28, q14, q8
++ vraddhn.u16 d29, q15, q9
++ vraddhn.u16 d30, q6, q10
++ vraddhn.u16 d31, q7, q11
++ vld4.8 {d24, d25, d26, d27}, [MASK]!
++ vqadd.u8 q14, q0, q14
++ vqadd.u8 q15, q1, q15
++ cache_preload 8, 8
++ pixman_composite_over_n_8888_8888_ca_process_pixblock_head
++ vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
++.endm
++
++.macro pixman_composite_over_n_8888_8888_ca_init
++ add DUMMY, sp, #ARGS_STACK_OFFSET
++ vpush {d8-d15}
++ vld1.32 {d11[0]}, [DUMMY]
++ vdup.8 d8, d11[0]
++ vdup.8 d9, d11[1]
++ vdup.8 d10, d11[2]
++ vdup.8 d11, d11[3]
++.endm
++
++.macro pixman_composite_over_n_8888_8888_ca_cleanup
++ vpop {d8-d15}
++.endm
++
++generate_composite_function \
++ pixman_composite_over_n_8888_8888_ca_asm_neon, 0, 32, 32, \
++ FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \
++ 8, /* number of pixels, processed in a single block */ \
++ 5, /* prefetch distance */ \
++ pixman_composite_over_n_8888_8888_ca_init, \
++ pixman_composite_over_n_8888_8888_ca_cleanup, \
++ pixman_composite_over_n_8888_8888_ca_process_pixblock_head, \
++ pixman_composite_over_n_8888_8888_ca_process_pixblock_tail, \
++ pixman_composite_over_n_8888_8888_ca_process_pixblock_tail_head
++
++/******************************************************************************/
++
+ .macro pixman_composite_add_n_8_8_process_pixblock_head
+ /* expecting source data in {d8, d9, d10, d11} */
+ /* d8 - blue, d9 - green, d10 - red, d11 - alpha */
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 557301e..3f0e18e 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -269,6 +269,7 @@ BIND_SRC_NULL_DST(over_8888_8888, uint32_t, 1, uint32_t, 1)
+
+ BIND_N_MASK_DST(over_n_8_0565, uint8_t, 1, uint16_t, 1)
+ BIND_N_MASK_DST(over_n_8_8888, uint8_t, 1, uint32_t, 1)
++BIND_N_MASK_DST(over_n_8888_8888_ca, uint32_t, 1, uint32_t, 1)
+ BIND_N_MASK_DST(add_n_8_8, uint8_t, 1, uint8_t, 1)
+
+ BIND_SRC_N_DST(over_8888_n_8888, uint32_t, 1, uint32_t, 1)
+@@ -412,6 +413,10 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
+ PIXMAN_STD_FAST_PATH (OVER, solid, null, r5g6b5, neon_composite_over_n_0565),
+ PIXMAN_STD_FAST_PATH (OVER, solid, null, a8r8g8b8, neon_composite_over_n_8888),
+ PIXMAN_STD_FAST_PATH (OVER, solid, null, x8r8g8b8, neon_composite_over_n_8888),
++ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, a8r8g8b8, neon_composite_over_n_8888_8888_ca),
++ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, x8r8g8b8, neon_composite_over_n_8888_8888_ca),
++ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, a8b8g8r8, neon_composite_over_n_8888_8888_ca),
++ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, x8b8g8r8, neon_composite_over_n_8888_8888_ca),
+ PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, a8r8g8b8, neon_composite_over_8888_n_8888),
+ PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, x8r8g8b8, neon_composite_over_8888_n_8888),
+ PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, a8, a8r8g8b8, neon_composite_over_8888_8_8888),
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/2-composite.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/2-composite.patch
new file mode 100644
index 0000000..84d4d9c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/2-composite.patch
@@ -0,0 +1,102 @@
+From 6e0df74dbfca26f92a18d968e1bf410bae134c8a Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Wed, 24 Feb 2010 00:26:57 +0000
+Subject: ARM: added 'neon_composite_src_x888_8888' fast path
+
+This fast path function improves performance of 'gnome-system-monitor'
+cairo-perf trace.
+
+Benchmark from ARM Cortex-A8 @720MHz
+
+before:
+
+[ # ] backend test min(s) median(s) stddev. count
+[ 0] image gnome-system-monitor 68.838 68.899 0.05% 5/6
+
+after:
+
+[ # ] backend test min(s) median(s) stddev. count
+[ 0] image gnome-system-monitor 53.336 53.384 0.09% 6/6
+---
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index e90d662..f2643de 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -947,6 +947,44 @@ generate_composite_function \
+
+ /******************************************************************************/
+
++.macro pixman_composite_src_x888_8888_process_pixblock_head
++ vorr q0, q0, q2
++ vorr q1, q1, q2
++.endm
++
++.macro pixman_composite_src_x888_8888_process_pixblock_tail
++.endm
++
++.macro pixman_composite_src_x888_8888_process_pixblock_tail_head
++ vst1.32 {d0, d1, d2, d3}, [DST_W, :128]!
++ vld1.32 {d0, d1, d2, d3}, [SRC]!
++ vorr q0, q0, q2
++ vorr q1, q1, q2
++ cache_preload 8, 8
++.endm
++
++.macro pixman_composite_src_x888_8888_init
++ vmov.u8 q2, #0xFF
++ vshl.u32 q2, q2, #24
++.endm
++
++generate_composite_function \
++ pixman_composite_src_x888_8888_asm_neon, 32, 0, 32, \
++ FLAG_DST_WRITEONLY, \
++ 8, /* number of pixels, processed in a single block */ \
++ 10, /* prefetch distance */ \
++ pixman_composite_src_x888_8888_init, \
++ default_cleanup, \
++ pixman_composite_src_x888_8888_process_pixblock_head, \
++ pixman_composite_src_x888_8888_process_pixblock_tail, \
++ pixman_composite_src_x888_8888_process_pixblock_tail_head, \
++ 0, /* dst_w_basereg */ \
++ 0, /* dst_r_basereg */ \
++ 0, /* src_basereg */ \
++ 0 /* mask_basereg */
++
++/******************************************************************************/
++
+ .macro pixman_composite_over_n_8_8888_process_pixblock_head
+ /* expecting deinterleaved source data in {d8, d9, d10, d11} */
+ /* d8 - blue, d9 - green, d10 - red, d11 - alpha */
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 3f0e18e..0a7ac31 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -251,6 +251,7 @@ neon_composite_##name (pixman_implementation_t *imp, \
+
+
+ BIND_SRC_NULL_DST(src_8888_8888, uint32_t, 1, uint32_t, 1)
++BIND_SRC_NULL_DST(src_x888_8888, uint32_t, 1, uint32_t, 1)
+ BIND_SRC_NULL_DST(src_0565_0565, uint16_t, 1, uint16_t, 1)
+ BIND_SRC_NULL_DST(src_0888_0888, uint8_t, 3, uint8_t, 3)
+ BIND_SRC_NULL_DST(src_8888_0565, uint32_t, 1, uint16_t, 1)
+@@ -400,6 +401,10 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
+ PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, x8r8g8b8, neon_composite_src_8888_8888),
+ PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, x8b8g8r8, neon_composite_src_8888_8888),
+ PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, x8b8g8r8, neon_composite_src_8888_8888),
++ PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, a8r8g8b8, neon_composite_src_8888_8888),
++ PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, a8b8g8r8, neon_composite_src_8888_8888),
++ PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, a8r8g8b8, neon_composite_src_x888_8888),
++ PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, a8b8g8r8, neon_composite_src_x888_8888),
+ PIXMAN_STD_FAST_PATH (SRC, r8g8b8, null, r8g8b8, neon_composite_src_0888_0888),
+ PIXMAN_STD_FAST_PATH (SRC, b8g8r8, null, x8r8g8b8, neon_composite_src_0888_8888_rev),
+ PIXMAN_STD_FAST_PATH (SRC, b8g8r8, null, r5g6b5, neon_composite_src_0888_0565_rev),
+@@ -430,6 +435,7 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
+ PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, x8r8g8b8, neon_composite_over_8888_8888),
+ PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, a8b8g8r8, neon_composite_over_8888_8888),
+ PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, x8b8g8r8, neon_composite_over_8888_8888),
++ PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, null, a8r8g8b8, neon_composite_src_x888_8888),
+ PIXMAN_STD_FAST_PATH (ADD, solid, a8, a8, neon_composite_add_n_8_8),
+ PIXMAN_STD_FAST_PATH (ADD, a8, a8, a8, neon_composite_add_8_8_8),
+ PIXMAN_STD_FAST_PATH (ADD, a8r8g8b8, a8r8g8b8, a8r8g8b8, neon_composite_add_8888_8888_8888),
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/3-composite.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/3-composite.patch
new file mode 100644
index 0000000..06e40fe
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.17.8/3-composite.patch
@@ -0,0 +1,108 @@
+From 19fc0c4c8d28796f0fbc2c8f47edc130851ae3a5 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Wed, 24 Feb 2010 02:14:45 +0000
+Subject: ARM: added 'neon_composite_over_reverse_n_8888' fast path
+
+This fast path function improves performance of 'poppler' cairo-perf trace.
+
+Benchmark from ARM Cortex-A8 @720MHz
+
+before:
+
+[ # ] backend test min(s) median(s) stddev. count
+[ 0] image poppler 38.986 39.158 0.23% 6/6
+
+after:
+
+[ # ] backend test min(s) median(s) stddev. count
+[ 0] image poppler 24.981 25.136 0.28% 6/6
+---
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index f2643de..eb8cc4c 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -680,6 +680,61 @@ generate_composite_function \
+
+ /******************************************************************************/
+
++.macro pixman_composite_over_reverse_n_8888_process_pixblock_tail_head
++ vrshr.u16 q14, q8, #8
++ PF add PF_X, PF_X, #8
++ PF tst PF_CTL, #0xF
++ vrshr.u16 q15, q9, #8
++ vrshr.u16 q12, q10, #8
++ vrshr.u16 q13, q11, #8
++ PF addne PF_X, PF_X, #8
++ PF subne PF_CTL, PF_CTL, #1
++ vraddhn.u16 d28, q14, q8
++ vraddhn.u16 d29, q15, q9
++ PF cmp PF_X, ORIG_W
++ vraddhn.u16 d30, q12, q10
++ vraddhn.u16 d31, q13, q11
++ vqadd.u8 q14, q0, q14
++ vqadd.u8 q15, q1, q15
++ vld4.8 {d0, d1, d2, d3}, [DST_R, :128]!
++ vmvn.8 d22, d3
++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
++ vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
++ PF subge PF_X, PF_X, ORIG_W
++ vmull.u8 q8, d22, d4
++ PF subges PF_CTL, PF_CTL, #0x10
++ vmull.u8 q9, d22, d5
++ vmull.u8 q10, d22, d6
++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
++ vmull.u8 q11, d22, d7
++.endm
++
++.macro pixman_composite_over_reverse_n_8888_init
++ add DUMMY, sp, #ARGS_STACK_OFFSET
++ vld1.32 {d7[0]}, [DUMMY]
++ vdup.8 d4, d7[0]
++ vdup.8 d5, d7[1]
++ vdup.8 d6, d7[2]
++ vdup.8 d7, d7[3]
++.endm
++
++generate_composite_function \
++ pixman_composite_over_reverse_n_8888_asm_neon, 0, 0, 32, \
++ FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \
++ 8, /* number of pixels, processed in a single block */ \
++ 5, /* prefetch distance */ \
++ pixman_composite_over_reverse_n_8888_init, \
++ default_cleanup, \
++ pixman_composite_over_8888_8888_process_pixblock_head, \
++ pixman_composite_over_8888_8888_process_pixblock_tail, \
++ pixman_composite_over_reverse_n_8888_process_pixblock_tail_head, \
++ 28, /* dst_w_basereg */ \
++ 0, /* dst_r_basereg */ \
++ 4, /* src_basereg */ \
++ 24 /* mask_basereg */
++
++/******************************************************************************/
++
+ .macro pixman_composite_over_n_8_0565_process_pixblock_head
+ /* in */
+ vmull.u8 q0, d24, d8
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 0a7ac31..30c5056 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -264,6 +264,7 @@ BIND_SRC_NULL_DST(add_8888_8888, uint32_t, 1, uint32_t, 1)
+
+ BIND_N_NULL_DST(over_n_0565, uint16_t, 1)
+ BIND_N_NULL_DST(over_n_8888, uint32_t, 1)
++BIND_N_NULL_DST(over_reverse_n_8888, uint32_t, 1)
+
+ BIND_SRC_NULL_DST(over_8888_0565, uint32_t, 1, uint16_t, 1)
+ BIND_SRC_NULL_DST(over_8888_8888, uint32_t, 1, uint32_t, 1)
+@@ -442,6 +443,8 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
+ PIXMAN_STD_FAST_PATH (ADD, a8, null, a8, neon_composite_add_8000_8000),
+ PIXMAN_STD_FAST_PATH (ADD, a8r8g8b8, null, a8r8g8b8, neon_composite_add_8888_8888),
+ PIXMAN_STD_FAST_PATH (ADD, a8b8g8r8, null, a8b8g8r8, neon_composite_add_8888_8888),
++ PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8r8g8b8, neon_composite_over_reverse_n_8888),
++ PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8b8g8r8, neon_composite_over_reverse_n_8888),
+
+ { PIXMAN_OP_NONE },
+ };
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
new file mode 100644
index 0000000..06b07a3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
@@ -0,0 +1,114 @@
+From 5234e3c2c161ed5fc92caa336ae78f89112c7d77 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Tue, 16 Mar 2010 16:55:28 +0100
+Subject: [PATCH 1/5] Generic C implementation of pixman_blt with overlapping support
+
+Uses memcpy/memmove functions to copy pixels, can handle the
+case when both source and destination areas are in the same
+image (this is useful for scrolling).
+
+It is assumed that copying direction is only important when
+using the same image for both source and destination (and
+src_stride == dst_stride). Copying direction is undefined
+for the images with different source and destination stride
+which happen to be in the overlapped areas (but this is an
+unrealistic case anyway).
+---
+ pixman/pixman-general.c | 21 ++++++++++++++++++---
+ pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+), 3 deletions(-)
+
+diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
+index bddf79a..f525744 100644
+--- a/pixman/pixman-general.c
++++ b/pixman/pixman-general.c
+@@ -285,9 +285,24 @@ general_blt (pixman_implementation_t *imp,
+ int width,
+ int height)
+ {
+- /* We can't blit unless we have sse2 or mmx */
+-
+- return FALSE;
++ uint8_t *dst_bytes = (uint8_t *)dst_bits;
++ uint8_t *src_bytes = (uint8_t *)src_bits;
++ int bpp;
++
++ if (src_bpp != dst_bpp || src_bpp & 7)
++ return FALSE;
++
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
++ dst_bytes + dst_y * dst_stride + dst_x * bpp,
++ src_stride,
++ dst_stride,
++ width,
++ height);
++ return TRUE;
+ }
+
+ static pixman_bool_t
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index d5767af..eeb677d 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -10,6 +10,7 @@
+
+ #include "pixman.h"
+ #include <time.h>
++#include <string.h>
+ #include <assert.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -867,4 +868,46 @@ void pixman_timer_register (pixman_timer_t *timer);
+
+ #endif /* PIXMAN_TIMERS */
+
++/* a helper function, can blit 8-bit images with src/dst overlapping support */
++static inline void
++pixman_blt_helper (uint8_t *src_bytes,
++ uint8_t *dst_bytes,
++ int src_stride,
++ int dst_stride,
++ int width,
++ int height)
++{
++ /*
++ * The second part of this check is not strictly needed, but it prevents
++ * unnecessary upside-down processing of areas which belong to different
++ * images. Upside-down processing can be slower with fixed-distance-ahead
++ * prefetch and perceived as having more tearing.
++ */
++ if (src_bytes < dst_bytes + width &&
++ src_bytes + src_stride * height > dst_bytes)
++ {
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++ /* Horizontal scrolling to the left needs memmove */
++ if (src_bytes + width > dst_bytes)
++ {
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return;
++ }
++ }
++ while (--height >= 0)
++ {
++ memcpy (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++}
++
+ #endif /* PIXMAN_PRIVATE_H */
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
new file mode 100644
index 0000000..bf6e58c
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
@@ -0,0 +1,91 @@
+From f607cd0250d398077b0c51201258775e372cb3c3 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:47 +0300
+Subject: [PATCH 2/5] Support of overlapping src/dst for pixman_blt_mmx
+
+---
+ pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++---------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
+index e084e7f..6212b31 100644
+--- a/pixman/pixman-mmx.c
++++ b/pixman/pixman-mmx.c
+@@ -2994,34 +2994,43 @@ pixman_blt_mmx (uint32_t *src_bits,
+ {
+ uint8_t * src_bytes;
+ uint8_t * dst_bytes;
+- int byte_width;
++ int bpp;
+
+- if (src_bpp != dst_bpp)
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
+- if (src_bpp == 16)
+- {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 2 * width;
+- src_stride *= 2;
+- dst_stride *= 2;
+- }
+- else if (src_bpp == 32)
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
+ {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 4 * width;
+- src_stride *= 4;
+- dst_stride *= 4;
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
+ }
+- else
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+ {
+- return FALSE;
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using MMX */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
+ }
+
+ while (height--)
+@@ -3031,7 +3040,7 @@ pixman_blt_mmx (uint32_t *src_bits,
+ uint8_t *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+- w = byte_width;
++ w = width;
+
+ while (w >= 2 && ((unsigned long)d & 3))
+ {
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
new file mode 100644
index 0000000..c1f3b2e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
@@ -0,0 +1,91 @@
+From 45a9a537f94a7feab47bd82171c7d620f0d34e3f Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:54 +0300
+Subject: [PATCH 3/5] Support of overlapping src/dst for pixman_blt_sse2
+
+---
+ pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++--------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
+index 946e7ba..66053ae 100644
+--- a/pixman/pixman-sse2.c
++++ b/pixman/pixman-sse2.c
+@@ -5299,34 +5299,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ {
+ uint8_t * src_bytes;
+ uint8_t * dst_bytes;
+- int byte_width;
++ int bpp;
+
+- if (src_bpp != dst_bpp)
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
+- if (src_bpp == 16)
+- {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 2 * width;
+- src_stride *= 2;
+- dst_stride *= 2;
+- }
+- else if (src_bpp == 32)
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
+ {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 4 * width;
+- src_stride *= 4;
+- dst_stride *= 4;
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
+ }
+- else
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+ {
+- return FALSE;
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using SSE2 */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
+ }
+
+ cache_prefetch ((__m128i*)src_bytes);
+@@ -5339,7 +5348,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ uint8_t *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+- w = byte_width;
++ w = width;
+
+ cache_prefetch_next ((__m128i*)s);
+ cache_prefetch_next ((__m128i*)d);
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
new file mode 100644
index 0000000..c37673e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
@@ -0,0 +1,94 @@
+From 4cf5bfc72a724fb653c48338b93e91dccea238af Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Wed, 18 Nov 2009 06:08:48 +0200
+Subject: [PATCH 4/5] Support of overlapping src/dst for pixman_blt_neon
+
+---
+ pixman/pixman-arm-neon.c | 62 +++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 51 insertions(+), 11 deletions(-)
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 6808b36..7feee1d 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -168,26 +168,66 @@ pixman_blt_neon (uint32_t *src_bits,
+ int width,
+ int height)
+ {
+- if (src_bpp != dst_bpp)
++ uint8_t * src_bytes;
++ uint8_t * dst_bytes;
++ int bpp;
++
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
++ {
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
++ }
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
++ {
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using NEON */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
++ }
++
+ switch (src_bpp)
+ {
+ case 16:
+ pixman_composite_src_0565_0565_asm_neon (
+- width, height,
+- (uint16_t *)(((char *) dst_bits) +
+- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
+- (uint16_t *)(((char *) src_bits) +
+- src_y * src_stride * 4 + src_x * 2), src_stride * 2);
++ width >> 1,
++ height,
++ (uint16_t *) dst_bytes,
++ dst_stride >> 1,
++ (uint16_t *) src_bytes,
++ src_stride >> 1);
+ return TRUE;
+ case 32:
+ pixman_composite_src_8888_8888_asm_neon (
+- width, height,
+- (uint32_t *)(((char *) dst_bits) +
+- dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
+- (uint32_t *)(((char *) src_bits) +
+- src_y * src_stride * 4 + src_x * 4), src_stride);
++ width >> 2,
++ height,
++ (uint32_t *) dst_bytes,
++ dst_stride >> 2,
++ (uint32_t *) src_bytes,
++ src_stride >> 2);
+ return TRUE;
+ default:
+ return FALSE;
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
new file mode 100644
index 0000000..d776574
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
@@ -0,0 +1,169 @@
+From d1410558827fce8aac354274a7150fa915881c50 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 10 Dec 2009 00:51:50 +0200
+Subject: [PATCH 5/5] ARM: added NEON optimizations for fetch/store r5g6b5 scanline
+
+---
+ pixman/pixman-access.c | 23 ++++++++++++++++++++++-
+ pixman/pixman-arm-neon-asm.S | 20 ++++++++++++++++++++
+ pixman/pixman-arm-neon.c | 41 +++++++++++++++++++++++++++++++++++++++++
+ pixman/pixman-private.h | 5 +++++
+ 4 files changed, 88 insertions(+), 1 deletions(-)
+
+diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
+index fa0a267..5bb3e09 100644
+--- a/pixman/pixman-access.c
++++ b/pixman/pixman-access.c
+@@ -2748,7 +2748,7 @@ typedef struct
+ store_scanline_ ## format, store_scanline_generic_64 \
+ }
+
+-static const format_info_t accessors[] =
++static format_info_t accessors[] =
+ {
+ /* 32 bpp formats */
+ FORMAT_INFO (a8r8g8b8),
+@@ -2891,6 +2891,27 @@ _pixman_bits_image_setup_raw_accessors (bits_image_t *image)
+ setup_accessors (image);
+ }
+
++void
++_pixman_bits_override_accessors (pixman_format_code_t format,
++ fetch_scanline_t fetch_func,
++ store_scanline_t store_func)
++{
++ format_info_t *info = accessors;
++
++ while (info->format != PIXMAN_null)
++ {
++ if (info->format == format)
++ {
++ if (fetch_func)
++ info->fetch_scanline_raw_32 = fetch_func;
++ if (store_func)
++ info->store_scanline_raw_32 = store_func;
++ return;
++ }
++ info++;
++ }
++}
++
+ #else
+
+ void
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index 51bc347..f30869e 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -458,6 +458,16 @@ generate_composite_function \
+ pixman_composite_src_8888_0565_process_pixblock_tail, \
+ pixman_composite_src_8888_0565_process_pixblock_tail_head
+
++generate_composite_function_single_scanline \
++ pixman_store_scanline_r5g6b5_asm_neon, 32, 0, 16, \
++ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
++ 8, /* number of pixels, processed in a single block */ \
++ default_init, \
++ default_cleanup, \
++ pixman_composite_src_8888_0565_process_pixblock_head, \
++ pixman_composite_src_8888_0565_process_pixblock_tail, \
++ pixman_composite_src_8888_0565_process_pixblock_tail_head
++
+ /******************************************************************************/
+
+ .macro pixman_composite_src_0565_8888_process_pixblock_head
+@@ -493,6 +503,16 @@ generate_composite_function \
+ pixman_composite_src_0565_8888_process_pixblock_tail, \
+ pixman_composite_src_0565_8888_process_pixblock_tail_head
+
++generate_composite_function_single_scanline \
++ pixman_fetch_scanline_r5g6b5_asm_neon, 16, 0, 32, \
++ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
++ 8, /* number of pixels, processed in a single block */ \
++ default_init, \
++ default_cleanup, \
++ pixman_composite_src_0565_8888_process_pixblock_head, \
++ pixman_composite_src_0565_8888_process_pixblock_tail, \
++ pixman_composite_src_0565_8888_process_pixblock_tail_head
++
+ /******************************************************************************/
+
+ .macro pixman_composite_add_8000_8000_process_pixblock_head
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 7feee1d..fda7a09 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -375,6 +375,43 @@ neon_combine_##name##_u (pixman_implementation_t *imp, \
+ BIND_COMBINE_U (over)
+ BIND_COMBINE_U (add)
+
++void
++pixman_fetch_scanline_r5g6b5_asm_neon (int width,
++ uint32_t *buffer,
++ const uint16_t *pixel);
++void
++pixman_store_scanline_r5g6b5_asm_neon (int width,
++ uint16_t *pixel,
++ const uint32_t *values);
++
++static void
++neon_fetch_scanline_r5g6b5 (pixman_image_t *image,
++ int x,
++ int y,
++ int width,
++ uint32_t * buffer,
++ const uint32_t *mask,
++ uint32_t mask_bits)
++{
++ const uint32_t *bits = image->bits.bits + y * image->bits.rowstride;
++ const uint16_t *pixel = (const uint16_t *)bits + x;
++
++ pixman_fetch_scanline_r5g6b5_asm_neon (width, buffer, pixel);
++}
++
++static void
++neon_store_scanline_r5g6b5 (bits_image_t * image,
++ int x,
++ int y,
++ int width,
++ const uint32_t *values)
++{
++ uint32_t *bits = image->bits + image->rowstride * y;
++ uint16_t *pixel = ((uint16_t *) bits) + x;
++
++ pixman_store_scanline_r5g6b5_asm_neon (width, pixel, values);
++}
++
+ pixman_implementation_t *
+ _pixman_implementation_create_arm_neon (void)
+ {
+@@ -385,6 +422,10 @@ _pixman_implementation_create_arm_neon (void)
+ imp->combine_32[PIXMAN_OP_OVER] = neon_combine_over_u;
+ imp->combine_32[PIXMAN_OP_ADD] = neon_combine_add_u;
+
++ _pixman_bits_override_accessors (PIXMAN_r5g6b5,
++ neon_fetch_scanline_r5g6b5,
++ neon_store_scanline_r5g6b5);
++
+ imp->blt = arm_neon_blt;
+ imp->fill = arm_neon_fill;
+
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index eeb677d..ba2d401 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -220,6 +220,11 @@ void
+ _pixman_bits_image_setup_raw_accessors (bits_image_t *image);
+
+ void
++_pixman_bits_override_accessors (pixman_format_code_t format,
++ fetch_scanline_t fetch_func,
++ store_scanline_t store_func);
++
++void
+ _pixman_image_get_scanline_generic_64 (pixman_image_t *image,
+ int x,
+ int y,
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/565-scanline.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/565-scanline.patch
new file mode 100644
index 0000000..8461a46
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/565-scanline.patch
@@ -0,0 +1,257 @@
+From deef1daf5896062f47fa61b94e1e77c7c0041820 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 04 Dec 2009 16:49:19 +0000
+Subject: A copy-paste version of 16bpp bilinear scanline fetcher
+
+---
+diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
+index 3d78ff0..1656975 100644
+--- a/pixman/pixman-bits-image.c
++++ b/pixman/pixman-bits-image.c
+@@ -535,6 +535,212 @@ bits_image_fetch_bilinear_no_repeat_8888 (pixman_image_t * ima,
+ *buffer++ = 0;
+ }
+
++static void
++bits_image_fetch_bilinear_no_repeat_0565 (pixman_image_t * ima,
++ int offset,
++ int line,
++ int width,
++ uint32_t * buffer,
++ const uint32_t * mask,
++ uint32_t mask_bits)
++{
++ bits_image_t *bits = &ima->bits;
++ pixman_fixed_t x_top, x_bottom, x;
++ pixman_fixed_t ux_top, ux_bottom, ux;
++ pixman_vector_t v;
++ uint32_t top_mask, bottom_mask;
++ uint16_t *top_row;
++ uint16_t *bottom_row;
++ uint32_t *end;
++ uint16_t zero[2] = { 0, 0 };
++ int y, y1, y2;
++ int disty;
++ int mask_inc;
++ int w;
++
++ /* reference point is the center of the pixel */
++ v.vector[0] = pixman_int_to_fixed (offset) + pixman_fixed_1 / 2;
++ v.vector[1] = pixman_int_to_fixed (line) + pixman_fixed_1 / 2;
++ v.vector[2] = pixman_fixed_1;
++
++ if (!pixman_transform_point_3d (bits->common.transform, &v))
++ return;
++
++ ux = ux_top = ux_bottom = bits->common.transform->matrix[0][0];
++ x = x_top = x_bottom = v.vector[0] - pixman_fixed_1/2;
++
++ y = v.vector[1] - pixman_fixed_1/2;
++ disty = (y >> 8) & 0xff;
++
++ /* Load the pointers to the first and second lines from the source
++ * image that bilinear code must read.
++ *
++ * The main trick in this code is about the check if any line are
++ * outside of the image;
++ *
++ * When I realize that a line (any one) is outside, I change
++ * the pointer to a dummy area with zeros. Once I change this, I
++ * must be sure the pointer will not change, so I set the
++ * variables to each pointer increments inside the loop.
++ */
++ y1 = pixman_fixed_to_int (y);
++ y2 = y1 + 1;
++
++ if (y1 < 0 || y1 >= bits->height)
++ {
++ top_row = zero;
++ x_top = 0;
++ ux_top = 0;
++ }
++ else
++ {
++ top_row = bits->bits + y1 * bits->rowstride;
++ x_top = x;
++ ux_top = ux;
++ }
++
++ if (y2 < 0 || y2 >= bits->height)
++ {
++ bottom_row = zero;
++ x_bottom = 0;
++ ux_bottom = 0;
++ }
++ else
++ {
++ bottom_row = bits->bits + y2 * bits->rowstride;
++ x_bottom = x;
++ ux_bottom = ux;
++ }
++
++ /* Instead of checking whether the operation uses the mast in
++ * each loop iteration, verify this only once and prepare the
++ * variables to make the code smaller inside the loop.
++ */
++ if (!mask)
++ {
++ mask_inc = 0;
++ mask_bits = 1;
++ mask = &mask_bits;
++ }
++ else
++ {
++ /* If have a mask, prepare the variables to check it */
++ mask_inc = 1;
++ }
++
++ /* If both are zero, then the whole thing is zero */
++ if (top_row == zero && bottom_row == zero)
++ {
++ memset (buffer, 0, width * sizeof (uint32_t));
++ return;
++ }
++ else
++ {
++ if (top_row == zero)
++ {
++ top_mask = 0;
++ bottom_mask = 0xff000000;
++ }
++ else if (bottom_row == zero)
++ {
++ top_mask = 0xff000000;
++ bottom_mask = 0;
++ }
++ else
++ {
++ top_mask = 0xff000000;
++ bottom_mask = 0xff000000;
++ }
++ }
++
++ end = buffer + width;
++
++ /* Zero fill to the left of the image */
++ while (buffer < end && x < pixman_fixed_minus_1)
++ {
++ *buffer++ = 0;
++ x += ux;
++ x_top += ux_top;
++ x_bottom += ux_bottom;
++ mask += mask_inc;
++ }
++
++ /* Left edge
++ */
++ while (buffer < end && x < 0)
++ {
++ uint32_t tr, br;
++ int32_t distx;
++
++ tr = CONVERT_0565_TO_0888 (top_row[pixman_fixed_to_int (x_top) + 1]) | top_mask;
++ br = CONVERT_0565_TO_0888 (bottom_row[pixman_fixed_to_int (x_bottom) + 1]) | bottom_mask;
++
++ distx = (x >> 8) & 0xff;
++
++ *buffer++ = bilinear_interpolation (0, tr, 0, br, distx, disty);
++
++ x += ux;
++ x_top += ux_top;
++ x_bottom += ux_bottom;
++ mask += mask_inc;
++ }
++
++ /* Main part */
++ w = pixman_int_to_fixed (bits->width - 1);
++
++ while (buffer < end && x < w)
++ {
++ if (*mask)
++ {
++ uint32_t tl, tr, bl, br;
++ int32_t distx;
++
++ tl = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top)]) | top_mask;
++ tr = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top) + 1]) | top_mask;
++ bl = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom)]) | bottom_mask;
++ br = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom) + 1]) | bottom_mask;
++
++ distx = (x >> 8) & 0xff;
++
++ *buffer = bilinear_interpolation (tl, tr, bl, br, distx, disty);
++ }
++
++ buffer++;
++ x += ux;
++ x_top += ux_top;
++ x_bottom += ux_bottom;
++ mask += mask_inc;
++ }
++
++ /* Right Edge */
++ w = pixman_int_to_fixed (bits->width);
++ while (buffer < end && x < w)
++ {
++ if (*mask)
++ {
++ uint32_t tl, bl;
++ int32_t distx;
++
++ tl = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top)]) | top_mask;
++ bl = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom)]) | bottom_mask;
++
++ distx = (x >> 8) & 0xff;
++
++ *buffer = bilinear_interpolation (tl, 0, bl, 0, distx, disty);
++ }
++
++ buffer++;
++ x += ux;
++ x_top += ux_top;
++ x_bottom += ux_bottom;
++ mask += mask_inc;
++ }
++
++ /* Zero fill to the left of the image */
++ while (buffer < end)
++ *buffer++ = 0;
++}
++
+ static force_inline uint32_t
+ bits_image_fetch_pixel_convolution (bits_image_t *image,
+ pixman_fixed_t x,
+@@ -917,14 +1123,26 @@ bits_image_property_changed (pixman_image_t *image)
+ (bits->common.filter == PIXMAN_FILTER_BILINEAR ||
+ bits->common.filter == PIXMAN_FILTER_GOOD ||
+ bits->common.filter == PIXMAN_FILTER_BEST) &&
+- bits->common.repeat == PIXMAN_REPEAT_NONE &&
+- (bits->format == PIXMAN_a8r8g8b8 ||
+- bits->format == PIXMAN_x8r8g8b8))
++ bits->common.repeat == PIXMAN_REPEAT_NONE)
+ {
+ image->common.get_scanline_64 =
+ _pixman_image_get_scanline_generic_64;
+- image->common.get_scanline_32 =
+- bits_image_fetch_bilinear_no_repeat_8888;
++
++ if (bits->format == PIXMAN_a8r8g8b8 || bits->format == PIXMAN_x8r8g8b8)
++ {
++ image->common.get_scanline_32 =
++ bits_image_fetch_bilinear_no_repeat_8888;
++ }
++ else if (bits->format == PIXMAN_r5g6b5)
++ {
++ image->common.get_scanline_32 =
++ bits_image_fetch_bilinear_no_repeat_0565;
++ }
++ else
++ {
++ image->common.get_scanline_32 =
++ bits_image_fetch_transformed;
++ }
+ }
+ else
+ {
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/missing-cache-preload.diff b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
new file mode 100644
index 0000000..475bb35
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
@@ -0,0 +1,28 @@
+From 4f45c7688e6b767a5f7b7f5cced51b4797a3c288 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 21 May 2010 13:31:03 +0000
+Subject: ARM: added missing cache preload
+
+---
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index 51bc347..a99555a 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -388,6 +388,7 @@ generate_composite_function \
+ vld1.16 {d4, d5}, [DST_R, :128]!
+ vst1.16 {d28, d29}, [DST_W, :128]!
+ pixman_composite_over_n_0565_process_pixblock_head
++ cache_preload 8, 8
+ .endm
+
+ .macro pixman_composite_over_n_0565_init
+@@ -660,6 +661,7 @@ generate_composite_function_single_scanline \
+ vld4.8 {d4, d5, d6, d7}, [DST_R, :128]!
+ vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
+ pixman_composite_over_8888_8888_process_pixblock_head
++ cache_preload 8, 8
+ .endm
+
+ .macro pixman_composite_over_n_8888_init
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch b/recipes/obsolete/xorg/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
new file mode 100644
index 0000000..05fe829
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
@@ -0,0 +1,29 @@
+From: Carl Worth <cworth@cworth.org>
+
+Don't copy unused bits to an alpha channel
+
+This bug was identified by cairo's rgb24-ignore-alpha test which
+blends RGB24 over ARGB32 and notices that "alpha" values are
+making it from the source to the destination.
+
+Index: a/pixman/pixman-pict.c
+===================================================================
+--- a/pixman/pixman-pict.c b8b7b767b3ed1fc57ba177c38187e1eb3daf4de8
++++ b/pixman/pixman-pict.c c7d73fc532c2da313041906ac0f48dba1b10d3bc
+@@ -1778,7 +1778,6 @@ pixman_image_composite (pixman_op_t
+ break;
+ case PIXMAN_x8r8g8b8:
+ switch (pDst->bits.format) {
+- case PIXMAN_a8r8g8b8:
+ case PIXMAN_x8r8g8b8:
+ #ifdef USE_MMX
+ if (pixman_have_mmx())
+@@ -1790,7 +1789,6 @@ pixman_image_composite (pixman_op_t
+ }
+ case PIXMAN_x8b8g8r8:
+ switch (pDst->bits.format) {
+- case PIXMAN_a8b8g8r8:
+ case PIXMAN_x8b8g8r8:
+ #ifdef USE_MMX
+ if (pixman_have_mmx())
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/obsolete/xorg/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
new file mode 100644
index 0000000..a2cda24
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
@@ -0,0 +1,114 @@
+From 8ea1a333de202018a862a7b04b94479d3109274b Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Tue, 16 Mar 2010 16:55:28 +0100
+Subject: [PATCH 1/5] Generic C implementation of pixman_blt with overlapping support
+
+Uses memcpy/memmove functions to copy pixels, can handle the
+case when both source and destination areas are in the same
+image (this is useful for scrolling).
+
+It is assumed that copying direction is only important when
+using the same image for both source and destination (and
+src_stride == dst_stride). Copying direction is undefined
+for the images with different source and destination stride
+which happen to be in the overlapped areas (but this is an
+unrealistic case anyway).
+---
+ pixman/pixman-general.c | 21 ++++++++++++++++++---
+ pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+), 3 deletions(-)
+
+diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
+index bddf79a..f525744 100644
+--- a/pixman/pixman-general.c
++++ b/pixman/pixman-general.c
+@@ -285,9 +285,24 @@ general_blt (pixman_implementation_t *imp,
+ int width,
+ int height)
+ {
+- /* We can't blit unless we have sse2 or mmx */
+-
+- return FALSE;
++ uint8_t *dst_bytes = (uint8_t *)dst_bits;
++ uint8_t *src_bytes = (uint8_t *)src_bits;
++ int bpp;
++
++ if (src_bpp != dst_bpp || src_bpp & 7)
++ return FALSE;
++
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
++ dst_bytes + dst_y * dst_stride + dst_x * bpp,
++ src_stride,
++ dst_stride,
++ width,
++ height);
++ return TRUE;
+ }
+
+ static pixman_bool_t
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index d5767af..eeb677d 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -10,6 +10,7 @@
+
+ #include "pixman.h"
+ #include <time.h>
++#include <string.h>
+ #include <assert.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -867,4 +868,46 @@ void pixman_timer_register (pixman_timer_t *timer);
+
+ #endif /* PIXMAN_TIMERS */
+
++/* a helper function, can blit 8-bit images with src/dst overlapping support */
++static inline void
++pixman_blt_helper (uint8_t *src_bytes,
++ uint8_t *dst_bytes,
++ int src_stride,
++ int dst_stride,
++ int width,
++ int height)
++{
++ /*
++ * The second part of this check is not strictly needed, but it prevents
++ * unnecessary upside-down processing of areas which belong to different
++ * images. Upside-down processing can be slower with fixed-distance-ahead
++ * prefetch and perceived as having more tearing.
++ */
++ if (src_bytes < dst_bytes + width &&
++ src_bytes + src_stride * height > dst_bytes)
++ {
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++ /* Horizontal scrolling to the left needs memmove */
++ if (src_bytes + width > dst_bytes)
++ {
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return;
++ }
++ }
++ while (--height >= 0)
++ {
++ memcpy (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++}
++
+ #endif /* PIXMAN_PRIVATE_H */
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/obsolete/xorg/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
new file mode 100644
index 0000000..003337f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
@@ -0,0 +1,91 @@
+From 3170d9f5e927681a2516bcec52b317d1d4785e25 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:47 +0300
+Subject: [PATCH 2/5] Support of overlapping src/dst for pixman_blt_mmx
+
+---
+ pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++---------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
+index e084e7f..6212b31 100644
+--- a/pixman/pixman-mmx.c
++++ b/pixman/pixman-mmx.c
+@@ -2994,34 +2994,43 @@ pixman_blt_mmx (uint32_t *src_bits,
+ {
+ uint8_t * src_bytes;
+ uint8_t * dst_bytes;
+- int byte_width;
++ int bpp;
+
+- if (src_bpp != dst_bpp)
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
+- if (src_bpp == 16)
+- {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 2 * width;
+- src_stride *= 2;
+- dst_stride *= 2;
+- }
+- else if (src_bpp == 32)
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
+ {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 4 * width;
+- src_stride *= 4;
+- dst_stride *= 4;
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
+ }
+- else
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+ {
+- return FALSE;
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using MMX */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
+ }
+
+ while (height--)
+@@ -3031,7 +3040,7 @@ pixman_blt_mmx (uint32_t *src_bits,
+ uint8_t *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+- w = byte_width;
++ w = width;
+
+ while (w >= 2 && ((unsigned long)d & 3))
+ {
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/obsolete/xorg/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
new file mode 100644
index 0000000..7e8f34f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
@@ -0,0 +1,91 @@
+From f07cd58c643b490dcb1ef7be2642926cfeca1e69 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 22 Oct 2009 05:45:54 +0300
+Subject: [PATCH 3/5] Support of overlapping src/dst for pixman_blt_sse2
+
+---
+ pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++--------------------
+ 1 files changed, 32 insertions(+), 23 deletions(-)
+
+diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
+index 946e7ba..66053ae 100644
+--- a/pixman/pixman-sse2.c
++++ b/pixman/pixman-sse2.c
+@@ -5299,34 +5299,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ {
+ uint8_t * src_bytes;
+ uint8_t * dst_bytes;
+- int byte_width;
++ int bpp;
+
+- if (src_bpp != dst_bpp)
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
+- if (src_bpp == 16)
+- {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 2 * width;
+- src_stride *= 2;
+- dst_stride *= 2;
+- }
+- else if (src_bpp == 32)
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
+ {
+- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+- byte_width = 4 * width;
+- src_stride *= 4;
+- dst_stride *= 4;
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
+ }
+- else
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
+ {
+- return FALSE;
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using SSE2 */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
+ }
+
+ cache_prefetch ((__m128i*)src_bytes);
+@@ -5339,7 +5348,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
+ uint8_t *d = dst_bytes;
+ src_bytes += src_stride;
+ dst_bytes += dst_stride;
+- w = byte_width;
++ w = width;
+
+ cache_prefetch_next ((__m128i*)s);
+ cache_prefetch_next ((__m128i*)d);
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/obsolete/xorg/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
new file mode 100644
index 0000000..0ba5b84
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
@@ -0,0 +1,94 @@
+From e0542866c466ad512d69292df098d4b880e35e52 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Wed, 18 Nov 2009 06:08:48 +0200
+Subject: [PATCH 4/5] Support of overlapping src/dst for pixman_blt_neon
+
+---
+ pixman/pixman-arm-neon.c | 62 +++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 51 insertions(+), 11 deletions(-)
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 24ceeeb..134493d 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -360,26 +360,66 @@ pixman_blt_neon (uint32_t *src_bits,
+ int width,
+ int height)
+ {
+- if (src_bpp != dst_bpp)
++ uint8_t * src_bytes;
++ uint8_t * dst_bytes;
++ int bpp;
++
++ if (src_bpp != dst_bpp || src_bpp & 7)
+ return FALSE;
+
++ bpp = src_bpp >> 3;
++ width *= bpp;
++ src_stride *= 4;
++ dst_stride *= 4;
++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
++
++ if (src_bpp != 16 && src_bpp != 32)
++ {
++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
++ width, height);
++ return TRUE;
++ }
++
++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
++ {
++ src_bytes += src_stride * height - src_stride;
++ dst_bytes += dst_stride * height - dst_stride;
++ dst_stride = -dst_stride;
++ src_stride = -src_stride;
++
++ if (src_bytes + width > dst_bytes)
++ {
++ /* TODO: reverse scanline copy using NEON */
++ while (--height >= 0)
++ {
++ memmove (dst_bytes, src_bytes, width);
++ dst_bytes += dst_stride;
++ src_bytes += src_stride;
++ }
++ return TRUE;
++ }
++ }
++
+ switch (src_bpp)
+ {
+ case 16:
+ pixman_composite_src_0565_0565_asm_neon (
+- width, height,
+- (uint16_t *)(((char *) dst_bits) +
+- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
+- (uint16_t *)(((char *) src_bits) +
+- src_y * src_stride * 4 + src_x * 2), src_stride * 2);
++ width >> 1,
++ height,
++ (uint16_t *) dst_bytes,
++ dst_stride >> 1,
++ (uint16_t *) src_bytes,
++ src_stride >> 1);
+ return TRUE;
+ case 32:
+ pixman_composite_src_8888_8888_asm_neon (
+- width, height,
+- (uint32_t *)(((char *) dst_bits) +
+- dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
+- (uint32_t *)(((char *) src_bits) +
+- src_y * src_stride * 4 + src_x * 4), src_stride);
++ width >> 2,
++ height,
++ (uint32_t *) dst_bytes,
++ dst_stride >> 2,
++ (uint32_t *) src_bytes,
++ src_stride >> 2);
+ return TRUE;
+ default:
+ return FALSE;
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch b/recipes/obsolete/xorg/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
new file mode 100644
index 0000000..769ed2e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
@@ -0,0 +1,169 @@
+From d51b10a2750d99543a0c92ca44802aa7a4d70e54 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 10 Dec 2009 00:51:50 +0200
+Subject: [PATCH 5/5] ARM: added NEON optimizations for fetch/store r5g6b5 scanline
+
+---
+ pixman/pixman-access.c | 23 ++++++++++++++++++++++-
+ pixman/pixman-arm-neon-asm.S | 20 ++++++++++++++++++++
+ pixman/pixman-arm-neon.c | 41 +++++++++++++++++++++++++++++++++++++++++
+ pixman/pixman-private.h | 5 +++++
+ 4 files changed, 88 insertions(+), 1 deletions(-)
+
+diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
+index fa0a267..5bb3e09 100644
+--- a/pixman/pixman-access.c
++++ b/pixman/pixman-access.c
+@@ -2748,7 +2748,7 @@ typedef struct
+ store_scanline_ ## format, store_scanline_generic_64 \
+ }
+
+-static const format_info_t accessors[] =
++static format_info_t accessors[] =
+ {
+ /* 32 bpp formats */
+ FORMAT_INFO (a8r8g8b8),
+@@ -2891,6 +2891,27 @@ _pixman_bits_image_setup_raw_accessors (bits_image_t *image)
+ setup_accessors (image);
+ }
+
++void
++_pixman_bits_override_accessors (pixman_format_code_t format,
++ fetch_scanline_t fetch_func,
++ store_scanline_t store_func)
++{
++ format_info_t *info = accessors;
++
++ while (info->format != PIXMAN_null)
++ {
++ if (info->format == format)
++ {
++ if (fetch_func)
++ info->fetch_scanline_raw_32 = fetch_func;
++ if (store_func)
++ info->store_scanline_raw_32 = store_func;
++ return;
++ }
++ info++;
++ }
++}
++
+ #else
+
+ void
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index eb8cc4c..6ab3301 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -454,6 +454,16 @@ generate_composite_function \
+ pixman_composite_src_8888_0565_process_pixblock_tail, \
+ pixman_composite_src_8888_0565_process_pixblock_tail_head
+
++generate_composite_function_single_scanline \
++ pixman_store_scanline_r5g6b5_asm_neon, 32, 0, 16, \
++ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
++ 8, /* number of pixels, processed in a single block */ \
++ default_init, \
++ default_cleanup, \
++ pixman_composite_src_8888_0565_process_pixblock_head, \
++ pixman_composite_src_8888_0565_process_pixblock_tail, \
++ pixman_composite_src_8888_0565_process_pixblock_tail_head
++
+ /******************************************************************************/
+
+ .macro pixman_composite_src_0565_8888_process_pixblock_head
+@@ -489,6 +499,16 @@ generate_composite_function \
+ pixman_composite_src_0565_8888_process_pixblock_tail, \
+ pixman_composite_src_0565_8888_process_pixblock_tail_head
+
++generate_composite_function_single_scanline \
++ pixman_fetch_scanline_r5g6b5_asm_neon, 16, 0, 32, \
++ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
++ 8, /* number of pixels, processed in a single block */ \
++ default_init, \
++ default_cleanup, \
++ pixman_composite_src_0565_8888_process_pixblock_head, \
++ pixman_composite_src_0565_8888_process_pixblock_tail, \
++ pixman_composite_src_0565_8888_process_pixblock_tail_head
++
+ /******************************************************************************/
+
+ .macro pixman_composite_add_8000_8000_process_pixblock_head
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 134493d..2245b52 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -567,6 +567,43 @@ neon_combine_##name##_u (pixman_implementation_t *imp, \
+ BIND_COMBINE_U (over)
+ BIND_COMBINE_U (add)
+
++void
++pixman_fetch_scanline_r5g6b5_asm_neon (int width,
++ uint32_t *buffer,
++ const uint16_t *pixel);
++void
++pixman_store_scanline_r5g6b5_asm_neon (int width,
++ uint16_t *pixel,
++ const uint32_t *values);
++
++static void
++neon_fetch_scanline_r5g6b5 (pixman_image_t *image,
++ int x,
++ int y,
++ int width,
++ uint32_t * buffer,
++ const uint32_t *mask,
++ uint32_t mask_bits)
++{
++ const uint32_t *bits = image->bits.bits + y * image->bits.rowstride;
++ const uint16_t *pixel = (const uint16_t *)bits + x;
++
++ pixman_fetch_scanline_r5g6b5_asm_neon (width, buffer, pixel);
++}
++
++static void
++neon_store_scanline_r5g6b5 (bits_image_t * image,
++ int x,
++ int y,
++ int width,
++ const uint32_t *values)
++{
++ uint32_t *bits = image->bits + image->rowstride * y;
++ uint16_t *pixel = ((uint16_t *) bits) + x;
++
++ pixman_store_scanline_r5g6b5_asm_neon (width, pixel, values);
++}
++
+ pixman_implementation_t *
+ _pixman_implementation_create_arm_neon (void)
+ {
+@@ -577,6 +614,10 @@ _pixman_implementation_create_arm_neon (void)
+ imp->combine_32[PIXMAN_OP_OVER] = neon_combine_over_u;
+ imp->combine_32[PIXMAN_OP_ADD] = neon_combine_add_u;
+
++ _pixman_bits_override_accessors (PIXMAN_r5g6b5,
++ neon_fetch_scanline_r5g6b5,
++ neon_store_scanline_r5g6b5);
++
+ imp->blt = arm_neon_blt;
+ imp->fill = arm_neon_fill;
+
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index eeb677d..ba2d401 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -220,6 +220,11 @@ void
+ _pixman_bits_image_setup_raw_accessors (bits_image_t *image);
+
+ void
++_pixman_bits_override_accessors (pixman_format_code_t format,
++ fetch_scanline_t fetch_func,
++ store_scanline_t store_func);
++
++void
+ _pixman_image_get_scanline_generic_64 (pixman_image_t *image,
+ int x,
+ int y,
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch b/recipes/obsolete/xorg/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch
new file mode 100644
index 0000000..3d8d4e8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch
@@ -0,0 +1,53 @@
+From 7f0adaef68c5b0bb1c5eb9f5db5792b71b8b8beb Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 19 Mar 2010 10:44:09 +0100
+Subject: [PATCH 6/6] Revert "ARM: SIMD: Try without any CFLAGS before forcing -mcpu="
+
+This forces -marm that results in runtime SIGILL on thumb userspace
+
+This reverts commit 18f0de452dc7e12e4cb544d761a626d5c6031663.
+---
+ configure.ac | 20 +++++---------------
+ 1 files changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fc3ee24..f84a4dc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -363,28 +363,18 @@ AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
+
+ dnl ===========================================================================
+ dnl Check for ARM SIMD instructions
+-ARM_SIMD_CFLAGS=""
++ARM_SIMD_CFLAGS="-mcpu=arm1136j-s"
+
+ have_arm_simd=no
+ AC_MSG_CHECKING(whether to use ARM SIMD assembler)
+-# check with default CFLAGS in case the toolchain turns on a sufficiently recent -mcpu=
++xserver_save_CFLAGS=$CFLAGS
++CFLAGS="$ARM_SIMD_CFLAGS $CFLAGS"
+ AC_COMPILE_IFELSE([
+ int main () {
+ asm("uqadd8 r1, r1, r2");
+ return 0;
+-}], have_arm_simd=yes,
+- # check again with an explicit -mcpu= in case the toolchain defaults to an
+- # older one; note that uqadd8 isn't available in Thumb mode on arm1136j-s
+- # so we force ARM mode
+- ARM_SIMD_CFLAGS="-mcpu=arm1136j-s -marm"
+- xserver_save_CFLAGS=$CFLAGS
+- CFLAGS="$ARM_SIMD_CFLAGS $CFLAGS"
+- AC_COMPILE_IFELSE([
+- int main () {
+- asm("uqadd8 r1, r1, r2");
+- return 0;
+- }], have_arm_simd=yes)
+- CFLAGS=$xserver_save_CFLAGS)
++}], have_arm_simd=yes)
++CFLAGS=$xserver_save_CFLAGS
+
+ AC_ARG_ENABLE(arm-simd,
+ [AC_HELP_STRING([--disable-arm-simd],
+--
+1.6.6.1
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/calloc.patch b/recipes/obsolete/xorg/xorg-lib/pixman/calloc.patch
new file mode 100644
index 0000000..4a60d7e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/calloc.patch
@@ -0,0 +1,23 @@
+From 634ba33b5b1fcfd5a0e7910f9991b4ed4f674549 Mon Sep 17 00:00:00 2001
+From: Søren Sandmann Pedersen <ssp@redhat.com>
+Date: Wed, 07 Apr 2010 05:39:14 +0000
+Subject: Fix uninitialized cache when pthreads are used
+
+The thread local cache is allocated with malloc(), but we rely on it
+being initialized to zero, so allocate it with calloc() instead.
+---
+diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
+index a4e3f88..cdac0d8 100644
+--- a/pixman/pixman-compiler.h
++++ b/pixman/pixman-compiler.h
+@@ -101,7 +101,7 @@
+ static type * \
+ tls_ ## name ## _alloc (key) \
+ { \
+- type *value = malloc (sizeof (type)); \
++ type *value = calloc (1, sizeof (type)); \
+ if (value) \
+ pthread_setspecific (key, value); \
+ return value; \
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/nearest-neighbour.patch b/recipes/obsolete/xorg/xorg-lib/pixman/nearest-neighbour.patch
new file mode 100644
index 0000000..29b140f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/nearest-neighbour.patch
@@ -0,0 +1,1040 @@
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 17 Jul 2009 10:22:23 +0000 (+0300)
+Subject: Fastpath for nearest neighbour scaled compositing operations.
+X-Git-Url: http://siarhei.siamashka.name/gitweb/?p=pixman.git;a=commitdiff_plain;h=247531c6978725a88fd3706129b9d3e339026f54
+
+Fastpath for nearest neighbour scaled compositing operations.
+
+OVER 8888x8888, OVER 8888x0565, SRC 8888x8888, SRC 8888x0565
+and SRC 0565x0565 cases are supported.
+---
+
+diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
+index 7f80578..7f3a6ad 100644
+--- a/pixman/pixman-fast-path.c
++++ b/pixman/pixman-fast-path.c
+@@ -1261,6 +1261,993 @@ fast_composite_src_scale_nearest (pixman_implementation_t *imp,
+ }
+ }
+
++/*
++ * Functions, which implement the core inner loops for the nearest neighbour
++ * scaled fastpath compositing operations. The do not need to do clipping
++ * checks, also the loops are unrolled to process two pixels per iteration
++ * for better performance on most CPU architectures (superscalar processors
++ * can issue several operations simultaneously, other processors can hide
++ * instructions latencies by pipelining operations). Unrolling more
++ * does not make much sense because the compiler will start running out
++ * of spare registers soon.
++ */
++
++#undef READ
++#undef WRITE
++#define READ(img,x) (*(x))
++#define WRITE(img,ptr,v) ((*(ptr)) = (v))
++
++#define UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(x, a, y) do { \
++ UN8x4_MUL_UN8_ADD_UN8x4(x, a, y); \
++ x = CONVERT_8888_TO_0565(x); \
++ } while (0)
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x0565 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint16_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t d;
++ uint32_t s1, s2;
++ uint8_t a1, a2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++
++ uint32_t *src;
++ uint16_t *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++
++ if ((y < 0) || (y >= pSrc->bits.height)) {
++ continue;
++ }
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ s2 = READ(pSrc, src + x2);
++
++ a1 = s1 >> 24;
++ a2 = s2 >> 24;
++
++ if (a1 == 0xff)
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ else if (s1) {
++ d = CONVERT_0565_TO_0888(READ(pDst, dst));
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++
++ if (a2 == 0xff)
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
++ else if (s2) {
++ d = CONVERT_0565_TO_0888(READ(pDst, dst));
++ a2 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a2, s2);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ a1 = s1 >> 24;
++ if (a1 == 0xff)
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ else if (s1) {
++ d = CONVERT_0565_TO_0888(READ(pDst, dst));
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x0565 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint16_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t d;
++ uint32_t s1, s2;
++ uint8_t a1, a2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++ int32_t max_vx, max_vy;
++
++ uint32_t *src;
++ uint16_t *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ max_vx = pSrc->bits.width << 16;
++ max_vy = pSrc->bits.height << 16;
++
++ while (orig_vx < 0) orig_vx += max_vx;
++ while (vy < 0) vy += max_vy;
++ while (orig_vx >= max_vx) orig_vx -= max_vx;
++ while (vy >= max_vy) vy -= max_vy;
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++ while (vy >= max_vy) vy -= max_vy;
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s2 = READ(pSrc, src + x2);
++
++ a1 = s1 >> 24;
++ a2 = s2 >> 24;
++
++ if (a1 == 0xff)
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ else if (s1) {
++ d = CONVERT_0565_TO_0888(READ(pDst, dst));
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++
++ if (a2 == 0xff)
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
++ else if (s2) {
++ d = CONVERT_0565_TO_0888(READ(pDst, dst));
++ a2 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a2, s2);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ a1 = s1 >> 24;
++ if (a1 == 0xff)
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ else if (s1) {
++ d = CONVERT_0565_TO_0888(READ(pDst, dst));
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x8888 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint32_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t d;
++ uint32_t s1, s2;
++ uint8_t a1, a2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++
++ uint32_t *src, *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++
++ if ((y < 0) || (y >= pSrc->bits.height)) {
++ continue;
++ }
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ s2 = READ(pSrc, src + x2);
++
++ a1 = s1 >> 24;
++ a2 = s2 >> 24;
++
++ if (a1 == 0xff)
++ WRITE(pDst, dst, s1);
++ else if (s1) {
++ d = READ(pDst, dst);
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++
++ if (a2 == 0xff)
++ WRITE(pDst, dst, s2);
++ else if (s2) {
++ d = READ(pDst, dst);
++ a2 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4(d, a2, s2);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ a1 = s1 >> 24;
++ if (a1 == 0xff)
++ WRITE(pDst, dst, s1);
++ else if (s1) {
++ d = READ(pDst, dst);
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x8888 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint32_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t d;
++ uint32_t s1, s2;
++ uint8_t a1, a2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++ int32_t max_vx, max_vy;
++
++ uint32_t *src, *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ max_vx = pSrc->bits.width << 16;
++ max_vy = pSrc->bits.height << 16;
++
++ while (orig_vx < 0) orig_vx += max_vx;
++ while (vy < 0) vy += max_vy;
++ while (orig_vx >= max_vx) orig_vx -= max_vx;
++ while (vy >= max_vy) vy -= max_vy;
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++ while (vy >= max_vy) vy -= max_vy;
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s2 = READ(pSrc, src + x2);
++
++ a1 = s1 >> 24;
++ a2 = s2 >> 24;
++
++ if (a1 == 0xff)
++ WRITE(pDst, dst, s1);
++ else if (s1) {
++ d = READ(pDst, dst);
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++
++ if (a2 == 0xff)
++ WRITE(pDst, dst, s2);
++ else if (s2) {
++ d = READ(pDst, dst);
++ a2 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4(d, a2, s2);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ a1 = s1 >> 24;
++ if (a1 == 0xff)
++ WRITE(pDst, dst, s1);
++ else if (s1) {
++ d = READ(pDst, dst);
++ a1 ^= 0xff;
++ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
++ WRITE(pDst, dst, d);
++ }
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x8888 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint32_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t s1, s2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++
++ uint32_t *src, *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++
++ if ((y < 0) || (y >= pSrc->bits.height)) {
++ memset(dst, 0, width * sizeof(*dst));
++ continue;
++ }
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ s2 = READ(pSrc, src + x2);
++
++ WRITE(pDst, dst, s1);
++ dst++;
++ WRITE(pDst, dst, s2);
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++ WRITE(pDst, dst, s1);
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x8888 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint32_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t s1, s2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++ int32_t max_vx, max_vy;
++
++ uint32_t *src, *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ max_vx = pSrc->bits.width << 16;
++ max_vy = pSrc->bits.height << 16;
++
++ while (orig_vx < 0) orig_vx += max_vx;
++ while (vy < 0) vy += max_vy;
++ while (orig_vx >= max_vx) orig_vx -= max_vx;
++ while (vy >= max_vy) vy -= max_vy;
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++ while (vy >= max_vy) vy -= max_vy;
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s2 = READ(pSrc, src + x2);
++
++ WRITE(pDst, dst, s1);
++ dst++;
++ WRITE(pDst, dst, s2);
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ WRITE(pDst, dst, s1);
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_0565x0565 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint16_t *dstLine;
++ uint16_t *srcFirstLine;
++ uint16_t s1, s2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++
++ uint16_t *src, *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint16_t, srcStride, srcFirstLine, 1);
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++
++ if ((y < 0) || (y >= pSrc->bits.height)) {
++ memset(dst, 0, width * sizeof(*dst));
++ continue;
++ }
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ s2 = READ(pSrc, src + x2);
++
++ WRITE(pDst, dst, s1);
++ dst++;
++ WRITE(pDst, dst, s2);
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++ WRITE(pDst, dst, s1);
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_0565x0565 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint16_t *dstLine;
++ uint16_t *srcFirstLine;
++ uint16_t s1, s2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++ int32_t max_vx, max_vy;
++
++ uint16_t *src, *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint16_t, srcStride, srcFirstLine, 1);
++
++ max_vx = pSrc->bits.width << 16;
++ max_vy = pSrc->bits.height << 16;
++
++ while (orig_vx < 0) orig_vx += max_vx;
++ while (vy < 0) vy += max_vy;
++ while (orig_vx >= max_vx) orig_vx -= max_vx;
++ while (vy >= max_vy) vy -= max_vy;
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++ while (vy >= max_vy) vy -= max_vy;
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s2 = READ(pSrc, src + x2);
++
++ WRITE(pDst, dst, s1);
++ dst++;
++ WRITE(pDst, dst, s2);
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ WRITE(pDst, dst, s1);
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x0565 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint16_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t s1, s2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++
++ uint32_t *src;
++ uint16_t *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++
++ if ((y < 0) || (y >= pSrc->bits.height)) {
++ memset(dst, 0, width * sizeof(*dst));
++ continue;
++ }
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ s2 = READ(pSrc, src + x2);
++
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ dst++;
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ s1 = READ(pSrc, src + x1);
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ dst++;
++ }
++ }
++}
++
++static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x0565 (
++ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
++ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
++{
++ uint16_t *dstLine;
++ uint32_t *srcFirstLine;
++ uint32_t s1, s2;
++ int w;
++ int x1, x2, y;
++ int32_t orig_vx = vx;
++ int32_t max_vx, max_vy;
++
++ uint32_t *src;
++ uint16_t *dst;
++ int srcStride, dstStride;
++ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
++ * transformed from destination space to source space */
++ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
++
++ max_vx = pSrc->bits.width << 16;
++ max_vy = pSrc->bits.height << 16;
++
++ while (orig_vx < 0) orig_vx += max_vx;
++ while (vy < 0) vy += max_vy;
++ while (orig_vx >= max_vx) orig_vx -= max_vx;
++ while (vy >= max_vy) vy -= max_vy;
++
++ while (--height >= 0)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++
++ y = vy >> 16;
++ vy += unit_y;
++ while (vy >= max_vy) vy -= max_vy;
++
++ src = srcFirstLine + srcStride * y;
++
++ w = width;
++ vx = orig_vx;
++ while ((w -= 2) >= 0)
++ {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ x2 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s2 = READ(pSrc, src + x2);
++
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ dst++;
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
++ dst++;
++ }
++ if (w & 1) {
++ x1 = vx >> 16;
++ vx += unit_x;
++ while (vx >= max_vx) vx -= max_vx;
++ s1 = READ(pSrc, src + x1);
++
++ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
++ dst++;
++ }
++ }
++}
++
++/*
++ * Check if the clipping boundary is crossed on horizontal scaling
++ */
++static inline pixman_bool_t
++fbTransformVerifyHorizontalClipping(pixman_image_t *pict, int width, int32_t vx, int32_t unit_x)
++{
++ while (--width >= 0) {
++ int x = vx >> 16;
++ if ((x < 0) || (x >= pict->bits.width)) return 1;
++ vx += unit_x;
++ }
++ return 0;
++}
++
++/*
++ * Check if the clipping boundary is crossed on vertical scaling
++ */
++static inline pixman_bool_t
++fbTransformVerifyVerticalClipping(pixman_image_t *pict, int height, int32_t vy, int32_t unit_y)
++{
++ while (--height >= 0) {
++ int y = vy >> 16;
++ if ((y < 0) || (y >= pict->bits.height)) return 1;
++ vy += unit_y;
++ }
++ return 0;
++}
++
++/*
++ * Easy case of transform without rotation or complex clipping
++ * Returns 1 in the case if it was able to handle this operation and 0 otherwise
++ */
++static pixman_bool_t
++fbCompositeTransformNonrotatedAffineTrivialclip (
++ pixman_op_t op,
++ pixman_image_t *pSrc,
++ pixman_image_t *pMask,
++ pixman_image_t *pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ pixman_vector_t v, unit;
++ int skipdst_x = 0, skipdst_y = 0;
++
++ /* Handle destination clipping */
++ if (xDst < pDst->common.clip_region.extents.x1) {
++ skipdst_x = pDst->common.clip_region.extents.x1 - xDst;
++ if (skipdst_x >= (int)width)
++ return 1;
++ xDst = pDst->common.clip_region.extents.x1;
++ width -= skipdst_x;
++ }
++
++ if (yDst < pDst->common.clip_region.extents.y1) {
++ skipdst_y = pDst->common.clip_region.extents.y1 - yDst;
++ if (skipdst_y >= (int)height)
++ return 1;
++ yDst = pDst->common.clip_region.extents.y1;
++ height -= skipdst_y;
++ }
++
++ if (xDst >= pDst->common.clip_region.extents.x2 ||
++ yDst >= pDst->common.clip_region.extents.y2)
++ {
++ return 1;
++ }
++
++ if (xDst + width > pDst->common.clip_region.extents.x2)
++ width = pDst->common.clip_region.extents.x2 - xDst;
++ if (yDst + height > pDst->common.clip_region.extents.y2)
++ height = pDst->common.clip_region.extents.y2 - yDst;
++
++ /* reference point is the center of the pixel */
++ v.vector[0] = pixman_int_to_fixed(xSrc) + pixman_fixed_1 / 2;
++ v.vector[1] = pixman_int_to_fixed(ySrc) + pixman_fixed_1 / 2;
++ v.vector[2] = pixman_fixed_1;
++
++ if (!pixman_transform_point_3d (pSrc->common.transform, &v))
++ return 0;
++
++ /* Round down to closest integer, ensuring that 0.5 rounds to 0, not 1 */
++ v.vector[0] -= pixman_fixed_e;
++ v.vector[1] -= pixman_fixed_e;
++
++ unit.vector[0] = pSrc->common.transform->matrix[0][0];
++ unit.vector[1] = pSrc->common.transform->matrix[1][1];
++
++ v.vector[0] += unit.vector[0] * skipdst_x;
++ v.vector[1] += unit.vector[1] * skipdst_y;
++
++ /* Check for possible fixed point arithmetics problems/overflows */
++ if (unit.vector[0] <= 0 || unit.vector[1] <= 0)
++ return 0;
++ if (width == 0 || height == 0)
++ return 0;
++ if ((uint32_t)width + (unit.vector[0] >> 16) >= 0x7FFF)
++ return 0;
++ if ((uint32_t)height + (unit.vector[1] >> 16) >= 0x7FFF)
++ return 0;
++
++ /* Horizontal source clipping is only supported for NORMAL repeat */
++ if (pSrc->common.repeat != PIXMAN_REPEAT_NORMAL
++ && fbTransformVerifyHorizontalClipping(pSrc, width, v.vector[0], unit.vector[0])) {
++ return 0;
++ }
++
++ /* Vertical source clipping is only supported for NONE and NORMAL repeat */
++ if (pSrc->common.repeat != PIXMAN_REPEAT_NONE && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL
++ && fbTransformVerifyVerticalClipping(pSrc, height, v.vector[1], unit.vector[1])) {
++ return 0;
++ }
++
++ if (op == PIXMAN_OP_OVER && pSrc->bits.format == PIXMAN_a8r8g8b8
++ && (pDst->bits.format == PIXMAN_x8r8g8b8 || pDst->bits.format == PIXMAN_a8r8g8b8))
++ {
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x8888(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x8888(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ }
++
++ if (op == PIXMAN_OP_SRC && (pSrc->bits.format == PIXMAN_x8r8g8b8 || pSrc->bits.format == PIXMAN_a8r8g8b8)
++ && (pDst->bits.format == PIXMAN_x8r8g8b8 || pDst->bits.format == pSrc->bits.format))
++ {
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x8888(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x8888(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ }
++
++ if (op == PIXMAN_OP_OVER && pSrc->bits.format == PIXMAN_a8r8g8b8 && pDst->bits.format == PIXMAN_r5g6b5)
++ {
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x0565(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x0565(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ }
++
++ if (op == PIXMAN_OP_SRC && pSrc->bits.format == PIXMAN_r5g6b5 && pDst->bits.format == PIXMAN_r5g6b5)
++ {
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_0565x0565(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_0565x0565(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ }
++
++ if (op == PIXMAN_OP_SRC && (pSrc->bits.format == PIXMAN_x8r8g8b8 || pSrc->bits.format == PIXMAN_a8r8g8b8)
++ && pDst->bits.format == PIXMAN_r5g6b5)
++ {
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x0565(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
++ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x0565(
++ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
++ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
++ return 1;
++ }
++ }
++
++ /* No fastpath scaling implemented for this case */
++ return 0;
++}
++
+ static void
+ fast_path_composite (pixman_implementation_t *imp,
+ pixman_op_t op,
+@@ -1279,6 +2266,30 @@ fast_path_composite (pixman_implementation_t *imp,
+ if (src->type == BITS
+ && src->common.transform
+ && !mask
++ && !src->common.alpha_map && !dest->common.alpha_map
++ && (src->common.filter == PIXMAN_FILTER_NEAREST)
++ && !src->bits.read_func && !src->bits.write_func
++ && !dest->bits.read_func && !dest->bits.write_func)
++ {
++ /* ensure that the transform matrix only has a scale */
++ if (src->common.transform->matrix[0][1] == 0 &&
++ src->common.transform->matrix[1][0] == 0 &&
++ src->common.transform->matrix[2][0] == 0 &&
++ src->common.transform->matrix[2][1] == 0 &&
++ src->common.transform->matrix[2][2] == pixman_fixed_1 &&
++ dest->common.clip_region.data == NULL)
++ {
++ if (fbCompositeTransformNonrotatedAffineTrivialclip (op, src, mask, dest,
++ src_x, src_y, mask_x, mask_y, dest_x, dest_y, width, height))
++ {
++ return;
++ }
++ }
++ }
++
++ if (src->type == BITS
++ && src->common.transform
++ && !mask
+ && op == PIXMAN_OP_SRC
+ && !src->common.alpha_map && !dest->common.alpha_map
+ && (src->common.filter == PIXMAN_FILTER_NEAREST)
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/over-n-8-0565.patch b/recipes/obsolete/xorg/xorg-lib/pixman/over-n-8-0565.patch
new file mode 100644
index 0000000..3911068
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/over-n-8-0565.patch
@@ -0,0 +1,231 @@
+From de2221a32d0b6628116565563f7b4ccd0a44e8b6 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 04 Mar 2010 23:20:25 +0000
+Subject: ARM: added 'armv6_composite_over_n_8_0565' fast path
+
+Provides ~3x performance improvement when working with
+data in L1 cache and memory. This fast path is important
+for fonts rendering when using 16bpp desktop.
+
+Microbenchmark from N800 (ARM11 @ 400MHz), measured in MPix/s:
+
+before:
+
+ over_n_8_0565 = L1: 2.99 M: 2.86
+
+after:
+
+ over_n_8_0565 = L1: 9.07 M: 8.05
+---
+diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
+index 09a2888..c375c01 100644
+--- a/pixman/pixman-arm-simd.c
++++ b/pixman/pixman-arm-simd.c
+@@ -419,6 +419,193 @@ arm_composite_over_n_8_8888 (pixman_implementation_t * impl,
+ }
+ }
+
++#if defined(__ARM_EABI__) && defined(__linux__)
++/*
++ * ARMv6 assembly optimized version of 'composite_over_n_8_0565'. It is
++ * a bare metal 'naked' function which uses all the available CPU registers
++ * and is compatible with ARM EABI. It might (or might not) break when used
++ * with a different ABI, anyway it is better to be safe than sorry.
++ */
++static void __attribute__((naked)) armv6_composite_over_n_8_0565_asm (
++ uint16_t *dst, uint8_t *mask, uint32_t src, int w,
++ int dst_stride_delta, int mask_stride_delta, int h)
++{
++ asm volatile (
++ ".macro composite_internal_armv6_asm opaque_flag\n"
++ /* save all registers (8 words) to stack */
++ "stmdb sp!, {r4-r11, ip, lr}\n"
++ /* some register aliases for better readability */
++ "DST .req r0\n"
++ "MASK .req r1\n"
++ "S .req r2\n"
++ "W .req r3\n"
++ "A .req r8\n"
++ "D .req r10\n"
++ "C0000FF .req r11\n"
++ "C00001F .req r9\n"
++ "C800080 .req ip\n"
++ "CE000E0 .req lr\n"
++ /* precalculate some stuff and put it on stack */
++ "mov r6, #0xF8\n"
++ "mov r7, #0xFC\n"
++
++ "str W, [sp, #-8]!\n"
++
++ ".if \\opaque_flag\n"
++ /* precalculate and save it to stack for later use:
++ * ((src >> 3) & 0x001F) |
++ * ((src >> 5) & 0x07E0) |
++ * ((src >> 8) & 0xF800)
++ */
++ "mov A, #0x1F\n"
++ "and D, A, S, lsr #3\n"
++ "and r4, S, #0xF80000\n"
++ "and r5, S, #0xFC00\n"
++ "orr D, r4, lsr #8\n"
++ "orr D, r5, lsr #5\n"
++ "str D, [sp, #4]\n"
++ ".endif\n"
++
++ "ldr D, [sp, #(8 + 10*4 + 8)]\n" /* h */
++ "ldr A, =0xFF00FF\n"
++ "ldr C800080, =0x800080\n"
++ "ldr CE000E0, =0xE000E0\n"
++ "ldr C0000FF, =0xFF\n"
++ "ldr C00001F, =0x1F\n"
++ "and r4, A, S\n" /* r4 = src & 0x00FF00FF */
++ "and r5, A, S, lsr #8\n" /* r5 = (src >> 8) & 0x00FF00FF */
++ "stmdb sp!, {r4, r5, r6, r7}\n"
++ "0:\n"
++ "subs D, D, #1\n"
++ "blt 6f\n"
++ "1:\n"
++ "subs W, W, #1\n"
++ "blt 5f\n"
++ "2:\n"
++ "ldrb A, [MASK], #1\n"
++ "ldmia sp, {r4, r5, r6, r7}\n" /* load constants from stack */
++ "add DST, DST, #2\n"
++ "cmp A, #0\n"
++ "beq 1b\n"
++
++ ".if \\opaque_flag\n"
++ "cmp A, #0xFF\n"
++ "bne 3f\n"
++ "ldr D, [sp, #(4*4 + 4)]\n" /* load precalculated value */
++ "subs W, #1\n"
++ "strh D, [DST, #-2]\n"
++ "bge 2b\n"
++ ".endif\n"
++
++ "3:\n"
++ "ldrh D, [DST, #-2]\n"
++ "mla r4, A, r4, C800080\n"
++ "mla r5, A, r5, C800080\n"
++ "and r6, r6, D, lsl #3\n" /* & 0xF8 */
++ "and r7, r7, D, lsr #3\n" /* & 0xFC */
++ "and D, D, #0xF800\n"
++ "bic S, r4, #0xFF0000\n"
++ "bic A, r5, #0xFF0000\n"
++ "add r4, r4, S, lsr #8\n"
++ "add r5, r5, A, lsr #8\n"
++
++ "and S, r7, #0xC0\n"
++ "orr r6, r6, D, lsl #8\n"
++ "and D, r6, CE000E0\n"
++ "eor A, C0000FF, r5, lsr #24\n"
++ "orr r6, D, lsr #5\n"
++ "orr r7, S, lsr #6\n"
++
++ "mla r6, A, r6, C800080\n"
++ "mla r7, A, r7, C800080\n"
++ "subs W, #1\n"
++ "bic D, r6, #0xFF0000\n"
++ "bic A, r7, #0xFF0000\n"
++ "add r6, r6, D, lsr #8\n"
++ "uqadd8 r4, r4, r6\n"
++ "add r7, r7, A, lsr #8\n"
++ "uqadd8 r5, r5, r7\n"
++ "and D, C00001F, r4, lsr #11\n"
++ "and r4, r4, #0xF8000000\n"
++ "and r5, r5, #0xFC00\n"
++ "orr D, r4, lsr #16\n"
++ "orr D, r5, lsr #5\n"
++ "strh D, [DST, #-2]\n"
++ "bge 2b\n"
++ "5:\n"
++ "ldr r6, [sp, #(4*4 + 8 + 10*4 + 8)]\n" /* h */
++ "ldr r4, [sp, #(4*4 + 8 + 10*4 + 4)]\n" /* mask stride */
++ "ldr r5, [sp, #(4*4 + 8 + 10*4 + 0)]\n" /* dst stride */
++ "ldr W, [sp, #(4*4)]\n"
++ "subs r6, r6, #1\n" /* h */
++ "str r6, [sp, #(4*4 + 8 + 10*4 + 8)]\n" /* h */
++ "add MASK, MASK, r4\n"
++ "add DST, DST, r5, lsl #1\n"
++ "bgt 1b\n"
++ "6:\n"
++ "add sp, sp, #(4*4 + 8)\n"
++ /* restore all registers and return */
++ "ldmia sp!, {r4-r11, ip, pc}\n"
++ ".unreq DST\n"
++ ".unreq MASK\n"
++ ".unreq S\n"
++ ".unreq W\n"
++ ".unreq A\n"
++ ".unreq D\n"
++ ".unreq C0000FF\n"
++ ".unreq C00001F\n"
++ ".unreq C800080\n"
++ ".unreq CE000E0\n"
++ ".endm\n"
++
++ "mov ip, r2, lsr #24\n"
++ "cmp ip, #0xFF\n"
++ "beq 9f\n"
++ "composite_internal_armv6_asm 0\n"
++ "9:\n"
++ "composite_internal_armv6_asm 1\n"
++ ".ltorg\n"
++ ".purgem composite_internal_armv6_asm\n"
++ );
++}
++
++static void
++armv6_composite_over_n_8_0565 (pixman_implementation_t * impl,
++ pixman_op_t op,
++ pixman_image_t * src_image,
++ pixman_image_t * mask_image,
++ pixman_image_t * dst_image,
++ int32_t src_x,
++ int32_t src_y,
++ int32_t mask_x,
++ int32_t mask_y,
++ int32_t dest_x,
++ int32_t dest_y,
++ int32_t width,
++ int32_t height)
++{
++ uint32_t src;
++ uint16_t *dst;
++ uint8_t *mask;
++ int dst_stride, mask_stride;
++
++ src = _pixman_image_get_solid (src_image, dst_image->bits.format);
++
++ /* bail out if fully transparent */
++ if (src == 0)
++ return;
++
++ PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t,
++ dst_stride, dst, 1);
++ PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t,
++ mask_stride, mask, 1);
++
++ armv6_composite_over_n_8_0565_asm (dst, mask, src, width,
++ dst_stride - width, mask_stride - width, height);
++}
++
++#endif
++
+ static const pixman_fast_path_t arm_simd_fast_paths[] =
+ {
+ PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, a8r8g8b8, arm_composite_over_8888_8888),
+@@ -434,7 +621,10 @@ static const pixman_fast_path_t arm_simd_fast_paths[] =
+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8r8g8b8, arm_composite_over_n_8_8888),
+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, a8b8g8r8, arm_composite_over_n_8_8888),
+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8b8g8r8, arm_composite_over_n_8_8888),
+-
++#if defined(__ARM_EABI__) && defined(__linux__)
++ PIXMAN_STD_FAST_PATH (OVER, solid, a8, r5g6b5, armv6_composite_over_n_8_0565),
++ PIXMAN_STD_FAST_PATH (OVER, solid, a8, b5g6r5, armv6_composite_over_n_8_0565),
++#endif
+ { PIXMAN_OP_NONE },
+ };
+
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/pixman-28986.patch b/recipes/obsolete/xorg/xorg-lib/pixman/pixman-28986.patch
new file mode 100644
index 0000000..f5ba4c3
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/pixman-28986.patch
@@ -0,0 +1,32 @@
+From 7b7860d61fb1526acdf010dd8fd644bbf1396b9e Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 28 Aug 2009 22:34:21 +0300
+Subject: [PATCH] ARM: workaround for gcc bug in vshll_n_u8 intrinsic
+
+Some versions of gcc (cs2009q1, 4.4.1) incorrectly reject
+shift operand having value >= 8, claiming that it is out of
+range. So inline assembly is used as a workaround.
+---
+ pixman/pixman-arm-neon.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 4125d1b..3e7f566 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -64,6 +64,12 @@ unpack0565 (uint16x8_t rgb)
+ return res;
+ }
+
++#ifdef USE_GCC_INLINE_ASM
++/* Some versions of gcc have problems with vshll_n_u8 intrinsic (Bug 23576) */
++#define vshll_n_u8(a, n) ({ uint16x8_t r; \
++ asm ("vshll.u8 %q0, %P1, %2\n" : "=w" (r) : "w" (a), "i" (n)); r; })
++#endif
++
+ static force_inline uint16x8_t
+ pack0565 (uint8x8x4_t s)
+ {
+--
+1.5.4.3
+
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/prefetch.patch b/recipes/obsolete/xorg/xorg-lib/pixman/prefetch.patch
new file mode 100644
index 0000000..c2e856e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/prefetch.patch
@@ -0,0 +1,298 @@
+From d0044bfbd596f22ed1560579ea6537b39f3dc1af Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Thu, 29 Oct 2009 19:06:42 +0000
+Subject: ARM: Don't emit prefetch code if prefetch distance is set to 0
+
+Also it is now possible to disable prefetch globally with
+a configuration macro
+---
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index bca499a..35e6a7e 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -219,33 +219,33 @@
+ vshrn.u16 d7, q2, #3
+ vsli.u16 q2, q2, #5
+ vshll.u8 q14, d16, #8
+- add PF_X, PF_X, #8
++ PF add PF_X, PF_X, #8
+ vshll.u8 q8, d19, #8
+- tst PF_CTL, #0xF
++ PF tst PF_CTL, #0xF
+ vsri.u8 d6, d6, #5
+- addne PF_X, PF_X, #8
++ PF addne PF_X, PF_X, #8
+ vmvn.8 d3, d3
+- subne PF_CTL, PF_CTL, #1
++ PF subne PF_CTL, PF_CTL, #1
+ vsri.u8 d7, d7, #6
+ vshrn.u16 d30, q2, #2
+ vmull.u8 q10, d3, d6
+- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
+ vmull.u8 q11, d3, d7
+ vmull.u8 q12, d3, d30
+- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
+ vsri.u16 q14, q8, #5
+- cmp PF_X, ORIG_W
++ PF cmp PF_X, ORIG_W
+ vshll.u8 q9, d18, #8
+ vrshr.u16 q13, q10, #8
+- subge PF_X, PF_X, ORIG_W
++ PF subge PF_X, PF_X, ORIG_W
+ vrshr.u16 q3, q11, #8
+ vrshr.u16 q15, q12, #8
+- subges PF_CTL, PF_CTL, #0x10
++ PF subges PF_CTL, PF_CTL, #0x10
+ vsri.u16 q14, q9, #11
+- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
+ vraddhn.u16 d20, q10, q13
+ vraddhn.u16 d23, q11, q3
+- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
+ vraddhn.u16 d22, q12, q15
+ vst1.16 {d28, d29}, [DST_W, :128]!
+ .endm
+@@ -323,20 +323,20 @@ generate_composite_function \
+
+ .macro pixman_composite_src_8888_0565_process_pixblock_tail_head
+ vsri.u16 q14, q8, #5
+- add PF_X, PF_X, #8
+- tst PF_CTL, #0xF
++ PF add PF_X, PF_X, #8
++ PF tst PF_CTL, #0xF
+ vld4.8 {d0, d1, d2, d3}, [SRC]!
+- addne PF_X, PF_X, #8
+- subne PF_CTL, PF_CTL, #1
++ PF addne PF_X, PF_X, #8
++ PF subne PF_CTL, PF_CTL, #1
+ vsri.u16 q14, q9, #11
+- cmp PF_X, ORIG_W
+- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
++ PF cmp PF_X, ORIG_W
++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
+ vshll.u8 q8, d1, #8
+ vst1.16 {d28, d29}, [DST_W, :128]!
+- subge PF_X, PF_X, ORIG_W
+- subges PF_CTL, PF_CTL, #0x10
++ PF subge PF_X, PF_X, ORIG_W
++ PF subges PF_CTL, PF_CTL, #0x10
+ vshll.u8 q14, d2, #8
+- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
+ vshll.u8 q9, d0, #8
+ .endm
+
+@@ -363,20 +363,20 @@ generate_composite_function \
+
+ .macro pixman_composite_add_8000_8000_process_pixblock_tail_head
+ vld1.8 {d0, d1, d2, d3}, [SRC]!
+- add PF_X, PF_X, #32
+- tst PF_CTL, #0xF
++ PF add PF_X, PF_X, #32
++ PF tst PF_CTL, #0xF
+ vld1.8 {d4, d5, d6, d7}, [DST_R, :128]!
+- addne PF_X, PF_X, #32
+- subne PF_CTL, PF_CTL, #1
++ PF addne PF_X, PF_X, #32
++ PF subne PF_CTL, PF_CTL, #1
+ vst1.8 {d28, d29, d30, d31}, [DST_W, :128]!
+- cmp PF_X, ORIG_W
+- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
+- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
+- subge PF_X, PF_X, ORIG_W
+- subges PF_CTL, PF_CTL, #0x10
++ PF cmp PF_X, ORIG_W
++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
++ PF subge PF_X, PF_X, ORIG_W
++ PF subges PF_CTL, PF_CTL, #0x10
+ vqadd.u8 q14, q0, q2
+- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
+- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
+ vqadd.u8 q15, q1, q3
+ .endm
+
+@@ -418,32 +418,32 @@ generate_composite_function \
+ .macro pixman_composite_over_8888_8888_process_pixblock_tail_head
+ vld4.8 {d4, d5, d6, d7}, [DST_R, :128]!
+ vrshr.u16 q14, q8, #8
+- add PF_X, PF_X, #8
+- tst PF_CTL, #0xF
++ PF add PF_X, PF_X, #8
++ PF tst PF_CTL, #0xF
+ vrshr.u16 q15, q9, #8
+ vrshr.u16 q12, q10, #8
+ vrshr.u16 q13, q11, #8
+- addne PF_X, PF_X, #8
+- subne PF_CTL, PF_CTL, #1
++ PF addne PF_X, PF_X, #8
++ PF subne PF_CTL, PF_CTL, #1
+ vraddhn.u16 d28, q14, q8
+ vraddhn.u16 d29, q15, q9
+- cmp PF_X, ORIG_W
++ PF cmp PF_X, ORIG_W
+ vraddhn.u16 d30, q12, q10
+ vraddhn.u16 d31, q13, q11
+ vqadd.u8 q14, q0, q14
+ vqadd.u8 q15, q1, q15
+ vld4.8 {d0, d1, d2, d3}, [SRC]!
+- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
+ vmvn.8 d22, d3
+- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
+ vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
+- subge PF_X, PF_X, ORIG_W
++ PF subge PF_X, PF_X, ORIG_W
+ vmull.u8 q8, d22, d4
+- subges PF_CTL, PF_CTL, #0x10
++ PF subges PF_CTL, PF_CTL, #0x10
+ vmull.u8 q9, d22, d5
+- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
+ vmull.u8 q10, d22, d6
+- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
+ vmull.u8 q11, d22, d7
+ .endm
+
+diff --git a/pixman/pixman-arm-neon-asm.h b/pixman/pixman-arm-neon-asm.h
+index d276ab9..a2941ae 100644
+--- a/pixman/pixman-arm-neon-asm.h
++++ b/pixman/pixman-arm-neon-asm.h
+@@ -58,6 +58,11 @@
+ #define RESPECT_STRICT_ALIGNMENT 1
+
+ /*
++ * If set to nonzero value, prefetch is globally disabled
++ */
++#define PREFETCH_GLOBALLY_DISABLED 0
++
++/*
+ * Definitions of supplementary pixld/pixst macros (for partial load/store of
+ * pixel data)
+ */
+@@ -218,37 +223,43 @@
+ * pixels processing like simple copy. Anyway, having prefetch is a must
+ * when working with graphics data.
+ */
++.macro PF a, x:vararg
++.if (ADVANCED_PREFETCH_ENABLED != 0) && (PREFETCH_GLOBALLY_DISABLED == 0)
++ a x
++.endif
++.endm
++
+ .macro cache_preload std_increment, boost_increment
+ .if (src_bpp_shift >= 0) || (dst_r_bpp != 0) || (mask_bpp_shift >= 0)
+ .if regs_shortage
+- ldr ORIG_W, [sp] /* If we are short on regs, ORIG_W is kept on stack */
++ PF ldr ORIG_W, [sp] /* If we are short on regs, ORIG_W is kept on stack */
+ .endif
+ .if std_increment != 0
+- add PF_X, PF_X, #std_increment
++ PF add PF_X, PF_X, #std_increment
+ .endif
+- tst PF_CTL, #0xF
+- addne PF_X, PF_X, #boost_increment
+- subne PF_CTL, PF_CTL, #1
+- cmp PF_X, ORIG_W
++ PF tst PF_CTL, #0xF
++ PF addne PF_X, PF_X, #boost_increment
++ PF subne PF_CTL, PF_CTL, #1
++ PF cmp PF_X, ORIG_W
+ .if src_bpp_shift >= 0
+- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
+ .endif
+ .if dst_r_bpp != 0
+- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
+ .endif
+ .if mask_bpp_shift >= 0
+- pld [PF_MASK, PF_X, lsl #mask_bpp_shift]
++ PF pld, [PF_MASK, PF_X, lsl #mask_bpp_shift]
+ .endif
+- subge PF_X, PF_X, ORIG_W
+- subges PF_CTL, PF_CTL, #0x10
++ PF subge PF_X, PF_X, ORIG_W
++ PF subges PF_CTL, PF_CTL, #0x10
+ .if src_bpp_shift >= 0
+- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
+ .endif
+ .if dst_r_bpp != 0
+- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
+ .endif
+ .if mask_bpp_shift >= 0
+- ldrgeb DUMMY, [PF_MASK, MASK_STRIDE, lsl #mask_bpp_shift]!
++ PF ldrgeb DUMMY, [PF_MASK, MASK_STRIDE, lsl #mask_bpp_shift]!
+ .endif
+ .endif
+ .endm
+@@ -297,6 +308,12 @@ fname:
+ PF_DST .req r12
+ PF_MASK .req r14
+
++.if prefetch_distance == 0
++ .set ADVANCED_PREFETCH_ENABLED, 0
++.else
++ .set ADVANCED_PREFETCH_ENABLED, 1
++.endif
++
+ .if mask_bpp == 0
+ ORIG_W .req r7 /* saved original width */
+ DUMMY .req r8 /* temporary register */
+@@ -374,12 +391,12 @@ fname:
+ ldr MASK_STRIDE, [sp, #52]
+ .endif
+ mov DST_R, DST_W
+- mov PF_SRC, SRC
+- mov PF_DST, DST_R
+- mov PF_MASK, MASK
+- mov PF_CTL, H, lsl #4
+- /* pf_ctl = 10 | ((h - 1) << 4) */
+- add PF_CTL, #(prefetch_distance - 0x10)
++ PF mov PF_SRC, SRC
++ PF mov PF_DST, DST_R
++ PF mov PF_MASK, MASK
++ /* PF_CTL = prefetch_distance | ((h - 1) << 4) */
++ PF mov PF_CTL, H, lsl #4
++ PF add PF_CTL, #(prefetch_distance - 0x10)
+
+ init
+ .if regs_shortage
+@@ -412,7 +429,7 @@ fname:
+ .else
+ add DST_R, DST_R, #lowbit
+ .endif
+- add PF_X, PF_X, #(lowbit * 8 / dst_w_bpp)
++ PF add PF_X, PF_X, #(lowbit * 8 / dst_w_bpp)
+ sub W, W, #(lowbit * 8 / dst_w_bpp)
+ 1:
+ .endif
+@@ -444,7 +461,7 @@ fname:
+ (src_basereg - pixblock_size * src_bpp / 64), SRC
+ pixld pixblock_size, mask_bpp, \
+ (mask_basereg - pixblock_size * mask_bpp / 64), MASK
+- add PF_X, PF_X, #pixblock_size
++ PF add PF_X, PF_X, #pixblock_size
+ process_pixblock_head
+ cache_preload 0, pixblock_size
+ subs W, W, #(pixblock_size * 2)
+@@ -468,7 +485,7 @@ fname:
+ pixld chunk_size, src_bpp, src_basereg, SRC
+ pixld chunk_size, mask_bpp, mask_basereg, MASK
+ pixld_a chunk_size, dst_r_bpp, dst_r_basereg, DST_R
+- add PF_X, PF_X, #chunk_size
++ PF add PF_X, PF_X, #chunk_size
+ 1:
+ .endif
+ .endr
+--
+cgit v0.8.2
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/remove-broken.patch b/recipes/obsolete/xorg/xorg-lib/pixman/remove-broken.patch
new file mode 100644
index 0000000..fd025b4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/remove-broken.patch
@@ -0,0 +1,826 @@
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Sun, 26 Jul 2009 22:21:26 +0000 (+0300)
+Subject: ARM: Removal of unused/broken NEON code
+X-Git-Url: http://siarhei.siamashka.name/gitweb/?p=pixman.git;a=commitdiff_plain;h=7ef2322eefcccc28a2d45c0da22c0fee88b8f464
+
+ARM: Removal of unused/broken NEON code
+---
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+index 4125d1b..9404c70 100644
+--- a/pixman/pixman-arm-neon.c
++++ b/pixman/pixman-arm-neon.c
+@@ -1895,710 +1895,6 @@ pixman_fill_neon (uint32_t *bits,
+ #endif
+ }
+
+-/* TODO: is there a more generic way of doing this being introduced? */
+-#define NEON_SCANLINE_BUFFER_PIXELS (1024)
+-
+-static inline void
+-neon_quadword_copy (void * dst,
+- void * src,
+- uint32_t count, /* of quadwords */
+- uint32_t trailer_count /* of bytes */)
+-{
+- uint8_t *t_dst = dst, *t_src = src;
+-
+- /* Uses aligned multi-register loads to maximise read bandwidth
+- * on uncached memory such as framebuffers
+- * The accesses do not have the aligned qualifiers, so that the copy
+- * may convert between aligned-uncached and unaligned-cached memory.
+- * It is assumed that the CPU can infer alignedness from the address.
+- */
+-
+-#ifdef USE_GCC_INLINE_ASM
+-
+- asm volatile (
+- " cmp %[count], #8 \n"
+- " blt 1f @ skip oversized fragments \n"
+- "0: @ start with eight quadwords at a time \n"
+- " sub %[count], %[count], #8 \n"
+- " vld1.8 {d16, d17, d18, d19}, [%[src]]! \n"
+- " vld1.8 {d20, d21, d22, d23}, [%[src]]! \n"
+- " vld1.8 {d24, d25, d26, d27}, [%[src]]! \n"
+- " vld1.8 {d28, d29, d30, d31}, [%[src]]! \n"
+- " cmp %[count], #8 \n"
+- " vst1.8 {d16, d17, d18, d19}, [%[dst]]! \n"
+- " vst1.8 {d20, d21, d22, d23}, [%[dst]]! \n"
+- " vst1.8 {d24, d25, d26, d27}, [%[dst]]! \n"
+- " vst1.8 {d28, d29, d30, d31}, [%[dst]]! \n"
+- " bge 0b \n"
+- "1: @ four quadwords \n"
+- " tst %[count], #4 \n"
+- " beq 2f @ skip oversized fragment \n"
+- " vld1.8 {d16, d17, d18, d19}, [%[src]]! \n"
+- " vld1.8 {d20, d21, d22, d23}, [%[src]]! \n"
+- " vst1.8 {d16, d17, d18, d19}, [%[dst]]! \n"
+- " vst1.8 {d20, d21, d22, d23}, [%[dst]]! \n"
+- "2: @ two quadwords \n"
+- " tst %[count], #2 \n"
+- " beq 3f @ skip oversized fragment \n"
+- " vld1.8 {d16, d17, d18, d19}, [%[src]]! \n"
+- " vst1.8 {d16, d17, d18, d19}, [%[dst]]! \n"
+- "3: @ one quadword \n"
+- " tst %[count], #1 \n"
+- " beq 4f @ skip oversized fragment \n"
+- " vld1.8 {d16, d17}, [%[src]]! \n"
+- " vst1.8 {d16, d17}, [%[dst]]! \n"
+- "4: @ end \n"
+-
+- /* Clobbered input registers marked as input/outputs */
+- : [dst] "+r" (t_dst), [src] "+r" (t_src), [count] "+r" (count)
+-
+- /* No unclobbered inputs */
+- :
+-
+- /* Clobbered vector registers */
+- : "d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23", "d24", "d25",
+- "d26", "d27", "d28", "d29", "d30", "d31", "cc", "memory");
+-
+-#else
+-
+- while (count >= 8)
+- {
+- uint8x16x4_t t1 = vld4q_u8 (t_src);
+- uint8x16x4_t t2 = vld4q_u8 (t_src + sizeof(uint8x16x4_t));
+-
+- t_src += sizeof(uint8x16x4_t) * 2;
+- vst4q_u8 (t_dst, t1);
+- vst4q_u8 (t_dst + sizeof(uint8x16x4_t), t2);
+- t_dst += sizeof(uint8x16x4_t) * 2;
+- count -= 8;
+- }
+-
+- if (count & 4)
+- {
+- uint8x16x4_t t1 = vld4q_u8 (t_src);
+-
+- t_src += sizeof(uint8x16x4_t);
+- vst4q_u8 (t_dst, t1);
+- t_dst += sizeof(uint8x16x4_t);
+- }
+-
+- if (count & 2)
+- {
+- uint8x8x4_t t1 = vld4_u8 (t_src);
+-
+- t_src += sizeof(uint8x8x4_t);
+- vst4_u8 (t_dst, t1);
+- t_dst += sizeof(uint8x8x4_t);
+- }
+-
+- if (count & 1)
+- {
+- uint8x16_t t1 = vld1q_u8 (t_src);
+-
+- t_src += sizeof(uint8x16_t);
+- vst1q_u8 (t_dst, t1);
+- t_dst += sizeof(uint8x16_t);
+- }
+-
+-#endif /* !USE_GCC_INLINE_ASM */
+-
+- if (trailer_count)
+- {
+- if (trailer_count & 8)
+- {
+- uint8x8_t t1 = vld1_u8 (t_src);
+-
+- t_src += sizeof(uint8x8_t);
+- vst1_u8 (t_dst, t1);
+- t_dst += sizeof(uint8x8_t);
+- }
+-
+- if (trailer_count & 4)
+- {
+- *((uint32_t*) t_dst) = *((uint32_t*) t_src);
+-
+- t_dst += 4;
+- t_src += 4;
+- }
+-
+- if (trailer_count & 2)
+- {
+- *((uint16_t*) t_dst) = *((uint16_t*) t_src);
+-
+- t_dst += 2;
+- t_src += 2;
+- }
+-
+- if (trailer_count & 1)
+- {
+- *t_dst++ = *t_src++;
+- }
+- }
+-}
+-
+-static inline void
+-solid_over_565_8_pix_neon (uint32_t glyph_colour,
+- uint16_t *dest,
+- uint8_t * in_mask,
+- uint32_t dest_stride, /* bytes, not elements */
+- uint32_t mask_stride,
+- uint32_t count /* 8-pixel groups */)
+-{
+- /* Inner loop of glyph blitter (solid colour, alpha mask) */
+-
+-#ifdef USE_GCC_INLINE_ASM
+-
+- asm volatile (
+- " vld4.8 {d20[], d21[], d22[], d23[]}, [%[glyph_colour]] @ splat solid colour components \n"
+- "0: @ loop \n"
+- " vld1.16 {d0, d1}, [%[dest]] @ load first pixels from framebuffer \n"
+- " vld1.8 {d17}, [%[in_mask]] @ load alpha mask of glyph \n"
+- " vmull.u8 q9, d17, d23 @ apply glyph colour alpha to mask \n"
+- " vshrn.u16 d17, q9, #8 @ reformat it to match original mask \n"
+- " vmvn d18, d17 @ we need the inverse mask for the background \n"
+- " vsli.u16 q3, q0, #5 @ duplicate framebuffer blue bits \n"
+- " vshrn.u16 d2, q0, #8 @ unpack red from framebuffer pixels \n"
+- " vshrn.u16 d4, q0, #3 @ unpack green \n"
+- " vsri.u8 d2, d2, #5 @ duplicate red bits (extend 5 to 8) \n"
+- " vshrn.u16 d6, q3, #2 @ unpack extended blue (truncate 10 to 8) \n"
+- " vsri.u8 d4, d4, #6 @ duplicate green bits (extend 6 to 8) \n"
+- " vmull.u8 q1, d2, d18 @ apply inverse mask to background red... \n"
+- " vmull.u8 q2, d4, d18 @ ...green... \n"
+- " vmull.u8 q3, d6, d18 @ ...blue \n"
+- " subs %[count], %[count], #1 @ decrement/test loop counter \n"
+- " vmlal.u8 q1, d17, d22 @ add masked foreground red... \n"
+- " vmlal.u8 q2, d17, d21 @ ...green... \n"
+- " vmlal.u8 q3, d17, d20 @ ...blue \n"
+- " add %[in_mask], %[in_mask], %[mask_stride] @ advance mask pointer, while we wait \n"
+- " vsri.16 q1, q2, #5 @ pack green behind red \n"
+- " vsri.16 q1, q3, #11 @ pack blue into pixels \n"
+- " vst1.16 {d2, d3}, [%[dest]] @ store composited pixels \n"
+- " add %[dest], %[dest], %[dest_stride] @ advance framebuffer pointer \n"
+- " bne 0b @ next please \n"
+-
+- /* Clobbered registers marked as input/outputs */
+- : [dest] "+r" (dest), [in_mask] "+r" (in_mask), [count] "+r" (count)
+-
+- /* Inputs */
+- : [dest_stride] "r" (dest_stride), [mask_stride] "r" (mask_stride), [glyph_colour] "r" (&glyph_colour)
+-
+- /* Clobbers, including the inputs we modify, and potentially lots of memory */
+- : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d17", "d18", "d19",
+- "d20", "d21", "d22", "d23", "d24", "d25", "cc", "memory"
+- );
+-
+-#else
+-
+- uint8x8x4_t solid_colour = vld4_dup_u8 ((uint8_t*) &glyph_colour);
+-
+- while (count--)
+- {
+- uint16x8_t pixels = vld1q_u16 (dest);
+- uint8x8_t mask = vshrn_n_u16 (vmull_u8 (solid_colour.val[3], vld1_u8 (in_mask)), 8);
+- uint8x8_t mask_image = vmvn_u8 (mask);
+-
+- uint8x8_t t_red = vshrn_n_u16 (pixels, 8);
+- uint8x8_t t_green = vshrn_n_u16 (pixels, 3);
+- uint8x8_t t_blue = vshrn_n_u16 (vsli_n_u8 (pixels, pixels, 5), 2);
+-
+- uint16x8_t s_red = vmull_u8 (vsri_n_u8 (t_red, t_red, 5), mask_image);
+- uint16x8_t s_green = vmull_u8 (vsri_n_u8 (t_green, t_green, 6), mask_image);
+- uint16x8_t s_blue = vmull_u8 (t_blue, mask_image);
+-
+- s_red = vmlal (s_red, mask, solid_colour.val[2]);
+- s_green = vmlal (s_green, mask, solid_colour.val[1]);
+- s_blue = vmlal (s_blue, mask, solid_colour.val[0]);
+-
+- pixels = vsri_n_u16 (s_red, s_green, 5);
+- pixels = vsri_n_u16 (pixels, s_blue, 11);
+- vst1q_u16 (dest, pixels);
+-
+- dest += dest_stride;
+- mask += mask_stride;
+- }
+-
+-#endif
+-}
+-
+-#if 0 /* this is broken currently */
+-static void
+-neon_composite_over_n_8_0565 (pixman_implementation_t * impl,
+- pixman_op_t op,
+- pixman_image_t * src_image,
+- pixman_image_t * mask_image,
+- pixman_image_t * dst_image,
+- int32_t src_x,
+- int32_t src_y,
+- int32_t mask_x,
+- int32_t mask_y,
+- int32_t dest_x,
+- int32_t dest_y,
+- int32_t width,
+- int32_t height)
+-{
+- uint32_t src, srca;
+- uint16_t *dst_line, *aligned_line;
+- uint8_t *mask_line;
+- uint32_t dst_stride, mask_stride;
+- uint32_t kernel_count, copy_count, copy_tail;
+- uint8_t kernel_offset, copy_offset;
+-
+- src = _pixman_image_get_solid (src_image, dst_image->bits.format);
+-
+- /* bail out if fully transparent or degenerate */
+- srca = src >> 24;
+- if (src == 0)
+- return;
+-
+- if (width == 0 || height == 0)
+- return;
+-
+- if (width > NEON_SCANLINE_BUFFER_PIXELS)
+- {
+- /* split the blit, so we can use a fixed-size scanline buffer
+- * TODO: there must be a more elegant way of doing this.
+- */
+- int x;
+- for (x = 0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS)
+- {
+- neon_composite_over_n_8_0565 (
+- impl, op,
+- src_image, mask_image, dst_image,
+- src_x + x, src_y, mask_x + x, mask_y, dest_x + x, dest_y,
+- (x + NEON_SCANLINE_BUFFER_PIXELS > width) ? width - x : NEON_SCANLINE_BUFFER_PIXELS, height);
+- }
+-
+- return;
+- }
+-
+- PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
+- PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
+-
+- /* keep within minimum number of aligned quadwords on width
+- * while also keeping the minimum number of columns to process
+- */
+- {
+- unsigned long aligned_left = (unsigned long)(dst_line) & ~0xF;
+- unsigned long aligned_right = (((unsigned long)(dst_line + width)) + 0xF) & ~0xF;
+- unsigned long ceiling_length = (((unsigned long) width) * sizeof(*dst_line) + 0xF) & ~0xF;
+-
+- /* the fast copy should be quadword aligned */
+- copy_offset = dst_line - ((uint16_t*) aligned_left);
+- aligned_line = dst_line - copy_offset;
+- copy_count = (uint32_t) ((aligned_right - aligned_left) >> 4);
+- copy_tail = 0;
+-
+- if (aligned_right - aligned_left > ceiling_length)
+- {
+- /* unaligned routine is tightest */
+- kernel_count = (uint32_t) (ceiling_length >> 4);
+- kernel_offset = copy_offset;
+- }
+- else
+- {
+- /* aligned routine is equally tight, so it is safer to align */
+- kernel_count = copy_count;
+- kernel_offset = 0;
+- }
+-
+- /* We should avoid reading beyond scanline ends for safety */
+- if (aligned_line < (dst_line - dest_x) ||
+- (aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
+- {
+- /* switch to precise read */
+- copy_offset = kernel_offset = 0;
+- aligned_line = dst_line;
+- kernel_count = (uint32_t) (ceiling_length >> 4);
+- copy_count = (width * sizeof(*dst_line)) >> 4;
+- copy_tail = (width * sizeof(*dst_line)) & 0xF;
+- }
+- }
+-
+- {
+- uint16_t scan_line[NEON_SCANLINE_BUFFER_PIXELS + 8]; /* deliberately not initialised */
+- uint8_t glyph_line[NEON_SCANLINE_BUFFER_PIXELS + 8];
+- int y = height;
+-
+- /* row-major order */
+- /* left edge, middle block, right edge */
+- for ( ; y--; mask_line += mask_stride, aligned_line += dst_stride, dst_line += dst_stride)
+- {
+- /* We don't want to overrun the edges of the glyph,
+- * so realign the edge data into known buffers
+- */
+- neon_quadword_copy (glyph_line + copy_offset, mask_line, width >> 4, width & 0xF);
+-
+- /* Uncached framebuffer access is really, really slow
+- * if we do it piecemeal. It should be much faster if we
+- * grab it all at once. One scanline should easily fit in
+- * L1 cache, so this should not waste RAM bandwidth.
+- */
+- neon_quadword_copy (scan_line, aligned_line, copy_count, copy_tail);
+-
+- /* Apply the actual filter */
+- solid_over_565_8_pix_neon (
+- src, scan_line + kernel_offset,
+- glyph_line + kernel_offset, 8 * sizeof(*dst_line),
+- 8, kernel_count);
+-
+- /* Copy the modified scanline back */
+- neon_quadword_copy (dst_line, scan_line + copy_offset,
+- width >> 3, (width & 7) * 2);
+- }
+- }
+-}
+-#endif
+-
+-#ifdef USE_GCC_INLINE_ASM
+-
+-static inline void
+-plain_over_565_8_pix_neon (uint32_t colour,
+- uint16_t *dest,
+- uint32_t dest_stride, /* bytes, not elements */
+- uint32_t count /* 8-pixel groups */)
+-{
+- /* Inner loop for plain translucent rects
+- * (solid colour without alpha mask)
+- */
+- asm volatile (
+- " vld4.8 {d20[], d21[], d22[], d23[]}, [%[colour]] @ solid colour load/splat \n"
+- " vmull.u8 q12, d23, d22 @ premultiply alpha red \n"
+- " vmull.u8 q13, d23, d21 @ premultiply alpha green \n"
+- " vmull.u8 q14, d23, d20 @ premultiply alpha blue \n"
+- " vmvn d18, d23 @ inverse alpha for background \n"
+- "0: @ loop\n"
+- " vld1.16 {d0, d1}, [%[dest]] @ load first pixels from framebuffer \n"
+- " vshrn.u16 d2, q0, #8 @ unpack red from framebuffer pixels \n"
+- " vshrn.u16 d4, q0, #3 @ unpack green \n"
+- " vsli.u16 q3, q0, #5 @ duplicate framebuffer blue bits \n"
+- " vsri.u8 d2, d2, #5 @ duplicate red bits (extend 5 to 8) \n"
+- " vsri.u8 d4, d4, #6 @ duplicate green bits (extend 6 to 8) \n"
+- " vshrn.u16 d6, q3, #2 @ unpack extended blue (truncate 10 to 8) \n"
+- " vmov q0, q12 @ retrieve foreground red \n"
+- " vmlal.u8 q0, d2, d18 @ blend red - my kingdom for a four-operand MLA \n"
+- " vmov q1, q13 @ retrieve foreground green \n"
+- " vmlal.u8 q1, d4, d18 @ blend green \n"
+- " vmov q2, q14 @ retrieve foreground blue \n"
+- " vmlal.u8 q2, d6, d18 @ blend blue \n"
+- " subs %[count], %[count], #1 @ decrement/test loop counter \n"
+- " vsri.16 q0, q1, #5 @ pack green behind red \n"
+- " vsri.16 q0, q2, #11 @ pack blue into pixels \n"
+- " vst1.16 {d0, d1}, [%[dest]] @ store composited pixels \n"
+- " add %[dest], %[dest], %[dest_stride] @ advance framebuffer pointer \n"
+- " bne 0b @ next please \n"
+-
+- /* Clobbered registers marked as input/outputs */
+- : [dest] "+r" (dest), [count] "+r" (count)
+-
+- /* Inputs */
+- : [dest_stride] "r" (dest_stride), [colour] "r" (&colour)
+-
+- /* Clobbers, including the inputs we modify, and
+- * potentially lots of memory
+- */
+- : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d18", "d19",
+- "d20", "d21", "d22", "d23", "d24", "d25", "d26", "d27", "d28", "d29",
+- "cc", "memory"
+- );
+-}
+-
+-static void
+-neon_composite_over_n_0565 (pixman_implementation_t * impl,
+- pixman_op_t op,
+- pixman_image_t * src_image,
+- pixman_image_t * mask_image,
+- pixman_image_t * dst_image,
+- int32_t src_x,
+- int32_t src_y,
+- int32_t mask_x,
+- int32_t mask_y,
+- int32_t dest_x,
+- int32_t dest_y,
+- int32_t width,
+- int32_t height)
+-{
+- uint32_t src, srca;
+- uint16_t *dst_line, *aligned_line;
+- uint32_t dst_stride;
+- uint32_t kernel_count, copy_count, copy_tail;
+- uint8_t kernel_offset, copy_offset;
+-
+- src = _pixman_image_get_solid (src_image, dst_image->bits.format);
+-
+- /* bail out if fully transparent */
+- srca = src >> 24;
+- if (src == 0)
+- return;
+-
+- if (width == 0 || height == 0)
+- return;
+-
+- if (width > NEON_SCANLINE_BUFFER_PIXELS)
+- {
+- /* split the blit, so we can use a fixed-size scanline buffer *
+- * TODO: there must be a more elegant way of doing this.
+- */
+- int x;
+-
+- for (x = 0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS)
+- {
+- neon_composite_over_n_0565 (
+- impl, op,
+- src_image, mask_image, dst_image,
+- src_x + x, src_y, mask_x + x, mask_y, dest_x + x, dest_y,
+- (x + NEON_SCANLINE_BUFFER_PIXELS > width) ? width - x : NEON_SCANLINE_BUFFER_PIXELS, height);
+- }
+- return;
+- }
+-
+- PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
+-
+- /* keep within minimum number of aligned quadwords on width
+- * while also keeping the minimum number of columns to process
+- */
+- {
+- unsigned long aligned_left = (unsigned long)(dst_line) & ~0xF;
+- unsigned long aligned_right = (((unsigned long)(dst_line + width)) + 0xF) & ~0xF;
+- unsigned long ceiling_length = (((unsigned long) width) * sizeof(*dst_line) + 0xF) & ~0xF;
+-
+- /* the fast copy should be quadword aligned */
+- copy_offset = dst_line - ((uint16_t*) aligned_left);
+- aligned_line = dst_line - copy_offset;
+- copy_count = (uint32_t) ((aligned_right - aligned_left) >> 4);
+- copy_tail = 0;
+-
+- if (aligned_right - aligned_left > ceiling_length)
+- {
+- /* unaligned routine is tightest */
+- kernel_count = (uint32_t) (ceiling_length >> 4);
+- kernel_offset = copy_offset;
+- }
+- else
+- {
+- /* aligned routine is equally tight, so it is safer to align */
+- kernel_count = copy_count;
+- kernel_offset = 0;
+- }
+-
+- /* We should avoid reading beyond scanline ends for safety */
+- if (aligned_line < (dst_line - dest_x) ||
+- (aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
+- {
+- /* switch to precise read */
+- copy_offset = kernel_offset = 0;
+- aligned_line = dst_line;
+- kernel_count = (uint32_t) (ceiling_length >> 4);
+- copy_count = (width * sizeof(*dst_line)) >> 4;
+- copy_tail = (width * sizeof(*dst_line)) & 0xF;
+- }
+- }
+-
+- {
+- uint16_t scan_line[NEON_SCANLINE_BUFFER_PIXELS + 8]; /* deliberately not initialised */
+-
+- /* row-major order */
+- /* left edge, middle block, right edge */
+- for ( ; height--; aligned_line += dst_stride, dst_line += dst_stride)
+- {
+- /* Uncached framebuffer access is really, really slow if we do it piecemeal.
+- * It should be much faster if we grab it all at once.
+- * One scanline should easily fit in L1 cache, so this should
+- * not waste RAM bandwidth.
+- */
+- neon_quadword_copy (scan_line, aligned_line, copy_count, copy_tail);
+-
+- /* Apply the actual filter */
+- plain_over_565_8_pix_neon (
+- src, scan_line + kernel_offset, 8 * sizeof(*dst_line), kernel_count);
+-
+- /* Copy the modified scanline back */
+- neon_quadword_copy (
+- dst_line, scan_line + copy_offset, width >> 3, (width & 7) * 2);
+- }
+- }
+-}
+-
+-static inline void
+-ARGB8_over_565_8_pix_neon (uint32_t *src,
+- uint16_t *dest,
+- uint32_t src_stride, /* bytes, not elements */
+- uint32_t count /* 8-pixel groups */)
+-{
+- asm volatile (
+- "0: @ loop\n"
+- " pld [%[src], %[src_stride]] @ preload from next scanline \n"
+- " vld1.16 {d0, d1}, [%[dest]] @ load pixels from framebuffer \n"
+- " vld4.8 {d20, d21, d22, d23},[%[src]]! @ load source image pixels \n"
+- " vsli.u16 q3, q0, #5 @ duplicate framebuffer blue bits \n"
+- " vshrn.u16 d2, q0, #8 @ unpack red from framebuffer pixels \n"
+- " vshrn.u16 d4, q0, #3 @ unpack green \n"
+- " vmvn d18, d23 @ we need the inverse alpha for the background \n"
+- " vsri.u8 d2, d2, #5 @ duplicate red bits (extend 5 to 8) \n"
+- " vshrn.u16 d6, q3, #2 @ unpack extended blue (truncate 10 to 8) \n"
+- " vsri.u8 d4, d4, #6 @ duplicate green bits (extend 6 to 8) \n"
+- " vmull.u8 q1, d2, d18 @ apply inverse alpha to background red... \n"
+- " vmull.u8 q2, d4, d18 @ ...green... \n"
+- " vmull.u8 q3, d6, d18 @ ...blue \n"
+- " subs %[count], %[count], #1 @ decrement/test loop counter \n"
+- " vmlal.u8 q1, d23, d22 @ add blended foreground red... \n"
+- " vmlal.u8 q2, d23, d21 @ ...green... \n"
+- " vmlal.u8 q3, d23, d20 @ ...blue \n"
+- " vsri.16 q1, q2, #5 @ pack green behind red \n"
+- " vsri.16 q1, q3, #11 @ pack blue into pixels \n"
+- " vst1.16 {d2, d3}, [%[dest]]! @ store composited pixels \n"
+- " bne 0b @ next please \n"
+-
+- /* Clobbered registers marked as input/outputs */
+- : [dest] "+r" (dest), [src] "+r" (src), [count] "+r" (count)
+-
+- /* Inputs */
+- : [src_stride] "r" (src_stride)
+-
+- /* Clobbers, including the inputs we modify, and potentially lots of memory */
+- : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d17", "d18", "d20",
+- "d21", "d22", "d23", "cc", "memory"
+- );
+-}
+-
+-static void
+-neon_composite_over_8888_0565 (pixman_implementation_t * impl,
+- pixman_op_t op,
+- pixman_image_t * src_image,
+- pixman_image_t * mask_image,
+- pixman_image_t * dst_image,
+- int32_t src_x,
+- int32_t src_y,
+- int32_t mask_x,
+- int32_t mask_y,
+- int32_t dest_x,
+- int32_t dest_y,
+- int32_t width,
+- int32_t height)
+-{
+- uint32_t *src_line;
+- uint16_t *dst_line, *aligned_line;
+- uint32_t dst_stride, src_stride;
+- uint32_t kernel_count, copy_count, copy_tail;
+- uint8_t kernel_offset, copy_offset;
+-
+- /* we assume mask is opaque
+- * so the only alpha to deal with is embedded in src
+- */
+- if (width > NEON_SCANLINE_BUFFER_PIXELS)
+- {
+- /* split the blit, so we can use a fixed-size scanline buffer */
+- int x;
+- for (x = 0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS)
+- {
+- neon_composite_over_8888_0565 (
+- impl, op,
+- src_image, mask_image, dst_image,
+- src_x + x, src_y, mask_x + x, mask_y, dest_x + x, dest_y,
+- (x + NEON_SCANLINE_BUFFER_PIXELS > width) ? width - x : NEON_SCANLINE_BUFFER_PIXELS, height);
+- }
+- return;
+- }
+-
+- PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
+- PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+-
+- /* keep within minimum number of aligned quadwords on width
+- * while also keeping the minimum number of columns to process
+- */
+- {
+- unsigned long aligned_left = (unsigned long)(dst_line) & ~0xF;
+- unsigned long aligned_right = (((unsigned long)(dst_line + width)) + 0xF) & ~0xF;
+- unsigned long ceiling_length = (((unsigned long) width) * sizeof(*dst_line) + 0xF) & ~0xF;
+-
+- /* the fast copy should be quadword aligned */
+- copy_offset = dst_line - ((uint16_t*) aligned_left);
+- aligned_line = dst_line - copy_offset;
+- copy_count = (uint32_t) ((aligned_right - aligned_left) >> 4);
+- copy_tail = 0;
+-
+- if (aligned_right - aligned_left > ceiling_length)
+- {
+- /* unaligned routine is tightest */
+- kernel_count = (uint32_t) (ceiling_length >> 4);
+- kernel_offset = copy_offset;
+- }
+- else
+- {
+- /* aligned routine is equally tight, so it is safer to align */
+- kernel_count = copy_count;
+- kernel_offset = 0;
+- }
+-
+- /* We should avoid reading beyond scanline ends for safety */
+- if (aligned_line < (dst_line - dest_x) ||
+- (aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
+- {
+- /* switch to precise read */
+- copy_offset = kernel_offset = 0;
+- aligned_line = dst_line;
+- kernel_count = (uint32_t) (ceiling_length >> 4);
+- copy_count = (width * sizeof(*dst_line)) >> 4;
+- copy_tail = (width * sizeof(*dst_line)) & 0xF;
+- }
+- }
+-
+- /* Preload the first input scanline */
+- {
+- uint8_t *src_ptr = (uint8_t*) src_line;
+- uint32_t count = (width + 15) / 16;
+-
+-#ifdef USE_GCC_INLINE_ASM
+- asm volatile (
+- "0: @ loop \n"
+- " subs %[count], %[count], #1 \n"
+- " pld [%[src]] \n"
+- " add %[src], %[src], #64 \n"
+- " bgt 0b \n"
+-
+- /* Clobbered input registers marked as input/outputs */
+- : [src] "+r" (src_ptr), [count] "+r" (count)
+- : /* no unclobbered inputs */
+- : "cc"
+- );
+-#else
+- do
+- {
+- __pld (src_ptr);
+- src_ptr += 64;
+- }
+- while (--count);
+-#endif
+- }
+-
+- {
+- uint16_t scan_line[NEON_SCANLINE_BUFFER_PIXELS + 8]; /* deliberately not initialised */
+-
+- /* row-major order */
+- /* left edge, middle block, right edge */
+- for ( ; height--; src_line += src_stride, aligned_line += dst_stride)
+- {
+- /* Uncached framebuffer access is really, really slow if we do
+- * it piecemeal. It should be much faster if we grab it all at
+- * once. One scanline should easily fit in L1 cache, so this
+- * should not waste RAM bandwidth.
+- */
+- neon_quadword_copy (scan_line, aligned_line, copy_count, copy_tail);
+-
+- /* Apply the actual filter */
+- ARGB8_over_565_8_pix_neon (
+- src_line, scan_line + kernel_offset,
+- src_stride * sizeof(*src_line), kernel_count);
+-
+- /* Copy the modified scanline back */
+- neon_quadword_copy (dst_line,
+- scan_line + copy_offset,
+- width >> 3, (width & 7) * 2);
+- }
+- }
+-}
+-
+-#endif /* USE_GCC_INLINE_ASM */
+-
+ static const pixman_fast_path_t arm_neon_fast_path_array[] =
+ {
+ { PIXMAN_OP_ADD, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, neon_composite_add_8888_8_8, 0 },
+@@ -2612,12 +1908,6 @@ static const pixman_fast_path_t arm_neon_fast_path_array[] =
+ #ifdef USE_GCC_INLINE_ASM
+ { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_src_16_16, 0 },
+ { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_src_16_16, 0 },
+-#if 0 /* this code has some bugs */
+- { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_over_n_0565, 0 },
+- { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_over_n_0565, 0 },
+- { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_over_8888_0565, 0 },
+- { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_over_8888_0565, 0 },
+-#endif
+ #endif
+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, neon_composite_over_8888_8888, 0 },
+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, neon_composite_over_8888_8888, 0 },
+@@ -2668,79 +1958,6 @@ arm_neon_composite (pixman_implementation_t *imp,
+ }
+
+ static pixman_bool_t
+-pixman_blt_neon (void *src_bits,
+- void *dst_bits,
+- int src_stride,
+- int dst_stride,
+- int src_bpp,
+- int dst_bpp,
+- int src_x,
+- int src_y,
+- int dst_x,
+- int dst_y,
+- int width,
+- int height)
+-{
+- if (!width || !height)
+- return TRUE;
+-
+- /* accelerate only straight copies involving complete bytes */
+- if (src_bpp != dst_bpp || (src_bpp & 7))
+- return FALSE;
+-
+- {
+- uint32_t bytes_per_pixel = src_bpp >> 3;
+- uint32_t byte_width = width * bytes_per_pixel;
+- /* parameter is in words for some reason */
+- int32_t src_stride_bytes = src_stride * 4;
+- int32_t dst_stride_bytes = dst_stride * 4;
+- uint8_t *src_bytes = ((uint8_t*) src_bits) +
+- src_y * src_stride_bytes + src_x * bytes_per_pixel;
+- uint8_t *dst_bytes = ((uint8_t*) dst_bits) +
+- dst_y * dst_stride_bytes + dst_x * bytes_per_pixel;
+- uint32_t quadword_count = byte_width / 16;
+- uint32_t offset = byte_width % 16;
+-
+- while (height--)
+- {
+- neon_quadword_copy (dst_bytes, src_bytes, quadword_count, offset);
+- src_bytes += src_stride_bytes;
+- dst_bytes += dst_stride_bytes;
+- }
+- }
+-
+- return TRUE;
+-}
+-
+-static pixman_bool_t
+-arm_neon_blt (pixman_implementation_t *imp,
+- uint32_t * src_bits,
+- uint32_t * dst_bits,
+- int src_stride,
+- int dst_stride,
+- int src_bpp,
+- int dst_bpp,
+- int src_x,
+- int src_y,
+- int dst_x,
+- int dst_y,
+- int width,
+- int height)
+-{
+- if (pixman_blt_neon (
+- src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
+- src_x, src_y, dst_x, dst_y, width, height))
+- {
+- return TRUE;
+- }
+-
+- return _pixman_implementation_blt (
+- imp->delegate,
+- src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
+- src_x, src_y, dst_x, dst_y, width, height);
+-}
+-
+-static pixman_bool_t
+ arm_neon_fill (pixman_implementation_t *imp,
+ uint32_t * bits,
+ int stride,
+@@ -2765,9 +1982,6 @@ _pixman_implementation_create_arm_neon (void)
+ pixman_implementation_t *imp = _pixman_implementation_create (simd);
+
+ imp->composite = arm_neon_composite;
+-#if 0 /* this code has some bugs */
+- imp->blt = arm_neon_blt;
+-#endif
+ imp->fill = arm_neon_fill;
+
+ return imp;
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/src-8888-0565.patch b/recipes/obsolete/xorg/xorg-lib/pixman/src-8888-0565.patch
new file mode 100644
index 0000000..c544225
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/src-8888-0565.patch
@@ -0,0 +1,324 @@
+From 6494f9ae8820078d0e6109bf8f294156f7a5da4c Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Fri, 05 Mar 2010 00:40:34 +0000
+Subject: ARM: added 'armv6_composite_src_8888_0565' fast path
+
+Provides ~3x performance improvement when working with
+data in L1 cache, and ~80% performace improvement when working
+with memory. This fast path is important for 32bpp -> 16bpp
+color format conversion and is commonly used with 16bpp desktop.
+
+Microbenchmark from N800 (ARM11 @ 400MHz), measured in MPix/s:
+
+before:
+
+ src_8888_0565 = L1: 21.54 M: 15.62
+
+after (armv4):
+
+ src_8888_0565 = L1: 45.26 M: 23.29
+
+after (armv6):
+
+ src_8888_0565 = L1: 60.62 M: 28.37
+---
+diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
+index c375c01..69243c1 100644
+--- a/pixman/pixman-arm-simd.c
++++ b/pixman/pixman-arm-simd.c
+@@ -604,6 +604,282 @@ armv6_composite_over_n_8_0565 (pixman_implementation_t * impl,
+ dst_stride - width, mask_stride - width, height);
+ }
+
++static inline void
++armv4_composite_src_8888_0565_asm (
++ uint16_t *dst, uint32_t *src, int w, int dst_stride,
++ int src_stride, int h)
++{
++ uint32_t a, x, y, c1F001F = 0x1F001F, cFFFF = 0xFFFF;
++ int backup_w = w;
++ while (h--)
++ {
++ w = backup_w;
++ if (w > 0 && (uintptr_t)dst & 2)
++ {
++ x = *src++;
++
++ a = (x >> 3) & c1F001F;
++ x &= 0xFC00;
++ a |= a >> 5;
++ a |= x >> 5;
++
++ *dst++ = a;
++ w--;
++ }
++
++ asm volatile(
++ "subs %[w], %[w], #2\n"
++ "blt 2f\n"
++ "1:\n"
++ "ldr %[x], [%[src]], #4\n"
++ "ldr %[y], [%[src]], #4\n"
++ "subs %[w], %[w], #2\n"
++
++ "and %[a], %[c1F001F], %[x], lsr #3\n"
++ "and %[x], %[x], #0xFC00\n\n"
++ "orr %[a], %[a], %[a], lsr #5\n"
++ "orr %[x], %[a], %[x], lsr #5\n"
++
++ "and %[a], %[c1F001F], %[y], lsr #3\n"
++ "and %[y], %[y], #0xFC00\n\n"
++ "orr %[a], %[a], %[a], lsr #5\n"
++ "orr %[y], %[a], %[y], lsr #5\n"
++ /*
++ * Writing single 32-bit value is much faster than two
++ * separate 16-bit values for older CPUs without (efficient)
++ * write combining, even though it costs an extra instruction.
++ */
++ "and %[x], %[x], %[cFFFF]\n"
++ "orr %[x], %[x], %[y], lsl #16\n"
++ "str %[x], [%[dst]], #4\n"
++ "bge 1b\n"
++ "2:\n"
++ : [c1F001F] "+&r" (c1F001F), [cFFFF] "+&r" (cFFFF),
++ [src] "+&r" (src), [dst] "+&r" (dst), [a] "=&r" (a),
++ [x] "=&r" (x), [y] "=&r" (y), [w] "+&r" (w)
++ );
++
++ if (w & 1)
++ {
++ x = *src++;
++
++ a = (x >> 3) & c1F001F;
++ x = x & 0xFC00;
++ a |= a >> 5;
++ a |= x >> 5;
++
++ *dst++ = a;
++ }
++
++ src += src_stride - backup_w;
++ dst += dst_stride - backup_w;
++ }
++}
++
++/*
++ * Conversion x8r8g8b8 -> r5g6b5
++ *
++ * Note: 'w' must be >= 7 here
++ */
++static void __attribute__((naked))
++armv6_composite_src_8888_0565_asm (
++ uint16_t *dst, uint32_t *src, int w, int dst_stride,
++ int src_stride, int h)
++{
++ asm volatile(
++ /* define supplementary macros */
++ ".macro cvt8888to565 PIX\n"
++ "and A, C1F001F, \\PIX, lsr #3\n"
++ "and \\PIX, \\PIX, #0xFC00\n\n"
++ "orr A, A, A, lsr #5\n"
++ "orr \\PIX, A, \\PIX, lsr #5\n"
++ ".endm\n"
++
++ ".macro combine_pixels_pair PIX1, PIX2\n"
++ /* Note: assume little endian byte order */
++ "pkhbt \\PIX1, \\PIX1, \\PIX2, lsl #16\n"
++ ".endm\n"
++
++ /* function entry, save all registers (10 words) to stack */
++ "stmdb sp!, {r4-r11, ip, lr}\n"
++
++ /* define some aliases */
++ "DST .req r0\n"
++ "SRC .req r1\n"
++ "W .req r2\n"
++ "H .req r3\n"
++
++ "TMP1 .req r4\n"
++ "TMP2 .req r5\n"
++ "TMP3 .req r6\n"
++ "TMP4 .req r7\n"
++ "TMP5 .req r8\n"
++ "TMP6 .req r9\n"
++ "TMP7 .req r10\n"
++ "TMP8 .req r11\n"
++
++ "C1F001F .req ip\n"
++ "A .req lr\n"
++
++ "ldr TMP1, [sp, #(10*4+0)]\n" /* load src_stride */
++ "ldr C1F001F, =0x1F001F\n"
++ "sub r3, r3, W\n"
++ "str r3, [sp, #(10*4+0)]\n" /* store (dst_stride-w) */
++ "ldr r3, [sp, #(10*4+4)]\n" /* load h */
++ "sub TMP1, TMP1, W\n"
++ "str TMP1, [sp, #(10*4+4)]\n" /* store (src_stride-w) */
++
++ "str W, [sp, #(8*4)]\n" /* saved ip = W */
++
++ "0:\n"
++ "subs H, H, #1\n"
++ "blt 6f\n"
++ "1:\n"
++ /* align DST at 4 byte boundary */
++ "tst DST, #2\n"
++ "beq 2f\n"
++ "ldr TMP1, [SRC], #4\n"
++ "sub W, W, #1\n"
++ "cvt8888to565 TMP1\n"
++ "strh TMP1, [DST], #2\n"
++ "2:"
++ /* align DST at 8 byte boundary */
++ "tst DST, #4\n"
++ "beq 2f\n"
++ "ldmia SRC!, {TMP1, TMP2}\n"
++ "sub W, W, #2\n"
++ "cvt8888to565 TMP1\n"
++ "cvt8888to565 TMP2\n"
++ "combine_pixels_pair TMP1, TMP2\n"
++ "str TMP1, [DST], #4\n"
++ "2:"
++ /* align DST at 16 byte boundary */
++ "tst DST, #8\n"
++ "beq 2f\n"
++ "ldmia SRC!, {TMP1, TMP2, TMP3, TMP4}\n"
++ "sub W, W, #4\n"
++ "cvt8888to565 TMP1\n"
++ "cvt8888to565 TMP2\n"
++ "cvt8888to565 TMP3\n"
++ "cvt8888to565 TMP4\n"
++ "combine_pixels_pair TMP1, TMP2\n"
++ "combine_pixels_pair TMP3, TMP4\n"
++ "stmia DST!, {TMP1, TMP3}\n"
++ "2:"
++ /* inner loop, process 8 pixels per iteration */
++ "subs W, W, #8\n"
++ "blt 4f\n"
++ "3:\n"
++ "ldmia SRC!, {TMP1, TMP2, TMP3, TMP4, TMP5, TMP6, TMP7, TMP8}\n"
++ "subs W, W, #8\n"
++ "cvt8888to565 TMP1\n"
++ "cvt8888to565 TMP2\n"
++ "cvt8888to565 TMP3\n"
++ "cvt8888to565 TMP4\n"
++ "cvt8888to565 TMP5\n"
++ "cvt8888to565 TMP6\n"
++ "cvt8888to565 TMP7\n"
++ "cvt8888to565 TMP8\n"
++ "combine_pixels_pair TMP1, TMP2\n"
++ "combine_pixels_pair TMP3, TMP4\n"
++ "combine_pixels_pair TMP5, TMP6\n"
++ "combine_pixels_pair TMP7, TMP8\n"
++ "stmia DST!, {TMP1, TMP3, TMP5, TMP7}\n"
++ "bge 3b\n"
++ "4:\n"
++
++ /* process the remaining pixels */
++ "tst W, #4\n"
++ "beq 4f\n"
++ "ldmia SRC!, {TMP1, TMP2, TMP3, TMP4}\n"
++ "cvt8888to565 TMP1\n"
++ "cvt8888to565 TMP2\n"
++ "cvt8888to565 TMP3\n"
++ "cvt8888to565 TMP4\n"
++ "combine_pixels_pair TMP1, TMP2\n"
++ "combine_pixels_pair TMP3, TMP4\n"
++ "stmia DST!, {TMP1, TMP3}\n"
++ "4:\n"
++ "tst W, #2\n"
++ "beq 4f\n"
++ "ldmia SRC!, {TMP1, TMP2}\n"
++ "cvt8888to565 TMP1\n"
++ "cvt8888to565 TMP2\n"
++ "combine_pixels_pair TMP1, TMP2\n"
++ "str TMP1, [DST], #4\n"
++ "4:\n"
++ "tst W, #1\n"
++ "beq 4f\n"
++ "ldr TMP1, [SRC], #4\n"
++ "cvt8888to565 TMP1\n"
++ "strh TMP1, [DST], #2\n"
++ "4:\n"
++ "ldr TMP1, [sp, #(10*4+0)]\n" /* (dst_stride-w) */
++ "ldr TMP2, [sp, #(10*4+4)]\n" /* (src_stride-w) */
++ "ldr W, [sp, #(8*4)]\n"
++ "subs H, H, #1\n"
++ "add DST, DST, TMP1, lsl #1\n"
++ "add SRC, SRC, TMP2, lsl #2\n"
++ "bge 1b\n"
++ "6:\n"
++ /* restore all registers and return */
++ "ldmia sp!, {r4-r11, ip, pc}\n"
++ ".ltorg\n"
++
++ ".unreq DST\n"
++ ".unreq SRC\n"
++ ".unreq W\n"
++ ".unreq H\n"
++
++ ".unreq TMP1\n"
++ ".unreq TMP2\n"
++ ".unreq TMP3\n"
++ ".unreq TMP4\n"
++ ".unreq TMP5\n"
++ ".unreq TMP6\n"
++ ".unreq TMP7\n"
++ ".unreq TMP8\n"
++
++ ".unreq C1F001F\n"
++ ".unreq A\n"
++
++ ".purgem cvt8888to565\n"
++ ".purgem combine_pixels_pair\n"
++ );
++}
++
++static void
++armv6_composite_src_8888_0565 (pixman_implementation_t * impl,
++ pixman_op_t op,
++ pixman_image_t * src_image,
++ pixman_image_t * mask_image,
++ pixman_image_t * dst_image,
++ int32_t src_x,
++ int32_t src_y,
++ int32_t mask_x,
++ int32_t mask_y,
++ int32_t dest_x,
++ int32_t dest_y,
++ int32_t width,
++ int32_t height)
++{
++ uint32_t *src;
++ uint16_t *dst;
++ int src_stride, dst_stride;
++
++ PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t,
++ dst_stride, dst, 1);
++ PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t,
++ src_stride, src, 1);
++
++ if (width < 7)
++ armv4_composite_src_8888_0565_asm (dst, src, width,
++ dst_stride, src_stride, height);
++ else
++ armv6_composite_src_8888_0565_asm (dst, src, width,
++ dst_stride, src_stride, height);
++}
++
+ #endif
+
+ static const pixman_fast_path_t arm_simd_fast_paths[] =
+@@ -624,6 +900,10 @@ static const pixman_fast_path_t arm_simd_fast_paths[] =
+ #if defined(__ARM_EABI__) && defined(__linux__)
+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, r5g6b5, armv6_composite_over_n_8_0565),
+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, b5g6r5, armv6_composite_over_n_8_0565),
++ PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, r5g6b5, armv6_composite_src_8888_0565),
++ PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, r5g6b5, armv6_composite_src_8888_0565),
++ PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, b5g6r5, armv6_composite_src_8888_0565),
++ PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, b5g6r5, armv6_composite_src_8888_0565),
+ #endif
+ { PIXMAN_OP_NONE },
+ };
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman/tls.patch b/recipes/obsolete/xorg/xorg-lib/pixman/tls.patch
new file mode 100644
index 0000000..316caed
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman/tls.patch
@@ -0,0 +1,59 @@
+From 714559dccda3165a72f0a9935c1edc3aef535f30 Mon Sep 17 00:00:00 2001
+From: Søren Sandmann Pedersen <ssp@redhat.com>
+Date: Wed, 07 Apr 2010 05:44:12 +0000
+Subject: Fixes for pthread thread local storage.
+
+The tls_name_key variable is passed to tls_name_get(), and the first
+time this happens it isn't initialized. tls_name_get() then passes it
+on to tls_name_alloc() which passes it on to pthread_setspecific()
+leading to undefined behavior.
+
+None of this is actually necessary at all because there is only one
+such variable per thread local variable, so it doesn't need to passed
+as a parameter at all.
+
+All of this was pointed out by Tor Lillqvist on the cairo mailing
+list.
+---
+diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
+index cdac0d8..531c8c9 100644
+--- a/pixman/pixman-compiler.h
++++ b/pixman/pixman-compiler.h
+@@ -99,16 +99,16 @@
+ } \
+ \
+ static type * \
+- tls_ ## name ## _alloc (key) \
++ tls_ ## name ## _alloc (void) \
+ { \
+ type *value = calloc (1, sizeof (type)); \
+ if (value) \
+- pthread_setspecific (key, value); \
++ pthread_setspecific (tls_ ## name ## _key, value); \
+ return value; \
+ } \
+ \
+ static force_inline type * \
+- tls_ ## name ## _get (key) \
++ tls_ ## name ## _get (void) \
+ { \
+ type *value = NULL; \
+ if (pthread_once (&tls_ ## name ## _once_control, \
+@@ -116,13 +116,13 @@
+ { \
+ value = pthread_getspecific (tls_ ## name ## _key); \
+ if (!value) \
+- value = tls_ ## name ## _alloc (key); \
++ value = tls_ ## name ## _alloc (); \
+ } \
+ return value; \
+ }
+
+ # define PIXMAN_GET_THREAD_LOCAL(name) \
+- tls_ ## name ## _get (tls_ ## name ## _key)
++ tls_ ## name ## _get ()
+
+ #else
+
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.10.0.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.10.0.bb
new file mode 100644
index 0000000..8690818
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.10.0.bb
@@ -0,0 +1,5 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "41804ac38025102dcc9891dfd4a3d105"
+SRC_URI[archive.sha256sum] = "48625f6b5ce130672942503c683d306d957ee40f59f8e59be6ca30a245ad47d0"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.11.4.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.11.4.bb
new file mode 100644
index 0000000..b058104
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.11.4.bb
@@ -0,0 +1,7 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "8c8afc259af61d42aa9b3d8ec5a9a03b"
+SRC_URI[archive.sha256sum] = "d034f4afb4329c38e8789a5a7a384194c7402094b4c2b7600d2d86d8589e8571"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.11.8.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.11.8.bb
new file mode 100644
index 0000000..d7c6717
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.11.8.bb
@@ -0,0 +1,9 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += " \
+ file://pixman-arm.patch \
+ file://pixman-x888-565.patch \
+ "
+SRC_URI[archive.md5sum] = "7b5db768c51337b5e5e954fc9c961cd3"
+SRC_URI[archive.sha256sum] = "720db5ef6ed0e744b9bac5360ade9a7c024f9fb3fab05c83a90ee28b08e66e01"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.15.18.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.15.18.bb
new file mode 100644
index 0000000..4811a01
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.15.18.bb
@@ -0,0 +1,7 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "9b60fe7623621b546b76777b8b7d2490"
+SRC_URI[archive.sha256sum] = "3a5003cf6c7d5b03ed5977c108ee11410cfd7849eea370eb4feae98f2822c795"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.15.6.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.15.6.bb
new file mode 100644
index 0000000..a09de4e
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.15.6.bb
@@ -0,0 +1,7 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "fe922698df46b21d7e19f28ded4ca100"
+SRC_URI[archive.sha256sum] = "3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.17.12.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.17.12.bb
new file mode 100644
index 0000000..b476aaa
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.17.12.bb
@@ -0,0 +1,24 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += "\
+ file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+ file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+ file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+ file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+ file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
+ file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch \
+ file://over-n-8-0565.patch \
+ file://src-8888-0565.patch \
+"
+SRC_URI[archive.md5sum] = "331415d7a110145cf27aa00e11d0a683"
+SRC_URI[archive.sha256sum] = "8cce103af1b4200a13bedca5b763f74c9bc99a55985ab44ca92ba532dac6b57f"
+
+NEON = " --disable-arm-neon "
+NEON_armv7a = " "
+
+EXTRA_OECONF = "${NEON} --disable-gtk"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "2"
+DEFAULT_PREFERENCE_shr = "2"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.17.8.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.17.8.bb
new file mode 100644
index 0000000..55c70c8
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.17.8.bb
@@ -0,0 +1,23 @@
+require pixman.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += " \
+ file://0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+ file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+ file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+ file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+ file://1-composite.patch \
+ file://2-composite.patch \
+ file://3-composite.patch \
+ "
+SRC_URI[archive.md5sum] = "a7deb2ff6b286b676d67aa6ae91317ae"
+SRC_URI[archive.sha256sum] = "ea24e9003455a0881bd43bf7e4169f2b34c90c8521405103e3490553876a81b4"
+
+NEON = " --disable-arm-neon "
+NEON_armv7a = " "
+
+EXTRA_OECONF = "${NEON} --disable-gtk"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "2"
+DEFAULT_PREFERENCE_shr = "2"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.18.0.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.18.0.bb
new file mode 100644
index 0000000..c099b77
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.18.0.bb
@@ -0,0 +1,24 @@
+require pixman.inc
+PR = "${INC_PR}.3"
+
+SRC_URI += "\
+ file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+ file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+ file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+ file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+ file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
+ file://calloc.patch \
+ file://tls.patch \
+ file://565-scanline.patch \
+ file://missing-cache-preload.diff \
+"
+SRC_URI[archive.md5sum] = "a4fb870fc325be258089f1683642e976"
+SRC_URI[archive.sha256sum] = "b305291bba3d9271a4481e5eedf901025ac8ba4ec8f7b76ccafc5094610cd4ff"
+
+NEON = " --disable-arm-neon "
+NEON_armv7a = " "
+
+EXTRA_OECONF = "${NEON} --disable-gtk"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_shr = "2"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.9.4.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.9.4.bb
new file mode 100644
index 0000000..254bf61
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.9.4.bb
@@ -0,0 +1,7 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Library for lowlevel pixel operations"
+DEPENDS = "virtual/libx11"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "c354ab5b0da10227226d3ef604254875"
+SRC_URI[archive.sha256sum] = "261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_0.9.5.bb b/recipes/obsolete/xorg/xorg-lib/pixman_0.9.5.bb
new file mode 100644
index 0000000..6259dea
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_0.9.5.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+DESCRIPTION = "Library for lowlevel pixel operations"
+DEPENDS = "virtual/libx11"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://dont-copy-unused-bits-to-alpha-channel.patch"
+SRC_URI[archive.md5sum] = "f9fea77e46ec7a3a16e925e137f146e7"
+SRC_URI[archive.sha256sum] = "a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8"
diff --git a/recipes/obsolete/xorg/xorg-lib/pixman_git.bb b/recipes/obsolete/xorg/xorg-lib/pixman_git.bb
new file mode 100644
index 0000000..12140c1
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/pixman_git.bb
@@ -0,0 +1,27 @@
+require pixman.inc
+PV = "0.17.13"
+PR = "${INC_PR}.2"
+PR_append = "+gitr${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/pixman;protocol=git;branch=master \
+ file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+ file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
+ file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
+ file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
+ file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
+ file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch \
+ file://over-n-8-0565.patch \
+ file://src-8888-0565.patch \
+ file://calloc.patch \
+ file://tls.patch \
+"
+
+SRCREV = "69f1ec9a7827aeb522fcae99846237ef0f896e7b"
+S = "${WORKDIR}/git"
+
+NEON = " --disable-arm-neon "
+NEON_armv7a = " "
+
+EXTRA_OECONF = "${NEON} --disable-gtk"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans/fix-missing-includepath.patch b/recipes/obsolete/xorg/xorg-lib/xtrans/fix-missing-includepath.patch
new file mode 100644
index 0000000..043d14f
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans/fix-missing-includepath.patch
@@ -0,0 +1,13 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- xtrans-X11R7.0-1.0.0/xtrans.pc.in~fix-missing-includepath 2005-07-02 20:00:50.000000000 +0200
++++ xtrans-X11R7.0-1.0.0/xtrans.pc.in 2006-08-11 19:27:58.000000000 +0200
+@@ -6,4 +6,4 @@
+ Name: XTrans
+ Description: Abstract network code for X
+ Version: @PACKAGE_VERSION@
+-Cflags: -I${includedir} -D_BSD_SOURCE @fchown_define@ @sticky_bit_define@
++Cflags: -I${includedir} -I${includedir}/X11/Xtrans -D_BSD_SOURCE @fchown_define@ @sticky_bit_define@
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans_1.0.3.bb b/recipes/obsolete/xorg/xorg-lib/xtrans_1.0.3.bb
new file mode 100644
index 0000000..19a56fa
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans_1.0.3.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-missing-includepath.patch"
+SRC_URI[archive.md5sum] = "bb196907ea1e182dcb396eb22f7d2c1a"
+SRC_URI[archive.sha256sum] = "e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085"
+
+FILESPATHPKG .= ":xtrans-${PV}:xtrans"
+
+ALLOW_EMPTY = "1"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans_1.0.4.bb b/recipes/obsolete/xorg/xorg-lib/xtrans_1.0.4.bb
new file mode 100644
index 0000000..d19a6c0
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans_1.0.4.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-missing-includepath.patch"
+SRC_URI[archive.md5sum] = "8b36cdf08df12be96615e3d550236626"
+SRC_URI[archive.sha256sum] = "765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c"
+
+FILESPATHPKG .= ":xtrans-${PV}:xtrans"
+
+ALLOW_EMPTY = "1"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans_1.1.bb b/recipes/obsolete/xorg/xorg-lib/xtrans_1.1.bb
new file mode 100644
index 0000000..1f3fcb4
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans_1.1.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-missing-includepath.patch"
+SRC_URI[archive.md5sum] = "8546e3a060aefb42c889eaa4b5db33af"
+SRC_URI[archive.sha256sum] = "16bc4646f105efd3d0dd105899ac19035d67acf50950ca8c70cf68772508272d"
+
+FILESPATHPKG .= ":xtrans-${PV}:xtrans"
+
+ALLOW_EMPTY = "1"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.1.bb b/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.1.bb
new file mode 100644
index 0000000..e695e35
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.1.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+RDEPENDS_${PN}-dev = ""
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "96e142331edd498a9364887b2548f1bb"
+SRC_URI[archive.sha256sum] = "9ff21a8d9ea524ca9b7cb6d6b4d522b4cb20b1c35edeb8995a9e9265a0df64bd"
+
+FILESPATHPKG .= ":xtrans-${PV}:xtrans"
+
+ALLOW_EMPTY = "1"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.3.bb b/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.3.bb
new file mode 100644
index 0000000..1f0ec39
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.3.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+RDEPENDS_${PN}-dev = ""
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "f9cf791dfad59cf044e276aab3a71e1d"
+SRC_URI[archive.sha256sum] = "a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0"
+
+FILESPATHPKG .= ":xtrans-${PV}:xtrans"
+
+ALLOW_EMPTY = "1"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.bb b/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.bb
new file mode 100644
index 0000000..8a4ddca
--- /dev/null
+++ b/recipes/obsolete/xorg/xorg-lib/xtrans_1.2.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-missing-includepath.patch"
+SRC_URI[archive.md5sum] = "a91fef8b932b21992af7dfff7b2643f3"
+SRC_URI[archive.sha256sum] = "d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4"
+
+FILESPATHPKG .= ":xtrans-${PV}:xtrans"
+
+ALLOW_EMPTY = "1"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/xorg-lib/diet-x11_1.1.1.bb b/recipes/xorg-lib/diet-x11_1.1.1.bb
deleted file mode 100644
index 593ba34..0000000
--- a/recipes/xorg-lib/diet-x11_1.1.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require libx11_${PV}.bb
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://X18NCMSstubs.diff \
- file://fix-disable-xlocale.diff \
- file://fix-utf8-wrong-define.patch \
- file://xim.patch \
- file://xchar2b.patch"
-
-EXTRA_OECONF += "--without-xcb --disable-udc --enable-xcms --disable-xlocale --disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/diet-x11_1.1.2.bb b/recipes/xorg-lib/diet-x11_1.1.2.bb
deleted file mode 100644
index f6291a9..0000000
--- a/recipes/xorg-lib/diet-x11_1.1.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11_${PV}.bb
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://X18NCMSstubs.diff \
- file://fix-disable-xlocale.diff \
- file://fix-utf8-wrong-define.patch"
-
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/diet-x11_1.1.3.bb b/recipes/xorg-lib/diet-x11_1.1.3.bb
deleted file mode 100644
index f6291a9..0000000
--- a/recipes/xorg-lib/diet-x11_1.1.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11_${PV}.bb
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://X18NCMSstubs.diff \
- file://fix-disable-xlocale.diff \
- file://fix-utf8-wrong-define.patch"
-
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/diet-x11_1.1.4.bb b/recipes/xorg-lib/diet-x11_1.1.4.bb
deleted file mode 100644
index f6291a9..0000000
--- a/recipes/xorg-lib/diet-x11_1.1.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11_${PV}.bb
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://X18NCMSstubs.diff \
- file://fix-disable-xlocale.diff \
- file://fix-utf8-wrong-define.patch"
-
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/libapplewm_1.0.0.bb b/recipes/xorg-lib/libapplewm_1.0.0.bb
deleted file mode 100644
index 6e746b4..0000000
--- a/recipes/xorg-lib/libapplewm_1.0.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-DEPENDS += "libxext applewmproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "48a403c45be2206ee900729ced3a0e62"
-SRC_URI[archive.sha256sum] = "ecd2ff407a418eb4ac673f48b4d0a9c5b6860a13cef7211a32fe8f3d3db0407e"
-
-XORG_PN = "libAppleWM"
diff --git a/recipes/xorg-lib/libdmx_1.0.2.bb b/recipes/xorg-lib/libdmx_1.0.2.bb
deleted file mode 100644
index 7d6e025..0000000
--- a/recipes/xorg-lib/libdmx_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Distributed Multihead extension library"
-DEPENDS += "libxext dmxproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4d866967210d06098fc9f302ed4c79b1"
-SRC_URI[archive.sha256sum] = "fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4"
diff --git a/recipes/xorg-lib/libfontenc_1.0.4.bb b/recipes/xorg-lib/libfontenc_1.0.4.bb
deleted file mode 100644
index f16cb77..0000000
--- a/recipes/xorg-lib/libfontenc_1.0.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 font encoding library"
-LICENSE = "BSD-X"
-DEPENDS += "zlib xproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5cd16a2e51ca7b96a3081c7486ff98b9"
-SRC_URI[archive.sha256sum] = "b993aa3d17e845a12a49160b5d96993059ce919c7ba902005b910b867b6258c8"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-lib/libfs_1.0.0.bb b/recipes/xorg-lib/libfs_1.0.0.bb
deleted file mode 100644
index 7f81054..0000000
--- a/recipes/xorg-lib/libfs_1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Font Services library"
-DEPENDS += "xproto fontsproto xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "dfd5de47e232db0891410bec8ee6707b"
-SRC_URI[archive.sha256sum] = "2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde"
-
-XORG_PN = "libFS"
diff --git a/recipes/xorg-lib/libfs_1.0.1.bb b/recipes/xorg-lib/libfs_1.0.1.bb
deleted file mode 100644
index fe1f774..0000000
--- a/recipes/xorg-lib/libfs_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Font Services library"
-DEPENDS += "xproto fontsproto xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "81521249353fa33be7a4bb0062c2fbb9"
-SRC_URI[archive.sha256sum] = "9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5"
-
-XORG_PN = "libFS"
diff --git a/recipes/xorg-lib/libice_1.0.3.bb b/recipes/xorg-lib/libice_1.0.3.bb
deleted file mode 100644
index 52c9de0..0000000
--- a/recipes/xorg-lib/libice_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Inter-Client Exchange library"
-DEPENDS += "xproto xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "071f96648ac25c8e87a3de11a7de2d8a"
-SRC_URI[archive.sha256sum] = "ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libICE"
diff --git a/recipes/xorg-lib/libice_1.0.4.bb b/recipes/xorg-lib/libice_1.0.4.bb
deleted file mode 100644
index 29303c1..0000000
--- a/recipes/xorg-lib/libice_1.0.4.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Inter-Client Exchange library"
-DEPENDS += "xproto xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4ab4e67e0b8845aa201e984153087f4a"
-SRC_URI[archive.sha256sum] = "13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libICE"
diff --git a/recipes/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch b/recipes/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch
new file mode 100644
index 0000000..f9f4a63
--- /dev/null
+++ b/recipes/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch
@@ -0,0 +1,55 @@
+diff -uNr liblbxutil-1.1.0.orig/configure.ac liblbxutil-1.1.0/configure.ac
+--- liblbxutil-1.1.0.orig/configure.ac 2009-12-04 23:52:04.000000000 +0100
++++ liblbxutil-1.1.0/configure.ac 2009-12-16 10:45:00.000000000 +0100
+@@ -50,4 +50,5 @@
+
+ AC_OUTPUT([Makefile
+ src/Makefile
++ src/image/Makefile
+ lbxutil.pc])
+diff -uNr liblbxutil-1.1.0.orig/src/image/Makefile.am liblbxutil-1.1.0/src/image/Makefile.am
+--- liblbxutil-1.1.0.orig/src/image/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ liblbxutil-1.1.0/src/image/Makefile.am 2009-12-16 10:45:00.000000000 +0100
+@@ -0,0 +1,15 @@
++# evil hack
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
++
++CC=$(CC_FOR_BUILD)
++LIBTOOL = @LIBTOOL@ --tag=CC
++
++noinst_PROGRAMS = mkg3states
++
++mkg3states_SOURCES = \
++ mkg3states.c
++
++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+diff -uNr liblbxutil-1.1.0.orig/src/Makefile.am liblbxutil-1.1.0/src/Makefile.am
+--- liblbxutil-1.1.0.orig/src/Makefile.am 2009-12-16 10:48:11.000000000 +0100
++++ liblbxutil-1.1.0/src/Makefile.am 2009-12-16 10:46:47.000000000 +0100
+@@ -3,10 +3,7 @@
+ AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS)
+ INCLUDES = -I$(top_srcdir)/include
+
+-noinst_PROGRAMS = mkg3states
+-
+-mkg3states_SOURCES = \
+- $(srcdir)/image/mkg3states.c
++SUBDIRS = image
+
+ liblbxutil_la_SOURCES = \
+ $(srcdir)/lbx_zlib/reqstats.h \
+@@ -38,9 +35,8 @@
+
+ $(srcdir)/image/dfaxg42d.c: g3states.h
+
+-g3states.h: mkg3states
+- -rm -f g3states.h
+- $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
++g3states.h: image/mkg3states
++ $(AM_V_GEN) ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
+
+ liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+
diff --git a/recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch b/recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch
deleted file mode 100644
index f9f4a63..0000000
--- a/recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -uNr liblbxutil-1.1.0.orig/configure.ac liblbxutil-1.1.0/configure.ac
---- liblbxutil-1.1.0.orig/configure.ac 2009-12-04 23:52:04.000000000 +0100
-+++ liblbxutil-1.1.0/configure.ac 2009-12-16 10:45:00.000000000 +0100
-@@ -50,4 +50,5 @@
-
- AC_OUTPUT([Makefile
- src/Makefile
-+ src/image/Makefile
- lbxutil.pc])
-diff -uNr liblbxutil-1.1.0.orig/src/image/Makefile.am liblbxutil-1.1.0/src/image/Makefile.am
---- liblbxutil-1.1.0.orig/src/image/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ liblbxutil-1.1.0/src/image/Makefile.am 2009-12-16 10:45:00.000000000 +0100
-@@ -0,0 +1,15 @@
-+# evil hack
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-+
-+CC=$(CC_FOR_BUILD)
-+LIBTOOL = @LIBTOOL@ --tag=CC
-+
-+noinst_PROGRAMS = mkg3states
-+
-+mkg3states_SOURCES = \
-+ mkg3states.c
-+
-+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
-+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-diff -uNr liblbxutil-1.1.0.orig/src/Makefile.am liblbxutil-1.1.0/src/Makefile.am
---- liblbxutil-1.1.0.orig/src/Makefile.am 2009-12-16 10:48:11.000000000 +0100
-+++ liblbxutil-1.1.0/src/Makefile.am 2009-12-16 10:46:47.000000000 +0100
-@@ -3,10 +3,7 @@
- AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS)
- INCLUDES = -I$(top_srcdir)/include
-
--noinst_PROGRAMS = mkg3states
--
--mkg3states_SOURCES = \
-- $(srcdir)/image/mkg3states.c
-+SUBDIRS = image
-
- liblbxutil_la_SOURCES = \
- $(srcdir)/lbx_zlib/reqstats.h \
-@@ -38,9 +35,8 @@
-
- $(srcdir)/image/dfaxg42d.c: g3states.h
-
--g3states.h: mkg3states
-- -rm -f g3states.h
-- $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
-+g3states.h: image/mkg3states
-+ $(AM_V_GEN) ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
-
- liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-
diff --git a/recipes/xorg-lib/liblbxutil/mkg3states.patch b/recipes/xorg-lib/liblbxutil/mkg3states.patch
deleted file mode 100644
index 58463db..0000000
--- a/recipes/xorg-lib/liblbxutil/mkg3states.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500
-+++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500
-@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION
-
- AC_OUTPUT([Makefile
- src/Makefile
-+ src/image/Makefile
- lbxutil.pc])
---- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500
-+++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500
-@@ -1,9 +1,6 @@
- lib_LTLIBRARIES = liblbxutil.la
-
--noinst_PROGRAMS = mkg3states
--
--mkg3states_SOURCES = \
-- $(srcdir)/image/mkg3states.c
-+SUBDIRS = image
-
- liblbxutil_la_SOURCES = \
- $(srcdir)/lbx_zlib/reqstats.h \
-@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@
-
- $(srcdir)/image/dfaxg42d.c: g3states.h
-
--g3states.h: mkg3states
-- -rm -f g3states.h
-- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
-+g3states.h: image/mkg3states
-+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
-
- liblbxutil_la_LDFLAGS = -version-number 1:0:0
-
---- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500
-+++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500
-@@ -0,0 +1,15 @@
-+# evil hack
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-+
-+CC=$(CC_FOR_BUILD)
-+LIBTOOL = @LIBTOOL@ --tag=CC
-+
-+noinst_PROGRAMS = mkg3states
-+
-+mkg3states_SOURCES = \
-+ mkg3states.c
-+
-+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
-+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/recipes/xorg-lib/liblbxutil_1.0.1.bb b/recipes/xorg-lib/liblbxutil_1.0.1.bb
deleted file mode 100644
index f51d5ab..0000000
--- a/recipes/xorg-lib/liblbxutil_1.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "XFIXES Extension"
-DEPENDS += " xextproto xproto zlib"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://mkg3states.patch"
-SRC_URI[archive.md5sum] = "b73cbd5bc3cd268722a624a5f1318fde"
-SRC_URI[archive.sha256sum] = "94c31c7090106d3a95e2a7c083961efca1321b970118fe103ab06e5d927b7258"
-
-export CC_FOR_BUILD = "gcc"
diff --git a/recipes/xorg-lib/libpciaccess/fix-mtrr-check.patch b/recipes/xorg-lib/libpciaccess/fix-mtrr-check.patch
deleted file mode 100644
index e2d9f62..0000000
--- a/recipes/xorg-lib/libpciaccess/fix-mtrr-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
---- libpciaccess-0.10.3.orig/configure.ac
-+++ libpciaccess-0.10.3/configure.ac
-@@ -89,12 +89,10 @@ esac
- AM_CONDITIONAL(LINUX, [test "x$linux" = xyes])
- AM_CONDITIONAL(FREEBSD, [test "x$freebsd" = xyes])
- AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
- AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
-
--AC_CHECK_FILE([/usr/include/asm/mtrr.h],
-- [have_mtrr_h="yes"], [have_mtrr_h="no"])
- if test "x$have_mtrr_h" = xyes; then
- AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
- fi
-
- AC_SUBST(PCIACCESS_CFLAGS)
diff --git a/recipes/xorg-lib/libpciaccess_0.10.3.bb b/recipes/xorg-lib/libpciaccess_0.10.3.bb
deleted file mode 100644
index c594dc0..0000000
--- a/recipes/xorg-lib/libpciaccess_0.10.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-lib-common.inc
-DEPENDS += "xproto virtual/libx11"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-mtrr-check.patch"
-SRC_URI[archive.md5sum] = "6d5468debf76fac84576ca26c9535821"
-SRC_URI[archive.sha256sum] = "2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc"
diff --git a/recipes/xorg-lib/libpciaccess_0.11.0.bb b/recipes/xorg-lib/libpciaccess_0.11.0.bb
deleted file mode 100644
index aca0a2f..0000000
--- a/recipes/xorg-lib/libpciaccess_0.11.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-lib-common.inc
-DEPENDS += "xproto virtual/libx11"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "686320dcec98daad0bdfb8894d4f2a2b"
-SRC_URI[archive.sha256sum] = "6e38be12b656c83c66a6fd8ba56c041d8188218278219c88ee635242ec1c7dab"
diff --git a/recipes/xorg-lib/libsm_1.0.2.bb b/recipes/xorg-lib/libsm_1.0.2.bb
deleted file mode 100644
index ee2ff16..0000000
--- a/recipes/xorg-lib/libsm_1.0.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "Session management library"
-PRIORITY = "optional"
-DEPENDS += " libice xproto xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a254771550c01db372e88d1a1dc2e13a"
-SRC_URI[archive.sha256sum] = "e290614797bd626c1b92bac8f83e8954b99bd66e6ecdaa1e935e176df099eba8"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libSM"
diff --git a/recipes/xorg-lib/libsm_1.0.3.bb b/recipes/xorg-lib/libsm_1.0.3.bb
deleted file mode 100644
index 8ca90fe..0000000
--- a/recipes/xorg-lib/libsm_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Session management library"
-DEPENDS += "libice xproto xtrans"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "184cbf502b3cd5d7ba5f9d1290a99606"
-SRC_URI[archive.sha256sum] = "57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libSM"
diff --git a/recipes/xorg-lib/libsm_1.1.0.bb b/recipes/xorg-lib/libsm_1.1.0.bb
deleted file mode 100644
index 1b51b89..0000000
--- a/recipes/xorg-lib/libsm_1.1.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Session management library"
-DEPENDS += "libice xproto xtrans util-linux-ng"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "05a04c2b6382fb0054f6c70494e22733"
-SRC_URI[archive.sha256sum] = "7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libSM"
diff --git a/recipes/xorg-lib/libwindowswm_1.0.0.bb b/recipes/xorg-lib/libwindowswm_1.0.0.bb
deleted file mode 100644
index 35457cb..0000000
--- a/recipes/xorg-lib/libwindowswm_1.0.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-lib-common.inc
-DEPENDS += "libxext windowswmproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "337b379fd00a67345b083100c4e6ba95"
-SRC_URI[archive.sha256sum] = "6ad87266173d21ba7e0e4506db0c094769fd58c3f0b741b37f30c297deec166a"
-
-XORG_PN = "libWindowsWM"
diff --git a/recipes/xorg-lib/libx11-1.0.1/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.0.1/keysymdef_include.patch
deleted file mode 100644
index 5653088..0000000
--- a/recipes/xorg-lib/libx11-1.0.1/keysymdef_include.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
diff --git a/recipes/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
deleted file mode 100644
index ad8b6fc..0000000
--- a/recipes/xorg-lib/libx11-1.0.1/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libX11-1.0.1/src/util/Makefile.am
-===================================================================
---- libX11-1.0.1.old/src/util/Makefile.am
-+++ libX11-1.0.1/src/util/Makefile.am
-@@ -1,10 +1 @@
--# $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)
--
--#override CC = gcc
--LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--
- EXTRA_DIST = mkks.sh
diff --git a/recipes/xorg-lib/libx11-1.0.3/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.0.3/keysymdef_include.patch
deleted file mode 100644
index 5653088..0000000
--- a/recipes/xorg-lib/libx11-1.0.3/keysymdef_include.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
diff --git a/recipes/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
deleted file mode 100644
index ad8b6fc..0000000
--- a/recipes/xorg-lib/libx11-1.0.3/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libX11-1.0.1/src/util/Makefile.am
-===================================================================
---- libX11-1.0.1.old/src/util/Makefile.am
-+++ libX11-1.0.1/src/util/Makefile.am
-@@ -1,10 +1 @@
--# $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)
--
--#override CC = gcc
--LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--
- EXTRA_DIST = mkks.sh
diff --git a/recipes/xorg-lib/libx11-1.1.1/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.1/keysymdef_include.patch
deleted file mode 100644
index 5653088..0000000
--- a/recipes/xorg-lib/libx11-1.1.1/keysymdef_include.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
diff --git a/recipes/xorg-lib/libx11-1.1.2/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.2/keysymdef_include.patch
deleted file mode 100644
index 5653088..0000000
--- a/recipes/xorg-lib/libx11-1.1.2/keysymdef_include.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
diff --git a/recipes/xorg-lib/libx11-1.1.3/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.3/keysymdef_include.patch
deleted file mode 100644
index 5653088..0000000
--- a/recipes/xorg-lib/libx11-1.1.3/keysymdef_include.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
diff --git a/recipes/xorg-lib/libx11-1.1.4/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.4/keysymdef_include.patch
deleted file mode 100644
index 5653088..0000000
--- a/recipes/xorg-lib/libx11-1.1.4/keysymdef_include.patch
+++ /dev/null
@@ -1,62 +0,0 @@
----
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
diff --git a/recipes/xorg-lib/libx11-1.1.5/X18NCMSstubs.diff b/recipes/xorg-lib/libx11-1.1.5/X18NCMSstubs.diff
new file mode 100644
index 0000000..54b1727
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/X18NCMSstubs.diff
@@ -0,0 +1,528 @@
+--- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100
+@@ -83,6 +83,7 @@
+ * from UCS char to specified charset char.
+ * This converter is needed for _XimGetCharCode subroutine.
+ */
++#ifdef XLOCALE
+ XPointer
+ _XimGetLocaleCode (
+ _Xconst char* encoding_name)
+@@ -96,6 +97,7 @@
+ }
+ return cvt;
+ }
++#endif
+
+ /*
+ * Returns the locale dependent representation of a keysym.
+@@ -107,6 +109,7 @@
+ * locale
+ */
+ /*ARGSUSED*/
++#ifdef XLOCALE
+ int
+ _XimGetCharCode (
+ XPointer ucs_conv,
+@@ -135,6 +138,7 @@
+ buf[count]= '\0';
+ return count;
+ }
++#endif
+
+ #ifdef XKB
+ static int lookup_string(
+--- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100
+@@ -0,0 +1,428 @@
++/*
++ * X18NCMSstubs.c
++ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
++ *
++ * Copyright © 2003 Matthew Allum
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Matthew Allum not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Keith Packard and Compaq makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
++ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include <stdlib.h>
++#include "Xlibint.h"
++#include "Xlcint.h"
++#include <X11/Xlocale.h>
++#include <X11/Xos.h>
++#ifdef WIN32
++#undef close
++#endif
++#include <X11/Xutil.h>
++#include "XlcPubI.h"
++
++#include "Xcmsint.h" /* for XcmsCCC type */
++#include "XlcPubI.h" /* for XLCd type */
++#include "config.h"
++
++#if ! XLOCALE
++
++Bool
++XSupportsLocale()
++{
++ return False;
++}
++
++char *
++XSetLocaleModifiers(
++ const char *modifiers)
++{
++ return NULL;
++}
++
++XLCd
++_XOpenLC(
++ char *name)
++{
++ return NULL;
++}
++
++XLCd
++_XlcCurrentLC()
++{
++ return NULL;
++}
++
++void
++_XlcVaToArgList(
++ va_list var,
++ int count,
++ XlcArgList *args_ret)
++{
++ return;
++}
++
++void
++_XlcCountVaList(
++ va_list var,
++ int *count_ret)
++{
++ return;
++}
++
++void
++_XCloseLC(
++ XLCd lcd)
++{
++ return;
++}
++
++int
++_XlcConvert(
++ XlcConv conv,
++ XPointer *from,
++ int *from_left,
++ XPointer *to,
++ int *to_left,
++ XPointer *args,
++ int num_args)
++{
++ return 0;
++}
++
++/* XIM Stubs */
++
++XPointer
++_XimGetLocaleCode ( _Xconst char* encoding_name )
++{
++ return NULL;
++}
++
++int
++_XimGetCharCode (
++ XPointer ucs_conv,
++ KeySym keysym,
++ unsigned char* buf,
++ int nbytes)
++{
++ return 0;
++}
++
++/* Xrm Stubs */
++
++XrmMethods
++_XrmInitParseInfo(
++ XPointer *state)
++{
++ return (XrmMethods) NULL;
++}
++
++/* Xwc Stubs */
++
++int
++XwcTextExtents(
++ XFontSet font_set,
++ _Xconst wchar_t *text,
++ int text_len,
++ XRectangle *overall_ink_extents,
++ XRectangle *overall_logical_extents)
++{
++ return 0;
++}
++
++void
++XwcDrawString(Display *display,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x, int y,
++ _Xconst wchar_t *string,
++ int num_wchars)
++{
++ ;
++}
++
++void
++XwcDrawText(
++ Display *dpy,
++ Drawable d,
++ GC gc,
++ int x,
++ int y,
++ XwcTextItem *text_items,
++ int nitems)
++{
++ ;
++}
++
++void
++XwcDrawImageString(
++ Display *dpy,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x,
++ int y,
++ _Xconst wchar_t *text,
++ int text_len)
++{
++ ;
++}
++
++int
++XwcTextEscapement(
++ XFontSet font_set,
++ _Xconst wchar_t *text,
++ int text_len)
++{
++ return 0;
++}
++
++Status
++XwcTextPerCharExtents(
++ XFontSet font_set,
++ _Xconst wchar_t *text,
++ int text_len,
++ XRectangle *ink_extents_buffer,
++ XRectangle *logical_extents_buffer,
++ int buffer_size,
++ int *num_chars,
++ XRectangle *max_ink_extents,
++ XRectangle *max_logical_extents)
++{
++ ;
++}
++
++int
++XwcTextPropertyToTextList(
++ Display *dpy,
++ const XTextProperty *text_prop,
++ wchar_t ***list_ret,
++ int *count_ret)
++{
++ return 0;
++}
++
++int
++XwcTextListToTextProperty(
++ Display *dpy,
++ wchar_t **list,
++ int count,
++ XICCEncodingStyle style,
++ XTextProperty *text_prop)
++{
++ return 0;
++}
++
++void
++XwcFreeStringList(wchar_t **list)
++{
++ return;
++}
++
++
++void XmbSetWMProperties ( /* Actually from mbWMProps.c */
++ Display *dpy,
++ Window w,
++ _Xconst char *windowName,
++ _Xconst char *iconName,
++ char **argv,
++ int argc,
++ XSizeHints *sizeHints,
++ XWMHints *wmHints,
++ XClassHint *classHints)
++{
++ return;
++}
++
++int
++XmbTextPropertyToTextList(
++ Display *dpy,
++ const XTextProperty *text_prop,
++ char ***list_ret,
++ int *count_ret)
++{
++ return XLocaleNotSupported;
++}
++
++int
++XmbTextListToTextProperty(
++ Display *dpy,
++ char **list,
++ int count,
++ XICCEncodingStyle style,
++ XTextProperty *text_prop)
++{
++ return XLocaleNotSupported;
++}
++
++int
++XmbTextExtents(
++ XFontSet font_set,
++ _Xconst char *text,
++ int text_len,
++ XRectangle *overall_ink_extents,
++ XRectangle *overall_logical_extents)
++{
++ return 0;
++}
++
++void
++XmbDrawText(
++ Display *dpy,
++ Drawable d,
++ GC gc,
++ int x,
++ int y,
++ XmbTextItem *text_items,
++ int nitems)
++{
++ ;
++}
++
++void
++XmbDrawString(
++ Display *dpy,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x,
++ int y,
++ _Xconst char *text,
++ int text_len)
++{
++ ;
++}
++
++void
++XmbDrawImageString(
++ Display *dpy,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x,
++ int y,
++ _Xconst char *text,
++ int text_len)
++{
++ ;
++}
++
++int
++XmbTextEscapement(
++ XFontSet font_set,
++ _Xconst char *text,
++ int text_len)
++{
++ return 0;
++}
++
++Status
++XmbTextPerCharExtents(
++ XFontSet font_set,
++ _Xconst char *text,
++ int text_len,
++ XRectangle *ink_extents_buffer,
++ XRectangle *logical_extents_buffer,
++ int buffer_size,
++ int *num_chars,
++ XRectangle *max_ink_extents,
++ XRectangle *max_logical_extents)
++{
++ return 0;
++}
++
++unsigned int
++KeySymToUcs4(KeySym keysym)
++{
++ return 0;
++}
++
++#endif
++
++#if ! XCMS
++
++XcmsCCC
++XcmsCCCOfColormap(dpy, cmap)
++ Display *dpy;
++ Colormap cmap;
++{
++ return NULL;
++}
++
++Status
++_XcmsResolveColorString (
++ XcmsCCC ccc,
++ const char **color_string,
++ XcmsColor *pColor_exact_return,
++ XcmsColorFormat result_format)
++{
++ return(XcmsFailure);
++}
++
++void
++_XcmsUnresolveColor(
++ XcmsCCC ccc,
++ XcmsColor *pColor)
++{
++ return;
++}
++
++void
++_XUnresolveColor(
++ XcmsCCC ccc,
++ XColor *pXColor)
++{
++ return;
++}
++
++XcmsCmapRec *
++_XcmsAddCmapRec(dpy, cmap, windowID, visual)
++ Display *dpy;
++ Colormap cmap;
++ Window windowID;
++ Visual *visual;
++{
++ return NULL;
++}
++
++void
++_XcmsRGB_to_XColor(
++ XcmsColor *pColors,
++ XColor *pXColors,
++ unsigned int nColors)
++{
++ return;
++}
++
++XcmsCmapRec *
++_XcmsCopyCmapRecAndFree(
++ Display *dpy,
++ Colormap src_cmap,
++ Colormap copy_cmap)
++{
++ return NULL;
++}
++
++void
++_XcmsDeleteCmapRec(
++ Display *dpy,
++ Colormap cmap)
++{
++ return;
++}
++
++#endif
+--- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100
+@@ -331,6 +331,8 @@
+ libX11_la_SOURCES+=UIThrStubs.c
+ endif
+
++libX11_la_SOURCES+=X18NCMSstubs.c
++
+ x11datadir = @X11_DATADIR@
+ x11data_DATA = XKeysymDB XErrorDB
+
+@@ -338,7 +340,8 @@
+ $(x11data_DATA) \
+ os2Stubs.c \
+ udcInf.c \
+- UIThrStubs.c
++ UIThrStubs.c \
++ X18NCMSstubs.c
+
+ #
+ # Figure out which sub-libraries to link into Xlib
+--- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100
+@@ -55,7 +55,9 @@
+ #define NUM_FREE_CVLS 4
+
+ /* in lcWrap.c */
++#ifdef XLOCALE
+ extern LockInfoPtr _Xi18n_lock;
++#endif
+
+ #ifdef WIN32
+ static DWORD _X_TlsIndex = (DWORD)-1;
+@@ -625,9 +627,11 @@
+ _Xglobal_lock = &global_lock;
+ xmutex_init(_Xglobal_lock->lock);
+ xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
++#ifdef XLOCALE
+ _Xi18n_lock = &i18n_lock;
+ xmutex_init(_Xi18n_lock->lock);
+ xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
++#endif
+ _XLockMutex_fn = _XLockMutex;
+ _XUnlockMutex_fn = _XUnlockMutex;
+ _XCreateMutex_fn = _XCreateMutex;
+--- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100
++++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100
+@@ -215,7 +215,14 @@
+ esac
+ AC_SUBST(KEYSYMDEF)
+
+-AM_CONDITIONAL(UDC, test xfalse = xtrue)
++AC_ARG_ENABLE(udc,
++ AC_HELP_STRING([--disable-udc],
++ [Disable Xlib support for UDC *EXPERIMENTAL*]),
++ [UDC=$enableval],[UDC=yes])
++AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
++if test x"$UDC" = "xyes"; then
++ AC_DEFINE(UDC,1,[Include support for UDC])
++fi
+
+ AC_ARG_ENABLE(xcms,
+ AC_HELP_STRING([--disable-xcms],
diff --git a/recipes/xorg-lib/libx11-1.1.5/dolt-fix.patch b/recipes/xorg-lib/libx11-1.1.5/dolt-fix.patch
new file mode 100644
index 0000000..ea1a8bd
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/dolt-fix.patch
@@ -0,0 +1,21 @@
+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__
+
diff --git a/recipes/xorg-lib/libx11-1.1.5/fix-disable-xlocale.diff b/recipes/xorg-lib/libx11-1.1.5/fix-disable-xlocale.diff
new file mode 100644
index 0000000..9dbf6da
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/fix-disable-xlocale.diff
@@ -0,0 +1,14 @@
+--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
+@@ -701,7 +701,11 @@
+ }
+ if (l - 2 - (p - charset) < 0)
+ return 0;
++#ifdef XLOCALE
+ if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
++#else
++ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
++#endif
+ return 0;
+ if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
+ return 0;
diff --git a/recipes/xorg-lib/libx11-1.1.5/fix-utf8-wrong-define.patch b/recipes/xorg-lib/libx11-1.1.5/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000..a098db1
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/fix-utf8-wrong-define.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
++++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
+@@ -103,7 +103,7 @@
+
+ /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
+ November 2000. Its presence is indicated through the following macro. */
+-#define X_HAVE_UTF8_STRING 1
++#undef X_HAVE_UTF8_STRING
+
+ typedef char *XPointer;
+
diff --git a/recipes/xorg-lib/libx11-1.1.5/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.1.5/keysymdef_include.patch
new file mode 100644
index 0000000..07487b6
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/keysymdef_include.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.1.5/configure.ac
+===================================================================
+--- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000
++++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000
+@@ -221,13 +221,21 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ dir=`pkg-config --variable=includedir xproto`
++ KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
++
+ if test -f "$KEYSYMDEF"; then
+- AC_MSG_RESULT([$KEYSYMDEF])
++ AC_MSG_RESULT([$KEYSYMDEF])
+ else
+ AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
++
+ AC_SUBST(KEYSYMDEF)
+
+ AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/recipes/xorg-lib/libx11-1.1.5/makekeys-update.patch b/recipes/xorg-lib/libx11-1.1.5/makekeys-update.patch
new file mode 100644
index 0000000..323dbbb
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/makekeys-update.patch
@@ -0,0 +1,87 @@
+From f8613deafdc7c6f3be49c3448e011426bcfdf78e Mon Sep 17 00:00:00 2001
+From: Holger Hans Peter Freyther <zecke@selfish.org>
+Date: Tue, 28 Jul 2009 03:20:20 +0200
+Subject: [PATCH] makekeys.c: Replace with the latest version to fix a segfault
+
+Fix a crash..
+---
+ src/util/makekeys.c | 28 +++++++++++++++++-----------
+ 1 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index 214ea5c..3fe8a96 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -36,13 +36,10 @@ from The Open Group.
+ #include <X11/keysymdef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */
+-char *malloc();
+-#endif /* macII */
+
+ typedef unsigned long Signature;
+
+-#define KTNUM 3000
++#define KTNUM 4000
+
+ static struct info {
+ char *name;
+@@ -52,11 +49,11 @@ static struct info {
+ #define MIN_REHASH 15
+ #define MATCHES 10
+
+-char tab[KTNUM];
+-unsigned short offsets[KTNUM];
+-unsigned short indexes[KTNUM];
+-KeySym values[KTNUM];
+-char buf[1024];
++static char tab[KTNUM];
++static unsigned short offsets[KTNUM];
++static unsigned short indexes[KTNUM];
++static KeySym values[KTNUM];
++static char buf[1024];
+
+ int
+ main(int argc, char *argv[])
+@@ -103,12 +100,11 @@ main(int argc, char *argv[])
+ key);
+ continue;
+ }
+- name = malloc((unsigned)strlen(key)+1);
++ name = strdup(key);
+ if (!name) {
+ fprintf(stderr, "makekeys: out of memory!\n");
+ exit(1);
+ }
+- (void)strcpy(name, key);
+ info[ksnum].name = name;
+ ksnum++;
+ if (ksnum == KTNUM) {
+@@ -157,6 +153,11 @@ next1: ;
+ }
+
+ z = best_z;
++ if (z == 0) {
++ fprintf(stderr, "makekeys: failed to find small enough hash!\n"
++ "Try increasing KTNUM in makekeys.c\n");
++ exit(1);
++ }
+ printf("#ifdef NEEDKTABLE\n");
+ printf("const unsigned char _XkeyTable[] = {\n");
+ printf("0,\n");
+@@ -237,6 +238,11 @@ next2: ;
+ }
+
+ z = best_z;
++ if (z == 0) {
++ fprintf(stderr, "makekeys: failed to find small enough hash!\n"
++ "Try increasing KTNUM in makekeys.c\n");
++ exit(1);
++ }
+ for (i = z; --i >= 0;)
+ offsets[i] = 0;
+ for (i = 0; i < ksnum; i++) {
+--
+1.6.3.3
+
diff --git a/recipes/xorg-lib/libx11-1.1.5/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.1.5/x11_disable_makekeys.patch
new file mode 100644
index 0000000..2a8a55c
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.1.5/x11_disable_makekeys.patch
@@ -0,0 +1,30 @@
+---
+ src/util/Makefile.am | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+Index: libX11-1.1.2/src/util/Makefile.am
+===================================================================
+--- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100
++++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100
+@@ -1,21 +1,4 @@
+ # $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)
+-
+-#override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-
+ 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
diff --git a/recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch
deleted file mode 100644
index 9e9e75e..0000000
--- a/recipes/xorg-lib/libx11-1.2/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- /tmp/Makefile.am 2009-05-27 22:19:39.000000000 +0200
-+++ libX11-1.2/src/util/Makefile.am 2009-05-27 22:21:31.000000000 +0200
-@@ -1,20 +1 @@
--# $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
diff --git a/recipes/xorg-lib/libx11-1.3.2/dolt-fix.patch b/recipes/xorg-lib/libx11-1.3.2/dolt-fix.patch
new file mode 100644
index 0000000..ea1a8bd
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.2/dolt-fix.patch
@@ -0,0 +1,21 @@
+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__
+
diff --git a/recipes/xorg-lib/libx11-1.3.2/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.2/keysymdef_include.patch
new file mode 100644
index 0000000..07487b6
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.2/keysymdef_include.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.1.5/configure.ac
+===================================================================
+--- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000
++++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000
+@@ -221,13 +221,21 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ dir=`pkg-config --variable=includedir xproto`
++ KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
++
+ if test -f "$KEYSYMDEF"; then
+- AC_MSG_RESULT([$KEYSYMDEF])
++ AC_MSG_RESULT([$KEYSYMDEF])
+ else
+ AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
++
+ AC_SUBST(KEYSYMDEF)
+
+ AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch b/recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
deleted file mode 100644
index 7e96075..0000000
--- a/recipes/xorg-lib/libx11-1.3.3+git/dolt-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: libX11-1.3.4/m4/dolt.m4
-===================================================================
---- libX11-1.3.4/m4/dolt.m4
-+++ libX11-1.3.4/m4/dolt.m4
-@@ -155,7 +155,7 @@ dnl without '=', because automake does n
- 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=()
-@@ -171,7 +171,7 @@ done
- 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__
-
diff --git a/recipes/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
deleted file mode 100644
index 07487b6..0000000
--- a/recipes/xorg-lib/libx11-1.3.3+git/keysymdef_include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: libX11-1.1.5/configure.ac
-===================================================================
---- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000
-+++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000
-@@ -221,13 +221,21 @@
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysymdef.h])
--dir=`pkg-config --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ dir=`pkg-config --variable=includedir xproto`
-+ KEYSYMDEF="$dir/X11/keysymdef.h"
-+fi
-+
- if test -f "$KEYSYMDEF"; then
-- AC_MSG_RESULT([$KEYSYMDEF])
-+ AC_MSG_RESULT([$KEYSYMDEF])
- else
- AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
-+
- AC_SUBST(KEYSYMDEF)
-
- AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/recipes/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
deleted file mode 100644
index 0739632..0000000
--- a/recipes/xorg-lib/libx11-1.3.3+git/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: git/src/util/Makefile.am
-===================================================================
---- git.orig/src/util/Makefile.am
-+++ git/src/util/Makefile.am
-@@ -1,21 +1 @@
--
--noinst_PROGRAMS=makekeys
--
--makekeys_CFLAGS = \
-- $(X11_CFLAGS) \
-- $(CWARNFLAGS)
--
--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
diff --git a/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
deleted file mode 100644
index 5d0a24c..0000000
--- a/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uNr libX11-1.3.3.orig/src/util/Makefile.am libX11-1.3.3/src/util/Makefile.am
---- libX11-1.3.3.orig/src/util/Makefile.am 2010-01-15 02:11:36.000000000 +0100
-+++ libX11-1.3.3/src/util/Makefile.am 2010-01-18 14:48:27.000000000 +0100
-@@ -1,19 +1 @@
--
--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
diff --git a/recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch b/recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch
deleted file mode 100644
index 7e96075..0000000
--- a/recipes/xorg-lib/libx11-1.3.4/dolt-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: libX11-1.3.4/m4/dolt.m4
-===================================================================
---- libX11-1.3.4/m4/dolt.m4
-+++ libX11-1.3.4/m4/dolt.m4
-@@ -155,7 +155,7 @@ dnl without '=', because automake does n
- 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=()
-@@ -171,7 +171,7 @@ done
- 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__
-
diff --git a/recipes/xorg-lib/libx11-1.3.4/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.4/keysymdef_include.patch
deleted file mode 100644
index 0cab165..0000000
--- a/recipes/xorg-lib/libx11-1.3.4/keysymdef_include.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: libX11-1.3.4/configure.ac
-===================================================================
---- libX11-1.3.4.orig/configure.ac
-+++ libX11-1.3.4/configure.ac
-@@ -355,8 +355,14 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysymdef.h])
--dir=`$PKG_CONFIG --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ dir=`${PKG_CONFIG} --variable=includedir xproto`
-+ KEYSYMDEF="$dir/X11/keysymdef.h"
-+fi
- if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
- else
diff --git a/recipes/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
deleted file mode 100644
index 9763313..0000000
--- a/recipes/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: libX11-1.3.4/src/util/Makefile.am
-===================================================================
---- libX11-1.3.4.orig/src/util/Makefile.am
-+++ libX11-1.3.4/src/util/Makefile.am
-@@ -1,24 +1 @@
--
--noinst_PROGRAMS=makekeys
--
--makekeys_CFLAGS = \
-- $(X11_CFLAGS) \
-- $(CWARNFLAGS)
--
--CC = @CC_FOR_BUILD@
--CPPFLAGS = @CPPFLAGS_FOR_BUILD@
--CFLAGS = @CFLAGS_FOR_BUILD@
--LDFLAGS = @LDFLAGS_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
diff --git a/recipes/xorg-lib/libx11/X18NCMSstubs.diff b/recipes/xorg-lib/libx11/X18NCMSstubs.diff
deleted file mode 100644
index 54b1727..0000000
--- a/recipes/xorg-lib/libx11/X18NCMSstubs.diff
+++ /dev/null
@@ -1,528 +0,0 @@
---- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100
-@@ -83,6 +83,7 @@
- * from UCS char to specified charset char.
- * This converter is needed for _XimGetCharCode subroutine.
- */
-+#ifdef XLOCALE
- XPointer
- _XimGetLocaleCode (
- _Xconst char* encoding_name)
-@@ -96,6 +97,7 @@
- }
- return cvt;
- }
-+#endif
-
- /*
- * Returns the locale dependent representation of a keysym.
-@@ -107,6 +109,7 @@
- * locale
- */
- /*ARGSUSED*/
-+#ifdef XLOCALE
- int
- _XimGetCharCode (
- XPointer ucs_conv,
-@@ -135,6 +138,7 @@
- buf[count]= '\0';
- return count;
- }
-+#endif
-
- #ifdef XKB
- static int lookup_string(
---- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100
-@@ -0,0 +1,428 @@
-+/*
-+ * X18NCMSstubs.c
-+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
-+ *
-+ * Copyright © 2003 Matthew Allum
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Matthew Allum not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Keith Packard and Compaq makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <stdlib.h>
-+#include "Xlibint.h"
-+#include "Xlcint.h"
-+#include <X11/Xlocale.h>
-+#include <X11/Xos.h>
-+#ifdef WIN32
-+#undef close
-+#endif
-+#include <X11/Xutil.h>
-+#include "XlcPubI.h"
-+
-+#include "Xcmsint.h" /* for XcmsCCC type */
-+#include "XlcPubI.h" /* for XLCd type */
-+#include "config.h"
-+
-+#if ! XLOCALE
-+
-+Bool
-+XSupportsLocale()
-+{
-+ return False;
-+}
-+
-+char *
-+XSetLocaleModifiers(
-+ const char *modifiers)
-+{
-+ return NULL;
-+}
-+
-+XLCd
-+_XOpenLC(
-+ char *name)
-+{
-+ return NULL;
-+}
-+
-+XLCd
-+_XlcCurrentLC()
-+{
-+ return NULL;
-+}
-+
-+void
-+_XlcVaToArgList(
-+ va_list var,
-+ int count,
-+ XlcArgList *args_ret)
-+{
-+ return;
-+}
-+
-+void
-+_XlcCountVaList(
-+ va_list var,
-+ int *count_ret)
-+{
-+ return;
-+}
-+
-+void
-+_XCloseLC(
-+ XLCd lcd)
-+{
-+ return;
-+}
-+
-+int
-+_XlcConvert(
-+ XlcConv conv,
-+ XPointer *from,
-+ int *from_left,
-+ XPointer *to,
-+ int *to_left,
-+ XPointer *args,
-+ int num_args)
-+{
-+ return 0;
-+}
-+
-+/* XIM Stubs */
-+
-+XPointer
-+_XimGetLocaleCode ( _Xconst char* encoding_name )
-+{
-+ return NULL;
-+}
-+
-+int
-+_XimGetCharCode (
-+ XPointer ucs_conv,
-+ KeySym keysym,
-+ unsigned char* buf,
-+ int nbytes)
-+{
-+ return 0;
-+}
-+
-+/* Xrm Stubs */
-+
-+XrmMethods
-+_XrmInitParseInfo(
-+ XPointer *state)
-+{
-+ return (XrmMethods) NULL;
-+}
-+
-+/* Xwc Stubs */
-+
-+int
-+XwcTextExtents(
-+ XFontSet font_set,
-+ _Xconst wchar_t *text,
-+ int text_len,
-+ XRectangle *overall_ink_extents,
-+ XRectangle *overall_logical_extents)
-+{
-+ return 0;
-+}
-+
-+void
-+XwcDrawString(Display *display,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x, int y,
-+ _Xconst wchar_t *string,
-+ int num_wchars)
-+{
-+ ;
-+}
-+
-+void
-+XwcDrawText(
-+ Display *dpy,
-+ Drawable d,
-+ GC gc,
-+ int x,
-+ int y,
-+ XwcTextItem *text_items,
-+ int nitems)
-+{
-+ ;
-+}
-+
-+void
-+XwcDrawImageString(
-+ Display *dpy,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x,
-+ int y,
-+ _Xconst wchar_t *text,
-+ int text_len)
-+{
-+ ;
-+}
-+
-+int
-+XwcTextEscapement(
-+ XFontSet font_set,
-+ _Xconst wchar_t *text,
-+ int text_len)
-+{
-+ return 0;
-+}
-+
-+Status
-+XwcTextPerCharExtents(
-+ XFontSet font_set,
-+ _Xconst wchar_t *text,
-+ int text_len,
-+ XRectangle *ink_extents_buffer,
-+ XRectangle *logical_extents_buffer,
-+ int buffer_size,
-+ int *num_chars,
-+ XRectangle *max_ink_extents,
-+ XRectangle *max_logical_extents)
-+{
-+ ;
-+}
-+
-+int
-+XwcTextPropertyToTextList(
-+ Display *dpy,
-+ const XTextProperty *text_prop,
-+ wchar_t ***list_ret,
-+ int *count_ret)
-+{
-+ return 0;
-+}
-+
-+int
-+XwcTextListToTextProperty(
-+ Display *dpy,
-+ wchar_t **list,
-+ int count,
-+ XICCEncodingStyle style,
-+ XTextProperty *text_prop)
-+{
-+ return 0;
-+}
-+
-+void
-+XwcFreeStringList(wchar_t **list)
-+{
-+ return;
-+}
-+
-+
-+void XmbSetWMProperties ( /* Actually from mbWMProps.c */
-+ Display *dpy,
-+ Window w,
-+ _Xconst char *windowName,
-+ _Xconst char *iconName,
-+ char **argv,
-+ int argc,
-+ XSizeHints *sizeHints,
-+ XWMHints *wmHints,
-+ XClassHint *classHints)
-+{
-+ return;
-+}
-+
-+int
-+XmbTextPropertyToTextList(
-+ Display *dpy,
-+ const XTextProperty *text_prop,
-+ char ***list_ret,
-+ int *count_ret)
-+{
-+ return XLocaleNotSupported;
-+}
-+
-+int
-+XmbTextListToTextProperty(
-+ Display *dpy,
-+ char **list,
-+ int count,
-+ XICCEncodingStyle style,
-+ XTextProperty *text_prop)
-+{
-+ return XLocaleNotSupported;
-+}
-+
-+int
-+XmbTextExtents(
-+ XFontSet font_set,
-+ _Xconst char *text,
-+ int text_len,
-+ XRectangle *overall_ink_extents,
-+ XRectangle *overall_logical_extents)
-+{
-+ return 0;
-+}
-+
-+void
-+XmbDrawText(
-+ Display *dpy,
-+ Drawable d,
-+ GC gc,
-+ int x,
-+ int y,
-+ XmbTextItem *text_items,
-+ int nitems)
-+{
-+ ;
-+}
-+
-+void
-+XmbDrawString(
-+ Display *dpy,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x,
-+ int y,
-+ _Xconst char *text,
-+ int text_len)
-+{
-+ ;
-+}
-+
-+void
-+XmbDrawImageString(
-+ Display *dpy,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x,
-+ int y,
-+ _Xconst char *text,
-+ int text_len)
-+{
-+ ;
-+}
-+
-+int
-+XmbTextEscapement(
-+ XFontSet font_set,
-+ _Xconst char *text,
-+ int text_len)
-+{
-+ return 0;
-+}
-+
-+Status
-+XmbTextPerCharExtents(
-+ XFontSet font_set,
-+ _Xconst char *text,
-+ int text_len,
-+ XRectangle *ink_extents_buffer,
-+ XRectangle *logical_extents_buffer,
-+ int buffer_size,
-+ int *num_chars,
-+ XRectangle *max_ink_extents,
-+ XRectangle *max_logical_extents)
-+{
-+ return 0;
-+}
-+
-+unsigned int
-+KeySymToUcs4(KeySym keysym)
-+{
-+ return 0;
-+}
-+
-+#endif
-+
-+#if ! XCMS
-+
-+XcmsCCC
-+XcmsCCCOfColormap(dpy, cmap)
-+ Display *dpy;
-+ Colormap cmap;
-+{
-+ return NULL;
-+}
-+
-+Status
-+_XcmsResolveColorString (
-+ XcmsCCC ccc,
-+ const char **color_string,
-+ XcmsColor *pColor_exact_return,
-+ XcmsColorFormat result_format)
-+{
-+ return(XcmsFailure);
-+}
-+
-+void
-+_XcmsUnresolveColor(
-+ XcmsCCC ccc,
-+ XcmsColor *pColor)
-+{
-+ return;
-+}
-+
-+void
-+_XUnresolveColor(
-+ XcmsCCC ccc,
-+ XColor *pXColor)
-+{
-+ return;
-+}
-+
-+XcmsCmapRec *
-+_XcmsAddCmapRec(dpy, cmap, windowID, visual)
-+ Display *dpy;
-+ Colormap cmap;
-+ Window windowID;
-+ Visual *visual;
-+{
-+ return NULL;
-+}
-+
-+void
-+_XcmsRGB_to_XColor(
-+ XcmsColor *pColors,
-+ XColor *pXColors,
-+ unsigned int nColors)
-+{
-+ return;
-+}
-+
-+XcmsCmapRec *
-+_XcmsCopyCmapRecAndFree(
-+ Display *dpy,
-+ Colormap src_cmap,
-+ Colormap copy_cmap)
-+{
-+ return NULL;
-+}
-+
-+void
-+_XcmsDeleteCmapRec(
-+ Display *dpy,
-+ Colormap cmap)
-+{
-+ return;
-+}
-+
-+#endif
---- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100
-@@ -331,6 +331,8 @@
- libX11_la_SOURCES+=UIThrStubs.c
- endif
-
-+libX11_la_SOURCES+=X18NCMSstubs.c
-+
- x11datadir = @X11_DATADIR@
- x11data_DATA = XKeysymDB XErrorDB
-
-@@ -338,7 +340,8 @@
- $(x11data_DATA) \
- os2Stubs.c \
- udcInf.c \
-- UIThrStubs.c
-+ UIThrStubs.c \
-+ X18NCMSstubs.c
-
- #
- # Figure out which sub-libraries to link into Xlib
---- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100
-@@ -55,7 +55,9 @@
- #define NUM_FREE_CVLS 4
-
- /* in lcWrap.c */
-+#ifdef XLOCALE
- extern LockInfoPtr _Xi18n_lock;
-+#endif
-
- #ifdef WIN32
- static DWORD _X_TlsIndex = (DWORD)-1;
-@@ -625,9 +627,11 @@
- _Xglobal_lock = &global_lock;
- xmutex_init(_Xglobal_lock->lock);
- xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
-+#ifdef XLOCALE
- _Xi18n_lock = &i18n_lock;
- xmutex_init(_Xi18n_lock->lock);
- xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
-+#endif
- _XLockMutex_fn = _XLockMutex;
- _XUnlockMutex_fn = _XUnlockMutex;
- _XCreateMutex_fn = _XCreateMutex;
---- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100
-@@ -215,7 +215,14 @@
- esac
- AC_SUBST(KEYSYMDEF)
-
--AM_CONDITIONAL(UDC, test xfalse = xtrue)
-+AC_ARG_ENABLE(udc,
-+ AC_HELP_STRING([--disable-udc],
-+ [Disable Xlib support for UDC *EXPERIMENTAL*]),
-+ [UDC=$enableval],[UDC=yes])
-+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
-+if test x"$UDC" = "xyes"; then
-+ AC_DEFINE(UDC,1,[Include support for UDC])
-+fi
-
- AC_ARG_ENABLE(xcms,
- AC_HELP_STRING([--disable-xcms],
diff --git a/recipes/xorg-lib/libx11/dolt-fix.patch b/recipes/xorg-lib/libx11/dolt-fix.patch
deleted file mode 100644
index ea1a8bd..0000000
--- a/recipes/xorg-lib/libx11/dolt-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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__
-
diff --git a/recipes/xorg-lib/libx11/fix-disable-xlocale.diff b/recipes/xorg-lib/libx11/fix-disable-xlocale.diff
deleted file mode 100644
index 9dbf6da..0000000
--- a/recipes/xorg-lib/libx11/fix-disable-xlocale.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
-@@ -701,7 +701,11 @@
- }
- if (l - 2 - (p - charset) < 0)
- return 0;
-+#ifdef XLOCALE
- if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
-+#else
-+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
-+#endif
- return 0;
- if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
- return 0;
diff --git a/recipes/xorg-lib/libx11/fix-utf8-wrong-define.patch b/recipes/xorg-lib/libx11/fix-utf8-wrong-define.patch
deleted file mode 100644
index a098db1..0000000
--- a/recipes/xorg-lib/libx11/fix-utf8-wrong-define.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
-+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
-@@ -103,7 +103,7 @@
-
- /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
- November 2000. Its presence is indicated through the following macro. */
--#define X_HAVE_UTF8_STRING 1
-+#undef X_HAVE_UTF8_STRING
-
- typedef char *XPointer;
-
diff --git a/recipes/xorg-lib/libx11/keysymdef_include.patch b/recipes/xorg-lib/libx11/keysymdef_include.patch
deleted file mode 100644
index 07487b6..0000000
--- a/recipes/xorg-lib/libx11/keysymdef_include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: libX11-1.1.5/configure.ac
-===================================================================
---- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000
-+++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000
-@@ -221,13 +221,21 @@
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysymdef.h])
--dir=`pkg-config --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ dir=`pkg-config --variable=includedir xproto`
-+ KEYSYMDEF="$dir/X11/keysymdef.h"
-+fi
-+
- if test -f "$KEYSYMDEF"; then
-- AC_MSG_RESULT([$KEYSYMDEF])
-+ AC_MSG_RESULT([$KEYSYMDEF])
- else
- AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
-+
- AC_SUBST(KEYSYMDEF)
-
- AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/recipes/xorg-lib/libx11/makekeys-update.patch b/recipes/xorg-lib/libx11/makekeys-update.patch
deleted file mode 100644
index 323dbbb..0000000
--- a/recipes/xorg-lib/libx11/makekeys-update.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From f8613deafdc7c6f3be49c3448e011426bcfdf78e Mon Sep 17 00:00:00 2001
-From: Holger Hans Peter Freyther <zecke@selfish.org>
-Date: Tue, 28 Jul 2009 03:20:20 +0200
-Subject: [PATCH] makekeys.c: Replace with the latest version to fix a segfault
-
-Fix a crash..
----
- src/util/makekeys.c | 28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index 214ea5c..3fe8a96 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -36,13 +36,10 @@ from The Open Group.
- #include <X11/keysymdef.h>
- #include <stdio.h>
- #include <stdlib.h>
--#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */
--char *malloc();
--#endif /* macII */
-
- typedef unsigned long Signature;
-
--#define KTNUM 3000
-+#define KTNUM 4000
-
- static struct info {
- char *name;
-@@ -52,11 +49,11 @@ static struct info {
- #define MIN_REHASH 15
- #define MATCHES 10
-
--char tab[KTNUM];
--unsigned short offsets[KTNUM];
--unsigned short indexes[KTNUM];
--KeySym values[KTNUM];
--char buf[1024];
-+static char tab[KTNUM];
-+static unsigned short offsets[KTNUM];
-+static unsigned short indexes[KTNUM];
-+static KeySym values[KTNUM];
-+static char buf[1024];
-
- int
- main(int argc, char *argv[])
-@@ -103,12 +100,11 @@ main(int argc, char *argv[])
- key);
- continue;
- }
-- name = malloc((unsigned)strlen(key)+1);
-+ name = strdup(key);
- if (!name) {
- fprintf(stderr, "makekeys: out of memory!\n");
- exit(1);
- }
-- (void)strcpy(name, key);
- info[ksnum].name = name;
- ksnum++;
- if (ksnum == KTNUM) {
-@@ -157,6 +153,11 @@ next1: ;
- }
-
- z = best_z;
-+ if (z == 0) {
-+ fprintf(stderr, "makekeys: failed to find small enough hash!\n"
-+ "Try increasing KTNUM in makekeys.c\n");
-+ exit(1);
-+ }
- printf("#ifdef NEEDKTABLE\n");
- printf("const unsigned char _XkeyTable[] = {\n");
- printf("0,\n");
-@@ -237,6 +238,11 @@ next2: ;
- }
-
- z = best_z;
-+ if (z == 0) {
-+ fprintf(stderr, "makekeys: failed to find small enough hash!\n"
-+ "Try increasing KTNUM in makekeys.c\n");
-+ exit(1);
-+ }
- for (i = z; --i >= 0;)
- offsets[i] = 0;
- for (i = 0; i < ksnum; i++) {
---
-1.6.3.3
-
diff --git a/recipes/xorg-lib/libx11/ruutf8.patch b/recipes/xorg-lib/libx11/ruutf8.patch
deleted file mode 100644
index 0822b30..0000000
--- a/recipes/xorg-lib/libx11/ruutf8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
-index a74ca75..ff5bc3f 100644
---- a/nls/locale.alias.pre
-+++ b/nls/locale.alias.pre
-@@ -898,6 +898,7 @@ ru_RU.cp1251: ru_RU.CP1251
- ru_RU.microsoftcp1251: ru_RU.CP1251
- ru_RU.microsoft-cp1251: ru_RU.CP1251
- ru_RU.MICROSOFT-CP1251: ru_RU.CP1251
-+ru_RU.utf8: ru_RU.UTF-8
- #if defined(INCLUDE_ru_SU)
- XCOMM ru_SU is redundant now
- ru_SU: ru_RU.KOI8-R
diff --git a/recipes/xorg-lib/libx11/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11/x11_disable_makekeys.patch
deleted file mode 100644
index 2a8a55c..0000000
--- a/recipes/xorg-lib/libx11/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,30 +0,0 @@
----
- src/util/Makefile.am | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-Index: libX11-1.1.2/src/util/Makefile.am
-===================================================================
---- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100
-+++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100
-@@ -1,21 +1,4 @@
- # $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)
--
--#override CC = gcc
--LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--
- 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
diff --git a/recipes/xorg-lib/libx11/xchar2b.patch b/recipes/xorg-lib/libx11/xchar2b.patch
deleted file mode 100644
index 31da58f..0000000
--- a/recipes/xorg-lib/libx11/xchar2b.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://www.koka-in.org/~kensyu/zaurus/diary/20030618.html
-
---- /tmp/Xlib.h 2006-12-01 14:40:27.000000000 +0100
-+++ libX11-X11R7.1-1.0.1/include/X11/Xlib.h 2006-12-01 14:40:56.948254000 +0100
-@@ -1067,7 +1067,7 @@
- typedef struct { /* normal 16 bit characters are two bytes */
- unsigned char byte1;
- unsigned char byte2;
--} XChar2b;
-+} __attribute__ ((packed)) XChar2b;
-
- typedef struct {
- XChar2b *chars; /* two byte characters */
diff --git a/recipes/xorg-lib/libx11/xim.patch b/recipes/xorg-lib/libx11/xim.patch
deleted file mode 100644
index 0eab197..0000000
--- a/recipes/xorg-lib/libx11/xim.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000
-+++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
-@@ -90,6 +90,52 @@
- return;
- }
-
-+XIM
-+XOpenIM (
-+ Display* display,
-+ struct _XrmHashBucketRec* rdb,
-+ char* res_name,
-+ char* res_class)
-+{
-+ return (XIM) NULL;
-+}
-+
-+Status
-+XCloseIM ( XIM im )
-+{
-+ return NULL;
-+}
-+
-+XIC
-+XCreateIC ( XIM im, ...)
-+{
-+ return NULL;
-+}
-+
-+void
-+XDestroyIC ( XIC ic )
-+{
-+ return;
-+}
-+
-+int
-+XmbLookupString (
-+ XIC ic,
-+ XKeyPressedEvent* ev,
-+ char* buffer,
-+ int nbytes,
-+ KeySym* keysym,
-+ Status* status)
-+{
-+ return XLookupNone;
-+}
-+
-+char *
-+XGetICValues( XIC ic, ...)
-+{
-+ return (char *) NULL;
-+}
-+
- XPointer
- _XimGetLocaleCode ( _Xconst char* encoding_name )
- {
diff --git a/recipes/xorg-lib/libx11_1.0.1.bb b/recipes/xorg-lib/libx11_1.0.1.bb
deleted file mode 100644
index 734a31d..0000000
--- a/recipes/xorg-lib/libx11_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11.inc
-LICENSE = "XFree86"
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://ruutf8.patch"
-SRC_URI[archive.md5sum] = "58f0537f21183e27149cf906a1b6bef9"
-SRC_URI[archive.sha256sum] = "f99e4ce6d8e3b8833957978fe22223897b0e636c83580f2b07eff0388eb75294"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.0.3.bb b/recipes/xorg-lib/libx11_1.0.3.bb
deleted file mode 100644
index 40cbeb5..0000000
--- a/recipes/xorg-lib/libx11_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11.inc
-LICENSE = "XFree86"
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://ruutf8.patch"
-SRC_URI[archive.md5sum] = "60b787a812c92d33f71860e4e19cb59d"
-SRC_URI[archive.sha256sum] = "fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.1.bb b/recipes/xorg-lib/libx11_1.1.1.bb
deleted file mode 100644
index 368dd7b..0000000
--- a/recipes/xorg-lib/libx11_1.1.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require libx11.inc
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://ruutf8.patch"
-SRC_URI[archive.md5sum] = "848b80f77b20ae1fa5c882bbfa531ebc"
-SRC_URI[archive.sha256sum] = "5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.2.bb b/recipes/xorg-lib/libx11_1.1.2.bb
deleted file mode 100644
index 60093c1..0000000
--- a/recipes/xorg-lib/libx11_1.1.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libx11.inc
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "710bf38a9477a5a1b235bc94f1d0593c"
-SRC_URI[archive.sha256sum] = "b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.3.bb b/recipes/xorg-lib/libx11_1.1.3.bb
deleted file mode 100644
index d6aa199..0000000
--- a/recipes/xorg-lib/libx11_1.1.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libx11.inc
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4d43d3e472c552d2f191ecdd4e75112c"
-SRC_URI[archive.sha256sum] = "4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.4.bb b/recipes/xorg-lib/libx11_1.1.4.bb
deleted file mode 100644
index 3eeeece..0000000
--- a/recipes/xorg-lib/libx11_1.1.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libx11.inc
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1469a5a8aa8d288dce6f4c45d2f68dc3"
-SRC_URI[archive.sha256sum] = "bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.2.bb b/recipes/xorg-lib/libx11_1.2.bb
deleted file mode 100644
index 0cea5f8..0000000
--- a/recipes/xorg-lib/libx11_1.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require libx11.inc
-DEPENDS = "${COMMON_DEPENDS}"
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://dolt-fix.patch"
-SRC_URI[archive.md5sum] = "c6265b59ea2b594fd68e33f9125b4d20"
-SRC_URI[archive.sha256sum] = "e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051"
-
-EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb
deleted file mode 100644
index 8c40a99..0000000
--- a/recipes/xorg-lib/libx11_1.3.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libx11.inc
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://dolt-fix.patch"
-SRC_URI[archive.md5sum] = "5d74971360f194ce33d2bd2e4d9b066c"
-SRC_URI[archive.sha256sum] = "8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac"
diff --git a/recipes/xorg-lib/libx11_1.3.4.bb b/recipes/xorg-lib/libx11_1.3.4.bb
deleted file mode 100644
index e55d720..0000000
--- a/recipes/xorg-lib/libx11_1.3.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libx11.inc
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://dolt-fix.patch"
-SRC_URI[archive.md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
-SRC_URI[archive.sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
diff --git a/recipes/xorg-lib/libx11_git.bb b/recipes/xorg-lib/libx11_git.bb
deleted file mode 100644
index eac68d8..0000000
--- a/recipes/xorg-lib/libx11_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require libx11.inc
-PV = "1.3.3+git"
-PR = "${INC_PR}.0"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
-SRC_URI += " file://keysymdef_include.patch \
- file://x11_disable_makekeys.patch \
- file://dolt-fix.patch \
-"
-
-SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d"
-S = "${WORKDIR}/git"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/xorg-lib/libxau_1.0.3.bb b/recipes/xorg-lib/libxau_1.0.3.bb
deleted file mode 100644
index cd4f79b..0000000
--- a/recipes/xorg-lib/libxau_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "A Sample Authorization Protocol for X"
-DEPENDS += " xproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "75a9f2b85cd1617b5ca98c9095323853"
-SRC_URI[archive.sha256sum] = "d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXau"
diff --git a/recipes/xorg-lib/libxau_1.0.4.bb b/recipes/xorg-lib/libxau_1.0.4.bb
deleted file mode 100644
index 293fc63..0000000
--- a/recipes/xorg-lib/libxau_1.0.4.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "A Sample Authorization Protocol for X"
-DEPENDS += " xproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0f2b88d857e0a3f5898e4759c541af46"
-SRC_URI[archive.sha256sum] = "10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXau"
diff --git a/recipes/xorg-lib/libxaw_1.0.3.bb b/recipes/xorg-lib/libxaw_1.0.3.bb
deleted file mode 100644
index 87ec70e..0000000
--- a/recipes/xorg-lib/libxaw_1.0.3.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Athena Widget Set"
-DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ee215536ea78798268ab3a444d10135a"
-SRC_URI[archive.sha256sum] = "45ca55bdac904a07b8118618c65ddb5bf8826e626c4c927e3c2508c58e231514"
-
-do_install_append () {
- ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
- ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
- ln -sf libXaw7.so.7 ${D}${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*"
-
-XORG_PN = "libXaw"
diff --git a/recipes/xorg-lib/libxaw_1.0.4.bb b/recipes/xorg-lib/libxaw_1.0.4.bb
deleted file mode 100644
index 2ed715d..0000000
--- a/recipes/xorg-lib/libxaw_1.0.4.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Athena Widget Set"
-DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "73671d8f1cf36fdd81395328cc3539c9"
-SRC_URI[archive.sha256sum] = "11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9"
-
-do_install_append () {
- ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
- ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
- ln -sf libXaw7.so.7 ${D}${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*"
-
-XORG_PN = "libXaw"
diff --git a/recipes/xorg-lib/libxcomposite/change-include-order.patch b/recipes/xorg-lib/libxcomposite/change-include-order.patch
deleted file mode 100644
index 630b881..0000000
--- a/recipes/xorg-lib/libxcomposite/change-include-order.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch makes the build use its own Xcomposite.h over rather than an
-older Xcomposite.h that might already be installed in the staging dir.
-
---- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100
-+++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100
-@@ -21,7 +21,7 @@
- # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- # PERFORMANCE OF THIS SOFTWARE.
-
--AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
-+AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
-
- lib_LTLIBRARIES = libXcomposite.la
-
diff --git a/recipes/xorg-lib/libxcomposite_0.3.1.bb b/recipes/xorg-lib/libxcomposite_0.3.1.bb
deleted file mode 100644
index d7f8beb..0000000
--- a/recipes/xorg-lib/libxcomposite_0.3.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Composite extension library."
-LICENSE = "BSD-X"
-DEPENDS += " compositeproto virtual/libx11 libxfixes"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://change-include-order.patch"
-SRC_URI[archive.md5sum] = "a80650d660486ea7bb2e5fd84a83799a"
-SRC_URI[archive.sha256sum] = "d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b"
-
-XORG_PN = "libXcomposite"
diff --git a/recipes/xorg-lib/libxcomposite_0.4.0.bb b/recipes/xorg-lib/libxcomposite_0.4.0.bb
deleted file mode 100644
index 2dff14a..0000000
--- a/recipes/xorg-lib/libxcomposite_0.4.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Composite extension library."
-LICENSE = "BSD-X"
-DEPENDS += " compositeproto virtual/libx11 libxfixes libxext"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += " file://change-include-order.patch"
-SRC_URI[archive.md5sum] = "7e95395dea89be21bae929b9b7f16641"
-SRC_URI[archive.sha256sum] = "7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510"
-
-XORG_PN = "libXcomposite"
diff --git a/recipes/xorg-lib/libxcursor_1.1.8.bb b/recipes/xorg-lib/libxcursor_1.1.8.bb
deleted file mode 100644
index 3f175e8..0000000
--- a/recipes/xorg-lib/libxcursor_1.1.8.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X cursor management library"
-LICENSE = "BSD-X"
-DEPENDS += "libxrender libxfixes"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ec2acd10a7736a85dd1e1ed9ea5bec96"
-SRC_URI[archive.sha256sum] = "8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXcursor"
diff --git a/recipes/xorg-lib/libxcursor_1.1.9.bb b/recipes/xorg-lib/libxcursor_1.1.9.bb
deleted file mode 100644
index 2b363a5..0000000
--- a/recipes/xorg-lib/libxcursor_1.1.9.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X cursor management library"
-LICENSE = "BSD-X"
-DEPENDS += "libxrender libxfixes"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "99b7554037a92b260891091e81815a0a"
-SRC_URI[archive.sha256sum] = "1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXcursor"
diff --git a/recipes/xorg-lib/libxdamage_1.0.4.bb b/recipes/xorg-lib/libxdamage_1.0.4.bb
deleted file mode 100644
index 452c634..0000000
--- a/recipes/xorg-lib/libxdamage_1.0.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Damage extension library."
-LICENSE = "BSD-X"
-DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4d0eece7a8372a7754db1de08c2be324"
-SRC_URI[archive.sha256sum] = "5df90f0efa77e1d6f9e1768a2b0adfc896d09c7a3d8680ed0980511b3625c636"
-
-XORG_PN = "libXdamage"
diff --git a/recipes/xorg-lib/libxdamage_1.1.1.bb b/recipes/xorg-lib/libxdamage_1.1.1.bb
deleted file mode 100644
index cb7eca1..0000000
--- a/recipes/xorg-lib/libxdamage_1.1.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 damaged region extension library"
-LICENSE = "BSD-X"
-DEPENDS += "damageproto libxfixes"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ac0ce6b0063a9858c8f24ddb4c60487d"
-SRC_URI[archive.sha256sum] = "0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e"
-
-XORG_PN = "libXdamage"
diff --git a/recipes/xorg-lib/libxdmcp_1.0.2.bb b/recipes/xorg-lib/libxdmcp_1.0.2.bb
deleted file mode 100644
index 1226afb..0000000
--- a/recipes/xorg-lib/libxdmcp_1.0.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Display Manager Control Protocol library"
-DEPENDS += "xproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "10facf2bc7cbd5e5c1a698b8a210a582"
-SRC_URI[archive.sha256sum] = "f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXdmcp"
diff --git a/recipes/xorg-lib/libxext_1.0.2.bb b/recipes/xorg-lib/libxext_1.0.2.bb
deleted file mode 100644
index 02326de..0000000
--- a/recipes/xorg-lib/libxext_1.0.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Server Extension library"
-PRIORITY = "optional"
-DEPENDS += " xproto virtual/libx11 xextproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "cce89c5b941a493512b534f4847c6111"
-SRC_URI[archive.sha256sum] = "368e4cf5117febd998e6fc40d096b3af19a571adccc5ed49b9d16e482b3a8f8e"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXext"
diff --git a/recipes/xorg-lib/libxext_1.0.3.bb b/recipes/xorg-lib/libxext_1.0.3.bb
deleted file mode 100644
index f8d76b4..0000000
--- a/recipes/xorg-lib/libxext_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 miscellaneous extension library"
-DEPENDS += "xproto virtual/libx11 xextproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1bf6fa1c26f9957d7cc0bd90b038dfa6"
-SRC_URI[archive.sha256sum] = "2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXext"
diff --git a/recipes/xorg-lib/libxext_1.0.4.bb b/recipes/xorg-lib/libxext_1.0.4.bb
deleted file mode 100644
index 1317e5c..0000000
--- a/recipes/xorg-lib/libxext_1.0.4.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 miscellaneous extension library"
-DEPENDS += "xproto virtual/libx11 xextproto libxau"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "a91f1f722ac80c597cf0b75dcb8b48c0"
-SRC_URI[archive.sha256sum] = "2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXext"
diff --git a/recipes/xorg-lib/libxext_1.0.5.bb b/recipes/xorg-lib/libxext_1.0.5.bb
deleted file mode 100644
index 40dbece..0000000
--- a/recipes/xorg-lib/libxext_1.0.5.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 miscellaneous extension library"
-DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "aa11d859cc8e9a0bad3bb55e1666547b"
-SRC_URI[archive.sha256sum] = "1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXext"
diff --git a/recipes/xorg-lib/libxfixes_4.0.3.bb b/recipes/xorg-lib/libxfixes_4.0.3.bb
deleted file mode 100644
index d574764..0000000
--- a/recipes/xorg-lib/libxfixes_4.0.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Fixes extension library."
-LICENSE = "BSD-X"
-DEPENDS += "virtual/libx11 xproto fixesproto xextproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1990d19725a3c7f32290037f02d3737f"
-SRC_URI[archive.sha256sum] = "547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfixes"
diff --git a/recipes/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch b/recipes/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
deleted file mode 100644
index dd30743..0000000
--- a/recipes/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-commit 7670d4a2720c61fbc7b989fed14c676f04ac3ad1
-Author: Dodji Seketeli <dodji@openedhand.com>
-Date: Mon Jul 16 12:24:34 2007 +0200
-
- Remove side effects from BuiltinReadDirectory()
-
- The first time BuiltinReadDirectory() is called,
- save the content of builtin_dir and builtin_alias,
- before calling FontFileAddFontFile(), because that fonction
- will modify those.
-
- Then, in subsequent calls to BuiltinReadDirectory(), restore
- builtin_dir and builtin_alias so that the side effect incurred
- by the first call disappears.
-
-diff --git a/src/builtins/dir.c b/src/builtins/dir.c
-index c272449..97f1e1e 100644
---- a/src/builtins/dir.c
-+++ b/src/builtins/dir.c
-@@ -29,6 +29,133 @@
- #endif
- #include "builtin.h"
-
-+BuiltinDirPtr
-+BuiltinDirsDup (const BuiltinDirPtr a_dirs,
-+ int a_dirs_len)
-+{
-+ BuiltinDirPtr dirs=NULL ;
-+ int i=0 ;
-+
-+ if (!a_dirs)
-+ return NULL ;
-+
-+ dirs = xcalloc (a_dirs_len, sizeof (BuiltinDirRec)) ;
-+ if (!dirs)
-+ return NULL ;
-+
-+ for (i=0; i < a_dirs_len; i++) {
-+ int len = strlen (a_dirs[i].file_name) ;
-+ dirs[i].file_name = xcalloc (1, len) ;
-+ memmove (dirs[i].file_name, a_dirs[i].file_name, len);
-+ len = strlen (a_dirs[i].font_name) ;
-+ dirs[i].font_name = xcalloc (1, len) ;
-+ memmove (dirs[i].font_name, a_dirs[i].font_name, len);
-+ }
-+ return dirs ;
-+}
-+
-+/**
-+ * Copy a_save back into a_cur
-+ * @param a_cur the instance of BuiltinDir to restore
-+ * @param a_saved the saved instance of BuiltinDir to copy into a_cur
-+ * @return 0 if went okay, 1 otherwise.
-+ */
-+int
-+BuiltinDirRestore (BuiltinDirPtr a_cur,
-+ const BuiltinDirPtr a_saved)
-+{
-+ if (!a_cur)
-+ return 1 ;
-+ if (!a_saved)
-+ return 0 ;
-+
-+ if (a_saved->font_name)
-+ memmove (a_cur->font_name, a_saved->font_name, strlen (a_saved->font_name)) ;
-+ return 0 ;
-+}
-+
-+
-+int
-+BuiltinDirsRestore (BuiltinDirPtr a_cur_tab,
-+ const BuiltinDirPtr a_saved_tab,
-+ int a_tab_len)
-+{
-+ int i=0 ;
-+
-+ if (!a_cur_tab)
-+ return 1 ;
-+ if (!a_saved_tab)
-+ return 0 ;
-+
-+ for (i=0 ; i < a_tab_len; i++) {
-+ if (BuiltinDirRestore (&a_cur_tab[i], &a_saved_tab[i]))
-+ return 1 ;
-+ }
-+ return 0 ;
-+}
-+
-+BuiltinAliasPtr
-+BuiltinAliasesDup (const BuiltinAliasPtr a_aliases,
-+ int a_aliases_len)
-+{
-+ BuiltinAliasPtr aliases=NULL ;
-+ int i=0 ;
-+
-+ if (!a_aliases)
-+ return NULL ;
-+
-+ aliases = xcalloc (a_aliases_len, sizeof (BuiltinAliasRec)) ;
-+ if (!aliases)
-+ return NULL ;
-+
-+ for (i=0; i < a_aliases_len; i++) {
-+ int len = strlen (a_aliases[i].font_name) ;
-+ aliases[i].font_name = xcalloc (1, len) ;
-+ memmove (aliases[i].font_name, a_aliases[i].font_name, len);
-+ }
-+ return aliases ;
-+}
-+
-+/**
-+ * Copy a_save back into a_cur
-+ * @param a_cur the instance of BuiltinAlias to restore
-+ * @param a_saved the saved instance of BuiltinAlias to copy into a_cur
-+ * @return 0 if went okay, 1 otherwise.
-+ */
-+int
-+BuiltinAliasRestore (BuiltinAliasPtr a_cur,
-+ const BuiltinAliasPtr a_save)
-+{
-+ if (!a_cur)
-+ return 1 ;
-+ if (!a_save)
-+ return 0 ;
-+ if (a_save->alias_name)
-+ memmove (a_cur->alias_name, a_save->alias_name, strlen (a_save->alias_name)) ;
-+ if (a_save->font_name)
-+ memmove (a_cur->font_name, a_save->font_name, strlen (a_save->font_name)) ;
-+ return 0 ;
-+}
-+
-+int
-+BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab,
-+ const BuiltinAliasPtr a_saved_tab,
-+ int a_tab_len)
-+{
-+ int i=0 ;
-+
-+ if (!a_cur_tab)
-+ return 1 ;
-+ if (!a_saved_tab)
-+ return 0 ;
-+
-+ for (i=0 ; i < a_tab_len; i++) {
-+ if (BuiltinAliasRestore (&a_cur_tab[i], &a_saved_tab[i]))
-+ return 1 ;
-+ }
-+ return 0 ;
-+}
-+
- int
- BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
- {
-@@ -36,6 +163,34 @@ BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
- int i;
-
- dir = FontFileMakeDir ("", builtin_dir_count);
-+ static BuiltinDirPtr saved_builtin_dir ;
-+ static BuiltinAliasPtr saved_builtin_alias ;
-+
-+
-+ if (saved_builtin_dir)
-+ {
-+ BuiltinDirsRestore ((BuiltinDirPtr) builtin_dir,
-+ saved_builtin_dir,
-+ builtin_dir_count) ;
-+ }
-+ else
-+ {
-+ saved_builtin_dir = BuiltinDirsDup ((const BuiltinDirPtr) builtin_dir,
-+ builtin_dir_count) ;
-+ }
-+
-+ if (saved_builtin_alias)
-+ {
-+ BuiltinAliasesRestore ((BuiltinAliasPtr) builtin_alias,
-+ saved_builtin_alias,
-+ builtin_alias_count) ;
-+ }
-+ else
-+ {
-+ saved_builtin_alias = BuiltinAliasesDup ((const BuiltinAliasPtr) builtin_alias,
-+ builtin_alias_count) ;
-+ }
-+
- for (i = 0; i < builtin_dir_count; i++)
- {
- if (!FontFileAddFontFile (dir,
diff --git a/recipes/xorg-lib/libxfont/no-scalable-crash.patch b/recipes/xorg-lib/libxfont/no-scalable-crash.patch
deleted file mode 100644
index 90bded6..0000000
--- a/recipes/xorg-lib/libxfont/no-scalable-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200
-+++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200
-@@ -695,6 +695,11 @@
- */
- if (isscale)
- {
-+ /* If the fontname says it is scalable, make sure that the
-+ * renderer supports OpenScalable and GetInfoScalable.
-+ */
-+ if (renderer->OpenScalable && renderer->GetInfoScalable)
-+ {
- if (vals.values_supplied & SIZE_SPECIFY_MASK)
- {
- bzero((char *)&zeroVals, sizeof(zeroVals));
-@@ -794,6 +799,7 @@
- bitmap->name.name);
- }
- }
-+ }
- }
- return TRUE;
- }
diff --git a/recipes/xorg-lib/libxfont_1.2.7.bb b/recipes/xorg-lib/libxfont_1.2.7.bb
deleted file mode 100644
index b470c8b..0000000
--- a/recipes/xorg-lib/libxfont_1.2.7.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X font library (used by the X server)."
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://no-scalable-crash.patch"
-SRC_URI[archive.md5sum] = "2f2085310f75900044d9dcd469637d26"
-SRC_URI[archive.sha256sum] = "2f8c004c0b914d460e6fd2b48d8b425cf4778d415467fc1f1d938b200462d18b"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfont"
diff --git a/recipes/xorg-lib/libxfont_1.2.8.bb b/recipes/xorg-lib/libxfont_1.2.8.bb
deleted file mode 100644
index 3794cf2..0000000
--- a/recipes/xorg-lib/libxfont_1.2.8.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X font library (used by the X server)."
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://no-scalable-crash.patch"
-SRC_URI[archive.md5sum] = "83b8e21f6ee22512a8f72ba51e2d74f6"
-SRC_URI[archive.sha256sum] = "374a2ca12f62a4d9f09a17a34765a5289cefa9db7f9f0913e1c3731b4088aad8"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfont"
diff --git a/recipes/xorg-lib/libxfont_1.3.0.bb b/recipes/xorg-lib/libxfont_1.3.0.bb
deleted file mode 100644
index c3c9377..0000000
--- a/recipes/xorg-lib/libxfont_1.3.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 font rasterisation library"
-LICENSE = "BSD-X"
-DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://no-scalable-crash.patch \
- file://builtinreaddirectory-no-side-effect.patch"
-SRC_URI[archive.md5sum] = "d1d3fa170d74b066f1f23ca8574e7c90"
-SRC_URI[archive.sha256sum] = "07567b9880f28d1a404389c024a185419bfe81136aef3d9eda52407f34c3d3dd"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfont"
diff --git a/recipes/xorg-lib/libxfont_1.3.1.bb b/recipes/xorg-lib/libxfont_1.3.1.bb
deleted file mode 100644
index 671fd58..0000000
--- a/recipes/xorg-lib/libxfont_1.3.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 font rasterisation library"
-LICENSE = "BSD-X"
-DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://no-scalable-crash.patch"
-SRC_URI[archive.md5sum] = "b2f396b62633819bbdd9748383876e21"
-SRC_URI[archive.sha256sum] = "dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfont"
diff --git a/recipes/xorg-lib/libxfont_1.3.2.bb b/recipes/xorg-lib/libxfont_1.3.2.bb
deleted file mode 100644
index 250433a..0000000
--- a/recipes/xorg-lib/libxfont_1.3.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 font rasterisation library"
-LICENSE = "BSD-X"
-DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://no-scalable-crash.patch"
-SRC_URI[archive.md5sum] = "64f510ebf9679f3a97a3d633cbee4f50"
-SRC_URI[archive.sha256sum] = "c167cfd529b7c67f496ee0bed3c0b43e0107de0f689d387c1c0e23ef7cf3d2f2"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfont"
diff --git a/recipes/xorg-lib/libxfont_1.3.3.bb b/recipes/xorg-lib/libxfont_1.3.3.bb
deleted file mode 100644
index 65b5415..0000000
--- a/recipes/xorg-lib/libxfont_1.3.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 font rasterisation library"
-LICENSE = "BSD-X"
-DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4f174b9613f87cf00d731da428a1b194"
-SRC_URI[archive.sha256sum] = "6171e6bca4bd6333611bd9c63cccc8e8e412d876c72097f0dddc490a9df51d5a"
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXfont"
diff --git a/recipes/xorg-lib/libxfontcache_1.0.4.bb b/recipes/xorg-lib/libxfontcache_1.0.4.bb
deleted file mode 100644
index f4a079e..0000000
--- a/recipes/xorg-lib/libxfontcache_1.0.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X-TrueType font cache extension client library"
-DEPENDS += "libxext fontcacheproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1adca018aa7bf2d215f20a69c10828ad"
-SRC_URI[archive.sha256sum] = "ffe747cfbf81cdd862af1b05d021ad1ab83b623eab5b32b0a618efb4c0f3e01c"
-
-XORG_PN = "libXfontcache"
diff --git a/recipes/xorg-lib/libxft_2.1.12.bb b/recipes/xorg-lib/libxft_2.1.12.bb
deleted file mode 100644
index 14beef39..0000000
--- a/recipes/xorg-lib/libxft_2.1.12.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "FreeType-based font drawing library for X"
-DEPENDS += "libxrender freetype fontconfig"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1309301e2d979bd475dc58325cb8c056"
-SRC_URI[archive.sha256sum] = "68b46f85caaf0b30c876bd983abe144c25755bee7532e8738ab7ebe29a428986"
-
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/pkgconfig \
- ${datadir}/aclocal ${bindir} ${sbindir}"
-
-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)
-}
-
-XORG_PN = "libXft"
diff --git a/recipes/xorg-lib/libxft_2.1.13.bb b/recipes/xorg-lib/libxft_2.1.13.bb
deleted file mode 100644
index a2219c9..0000000
--- a/recipes/xorg-lib/libxft_2.1.13.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "FreeType-based font drawing library for X"
-DEPENDS += "libxrender freetype fontconfig"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "bc8881851f3bd8dcc625fac37350a1c6"
-SRC_URI[archive.sha256sum] = "ce7688258af34c14af421bcfb306d4310245b727d2417ac968b7f6b2facfde8c"
-
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/pkgconfig \
- ${datadir}/aclocal ${bindir} ${sbindir}"
-
-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)
-}
-
-XORG_PN = "libXft"
diff --git a/recipes/xorg-lib/libxi_1.0.2.bb b/recipes/xorg-lib/libxi_1.0.2.bb
deleted file mode 100644
index 12e49f0..0000000
--- a/recipes/xorg-lib/libxi_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Input extension library."
-DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4a5207a29a6b220e5462129854689844"
-SRC_URI[archive.sha256sum] = "7e6339539d3d0a4fc95cc23ca2b13ae67dd783e011b3cc5ca76040e376bff57f"
-
-XORG_PN = "libXi"
diff --git a/recipes/xorg-lib/libxi_1.1.0.bb b/recipes/xorg-lib/libxi_1.1.0.bb
deleted file mode 100644
index 3ad5dfc..0000000
--- a/recipes/xorg-lib/libxi_1.1.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Input extension library."
-DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c25abbe604029855eb11a3a75fb1f386"
-SRC_URI[archive.sha256sum] = "0f90d7e27d8a7d6bccf9350b6283ffe122e5347fa51d4ea9055653b297339989"
-
-XORG_PN = "libXi"
diff --git a/recipes/xorg-lib/libxi_1.1.2.bb b/recipes/xorg-lib/libxi_1.1.2.bb
deleted file mode 100644
index bff8ba4..0000000
--- a/recipes/xorg-lib/libxi_1.1.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Input extension library"
-DEPENDS += "libxext inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9c4dd85f3e2a75bfb60bd288502bc288"
-SRC_URI[archive.sha256sum] = "4deda13613f03e4524d3cf0ac14b9e20be5044d415cb8478713ecbe47f4de862"
-
-XORG_PN = "libXi"
diff --git a/recipes/xorg-lib/libxi_1.1.3.bb b/recipes/xorg-lib/libxi_1.1.3.bb
deleted file mode 100644
index 039bfc8..0000000
--- a/recipes/xorg-lib/libxi_1.1.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Input extension library"
-DEPENDS += "libxext inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7c510abb0cad8dc20493fb27ff7859d8"
-SRC_URI[archive.sha256sum] = "c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f"
-
-XORG_PN = "libXi"
diff --git a/recipes/xorg-lib/libxi_1.2.0.bb b/recipes/xorg-lib/libxi_1.2.0.bb
deleted file mode 100644
index e6b3da7..0000000
--- a/recipes/xorg-lib/libxi_1.2.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Input extension library"
-DEPENDS += "libxext inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4b88e07d7dd77ca1e786f09066b58c02"
-SRC_URI[archive.sha256sum] = "7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a"
-
-XORG_PN = "libXi"
diff --git a/recipes/xorg-lib/libxinerama_1.0.2.bb b/recipes/xorg-lib/libxinerama_1.0.2.bb
deleted file mode 100644
index 786c294..0000000
--- a/recipes/xorg-lib/libxinerama_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Xinerama extension library"
-DEPENDS += "libxext xineramaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f6fb08eafd3c2909d515f1a07bfca8fd"
-SRC_URI[archive.sha256sum] = "d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d"
-
-XORG_PN = "libXinerama"
diff --git a/recipes/xorg-lib/libxinerama_1.0.3.bb b/recipes/xorg-lib/libxinerama_1.0.3.bb
deleted file mode 100644
index 4e7cc91..0000000
--- a/recipes/xorg-lib/libxinerama_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Xinerama extension library"
-DEPENDS += "libxext xineramaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "cd9f7c46439ac40e0517a302d2434d2c"
-SRC_URI[archive.sha256sum] = "07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219"
-
-XORG_PN = "libXinerama"
diff --git a/recipes/xorg-lib/libxkbfile_1.0.4.bb b/recipes/xorg-lib/libxkbfile_1.0.4.bb
deleted file mode 100644
index d02cec5..0000000
--- a/recipes/xorg-lib/libxkbfile_1.0.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 keyboard file manipulation library"
-LICENSE = "GPL"
-DEPENDS += "virtual/libx11 kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "12b4ceb5d42b520228b5fb40a96ae6c5"
-SRC_URI[archive.sha256sum] = "468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-lib/libxkbfile_1.0.5.bb b/recipes/xorg-lib/libxkbfile_1.0.5.bb
deleted file mode 100644
index 60d3a1b..0000000
--- a/recipes/xorg-lib/libxkbfile_1.0.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 keyboard file manipulation library"
-LICENSE = "GPL"
-DEPENDS += "virtual/libx11 kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "0726a845fe5a56551de2718c9f6b0e35"
-SRC_URI[archive.sha256sum] = "0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/xorg-lib/libxmu_1.0.3.bb b/recipes/xorg-lib/libxmu_1.0.3.bb
deleted file mode 100644
index b5bc535..0000000
--- a/recipes/xorg-lib/libxmu_1.0.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 miscellaneous utility library"
-DEPENDS += "libxt libxext"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b926b95b811ece3e19cd590db85ee615"
-SRC_URI[archive.sha256sum] = "b56e308e36da8d9cb48433ddb81fd04e26b4f1c695586ac8106ac48a35466d66"
-
-PACKAGES =+ "libxmuu libxmuu-dev"
-
-FILES_libxmuu = "${libdir}/libXmuu.so.*"
-FILES_libxmuu-dev = "${libdir}/libXmuu.so"
-
-LEAD_SONAME = "libXmu"
-
-XORG_PN = "libXmu"
diff --git a/recipes/xorg-lib/libxmu_1.0.4.bb b/recipes/xorg-lib/libxmu_1.0.4.bb
deleted file mode 100644
index 7ebe4c8..0000000
--- a/recipes/xorg-lib/libxmu_1.0.4.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 miscellaneous utility library"
-DEPENDS += "libxt libxext"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fb372a5f3ab42b5ba16d7af4d833a0cb"
-SRC_URI[archive.sha256sum] = "f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0"
-
-PACKAGES =+ "libxmuu libxmuu-dev"
-
-FILES_libxmuu = "${libdir}/libXmuu.so.*"
-FILES_libxmuu-dev = "${libdir}/libXmuu.so"
-
-LEAD_SONAME = "libXmu"
-
-XORG_PN = "libXmu"
diff --git a/recipes/xorg-lib/libxpm_3.5.6.bb b/recipes/xorg-lib/libxpm_3.5.6.bb
deleted file mode 100644
index 977f015..0000000
--- a/recipes/xorg-lib/libxpm_3.5.6.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Pixmap library"
-LICENSE = "X-BSD"
-DEPENDS += "libxext libsm libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "37b7d1826c6a02107269632a93b8791f"
-SRC_URI[archive.sha256sum] = "2d5c5242b8417db6aa758e5be387de33385d9960ff21c801af7d6a4730b4fd0d"
-
-PACKAGES =+ "sxpm cxpm"
-
-FILES_cxpm = "${bindir}/cxpm"
-FILES_sxpm = "${bindir}/sxpm"
-
-XORG_PN = "libXpm"
diff --git a/recipes/xorg-lib/libxpm_3.5.7.bb b/recipes/xorg-lib/libxpm_3.5.7.bb
deleted file mode 100644
index b8ed813..0000000
--- a/recipes/xorg-lib/libxpm_3.5.7.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Pixmap library"
-LICENSE = "X-BSD"
-DEPENDS += "libxext libsm libxt"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "cd15ee542d9f515538b4462a6f79d977"
-SRC_URI[archive.sha256sum] = "64701ae67ce5b0797307b75d8255bec3a0d371d0c50715ea618f5a68bcc92baa"
-
-PACKAGES =+ "sxpm cxpm"
-
-FILES_cxpm = "${bindir}/cxpm"
-FILES_sxpm = "${bindir}/sxpm"
-
-XORG_PN = "libXpm"
diff --git a/recipes/xorg-lib/libxrandr_1.1.2.bb b/recipes/xorg-lib/libxrandr_1.1.2.bb
deleted file mode 100644
index 4fb614c..0000000
--- a/recipes/xorg-lib/libxrandr_1.1.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Resize and Rotate extension library."
-LICENSE = "BSD-X"
-DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "962946952a01650bb43206043a3c0e12"
-SRC_URI[archive.sha256sum] = "ba5adedc37da835a5c9e5a5d457dce13feead64fc364bc4719c41720ca0a3c50"
-
-BBCLASSEXTEND = "nativesdk"
-
-XORG_PN = "libXrandr"
diff --git a/recipes/xorg-lib/libxrandr_1.2.2.bb b/recipes/xorg-lib/libxrandr_1.2.2.bb
deleted file mode 100644
index 2038f8a..0000000
--- a/recipes/xorg-lib/libxrandr_1.2.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Resize and Rotate extension library"
-LICENSE = "BSD-X"
-DEPENDS += "randrproto libxrender libxext"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "1b244b5d19f0ccab01d7083436cd3558"
-SRC_URI[archive.sha256sum] = "206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98"
-
-BBCLASSEXTEND = "nativesdk"
-
-XORG_PN = "libXrandr"
diff --git a/recipes/xorg-lib/libxrandr_1.2.3.bb b/recipes/xorg-lib/libxrandr_1.2.3.bb
deleted file mode 100644
index 22ab29d..0000000
--- a/recipes/xorg-lib/libxrandr_1.2.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Resize and Rotate extension library"
-LICENSE = "BSD-X"
-DEPENDS += "randrproto libxrender libxext"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5cd67cc02a50c9644ba0a1846ea3b08e"
-SRC_URI[archive.sha256sum] = "f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267"
-
-BBCLASSEXTEND = "nativesdk"
-
-XORG_PN = "libXrandr"
diff --git a/recipes/xorg-lib/libxrender_0.9.2.bb b/recipes/xorg-lib/libxrender_0.9.2.bb
deleted file mode 100644
index c67495a..0000000
--- a/recipes/xorg-lib/libxrender_0.9.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Rendering Extension client library"
-LICENSE = "BSD-X"
-DEPENDS += "virtual/libx11 renderproto xproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "2f1b2c6e8dcbcb6d760e59f445abd92c"
-SRC_URI[archive.sha256sum] = "0f749183ab1a0ece14d33c3299b3f70893122349c0bfa9d7bd0e66ce19d1802a"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXrender"
diff --git a/recipes/xorg-lib/libxrender_0.9.3.bb b/recipes/xorg-lib/libxrender_0.9.3.bb
deleted file mode 100644
index 82b0143..0000000
--- a/recipes/xorg-lib/libxrender_0.9.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Rendering Extension client library"
-LICENSE = "BSD-X"
-DEPENDS += "virtual/libx11 renderproto xproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "307132fce2e551ad2c641bddf8480f16"
-SRC_URI[archive.sha256sum] = "9882ba2d74e9ca5cfd0c2231ac8eba14d8fc59d538c787fa639f8d77c996bbef"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXrender"
diff --git a/recipes/xorg-lib/libxrender_0.9.4.bb b/recipes/xorg-lib/libxrender_0.9.4.bb
deleted file mode 100644
index 4543a9e..0000000
--- a/recipes/xorg-lib/libxrender_0.9.4.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Rendering Extension client library"
-LICENSE = "BSD-X"
-DEPENDS += "virtual/libx11 renderproto xproto libxdmcp"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "dc266e850c51368f964e0d67bf5fb5e6"
-SRC_URI[archive.sha256sum] = "5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec"
-
-BBCLASSEXTEND = "native nativesdk"
-
-XORG_PN = "libXrender"
diff --git a/recipes/xorg-lib/libxres_1.0.3.bb b/recipes/xorg-lib/libxres_1.0.3.bb
deleted file mode 100644
index 9a1aa01..0000000
--- a/recipes/xorg-lib/libxres_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Resource extension library"
-DEPENDS += "libxext resourceproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "de66ffb657aba64c9d6dbdeabb757f3e"
-SRC_URI[archive.sha256sum] = "a6d5ba7573f5ec0f091095f01b51d1e671dd0f14acb5b8559cdf366e398a0230"
-
-XORG_PN = "libXres"
diff --git a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb b/recipes/xorg-lib/libxscrnsaver_1.1.2.bb
deleted file mode 100644
index db164d2..0000000
--- a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Screen Saver extension library"
-LICENSE = "GPL"
-DEPENDS += "libxext scrnsaverproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "ac2d697dd02f51e5c15f7104f4be5328"
-SRC_URI[archive.sha256sum] = "6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67"
-
-RREPLACES_${PN} = "libxss"
-
-XORG_PN = "libXScrnSaver"
diff --git a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb b/recipes/xorg-lib/libxscrnsaver_1.1.3.bb
deleted file mode 100644
index 2cc2c81..0000000
--- a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Screen Saver extension library"
-LICENSE = "GPL"
-DEPENDS += "libxext scrnsaverproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "93f84b6797f2f29cae1ce23b0355d00d"
-SRC_URI[archive.sha256sum] = "4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988"
-
-RREPLACES_${PN} = "libxss"
-
-XORG_PN = "libXScrnSaver"
diff --git a/recipes/xorg-lib/libxt/pr10970-header-fix.patch b/recipes/xorg-lib/libxt/pr10970-header-fix.patch
deleted file mode 100644
index 2acafb8..0000000
--- a/recipes/xorg-lib/libxt/pr10970-header-fix.patch
+++ /dev/null
@@ -1,512 +0,0 @@
-diff --git a/include/X11/CallbackI.h b/include/X11/CallbackI.h
-index 4ae08ab..64e8152 100644
---- a/include/X11/CallbackI.h
-+++ b/include/X11/CallbackI.h
-@@ -58,6 +58,8 @@ typedef XrmResource **CallbackTable;
- #define _XtCBCalling 1
- #define _XtCBFreeAfterCalling 2
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct internalCallbackRec {
- unsigned short count;
- char is_padded; /* contains NULL padding for external form */
-@@ -115,3 +117,5 @@ extern void _XtCallConditionalCallbackList(
- XtPointer /* call_data */,
- _XtConditionProc /* cond_proc */
- );
-+
-+_XFUNCPROTOEND
-diff --git a/include/X11/CompositeP.h b/include/X11/CompositeP.h
-index ed055b2..e93275a 100644
---- a/include/X11/CompositeP.h
-+++ b/include/X11/CompositeP.h
-@@ -52,6 +52,8 @@ SOFTWARE.
-
- #include <X11/Composite.h>
-
-+_XFUNCPROTOBEGIN
-+
- /************************************************************************
- *
- * Additional instance fields for widgets of (sub)class 'Composite'
-@@ -101,6 +103,8 @@ typedef struct _CompositeClassRec {
-
- externalref CompositeClassRec compositeClassRec;
-
-+_XFUNCPROTOEND
-+
- #define XtCompositeExtensionVersion 2L
- #define XtInheritGeometryManager ((XtGeometryHandler) _XtInherit)
- #define XtInheritChangeManaged ((XtWidgetProc) _XtInherit)
-diff --git a/include/X11/ConstrainP.h b/include/X11/ConstrainP.h
-index a90d19a..7030a34 100644
---- a/include/X11/ConstrainP.h
-+++ b/include/X11/ConstrainP.h
-@@ -52,6 +52,8 @@ SOFTWARE.
-
- #include <X11/Constraint.h>
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct _ConstraintPart {
- XtPointer mumble; /* No new fields, keep C compiler happy */
- } ConstraintPart;
-@@ -88,6 +90,8 @@ typedef struct _ConstraintClassRec {
-
- externalref ConstraintClassRec constraintClassRec;
-
-+_XFUNCPROTOEND
-+
- #define XtConstraintExtensionVersion 1L
-
- #endif /* _XtConstraintP_h */
-diff --git a/include/X11/Constraint.h b/include/X11/Constraint.h
-index 9bb962e..b8bd902 100644
---- a/include/X11/Constraint.h
-+++ b/include/X11/Constraint.h
-@@ -50,11 +50,15 @@ SOFTWARE.
- #ifndef _XtConstraint_h
- #define _XtConstraint_h
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct _ConstraintClassRec *ConstraintWidgetClass;
-
- #ifndef CONSTRAINT
- externalref WidgetClass constraintWidgetClass;
- #endif
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtConstraint_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/ConvertI.h b/include/X11/ConvertI.h
-index 02c0e5c..f3f7fb0 100644
---- a/include/X11/ConvertI.h
-+++ b/include/X11/ConvertI.h
-@@ -48,6 +48,8 @@ SOFTWARE.
- ******************************************************************/
- /* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */
-
-+_XFUNCPROTOBEGIN
-+
- /* Representation types */
-
- extern XrmQuark _XtQString;
-@@ -94,3 +96,4 @@ extern Boolean _XtConvert(
-
- void _XtConvertInitialize(void);
-
-+_XFUNCPROTOEND
-diff --git a/include/X11/Core.h b/include/X11/Core.h
-index ff6cb75..e1a7c28 100644
---- a/include/X11/Core.h
-+++ b/include/X11/Core.h
-@@ -53,6 +53,8 @@ SOFTWARE.
- #ifndef _XtCore_h
- #define _XtCore_h
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct _WidgetClassRec *CoreWidgetClass;
- typedef struct _WidgetRec *CoreWidget;
- externalref WidgetClass coreWidgetClass;
-@@ -62,5 +64,7 @@ externalref WidgetClass widgetClass;
-
- #endif
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtCore_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/CoreP.h b/include/X11/CoreP.h
-index e07f085..57836e6 100644
---- a/include/X11/CoreP.h
-+++ b/include/X11/CoreP.h
-@@ -55,6 +55,8 @@ SOFTWARE.
-
- #include <X11/Core.h>
-
-+_XFUNCPROTOBEGIN
-+
- externalref int _XtInheritTranslations;
-
- #define XtInheritTranslations ((String) &_XtInheritTranslations)
-@@ -167,5 +169,7 @@ typedef struct _WidgetClassRec {
- externalref WidgetClassRec widgetClassRec;
- #define coreClassRec widgetClassRec
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtCoreP_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/CreateI.h b/include/X11/CreateI.h
-index 87abb1d..e0ca9a3 100644
---- a/include/X11/CreateI.h
-+++ b/include/X11/CreateI.h
-@@ -3,6 +3,8 @@
- #ifndef _XtcreateI_h
- #define _XtcreateI_h
-
-+_XFUNCPROTOBEGIN
-+
- extern Widget _XtCreateWidget(String name, WidgetClass widget_class,
- Widget parent, ArgList args, Cardinal num_args,
- XtTypedArgList typed_args,
-@@ -18,9 +20,12 @@ extern Widget _XtAppCreateShell(String name, String class,
- Cardinal num_typed_args);
- extern Widget _XtCreateHookObj(Screen *screen);
-
-+_XFUNCPROTOEND
-
- #include <stdarg.h>
-
-+_XFUNCPROTOBEGIN
-+
- /* VarCreate.c */
- extern Widget _XtVaOpenApplication(XtAppContext *app_context_return,
- _Xconst char* application_class,
-@@ -34,4 +39,6 @@ extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,
- int *argc_in_out, String *argv_in_out,
- String *fallback_resources, va_list var_args);
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtcreateI_h */
-diff --git a/include/X11/EventI.h b/include/X11/EventI.h
-index 00858e7..d2d1d0f 100644
---- a/include/X11/EventI.h
-+++ b/include/X11/EventI.h
-@@ -65,6 +65,8 @@ typedef struct _XtGrabRec *XtGrabList;
-
- #include "PassivGraI.h"
-
-+_XFUNCPROTOBEGIN
-+
- extern void _XtEventInitialize(
- void
- );
-@@ -131,4 +133,6 @@ extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr,
- /* NextEvent.c */
- extern Boolean XtAppPeekEvent_SkipTimer;
-
-+_XFUNCPROTOEND
-+
- #endif /* _Event_h_ */
-diff --git a/include/X11/HookObjI.h b/include/X11/HookObjI.h
-index c9a22a2..c0858c2 100644
---- a/include/X11/HookObjI.h
-+++ b/include/X11/HookObjI.h
-@@ -29,6 +29,8 @@ in this Software without prior written authorization from The Open Group.
- #ifndef _XtHookObjI_h
- #define _XtHookObjI_h
-
-+_XFUNCPROTOBEGIN
-+
- /* This object is implementation-dependent and private to the library. */
-
- typedef struct _HookObjRec *HookObject;
-@@ -66,6 +68,8 @@ typedef struct _HookObjClassRec {
-
- externalref HookObjClassRec hookObjClassRec;
-
-+_XFUNCPROTOEND
-+
- #endif /* ifndef _Xt_HookObjI_h */
-
-
-diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h
-index c2fe47c..2ae9b74 100644
---- a/include/X11/InitialI.h
-+++ b/include/X11/InitialI.h
-@@ -84,6 +84,8 @@ SOFTWARE.
- #include <X11/Xos.h>
- #include <X11/Xpoll.h>
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct _TimerEventRec {
- struct timeval te_timer_value;
- struct _TimerEventRec *te_next;
-@@ -426,4 +428,6 @@ extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
- String *applName, String *displayName,
- String *language);
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtinitialI_h */
-diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h
-index d749867..d88166f 100644
---- a/include/X11/IntrinsicI.h
-+++ b/include/X11/IntrinsicI.h
-@@ -194,6 +194,8 @@ SOFTWARE.
- #define ERRORDB "/usr/lib/X11/XtErrorDB"
- #endif
-
-+_XFUNCPROTOBEGIN
-+
- extern String XtCXtToolkitError;
-
- extern void _XtAllocError(
-@@ -257,5 +259,7 @@ extern char* __XtCalloc (
- #define __XtCalloc XtCalloc
- #endif
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtintrinsicI_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/Object.h b/include/X11/Object.h
-index 96723b1..2c84aaf 100644
---- a/include/X11/Object.h
-+++ b/include/X11/Object.h
-@@ -50,11 +50,16 @@ SOFTWARE.
- #ifndef _XtObject_h
- #define _XtObject_h
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct _ObjectRec *Object;
- typedef struct _ObjectClassRec *ObjectClass;
-
- #ifndef OBJECT
- externalref WidgetClass objectClass;
- #endif
-+
-+_XFUNCPROTOEND
-+
- #endif /* _XtObject_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/ObjectP.h b/include/X11/ObjectP.h
-index a24564e..0f484d2 100644
---- a/include/X11/ObjectP.h
-+++ b/include/X11/ObjectP.h
-@@ -52,6 +52,8 @@ SOFTWARE.
-
- #include <X11/Object.h>
-
-+_XFUNCPROTOBEGIN
-+
- /**********************************************************
- * Object Instance Data Structures
- *
-@@ -132,6 +134,8 @@ typedef struct _ObjectClassRec {
-
- externalref ObjectClassRec objectClassRec;
-
-+_XFUNCPROTOEND
-+
- #define XtObjectExtensionVersion 1L
- #define XtInheritAllocate ((XtAllocateProc) _XtInherit)
- #define XtInheritDeallocate ((XtDeallocateProc) _XtInherit)
-diff --git a/include/X11/PassivGraI.h b/include/X11/PassivGraI.h
-index 02e2964..10591ac 100644
---- a/include/X11/PassivGraI.h
-+++ b/include/X11/PassivGraI.h
-@@ -60,6 +60,8 @@ in this Software without prior written authorization from The Open Group.
- #define KEYBOARD TRUE
- #define POINTER FALSE
-
-+_XFUNCPROTOBEGIN
-+
- typedef enum {
- XtNoServerGrab,
- XtPassiveServerGrab,
-@@ -183,4 +185,6 @@ extern void _XtClearAncestorCache(
- Widget /* widget */
- );
-
-+_XFUNCPROTOEND
-+
- #endif /* _PDI_h_ */
-diff --git a/include/X11/RectObj.h b/include/X11/RectObj.h
-index 07615fa..dced5c3 100644
---- a/include/X11/RectObj.h
-+++ b/include/X11/RectObj.h
-@@ -50,11 +50,16 @@ SOFTWARE.
- #ifndef _XtRect_h
- #define _XtRect_h
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct _RectObjRec *RectObj;
- typedef struct _RectObjClassRec *RectObjClass;
-
- #ifndef RECTOBJ
- externalref WidgetClass rectObjClass;
- #endif
-+
-+_XFUNCPROTOEND
-+
- #endif /* _XtRect_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/RectObjP.h b/include/X11/RectObjP.h
-index ca3b8ad..d6ffb78 100644
---- a/include/X11/RectObjP.h
-+++ b/include/X11/RectObjP.h
-@@ -53,6 +53,8 @@ SOFTWARE.
- #include <X11/RectObj.h>
- #include <X11/ObjectP.h>
-
-+_XFUNCPROTOBEGIN
-+
- /**********************************************************
- * Rectangle Object Instance Data Structures
- *
-@@ -126,4 +128,6 @@ typedef struct _RectObjClassRec {
-
- externalref RectObjClassRec rectObjClassRec;
-
-+_XFUNCPROTOEND
-+
- #endif /*_Xt_RectObjP_h_*/
-diff --git a/include/X11/ResourceI.h b/include/X11/ResourceI.h
-index d6ed1df..3db97f8 100644
---- a/include/X11/ResourceI.h
-+++ b/include/X11/ResourceI.h
-@@ -61,6 +61,8 @@ SOFTWARE.
- #define StringToName(string) XrmStringToName(string)
- #define StringToClass(string) XrmStringToClass(string)
-
-+_XFUNCPROTOBEGIN
-+
- extern void _XtDependencies(
- XtResourceList * /* class_resp */,
- Cardinal * /* class_num_resp */,
-@@ -96,5 +98,6 @@ extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources,
- Cardinal num_resources);
- extern void _XtResourceListInitialize(void);
-
-+_XFUNCPROTOEND
-
- #endif /* _XtresourceI_h */
-diff --git a/include/X11/ShellP.h b/include/X11/ShellP.h
-index 2b08c3f..7297d33 100644
---- a/include/X11/ShellP.h
-+++ b/include/X11/ShellP.h
-@@ -67,6 +67,8 @@ SOFTWARE.
- * *****
- */
-
-+_XFUNCPROTOBEGIN
-+
- /***********************************************************************
- *
- * Shell Widget Private Data
-@@ -214,8 +216,12 @@ typedef struct {
- WMShellPart wm;
- } WMShellRec, *WMShellWidget;
-
-+_XFUNCPROTOEND
-+
- #include <X11/VendorP.h>
-
-+_XFUNCPROTOBEGIN
-+
- /***********************************************************************
- *
- * TransientShell Widget Private Data
-@@ -425,4 +431,6 @@ typedef struct {
- SessionShellPart session;
- } SessionShellRec, *SessionShellWidget;
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtShellPrivate_h */
-diff --git a/include/X11/ThreadsI.h b/include/X11/ThreadsI.h
-index 1492d77..28cbc98 100644
---- a/include/X11/ThreadsI.h
-+++ b/include/X11/ThreadsI.h
-@@ -81,6 +81,8 @@ typedef void (*ThreadAppRestoreLockProc)(
- Boolean* /* pushed_thread */
- );
-
-+_XFUNCPROTOBEGIN
-+
- extern void (*_XtProcessLock)(
- void
- );
-@@ -93,6 +95,8 @@ extern void (*_XtInitAppLock)(
- XtAppContext /* app */
- );
-
-+_XFUNCPROTOEND
-+
- #define INIT_APP_LOCK(app) if(_XtInitAppLock) (*_XtInitAppLock)(app)
- #define FREE_APP_LOCK(app) if(app && app->free_lock)(*app->free_lock)(app)
-
-diff --git a/include/X11/TranslateI.h b/include/X11/TranslateI.h
-index 1224875..6cc3099 100644
---- a/include/X11/TranslateI.h
-+++ b/include/X11/TranslateI.h
-@@ -342,6 +342,8 @@ typedef struct _TMGlobalRec{
- #endif /* TRACE_TM */
- }TMGlobalRec;
-
-+_XFUNCPROTOBEGIN
-+
- extern TMGlobalRec _XtGlobalTM;
-
- #define TM_MOD_SEGMENT_SIZE 16
-@@ -604,3 +606,4 @@ extern void _XtUnmergeTranslations(
- /* TMKey.c */
- extern void _XtAllocTMContext(XtPerDisplay pd);
-
-+_XFUNCPROTOEND
-diff --git a/include/X11/VarargsI.h b/include/X11/VarargsI.h
-index e15404a..76ce9bc 100644
---- a/include/X11/VarargsI.h
-+++ b/include/X11/VarargsI.h
-@@ -34,6 +34,8 @@ in this Software without prior written authorization from The Open Group.
-
- /* private routines */
-
-+_XFUNCPROTOBEGIN
-+
- extern void _XtCountVaList(
- va_list /*var*/, int* /*total_count*/, int* /*typed_count*/
- );
-@@ -62,4 +64,6 @@ extern void _XtGetSubresources(
- Widget /*w*/, XtPointer /*base*/, const char* /*name*/, const char* /*class*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/
- );
-
-+_XFUNCPROTOEND
-+
- #endif /* _VarargsI_h_ */
-diff --git a/include/X11/Vendor.h b/include/X11/Vendor.h
-index 65e7c38..633d17a 100644
---- a/include/X11/Vendor.h
-+++ b/include/X11/Vendor.h
-@@ -65,7 +65,11 @@ SOFTWARE.
-
- typedef struct _VendorShellClassRec *VendorShellWidgetClass;
-
-+_XFUNCPROTOBEGIN
-+
- externalref WidgetClass vendorShellWidgetClass;
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtVendor_h */
- /* DON'T ADD STUFF AFTER THIS #endif */
-diff --git a/include/X11/VendorP.h b/include/X11/VendorP.h
-index 08bf689..e60857d 100644
---- a/include/X11/VendorP.h
-+++ b/include/X11/VendorP.h
-@@ -72,6 +72,8 @@ SOFTWARE.
-
- /* New fields for the VendorShell widget class record */
-
-+_XFUNCPROTOBEGIN
-+
- typedef struct {
- XtPointer extension; /* pointer to extension record */
- } VendorShellClassPart;
-@@ -100,4 +102,6 @@ typedef struct {
- VendorShellPart vendor;
- } VendorShellRec, *VendorShellWidget;
-
-+_XFUNCPROTOEND
-+
- #endif /* _XtVendorPrivate_h */
diff --git a/recipes/xorg-lib/libxt_1.0.4.bb b/recipes/xorg-lib/libxt_1.0.4.bb
deleted file mode 100644
index 7dd9863..0000000
--- a/recipes/xorg-lib/libxt_1.0.4.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Toolkit Intrinsics"
-PRIORITY = "optional"
-DEPENDS += " libsm virtual/libx11 xproto kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://pr10970-header-fix.patch"
-SRC_URI[archive.md5sum] = "937735f342c046db239852fec0413f6c"
-SRC_URI[archive.sha256sum] = "ec7088b2ffe8f56c177525283601fb048decaf6f175d9ee5db01e12810a4d345"
-
-EXTRA_OECONF = "--enable-malloc0returnsnull --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 ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
- ) || exit 1
- oe_runmake
-}
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXt"
diff --git a/recipes/xorg-lib/libxt_1.0.5.bb b/recipes/xorg-lib/libxt_1.0.5.bb
deleted file mode 100644
index 7bdf252..0000000
--- a/recipes/xorg-lib/libxt_1.0.5.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 toolkit intrinsics library"
-DEPENDS += "libsm virtual/libx11 kbproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://pr10970-header-fix.patch"
-SRC_URI[archive.md5sum] = "f3bdd67785ace8cd0b23249e9d8c9975"
-SRC_URI[archive.sha256sum] = "43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4"
-
-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
-}
-
-BBCLASSEXTEND = "native"
-
-XORG_PN = "libXt"
diff --git a/recipes/xorg-lib/libxtst_1.0.2.bb b/recipes/xorg-lib/libxtst_1.0.2.bb
deleted file mode 100644
index ff87f7c..0000000
--- a/recipes/xorg-lib/libxtst_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Test Extension: client side library"
-DEPENDS += "libxext recordproto inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "032d5c1d3914fc0224837328c88aef96"
-SRC_URI[archive.sha256sum] = "eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b"
-
-XORG_PN = "libXtst"
diff --git a/recipes/xorg-lib/libxtst_1.0.3.bb b/recipes/xorg-lib/libxtst_1.0.3.bb
deleted file mode 100644
index 56dfae5..0000000
--- a/recipes/xorg-lib/libxtst_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Test Extension: client side library"
-DEPENDS += "libxext recordproto inputproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "090c1ad04e34982eada5cf3b1a0792fd"
-SRC_URI[archive.sha256sum] = "b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905"
-
-XORG_PN = "libXtst"
diff --git a/recipes/xorg-lib/libxv_1.0.3.bb b/recipes/xorg-lib/libxv_1.0.3.bb
deleted file mode 100644
index 4f19126..0000000
--- a/recipes/xorg-lib/libxv_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Video extension library"
-LICENSE = "GPL"
-DEPENDS += "libxext videoproto"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f1c4109fa804aeaf7188b66c5cdd9f57"
-SRC_URI[archive.sha256sum] = "f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b"
-
-XORG_PN = "libXv"
diff --git a/recipes/xorg-lib/libxv_1.0.4.bb b/recipes/xorg-lib/libxv_1.0.4.bb
deleted file mode 100644
index be5a50c..0000000
--- a/recipes/xorg-lib/libxv_1.0.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Video extension library"
-LICENSE = "GPL"
-DEPENDS += "libxext videoproto"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "723a0275227165383e967a1ca8899b52"
-SRC_URI[archive.sha256sum] = "4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8"
-
-XORG_PN = "libXv"
diff --git a/recipes/xorg-lib/libxvmc/drm.patch b/recipes/xorg-lib/libxvmc/drm.patch
deleted file mode 100644
index d48cdb3..0000000
--- a/recipes/xorg-lib/libxvmc/drm.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- XvMC/hw/via/Makefile.am.old 2005-03-06 11:25:11.000000000 +0000
-+++ XvMC/hw/via/Makefile.am 2005-03-06 11:25:22.000000000 +0000
-@@ -1,5 +1,5 @@
- AM_CFLAGS = $(XVMC_CFLAGS)
--libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
-+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm
-
- lib_LTLIBRARIES = libviaXvMC.la
-
diff --git a/recipes/xorg-lib/libxvmc/true.patch b/recipes/xorg-lib/libxvmc/true.patch
deleted file mode 100644
index 7059295..0000000
--- a/recipes/xorg-lib/libxvmc/true.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- XvMC/hw/via/viaXvMC.c.old 2004-10-18 20:54:49.000000000 +0100
-+++ XvMC/hw/via/viaXvMC.c 2004-10-18 20:55:03.000000000 +0100
-@@ -43,6 +43,8 @@
- #include <xf86drm.h>
- #include <pthread.h>
- #include "vldXvMC.h"
-+
-+#define TRUE 1
-
- #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \
- (((CARD8 *)(ctx)->sAreaAddress) + \
diff --git a/recipes/xorg-lib/libxvmc/via.patch b/recipes/xorg-lib/libxvmc/via.patch
deleted file mode 100644
index 21cdfbd..0000000
--- a/recipes/xorg-lib/libxvmc/via.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- XvMC/configure.ac.old 2004-09-18 13:16:31.000000000 +0100
-+++ XvMC/configure.ac 2004-09-18 13:16:32.000000000 +0100
-@@ -14,4 +14,5 @@
- AC_OUTPUT([Makefile
- hw/Makefile
- hw/i810/Makefile
-+ hw/via/Makefile
- xvmc.pc])
---- /dev/null 2004-06-13 02:32:19.000000000 +0100
-+++ XvMC/hw/via/Makefile.am 2004-09-18 13:16:01.000000000 +0100
-@@ -0,0 +1,7 @@
-+AM_CFLAGS = $(XVMC_CFLAGS)
-+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
-+
-+lib_LTLIBRARIES = libviaXvMC.la
-+
-+libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \
-+ viaXvMCPriv.h
---- XvMC/hw/Makefile.am.old 2004-10-17 22:34:27.000000000 +0100
-+++ XvMC/hw/Makefile.am 2004-10-17 22:34:31.000000000 +0100
-@@ -1 +1 @@
--SUBDIRS = i810
-+SUBDIRS = i810 via
diff --git a/recipes/xorg-lib/libxvmc_1.0.4.bb b/recipes/xorg-lib/libxvmc_1.0.4.bb
deleted file mode 100644
index 003c5be..0000000
--- a/recipes/xorg-lib/libxvmc_1.0.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Video Motion Compensation extension library"
-DEPENDS += "libxext libxv videoproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "b54600573daf9d1a29b952e8d35b389e"
-SRC_URI[archive.sha256sum] = "1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb"
-
-XORG_PN = "libXvMC"
diff --git a/recipes/xorg-lib/libxvmc_1.0.5.bb b/recipes/xorg-lib/libxvmc_1.0.5.bb
deleted file mode 100644
index cdd965a..0000000
--- a/recipes/xorg-lib/libxvmc_1.0.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X Video Motion Compensation extension library"
-DEPENDS += "libxext libxv videoproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "16c3a11add14979beb7510e44623cac6"
-SRC_URI[archive.sha256sum] = "0644c768d28343af0efe0cb09fc9e0220b8ad755642bb498a3038cee328fde7f"
-
-XORG_PN = "libXvMC"
diff --git a/recipes/xorg-lib/libxxf86dga_1.0.1.bb b/recipes/xorg-lib/libxxf86dga_1.0.1.bb
deleted file mode 100644
index 6d51967..0000000
--- a/recipes/xorg-lib/libxxf86dga_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Direct Graphics Access extension library"
-DEPENDS += "libxext xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "5b0e752c71a23e9d1290cad44a7c7c75"
-SRC_URI[archive.sha256sum] = "8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9"
-
-XORG_PN = "libXxf86dga"
diff --git a/recipes/xorg-lib/libxxf86dga_1.0.2.bb b/recipes/xorg-lib/libxxf86dga_1.0.2.bb
deleted file mode 100644
index b311537..0000000
--- a/recipes/xorg-lib/libxxf86dga_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 Direct Graphics Access extension library"
-DEPENDS += "libxext xf86dgaproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "6f5f621804ee652b6cc6f2025c517c78"
-SRC_URI[archive.sha256sum] = "59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25"
-
-XORG_PN = "libXxf86dga"
diff --git a/recipes/xorg-lib/libxxf86misc_1.0.1.bb b/recipes/xorg-lib/libxxf86misc_1.0.1.bb
deleted file mode 100644
index 91a7123..0000000
--- a/recipes/xorg-lib/libxxf86misc_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 XFree86 miscellaneous extension library"
-DEPENDS += "libxext xf86miscproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "7cee0df63903cef7f7a3fb68cdd99eef"
-SRC_URI[archive.sha256sum] = "2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289"
-
-XORG_PN = "libXxf86misc"
diff --git a/recipes/xorg-lib/libxxf86vm_1.0.1.bb b/recipes/xorg-lib/libxxf86vm_1.0.1.bb
deleted file mode 100644
index b13707c..0000000
--- a/recipes/xorg-lib/libxxf86vm_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 XFree86 video mode extension library"
-DEPENDS += "libxext xf86vidmodeproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8de1ca6c55aaad7d8cae19b4f0b3da32"
-SRC_URI[archive.sha256sum] = "e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a"
-
-XORG_PN = "libXxf86vm"
diff --git a/recipes/xorg-lib/libxxf86vm_1.0.2.bb b/recipes/xorg-lib/libxxf86vm_1.0.2.bb
deleted file mode 100644
index e693362..0000000
--- a/recipes/xorg-lib/libxxf86vm_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "X11 XFree86 video mode extension library"
-DEPENDS += "libxext xf86vidmodeproto"
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "304d37bd0a10d9b58aa9b64469ad73e5"
-SRC_URI[archive.sha256sum] = "3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de"
-
-XORG_PN = "libXxf86vm"
diff --git a/recipes/xorg-lib/pixman-0.12.0/pixman-arm.patch b/recipes/xorg-lib/pixman-0.12.0/pixman-arm.patch
new file mode 100644
index 0000000..91dda03
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.12.0/pixman-arm.patch
@@ -0,0 +1,632 @@
+From: Jeff Muizelaar <jmuizelaar@mozilla.com>
+Date: Wed, 17 Sep 2008 19:53:20 +0000 (-0400)
+Subject: Add support for ARMv6 SIMD fastpaths.
+X-Git-Url: http://gitweb.freedesktop.org/?p=pixman.git;a=commitdiff;h=d0b181f347ef4720d130beee3f03196afbd28aba
+
+Add support for ARMv6 SIMD fastpaths.
+---
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -277,6 +277,44 @@ AC_SUBST(VMX_CFLAGS)
+
+ AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
+
++dnl Check for ARM
++
++have_armv6_simd=no
++AC_MSG_CHECKING(whether to use ARM assembler)
++xserver_save_CFLAGS=$CFLAGS
++CFLAGS="$CFLAGS $ARM_CFLAGS"
++AC_COMPILE_IFELSE([
++int main () {
++ asm("uqadd8 r1, r1, r2");
++ return 0;
++}], have_armv6_simd=yes)
++CFLAGS=$xserver_save_CFLAGS
++
++AC_ARG_ENABLE(arm,
++ [AC_HELP_STRING([--disable-arm],
++ [disable ARM fast paths])],
++ [enable_arm=$enableval], [enable_arm=auto])
++
++if test $enable_arm = no ; then
++ have_armv6_simd=disabled
++fi
++
++if test $have_armv6_simd = yes ; then
++ AC_DEFINE(USE_ARM, 1, [use ARM compiler intrinsics])
++else
++ ARM_CFLAGS=
++fi
++
++AC_MSG_RESULT($have_armv6_simd)
++if test $enable_arm = yes && test $have_armv6_simd = no ; then
++ AC_MSG_ERROR([ARM intrinsics not detected])
++fi
++
++AC_SUBST(ARM_CFLAGS)
++
++AM_CONDITIONAL(USE_ARM, test $have_armv6_simd = yes)
++
++
+ AC_ARG_ENABLE(gtk,
+ [AC_HELP_STRING([--enable-gtk],
+ [enable tests using GTK+ [default=auto]])],
+--- a/pixman/Makefile.am
++++ b/pixman/Makefile.am
+@@ -79,3 +79,15 @@ libpixman_sse2_la_LIBADD = $(DEP_LIBS)
+ libpixman_1_la_LIBADD += libpixman-sse2.la
+ endif
+
++# arm code
++if USE_ARM
++noinst_LTLIBRARIES += libpixman-arm.la
++libpixman_arm_la_SOURCES = \
++ pixman-arm.c \
++ pixman-arm.h
++libpixman_arm_la_CFLAGS = $(DEP_CFLAGS) $(ARM_CFLAGS)
++libpixman_arm_la_LIBADD = $(DEP_LIBS)
++libpixman_1_la_LIBADD += libpixman-arm.la
++endif
++
++
+--- /dev/null
++++ b/pixman/pixman-arm.c
+@@ -0,0 +1,409 @@
++/*
++ * Copyright © 2008 Mozilla Corporation
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Mozilla Corporation not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Mozilla Corporation makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ *
++ * Author: Jeff Muizelaar (jeff@infidigm.net)
++ *
++ */
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include "pixman-arm.h"
++
++void
++fbCompositeSrcAdd_8000x8000arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint8_t *dstLine, *dst;
++ uint8_t *srcLine, *src;
++ int dstStride, srcStride;
++ uint16_t w;
++ uint8_t s, d;
++
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1);
++ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
++
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ while (w && (unsigned long)dst & 3)
++ {
++ s = *src;
++ d = *dst;
++ asm("uqadd8 %0, %1, %2" : "+r"(d) : "r"(s));
++ *dst = d;
++
++ dst++;
++ src++;
++ w--;
++ }
++
++ while (w >= 4)
++ {
++ asm("uqadd8 %0, %1, %2" : "=r"(*(uint32_t*)dst) : "r"(*(uint32_t*)src), "r"(*(uint32_t*)dst));
++ dst += 4;
++ src += 4;
++ w -= 4;
++ }
++
++ while (w)
++ {
++ s = *src;
++ d = *dst;
++ asm("uqadd8 %0, %1, %2" : "+r"(d) : "r"(s));
++ *dst = d;
++
++ dst++;
++ src++;
++ w--;
++ }
++ }
++
++}
++
++void
++fbCompositeSrc_8888x8888arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t *dstLine, *dst;
++ uint32_t *srcLine, *src;
++ int dstStride, srcStride;
++ uint16_t w;
++ uint32_t component_half = 0x800080;
++ uint32_t upper_component_mask = 0xff00ff00;
++ uint32_t alpha_mask = 0xff;
++
++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++//#define inner_branch
++ asm volatile (
++ "cmp %[w], #0\n\t"
++ "beq 2f\n\t"
++ "1:\n\t"
++ /* load dest */
++ "ldr r5, [%[src]], #4\n\t"
++#ifdef inner_branch
++ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
++ * The 0x0 case also allows us to avoid doing an unecessary data
++ * write which is more valuable so we only check for that */
++ "cmp r5, #0x1000000\n\t"
++ "blt 3f\n\t"
++
++ /* = 255 - alpha */
++ "sub r8, %[alpha_mask], r5, lsr #24\n\t"
++
++ "ldr r4, [%[dest]] \n\t"
++
++#else
++ "ldr r4, [%[dest]] \n\t"
++
++ /* = 255 - alpha */
++ "sub r8, %[alpha_mask], r5, lsr #24\n\t"
++#endif
++ "uxtb16 r6, r4\n\t"
++ "uxtb16 r7, r4, ror #8\n\t"
++
++ /* multiply by 257 and divide by 65536 */
++ "mla r6, r6, r8, %[component_half]\n\t"
++ "mla r7, r7, r8, %[component_half]\n\t"
++
++ "uxtab16 r6, r6, r6, ror #8\n\t"
++ "uxtab16 r7, r7, r7, ror #8\n\t"
++
++ /* recombine the 0xff00ff00 bytes of r6 and r7 */
++ "and r7, %[upper_component_mask]\n\t"
++ "uxtab16 r6, r7, r6, ror #8\n\t"
++
++ "uqadd8 r5, r6, r5\n\t"
++
++#ifdef inner_branch
++ "3:\n\t"
++
++#endif
++ "str r5, [%[dest]], #4\n\t"
++ /* increment counter and jmp to top */
++ "subs %[w], %[w], #1\n\t"
++ "bne 1b\n\t"
++ "2:\n\t"
++ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src)
++ : [component_half] "r" (component_half), [upper_component_mask] "r" (upper_component_mask),
++ [alpha_mask] "r" (alpha_mask)
++ : "r4", "r5", "r6", "r7", "r8", "cc", "memory"
++ );
++ }
++}
++
++void
++fbCompositeSrc_8888x8x8888arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t *dstLine, *dst;
++ uint32_t *srcLine, *src;
++ uint32_t mask;
++ int dstStride, srcStride;
++ uint16_t w;
++ uint32_t component_half = 0x800080;
++ uint32_t alpha_mask = 0xff;
++
++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++
++ fbComposeGetSolid (pMask, mask, pDst->bits.format);
++ mask = (mask) >> 24;
++
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++//#define inner_branch
++ asm volatile (
++ "cmp %[w], #0\n\t"
++ "beq 2f\n\t"
++ "1:\n\t"
++ /* load dest */
++ "ldr r5, [%[src]], #4\n\t"
++#ifdef inner_branch
++ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
++ * The 0x0 case also allows us to avoid doing an unecessary data
++ * write which is more valuable so we only check for that */
++ "cmp r5, #0x1000000\n\t"
++ "blt 3f\n\t"
++
++#endif
++ "ldr r4, [%[dest]] \n\t"
++
++ "uxtb16 r6, r5\n\t"
++ "uxtb16 r7, r5, ror #8\n\t"
++
++ /* multiply by alpha (r8) then by 257 and divide by 65536 */
++ "mla r6, r6, %[mask_alpha], %[component_half]\n\t"
++ "mla r7, r7, %[mask_alpha], %[component_half]\n\t"
++
++ "uxtab16 r6, r6, r6, ror #8\n\t"
++ "uxtab16 r7, r7, r7, ror #8\n\t"
++
++ "uxtb16 r6, r6, ror #8\n\t"
++ "uxtb16 r7, r7, ror #8\n\t"
++
++ /* recombine */
++ "orr r5, r6, r7, lsl #8\n\t"
++
++ "uxtb16 r6, r4\n\t"
++ "uxtb16 r7, r4, ror #8\n\t"
++
++ /* 255 - alpha */
++ "sub r8, %[alpha_mask], r5, lsr #24\n\t"
++
++ /* multiply by alpha (r8) then by 257 and divide by 65536 */
++ "mla r6, r6, r8, %[component_half]\n\t"
++ "mla r7, r7, r8, %[component_half]\n\t"
++
++ "uxtab16 r6, r6, r6, ror #8\n\t"
++ "uxtab16 r7, r7, r7, ror #8\n\t"
++
++ "uxtb16 r6, r6, ror #8\n\t"
++ "uxtb16 r7, r7, ror #8\n\t"
++
++ /* recombine */
++ "orr r6, r6, r7, lsl #8\n\t"
++
++ "uqadd8 r5, r6, r5\n\t"
++
++#ifdef inner_branch
++ "3:\n\t"
++
++#endif
++ "str r5, [%[dest]], #4\n\t"
++ /* increment counter and jmp to top */
++ "subs %[w], %[w], #1\n\t"
++ "bne 1b\n\t"
++ "2:\n\t"
++ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src)
++ : [component_half] "r" (component_half), [mask_alpha] "r" (mask),
++ [alpha_mask] "r" (alpha_mask)
++ : "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory"
++ );
++ }
++}
++
++void
++fbCompositeSolidMask_nx8x8888arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t src, srca;
++ uint32_t *dstLine, *dst;
++ uint8_t *maskLine, *mask;
++ int dstStride, maskStride;
++ uint16_t w;
++
++ fbComposeGetSolid(pSrc, src, pDst->bits.format);
++
++ srca = src >> 24;
++ if (src == 0)
++ return;
++
++ uint32_t component_mask = 0xff00ff;
++ uint32_t component_half = 0x800080;
++
++ uint32_t src_hi = (src >> 8) & component_mask;
++ uint32_t src_lo = src & component_mask;
++
++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
++
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++//#define inner_branch
++ asm volatile (
++ "cmp %[w], #0\n\t"
++ "beq 2f\n\t"
++ "1:\n\t"
++ /* load mask */
++ "ldrb r5, [%[mask]], #1\n\t"
++#ifdef inner_branch
++ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
++ * The 0x0 case also allows us to avoid doing an unecessary data
++ * write which is more valuable so we only check for that */
++ /* 0x1000000 is the least value that contains alpha all values
++ * less than it have a 0 alpha value */
++ "cmp r5, #0x0\n\t"
++ "beq 3f\n\t"
++
++#endif
++ "ldr r4, [%[dest]] \n\t"
++
++ /* multiply by alpha (r8) then by 257 and divide by 65536 */
++ "mla r6, %[src_lo], r5, %[component_half]\n\t"
++ "mla r7, %[src_hi], r5, %[component_half]\n\t"
++
++ "uxtab16 r6, r6, r6, ror #8\n\t"
++ "uxtab16 r7, r7, r7, ror #8\n\t"
++
++ "uxtb16 r6, r6, ror #8\n\t"
++ "uxtb16 r7, r7, ror #8\n\t"
++
++ /* recombine */
++ "orr r5, r6, r7, lsl #8\n\t"
++
++ "uxtb16 r6, r4\n\t"
++ "uxtb16 r7, r4, ror #8\n\t"
++
++ /* we could simplify this to use 'sub' if we were
++ * willing to give up a register for alpha_mask */
++ "mvn r8, r5\n\t"
++ "mov r8, r8, lsr #24\n\t"
++
++ /* multiply by alpha (r8) then by 257 and divide by 65536 */
++ "mla r6, r6, r8, %[component_half]\n\t"
++ "mla r7, r7, r8, %[component_half]\n\t"
++
++ "uxtab16 r6, r6, r6, ror #8\n\t"
++ "uxtab16 r7, r7, r7, ror #8\n\t"
++
++ "uxtb16 r6, r6, ror #8\n\t"
++ "uxtb16 r7, r7, ror #8\n\t"
++
++ /* recombine */
++ "orr r6, r6, r7, lsl #8\n\t"
++
++ "uqadd8 r5, r6, r5\n\t"
++
++#ifdef inner_branch
++ "3:\n\t"
++
++#endif
++ "str r5, [%[dest]], #4\n\t"
++ /* increment counter and jmp to top */
++ "subs %[w], %[w], #1\n\t"
++ "bne 1b\n\t"
++ "2:\n\t"
++ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src), [mask] "+r" (mask)
++ : [component_half] "r" (component_half),
++ [src_hi] "r" (src_hi), [src_lo] "r" (src_lo)
++ : "r4", "r5", "r6", "r7", "r8", "cc", "memory"
++ );
++ }
++}
+--- /dev/null
++++ b/pixman/pixman-arm.h
+@@ -0,0 +1,94 @@
++/*
++ * Copyright © 2008 Mozilla Corporation
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Mozilla Corporation not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Mozilla Corporation makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ *
++ * Author: Jeff Muizelaar (jeff@infidigm.net)
++ *
++ */
++
++#include "pixman-private.h"
++
++#ifdef USE_ARM
++
++static inline pixman_bool_t pixman_have_arm(void) { return TRUE; }
++
++#else
++#define pixman_have_arm() FALSE
++#endif
++
++#ifdef USE_ARM
++
++void
++fbCompositeSrcAdd_8000x8000arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++void
++fbCompositeSrc_8888x8888arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSrc_8888x8x8888arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++void
++fbCompositeSolidMask_nx8x8888arm (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++
++#endif /* USE_ARM */
+--- a/pixman/pixman-pict.c
++++ b/pixman/pixman-pict.c
+@@ -34,6 +34,7 @@
+ #include "pixman-mmx.h"
+ #include "pixman-vmx.h"
+ #include "pixman-sse2.h"
++#include "pixman-arm.h"
+ #include "pixman-combine32.h"
+
+ #ifdef __GNUC__
+@@ -1479,6 +1480,26 @@ static const FastPathInfo vmx_fast_paths
+ };
+ #endif
+
++#ifdef USE_ARM
++static const FastPathInfo arm_fast_paths[] =
++{
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_a8b8g8r8, fbCompositeSrc_8888x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fbCompositeSrc_8888x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8x8888arm, NEED_SOLID_MASK },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8x8888arm, NEED_SOLID_MASK },
++
++ { PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcAdd_8000x8000arm, 0 },
++
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSolidMask_nx8x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSolidMask_nx8x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8b8g8r8, fbCompositeSolidMask_nx8x8888arm, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8b8g8r8, fbCompositeSolidMask_nx8x8888arm, 0 },
++
++ { PIXMAN_OP_NONE },
++};
++#endif
+
+ static const FastPathInfo c_fast_paths[] =
+ {
+@@ -1829,6 +1850,12 @@ pixman_image_composite (pixman_op_t
+ if (!info && pixman_have_vmx())
+ info = get_fast_path (vmx_fast_paths, op, pSrc, pMask, pDst, pixbuf);
+ #endif
++
++#ifdef USE_ARM
++ if (!info && pixman_have_arm())
++ info = get_fast_path (arm_fast_paths, op, pSrc, pMask, pDst, pixbuf);
++#endif
++
+ if (!info)
+ info = get_fast_path (c_fast_paths, op, pSrc, pMask, pDst, pixbuf);
+
diff --git a/recipes/xorg-lib/pixman-0.12.0/pixman-x888-565.patch b/recipes/xorg-lib/pixman-0.12.0/pixman-x888-565.patch
new file mode 100644
index 0000000..a3fa331
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.12.0/pixman-x888-565.patch
@@ -0,0 +1,68 @@
+From: Vladimir Vukicevic <vladimir@slide.(none)>
+Date: Wed, 17 Sep 2008 20:01:31 +0000 (-0400)
+Subject: Add SRC x888x0565 C fast path
+X-Git-Url: http://gitweb.freedesktop.org/?p=pixman.git;a=commitdiff;h=7180230d4d87c55dfef1e17a0cc3b125d45aa3a0
+
+Add SRC x888x0565 C fast path
+---
+
+--- a/pixman/pixman-pict.c
++++ b/pixman/pixman-pict.c
+@@ -759,6 +759,46 @@ fbCompositeSrc_8888x0565 (pixman_op_t op
+ }
+ }
+
++
++void
++fbCompositeSrc_x888x0565 (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint16_t *dstLine, *dst;
++ uint32_t *srcLine, *src, s;
++ int dstStride, srcStride;
++ uint16_t w;
++
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ while (w--)
++ {
++ s = READ(pSrc, src++);
++ WRITE(pDst, dst, cvt8888to0565(s));
++ dst++;
++ }
++ }
++}
++
+ void
+ fbCompositeSrcAdd_8000x8000 (pixman_op_t op,
+ pixman_image_t * pSrc,
+@@ -1568,6 +1608,10 @@ static const FastPathInfo c_fast_paths[]
+ { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrcSrc_nxn, 0 },
+ { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrcSrc_nxn, 0 },
+ #endif
++ { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 },
+ { PIXMAN_OP_IN, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcIn_8x8, 0 },
+ { PIXMAN_OP_IN, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fbCompositeSolidMaskIn_nx8x8, 0 },
+ { PIXMAN_OP_NONE },
diff --git a/recipes/xorg-lib/pixman-0.13.2/pixman-0.13.2-neon1.patch b/recipes/xorg-lib/pixman-0.13.2/pixman-0.13.2-neon1.patch
new file mode 100644
index 0000000..b3bb762
--- /dev/null
+++ b/recipes/xorg-lib/pixman-0.13.2/pixman-0.13.2-neon1.patch
@@ -0,0 +1,1702 @@
+diff --git a/configure.ac b/configure.ac
+index 063f6eb..bada55c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -278,11 +278,12 @@ AC_SUBST(VMX_CFLAGS)
+ AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
+
+ dnl Check for ARM SIMD instructions
++ARM_SIMD_CFLAGS=""
+
+ have_arm_simd=no
+ AC_MSG_CHECKING(whether to use ARM SIMD assembler)
+ xserver_save_CFLAGS=$CFLAGS
+-CFLAGS="$CFLAGS $ARM_CFLAGS"
++CFLAGS="$CFLAGS $ARM_SIMD_CFLAGS"
+ AC_COMPILE_IFELSE([
+ int main () {
+ asm("uqadd8 r1, r1, r2");
+@@ -302,7 +303,7 @@ fi
+ if test $have_arm_simd = yes ; then
+ AC_DEFINE(USE_ARM_SIMD, 1, [use ARM SIMD compiler intrinsics])
+ else
+- ARM_CFLAGS=
++ ARM_SIMD_CFLAGS=
+ fi
+
+ AC_MSG_RESULT($have_arm_simd)
+@@ -310,9 +311,48 @@ if test $enable_arm_simd = yes && test $have_arm_simd = no ; then
+ AC_MSG_ERROR([ARM SIMD intrinsics not detected])
+ fi
+
+-AC_SUBST(ARM_CFLAGS)
++dnl Check for ARM NEON instructions
++ARM_NEON_CFLAGS="-mcpu=cortex-a8 -mfpu=neon"
++
++have_arm_neon=no
++AC_MSG_CHECKING(whether to use ARM NEON)
++xserver_save_CFLAGS=$CFLAGS
++CFLAGS="$CFLAGS $ARM_NEON_CFLAGS"
++AC_COMPILE_IFELSE([
++#include <arm_neon.h>
++int main () {
++ uint8x8_t neon_test=vmov_n_u8(0);
++ return 0;
++}], have_arm_neon=yes)
++CFLAGS=$xserver_save_CFLAGS
++
++AC_ARG_ENABLE(arm-neon,
++ [AC_HELP_STRING([--disable-arm-neon],
++ [disable ARM NEON fast paths])],
++ [enable_arm_neon=$enableval], [enable_arm_neon=auto])
++
++if test $enable_arm_neon = no ; then
++ have_arm_neon=disabled
++fi
++
++if test $have_arm_neon = yes ; then
++ AC_DEFINE(USE_ARM_NEON, 1, [use ARM NEON compiler intrinsics])
++else
++ ARM_NEON_CFLAGS=
++fi
++
++AC_MSG_RESULT($have_arm_neon)
++if test $enable_arm_neon = yes && test $have_arm_neon = no ; then
++ AC_MSG_ERROR([ARM NEON intrinsics not detected])
++fi
++
++
++AC_SUBST(ARM_SIMD_CFLAGS)
++AC_SUBST(ARM_NEON_CFLAGS)
+
+ AM_CONDITIONAL(USE_ARM_SIMD, test $have_arm_simd = yes)
++AM_CONDITIONAL(USE_ARM_NEON, test $have_arm_neon = yes)
++
+
+
+ AC_ARG_ENABLE(gtk,
+diff --git a/pixman/Makefile.am b/pixman/Makefile.am
+index c4612ea..4c1ec6b 100644
+--- a/pixman/Makefile.am
++++ b/pixman/Makefile.am
+@@ -80,15 +80,26 @@ libpixman_sse2_la_LIBADD = $(DEP_LIBS)
+ libpixman_1_la_LIBADD += libpixman-sse2.la
+ endif
+
+-# arm code
++# arm simd code
+ if USE_ARM_SIMD
+ noinst_LTLIBRARIES += libpixman-arm-simd.la
+ libpixman_arm_simd_la_SOURCES = \
+ pixman-arm-simd.c \
+ pixman-arm-simd.h
+-libpixman_arm_simd_la_CFLAGS = $(DEP_CFLAGS) $(ARM_CFLAGS)
++libpixman_arm_simd_la_CFLAGS = $(DEP_CFLAGS) $(ARM_SIMD_CFLAGS)
+ libpixman_arm_simd_la_LIBADD = $(DEP_LIBS)
+ libpixman_1_la_LIBADD += libpixman-arm-simd.la
+ endif
+
++# arm neon code
++if USE_ARM_NEON
++noinst_LTLIBRARIES += libpixman-arm-neon.la
++libpixman_arm_neon_la_SOURCES = \
++ pixman-arm-neon.c \
++ pixman-arm-neon.h
++libpixman_arm_neon_la_CFLAGS = $(DEP_CFLAGS) $(ARM_NEON_CFLAGS)
++libpixman_arm_neon_la_LIBADD = $(DEP_LIBS)
++libpixman_1_la_LIBADD += libpixman-arm-neon.la
++endif
++
+
+diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
+new file mode 100644
+index 0000000..10050e4
+--- /dev/null
++++ b/pixman/pixman-arm-neon.c
+@@ -0,0 +1,1387 @@
++/*
++ * Copyright © 2009 Mozilla Corporation
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Mozilla Corporation not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Mozilla Corporation makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ *
++ * Author: Ian Rickards (ian.rickards@arm.com)
++ *
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include "pixman-arm-neon.h"
++
++#include <arm_neon.h>
++
++
++#if !defined(__ARMCC_VERSION) && !defined(FORCE_NO_NEON_INLINE_ASM)
++// [both armcc & gcc set __GNUC__]
++// Use GNU style inline asm on gcc, for best performance
++// Use intrinsics on armcc
++// This switch determines if any GNU style inline asm is allowed
++#define USE_NEON_INLINE_ASM
++#endif
++
++
++static force_inline uint8x8x4_t unpack0565(uint16x8_t rgb)
++{
++ uint16x8_t gb, b;
++ uint8x8x4_t res;
++
++ res.val[3] = vdup_n_u8(0);
++ gb = vshrq_n_u16(rgb, 5);
++ b = vshrq_n_u16(rgb, 5+6);
++ res.val[0] = vmovn_u16(rgb); // get low 5 bits
++ res.val[1] = vmovn_u16(gb); // get mid 6 bits
++ res.val[2] = vmovn_u16(b); // get top 5 bits
++
++ res.val[0] = vshl_n_u8(res.val[0], 3); // shift to top
++ res.val[1] = vshl_n_u8(res.val[1], 2); // shift to top
++ res.val[2] = vshl_n_u8(res.val[2], 3); // shift to top
++
++ res.val[0] = vsri_n_u8(res.val[0], res.val[0], 5);
++ res.val[1] = vsri_n_u8(res.val[1], res.val[1], 6);
++ res.val[2] = vsri_n_u8(res.val[2], res.val[2], 5);
++
++ return res;
++}
++
++static force_inline uint16x8_t pack0565(uint8x8x4_t s)
++{
++ uint16x8_t rgb, val_g, val_r;
++
++ rgb = vshll_n_u8(s.val[2],8);
++ val_g = vshll_n_u8(s.val[1],8);
++ val_r = vshll_n_u8(s.val[0],8);
++ rgb = vsriq_n_u16(rgb, val_g, 5);
++ rgb = vsriq_n_u16(rgb, val_r, 5+6);
++
++ return rgb;
++}
++
++static force_inline uint8x8_t neon2mul(uint8x8_t x, uint8x8_t alpha)
++{
++ uint16x8_t tmp,tmp2;
++ uint8x8_t res;
++
++ tmp = vmull_u8(x,alpha);
++ tmp2 = vrshrq_n_u16(tmp,8);
++ res = vraddhn_u16(tmp,tmp2);
++
++ return res;
++}
++
++static force_inline uint8x8x4_t neon8mul(uint8x8x4_t x, uint8x8_t alpha)
++{
++ uint16x8x4_t tmp;
++ uint8x8x4_t res;
++ uint16x8_t qtmp1,qtmp2;
++
++ tmp.val[0] = vmull_u8(x.val[0],alpha);
++ tmp.val[1] = vmull_u8(x.val[1],alpha);
++ tmp.val[2] = vmull_u8(x.val[2],alpha);
++ tmp.val[3] = vmull_u8(x.val[3],alpha);
++
++ qtmp1 = vrshrq_n_u16(tmp.val[0],8);
++ qtmp2 = vrshrq_n_u16(tmp.val[1],8);
++ res.val[0] = vraddhn_u16(tmp.val[0],qtmp1);
++ qtmp1 = vrshrq_n_u16(tmp.val[2],8);
++ res.val[1] = vraddhn_u16(tmp.val[1],qtmp2);
++ qtmp2 = vrshrq_n_u16(tmp.val[3],8);
++ res.val[2] = vraddhn_u16(tmp.val[2],qtmp1);
++ res.val[3] = vraddhn_u16(tmp.val[3],qtmp2);
++
++ return res;
++}
++
++static force_inline uint8x8x4_t neon8qadd(uint8x8x4_t x, uint8x8x4_t y)
++{
++ uint8x8x4_t res;
++
++ res.val[0] = vqadd_u8(x.val[0],y.val[0]);
++ res.val[1] = vqadd_u8(x.val[1],y.val[1]);
++ res.val[2] = vqadd_u8(x.val[2],y.val[2]);
++ res.val[3] = vqadd_u8(x.val[3],y.val[3]);
++
++ return res;
++}
++
++
++void
++fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint8_t *dstLine, *dst;
++ uint8_t *srcLine, *src;
++ int dstStride, srcStride;
++ uint16_t w;
++
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1);
++ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
++
++ if (width>=8)
++ {
++ // Use overlapping 8-pixel method
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ uint8_t *keep_dst;
++
++#ifndef USE_NEON_INLINE_ASM
++ uint8x8_t sval,dval,temp;
++
++ sval = vld1_u8((void*)src);
++ dval = vld1_u8((void*)dst);
++ keep_dst = dst;
++
++ temp = vqadd_u8(dval,sval);
++
++ src += (w & 7);
++ dst += (w & 7);
++ w -= (w & 7);
++
++ while (w)
++ {
++ sval = vld1_u8((void*)src);
++ dval = vld1_u8((void*)dst);
++
++ vst1_u8((void*)keep_dst,temp);
++ keep_dst = dst;
++
++ temp = vqadd_u8(dval,sval);
++
++ src+=8;
++ dst+=8;
++ w-=8;
++ }
++ vst1_u8((void*)keep_dst,temp);
++#else
++ asm volatile (
++// avoid using d8-d15 (q4-q7) aapcs callee-save registers
++ "vld1.8 {d0}, [%[src]]\n\t"
++ "vld1.8 {d4}, [%[dst]]\n\t"
++ "mov %[keep_dst], %[dst]\n\t"
++
++ "and ip, %[w], #7\n\t"
++ "add %[src], %[src], ip\n\t"
++ "add %[dst], %[dst], ip\n\t"
++ "subs %[w], %[w], ip\n\t"
++ "b 9f\n\t"
++// LOOP
++ "2:\n\t"
++ "vld1.8 {d0}, [%[src]]!\n\t"
++ "vld1.8 {d4}, [%[dst]]!\n\t"
++ "vst1.8 {d20}, [%[keep_dst]]\n\t"
++ "sub %[keep_dst], %[dst], #8\n\t"
++ "subs %[w], %[w], #8\n\t"
++ "9:\n\t"
++ "vqadd.u8 d20, d0, d4\n\t"
++
++ "bne 2b\n\t"
++
++ "1:\n\t"
++ "vst1.8 {d20}, [%[keep_dst]]\n\t"
++
++ : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
++ :
++ : "ip", "cc", "memory", "d0","d4",
++ "d20"
++ );
++#endif
++ }
++ }
++ else
++ {
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++ uint8x8_t sval, dval;
++ uint8_t *dst4, *dst2;
++
++ if (w&4)
++ {
++ sval = vreinterpret_u8_u32(vld1_lane_u32((void*)src,vreinterpret_u32_u8(sval),1));
++ dval = vreinterpret_u8_u32(vld1_lane_u32((void*)dst,vreinterpret_u32_u8(dval),1));
++ dst4=dst;
++ src+=4;
++ dst+=4;
++ }
++ if (w&2)
++ {
++ sval = vreinterpret_u8_u16(vld1_lane_u16((void*)src,vreinterpret_u16_u8(sval),1));
++ dval = vreinterpret_u8_u16(vld1_lane_u16((void*)dst,vreinterpret_u16_u8(dval),1));
++ dst2=dst;
++ src+=2;
++ dst+=2;
++ }
++ if (w&1)
++ {
++ sval = vld1_lane_u8((void*)src,sval,1);
++ dval = vld1_lane_u8((void*)dst,dval,1);
++ }
++
++ dval = vqadd_u8(dval,sval);
++
++ if (w&1)
++ vst1_lane_u8((void*)dst,dval,1);
++ if (w&2)
++ vst1_lane_u16((void*)dst2,vreinterpret_u16_u8(dval),1);
++ if (w&4)
++ vst1_lane_u32((void*)dst4,vreinterpret_u32_u8(dval),1);
++ }
++ }
++}
++
++
++void
++fbCompositeSrc_8888x8888neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t *dstLine, *dst;
++ uint32_t *srcLine, *src;
++ int dstStride, srcStride;
++ uint32_t w;
++
++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++
++ if (width>=8)
++ {
++ // Use overlapping 8-pixel method
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ uint32_t *keep_dst;
++
++#ifndef USE_NEON_INLINE_ASM
++ uint8x8x4_t sval,dval,temp;
++
++ sval = vld4_u8((void*)src);
++ dval = vld4_u8((void*)dst);
++ keep_dst = dst;
++
++ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
++ temp = neon8qadd(sval,temp);
++
++ src += (w & 7);
++ dst += (w & 7);
++ w -= (w & 7);
++
++ while (w)
++ {
++ sval = vld4_u8((void*)src);
++ dval = vld4_u8((void*)dst);
++
++ vst4_u8((void*)keep_dst,temp);
++ keep_dst = dst;
++
++ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
++ temp = neon8qadd(sval,temp);
++
++ src+=8;
++ dst+=8;
++ w-=8;
++ }
++ vst4_u8((void*)keep_dst,temp);
++#else
++ asm volatile (
++// avoid using d8-d15 (q4-q7) aapcs callee-save registers
++ "vld4.8 {d0-d3}, [%[src]]\n\t"
++ "vld4.8 {d4-d7}, [%[dst]]\n\t"
++ "mov %[keep_dst], %[dst]\n\t"
++
++ "and ip, %[w], #7\n\t"
++ "add %[src], %[src], ip, LSL#2\n\t"
++ "add %[dst], %[dst], ip, LSL#2\n\t"
++ "subs %[w], %[w], ip\n\t"
++ "b 9f\n\t"
++// LOOP
++ "2:\n\t"
++ "vld4.8 {d0-d3}, [%[src]]!\n\t"
++ "vld4.8 {d4-d7}, [%[dst]]!\n\t"
++ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
++ "sub %[keep_dst], %[dst], #8*4\n\t"
++ "subs %[w], %[w], #8\n\t"
++ "9:\n\t"
++ "vmvn.8 d31, d3\n\t"
++ "vmull.u8 q10, d31, d4\n\t"
++ "vmull.u8 q11, d31, d5\n\t"
++ "vmull.u8 q12, d31, d6\n\t"
++ "vmull.u8 q13, d31, d7\n\t"
++ "vrshr.u16 q8, q10, #8\n\t"
++ "vrshr.u16 q9, q11, #8\n\t"
++ "vraddhn.u16 d20, q10, q8\n\t"
++ "vraddhn.u16 d21, q11, q9\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vraddhn.u16 d22, q12, q8\n\t"
++ "vraddhn.u16 d23, q13, q9\n\t"
++// result in d20-d23
++ "vqadd.u8 d20, d0, d20\n\t"
++ "vqadd.u8 d21, d1, d21\n\t"
++ "vqadd.u8 d22, d2, d22\n\t"
++ "vqadd.u8 d23, d3, d23\n\t"
++
++ "bne 2b\n\t"
++
++ "1:\n\t"
++ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
++
++ : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
++ :
++ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
++ "d16","d17","d18","d19","d20","d21","d22","d23"
++ );
++#endif
++ }
++ }
++ else
++ {
++ uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL));
++
++ // Handle width<8
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ while (w>=2)
++ {
++ uint8x8_t sval,dval;
++
++ /* two 32-bit pixels packed into D-reg; ad-hoc vectorization */
++ sval = vreinterpret_u8_u32(vld1_u32((void*)src));
++ dval = vreinterpret_u8_u32(vld1_u32((void*)dst));
++ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval),alpha_selector));
++ vst1_u8((void*)dst,vqadd_u8(sval,dval));
++
++ src+=2;
++ dst+=2;
++ w-=2;
++ }
++
++ if (w)
++ {
++ uint8x8_t sval,dval;
++
++ /* single 32-bit pixel in lane 0 */
++ sval = vreinterpret_u8_u32(vld1_dup_u32((void*)src)); // only interested in lane 0
++ dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst)); // only interested in lane 0
++ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval),alpha_selector));
++ vst1_lane_u32((void*)dst,vreinterpret_u32_u8(vqadd_u8(sval,dval)),0);
++ }
++ }
++ }
++}
++
++
++
++void
++fbCompositeSrc_x888x0565neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint16_t *dstLine, *dst;
++ uint32_t *srcLine, *src;
++ int dstStride, srcStride;
++ uint32_t w;
++
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++
++ if (width>=8)
++ {
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ do {
++ while (w>=8)
++ {
++#ifndef USE_NEON_INLINE_ASM
++ vst1q_u16(dst, pack0565(vld4_u8((void*)src)));
++#else
++ asm volatile (
++ "vld4.8 {d4-d7}, [%[src]]\n\t"
++ "vshll.u8 q0, d6, #8\n\t"
++ "vshll.u8 q1, d5, #8\n\t"
++ "vsriq.u16 q0, q1, #5\t\n"
++ "vshll.u8 q1, d4, #8\n\t"
++ "vsriq.u16 q0, q1, #11\t\n"
++ "vst1.16 {q0}, [%[dst]]\n\t"
++ :
++ : [dst] "r" (dst), [src] "r" (src)
++ : "memory", "d0","d1","d2","d3","d4","d5","d6","d7"
++ );
++#endif
++ src+=8;
++ dst+=8;
++ w-=8;
++ }
++ if (w != 0)
++ {
++ src -= (8-w);
++ dst -= (8-w);
++ w = 8; // do another vector
++ }
++ } while (w!=0);
++ }
++ }
++ else
++ {
++ // Handle width<8
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ while (w>=2)
++ {
++ uint32x2_t sval, rgb, g, b;
++ sval = vld1_u32(src);
++ rgb = vshr_n_u32(sval,8-5); // r (5 bits)
++ g = vshr_n_u32(sval,8+8-6); // g to bottom byte
++ rgb = vsli_n_u32(rgb, g, 5);
++ b = vshr_n_u32(sval,8+8+8-5); // b to bottom byte
++ rgb = vsli_n_u32(rgb, b, 11);
++ vst1_lane_u16(dst++,vreinterpret_u16_u32(rgb),0);
++ vst1_lane_u16(dst++,vreinterpret_u16_u32(rgb),2);
++ src+=2;
++ w-=2;
++ }
++ if (w)
++ {
++ uint32x2_t sval, rgb, g, b;
++ sval = vld1_dup_u32(src);
++ rgb = vshr_n_u32(sval,8-5); // r (5 bits)
++ g = vshr_n_u32(sval,8+8-6); // g to bottom byte
++ rgb = vsli_n_u32(rgb, g, 5);
++ b = vshr_n_u32(sval,8+8+8-5); // b to bottom byte
++ rgb = vsli_n_u32(rgb, b, 11);
++ vst1_lane_u16(dst++,vreinterpret_u16_u32(rgb),0);
++ }
++ }
++ }
++}
++
++
++void
++fbCompositeSrc_8888x8x8888neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t *dstLine, *dst;
++ uint32_t *srcLine, *src;
++ uint32_t mask;
++ int dstStride, srcStride;
++ uint32_t w;
++ uint8x8_t mask_alpha;
++
++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++
++ fbComposeGetSolid (pMask, mask, pDst->bits.format);
++ mask_alpha = vdup_n_u8((mask) >> 24);
++
++ if (width>=8)
++ {
++ // Use overlapping 8-pixel method
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ uint32_t *keep_dst;
++
++#ifndef USE_NEON_INLINE_ASM
++ uint8x8x4_t sval,dval,temp;
++
++ sval = vld4_u8((void*)src);
++ dval = vld4_u8((void*)dst);
++ keep_dst = dst;
++
++ sval = neon8mul(sval,mask_alpha);
++ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
++ temp = neon8qadd(sval,temp);
++
++ src += (w & 7);
++ dst += (w & 7);
++ w -= (w & 7);
++
++ while (w)
++ {
++ sval = vld4_u8((void*)src);
++ dval = vld4_u8((void*)dst);
++
++ vst4_u8((void*)keep_dst,temp);
++ keep_dst = dst;
++
++ sval = neon8mul(sval,mask_alpha);
++ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
++ temp = neon8qadd(sval,temp);
++
++ src+=8;
++ dst+=8;
++ w-=8;
++ }
++ vst4_u8((void*)keep_dst,temp);
++#else
++ asm volatile (
++// avoid using d8-d15 (q4-q7) aapcs callee-save registers
++ "vdup.32 d30, %[mask]\n\t"
++ "vdup.8 d30, d30[3]\n\t"
++
++ "vld4.8 {d0-d3}, [%[src]]\n\t"
++ "vld4.8 {d4-d7}, [%[dst]]\n\t"
++ "mov %[keep_dst], %[dst]\n\t"
++
++ "and ip, %[w], #7\n\t"
++ "add %[src], %[src], ip, LSL#2\n\t"
++ "add %[dst], %[dst], ip, LSL#2\n\t"
++ "subs %[w], %[w], ip\n\t"
++ "b 9f\n\t"
++// LOOP
++ "2:\n\t"
++ "vld4.8 {d0-d3}, [%[src]]!\n\t"
++ "vld4.8 {d4-d7}, [%[dst]]!\n\t"
++ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
++ "sub %[keep_dst], %[dst], #8*4\n\t"
++ "subs %[w], %[w], #8\n\t"
++
++ "9:\n\t"
++ "vmull.u8 q10, d30, d0\n\t"
++ "vmull.u8 q11, d30, d1\n\t"
++ "vmull.u8 q12, d30, d2\n\t"
++ "vmull.u8 q13, d30, d3\n\t"
++ "vrshr.u16 q8, q10, #8\n\t"
++ "vrshr.u16 q9, q11, #8\n\t"
++ "vraddhn.u16 d0, q10, q8\n\t"
++ "vraddhn.u16 d1, q11, q9\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d3, q13, q9\n\t"
++ "vraddhn.u16 d2, q12, q8\n\t"
++
++ "vmvn.8 d31, d3\n\t"
++ "vmull.u8 q10, d31, d4\n\t"
++ "vmull.u8 q11, d31, d5\n\t"
++ "vmull.u8 q12, d31, d6\n\t"
++ "vmull.u8 q13, d31, d7\n\t"
++ "vrshr.u16 q8, q10, #8\n\t"
++ "vrshr.u16 q9, q11, #8\n\t"
++ "vraddhn.u16 d20, q10, q8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d21, q11, q9\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vraddhn.u16 d22, q12, q8\n\t"
++ "vraddhn.u16 d23, q13, q9\n\t"
++// result in d20-d23
++ "vqadd.u8 d20, d0, d20\n\t"
++ "vqadd.u8 d21, d1, d21\n\t"
++ "vqadd.u8 d22, d2, d22\n\t"
++ "vqadd.u8 d23, d3, d23\n\t"
++
++ "bne 2b\n\t"
++
++ "1:\n\t"
++ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
++
++ : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
++ : [mask] "r" (mask)
++ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
++ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27",
++ "d30","d31"
++ );
++#endif
++ }
++ }
++ else
++ {
++ uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL));
++
++ // Handle width<8
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ src = srcLine;
++ srcLine += srcStride;
++ w = width;
++
++ while (w>=2)
++ {
++ uint8x8_t sval,dval;
++
++ sval = vreinterpret_u8_u32(vld1_u32((void*)src));
++ dval = vreinterpret_u8_u32(vld1_u32((void*)dst));
++
++ /* sval * const alpha_mul */
++ sval = neon2mul(sval,mask_alpha);
++
++ /* dval * 255-(src alpha) */
++ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval), alpha_selector));
++
++ vst1_u8((void*)dst,vqadd_u8(sval,dval));
++
++ src+=2;
++ dst+=2;
++ w-=2;
++ }
++
++ if (w)
++ {
++ uint8x8_t sval,dval;
++
++ sval = vreinterpret_u8_u32(vld1_dup_u32((void*)src));
++ dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst));
++
++ /* sval * const alpha_mul */
++ sval = neon2mul(sval,mask_alpha);
++
++ /* dval * 255-(src alpha) */
++ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval), alpha_selector));
++
++ vst1_lane_u32((void*)dst,vreinterpret_u32_u8(vqadd_u8(sval,dval)),0);
++ }
++ }
++ }
++}
++
++
++
++void
++fbCompositeSolidMask_nx8x0565neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t src, srca;
++ uint16_t *dstLine, *dst;
++ uint8_t *maskLine, *mask;
++ int dstStride, maskStride;
++ uint32_t w;
++ uint8x8_t sval2;
++ uint8x8x4_t sval8;
++
++ fbComposeGetSolid(pSrc, src, pDst->bits.format);
++
++ srca = src >> 24;
++ if (src == 0)
++ return;
++
++ sval2=vreinterpret_u8_u32(vdup_n_u32(src));
++ sval8.val[0]=vdup_lane_u8(sval2,0);
++ sval8.val[1]=vdup_lane_u8(sval2,1);
++ sval8.val[2]=vdup_lane_u8(sval2,2);
++ sval8.val[3]=vdup_lane_u8(sval2,3);
++
++ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
++
++ if (width>=8)
++ {
++ // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
++ while (height--)
++ {
++ uint16_t *keep_dst;
++
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++#ifndef USE_NEON_INLINE_ASM
++ uint8x8_t alpha;
++ uint16x8_t dval, temp;
++ uint8x8x4_t sval8temp;
++
++ alpha = vld1_u8((void*)mask);
++ dval = vld1q_u16((void*)dst);
++ keep_dst = dst;
++
++ sval8temp = neon8mul(sval8,alpha);
++ temp = pack0565(neon8qadd(sval8temp,neon8mul(unpack0565(dval),vmvn_u8(sval8temp.val[3]))));
++
++ mask += (w & 7);
++ dst += (w & 7);
++ w -= (w & 7);
++
++ while (w)
++ {
++ dval = vld1q_u16((void*)dst);
++ alpha = vld1_u8((void*)mask);
++
++ vst1q_u16((void*)keep_dst,temp);
++ keep_dst = dst;
++
++ sval8temp = neon8mul(sval8,alpha);
++ temp = pack0565(neon8qadd(sval8temp,neon8mul(unpack0565(dval),vmvn_u8(sval8temp.val[3]))));
++
++ mask+=8;
++ dst+=8;
++ w-=8;
++ }
++ vst1q_u16((void*)keep_dst,temp);
++#else
++ asm volatile (
++ "vdup.32 d0, %[src]\n\t"
++ "vdup.8 d1, d0[1]\n\t"
++ "vdup.8 d2, d0[2]\n\t"
++ "vdup.8 d3, d0[3]\n\t"
++ "vdup.8 d0, d0[0]\n\t"
++
++ "vld1.8 {q12}, [%[dst]]\n\t"
++ "vld1.8 {d31}, [%[mask]]\n\t"
++ "mov %[keep_dst], %[dst]\n\t"
++
++ "and ip, %[w], #7\n\t"
++ "add %[mask], %[mask], ip\n\t"
++ "add %[dst], %[dst], ip, LSL#1\n\t"
++ "subs %[w], %[w], ip\n\t"
++ "b 9f\n\t"
++// LOOP
++ "2:\n\t"
++
++ "vld1.16 {q12}, [%[dst]]!\n\t"
++ "vld1.8 {d31}, [%[mask]]!\n\t"
++ "vst1.16 {q10}, [%[keep_dst]]\n\t"
++ "sub %[keep_dst], %[dst], #8*2\n\t"
++ "subs %[w], %[w], #8\n\t"
++ "9:\n\t"
++// expand 0565 q12 to 8888 {d4-d7}
++ "vmovn.u16 d4, q12\t\n"
++ "vshr.u16 q11, q12, #5\t\n"
++ "vshr.u16 q10, q12, #6+5\t\n"
++ "vmovn.u16 d5, q11\t\n"
++ "vmovn.u16 d6, q10\t\n"
++ "vshl.u8 d4, d4, #3\t\n"
++ "vshl.u8 d5, d5, #2\t\n"
++ "vshl.u8 d6, d6, #3\t\n"
++ "vsri.u8 d4, d4, #5\t\n"
++ "vsri.u8 d5, d5, #6\t\n"
++ "vsri.u8 d6, d6, #5\t\n"
++
++ "vmull.u8 q10, d31, d0\n\t"
++ "vmull.u8 q11, d31, d1\n\t"
++ "vmull.u8 q12, d31, d2\n\t"
++ "vmull.u8 q13, d31, d3\n\t"
++ "vrshr.u16 q8, q10, #8\n\t"
++ "vrshr.u16 q9, q11, #8\n\t"
++ "vraddhn.u16 d20, q10, q8\n\t"
++ "vraddhn.u16 d21, q11, q9\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d23, q13, q9\n\t"
++ "vraddhn.u16 d22, q12, q8\n\t"
++
++// duplicate in 4/2/1 & 8pix vsns
++ "vmvn.8 d30, d23\n\t"
++ "vmull.u8 q14, d30, d6\n\t"
++ "vmull.u8 q13, d30, d5\n\t"
++ "vmull.u8 q12, d30, d4\n\t"
++ "vrshr.u16 q8, q14, #8\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vraddhn.u16 d6, q14, q8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d5, q13, q9\n\t"
++ "vqadd.u8 d6, d6, d22\n\t" // moved up
++ "vraddhn.u16 d4, q12, q8\n\t"
++// intentionally don't calculate alpha
++// result in d4-d6
++
++// "vqadd.u8 d6, d6, d22\n\t" ** moved up
++ "vqadd.u8 d5, d5, d21\n\t"
++ "vqadd.u8 d4, d4, d20\n\t"
++
++// pack 8888 {d20-d23} to 0565 q10
++ "vshll.u8 q10, d6, #8\n\t"
++ "vshll.u8 q3, d5, #8\n\t"
++ "vshll.u8 q2, d4, #8\n\t"
++ "vsri.u16 q10, q3, #5\t\n"
++ "vsri.u16 q10, q2, #11\t\n"
++
++ "bne 2b\n\t"
++
++ "1:\n\t"
++ "vst1.16 {q10}, [%[keep_dst]]\n\t"
++
++ : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [keep_dst] "+r" (keep_dst)
++ : [src] "r" (src)
++ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
++ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
++ "d30","d31"
++ );
++#endif
++ }
++ }
++ else
++ {
++ while (height--)
++ {
++ void *dst4, *dst2;
++
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++
++#ifndef USE_NEON_INLINE_ASM
++ uint8x8_t alpha;
++ uint16x8_t dval, temp;
++ uint8x8x4_t sval8temp;
++
++ if (w&4)
++ {
++ alpha = vreinterpret_u8_u32(vld1_lane_u32((void*)mask,vreinterpret_u32_u8(alpha),1));
++ dval = vreinterpretq_u16_u64(vld1q_lane_u64((void*)dst,vreinterpretq_u64_u16(dval),1));
++ dst4=dst;
++ mask+=4;
++ dst+=4;
++ }
++ if (w&2)
++ {
++ alpha = vreinterpret_u8_u16(vld1_lane_u16((void*)mask,vreinterpret_u16_u8(alpha),1));
++ dval = vreinterpretq_u16_u32(vld1q_lane_u32((void*)dst,vreinterpretq_u32_u16(dval),1));
++ dst2=dst;
++ mask+=2;
++ dst+=2;
++ }
++ if (w&1)
++ {
++ alpha = vld1_lane_u8((void*)mask,alpha,1);
++ dval = vld1q_lane_u16((void*)dst,dval,1);
++ }
++
++ sval8temp = neon8mul(sval8,alpha);
++ temp = pack0565(neon8qadd(sval8temp,neon8mul(unpack0565(dval),vmvn_u8(sval8temp.val[3]))));
++
++ if (w&1)
++ vst1q_lane_u16((void*)dst,temp,1);
++ if (w&2)
++ vst1q_lane_u32((void*)dst2,vreinterpretq_u32_u16(temp),1);
++ if (w&4)
++ vst1q_lane_u64((void*)dst4,vreinterpretq_u64_u16(temp),1);
++#else
++ asm volatile (
++ "vdup.32 d0, %[src]\n\t"
++ "vdup.8 d1, d0[1]\n\t"
++ "vdup.8 d2, d0[2]\n\t"
++ "vdup.8 d3, d0[3]\n\t"
++ "vdup.8 d0, d0[0]\n\t"
++
++ "tst %[w], #4\t\n"
++ "beq skip_load4\t\n"
++
++ "vld1.64 {d25}, [%[dst]]\n\t"
++ "vld1.32 {d31[1]}, [%[mask]]\n\t"
++ "mov %[dst4], %[dst]\t\n"
++ "add %[mask], %[mask], #4\t\n"
++ "add %[dst], %[dst], #4*2\t\n"
++
++ "skip_load4:\t\n"
++ "tst %[w], #2\t\n"
++ "beq skip_load2\t\n"
++ "vld1.32 {d24[1]}, [%[dst]]\n\t"
++ "vld1.16 {d31[1]}, [%[mask]]\n\t"
++ "mov %[dst2], %[dst]\t\n"
++ "add %[mask], %[mask], #2\t\n"
++ "add %[dst], %[dst], #2*2\t\n"
++
++ "skip_load2:\t\n"
++ "tst %[w], #1\t\n"
++ "beq skip_load1\t\n"
++ "vld1.16 {d24[1]}, [%[dst]]\n\t"
++ "vld1.8 {d31[1]}, [%[mask]]\n\t"
++
++ "skip_load1:\t\n"
++// expand 0565 q12 to 8888 {d4-d7}
++ "vmovn.u16 d4, q12\t\n"
++ "vshr.u16 q11, q12, #5\t\n"
++ "vshr.u16 q10, q12, #6+5\t\n"
++ "vmovn.u16 d5, q11\t\n"
++ "vmovn.u16 d6, q10\t\n"
++ "vshl.u8 d4, d4, #3\t\n"
++ "vshl.u8 d5, d5, #2\t\n"
++ "vshl.u8 d6, d6, #3\t\n"
++ "vsri.u8 d4, d4, #5\t\n"
++ "vsri.u8 d5, d5, #6\t\n"
++ "vsri.u8 d6, d6, #5\t\n"
++
++ "vmull.u8 q10, d31, d0\n\t"
++ "vmull.u8 q11, d31, d1\n\t"
++ "vmull.u8 q12, d31, d2\n\t"
++ "vmull.u8 q13, d31, d3\n\t"
++ "vrshr.u16 q8, q10, #8\n\t"
++ "vrshr.u16 q9, q11, #8\n\t"
++ "vraddhn.u16 d20, q10, q8\n\t"
++ "vraddhn.u16 d21, q11, q9\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d23, q13, q9\n\t"
++ "vraddhn.u16 d22, q12, q8\n\t"
++
++// duplicate in 4/2/1 & 8pix vsns
++ "vmvn.8 d30, d23\n\t"
++ "vmull.u8 q14, d30, d6\n\t"
++ "vmull.u8 q13, d30, d5\n\t"
++ "vmull.u8 q12, d30, d4\n\t"
++ "vrshr.u16 q8, q14, #8\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vraddhn.u16 d6, q14, q8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d5, q13, q9\n\t"
++ "vqadd.u8 d6, d6, d22\n\t" // moved up
++ "vraddhn.u16 d4, q12, q8\n\t"
++// intentionally don't calculate alpha
++// result in d4-d6
++
++// "vqadd.u8 d6, d6, d22\n\t" ** moved up
++ "vqadd.u8 d5, d5, d21\n\t"
++ "vqadd.u8 d4, d4, d20\n\t"
++
++// pack 8888 {d20-d23} to 0565 q10
++ "vshll.u8 q10, d6, #8\n\t"
++ "vshll.u8 q3, d5, #8\n\t"
++ "vshll.u8 q2, d4, #8\n\t"
++ "vsri.u16 q10, q3, #5\t\n"
++ "vsri.u16 q10, q2, #11\t\n"
++
++ "tst %[w], #1\n\t"
++ "beq skip_store1\t\n"
++ "vst1.16 {d20[1]}, [%[dst]]\t\n"
++ "skip_store1:\t\n"
++ "tst %[w], #2\n\t"
++ "beq skip_store2\t\n"
++ "vst1.32 {d20[1]}, [%[dst2]]\t\n"
++ "skip_store2:\t\n"
++ "tst %[w], #4\n\t"
++ "beq skip_store4\t\n"
++ "vst1.16 {d21}, [%[dst4]]\t\n"
++ "skip_store4:\t\n"
++
++ : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [dst4] "+r" (dst4), [dst2] "+r" (dst2)
++ : [src] "r" (src)
++ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
++ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
++ "d30","d31"
++ );
++#endif
++ }
++ }
++}
++
++
++void
++fbCompositeSolidMask_nx8x8888neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint32_t src, srca;
++ uint32_t *dstLine, *dst;
++ uint8_t *maskLine, *mask;
++ int dstStride, maskStride;
++ uint32_t w;
++ uint8x8_t sval2;
++ uint8x8x4_t sval8;
++ uint8x8_t mask_selector=vreinterpret_u8_u64(vcreate_u64(0x0101010100000000ULL));
++ uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL));
++
++ fbComposeGetSolid(pSrc, src, pDst->bits.format);
++
++ srca = src >> 24;
++ if (src == 0)
++ return;
++
++ sval2=vreinterpret_u8_u32(vdup_n_u32(src));
++ sval8.val[0]=vdup_lane_u8(sval2,0);
++ sval8.val[1]=vdup_lane_u8(sval2,1);
++ sval8.val[2]=vdup_lane_u8(sval2,2);
++ sval8.val[3]=vdup_lane_u8(sval2,3);
++
++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
++
++ if (width>=8)
++ {
++ // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
++ while (height--)
++ {
++ uint32_t *keep_dst;
++
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++#ifndef USE_NEON_INLINE_ASM
++ uint8x8_t alpha;
++ uint8x8x4_t dval, temp;
++
++ alpha = vld1_u8((void*)mask);
++ dval = vld4_u8((void*)dst);
++ keep_dst = dst;
++
++ temp = neon8mul(sval8,alpha);
++ dval = neon8mul(dval,vmvn_u8(temp.val[3]));
++ temp = neon8qadd(temp,dval);
++
++ mask += (w & 7);
++ dst += (w & 7);
++ w -= (w & 7);
++
++ while (w)
++ {
++ alpha = vld1_u8((void*)mask);
++ dval = vld4_u8((void*)dst);
++
++ vst4_u8((void*)keep_dst,temp);
++ keep_dst = dst;
++
++ temp = neon8mul(sval8,alpha);
++ dval = neon8mul(dval,vmvn_u8(temp.val[3]));
++ temp = neon8qadd(temp,dval);
++
++ mask+=8;
++ dst+=8;
++ w-=8;
++ }
++ vst4_u8((void*)keep_dst,temp);
++#else
++ asm volatile (
++ "vdup.32 d0, %[src]\n\t"
++ "vdup.8 d1, d0[1]\n\t"
++ "vdup.8 d2, d0[2]\n\t"
++ "vdup.8 d3, d0[3]\n\t"
++ "vdup.8 d0, d0[0]\n\t"
++
++ "vld4.8 {d4-d7}, [%[dst]]\n\t"
++ "vld1.8 {d31}, [%[mask]]\n\t"
++ "mov %[keep_dst], %[dst]\n\t"
++
++ "and ip, %[w], #7\n\t"
++ "add %[mask], %[mask], ip\n\t"
++ "add %[dst], %[dst], ip, LSL#2\n\t"
++ "subs %[w], %[w], ip\n\t"
++ "b 9f\n\t"
++// LOOP
++ "2:\n\t"
++ "vld4.8 {d4-d7}, [%[dst]]!\n\t"
++ "vld1.8 {d31}, [%[mask]]!\n\t"
++ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
++ "sub %[keep_dst], %[dst], #8*4\n\t"
++ "subs %[w], %[w], #8\n\t"
++ "9:\n\t"
++
++ "vmull.u8 q10, d31, d0\n\t"
++ "vmull.u8 q11, d31, d1\n\t"
++ "vmull.u8 q12, d31, d2\n\t"
++ "vmull.u8 q13, d31, d3\n\t"
++ "vrshr.u16 q8, q10, #8\n\t"
++ "vrshr.u16 q9, q11, #8\n\t"
++ "vraddhn.u16 d20, q10, q8\n\t"
++ "vraddhn.u16 d21, q11, q9\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vraddhn.u16 d23, q13, q9\n\t"
++ "vraddhn.u16 d22, q12, q8\n\t"
++
++ "vmvn.8 d30, d23\n\t"
++ "vmull.u8 q12, d30, d4\n\t"
++ "vmull.u8 q13, d30, d5\n\t"
++ "vmull.u8 q14, d30, d6\n\t"
++ "vmull.u8 q15, d30, d7\n\t"
++
++ "vrshr.u16 q8, q12, #8\n\t"
++ "vrshr.u16 q9, q13, #8\n\t"
++ "vraddhn.u16 d4, q12, q8\n\t"
++ "vrshr.u16 q8, q14, #8\n\t"
++ "vraddhn.u16 d5, q13, q9\n\t"
++ "vrshr.u16 q9, q15, #8\n\t"
++ "vraddhn.u16 d6, q14, q8\n\t"
++ "vraddhn.u16 d7, q15, q9\n\t"
++// result in d4-d7
++
++ "vqadd.u8 d20, d4, d20\n\t"
++ "vqadd.u8 d21, d5, d21\n\t"
++ "vqadd.u8 d22, d6, d22\n\t"
++ "vqadd.u8 d23, d7, d23\n\t"
++
++ "bne 2b\n\t"
++
++ "1:\n\t"
++ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
++
++ : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [keep_dst] "+r" (keep_dst)
++ : [src] "r" (src)
++ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
++ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
++ "d30","d31"
++ );
++#endif
++ }
++ }
++ else
++ {
++ while (height--)
++ {
++ uint8x8_t alpha;
++
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++ while (w>=2)
++ {
++ uint8x8_t dval, temp, res;
++
++ alpha = vtbl1_u8(vreinterpret_u8_u16(vld1_dup_u16((void*)mask)), mask_selector);
++ dval = vld1_u8((void*)dst);
++
++ temp = neon2mul(sval2,alpha);
++ res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector)));
++
++ vst1_u8((void*)dst,res);
++
++ mask+=2;
++ dst+=2;
++ w-=2;
++ }
++ if (w)
++ {
++ uint8x8_t dval, temp, res;
++
++ alpha = vtbl1_u8(vld1_dup_u8((void*)mask), mask_selector);
++ dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst));
++
++ temp = neon2mul(sval2,alpha);
++ res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector)));
++
++ vst1_lane_u32((void*)dst,vreinterpret_u32_u8(res),0);
++ }
++ }
++ }
++}
++
++
++void
++fbCompositeSrcAdd_8888x8x8neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height)
++{
++ uint8_t *dstLine, *dst;
++ uint8_t *maskLine, *mask;
++ int dstStride, maskStride;
++ uint32_t w;
++ uint32_t src;
++ uint8x8_t sa;
++
++ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
++ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
++ fbComposeGetSolid (pSrc, src, pDst->bits.format);
++ sa = vdup_n_u8((src) >> 24);
++
++ if (width>=8)
++ {
++ // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++ uint8x8_t mval, dval, res;
++ uint8_t *keep_dst;
++
++ mval = vld1_u8((void *)mask);
++ dval = vld1_u8((void *)dst);
++ keep_dst = dst;
++
++ res = vqadd_u8(neon2mul(mval,sa),dval);
++
++ mask += (w & 7);
++ dst += (w & 7);
++ w -= w & 7;
++
++ while (w)
++ {
++ mval = vld1_u8((void *)mask);
++ dval = vld1_u8((void *)dst);
++ vst1_u8((void *)keep_dst, res);
++ keep_dst = dst;
++
++ res = vqadd_u8(neon2mul(mval,sa),dval);
++
++ mask += 8;
++ dst += 8;
++ w -= 8;
++ }
++ vst1_u8((void *)keep_dst, res);
++ }
++ }
++ else
++ {
++ // Use 4/2/1 load/store method to handle 1-7 pixels
++ while (height--)
++ {
++ dst = dstLine;
++ dstLine += dstStride;
++ mask = maskLine;
++ maskLine += maskStride;
++ w = width;
++
++ uint8x8_t mval, dval, res;
++ uint8_t *dst4, *dst2;
++
++ if (w&4)
++ {
++ mval = vreinterpret_u8_u32(vld1_lane_u32((void *)mask, vreinterpret_u32_u8(mval), 1));
++ dval = vreinterpret_u8_u32(vld1_lane_u32((void *)dst, vreinterpret_u32_u8(dval), 1));
++
++ dst4 = dst;
++ mask += 4;
++ dst += 4;
++ }
++ if (w&2)
++ {
++ mval = vreinterpret_u8_u16(vld1_lane_u16((void *)mask, vreinterpret_u16_u8(mval), 1));
++ dval = vreinterpret_u8_u16(vld1_lane_u16((void *)dst, vreinterpret_u16_u8(dval), 1));
++ dst2 = dst;
++ mask += 2;
++ dst += 2;
++ }
++ if (w&1)
++ {
++ mval = vld1_lane_u8((void *)mask, mval, 1);
++ dval = vld1_lane_u8((void *)dst, dval, 1);
++ }
++
++ res = vqadd_u8(neon2mul(mval,sa),dval);
++
++ if (w&1)
++ vst1_lane_u8((void *)dst, res, 1);
++ if (w&2)
++ vst1_lane_u16((void *)dst2, vreinterpret_u16_u8(res), 1);
++ if (w&4)
++ vst1_lane_u32((void *)dst4, vreinterpret_u32_u8(res), 1);
++ }
++ }
++}
++
+diff --git a/pixman/pixman-arm-neon.h b/pixman/pixman-arm-neon.h
+new file mode 100644
+index 0000000..bab4dee
+--- /dev/null
++++ b/pixman/pixman-arm-neon.h
+@@ -0,0 +1,137 @@
++/*
++ * Copyright © 2009 Mozilla Corporation
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Mozilla Corporation not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Mozilla Corporation makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ *
++ * Author: Ian Rickards (ian.rickards@arm.com)
++ *
++ */
++
++#include "pixman-private.h"
++
++#ifdef USE_ARM_NEON
++
++static inline pixman_bool_t pixman_have_arm_neon(void) { return TRUE; }
++
++#else
++#define pixman_have_arm_neon() FALSE
++#endif
++
++#ifdef USE_ARM_NEON
++
++void
++fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSrc_8888x8888neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSrc_8888x8x8888neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSolidMask_nx8x0565neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSolidMask_nx8x8888neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSrc_x888x0565neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++void
++fbCompositeSrcAdd_8888x8x8neon (pixman_op_t op,
++ pixman_image_t * pSrc,
++ pixman_image_t * pMask,
++ pixman_image_t * pDst,
++ int16_t xSrc,
++ int16_t ySrc,
++ int16_t xMask,
++ int16_t yMask,
++ int16_t xDst,
++ int16_t yDst,
++ uint16_t width,
++ uint16_t height);
++
++#endif /* USE_ARM_NEON */
+diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
+index 1388517..b13947a 100644
+--- a/pixman/pixman-pict.c
++++ b/pixman/pixman-pict.c
+@@ -34,6 +34,7 @@
+ #include "pixman-mmx.h"
+ #include "pixman-vmx.h"
+ #include "pixman-sse2.h"
++#include "pixman-arm-neon.h"
+ #include "pixman-arm-simd.h"
+ #include "pixman-combine32.h"
+
+@@ -1518,6 +1519,31 @@ static const FastPathInfo vmx_fast_paths[] =
+ };
+ #endif
+
++#ifdef USE_ARM_NEON
++static const FastPathInfo arm_neon_fast_paths[] =
++{
++ { PIXMAN_OP_ADD, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fbCompositeSrcAdd_8888x8x8neon, 0 },
++ { PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcAdd_8000x8000neon, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565neon, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565neon, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565neon, 0 },
++ { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_a8b8g8r8, fbCompositeSrc_8888x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fbCompositeSrc_8888x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8x8888neon, NEED_SOLID_MASK },
++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8x8888neon, NEED_SOLID_MASK },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_r5g6b5, fbCompositeSolidMask_nx8x0565neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_b5g6r5, fbCompositeSolidMask_nx8x0565neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSolidMask_nx8x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSolidMask_nx8x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8b8g8r8, fbCompositeSolidMask_nx8x8888neon, 0 },
++ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8b8g8r8, fbCompositeSolidMask_nx8x8888neon, 0 },
++ { PIXMAN_OP_NONE },
++};
++#endif
++
+ #ifdef USE_ARM_SIMD
+ static const FastPathInfo arm_simd_fast_paths[] =
+ {
+@@ -1893,6 +1919,11 @@ pixman_image_composite (pixman_op_t op,
+ info = get_fast_path (vmx_fast_paths, op, pSrc, pMask, pDst, pixbuf);
+ #endif
+
++#ifdef USE_ARM_NEON
++ if (!info && pixman_have_arm_neon())
++ info = get_fast_path (arm_neon_fast_paths, op, pSrc, pMask, pDst, pixbuf);
++#endif
++
+ #ifdef USE_ARM_SIMD
+ if (!info && pixman_have_arm_simd())
+ info = get_fast_path (arm_simd_fast_paths, op, pSrc, pMask, pDst, pixbuf);
diff --git a/recipes/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
deleted file mode 100644
index 25ce7ee..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From c29c9fa826b7112156fd6150b5f1564227935c05 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:27:33 +0300
-Subject: [PATCH 3/6] Generic C implementation of pixman_blt with overlapping support
-
-Uses memcpy/memmove functions to copy pixels, can handle the
-case when both source and destination areas are in the same
-image (this is useful for scrolling).
-
-It is assumed that copying direction is only important when
-using the same image for both source and destination (and
-src_stride == dst_stride). Copying direction is undefined
-for the images with different source and destination stride
-which happen to be in the overlapped areas (but this is an
-unrealistic case anyway).
----
- pixman/pixman-general.c | 21 ++++++++++++++++++---
- pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 61 insertions(+), 3 deletions(-)
-
-diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
-index c96a3f9..d71a299 100644
---- a/pixman/pixman-general.c
-+++ b/pixman/pixman-general.c
-@@ -300,9 +300,24 @@ general_blt (pixman_implementation_t *imp,
- int width,
- int height)
- {
-- /* We can't blit unless we have sse2 or mmx */
--
-- return FALSE;
-+ uint8_t *dst_bytes = (uint8_t *)dst_bits;
-+ uint8_t *src_bytes = (uint8_t *)src_bits;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
-+ return FALSE;
-+
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
-+ dst_bytes + dst_y * dst_stride + dst_x * bpp,
-+ src_stride,
-+ dst_stride,
-+ width,
-+ height);
-+ return TRUE;
- }
-
- static pixman_bool_t
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index 5000f91..8c5d4fd 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -10,6 +10,7 @@
-
- #include "pixman.h"
- #include <time.h>
-+#include <string.h>
- #include <assert.h>
-
- #include "pixman-compiler.h"
-@@ -794,4 +795,46 @@ void pixman_timer_register (pixman_timer_t *timer);
-
- #endif /* PIXMAN_TIMERS */
-
-+/* a helper function, can blit 8-bit images with src/dst overlapping support */
-+static inline void
-+pixman_blt_helper (uint8_t *src_bytes,
-+ uint8_t *dst_bytes,
-+ int src_stride,
-+ int dst_stride,
-+ int width,
-+ int height)
-+{
-+ /*
-+ * The second part of this check is not strictly needed, but it prevents
-+ * unnecessary upside-down processing of areas which belong to different
-+ * images. Upside-down processing can be slower with fixed-distance-ahead
-+ * prefetch and perceived as having more tearing.
-+ */
-+ if (src_bytes < dst_bytes + width &&
-+ src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+ /* Horizontal scrolling to the left needs memmove */
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return;
-+ }
-+ }
-+ while (--height >= 0)
-+ {
-+ memcpy (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+}
-+
- #endif /* PIXMAN_PRIVATE_H */
---
-1.6.2.4
-
diff --git a/recipes/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
deleted file mode 100644
index 74c7b45..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 7ca32542c957ff308a6ca7e3715e6552a65ae395 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:45:47 +0300
-Subject: [PATCH 4/6] Support of overlapping src/dst for pixman_blt_mmx
-
----
- pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++---------------------
- 1 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
-index 819e3a0..dcccadb 100644
---- a/pixman/pixman-mmx.c
-+++ b/pixman/pixman-mmx.c
-@@ -3002,34 +3002,43 @@ pixman_blt_mmx (uint32_t *src_bits,
- {
- uint8_t * src_bytes;
- uint8_t * dst_bytes;
-- int byte_width;
-+ int bpp;
-
-- if (src_bpp != dst_bpp)
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-- if (src_bpp == 16)
-- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 2 * width;
-- src_stride *= 2;
-- dst_stride *= 2;
-- }
-- else if (src_bpp == 32)
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 4 * width;
-- src_stride *= 4;
-- dst_stride *= 4;
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
- }
-- else
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
- {
-- return FALSE;
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using MMX */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
- }
-
- while (height--)
-@@ -3039,7 +3048,7 @@ pixman_blt_mmx (uint32_t *src_bits,
- uint8_t *d = dst_bytes;
- src_bytes += src_stride;
- dst_bytes += dst_stride;
-- w = byte_width;
-+ w = width;
-
- while (w >= 2 && ((unsigned long)d & 3))
- {
---
-1.6.2.4
-
diff --git a/recipes/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
deleted file mode 100644
index 3704fbf..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From edc80b41c6480b7c80ec5f7c835c92b2debb3774 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:45:54 +0300
-Subject: [PATCH 5/6] Support of overlapping src/dst for pixman_blt_sse2
-
----
- pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++--------------------
- 1 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
-index 78b0ad1..b84636b 100644
---- a/pixman/pixman-sse2.c
-+++ b/pixman/pixman-sse2.c
-@@ -5300,34 +5300,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
- {
- uint8_t * src_bytes;
- uint8_t * dst_bytes;
-- int byte_width;
-+ int bpp;
-
-- if (src_bpp != dst_bpp)
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-- if (src_bpp == 16)
-- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 2 * width;
-- src_stride *= 2;
-- dst_stride *= 2;
-- }
-- else if (src_bpp == 32)
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 4 * width;
-- src_stride *= 4;
-- dst_stride *= 4;
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
- }
-- else
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
- {
-- return FALSE;
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using SSE2 */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
- }
-
- cache_prefetch ((__m128i*)src_bytes);
-@@ -5340,7 +5349,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
- uint8_t *d = dst_bytes;
- src_bytes += src_stride;
- dst_bytes += dst_stride;
-- w = byte_width;
-+ w = width;
-
- cache_prefetch_next ((__m128i*)s);
- cache_prefetch_next ((__m128i*)d);
---
-1.6.2.4
-
diff --git a/recipes/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
deleted file mode 100644
index 7c22483..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 86870ff530b5e435034bd80207e5758466d96cff Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Wed, 18 Nov 2009 06:08:48 +0200
-Subject: [PATCH 6/6] Support of overlapping src/dst for pixman_blt_neon
-
----
- pixman/pixman-arm-neon.c | 63 ++++++++++++++++++++++++++++++++++++++-------
- 1 files changed, 53 insertions(+), 10 deletions(-)
-
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 495fda4..c632ff5 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -357,26 +357,66 @@
- int width,
- int height)
- {
-- if (src_bpp != dst_bpp)
-+ uint8_t * src_bytes;
-+ uint8_t * dst_bytes;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
-+ {
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
-+ }
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using NEON */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
-+ }
-+
- switch (src_bpp)
- {
- case 16:
- pixman_composite_src_0565_0565_asm_neon (
-- width, height,
-- (uint16_t *)(((char *) dst_bits) +
-- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
-- (uint16_t *)(((char *) src_bits) +
-- src_y * src_stride * 4 + src_x * 2), src_stride * 2);
-+ width >> 1,
-+ height,
-+ (uint16_t *) dst_bytes,
-+ dst_stride >> 1,
-+ (uint16_t *) src_bytes,
-+ src_stride >> 1);
- return TRUE;
- case 32:
- pixman_composite_src_8888_8888_asm_neon (
-- width, height,
-- (uint32_t *)(((char *) dst_bits) +
-- dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
-- (uint32_t *)(((char *) src_bits) +
-- src_y * src_stride * 4 + src_x * 4), src_stride);
-+ width >> 2,
-+ height,
-+ (uint32_t *) dst_bytes,
-+ dst_stride >> 2,
-+ (uint32_t *) src_bytes,
-+ src_stride >> 2);
- return TRUE;
- default:
- return FALSE;
---
-1.6.2.4
-
diff --git a/recipes/xorg-lib/pixman-0.17.8/1-composite.patch b/recipes/xorg-lib/pixman-0.17.8/1-composite.patch
deleted file mode 100644
index 31bfa39..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/1-composite.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 78652135f48c6a304fc2e75bc0e440b8b2034a4d Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Tue, 23 Feb 2010 23:44:00 +0000
-Subject: ARM: added 'neon_composite_over_n_8888_8888_ca' fast path
-
-This fast path function improves performance of 'firefox-talos-gfx'
-cairo-perf trace.
-
-Benchmark from ARM Cortex-A8 @720MHz
-
-before:
-
-[ # ] backend test min(s) median(s) stddev. count
-[ 0] image firefox-talos-gfx 139.969 141.176 0.35% 6/6
-
-after:
-
-[ # ] backend test min(s) median(s) stddev. count
-[ 0] image firefox-talos-gfx 111.810 112.196 0.23% 6/6
----
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index 2986884..e90d662 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -1026,6 +1026,111 @@ generate_composite_function \
-
- /******************************************************************************/
-
-+.macro pixman_composite_over_n_8888_8888_ca_process_pixblock_head
-+ /*
-+ * 'combine_mask_ca' replacement
-+ *
-+ * input: solid src (n) in {d8, d9, d10, d11}
-+ * dest in {d4, d5, d6, d7 }
-+ * mask in {d24, d25, d26, d27}
-+ * output: updated src in {d0, d1, d2, d3 }
-+ * updated mask in {d24, d25, d26, d3 }
-+ */
-+ vmull.u8 q0, d24, d8
-+ vmull.u8 q1, d25, d9
-+ vmull.u8 q6, d26, d10
-+ vmull.u8 q7, d27, d11
-+ vmull.u8 q9, d11, d25
-+ vmull.u8 q12, d11, d24
-+ vmull.u8 q13, d11, d26
-+ vrshr.u16 q8, q0, #8
-+ vrshr.u16 q10, q1, #8
-+ vrshr.u16 q11, q6, #8
-+ vraddhn.u16 d0, q0, q8
-+ vraddhn.u16 d1, q1, q10
-+ vraddhn.u16 d2, q6, q11
-+ vrshr.u16 q11, q12, #8
-+ vrshr.u16 q8, q9, #8
-+ vrshr.u16 q6, q13, #8
-+ vrshr.u16 q10, q7, #8
-+ vraddhn.u16 d24, q12, q11
-+ vraddhn.u16 d25, q9, q8
-+ vraddhn.u16 d26, q13, q6
-+ vraddhn.u16 d3, q7, q10
-+ /*
-+ * 'combine_over_ca' replacement
-+ *
-+ * output: updated dest in {d28, d29, d30, d31}
-+ */
-+ vmvn.8 d24, d24
-+ vmvn.8 d25, d25
-+ vmull.u8 q8, d24, d4
-+ vmull.u8 q9, d25, d5
-+ vmvn.8 d26, d26
-+ vmvn.8 d27, d3
-+ vmull.u8 q10, d26, d6
-+ vmull.u8 q11, d27, d7
-+.endm
-+
-+.macro pixman_composite_over_n_8888_8888_ca_process_pixblock_tail
-+ /* ... continue 'combine_over_ca' replacement */
-+ vrshr.u16 q14, q8, #8
-+ vrshr.u16 q15, q9, #8
-+ vrshr.u16 q6, q10, #8
-+ vrshr.u16 q7, q11, #8
-+ vraddhn.u16 d28, q14, q8
-+ vraddhn.u16 d29, q15, q9
-+ vraddhn.u16 d30, q6, q10
-+ vraddhn.u16 d31, q7, q11
-+ vqadd.u8 q14, q0, q14
-+ vqadd.u8 q15, q1, q15
-+.endm
-+
-+.macro pixman_composite_over_n_8888_8888_ca_process_pixblock_tail_head
-+ vrshr.u16 q14, q8, #8
-+ vrshr.u16 q15, q9, #8
-+ vld4.8 {d4, d5, d6, d7}, [DST_R, :128]!
-+ vrshr.u16 q6, q10, #8
-+ vrshr.u16 q7, q11, #8
-+ vraddhn.u16 d28, q14, q8
-+ vraddhn.u16 d29, q15, q9
-+ vraddhn.u16 d30, q6, q10
-+ vraddhn.u16 d31, q7, q11
-+ vld4.8 {d24, d25, d26, d27}, [MASK]!
-+ vqadd.u8 q14, q0, q14
-+ vqadd.u8 q15, q1, q15
-+ cache_preload 8, 8
-+ pixman_composite_over_n_8888_8888_ca_process_pixblock_head
-+ vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
-+.endm
-+
-+.macro pixman_composite_over_n_8888_8888_ca_init
-+ add DUMMY, sp, #ARGS_STACK_OFFSET
-+ vpush {d8-d15}
-+ vld1.32 {d11[0]}, [DUMMY]
-+ vdup.8 d8, d11[0]
-+ vdup.8 d9, d11[1]
-+ vdup.8 d10, d11[2]
-+ vdup.8 d11, d11[3]
-+.endm
-+
-+.macro pixman_composite_over_n_8888_8888_ca_cleanup
-+ vpop {d8-d15}
-+.endm
-+
-+generate_composite_function \
-+ pixman_composite_over_n_8888_8888_ca_asm_neon, 0, 32, 32, \
-+ FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ 5, /* prefetch distance */ \
-+ pixman_composite_over_n_8888_8888_ca_init, \
-+ pixman_composite_over_n_8888_8888_ca_cleanup, \
-+ pixman_composite_over_n_8888_8888_ca_process_pixblock_head, \
-+ pixman_composite_over_n_8888_8888_ca_process_pixblock_tail, \
-+ pixman_composite_over_n_8888_8888_ca_process_pixblock_tail_head
-+
-+/******************************************************************************/
-+
- .macro pixman_composite_add_n_8_8_process_pixblock_head
- /* expecting source data in {d8, d9, d10, d11} */
- /* d8 - blue, d9 - green, d10 - red, d11 - alpha */
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 557301e..3f0e18e 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -269,6 +269,7 @@ BIND_SRC_NULL_DST(over_8888_8888, uint32_t, 1, uint32_t, 1)
-
- BIND_N_MASK_DST(over_n_8_0565, uint8_t, 1, uint16_t, 1)
- BIND_N_MASK_DST(over_n_8_8888, uint8_t, 1, uint32_t, 1)
-+BIND_N_MASK_DST(over_n_8888_8888_ca, uint32_t, 1, uint32_t, 1)
- BIND_N_MASK_DST(add_n_8_8, uint8_t, 1, uint8_t, 1)
-
- BIND_SRC_N_DST(over_8888_n_8888, uint32_t, 1, uint32_t, 1)
-@@ -412,6 +413,10 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
- PIXMAN_STD_FAST_PATH (OVER, solid, null, r5g6b5, neon_composite_over_n_0565),
- PIXMAN_STD_FAST_PATH (OVER, solid, null, a8r8g8b8, neon_composite_over_n_8888),
- PIXMAN_STD_FAST_PATH (OVER, solid, null, x8r8g8b8, neon_composite_over_n_8888),
-+ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, a8r8g8b8, neon_composite_over_n_8888_8888_ca),
-+ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, x8r8g8b8, neon_composite_over_n_8888_8888_ca),
-+ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, a8b8g8r8, neon_composite_over_n_8888_8888_ca),
-+ PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, x8b8g8r8, neon_composite_over_n_8888_8888_ca),
- PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, a8r8g8b8, neon_composite_over_8888_n_8888),
- PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, x8r8g8b8, neon_composite_over_8888_n_8888),
- PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, a8, a8r8g8b8, neon_composite_over_8888_8_8888),
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman-0.17.8/2-composite.patch b/recipes/xorg-lib/pixman-0.17.8/2-composite.patch
deleted file mode 100644
index 84d4d9c..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/2-composite.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 6e0df74dbfca26f92a18d968e1bf410bae134c8a Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Wed, 24 Feb 2010 00:26:57 +0000
-Subject: ARM: added 'neon_composite_src_x888_8888' fast path
-
-This fast path function improves performance of 'gnome-system-monitor'
-cairo-perf trace.
-
-Benchmark from ARM Cortex-A8 @720MHz
-
-before:
-
-[ # ] backend test min(s) median(s) stddev. count
-[ 0] image gnome-system-monitor 68.838 68.899 0.05% 5/6
-
-after:
-
-[ # ] backend test min(s) median(s) stddev. count
-[ 0] image gnome-system-monitor 53.336 53.384 0.09% 6/6
----
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index e90d662..f2643de 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -947,6 +947,44 @@ generate_composite_function \
-
- /******************************************************************************/
-
-+.macro pixman_composite_src_x888_8888_process_pixblock_head
-+ vorr q0, q0, q2
-+ vorr q1, q1, q2
-+.endm
-+
-+.macro pixman_composite_src_x888_8888_process_pixblock_tail
-+.endm
-+
-+.macro pixman_composite_src_x888_8888_process_pixblock_tail_head
-+ vst1.32 {d0, d1, d2, d3}, [DST_W, :128]!
-+ vld1.32 {d0, d1, d2, d3}, [SRC]!
-+ vorr q0, q0, q2
-+ vorr q1, q1, q2
-+ cache_preload 8, 8
-+.endm
-+
-+.macro pixman_composite_src_x888_8888_init
-+ vmov.u8 q2, #0xFF
-+ vshl.u32 q2, q2, #24
-+.endm
-+
-+generate_composite_function \
-+ pixman_composite_src_x888_8888_asm_neon, 32, 0, 32, \
-+ FLAG_DST_WRITEONLY, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ 10, /* prefetch distance */ \
-+ pixman_composite_src_x888_8888_init, \
-+ default_cleanup, \
-+ pixman_composite_src_x888_8888_process_pixblock_head, \
-+ pixman_composite_src_x888_8888_process_pixblock_tail, \
-+ pixman_composite_src_x888_8888_process_pixblock_tail_head, \
-+ 0, /* dst_w_basereg */ \
-+ 0, /* dst_r_basereg */ \
-+ 0, /* src_basereg */ \
-+ 0 /* mask_basereg */
-+
-+/******************************************************************************/
-+
- .macro pixman_composite_over_n_8_8888_process_pixblock_head
- /* expecting deinterleaved source data in {d8, d9, d10, d11} */
- /* d8 - blue, d9 - green, d10 - red, d11 - alpha */
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 3f0e18e..0a7ac31 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -251,6 +251,7 @@ neon_composite_##name (pixman_implementation_t *imp, \
-
-
- BIND_SRC_NULL_DST(src_8888_8888, uint32_t, 1, uint32_t, 1)
-+BIND_SRC_NULL_DST(src_x888_8888, uint32_t, 1, uint32_t, 1)
- BIND_SRC_NULL_DST(src_0565_0565, uint16_t, 1, uint16_t, 1)
- BIND_SRC_NULL_DST(src_0888_0888, uint8_t, 3, uint8_t, 3)
- BIND_SRC_NULL_DST(src_8888_0565, uint32_t, 1, uint16_t, 1)
-@@ -400,6 +401,10 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
- PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, x8r8g8b8, neon_composite_src_8888_8888),
- PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, x8b8g8r8, neon_composite_src_8888_8888),
- PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, x8b8g8r8, neon_composite_src_8888_8888),
-+ PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, a8r8g8b8, neon_composite_src_8888_8888),
-+ PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, a8b8g8r8, neon_composite_src_8888_8888),
-+ PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, a8r8g8b8, neon_composite_src_x888_8888),
-+ PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, a8b8g8r8, neon_composite_src_x888_8888),
- PIXMAN_STD_FAST_PATH (SRC, r8g8b8, null, r8g8b8, neon_composite_src_0888_0888),
- PIXMAN_STD_FAST_PATH (SRC, b8g8r8, null, x8r8g8b8, neon_composite_src_0888_8888_rev),
- PIXMAN_STD_FAST_PATH (SRC, b8g8r8, null, r5g6b5, neon_composite_src_0888_0565_rev),
-@@ -430,6 +435,7 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
- PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, x8r8g8b8, neon_composite_over_8888_8888),
- PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, a8b8g8r8, neon_composite_over_8888_8888),
- PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, x8b8g8r8, neon_composite_over_8888_8888),
-+ PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, null, a8r8g8b8, neon_composite_src_x888_8888),
- PIXMAN_STD_FAST_PATH (ADD, solid, a8, a8, neon_composite_add_n_8_8),
- PIXMAN_STD_FAST_PATH (ADD, a8, a8, a8, neon_composite_add_8_8_8),
- PIXMAN_STD_FAST_PATH (ADD, a8r8g8b8, a8r8g8b8, a8r8g8b8, neon_composite_add_8888_8888_8888),
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman-0.17.8/3-composite.patch b/recipes/xorg-lib/pixman-0.17.8/3-composite.patch
deleted file mode 100644
index 06e40fe..0000000
--- a/recipes/xorg-lib/pixman-0.17.8/3-composite.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 19fc0c4c8d28796f0fbc2c8f47edc130851ae3a5 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Wed, 24 Feb 2010 02:14:45 +0000
-Subject: ARM: added 'neon_composite_over_reverse_n_8888' fast path
-
-This fast path function improves performance of 'poppler' cairo-perf trace.
-
-Benchmark from ARM Cortex-A8 @720MHz
-
-before:
-
-[ # ] backend test min(s) median(s) stddev. count
-[ 0] image poppler 38.986 39.158 0.23% 6/6
-
-after:
-
-[ # ] backend test min(s) median(s) stddev. count
-[ 0] image poppler 24.981 25.136 0.28% 6/6
----
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index f2643de..eb8cc4c 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -680,6 +680,61 @@ generate_composite_function \
-
- /******************************************************************************/
-
-+.macro pixman_composite_over_reverse_n_8888_process_pixblock_tail_head
-+ vrshr.u16 q14, q8, #8
-+ PF add PF_X, PF_X, #8
-+ PF tst PF_CTL, #0xF
-+ vrshr.u16 q15, q9, #8
-+ vrshr.u16 q12, q10, #8
-+ vrshr.u16 q13, q11, #8
-+ PF addne PF_X, PF_X, #8
-+ PF subne PF_CTL, PF_CTL, #1
-+ vraddhn.u16 d28, q14, q8
-+ vraddhn.u16 d29, q15, q9
-+ PF cmp PF_X, ORIG_W
-+ vraddhn.u16 d30, q12, q10
-+ vraddhn.u16 d31, q13, q11
-+ vqadd.u8 q14, q0, q14
-+ vqadd.u8 q15, q1, q15
-+ vld4.8 {d0, d1, d2, d3}, [DST_R, :128]!
-+ vmvn.8 d22, d3
-+ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
-+ vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
-+ PF subge PF_X, PF_X, ORIG_W
-+ vmull.u8 q8, d22, d4
-+ PF subges PF_CTL, PF_CTL, #0x10
-+ vmull.u8 q9, d22, d5
-+ vmull.u8 q10, d22, d6
-+ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
-+ vmull.u8 q11, d22, d7
-+.endm
-+
-+.macro pixman_composite_over_reverse_n_8888_init
-+ add DUMMY, sp, #ARGS_STACK_OFFSET
-+ vld1.32 {d7[0]}, [DUMMY]
-+ vdup.8 d4, d7[0]
-+ vdup.8 d5, d7[1]
-+ vdup.8 d6, d7[2]
-+ vdup.8 d7, d7[3]
-+.endm
-+
-+generate_composite_function \
-+ pixman_composite_over_reverse_n_8888_asm_neon, 0, 0, 32, \
-+ FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ 5, /* prefetch distance */ \
-+ pixman_composite_over_reverse_n_8888_init, \
-+ default_cleanup, \
-+ pixman_composite_over_8888_8888_process_pixblock_head, \
-+ pixman_composite_over_8888_8888_process_pixblock_tail, \
-+ pixman_composite_over_reverse_n_8888_process_pixblock_tail_head, \
-+ 28, /* dst_w_basereg */ \
-+ 0, /* dst_r_basereg */ \
-+ 4, /* src_basereg */ \
-+ 24 /* mask_basereg */
-+
-+/******************************************************************************/
-+
- .macro pixman_composite_over_n_8_0565_process_pixblock_head
- /* in */
- vmull.u8 q0, d24, d8
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 0a7ac31..30c5056 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -264,6 +264,7 @@ BIND_SRC_NULL_DST(add_8888_8888, uint32_t, 1, uint32_t, 1)
-
- BIND_N_NULL_DST(over_n_0565, uint16_t, 1)
- BIND_N_NULL_DST(over_n_8888, uint32_t, 1)
-+BIND_N_NULL_DST(over_reverse_n_8888, uint32_t, 1)
-
- BIND_SRC_NULL_DST(over_8888_0565, uint32_t, 1, uint16_t, 1)
- BIND_SRC_NULL_DST(over_8888_8888, uint32_t, 1, uint32_t, 1)
-@@ -442,6 +443,8 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
- PIXMAN_STD_FAST_PATH (ADD, a8, null, a8, neon_composite_add_8000_8000),
- PIXMAN_STD_FAST_PATH (ADD, a8r8g8b8, null, a8r8g8b8, neon_composite_add_8888_8888),
- PIXMAN_STD_FAST_PATH (ADD, a8b8g8r8, null, a8b8g8r8, neon_composite_add_8888_8888),
-+ PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8r8g8b8, neon_composite_over_reverse_n_8888),
-+ PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8b8g8r8, neon_composite_over_reverse_n_8888),
-
- { PIXMAN_OP_NONE },
- };
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
deleted file mode 100644
index 06b07a3..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 5234e3c2c161ed5fc92caa336ae78f89112c7d77 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Tue, 16 Mar 2010 16:55:28 +0100
-Subject: [PATCH 1/5] Generic C implementation of pixman_blt with overlapping support
-
-Uses memcpy/memmove functions to copy pixels, can handle the
-case when both source and destination areas are in the same
-image (this is useful for scrolling).
-
-It is assumed that copying direction is only important when
-using the same image for both source and destination (and
-src_stride == dst_stride). Copying direction is undefined
-for the images with different source and destination stride
-which happen to be in the overlapped areas (but this is an
-unrealistic case anyway).
----
- pixman/pixman-general.c | 21 ++++++++++++++++++---
- pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 61 insertions(+), 3 deletions(-)
-
-diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
-index bddf79a..f525744 100644
---- a/pixman/pixman-general.c
-+++ b/pixman/pixman-general.c
-@@ -285,9 +285,24 @@ general_blt (pixman_implementation_t *imp,
- int width,
- int height)
- {
-- /* We can't blit unless we have sse2 or mmx */
--
-- return FALSE;
-+ uint8_t *dst_bytes = (uint8_t *)dst_bits;
-+ uint8_t *src_bytes = (uint8_t *)src_bits;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
-+ return FALSE;
-+
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
-+ dst_bytes + dst_y * dst_stride + dst_x * bpp,
-+ src_stride,
-+ dst_stride,
-+ width,
-+ height);
-+ return TRUE;
- }
-
- static pixman_bool_t
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index d5767af..eeb677d 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -10,6 +10,7 @@
-
- #include "pixman.h"
- #include <time.h>
-+#include <string.h>
- #include <assert.h>
- #include <stdio.h>
- #include <string.h>
-@@ -867,4 +868,46 @@ void pixman_timer_register (pixman_timer_t *timer);
-
- #endif /* PIXMAN_TIMERS */
-
-+/* a helper function, can blit 8-bit images with src/dst overlapping support */
-+static inline void
-+pixman_blt_helper (uint8_t *src_bytes,
-+ uint8_t *dst_bytes,
-+ int src_stride,
-+ int dst_stride,
-+ int width,
-+ int height)
-+{
-+ /*
-+ * The second part of this check is not strictly needed, but it prevents
-+ * unnecessary upside-down processing of areas which belong to different
-+ * images. Upside-down processing can be slower with fixed-distance-ahead
-+ * prefetch and perceived as having more tearing.
-+ */
-+ if (src_bytes < dst_bytes + width &&
-+ src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+ /* Horizontal scrolling to the left needs memmove */
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return;
-+ }
-+ }
-+ while (--height >= 0)
-+ {
-+ memcpy (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+}
-+
- #endif /* PIXMAN_PRIVATE_H */
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
deleted file mode 100644
index bf6e58c..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From f607cd0250d398077b0c51201258775e372cb3c3 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:45:47 +0300
-Subject: [PATCH 2/5] Support of overlapping src/dst for pixman_blt_mmx
-
----
- pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++---------------------
- 1 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
-index e084e7f..6212b31 100644
---- a/pixman/pixman-mmx.c
-+++ b/pixman/pixman-mmx.c
-@@ -2994,34 +2994,43 @@ pixman_blt_mmx (uint32_t *src_bits,
- {
- uint8_t * src_bytes;
- uint8_t * dst_bytes;
-- int byte_width;
-+ int bpp;
-
-- if (src_bpp != dst_bpp)
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-- if (src_bpp == 16)
-- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 2 * width;
-- src_stride *= 2;
-- dst_stride *= 2;
-- }
-- else if (src_bpp == 32)
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 4 * width;
-- src_stride *= 4;
-- dst_stride *= 4;
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
- }
-- else
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
- {
-- return FALSE;
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using MMX */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
- }
-
- while (height--)
-@@ -3031,7 +3040,7 @@ pixman_blt_mmx (uint32_t *src_bits,
- uint8_t *d = dst_bytes;
- src_bytes += src_stride;
- dst_bytes += dst_stride;
-- w = byte_width;
-+ w = width;
-
- while (w >= 2 && ((unsigned long)d & 3))
- {
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
deleted file mode 100644
index c1f3b2e..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 45a9a537f94a7feab47bd82171c7d620f0d34e3f Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:45:54 +0300
-Subject: [PATCH 3/5] Support of overlapping src/dst for pixman_blt_sse2
-
----
- pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++--------------------
- 1 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
-index 946e7ba..66053ae 100644
---- a/pixman/pixman-sse2.c
-+++ b/pixman/pixman-sse2.c
-@@ -5299,34 +5299,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
- {
- uint8_t * src_bytes;
- uint8_t * dst_bytes;
-- int byte_width;
-+ int bpp;
-
-- if (src_bpp != dst_bpp)
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-- if (src_bpp == 16)
-- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 2 * width;
-- src_stride *= 2;
-- dst_stride *= 2;
-- }
-- else if (src_bpp == 32)
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 4 * width;
-- src_stride *= 4;
-- dst_stride *= 4;
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
- }
-- else
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
- {
-- return FALSE;
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using SSE2 */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
- }
-
- cache_prefetch ((__m128i*)src_bytes);
-@@ -5339,7 +5348,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
- uint8_t *d = dst_bytes;
- src_bytes += src_stride;
- dst_bytes += dst_stride;
-- w = byte_width;
-+ w = width;
-
- cache_prefetch_next ((__m128i*)s);
- cache_prefetch_next ((__m128i*)d);
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
deleted file mode 100644
index c37673e..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 4cf5bfc72a724fb653c48338b93e91dccea238af Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Wed, 18 Nov 2009 06:08:48 +0200
-Subject: [PATCH 4/5] Support of overlapping src/dst for pixman_blt_neon
-
----
- pixman/pixman-arm-neon.c | 62 +++++++++++++++++++++++++++++++++++++--------
- 1 files changed, 51 insertions(+), 11 deletions(-)
-
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 6808b36..7feee1d 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -168,26 +168,66 @@ pixman_blt_neon (uint32_t *src_bits,
- int width,
- int height)
- {
-- if (src_bpp != dst_bpp)
-+ uint8_t * src_bytes;
-+ uint8_t * dst_bytes;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
-+ {
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
-+ }
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using NEON */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
-+ }
-+
- switch (src_bpp)
- {
- case 16:
- pixman_composite_src_0565_0565_asm_neon (
-- width, height,
-- (uint16_t *)(((char *) dst_bits) +
-- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
-- (uint16_t *)(((char *) src_bits) +
-- src_y * src_stride * 4 + src_x * 2), src_stride * 2);
-+ width >> 1,
-+ height,
-+ (uint16_t *) dst_bytes,
-+ dst_stride >> 1,
-+ (uint16_t *) src_bytes,
-+ src_stride >> 1);
- return TRUE;
- case 32:
- pixman_composite_src_8888_8888_asm_neon (
-- width, height,
-- (uint32_t *)(((char *) dst_bits) +
-- dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
-- (uint32_t *)(((char *) src_bits) +
-- src_y * src_stride * 4 + src_x * 4), src_stride);
-+ width >> 2,
-+ height,
-+ (uint32_t *) dst_bytes,
-+ dst_stride >> 2,
-+ (uint32_t *) src_bytes,
-+ src_stride >> 2);
- return TRUE;
- default:
- return FALSE;
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch b/recipes/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
deleted file mode 100644
index d776574..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From d1410558827fce8aac354274a7150fa915881c50 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 10 Dec 2009 00:51:50 +0200
-Subject: [PATCH 5/5] ARM: added NEON optimizations for fetch/store r5g6b5 scanline
-
----
- pixman/pixman-access.c | 23 ++++++++++++++++++++++-
- pixman/pixman-arm-neon-asm.S | 20 ++++++++++++++++++++
- pixman/pixman-arm-neon.c | 41 +++++++++++++++++++++++++++++++++++++++++
- pixman/pixman-private.h | 5 +++++
- 4 files changed, 88 insertions(+), 1 deletions(-)
-
-diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
-index fa0a267..5bb3e09 100644
---- a/pixman/pixman-access.c
-+++ b/pixman/pixman-access.c
-@@ -2748,7 +2748,7 @@ typedef struct
- store_scanline_ ## format, store_scanline_generic_64 \
- }
-
--static const format_info_t accessors[] =
-+static format_info_t accessors[] =
- {
- /* 32 bpp formats */
- FORMAT_INFO (a8r8g8b8),
-@@ -2891,6 +2891,27 @@ _pixman_bits_image_setup_raw_accessors (bits_image_t *image)
- setup_accessors (image);
- }
-
-+void
-+_pixman_bits_override_accessors (pixman_format_code_t format,
-+ fetch_scanline_t fetch_func,
-+ store_scanline_t store_func)
-+{
-+ format_info_t *info = accessors;
-+
-+ while (info->format != PIXMAN_null)
-+ {
-+ if (info->format == format)
-+ {
-+ if (fetch_func)
-+ info->fetch_scanline_raw_32 = fetch_func;
-+ if (store_func)
-+ info->store_scanline_raw_32 = store_func;
-+ return;
-+ }
-+ info++;
-+ }
-+}
-+
- #else
-
- void
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index 51bc347..f30869e 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -458,6 +458,16 @@ generate_composite_function \
- pixman_composite_src_8888_0565_process_pixblock_tail, \
- pixman_composite_src_8888_0565_process_pixblock_tail_head
-
-+generate_composite_function_single_scanline \
-+ pixman_store_scanline_r5g6b5_asm_neon, 32, 0, 16, \
-+ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ default_init, \
-+ default_cleanup, \
-+ pixman_composite_src_8888_0565_process_pixblock_head, \
-+ pixman_composite_src_8888_0565_process_pixblock_tail, \
-+ pixman_composite_src_8888_0565_process_pixblock_tail_head
-+
- /******************************************************************************/
-
- .macro pixman_composite_src_0565_8888_process_pixblock_head
-@@ -493,6 +503,16 @@ generate_composite_function \
- pixman_composite_src_0565_8888_process_pixblock_tail, \
- pixman_composite_src_0565_8888_process_pixblock_tail_head
-
-+generate_composite_function_single_scanline \
-+ pixman_fetch_scanline_r5g6b5_asm_neon, 16, 0, 32, \
-+ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ default_init, \
-+ default_cleanup, \
-+ pixman_composite_src_0565_8888_process_pixblock_head, \
-+ pixman_composite_src_0565_8888_process_pixblock_tail, \
-+ pixman_composite_src_0565_8888_process_pixblock_tail_head
-+
- /******************************************************************************/
-
- .macro pixman_composite_add_8000_8000_process_pixblock_head
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 7feee1d..fda7a09 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -375,6 +375,43 @@ neon_combine_##name##_u (pixman_implementation_t *imp, \
- BIND_COMBINE_U (over)
- BIND_COMBINE_U (add)
-
-+void
-+pixman_fetch_scanline_r5g6b5_asm_neon (int width,
-+ uint32_t *buffer,
-+ const uint16_t *pixel);
-+void
-+pixman_store_scanline_r5g6b5_asm_neon (int width,
-+ uint16_t *pixel,
-+ const uint32_t *values);
-+
-+static void
-+neon_fetch_scanline_r5g6b5 (pixman_image_t *image,
-+ int x,
-+ int y,
-+ int width,
-+ uint32_t * buffer,
-+ const uint32_t *mask,
-+ uint32_t mask_bits)
-+{
-+ const uint32_t *bits = image->bits.bits + y * image->bits.rowstride;
-+ const uint16_t *pixel = (const uint16_t *)bits + x;
-+
-+ pixman_fetch_scanline_r5g6b5_asm_neon (width, buffer, pixel);
-+}
-+
-+static void
-+neon_store_scanline_r5g6b5 (bits_image_t * image,
-+ int x,
-+ int y,
-+ int width,
-+ const uint32_t *values)
-+{
-+ uint32_t *bits = image->bits + image->rowstride * y;
-+ uint16_t *pixel = ((uint16_t *) bits) + x;
-+
-+ pixman_store_scanline_r5g6b5_asm_neon (width, pixel, values);
-+}
-+
- pixman_implementation_t *
- _pixman_implementation_create_arm_neon (void)
- {
-@@ -385,6 +422,10 @@ _pixman_implementation_create_arm_neon (void)
- imp->combine_32[PIXMAN_OP_OVER] = neon_combine_over_u;
- imp->combine_32[PIXMAN_OP_ADD] = neon_combine_add_u;
-
-+ _pixman_bits_override_accessors (PIXMAN_r5g6b5,
-+ neon_fetch_scanline_r5g6b5,
-+ neon_store_scanline_r5g6b5);
-+
- imp->blt = arm_neon_blt;
- imp->fill = arm_neon_fill;
-
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index eeb677d..ba2d401 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -220,6 +220,11 @@ void
- _pixman_bits_image_setup_raw_accessors (bits_image_t *image);
-
- void
-+_pixman_bits_override_accessors (pixman_format_code_t format,
-+ fetch_scanline_t fetch_func,
-+ store_scanline_t store_func);
-+
-+void
- _pixman_image_get_scanline_generic_64 (pixman_image_t *image,
- int x,
- int y,
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman-0.18.0/565-scanline.patch b/recipes/xorg-lib/pixman-0.18.0/565-scanline.patch
deleted file mode 100644
index 8461a46..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/565-scanline.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From deef1daf5896062f47fa61b94e1e77c7c0041820 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Fri, 04 Dec 2009 16:49:19 +0000
-Subject: A copy-paste version of 16bpp bilinear scanline fetcher
-
----
-diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
-index 3d78ff0..1656975 100644
---- a/pixman/pixman-bits-image.c
-+++ b/pixman/pixman-bits-image.c
-@@ -535,6 +535,212 @@ bits_image_fetch_bilinear_no_repeat_8888 (pixman_image_t * ima,
- *buffer++ = 0;
- }
-
-+static void
-+bits_image_fetch_bilinear_no_repeat_0565 (pixman_image_t * ima,
-+ int offset,
-+ int line,
-+ int width,
-+ uint32_t * buffer,
-+ const uint32_t * mask,
-+ uint32_t mask_bits)
-+{
-+ bits_image_t *bits = &ima->bits;
-+ pixman_fixed_t x_top, x_bottom, x;
-+ pixman_fixed_t ux_top, ux_bottom, ux;
-+ pixman_vector_t v;
-+ uint32_t top_mask, bottom_mask;
-+ uint16_t *top_row;
-+ uint16_t *bottom_row;
-+ uint32_t *end;
-+ uint16_t zero[2] = { 0, 0 };
-+ int y, y1, y2;
-+ int disty;
-+ int mask_inc;
-+ int w;
-+
-+ /* reference point is the center of the pixel */
-+ v.vector[0] = pixman_int_to_fixed (offset) + pixman_fixed_1 / 2;
-+ v.vector[1] = pixman_int_to_fixed (line) + pixman_fixed_1 / 2;
-+ v.vector[2] = pixman_fixed_1;
-+
-+ if (!pixman_transform_point_3d (bits->common.transform, &v))
-+ return;
-+
-+ ux = ux_top = ux_bottom = bits->common.transform->matrix[0][0];
-+ x = x_top = x_bottom = v.vector[0] - pixman_fixed_1/2;
-+
-+ y = v.vector[1] - pixman_fixed_1/2;
-+ disty = (y >> 8) & 0xff;
-+
-+ /* Load the pointers to the first and second lines from the source
-+ * image that bilinear code must read.
-+ *
-+ * The main trick in this code is about the check if any line are
-+ * outside of the image;
-+ *
-+ * When I realize that a line (any one) is outside, I change
-+ * the pointer to a dummy area with zeros. Once I change this, I
-+ * must be sure the pointer will not change, so I set the
-+ * variables to each pointer increments inside the loop.
-+ */
-+ y1 = pixman_fixed_to_int (y);
-+ y2 = y1 + 1;
-+
-+ if (y1 < 0 || y1 >= bits->height)
-+ {
-+ top_row = zero;
-+ x_top = 0;
-+ ux_top = 0;
-+ }
-+ else
-+ {
-+ top_row = bits->bits + y1 * bits->rowstride;
-+ x_top = x;
-+ ux_top = ux;
-+ }
-+
-+ if (y2 < 0 || y2 >= bits->height)
-+ {
-+ bottom_row = zero;
-+ x_bottom = 0;
-+ ux_bottom = 0;
-+ }
-+ else
-+ {
-+ bottom_row = bits->bits + y2 * bits->rowstride;
-+ x_bottom = x;
-+ ux_bottom = ux;
-+ }
-+
-+ /* Instead of checking whether the operation uses the mast in
-+ * each loop iteration, verify this only once and prepare the
-+ * variables to make the code smaller inside the loop.
-+ */
-+ if (!mask)
-+ {
-+ mask_inc = 0;
-+ mask_bits = 1;
-+ mask = &mask_bits;
-+ }
-+ else
-+ {
-+ /* If have a mask, prepare the variables to check it */
-+ mask_inc = 1;
-+ }
-+
-+ /* If both are zero, then the whole thing is zero */
-+ if (top_row == zero && bottom_row == zero)
-+ {
-+ memset (buffer, 0, width * sizeof (uint32_t));
-+ return;
-+ }
-+ else
-+ {
-+ if (top_row == zero)
-+ {
-+ top_mask = 0;
-+ bottom_mask = 0xff000000;
-+ }
-+ else if (bottom_row == zero)
-+ {
-+ top_mask = 0xff000000;
-+ bottom_mask = 0;
-+ }
-+ else
-+ {
-+ top_mask = 0xff000000;
-+ bottom_mask = 0xff000000;
-+ }
-+ }
-+
-+ end = buffer + width;
-+
-+ /* Zero fill to the left of the image */
-+ while (buffer < end && x < pixman_fixed_minus_1)
-+ {
-+ *buffer++ = 0;
-+ x += ux;
-+ x_top += ux_top;
-+ x_bottom += ux_bottom;
-+ mask += mask_inc;
-+ }
-+
-+ /* Left edge
-+ */
-+ while (buffer < end && x < 0)
-+ {
-+ uint32_t tr, br;
-+ int32_t distx;
-+
-+ tr = CONVERT_0565_TO_0888 (top_row[pixman_fixed_to_int (x_top) + 1]) | top_mask;
-+ br = CONVERT_0565_TO_0888 (bottom_row[pixman_fixed_to_int (x_bottom) + 1]) | bottom_mask;
-+
-+ distx = (x >> 8) & 0xff;
-+
-+ *buffer++ = bilinear_interpolation (0, tr, 0, br, distx, disty);
-+
-+ x += ux;
-+ x_top += ux_top;
-+ x_bottom += ux_bottom;
-+ mask += mask_inc;
-+ }
-+
-+ /* Main part */
-+ w = pixman_int_to_fixed (bits->width - 1);
-+
-+ while (buffer < end && x < w)
-+ {
-+ if (*mask)
-+ {
-+ uint32_t tl, tr, bl, br;
-+ int32_t distx;
-+
-+ tl = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top)]) | top_mask;
-+ tr = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top) + 1]) | top_mask;
-+ bl = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom)]) | bottom_mask;
-+ br = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom) + 1]) | bottom_mask;
-+
-+ distx = (x >> 8) & 0xff;
-+
-+ *buffer = bilinear_interpolation (tl, tr, bl, br, distx, disty);
-+ }
-+
-+ buffer++;
-+ x += ux;
-+ x_top += ux_top;
-+ x_bottom += ux_bottom;
-+ mask += mask_inc;
-+ }
-+
-+ /* Right Edge */
-+ w = pixman_int_to_fixed (bits->width);
-+ while (buffer < end && x < w)
-+ {
-+ if (*mask)
-+ {
-+ uint32_t tl, bl;
-+ int32_t distx;
-+
-+ tl = CONVERT_0565_TO_0888 (top_row [pixman_fixed_to_int (x_top)]) | top_mask;
-+ bl = CONVERT_0565_TO_0888 (bottom_row [pixman_fixed_to_int (x_bottom)]) | bottom_mask;
-+
-+ distx = (x >> 8) & 0xff;
-+
-+ *buffer = bilinear_interpolation (tl, 0, bl, 0, distx, disty);
-+ }
-+
-+ buffer++;
-+ x += ux;
-+ x_top += ux_top;
-+ x_bottom += ux_bottom;
-+ mask += mask_inc;
-+ }
-+
-+ /* Zero fill to the left of the image */
-+ while (buffer < end)
-+ *buffer++ = 0;
-+}
-+
- static force_inline uint32_t
- bits_image_fetch_pixel_convolution (bits_image_t *image,
- pixman_fixed_t x,
-@@ -917,14 +1123,26 @@ bits_image_property_changed (pixman_image_t *image)
- (bits->common.filter == PIXMAN_FILTER_BILINEAR ||
- bits->common.filter == PIXMAN_FILTER_GOOD ||
- bits->common.filter == PIXMAN_FILTER_BEST) &&
-- bits->common.repeat == PIXMAN_REPEAT_NONE &&
-- (bits->format == PIXMAN_a8r8g8b8 ||
-- bits->format == PIXMAN_x8r8g8b8))
-+ bits->common.repeat == PIXMAN_REPEAT_NONE)
- {
- image->common.get_scanline_64 =
- _pixman_image_get_scanline_generic_64;
-- image->common.get_scanline_32 =
-- bits_image_fetch_bilinear_no_repeat_8888;
-+
-+ if (bits->format == PIXMAN_a8r8g8b8 || bits->format == PIXMAN_x8r8g8b8)
-+ {
-+ image->common.get_scanline_32 =
-+ bits_image_fetch_bilinear_no_repeat_8888;
-+ }
-+ else if (bits->format == PIXMAN_r5g6b5)
-+ {
-+ image->common.get_scanline_32 =
-+ bits_image_fetch_bilinear_no_repeat_0565;
-+ }
-+ else
-+ {
-+ image->common.get_scanline_32 =
-+ bits_image_fetch_transformed;
-+ }
- }
- else
- {
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman-0.18.0/missing-cache-preload.diff b/recipes/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
deleted file mode 100644
index 475bb35..0000000
--- a/recipes/xorg-lib/pixman-0.18.0/missing-cache-preload.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4f45c7688e6b767a5f7b7f5cced51b4797a3c288 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Fri, 21 May 2010 13:31:03 +0000
-Subject: ARM: added missing cache preload
-
----
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index 51bc347..a99555a 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -388,6 +388,7 @@ generate_composite_function \
- vld1.16 {d4, d5}, [DST_R, :128]!
- vst1.16 {d28, d29}, [DST_W, :128]!
- pixman_composite_over_n_0565_process_pixblock_head
-+ cache_preload 8, 8
- .endm
-
- .macro pixman_composite_over_n_0565_init
-@@ -660,6 +661,7 @@ generate_composite_function_single_scanline \
- vld4.8 {d4, d5, d6, d7}, [DST_R, :128]!
- vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
- pixman_composite_over_8888_8888_process_pixblock_head
-+ cache_preload 8, 8
- .endm
-
- .macro pixman_composite_over_n_8888_init
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch b/recipes/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
deleted file mode 100644
index 05fe829..0000000
--- a/recipes/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Carl Worth <cworth@cworth.org>
-
-Don't copy unused bits to an alpha channel
-
-This bug was identified by cairo's rgb24-ignore-alpha test which
-blends RGB24 over ARGB32 and notices that "alpha" values are
-making it from the source to the destination.
-
-Index: a/pixman/pixman-pict.c
-===================================================================
---- a/pixman/pixman-pict.c b8b7b767b3ed1fc57ba177c38187e1eb3daf4de8
-+++ b/pixman/pixman-pict.c c7d73fc532c2da313041906ac0f48dba1b10d3bc
-@@ -1778,7 +1778,6 @@ pixman_image_composite (pixman_op_t
- break;
- case PIXMAN_x8r8g8b8:
- switch (pDst->bits.format) {
-- case PIXMAN_a8r8g8b8:
- case PIXMAN_x8r8g8b8:
- #ifdef USE_MMX
- if (pixman_have_mmx())
-@@ -1790,7 +1789,6 @@ pixman_image_composite (pixman_op_t
- }
- case PIXMAN_x8b8g8r8:
- switch (pDst->bits.format) {
-- case PIXMAN_a8b8g8r8:
- case PIXMAN_x8b8g8r8:
- #ifdef USE_MMX
- if (pixman_have_mmx())
-
diff --git a/recipes/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
deleted file mode 100644
index a2cda24..0000000
--- a/recipes/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 8ea1a333de202018a862a7b04b94479d3109274b Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Tue, 16 Mar 2010 16:55:28 +0100
-Subject: [PATCH 1/5] Generic C implementation of pixman_blt with overlapping support
-
-Uses memcpy/memmove functions to copy pixels, can handle the
-case when both source and destination areas are in the same
-image (this is useful for scrolling).
-
-It is assumed that copying direction is only important when
-using the same image for both source and destination (and
-src_stride == dst_stride). Copying direction is undefined
-for the images with different source and destination stride
-which happen to be in the overlapped areas (but this is an
-unrealistic case anyway).
----
- pixman/pixman-general.c | 21 ++++++++++++++++++---
- pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 61 insertions(+), 3 deletions(-)
-
-diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
-index bddf79a..f525744 100644
---- a/pixman/pixman-general.c
-+++ b/pixman/pixman-general.c
-@@ -285,9 +285,24 @@ general_blt (pixman_implementation_t *imp,
- int width,
- int height)
- {
-- /* We can't blit unless we have sse2 or mmx */
--
-- return FALSE;
-+ uint8_t *dst_bytes = (uint8_t *)dst_bits;
-+ uint8_t *src_bytes = (uint8_t *)src_bits;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
-+ return FALSE;
-+
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp,
-+ dst_bytes + dst_y * dst_stride + dst_x * bpp,
-+ src_stride,
-+ dst_stride,
-+ width,
-+ height);
-+ return TRUE;
- }
-
- static pixman_bool_t
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index d5767af..eeb677d 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -10,6 +10,7 @@
-
- #include "pixman.h"
- #include <time.h>
-+#include <string.h>
- #include <assert.h>
- #include <stdio.h>
- #include <string.h>
-@@ -867,4 +868,46 @@ void pixman_timer_register (pixman_timer_t *timer);
-
- #endif /* PIXMAN_TIMERS */
-
-+/* a helper function, can blit 8-bit images with src/dst overlapping support */
-+static inline void
-+pixman_blt_helper (uint8_t *src_bytes,
-+ uint8_t *dst_bytes,
-+ int src_stride,
-+ int dst_stride,
-+ int width,
-+ int height)
-+{
-+ /*
-+ * The second part of this check is not strictly needed, but it prevents
-+ * unnecessary upside-down processing of areas which belong to different
-+ * images. Upside-down processing can be slower with fixed-distance-ahead
-+ * prefetch and perceived as having more tearing.
-+ */
-+ if (src_bytes < dst_bytes + width &&
-+ src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+ /* Horizontal scrolling to the left needs memmove */
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return;
-+ }
-+ }
-+ while (--height >= 0)
-+ {
-+ memcpy (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+}
-+
- #endif /* PIXMAN_PRIVATE_H */
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
deleted file mode 100644
index 003337f..0000000
--- a/recipes/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 3170d9f5e927681a2516bcec52b317d1d4785e25 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:45:47 +0300
-Subject: [PATCH 2/5] Support of overlapping src/dst for pixman_blt_mmx
-
----
- pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++---------------------
- 1 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
-index e084e7f..6212b31 100644
---- a/pixman/pixman-mmx.c
-+++ b/pixman/pixman-mmx.c
-@@ -2994,34 +2994,43 @@ pixman_blt_mmx (uint32_t *src_bits,
- {
- uint8_t * src_bytes;
- uint8_t * dst_bytes;
-- int byte_width;
-+ int bpp;
-
-- if (src_bpp != dst_bpp)
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-- if (src_bpp == 16)
-- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 2 * width;
-- src_stride *= 2;
-- dst_stride *= 2;
-- }
-- else if (src_bpp == 32)
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 4 * width;
-- src_stride *= 4;
-- dst_stride *= 4;
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
- }
-- else
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
- {
-- return FALSE;
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using MMX */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
- }
-
- while (height--)
-@@ -3031,7 +3040,7 @@ pixman_blt_mmx (uint32_t *src_bits,
- uint8_t *d = dst_bytes;
- src_bytes += src_stride;
- dst_bytes += dst_stride;
-- w = byte_width;
-+ w = width;
-
- while (w >= 2 && ((unsigned long)d & 3))
- {
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
deleted file mode 100644
index 7e8f34f..0000000
--- a/recipes/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From f07cd58c643b490dcb1ef7be2642926cfeca1e69 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 22 Oct 2009 05:45:54 +0300
-Subject: [PATCH 3/5] Support of overlapping src/dst for pixman_blt_sse2
-
----
- pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++--------------------
- 1 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
-index 946e7ba..66053ae 100644
---- a/pixman/pixman-sse2.c
-+++ b/pixman/pixman-sse2.c
-@@ -5299,34 +5299,43 @@ pixman_blt_sse2 (uint32_t *src_bits,
- {
- uint8_t * src_bytes;
- uint8_t * dst_bytes;
-- int byte_width;
-+ int bpp;
-
-- if (src_bpp != dst_bpp)
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-- if (src_bpp == 16)
-- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 2 * width;
-- src_stride *= 2;
-- dst_stride *= 2;
-- }
-- else if (src_bpp == 32)
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
- {
-- src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-- byte_width = 4 * width;
-- src_stride *= 4;
-- dst_stride *= 4;
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
- }
-- else
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
- {
-- return FALSE;
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using SSE2 */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
- }
-
- cache_prefetch ((__m128i*)src_bytes);
-@@ -5339,7 +5348,7 @@ pixman_blt_sse2 (uint32_t *src_bits,
- uint8_t *d = dst_bytes;
- src_bytes += src_stride;
- dst_bytes += dst_stride;
-- w = byte_width;
-+ w = width;
-
- cache_prefetch_next ((__m128i*)s);
- cache_prefetch_next ((__m128i*)d);
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
deleted file mode 100644
index 0ba5b84..0000000
--- a/recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From e0542866c466ad512d69292df098d4b880e35e52 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Wed, 18 Nov 2009 06:08:48 +0200
-Subject: [PATCH 4/5] Support of overlapping src/dst for pixman_blt_neon
-
----
- pixman/pixman-arm-neon.c | 62 +++++++++++++++++++++++++++++++++++++--------
- 1 files changed, 51 insertions(+), 11 deletions(-)
-
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 24ceeeb..134493d 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -360,26 +360,66 @@ pixman_blt_neon (uint32_t *src_bits,
- int width,
- int height)
- {
-- if (src_bpp != dst_bpp)
-+ uint8_t * src_bytes;
-+ uint8_t * dst_bytes;
-+ int bpp;
-+
-+ if (src_bpp != dst_bpp || src_bpp & 7)
- return FALSE;
-
-+ bpp = src_bpp >> 3;
-+ width *= bpp;
-+ src_stride *= 4;
-+ dst_stride *= 4;
-+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp;
-+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp;
-+
-+ if (src_bpp != 16 && src_bpp != 32)
-+ {
-+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride,
-+ width, height);
-+ return TRUE;
-+ }
-+
-+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes)
-+ {
-+ src_bytes += src_stride * height - src_stride;
-+ dst_bytes += dst_stride * height - dst_stride;
-+ dst_stride = -dst_stride;
-+ src_stride = -src_stride;
-+
-+ if (src_bytes + width > dst_bytes)
-+ {
-+ /* TODO: reverse scanline copy using NEON */
-+ while (--height >= 0)
-+ {
-+ memmove (dst_bytes, src_bytes, width);
-+ dst_bytes += dst_stride;
-+ src_bytes += src_stride;
-+ }
-+ return TRUE;
-+ }
-+ }
-+
- switch (src_bpp)
- {
- case 16:
- pixman_composite_src_0565_0565_asm_neon (
-- width, height,
-- (uint16_t *)(((char *) dst_bits) +
-- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2,
-- (uint16_t *)(((char *) src_bits) +
-- src_y * src_stride * 4 + src_x * 2), src_stride * 2);
-+ width >> 1,
-+ height,
-+ (uint16_t *) dst_bytes,
-+ dst_stride >> 1,
-+ (uint16_t *) src_bytes,
-+ src_stride >> 1);
- return TRUE;
- case 32:
- pixman_composite_src_8888_8888_asm_neon (
-- width, height,
-- (uint32_t *)(((char *) dst_bits) +
-- dst_y * dst_stride * 4 + dst_x * 4), dst_stride,
-- (uint32_t *)(((char *) src_bits) +
-- src_y * src_stride * 4 + src_x * 4), src_stride);
-+ width >> 2,
-+ height,
-+ (uint32_t *) dst_bytes,
-+ dst_stride >> 2,
-+ (uint32_t *) src_bytes,
-+ src_stride >> 2);
- return TRUE;
- default:
- return FALSE;
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch b/recipes/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
deleted file mode 100644
index 769ed2e..0000000
--- a/recipes/xorg-lib/pixman/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From d51b10a2750d99543a0c92ca44802aa7a4d70e54 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 10 Dec 2009 00:51:50 +0200
-Subject: [PATCH 5/5] ARM: added NEON optimizations for fetch/store r5g6b5 scanline
-
----
- pixman/pixman-access.c | 23 ++++++++++++++++++++++-
- pixman/pixman-arm-neon-asm.S | 20 ++++++++++++++++++++
- pixman/pixman-arm-neon.c | 41 +++++++++++++++++++++++++++++++++++++++++
- pixman/pixman-private.h | 5 +++++
- 4 files changed, 88 insertions(+), 1 deletions(-)
-
-diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
-index fa0a267..5bb3e09 100644
---- a/pixman/pixman-access.c
-+++ b/pixman/pixman-access.c
-@@ -2748,7 +2748,7 @@ typedef struct
- store_scanline_ ## format, store_scanline_generic_64 \
- }
-
--static const format_info_t accessors[] =
-+static format_info_t accessors[] =
- {
- /* 32 bpp formats */
- FORMAT_INFO (a8r8g8b8),
-@@ -2891,6 +2891,27 @@ _pixman_bits_image_setup_raw_accessors (bits_image_t *image)
- setup_accessors (image);
- }
-
-+void
-+_pixman_bits_override_accessors (pixman_format_code_t format,
-+ fetch_scanline_t fetch_func,
-+ store_scanline_t store_func)
-+{
-+ format_info_t *info = accessors;
-+
-+ while (info->format != PIXMAN_null)
-+ {
-+ if (info->format == format)
-+ {
-+ if (fetch_func)
-+ info->fetch_scanline_raw_32 = fetch_func;
-+ if (store_func)
-+ info->store_scanline_raw_32 = store_func;
-+ return;
-+ }
-+ info++;
-+ }
-+}
-+
- #else
-
- void
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index eb8cc4c..6ab3301 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -454,6 +454,16 @@ generate_composite_function \
- pixman_composite_src_8888_0565_process_pixblock_tail, \
- pixman_composite_src_8888_0565_process_pixblock_tail_head
-
-+generate_composite_function_single_scanline \
-+ pixman_store_scanline_r5g6b5_asm_neon, 32, 0, 16, \
-+ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ default_init, \
-+ default_cleanup, \
-+ pixman_composite_src_8888_0565_process_pixblock_head, \
-+ pixman_composite_src_8888_0565_process_pixblock_tail, \
-+ pixman_composite_src_8888_0565_process_pixblock_tail_head
-+
- /******************************************************************************/
-
- .macro pixman_composite_src_0565_8888_process_pixblock_head
-@@ -489,6 +499,16 @@ generate_composite_function \
- pixman_composite_src_0565_8888_process_pixblock_tail, \
- pixman_composite_src_0565_8888_process_pixblock_tail_head
-
-+generate_composite_function_single_scanline \
-+ pixman_fetch_scanline_r5g6b5_asm_neon, 16, 0, 32, \
-+ FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \
-+ 8, /* number of pixels, processed in a single block */ \
-+ default_init, \
-+ default_cleanup, \
-+ pixman_composite_src_0565_8888_process_pixblock_head, \
-+ pixman_composite_src_0565_8888_process_pixblock_tail, \
-+ pixman_composite_src_0565_8888_process_pixblock_tail_head
-+
- /******************************************************************************/
-
- .macro pixman_composite_add_8000_8000_process_pixblock_head
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 134493d..2245b52 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -567,6 +567,43 @@ neon_combine_##name##_u (pixman_implementation_t *imp, \
- BIND_COMBINE_U (over)
- BIND_COMBINE_U (add)
-
-+void
-+pixman_fetch_scanline_r5g6b5_asm_neon (int width,
-+ uint32_t *buffer,
-+ const uint16_t *pixel);
-+void
-+pixman_store_scanline_r5g6b5_asm_neon (int width,
-+ uint16_t *pixel,
-+ const uint32_t *values);
-+
-+static void
-+neon_fetch_scanline_r5g6b5 (pixman_image_t *image,
-+ int x,
-+ int y,
-+ int width,
-+ uint32_t * buffer,
-+ const uint32_t *mask,
-+ uint32_t mask_bits)
-+{
-+ const uint32_t *bits = image->bits.bits + y * image->bits.rowstride;
-+ const uint16_t *pixel = (const uint16_t *)bits + x;
-+
-+ pixman_fetch_scanline_r5g6b5_asm_neon (width, buffer, pixel);
-+}
-+
-+static void
-+neon_store_scanline_r5g6b5 (bits_image_t * image,
-+ int x,
-+ int y,
-+ int width,
-+ const uint32_t *values)
-+{
-+ uint32_t *bits = image->bits + image->rowstride * y;
-+ uint16_t *pixel = ((uint16_t *) bits) + x;
-+
-+ pixman_store_scanline_r5g6b5_asm_neon (width, pixel, values);
-+}
-+
- pixman_implementation_t *
- _pixman_implementation_create_arm_neon (void)
- {
-@@ -577,6 +614,10 @@ _pixman_implementation_create_arm_neon (void)
- imp->combine_32[PIXMAN_OP_OVER] = neon_combine_over_u;
- imp->combine_32[PIXMAN_OP_ADD] = neon_combine_add_u;
-
-+ _pixman_bits_override_accessors (PIXMAN_r5g6b5,
-+ neon_fetch_scanline_r5g6b5,
-+ neon_store_scanline_r5g6b5);
-+
- imp->blt = arm_neon_blt;
- imp->fill = arm_neon_fill;
-
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index eeb677d..ba2d401 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -220,6 +220,11 @@ void
- _pixman_bits_image_setup_raw_accessors (bits_image_t *image);
-
- void
-+_pixman_bits_override_accessors (pixman_format_code_t format,
-+ fetch_scanline_t fetch_func,
-+ store_scanline_t store_func);
-+
-+void
- _pixman_image_get_scanline_generic_64 (pixman_image_t *image,
- int x,
- int y,
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch b/recipes/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch
deleted file mode 100644
index 3d8d4e8..0000000
--- a/recipes/xorg-lib/pixman/0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 7f0adaef68c5b0bb1c5eb9f5db5792b71b8b8beb Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Fri, 19 Mar 2010 10:44:09 +0100
-Subject: [PATCH 6/6] Revert "ARM: SIMD: Try without any CFLAGS before forcing -mcpu="
-
-This forces -marm that results in runtime SIGILL on thumb userspace
-
-This reverts commit 18f0de452dc7e12e4cb544d761a626d5c6031663.
----
- configure.ac | 20 +++++---------------
- 1 files changed, 5 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fc3ee24..f84a4dc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -363,28 +363,18 @@ AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
-
- dnl ===========================================================================
- dnl Check for ARM SIMD instructions
--ARM_SIMD_CFLAGS=""
-+ARM_SIMD_CFLAGS="-mcpu=arm1136j-s"
-
- have_arm_simd=no
- AC_MSG_CHECKING(whether to use ARM SIMD assembler)
--# check with default CFLAGS in case the toolchain turns on a sufficiently recent -mcpu=
-+xserver_save_CFLAGS=$CFLAGS
-+CFLAGS="$ARM_SIMD_CFLAGS $CFLAGS"
- AC_COMPILE_IFELSE([
- int main () {
- asm("uqadd8 r1, r1, r2");
- return 0;
--}], have_arm_simd=yes,
-- # check again with an explicit -mcpu= in case the toolchain defaults to an
-- # older one; note that uqadd8 isn't available in Thumb mode on arm1136j-s
-- # so we force ARM mode
-- ARM_SIMD_CFLAGS="-mcpu=arm1136j-s -marm"
-- xserver_save_CFLAGS=$CFLAGS
-- CFLAGS="$ARM_SIMD_CFLAGS $CFLAGS"
-- AC_COMPILE_IFELSE([
-- int main () {
-- asm("uqadd8 r1, r1, r2");
-- return 0;
-- }], have_arm_simd=yes)
-- CFLAGS=$xserver_save_CFLAGS)
-+}], have_arm_simd=yes)
-+CFLAGS=$xserver_save_CFLAGS
-
- AC_ARG_ENABLE(arm-simd,
- [AC_HELP_STRING([--disable-arm-simd],
---
-1.6.6.1
-
diff --git a/recipes/xorg-lib/pixman/calloc.patch b/recipes/xorg-lib/pixman/calloc.patch
deleted file mode 100644
index 4a60d7e..0000000
--- a/recipes/xorg-lib/pixman/calloc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 634ba33b5b1fcfd5a0e7910f9991b4ed4f674549 Mon Sep 17 00:00:00 2001
-From: Søren Sandmann Pedersen <ssp@redhat.com>
-Date: Wed, 07 Apr 2010 05:39:14 +0000
-Subject: Fix uninitialized cache when pthreads are used
-
-The thread local cache is allocated with malloc(), but we rely on it
-being initialized to zero, so allocate it with calloc() instead.
----
-diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
-index a4e3f88..cdac0d8 100644
---- a/pixman/pixman-compiler.h
-+++ b/pixman/pixman-compiler.h
-@@ -101,7 +101,7 @@
- static type * \
- tls_ ## name ## _alloc (key) \
- { \
-- type *value = malloc (sizeof (type)); \
-+ type *value = calloc (1, sizeof (type)); \
- if (value) \
- pthread_setspecific (key, value); \
- return value; \
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman/nearest-neighbour.patch b/recipes/xorg-lib/pixman/nearest-neighbour.patch
deleted file mode 100644
index 29b140f..0000000
--- a/recipes/xorg-lib/pixman/nearest-neighbour.patch
+++ /dev/null
@@ -1,1040 +0,0 @@
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Fri, 17 Jul 2009 10:22:23 +0000 (+0300)
-Subject: Fastpath for nearest neighbour scaled compositing operations.
-X-Git-Url: http://siarhei.siamashka.name/gitweb/?p=pixman.git;a=commitdiff_plain;h=247531c6978725a88fd3706129b9d3e339026f54
-
-Fastpath for nearest neighbour scaled compositing operations.
-
-OVER 8888x8888, OVER 8888x0565, SRC 8888x8888, SRC 8888x0565
-and SRC 0565x0565 cases are supported.
----
-
-diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
-index 7f80578..7f3a6ad 100644
---- a/pixman/pixman-fast-path.c
-+++ b/pixman/pixman-fast-path.c
-@@ -1261,6 +1261,993 @@ fast_composite_src_scale_nearest (pixman_implementation_t *imp,
- }
- }
-
-+/*
-+ * Functions, which implement the core inner loops for the nearest neighbour
-+ * scaled fastpath compositing operations. The do not need to do clipping
-+ * checks, also the loops are unrolled to process two pixels per iteration
-+ * for better performance on most CPU architectures (superscalar processors
-+ * can issue several operations simultaneously, other processors can hide
-+ * instructions latencies by pipelining operations). Unrolling more
-+ * does not make much sense because the compiler will start running out
-+ * of spare registers soon.
-+ */
-+
-+#undef READ
-+#undef WRITE
-+#define READ(img,x) (*(x))
-+#define WRITE(img,ptr,v) ((*(ptr)) = (v))
-+
-+#define UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(x, a, y) do { \
-+ UN8x4_MUL_UN8_ADD_UN8x4(x, a, y); \
-+ x = CONVERT_8888_TO_0565(x); \
-+ } while (0)
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x0565 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint16_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t d;
-+ uint32_t s1, s2;
-+ uint8_t a1, a2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+
-+ uint32_t *src;
-+ uint16_t *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+
-+ if ((y < 0) || (y >= pSrc->bits.height)) {
-+ continue;
-+ }
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ s2 = READ(pSrc, src + x2);
-+
-+ a1 = s1 >> 24;
-+ a2 = s2 >> 24;
-+
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ else if (s1) {
-+ d = CONVERT_0565_TO_0888(READ(pDst, dst));
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+
-+ if (a2 == 0xff)
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
-+ else if (s2) {
-+ d = CONVERT_0565_TO_0888(READ(pDst, dst));
-+ a2 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a2, s2);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ a1 = s1 >> 24;
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ else if (s1) {
-+ d = CONVERT_0565_TO_0888(READ(pDst, dst));
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x0565 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint16_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t d;
-+ uint32_t s1, s2;
-+ uint8_t a1, a2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+ int32_t max_vx, max_vy;
-+
-+ uint32_t *src;
-+ uint16_t *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ max_vx = pSrc->bits.width << 16;
-+ max_vy = pSrc->bits.height << 16;
-+
-+ while (orig_vx < 0) orig_vx += max_vx;
-+ while (vy < 0) vy += max_vy;
-+ while (orig_vx >= max_vx) orig_vx -= max_vx;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s2 = READ(pSrc, src + x2);
-+
-+ a1 = s1 >> 24;
-+ a2 = s2 >> 24;
-+
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ else if (s1) {
-+ d = CONVERT_0565_TO_0888(READ(pDst, dst));
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+
-+ if (a2 == 0xff)
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
-+ else if (s2) {
-+ d = CONVERT_0565_TO_0888(READ(pDst, dst));
-+ a2 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a2, s2);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ a1 = s1 >> 24;
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ else if (s1) {
-+ d = CONVERT_0565_TO_0888(READ(pDst, dst));
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4_store_r5g6b5(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x8888 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint32_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t d;
-+ uint32_t s1, s2;
-+ uint8_t a1, a2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+
-+ uint32_t *src, *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+
-+ if ((y < 0) || (y >= pSrc->bits.height)) {
-+ continue;
-+ }
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ s2 = READ(pSrc, src + x2);
-+
-+ a1 = s1 >> 24;
-+ a2 = s2 >> 24;
-+
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, s1);
-+ else if (s1) {
-+ d = READ(pDst, dst);
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+
-+ if (a2 == 0xff)
-+ WRITE(pDst, dst, s2);
-+ else if (s2) {
-+ d = READ(pDst, dst);
-+ a2 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4(d, a2, s2);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ a1 = s1 >> 24;
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, s1);
-+ else if (s1) {
-+ d = READ(pDst, dst);
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x8888 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint32_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t d;
-+ uint32_t s1, s2;
-+ uint8_t a1, a2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+ int32_t max_vx, max_vy;
-+
-+ uint32_t *src, *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ max_vx = pSrc->bits.width << 16;
-+ max_vy = pSrc->bits.height << 16;
-+
-+ while (orig_vx < 0) orig_vx += max_vx;
-+ while (vy < 0) vy += max_vy;
-+ while (orig_vx >= max_vx) orig_vx -= max_vx;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s2 = READ(pSrc, src + x2);
-+
-+ a1 = s1 >> 24;
-+ a2 = s2 >> 24;
-+
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, s1);
-+ else if (s1) {
-+ d = READ(pDst, dst);
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+
-+ if (a2 == 0xff)
-+ WRITE(pDst, dst, s2);
-+ else if (s2) {
-+ d = READ(pDst, dst);
-+ a2 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4(d, a2, s2);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ a1 = s1 >> 24;
-+ if (a1 == 0xff)
-+ WRITE(pDst, dst, s1);
-+ else if (s1) {
-+ d = READ(pDst, dst);
-+ a1 ^= 0xff;
-+ UN8x4_MUL_UN8_ADD_UN8x4(d, a1, s1);
-+ WRITE(pDst, dst, d);
-+ }
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x8888 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint32_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t s1, s2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+
-+ uint32_t *src, *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+
-+ if ((y < 0) || (y >= pSrc->bits.height)) {
-+ memset(dst, 0, width * sizeof(*dst));
-+ continue;
-+ }
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ s2 = READ(pSrc, src + x2);
-+
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ WRITE(pDst, dst, s2);
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x8888 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint32_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t s1, s2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+ int32_t max_vx, max_vy;
-+
-+ uint32_t *src, *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ max_vx = pSrc->bits.width << 16;
-+ max_vy = pSrc->bits.height << 16;
-+
-+ while (orig_vx < 0) orig_vx += max_vx;
-+ while (vy < 0) vy += max_vy;
-+ while (orig_vx >= max_vx) orig_vx -= max_vx;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s2 = READ(pSrc, src + x2);
-+
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ WRITE(pDst, dst, s2);
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_0565x0565 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint16_t *dstLine;
-+ uint16_t *srcFirstLine;
-+ uint16_t s1, s2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+
-+ uint16_t *src, *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint16_t, srcStride, srcFirstLine, 1);
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+
-+ if ((y < 0) || (y >= pSrc->bits.height)) {
-+ memset(dst, 0, width * sizeof(*dst));
-+ continue;
-+ }
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ s2 = READ(pSrc, src + x2);
-+
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ WRITE(pDst, dst, s2);
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_0565x0565 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint16_t *dstLine;
-+ uint16_t *srcFirstLine;
-+ uint16_t s1, s2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+ int32_t max_vx, max_vy;
-+
-+ uint16_t *src, *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint16_t, srcStride, srcFirstLine, 1);
-+
-+ max_vx = pSrc->bits.width << 16;
-+ max_vy = pSrc->bits.height << 16;
-+
-+ while (orig_vx < 0) orig_vx += max_vx;
-+ while (vy < 0) vy += max_vy;
-+ while (orig_vx >= max_vx) orig_vx -= max_vx;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s2 = READ(pSrc, src + x2);
-+
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ WRITE(pDst, dst, s2);
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ WRITE(pDst, dst, s1);
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x0565 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint16_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t s1, s2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+
-+ uint32_t *src;
-+ uint16_t *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+
-+ if ((y < 0) || (y >= pSrc->bits.height)) {
-+ memset(dst, 0, width * sizeof(*dst));
-+ continue;
-+ }
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ s2 = READ(pSrc, src + x2);
-+
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ dst++;
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ s1 = READ(pSrc, src + x1);
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ dst++;
-+ }
-+ }
-+}
-+
-+static void fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x0565 (
-+ pixman_image_t *pSrc, pixman_image_t *pDst, int xSrc, int ySrc, int xDst, int yDst,
-+ int width, int height, int32_t vx, int32_t vy, int32_t unit_x, int32_t unit_y)
-+{
-+ uint16_t *dstLine;
-+ uint32_t *srcFirstLine;
-+ uint32_t s1, s2;
-+ int w;
-+ int x1, x2, y;
-+ int32_t orig_vx = vx;
-+ int32_t max_vx, max_vy;
-+
-+ uint32_t *src;
-+ uint16_t *dst;
-+ int srcStride, dstStride;
-+ PIXMAN_IMAGE_GET_LINE (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be
-+ * transformed from destination space to source space */
-+ PIXMAN_IMAGE_GET_LINE (pSrc, 0, 0, uint32_t, srcStride, srcFirstLine, 1);
-+
-+ max_vx = pSrc->bits.width << 16;
-+ max_vy = pSrc->bits.height << 16;
-+
-+ while (orig_vx < 0) orig_vx += max_vx;
-+ while (vy < 0) vy += max_vy;
-+ while (orig_vx >= max_vx) orig_vx -= max_vx;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ while (--height >= 0)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+
-+ y = vy >> 16;
-+ vy += unit_y;
-+ while (vy >= max_vy) vy -= max_vy;
-+
-+ src = srcFirstLine + srcStride * y;
-+
-+ w = width;
-+ vx = orig_vx;
-+ while ((w -= 2) >= 0)
-+ {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ x2 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s2 = READ(pSrc, src + x2);
-+
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ dst++;
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s2));
-+ dst++;
-+ }
-+ if (w & 1) {
-+ x1 = vx >> 16;
-+ vx += unit_x;
-+ while (vx >= max_vx) vx -= max_vx;
-+ s1 = READ(pSrc, src + x1);
-+
-+ WRITE(pDst, dst, CONVERT_8888_TO_0565(s1));
-+ dst++;
-+ }
-+ }
-+}
-+
-+/*
-+ * Check if the clipping boundary is crossed on horizontal scaling
-+ */
-+static inline pixman_bool_t
-+fbTransformVerifyHorizontalClipping(pixman_image_t *pict, int width, int32_t vx, int32_t unit_x)
-+{
-+ while (--width >= 0) {
-+ int x = vx >> 16;
-+ if ((x < 0) || (x >= pict->bits.width)) return 1;
-+ vx += unit_x;
-+ }
-+ return 0;
-+}
-+
-+/*
-+ * Check if the clipping boundary is crossed on vertical scaling
-+ */
-+static inline pixman_bool_t
-+fbTransformVerifyVerticalClipping(pixman_image_t *pict, int height, int32_t vy, int32_t unit_y)
-+{
-+ while (--height >= 0) {
-+ int y = vy >> 16;
-+ if ((y < 0) || (y >= pict->bits.height)) return 1;
-+ vy += unit_y;
-+ }
-+ return 0;
-+}
-+
-+/*
-+ * Easy case of transform without rotation or complex clipping
-+ * Returns 1 in the case if it was able to handle this operation and 0 otherwise
-+ */
-+static pixman_bool_t
-+fbCompositeTransformNonrotatedAffineTrivialclip (
-+ pixman_op_t op,
-+ pixman_image_t *pSrc,
-+ pixman_image_t *pMask,
-+ pixman_image_t *pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ pixman_vector_t v, unit;
-+ int skipdst_x = 0, skipdst_y = 0;
-+
-+ /* Handle destination clipping */
-+ if (xDst < pDst->common.clip_region.extents.x1) {
-+ skipdst_x = pDst->common.clip_region.extents.x1 - xDst;
-+ if (skipdst_x >= (int)width)
-+ return 1;
-+ xDst = pDst->common.clip_region.extents.x1;
-+ width -= skipdst_x;
-+ }
-+
-+ if (yDst < pDst->common.clip_region.extents.y1) {
-+ skipdst_y = pDst->common.clip_region.extents.y1 - yDst;
-+ if (skipdst_y >= (int)height)
-+ return 1;
-+ yDst = pDst->common.clip_region.extents.y1;
-+ height -= skipdst_y;
-+ }
-+
-+ if (xDst >= pDst->common.clip_region.extents.x2 ||
-+ yDst >= pDst->common.clip_region.extents.y2)
-+ {
-+ return 1;
-+ }
-+
-+ if (xDst + width > pDst->common.clip_region.extents.x2)
-+ width = pDst->common.clip_region.extents.x2 - xDst;
-+ if (yDst + height > pDst->common.clip_region.extents.y2)
-+ height = pDst->common.clip_region.extents.y2 - yDst;
-+
-+ /* reference point is the center of the pixel */
-+ v.vector[0] = pixman_int_to_fixed(xSrc) + pixman_fixed_1 / 2;
-+ v.vector[1] = pixman_int_to_fixed(ySrc) + pixman_fixed_1 / 2;
-+ v.vector[2] = pixman_fixed_1;
-+
-+ if (!pixman_transform_point_3d (pSrc->common.transform, &v))
-+ return 0;
-+
-+ /* Round down to closest integer, ensuring that 0.5 rounds to 0, not 1 */
-+ v.vector[0] -= pixman_fixed_e;
-+ v.vector[1] -= pixman_fixed_e;
-+
-+ unit.vector[0] = pSrc->common.transform->matrix[0][0];
-+ unit.vector[1] = pSrc->common.transform->matrix[1][1];
-+
-+ v.vector[0] += unit.vector[0] * skipdst_x;
-+ v.vector[1] += unit.vector[1] * skipdst_y;
-+
-+ /* Check for possible fixed point arithmetics problems/overflows */
-+ if (unit.vector[0] <= 0 || unit.vector[1] <= 0)
-+ return 0;
-+ if (width == 0 || height == 0)
-+ return 0;
-+ if ((uint32_t)width + (unit.vector[0] >> 16) >= 0x7FFF)
-+ return 0;
-+ if ((uint32_t)height + (unit.vector[1] >> 16) >= 0x7FFF)
-+ return 0;
-+
-+ /* Horizontal source clipping is only supported for NORMAL repeat */
-+ if (pSrc->common.repeat != PIXMAN_REPEAT_NORMAL
-+ && fbTransformVerifyHorizontalClipping(pSrc, width, v.vector[0], unit.vector[0])) {
-+ return 0;
-+ }
-+
-+ /* Vertical source clipping is only supported for NONE and NORMAL repeat */
-+ if (pSrc->common.repeat != PIXMAN_REPEAT_NONE && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL
-+ && fbTransformVerifyVerticalClipping(pSrc, height, v.vector[1], unit.vector[1])) {
-+ return 0;
-+ }
-+
-+ if (op == PIXMAN_OP_OVER && pSrc->bits.format == PIXMAN_a8r8g8b8
-+ && (pDst->bits.format == PIXMAN_x8r8g8b8 || pDst->bits.format == PIXMAN_a8r8g8b8))
-+ {
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x8888(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x8888(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ }
-+
-+ if (op == PIXMAN_OP_SRC && (pSrc->bits.format == PIXMAN_x8r8g8b8 || pSrc->bits.format == PIXMAN_a8r8g8b8)
-+ && (pDst->bits.format == PIXMAN_x8r8g8b8 || pDst->bits.format == pSrc->bits.format))
-+ {
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x8888(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x8888(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ }
-+
-+ if (op == PIXMAN_OP_OVER && pSrc->bits.format == PIXMAN_a8r8g8b8 && pDst->bits.format == PIXMAN_r5g6b5)
-+ {
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipOver_8888x0565(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatOver_8888x0565(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ }
-+
-+ if (op == PIXMAN_OP_SRC && pSrc->bits.format == PIXMAN_r5g6b5 && pDst->bits.format == PIXMAN_r5g6b5)
-+ {
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_0565x0565(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_0565x0565(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ }
-+
-+ if (op == PIXMAN_OP_SRC && (pSrc->bits.format == PIXMAN_x8r8g8b8 || pSrc->bits.format == PIXMAN_a8r8g8b8)
-+ && pDst->bits.format == PIXMAN_r5g6b5)
-+ {
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat != PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipSrc_8888x0565(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ if (pSrc->common.filter == PIXMAN_FILTER_NEAREST && pSrc->common.repeat == PIXMAN_REPEAT_NORMAL) {
-+ fbCompositeTransformNearestNonrotatedAffineTrivialclipRepeatSrc_8888x0565(
-+ pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height,
-+ v.vector[0], v.vector[1], unit.vector[0], unit.vector[1]);
-+ return 1;
-+ }
-+ }
-+
-+ /* No fastpath scaling implemented for this case */
-+ return 0;
-+}
-+
- static void
- fast_path_composite (pixman_implementation_t *imp,
- pixman_op_t op,
-@@ -1279,6 +2266,30 @@ fast_path_composite (pixman_implementation_t *imp,
- if (src->type == BITS
- && src->common.transform
- && !mask
-+ && !src->common.alpha_map && !dest->common.alpha_map
-+ && (src->common.filter == PIXMAN_FILTER_NEAREST)
-+ && !src->bits.read_func && !src->bits.write_func
-+ && !dest->bits.read_func && !dest->bits.write_func)
-+ {
-+ /* ensure that the transform matrix only has a scale */
-+ if (src->common.transform->matrix[0][1] == 0 &&
-+ src->common.transform->matrix[1][0] == 0 &&
-+ src->common.transform->matrix[2][0] == 0 &&
-+ src->common.transform->matrix[2][1] == 0 &&
-+ src->common.transform->matrix[2][2] == pixman_fixed_1 &&
-+ dest->common.clip_region.data == NULL)
-+ {
-+ if (fbCompositeTransformNonrotatedAffineTrivialclip (op, src, mask, dest,
-+ src_x, src_y, mask_x, mask_y, dest_x, dest_y, width, height))
-+ {
-+ return;
-+ }
-+ }
-+ }
-+
-+ if (src->type == BITS
-+ && src->common.transform
-+ && !mask
- && op == PIXMAN_OP_SRC
- && !src->common.alpha_map && !dest->common.alpha_map
- && (src->common.filter == PIXMAN_FILTER_NEAREST)
diff --git a/recipes/xorg-lib/pixman/over-n-8-0565.patch b/recipes/xorg-lib/pixman/over-n-8-0565.patch
deleted file mode 100644
index 3911068..0000000
--- a/recipes/xorg-lib/pixman/over-n-8-0565.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From de2221a32d0b6628116565563f7b4ccd0a44e8b6 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 04 Mar 2010 23:20:25 +0000
-Subject: ARM: added 'armv6_composite_over_n_8_0565' fast path
-
-Provides ~3x performance improvement when working with
-data in L1 cache and memory. This fast path is important
-for fonts rendering when using 16bpp desktop.
-
-Microbenchmark from N800 (ARM11 @ 400MHz), measured in MPix/s:
-
-before:
-
- over_n_8_0565 = L1: 2.99 M: 2.86
-
-after:
-
- over_n_8_0565 = L1: 9.07 M: 8.05
----
-diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
-index 09a2888..c375c01 100644
---- a/pixman/pixman-arm-simd.c
-+++ b/pixman/pixman-arm-simd.c
-@@ -419,6 +419,193 @@ arm_composite_over_n_8_8888 (pixman_implementation_t * impl,
- }
- }
-
-+#if defined(__ARM_EABI__) && defined(__linux__)
-+/*
-+ * ARMv6 assembly optimized version of 'composite_over_n_8_0565'. It is
-+ * a bare metal 'naked' function which uses all the available CPU registers
-+ * and is compatible with ARM EABI. It might (or might not) break when used
-+ * with a different ABI, anyway it is better to be safe than sorry.
-+ */
-+static void __attribute__((naked)) armv6_composite_over_n_8_0565_asm (
-+ uint16_t *dst, uint8_t *mask, uint32_t src, int w,
-+ int dst_stride_delta, int mask_stride_delta, int h)
-+{
-+ asm volatile (
-+ ".macro composite_internal_armv6_asm opaque_flag\n"
-+ /* save all registers (8 words) to stack */
-+ "stmdb sp!, {r4-r11, ip, lr}\n"
-+ /* some register aliases for better readability */
-+ "DST .req r0\n"
-+ "MASK .req r1\n"
-+ "S .req r2\n"
-+ "W .req r3\n"
-+ "A .req r8\n"
-+ "D .req r10\n"
-+ "C0000FF .req r11\n"
-+ "C00001F .req r9\n"
-+ "C800080 .req ip\n"
-+ "CE000E0 .req lr\n"
-+ /* precalculate some stuff and put it on stack */
-+ "mov r6, #0xF8\n"
-+ "mov r7, #0xFC\n"
-+
-+ "str W, [sp, #-8]!\n"
-+
-+ ".if \\opaque_flag\n"
-+ /* precalculate and save it to stack for later use:
-+ * ((src >> 3) & 0x001F) |
-+ * ((src >> 5) & 0x07E0) |
-+ * ((src >> 8) & 0xF800)
-+ */
-+ "mov A, #0x1F\n"
-+ "and D, A, S, lsr #3\n"
-+ "and r4, S, #0xF80000\n"
-+ "and r5, S, #0xFC00\n"
-+ "orr D, r4, lsr #8\n"
-+ "orr D, r5, lsr #5\n"
-+ "str D, [sp, #4]\n"
-+ ".endif\n"
-+
-+ "ldr D, [sp, #(8 + 10*4 + 8)]\n" /* h */
-+ "ldr A, =0xFF00FF\n"
-+ "ldr C800080, =0x800080\n"
-+ "ldr CE000E0, =0xE000E0\n"
-+ "ldr C0000FF, =0xFF\n"
-+ "ldr C00001F, =0x1F\n"
-+ "and r4, A, S\n" /* r4 = src & 0x00FF00FF */
-+ "and r5, A, S, lsr #8\n" /* r5 = (src >> 8) & 0x00FF00FF */
-+ "stmdb sp!, {r4, r5, r6, r7}\n"
-+ "0:\n"
-+ "subs D, D, #1\n"
-+ "blt 6f\n"
-+ "1:\n"
-+ "subs W, W, #1\n"
-+ "blt 5f\n"
-+ "2:\n"
-+ "ldrb A, [MASK], #1\n"
-+ "ldmia sp, {r4, r5, r6, r7}\n" /* load constants from stack */
-+ "add DST, DST, #2\n"
-+ "cmp A, #0\n"
-+ "beq 1b\n"
-+
-+ ".if \\opaque_flag\n"
-+ "cmp A, #0xFF\n"
-+ "bne 3f\n"
-+ "ldr D, [sp, #(4*4 + 4)]\n" /* load precalculated value */
-+ "subs W, #1\n"
-+ "strh D, [DST, #-2]\n"
-+ "bge 2b\n"
-+ ".endif\n"
-+
-+ "3:\n"
-+ "ldrh D, [DST, #-2]\n"
-+ "mla r4, A, r4, C800080\n"
-+ "mla r5, A, r5, C800080\n"
-+ "and r6, r6, D, lsl #3\n" /* & 0xF8 */
-+ "and r7, r7, D, lsr #3\n" /* & 0xFC */
-+ "and D, D, #0xF800\n"
-+ "bic S, r4, #0xFF0000\n"
-+ "bic A, r5, #0xFF0000\n"
-+ "add r4, r4, S, lsr #8\n"
-+ "add r5, r5, A, lsr #8\n"
-+
-+ "and S, r7, #0xC0\n"
-+ "orr r6, r6, D, lsl #8\n"
-+ "and D, r6, CE000E0\n"
-+ "eor A, C0000FF, r5, lsr #24\n"
-+ "orr r6, D, lsr #5\n"
-+ "orr r7, S, lsr #6\n"
-+
-+ "mla r6, A, r6, C800080\n"
-+ "mla r7, A, r7, C800080\n"
-+ "subs W, #1\n"
-+ "bic D, r6, #0xFF0000\n"
-+ "bic A, r7, #0xFF0000\n"
-+ "add r6, r6, D, lsr #8\n"
-+ "uqadd8 r4, r4, r6\n"
-+ "add r7, r7, A, lsr #8\n"
-+ "uqadd8 r5, r5, r7\n"
-+ "and D, C00001F, r4, lsr #11\n"
-+ "and r4, r4, #0xF8000000\n"
-+ "and r5, r5, #0xFC00\n"
-+ "orr D, r4, lsr #16\n"
-+ "orr D, r5, lsr #5\n"
-+ "strh D, [DST, #-2]\n"
-+ "bge 2b\n"
-+ "5:\n"
-+ "ldr r6, [sp, #(4*4 + 8 + 10*4 + 8)]\n" /* h */
-+ "ldr r4, [sp, #(4*4 + 8 + 10*4 + 4)]\n" /* mask stride */
-+ "ldr r5, [sp, #(4*4 + 8 + 10*4 + 0)]\n" /* dst stride */
-+ "ldr W, [sp, #(4*4)]\n"
-+ "subs r6, r6, #1\n" /* h */
-+ "str r6, [sp, #(4*4 + 8 + 10*4 + 8)]\n" /* h */
-+ "add MASK, MASK, r4\n"
-+ "add DST, DST, r5, lsl #1\n"
-+ "bgt 1b\n"
-+ "6:\n"
-+ "add sp, sp, #(4*4 + 8)\n"
-+ /* restore all registers and return */
-+ "ldmia sp!, {r4-r11, ip, pc}\n"
-+ ".unreq DST\n"
-+ ".unreq MASK\n"
-+ ".unreq S\n"
-+ ".unreq W\n"
-+ ".unreq A\n"
-+ ".unreq D\n"
-+ ".unreq C0000FF\n"
-+ ".unreq C00001F\n"
-+ ".unreq C800080\n"
-+ ".unreq CE000E0\n"
-+ ".endm\n"
-+
-+ "mov ip, r2, lsr #24\n"
-+ "cmp ip, #0xFF\n"
-+ "beq 9f\n"
-+ "composite_internal_armv6_asm 0\n"
-+ "9:\n"
-+ "composite_internal_armv6_asm 1\n"
-+ ".ltorg\n"
-+ ".purgem composite_internal_armv6_asm\n"
-+ );
-+}
-+
-+static void
-+armv6_composite_over_n_8_0565 (pixman_implementation_t * impl,
-+ pixman_op_t op,
-+ pixman_image_t * src_image,
-+ pixman_image_t * mask_image,
-+ pixman_image_t * dst_image,
-+ int32_t src_x,
-+ int32_t src_y,
-+ int32_t mask_x,
-+ int32_t mask_y,
-+ int32_t dest_x,
-+ int32_t dest_y,
-+ int32_t width,
-+ int32_t height)
-+{
-+ uint32_t src;
-+ uint16_t *dst;
-+ uint8_t *mask;
-+ int dst_stride, mask_stride;
-+
-+ src = _pixman_image_get_solid (src_image, dst_image->bits.format);
-+
-+ /* bail out if fully transparent */
-+ if (src == 0)
-+ return;
-+
-+ PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t,
-+ dst_stride, dst, 1);
-+ PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t,
-+ mask_stride, mask, 1);
-+
-+ armv6_composite_over_n_8_0565_asm (dst, mask, src, width,
-+ dst_stride - width, mask_stride - width, height);
-+}
-+
-+#endif
-+
- static const pixman_fast_path_t arm_simd_fast_paths[] =
- {
- PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, a8r8g8b8, arm_composite_over_8888_8888),
-@@ -434,7 +621,10 @@ static const pixman_fast_path_t arm_simd_fast_paths[] =
- PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8r8g8b8, arm_composite_over_n_8_8888),
- PIXMAN_STD_FAST_PATH (OVER, solid, a8, a8b8g8r8, arm_composite_over_n_8_8888),
- PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8b8g8r8, arm_composite_over_n_8_8888),
--
-+#if defined(__ARM_EABI__) && defined(__linux__)
-+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, r5g6b5, armv6_composite_over_n_8_0565),
-+ PIXMAN_STD_FAST_PATH (OVER, solid, a8, b5g6r5, armv6_composite_over_n_8_0565),
-+#endif
- { PIXMAN_OP_NONE },
- };
-
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman/pixman-0.13.2-neon1.patch b/recipes/xorg-lib/pixman/pixman-0.13.2-neon1.patch
deleted file mode 100644
index b3bb762..0000000
--- a/recipes/xorg-lib/pixman/pixman-0.13.2-neon1.patch
+++ /dev/null
@@ -1,1702 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 063f6eb..bada55c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -278,11 +278,12 @@ AC_SUBST(VMX_CFLAGS)
- AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
-
- dnl Check for ARM SIMD instructions
-+ARM_SIMD_CFLAGS=""
-
- have_arm_simd=no
- AC_MSG_CHECKING(whether to use ARM SIMD assembler)
- xserver_save_CFLAGS=$CFLAGS
--CFLAGS="$CFLAGS $ARM_CFLAGS"
-+CFLAGS="$CFLAGS $ARM_SIMD_CFLAGS"
- AC_COMPILE_IFELSE([
- int main () {
- asm("uqadd8 r1, r1, r2");
-@@ -302,7 +303,7 @@ fi
- if test $have_arm_simd = yes ; then
- AC_DEFINE(USE_ARM_SIMD, 1, [use ARM SIMD compiler intrinsics])
- else
-- ARM_CFLAGS=
-+ ARM_SIMD_CFLAGS=
- fi
-
- AC_MSG_RESULT($have_arm_simd)
-@@ -310,9 +311,48 @@ if test $enable_arm_simd = yes && test $have_arm_simd = no ; then
- AC_MSG_ERROR([ARM SIMD intrinsics not detected])
- fi
-
--AC_SUBST(ARM_CFLAGS)
-+dnl Check for ARM NEON instructions
-+ARM_NEON_CFLAGS="-mcpu=cortex-a8 -mfpu=neon"
-+
-+have_arm_neon=no
-+AC_MSG_CHECKING(whether to use ARM NEON)
-+xserver_save_CFLAGS=$CFLAGS
-+CFLAGS="$CFLAGS $ARM_NEON_CFLAGS"
-+AC_COMPILE_IFELSE([
-+#include <arm_neon.h>
-+int main () {
-+ uint8x8_t neon_test=vmov_n_u8(0);
-+ return 0;
-+}], have_arm_neon=yes)
-+CFLAGS=$xserver_save_CFLAGS
-+
-+AC_ARG_ENABLE(arm-neon,
-+ [AC_HELP_STRING([--disable-arm-neon],
-+ [disable ARM NEON fast paths])],
-+ [enable_arm_neon=$enableval], [enable_arm_neon=auto])
-+
-+if test $enable_arm_neon = no ; then
-+ have_arm_neon=disabled
-+fi
-+
-+if test $have_arm_neon = yes ; then
-+ AC_DEFINE(USE_ARM_NEON, 1, [use ARM NEON compiler intrinsics])
-+else
-+ ARM_NEON_CFLAGS=
-+fi
-+
-+AC_MSG_RESULT($have_arm_neon)
-+if test $enable_arm_neon = yes && test $have_arm_neon = no ; then
-+ AC_MSG_ERROR([ARM NEON intrinsics not detected])
-+fi
-+
-+
-+AC_SUBST(ARM_SIMD_CFLAGS)
-+AC_SUBST(ARM_NEON_CFLAGS)
-
- AM_CONDITIONAL(USE_ARM_SIMD, test $have_arm_simd = yes)
-+AM_CONDITIONAL(USE_ARM_NEON, test $have_arm_neon = yes)
-+
-
-
- AC_ARG_ENABLE(gtk,
-diff --git a/pixman/Makefile.am b/pixman/Makefile.am
-index c4612ea..4c1ec6b 100644
---- a/pixman/Makefile.am
-+++ b/pixman/Makefile.am
-@@ -80,15 +80,26 @@ libpixman_sse2_la_LIBADD = $(DEP_LIBS)
- libpixman_1_la_LIBADD += libpixman-sse2.la
- endif
-
--# arm code
-+# arm simd code
- if USE_ARM_SIMD
- noinst_LTLIBRARIES += libpixman-arm-simd.la
- libpixman_arm_simd_la_SOURCES = \
- pixman-arm-simd.c \
- pixman-arm-simd.h
--libpixman_arm_simd_la_CFLAGS = $(DEP_CFLAGS) $(ARM_CFLAGS)
-+libpixman_arm_simd_la_CFLAGS = $(DEP_CFLAGS) $(ARM_SIMD_CFLAGS)
- libpixman_arm_simd_la_LIBADD = $(DEP_LIBS)
- libpixman_1_la_LIBADD += libpixman-arm-simd.la
- endif
-
-+# arm neon code
-+if USE_ARM_NEON
-+noinst_LTLIBRARIES += libpixman-arm-neon.la
-+libpixman_arm_neon_la_SOURCES = \
-+ pixman-arm-neon.c \
-+ pixman-arm-neon.h
-+libpixman_arm_neon_la_CFLAGS = $(DEP_CFLAGS) $(ARM_NEON_CFLAGS)
-+libpixman_arm_neon_la_LIBADD = $(DEP_LIBS)
-+libpixman_1_la_LIBADD += libpixman-arm-neon.la
-+endif
-+
-
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-new file mode 100644
-index 0000000..10050e4
---- /dev/null
-+++ b/pixman/pixman-arm-neon.c
-@@ -0,0 +1,1387 @@
-+/*
-+ * Copyright © 2009 Mozilla Corporation
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Mozilla Corporation not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Mozilla Corporation makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ *
-+ * Author: Ian Rickards (ian.rickards@arm.com)
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include "pixman-arm-neon.h"
-+
-+#include <arm_neon.h>
-+
-+
-+#if !defined(__ARMCC_VERSION) && !defined(FORCE_NO_NEON_INLINE_ASM)
-+// [both armcc & gcc set __GNUC__]
-+// Use GNU style inline asm on gcc, for best performance
-+// Use intrinsics on armcc
-+// This switch determines if any GNU style inline asm is allowed
-+#define USE_NEON_INLINE_ASM
-+#endif
-+
-+
-+static force_inline uint8x8x4_t unpack0565(uint16x8_t rgb)
-+{
-+ uint16x8_t gb, b;
-+ uint8x8x4_t res;
-+
-+ res.val[3] = vdup_n_u8(0);
-+ gb = vshrq_n_u16(rgb, 5);
-+ b = vshrq_n_u16(rgb, 5+6);
-+ res.val[0] = vmovn_u16(rgb); // get low 5 bits
-+ res.val[1] = vmovn_u16(gb); // get mid 6 bits
-+ res.val[2] = vmovn_u16(b); // get top 5 bits
-+
-+ res.val[0] = vshl_n_u8(res.val[0], 3); // shift to top
-+ res.val[1] = vshl_n_u8(res.val[1], 2); // shift to top
-+ res.val[2] = vshl_n_u8(res.val[2], 3); // shift to top
-+
-+ res.val[0] = vsri_n_u8(res.val[0], res.val[0], 5);
-+ res.val[1] = vsri_n_u8(res.val[1], res.val[1], 6);
-+ res.val[2] = vsri_n_u8(res.val[2], res.val[2], 5);
-+
-+ return res;
-+}
-+
-+static force_inline uint16x8_t pack0565(uint8x8x4_t s)
-+{
-+ uint16x8_t rgb, val_g, val_r;
-+
-+ rgb = vshll_n_u8(s.val[2],8);
-+ val_g = vshll_n_u8(s.val[1],8);
-+ val_r = vshll_n_u8(s.val[0],8);
-+ rgb = vsriq_n_u16(rgb, val_g, 5);
-+ rgb = vsriq_n_u16(rgb, val_r, 5+6);
-+
-+ return rgb;
-+}
-+
-+static force_inline uint8x8_t neon2mul(uint8x8_t x, uint8x8_t alpha)
-+{
-+ uint16x8_t tmp,tmp2;
-+ uint8x8_t res;
-+
-+ tmp = vmull_u8(x,alpha);
-+ tmp2 = vrshrq_n_u16(tmp,8);
-+ res = vraddhn_u16(tmp,tmp2);
-+
-+ return res;
-+}
-+
-+static force_inline uint8x8x4_t neon8mul(uint8x8x4_t x, uint8x8_t alpha)
-+{
-+ uint16x8x4_t tmp;
-+ uint8x8x4_t res;
-+ uint16x8_t qtmp1,qtmp2;
-+
-+ tmp.val[0] = vmull_u8(x.val[0],alpha);
-+ tmp.val[1] = vmull_u8(x.val[1],alpha);
-+ tmp.val[2] = vmull_u8(x.val[2],alpha);
-+ tmp.val[3] = vmull_u8(x.val[3],alpha);
-+
-+ qtmp1 = vrshrq_n_u16(tmp.val[0],8);
-+ qtmp2 = vrshrq_n_u16(tmp.val[1],8);
-+ res.val[0] = vraddhn_u16(tmp.val[0],qtmp1);
-+ qtmp1 = vrshrq_n_u16(tmp.val[2],8);
-+ res.val[1] = vraddhn_u16(tmp.val[1],qtmp2);
-+ qtmp2 = vrshrq_n_u16(tmp.val[3],8);
-+ res.val[2] = vraddhn_u16(tmp.val[2],qtmp1);
-+ res.val[3] = vraddhn_u16(tmp.val[3],qtmp2);
-+
-+ return res;
-+}
-+
-+static force_inline uint8x8x4_t neon8qadd(uint8x8x4_t x, uint8x8x4_t y)
-+{
-+ uint8x8x4_t res;
-+
-+ res.val[0] = vqadd_u8(x.val[0],y.val[0]);
-+ res.val[1] = vqadd_u8(x.val[1],y.val[1]);
-+ res.val[2] = vqadd_u8(x.val[2],y.val[2]);
-+ res.val[3] = vqadd_u8(x.val[3],y.val[3]);
-+
-+ return res;
-+}
-+
-+
-+void
-+fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint8_t *dstLine, *dst;
-+ uint8_t *srcLine, *src;
-+ int dstStride, srcStride;
-+ uint16_t w;
-+
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1);
-+ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
-+
-+ if (width>=8)
-+ {
-+ // Use overlapping 8-pixel method
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ uint8_t *keep_dst;
-+
-+#ifndef USE_NEON_INLINE_ASM
-+ uint8x8_t sval,dval,temp;
-+
-+ sval = vld1_u8((void*)src);
-+ dval = vld1_u8((void*)dst);
-+ keep_dst = dst;
-+
-+ temp = vqadd_u8(dval,sval);
-+
-+ src += (w & 7);
-+ dst += (w & 7);
-+ w -= (w & 7);
-+
-+ while (w)
-+ {
-+ sval = vld1_u8((void*)src);
-+ dval = vld1_u8((void*)dst);
-+
-+ vst1_u8((void*)keep_dst,temp);
-+ keep_dst = dst;
-+
-+ temp = vqadd_u8(dval,sval);
-+
-+ src+=8;
-+ dst+=8;
-+ w-=8;
-+ }
-+ vst1_u8((void*)keep_dst,temp);
-+#else
-+ asm volatile (
-+// avoid using d8-d15 (q4-q7) aapcs callee-save registers
-+ "vld1.8 {d0}, [%[src]]\n\t"
-+ "vld1.8 {d4}, [%[dst]]\n\t"
-+ "mov %[keep_dst], %[dst]\n\t"
-+
-+ "and ip, %[w], #7\n\t"
-+ "add %[src], %[src], ip\n\t"
-+ "add %[dst], %[dst], ip\n\t"
-+ "subs %[w], %[w], ip\n\t"
-+ "b 9f\n\t"
-+// LOOP
-+ "2:\n\t"
-+ "vld1.8 {d0}, [%[src]]!\n\t"
-+ "vld1.8 {d4}, [%[dst]]!\n\t"
-+ "vst1.8 {d20}, [%[keep_dst]]\n\t"
-+ "sub %[keep_dst], %[dst], #8\n\t"
-+ "subs %[w], %[w], #8\n\t"
-+ "9:\n\t"
-+ "vqadd.u8 d20, d0, d4\n\t"
-+
-+ "bne 2b\n\t"
-+
-+ "1:\n\t"
-+ "vst1.8 {d20}, [%[keep_dst]]\n\t"
-+
-+ : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
-+ :
-+ : "ip", "cc", "memory", "d0","d4",
-+ "d20"
-+ );
-+#endif
-+ }
-+ }
-+ else
-+ {
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+ uint8x8_t sval, dval;
-+ uint8_t *dst4, *dst2;
-+
-+ if (w&4)
-+ {
-+ sval = vreinterpret_u8_u32(vld1_lane_u32((void*)src,vreinterpret_u32_u8(sval),1));
-+ dval = vreinterpret_u8_u32(vld1_lane_u32((void*)dst,vreinterpret_u32_u8(dval),1));
-+ dst4=dst;
-+ src+=4;
-+ dst+=4;
-+ }
-+ if (w&2)
-+ {
-+ sval = vreinterpret_u8_u16(vld1_lane_u16((void*)src,vreinterpret_u16_u8(sval),1));
-+ dval = vreinterpret_u8_u16(vld1_lane_u16((void*)dst,vreinterpret_u16_u8(dval),1));
-+ dst2=dst;
-+ src+=2;
-+ dst+=2;
-+ }
-+ if (w&1)
-+ {
-+ sval = vld1_lane_u8((void*)src,sval,1);
-+ dval = vld1_lane_u8((void*)dst,dval,1);
-+ }
-+
-+ dval = vqadd_u8(dval,sval);
-+
-+ if (w&1)
-+ vst1_lane_u8((void*)dst,dval,1);
-+ if (w&2)
-+ vst1_lane_u16((void*)dst2,vreinterpret_u16_u8(dval),1);
-+ if (w&4)
-+ vst1_lane_u32((void*)dst4,vreinterpret_u32_u8(dval),1);
-+ }
-+ }
-+}
-+
-+
-+void
-+fbCompositeSrc_8888x8888neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t *dstLine, *dst;
-+ uint32_t *srcLine, *src;
-+ int dstStride, srcStride;
-+ uint32_t w;
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
-+
-+ if (width>=8)
-+ {
-+ // Use overlapping 8-pixel method
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ uint32_t *keep_dst;
-+
-+#ifndef USE_NEON_INLINE_ASM
-+ uint8x8x4_t sval,dval,temp;
-+
-+ sval = vld4_u8((void*)src);
-+ dval = vld4_u8((void*)dst);
-+ keep_dst = dst;
-+
-+ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
-+ temp = neon8qadd(sval,temp);
-+
-+ src += (w & 7);
-+ dst += (w & 7);
-+ w -= (w & 7);
-+
-+ while (w)
-+ {
-+ sval = vld4_u8((void*)src);
-+ dval = vld4_u8((void*)dst);
-+
-+ vst4_u8((void*)keep_dst,temp);
-+ keep_dst = dst;
-+
-+ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
-+ temp = neon8qadd(sval,temp);
-+
-+ src+=8;
-+ dst+=8;
-+ w-=8;
-+ }
-+ vst4_u8((void*)keep_dst,temp);
-+#else
-+ asm volatile (
-+// avoid using d8-d15 (q4-q7) aapcs callee-save registers
-+ "vld4.8 {d0-d3}, [%[src]]\n\t"
-+ "vld4.8 {d4-d7}, [%[dst]]\n\t"
-+ "mov %[keep_dst], %[dst]\n\t"
-+
-+ "and ip, %[w], #7\n\t"
-+ "add %[src], %[src], ip, LSL#2\n\t"
-+ "add %[dst], %[dst], ip, LSL#2\n\t"
-+ "subs %[w], %[w], ip\n\t"
-+ "b 9f\n\t"
-+// LOOP
-+ "2:\n\t"
-+ "vld4.8 {d0-d3}, [%[src]]!\n\t"
-+ "vld4.8 {d4-d7}, [%[dst]]!\n\t"
-+ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
-+ "sub %[keep_dst], %[dst], #8*4\n\t"
-+ "subs %[w], %[w], #8\n\t"
-+ "9:\n\t"
-+ "vmvn.8 d31, d3\n\t"
-+ "vmull.u8 q10, d31, d4\n\t"
-+ "vmull.u8 q11, d31, d5\n\t"
-+ "vmull.u8 q12, d31, d6\n\t"
-+ "vmull.u8 q13, d31, d7\n\t"
-+ "vrshr.u16 q8, q10, #8\n\t"
-+ "vrshr.u16 q9, q11, #8\n\t"
-+ "vraddhn.u16 d20, q10, q8\n\t"
-+ "vraddhn.u16 d21, q11, q9\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vraddhn.u16 d22, q12, q8\n\t"
-+ "vraddhn.u16 d23, q13, q9\n\t"
-+// result in d20-d23
-+ "vqadd.u8 d20, d0, d20\n\t"
-+ "vqadd.u8 d21, d1, d21\n\t"
-+ "vqadd.u8 d22, d2, d22\n\t"
-+ "vqadd.u8 d23, d3, d23\n\t"
-+
-+ "bne 2b\n\t"
-+
-+ "1:\n\t"
-+ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
-+
-+ : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
-+ :
-+ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
-+ "d16","d17","d18","d19","d20","d21","d22","d23"
-+ );
-+#endif
-+ }
-+ }
-+ else
-+ {
-+ uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL));
-+
-+ // Handle width<8
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ while (w>=2)
-+ {
-+ uint8x8_t sval,dval;
-+
-+ /* two 32-bit pixels packed into D-reg; ad-hoc vectorization */
-+ sval = vreinterpret_u8_u32(vld1_u32((void*)src));
-+ dval = vreinterpret_u8_u32(vld1_u32((void*)dst));
-+ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval),alpha_selector));
-+ vst1_u8((void*)dst,vqadd_u8(sval,dval));
-+
-+ src+=2;
-+ dst+=2;
-+ w-=2;
-+ }
-+
-+ if (w)
-+ {
-+ uint8x8_t sval,dval;
-+
-+ /* single 32-bit pixel in lane 0 */
-+ sval = vreinterpret_u8_u32(vld1_dup_u32((void*)src)); // only interested in lane 0
-+ dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst)); // only interested in lane 0
-+ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval),alpha_selector));
-+ vst1_lane_u32((void*)dst,vreinterpret_u32_u8(vqadd_u8(sval,dval)),0);
-+ }
-+ }
-+ }
-+}
-+
-+
-+
-+void
-+fbCompositeSrc_x888x0565neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint16_t *dstLine, *dst;
-+ uint32_t *srcLine, *src;
-+ int dstStride, srcStride;
-+ uint32_t w;
-+
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
-+ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+
-+ if (width>=8)
-+ {
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ do {
-+ while (w>=8)
-+ {
-+#ifndef USE_NEON_INLINE_ASM
-+ vst1q_u16(dst, pack0565(vld4_u8((void*)src)));
-+#else
-+ asm volatile (
-+ "vld4.8 {d4-d7}, [%[src]]\n\t"
-+ "vshll.u8 q0, d6, #8\n\t"
-+ "vshll.u8 q1, d5, #8\n\t"
-+ "vsriq.u16 q0, q1, #5\t\n"
-+ "vshll.u8 q1, d4, #8\n\t"
-+ "vsriq.u16 q0, q1, #11\t\n"
-+ "vst1.16 {q0}, [%[dst]]\n\t"
-+ :
-+ : [dst] "r" (dst), [src] "r" (src)
-+ : "memory", "d0","d1","d2","d3","d4","d5","d6","d7"
-+ );
-+#endif
-+ src+=8;
-+ dst+=8;
-+ w-=8;
-+ }
-+ if (w != 0)
-+ {
-+ src -= (8-w);
-+ dst -= (8-w);
-+ w = 8; // do another vector
-+ }
-+ } while (w!=0);
-+ }
-+ }
-+ else
-+ {
-+ // Handle width<8
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ while (w>=2)
-+ {
-+ uint32x2_t sval, rgb, g, b;
-+ sval = vld1_u32(src);
-+ rgb = vshr_n_u32(sval,8-5); // r (5 bits)
-+ g = vshr_n_u32(sval,8+8-6); // g to bottom byte
-+ rgb = vsli_n_u32(rgb, g, 5);
-+ b = vshr_n_u32(sval,8+8+8-5); // b to bottom byte
-+ rgb = vsli_n_u32(rgb, b, 11);
-+ vst1_lane_u16(dst++,vreinterpret_u16_u32(rgb),0);
-+ vst1_lane_u16(dst++,vreinterpret_u16_u32(rgb),2);
-+ src+=2;
-+ w-=2;
-+ }
-+ if (w)
-+ {
-+ uint32x2_t sval, rgb, g, b;
-+ sval = vld1_dup_u32(src);
-+ rgb = vshr_n_u32(sval,8-5); // r (5 bits)
-+ g = vshr_n_u32(sval,8+8-6); // g to bottom byte
-+ rgb = vsli_n_u32(rgb, g, 5);
-+ b = vshr_n_u32(sval,8+8+8-5); // b to bottom byte
-+ rgb = vsli_n_u32(rgb, b, 11);
-+ vst1_lane_u16(dst++,vreinterpret_u16_u32(rgb),0);
-+ }
-+ }
-+ }
-+}
-+
-+
-+void
-+fbCompositeSrc_8888x8x8888neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t *dstLine, *dst;
-+ uint32_t *srcLine, *src;
-+ uint32_t mask;
-+ int dstStride, srcStride;
-+ uint32_t w;
-+ uint8x8_t mask_alpha;
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
-+
-+ fbComposeGetSolid (pMask, mask, pDst->bits.format);
-+ mask_alpha = vdup_n_u8((mask) >> 24);
-+
-+ if (width>=8)
-+ {
-+ // Use overlapping 8-pixel method
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ uint32_t *keep_dst;
-+
-+#ifndef USE_NEON_INLINE_ASM
-+ uint8x8x4_t sval,dval,temp;
-+
-+ sval = vld4_u8((void*)src);
-+ dval = vld4_u8((void*)dst);
-+ keep_dst = dst;
-+
-+ sval = neon8mul(sval,mask_alpha);
-+ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
-+ temp = neon8qadd(sval,temp);
-+
-+ src += (w & 7);
-+ dst += (w & 7);
-+ w -= (w & 7);
-+
-+ while (w)
-+ {
-+ sval = vld4_u8((void*)src);
-+ dval = vld4_u8((void*)dst);
-+
-+ vst4_u8((void*)keep_dst,temp);
-+ keep_dst = dst;
-+
-+ sval = neon8mul(sval,mask_alpha);
-+ temp = neon8mul(dval,vmvn_u8(sval.val[3]));
-+ temp = neon8qadd(sval,temp);
-+
-+ src+=8;
-+ dst+=8;
-+ w-=8;
-+ }
-+ vst4_u8((void*)keep_dst,temp);
-+#else
-+ asm volatile (
-+// avoid using d8-d15 (q4-q7) aapcs callee-save registers
-+ "vdup.32 d30, %[mask]\n\t"
-+ "vdup.8 d30, d30[3]\n\t"
-+
-+ "vld4.8 {d0-d3}, [%[src]]\n\t"
-+ "vld4.8 {d4-d7}, [%[dst]]\n\t"
-+ "mov %[keep_dst], %[dst]\n\t"
-+
-+ "and ip, %[w], #7\n\t"
-+ "add %[src], %[src], ip, LSL#2\n\t"
-+ "add %[dst], %[dst], ip, LSL#2\n\t"
-+ "subs %[w], %[w], ip\n\t"
-+ "b 9f\n\t"
-+// LOOP
-+ "2:\n\t"
-+ "vld4.8 {d0-d3}, [%[src]]!\n\t"
-+ "vld4.8 {d4-d7}, [%[dst]]!\n\t"
-+ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
-+ "sub %[keep_dst], %[dst], #8*4\n\t"
-+ "subs %[w], %[w], #8\n\t"
-+
-+ "9:\n\t"
-+ "vmull.u8 q10, d30, d0\n\t"
-+ "vmull.u8 q11, d30, d1\n\t"
-+ "vmull.u8 q12, d30, d2\n\t"
-+ "vmull.u8 q13, d30, d3\n\t"
-+ "vrshr.u16 q8, q10, #8\n\t"
-+ "vrshr.u16 q9, q11, #8\n\t"
-+ "vraddhn.u16 d0, q10, q8\n\t"
-+ "vraddhn.u16 d1, q11, q9\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d3, q13, q9\n\t"
-+ "vraddhn.u16 d2, q12, q8\n\t"
-+
-+ "vmvn.8 d31, d3\n\t"
-+ "vmull.u8 q10, d31, d4\n\t"
-+ "vmull.u8 q11, d31, d5\n\t"
-+ "vmull.u8 q12, d31, d6\n\t"
-+ "vmull.u8 q13, d31, d7\n\t"
-+ "vrshr.u16 q8, q10, #8\n\t"
-+ "vrshr.u16 q9, q11, #8\n\t"
-+ "vraddhn.u16 d20, q10, q8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d21, q11, q9\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vraddhn.u16 d22, q12, q8\n\t"
-+ "vraddhn.u16 d23, q13, q9\n\t"
-+// result in d20-d23
-+ "vqadd.u8 d20, d0, d20\n\t"
-+ "vqadd.u8 d21, d1, d21\n\t"
-+ "vqadd.u8 d22, d2, d22\n\t"
-+ "vqadd.u8 d23, d3, d23\n\t"
-+
-+ "bne 2b\n\t"
-+
-+ "1:\n\t"
-+ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
-+
-+ : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
-+ : [mask] "r" (mask)
-+ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
-+ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27",
-+ "d30","d31"
-+ );
-+#endif
-+ }
-+ }
-+ else
-+ {
-+ uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL));
-+
-+ // Handle width<8
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ while (w>=2)
-+ {
-+ uint8x8_t sval,dval;
-+
-+ sval = vreinterpret_u8_u32(vld1_u32((void*)src));
-+ dval = vreinterpret_u8_u32(vld1_u32((void*)dst));
-+
-+ /* sval * const alpha_mul */
-+ sval = neon2mul(sval,mask_alpha);
-+
-+ /* dval * 255-(src alpha) */
-+ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval), alpha_selector));
-+
-+ vst1_u8((void*)dst,vqadd_u8(sval,dval));
-+
-+ src+=2;
-+ dst+=2;
-+ w-=2;
-+ }
-+
-+ if (w)
-+ {
-+ uint8x8_t sval,dval;
-+
-+ sval = vreinterpret_u8_u32(vld1_dup_u32((void*)src));
-+ dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst));
-+
-+ /* sval * const alpha_mul */
-+ sval = neon2mul(sval,mask_alpha);
-+
-+ /* dval * 255-(src alpha) */
-+ dval = neon2mul(dval,vtbl1_u8(vmvn_u8(sval), alpha_selector));
-+
-+ vst1_lane_u32((void*)dst,vreinterpret_u32_u8(vqadd_u8(sval,dval)),0);
-+ }
-+ }
-+ }
-+}
-+
-+
-+
-+void
-+fbCompositeSolidMask_nx8x0565neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t src, srca;
-+ uint16_t *dstLine, *dst;
-+ uint8_t *maskLine, *mask;
-+ int dstStride, maskStride;
-+ uint32_t w;
-+ uint8x8_t sval2;
-+ uint8x8x4_t sval8;
-+
-+ fbComposeGetSolid(pSrc, src, pDst->bits.format);
-+
-+ srca = src >> 24;
-+ if (src == 0)
-+ return;
-+
-+ sval2=vreinterpret_u8_u32(vdup_n_u32(src));
-+ sval8.val[0]=vdup_lane_u8(sval2,0);
-+ sval8.val[1]=vdup_lane_u8(sval2,1);
-+ sval8.val[2]=vdup_lane_u8(sval2,2);
-+ sval8.val[3]=vdup_lane_u8(sval2,3);
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
-+
-+ if (width>=8)
-+ {
-+ // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
-+ while (height--)
-+ {
-+ uint16_t *keep_dst;
-+
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+#ifndef USE_NEON_INLINE_ASM
-+ uint8x8_t alpha;
-+ uint16x8_t dval, temp;
-+ uint8x8x4_t sval8temp;
-+
-+ alpha = vld1_u8((void*)mask);
-+ dval = vld1q_u16((void*)dst);
-+ keep_dst = dst;
-+
-+ sval8temp = neon8mul(sval8,alpha);
-+ temp = pack0565(neon8qadd(sval8temp,neon8mul(unpack0565(dval),vmvn_u8(sval8temp.val[3]))));
-+
-+ mask += (w & 7);
-+ dst += (w & 7);
-+ w -= (w & 7);
-+
-+ while (w)
-+ {
-+ dval = vld1q_u16((void*)dst);
-+ alpha = vld1_u8((void*)mask);
-+
-+ vst1q_u16((void*)keep_dst,temp);
-+ keep_dst = dst;
-+
-+ sval8temp = neon8mul(sval8,alpha);
-+ temp = pack0565(neon8qadd(sval8temp,neon8mul(unpack0565(dval),vmvn_u8(sval8temp.val[3]))));
-+
-+ mask+=8;
-+ dst+=8;
-+ w-=8;
-+ }
-+ vst1q_u16((void*)keep_dst,temp);
-+#else
-+ asm volatile (
-+ "vdup.32 d0, %[src]\n\t"
-+ "vdup.8 d1, d0[1]\n\t"
-+ "vdup.8 d2, d0[2]\n\t"
-+ "vdup.8 d3, d0[3]\n\t"
-+ "vdup.8 d0, d0[0]\n\t"
-+
-+ "vld1.8 {q12}, [%[dst]]\n\t"
-+ "vld1.8 {d31}, [%[mask]]\n\t"
-+ "mov %[keep_dst], %[dst]\n\t"
-+
-+ "and ip, %[w], #7\n\t"
-+ "add %[mask], %[mask], ip\n\t"
-+ "add %[dst], %[dst], ip, LSL#1\n\t"
-+ "subs %[w], %[w], ip\n\t"
-+ "b 9f\n\t"
-+// LOOP
-+ "2:\n\t"
-+
-+ "vld1.16 {q12}, [%[dst]]!\n\t"
-+ "vld1.8 {d31}, [%[mask]]!\n\t"
-+ "vst1.16 {q10}, [%[keep_dst]]\n\t"
-+ "sub %[keep_dst], %[dst], #8*2\n\t"
-+ "subs %[w], %[w], #8\n\t"
-+ "9:\n\t"
-+// expand 0565 q12 to 8888 {d4-d7}
-+ "vmovn.u16 d4, q12\t\n"
-+ "vshr.u16 q11, q12, #5\t\n"
-+ "vshr.u16 q10, q12, #6+5\t\n"
-+ "vmovn.u16 d5, q11\t\n"
-+ "vmovn.u16 d6, q10\t\n"
-+ "vshl.u8 d4, d4, #3\t\n"
-+ "vshl.u8 d5, d5, #2\t\n"
-+ "vshl.u8 d6, d6, #3\t\n"
-+ "vsri.u8 d4, d4, #5\t\n"
-+ "vsri.u8 d5, d5, #6\t\n"
-+ "vsri.u8 d6, d6, #5\t\n"
-+
-+ "vmull.u8 q10, d31, d0\n\t"
-+ "vmull.u8 q11, d31, d1\n\t"
-+ "vmull.u8 q12, d31, d2\n\t"
-+ "vmull.u8 q13, d31, d3\n\t"
-+ "vrshr.u16 q8, q10, #8\n\t"
-+ "vrshr.u16 q9, q11, #8\n\t"
-+ "vraddhn.u16 d20, q10, q8\n\t"
-+ "vraddhn.u16 d21, q11, q9\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d23, q13, q9\n\t"
-+ "vraddhn.u16 d22, q12, q8\n\t"
-+
-+// duplicate in 4/2/1 & 8pix vsns
-+ "vmvn.8 d30, d23\n\t"
-+ "vmull.u8 q14, d30, d6\n\t"
-+ "vmull.u8 q13, d30, d5\n\t"
-+ "vmull.u8 q12, d30, d4\n\t"
-+ "vrshr.u16 q8, q14, #8\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vraddhn.u16 d6, q14, q8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d5, q13, q9\n\t"
-+ "vqadd.u8 d6, d6, d22\n\t" // moved up
-+ "vraddhn.u16 d4, q12, q8\n\t"
-+// intentionally don't calculate alpha
-+// result in d4-d6
-+
-+// "vqadd.u8 d6, d6, d22\n\t" ** moved up
-+ "vqadd.u8 d5, d5, d21\n\t"
-+ "vqadd.u8 d4, d4, d20\n\t"
-+
-+// pack 8888 {d20-d23} to 0565 q10
-+ "vshll.u8 q10, d6, #8\n\t"
-+ "vshll.u8 q3, d5, #8\n\t"
-+ "vshll.u8 q2, d4, #8\n\t"
-+ "vsri.u16 q10, q3, #5\t\n"
-+ "vsri.u16 q10, q2, #11\t\n"
-+
-+ "bne 2b\n\t"
-+
-+ "1:\n\t"
-+ "vst1.16 {q10}, [%[keep_dst]]\n\t"
-+
-+ : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [keep_dst] "+r" (keep_dst)
-+ : [src] "r" (src)
-+ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
-+ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
-+ "d30","d31"
-+ );
-+#endif
-+ }
-+ }
-+ else
-+ {
-+ while (height--)
-+ {
-+ void *dst4, *dst2;
-+
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+
-+#ifndef USE_NEON_INLINE_ASM
-+ uint8x8_t alpha;
-+ uint16x8_t dval, temp;
-+ uint8x8x4_t sval8temp;
-+
-+ if (w&4)
-+ {
-+ alpha = vreinterpret_u8_u32(vld1_lane_u32((void*)mask,vreinterpret_u32_u8(alpha),1));
-+ dval = vreinterpretq_u16_u64(vld1q_lane_u64((void*)dst,vreinterpretq_u64_u16(dval),1));
-+ dst4=dst;
-+ mask+=4;
-+ dst+=4;
-+ }
-+ if (w&2)
-+ {
-+ alpha = vreinterpret_u8_u16(vld1_lane_u16((void*)mask,vreinterpret_u16_u8(alpha),1));
-+ dval = vreinterpretq_u16_u32(vld1q_lane_u32((void*)dst,vreinterpretq_u32_u16(dval),1));
-+ dst2=dst;
-+ mask+=2;
-+ dst+=2;
-+ }
-+ if (w&1)
-+ {
-+ alpha = vld1_lane_u8((void*)mask,alpha,1);
-+ dval = vld1q_lane_u16((void*)dst,dval,1);
-+ }
-+
-+ sval8temp = neon8mul(sval8,alpha);
-+ temp = pack0565(neon8qadd(sval8temp,neon8mul(unpack0565(dval),vmvn_u8(sval8temp.val[3]))));
-+
-+ if (w&1)
-+ vst1q_lane_u16((void*)dst,temp,1);
-+ if (w&2)
-+ vst1q_lane_u32((void*)dst2,vreinterpretq_u32_u16(temp),1);
-+ if (w&4)
-+ vst1q_lane_u64((void*)dst4,vreinterpretq_u64_u16(temp),1);
-+#else
-+ asm volatile (
-+ "vdup.32 d0, %[src]\n\t"
-+ "vdup.8 d1, d0[1]\n\t"
-+ "vdup.8 d2, d0[2]\n\t"
-+ "vdup.8 d3, d0[3]\n\t"
-+ "vdup.8 d0, d0[0]\n\t"
-+
-+ "tst %[w], #4\t\n"
-+ "beq skip_load4\t\n"
-+
-+ "vld1.64 {d25}, [%[dst]]\n\t"
-+ "vld1.32 {d31[1]}, [%[mask]]\n\t"
-+ "mov %[dst4], %[dst]\t\n"
-+ "add %[mask], %[mask], #4\t\n"
-+ "add %[dst], %[dst], #4*2\t\n"
-+
-+ "skip_load4:\t\n"
-+ "tst %[w], #2\t\n"
-+ "beq skip_load2\t\n"
-+ "vld1.32 {d24[1]}, [%[dst]]\n\t"
-+ "vld1.16 {d31[1]}, [%[mask]]\n\t"
-+ "mov %[dst2], %[dst]\t\n"
-+ "add %[mask], %[mask], #2\t\n"
-+ "add %[dst], %[dst], #2*2\t\n"
-+
-+ "skip_load2:\t\n"
-+ "tst %[w], #1\t\n"
-+ "beq skip_load1\t\n"
-+ "vld1.16 {d24[1]}, [%[dst]]\n\t"
-+ "vld1.8 {d31[1]}, [%[mask]]\n\t"
-+
-+ "skip_load1:\t\n"
-+// expand 0565 q12 to 8888 {d4-d7}
-+ "vmovn.u16 d4, q12\t\n"
-+ "vshr.u16 q11, q12, #5\t\n"
-+ "vshr.u16 q10, q12, #6+5\t\n"
-+ "vmovn.u16 d5, q11\t\n"
-+ "vmovn.u16 d6, q10\t\n"
-+ "vshl.u8 d4, d4, #3\t\n"
-+ "vshl.u8 d5, d5, #2\t\n"
-+ "vshl.u8 d6, d6, #3\t\n"
-+ "vsri.u8 d4, d4, #5\t\n"
-+ "vsri.u8 d5, d5, #6\t\n"
-+ "vsri.u8 d6, d6, #5\t\n"
-+
-+ "vmull.u8 q10, d31, d0\n\t"
-+ "vmull.u8 q11, d31, d1\n\t"
-+ "vmull.u8 q12, d31, d2\n\t"
-+ "vmull.u8 q13, d31, d3\n\t"
-+ "vrshr.u16 q8, q10, #8\n\t"
-+ "vrshr.u16 q9, q11, #8\n\t"
-+ "vraddhn.u16 d20, q10, q8\n\t"
-+ "vraddhn.u16 d21, q11, q9\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d23, q13, q9\n\t"
-+ "vraddhn.u16 d22, q12, q8\n\t"
-+
-+// duplicate in 4/2/1 & 8pix vsns
-+ "vmvn.8 d30, d23\n\t"
-+ "vmull.u8 q14, d30, d6\n\t"
-+ "vmull.u8 q13, d30, d5\n\t"
-+ "vmull.u8 q12, d30, d4\n\t"
-+ "vrshr.u16 q8, q14, #8\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vraddhn.u16 d6, q14, q8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d5, q13, q9\n\t"
-+ "vqadd.u8 d6, d6, d22\n\t" // moved up
-+ "vraddhn.u16 d4, q12, q8\n\t"
-+// intentionally don't calculate alpha
-+// result in d4-d6
-+
-+// "vqadd.u8 d6, d6, d22\n\t" ** moved up
-+ "vqadd.u8 d5, d5, d21\n\t"
-+ "vqadd.u8 d4, d4, d20\n\t"
-+
-+// pack 8888 {d20-d23} to 0565 q10
-+ "vshll.u8 q10, d6, #8\n\t"
-+ "vshll.u8 q3, d5, #8\n\t"
-+ "vshll.u8 q2, d4, #8\n\t"
-+ "vsri.u16 q10, q3, #5\t\n"
-+ "vsri.u16 q10, q2, #11\t\n"
-+
-+ "tst %[w], #1\n\t"
-+ "beq skip_store1\t\n"
-+ "vst1.16 {d20[1]}, [%[dst]]\t\n"
-+ "skip_store1:\t\n"
-+ "tst %[w], #2\n\t"
-+ "beq skip_store2\t\n"
-+ "vst1.32 {d20[1]}, [%[dst2]]\t\n"
-+ "skip_store2:\t\n"
-+ "tst %[w], #4\n\t"
-+ "beq skip_store4\t\n"
-+ "vst1.16 {d21}, [%[dst4]]\t\n"
-+ "skip_store4:\t\n"
-+
-+ : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [dst4] "+r" (dst4), [dst2] "+r" (dst2)
-+ : [src] "r" (src)
-+ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
-+ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
-+ "d30","d31"
-+ );
-+#endif
-+ }
-+ }
-+}
-+
-+
-+void
-+fbCompositeSolidMask_nx8x8888neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t src, srca;
-+ uint32_t *dstLine, *dst;
-+ uint8_t *maskLine, *mask;
-+ int dstStride, maskStride;
-+ uint32_t w;
-+ uint8x8_t sval2;
-+ uint8x8x4_t sval8;
-+ uint8x8_t mask_selector=vreinterpret_u8_u64(vcreate_u64(0x0101010100000000ULL));
-+ uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL));
-+
-+ fbComposeGetSolid(pSrc, src, pDst->bits.format);
-+
-+ srca = src >> 24;
-+ if (src == 0)
-+ return;
-+
-+ sval2=vreinterpret_u8_u32(vdup_n_u32(src));
-+ sval8.val[0]=vdup_lane_u8(sval2,0);
-+ sval8.val[1]=vdup_lane_u8(sval2,1);
-+ sval8.val[2]=vdup_lane_u8(sval2,2);
-+ sval8.val[3]=vdup_lane_u8(sval2,3);
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
-+
-+ if (width>=8)
-+ {
-+ // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
-+ while (height--)
-+ {
-+ uint32_t *keep_dst;
-+
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+#ifndef USE_NEON_INLINE_ASM
-+ uint8x8_t alpha;
-+ uint8x8x4_t dval, temp;
-+
-+ alpha = vld1_u8((void*)mask);
-+ dval = vld4_u8((void*)dst);
-+ keep_dst = dst;
-+
-+ temp = neon8mul(sval8,alpha);
-+ dval = neon8mul(dval,vmvn_u8(temp.val[3]));
-+ temp = neon8qadd(temp,dval);
-+
-+ mask += (w & 7);
-+ dst += (w & 7);
-+ w -= (w & 7);
-+
-+ while (w)
-+ {
-+ alpha = vld1_u8((void*)mask);
-+ dval = vld4_u8((void*)dst);
-+
-+ vst4_u8((void*)keep_dst,temp);
-+ keep_dst = dst;
-+
-+ temp = neon8mul(sval8,alpha);
-+ dval = neon8mul(dval,vmvn_u8(temp.val[3]));
-+ temp = neon8qadd(temp,dval);
-+
-+ mask+=8;
-+ dst+=8;
-+ w-=8;
-+ }
-+ vst4_u8((void*)keep_dst,temp);
-+#else
-+ asm volatile (
-+ "vdup.32 d0, %[src]\n\t"
-+ "vdup.8 d1, d0[1]\n\t"
-+ "vdup.8 d2, d0[2]\n\t"
-+ "vdup.8 d3, d0[3]\n\t"
-+ "vdup.8 d0, d0[0]\n\t"
-+
-+ "vld4.8 {d4-d7}, [%[dst]]\n\t"
-+ "vld1.8 {d31}, [%[mask]]\n\t"
-+ "mov %[keep_dst], %[dst]\n\t"
-+
-+ "and ip, %[w], #7\n\t"
-+ "add %[mask], %[mask], ip\n\t"
-+ "add %[dst], %[dst], ip, LSL#2\n\t"
-+ "subs %[w], %[w], ip\n\t"
-+ "b 9f\n\t"
-+// LOOP
-+ "2:\n\t"
-+ "vld4.8 {d4-d7}, [%[dst]]!\n\t"
-+ "vld1.8 {d31}, [%[mask]]!\n\t"
-+ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
-+ "sub %[keep_dst], %[dst], #8*4\n\t"
-+ "subs %[w], %[w], #8\n\t"
-+ "9:\n\t"
-+
-+ "vmull.u8 q10, d31, d0\n\t"
-+ "vmull.u8 q11, d31, d1\n\t"
-+ "vmull.u8 q12, d31, d2\n\t"
-+ "vmull.u8 q13, d31, d3\n\t"
-+ "vrshr.u16 q8, q10, #8\n\t"
-+ "vrshr.u16 q9, q11, #8\n\t"
-+ "vraddhn.u16 d20, q10, q8\n\t"
-+ "vraddhn.u16 d21, q11, q9\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vraddhn.u16 d23, q13, q9\n\t"
-+ "vraddhn.u16 d22, q12, q8\n\t"
-+
-+ "vmvn.8 d30, d23\n\t"
-+ "vmull.u8 q12, d30, d4\n\t"
-+ "vmull.u8 q13, d30, d5\n\t"
-+ "vmull.u8 q14, d30, d6\n\t"
-+ "vmull.u8 q15, d30, d7\n\t"
-+
-+ "vrshr.u16 q8, q12, #8\n\t"
-+ "vrshr.u16 q9, q13, #8\n\t"
-+ "vraddhn.u16 d4, q12, q8\n\t"
-+ "vrshr.u16 q8, q14, #8\n\t"
-+ "vraddhn.u16 d5, q13, q9\n\t"
-+ "vrshr.u16 q9, q15, #8\n\t"
-+ "vraddhn.u16 d6, q14, q8\n\t"
-+ "vraddhn.u16 d7, q15, q9\n\t"
-+// result in d4-d7
-+
-+ "vqadd.u8 d20, d4, d20\n\t"
-+ "vqadd.u8 d21, d5, d21\n\t"
-+ "vqadd.u8 d22, d6, d22\n\t"
-+ "vqadd.u8 d23, d7, d23\n\t"
-+
-+ "bne 2b\n\t"
-+
-+ "1:\n\t"
-+ "vst4.8 {d20-d23}, [%[keep_dst]]\n\t"
-+
-+ : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [keep_dst] "+r" (keep_dst)
-+ : [src] "r" (src)
-+ : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
-+ "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
-+ "d30","d31"
-+ );
-+#endif
-+ }
-+ }
-+ else
-+ {
-+ while (height--)
-+ {
-+ uint8x8_t alpha;
-+
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+ while (w>=2)
-+ {
-+ uint8x8_t dval, temp, res;
-+
-+ alpha = vtbl1_u8(vreinterpret_u8_u16(vld1_dup_u16((void*)mask)), mask_selector);
-+ dval = vld1_u8((void*)dst);
-+
-+ temp = neon2mul(sval2,alpha);
-+ res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector)));
-+
-+ vst1_u8((void*)dst,res);
-+
-+ mask+=2;
-+ dst+=2;
-+ w-=2;
-+ }
-+ if (w)
-+ {
-+ uint8x8_t dval, temp, res;
-+
-+ alpha = vtbl1_u8(vld1_dup_u8((void*)mask), mask_selector);
-+ dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst));
-+
-+ temp = neon2mul(sval2,alpha);
-+ res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector)));
-+
-+ vst1_lane_u32((void*)dst,vreinterpret_u32_u8(res),0);
-+ }
-+ }
-+ }
-+}
-+
-+
-+void
-+fbCompositeSrcAdd_8888x8x8neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint8_t *dstLine, *dst;
-+ uint8_t *maskLine, *mask;
-+ int dstStride, maskStride;
-+ uint32_t w;
-+ uint32_t src;
-+ uint8x8_t sa;
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
-+ fbComposeGetSolid (pSrc, src, pDst->bits.format);
-+ sa = vdup_n_u8((src) >> 24);
-+
-+ if (width>=8)
-+ {
-+ // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+ uint8x8_t mval, dval, res;
-+ uint8_t *keep_dst;
-+
-+ mval = vld1_u8((void *)mask);
-+ dval = vld1_u8((void *)dst);
-+ keep_dst = dst;
-+
-+ res = vqadd_u8(neon2mul(mval,sa),dval);
-+
-+ mask += (w & 7);
-+ dst += (w & 7);
-+ w -= w & 7;
-+
-+ while (w)
-+ {
-+ mval = vld1_u8((void *)mask);
-+ dval = vld1_u8((void *)dst);
-+ vst1_u8((void *)keep_dst, res);
-+ keep_dst = dst;
-+
-+ res = vqadd_u8(neon2mul(mval,sa),dval);
-+
-+ mask += 8;
-+ dst += 8;
-+ w -= 8;
-+ }
-+ vst1_u8((void *)keep_dst, res);
-+ }
-+ }
-+ else
-+ {
-+ // Use 4/2/1 load/store method to handle 1-7 pixels
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+ uint8x8_t mval, dval, res;
-+ uint8_t *dst4, *dst2;
-+
-+ if (w&4)
-+ {
-+ mval = vreinterpret_u8_u32(vld1_lane_u32((void *)mask, vreinterpret_u32_u8(mval), 1));
-+ dval = vreinterpret_u8_u32(vld1_lane_u32((void *)dst, vreinterpret_u32_u8(dval), 1));
-+
-+ dst4 = dst;
-+ mask += 4;
-+ dst += 4;
-+ }
-+ if (w&2)
-+ {
-+ mval = vreinterpret_u8_u16(vld1_lane_u16((void *)mask, vreinterpret_u16_u8(mval), 1));
-+ dval = vreinterpret_u8_u16(vld1_lane_u16((void *)dst, vreinterpret_u16_u8(dval), 1));
-+ dst2 = dst;
-+ mask += 2;
-+ dst += 2;
-+ }
-+ if (w&1)
-+ {
-+ mval = vld1_lane_u8((void *)mask, mval, 1);
-+ dval = vld1_lane_u8((void *)dst, dval, 1);
-+ }
-+
-+ res = vqadd_u8(neon2mul(mval,sa),dval);
-+
-+ if (w&1)
-+ vst1_lane_u8((void *)dst, res, 1);
-+ if (w&2)
-+ vst1_lane_u16((void *)dst2, vreinterpret_u16_u8(res), 1);
-+ if (w&4)
-+ vst1_lane_u32((void *)dst4, vreinterpret_u32_u8(res), 1);
-+ }
-+ }
-+}
-+
-diff --git a/pixman/pixman-arm-neon.h b/pixman/pixman-arm-neon.h
-new file mode 100644
-index 0000000..bab4dee
---- /dev/null
-+++ b/pixman/pixman-arm-neon.h
-@@ -0,0 +1,137 @@
-+/*
-+ * Copyright © 2009 Mozilla Corporation
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Mozilla Corporation not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Mozilla Corporation makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ *
-+ * Author: Ian Rickards (ian.rickards@arm.com)
-+ *
-+ */
-+
-+#include "pixman-private.h"
-+
-+#ifdef USE_ARM_NEON
-+
-+static inline pixman_bool_t pixman_have_arm_neon(void) { return TRUE; }
-+
-+#else
-+#define pixman_have_arm_neon() FALSE
-+#endif
-+
-+#ifdef USE_ARM_NEON
-+
-+void
-+fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSrc_8888x8888neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSrc_8888x8x8888neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSolidMask_nx8x0565neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSolidMask_nx8x8888neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSrc_x888x0565neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSrcAdd_8888x8x8neon (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+#endif /* USE_ARM_NEON */
-diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
-index 1388517..b13947a 100644
---- a/pixman/pixman-pict.c
-+++ b/pixman/pixman-pict.c
-@@ -34,6 +34,7 @@
- #include "pixman-mmx.h"
- #include "pixman-vmx.h"
- #include "pixman-sse2.h"
-+#include "pixman-arm-neon.h"
- #include "pixman-arm-simd.h"
- #include "pixman-combine32.h"
-
-@@ -1518,6 +1519,31 @@ static const FastPathInfo vmx_fast_paths[] =
- };
- #endif
-
-+#ifdef USE_ARM_NEON
-+static const FastPathInfo arm_neon_fast_paths[] =
-+{
-+ { PIXMAN_OP_ADD, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fbCompositeSrcAdd_8888x8x8neon, 0 },
-+ { PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcAdd_8000x8000neon, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565neon, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565neon, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565neon, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_a8b8g8r8, fbCompositeSrc_8888x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fbCompositeSrc_8888x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8x8888neon, NEED_SOLID_MASK },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8x8888neon, NEED_SOLID_MASK },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_r5g6b5, fbCompositeSolidMask_nx8x0565neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_b5g6r5, fbCompositeSolidMask_nx8x0565neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSolidMask_nx8x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSolidMask_nx8x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8b8g8r8, fbCompositeSolidMask_nx8x8888neon, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8b8g8r8, fbCompositeSolidMask_nx8x8888neon, 0 },
-+ { PIXMAN_OP_NONE },
-+};
-+#endif
-+
- #ifdef USE_ARM_SIMD
- static const FastPathInfo arm_simd_fast_paths[] =
- {
-@@ -1893,6 +1919,11 @@ pixman_image_composite (pixman_op_t op,
- info = get_fast_path (vmx_fast_paths, op, pSrc, pMask, pDst, pixbuf);
- #endif
-
-+#ifdef USE_ARM_NEON
-+ if (!info && pixman_have_arm_neon())
-+ info = get_fast_path (arm_neon_fast_paths, op, pSrc, pMask, pDst, pixbuf);
-+#endif
-+
- #ifdef USE_ARM_SIMD
- if (!info && pixman_have_arm_simd())
- info = get_fast_path (arm_simd_fast_paths, op, pSrc, pMask, pDst, pixbuf);
diff --git a/recipes/xorg-lib/pixman/pixman-28986.patch b/recipes/xorg-lib/pixman/pixman-28986.patch
deleted file mode 100644
index f5ba4c3..0000000
--- a/recipes/xorg-lib/pixman/pixman-28986.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7b7860d61fb1526acdf010dd8fd644bbf1396b9e Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Fri, 28 Aug 2009 22:34:21 +0300
-Subject: [PATCH] ARM: workaround for gcc bug in vshll_n_u8 intrinsic
-
-Some versions of gcc (cs2009q1, 4.4.1) incorrectly reject
-shift operand having value >= 8, claiming that it is out of
-range. So inline assembly is used as a workaround.
----
- pixman/pixman-arm-neon.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 4125d1b..3e7f566 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -64,6 +64,12 @@ unpack0565 (uint16x8_t rgb)
- return res;
- }
-
-+#ifdef USE_GCC_INLINE_ASM
-+/* Some versions of gcc have problems with vshll_n_u8 intrinsic (Bug 23576) */
-+#define vshll_n_u8(a, n) ({ uint16x8_t r; \
-+ asm ("vshll.u8 %q0, %P1, %2\n" : "=w" (r) : "w" (a), "i" (n)); r; })
-+#endif
-+
- static force_inline uint16x8_t
- pack0565 (uint8x8x4_t s)
- {
---
-1.5.4.3
-
diff --git a/recipes/xorg-lib/pixman/pixman-arm.patch b/recipes/xorg-lib/pixman/pixman-arm.patch
deleted file mode 100644
index 91dda03..0000000
--- a/recipes/xorg-lib/pixman/pixman-arm.patch
+++ /dev/null
@@ -1,632 +0,0 @@
-From: Jeff Muizelaar <jmuizelaar@mozilla.com>
-Date: Wed, 17 Sep 2008 19:53:20 +0000 (-0400)
-Subject: Add support for ARMv6 SIMD fastpaths.
-X-Git-Url: http://gitweb.freedesktop.org/?p=pixman.git;a=commitdiff;h=d0b181f347ef4720d130beee3f03196afbd28aba
-
-Add support for ARMv6 SIMD fastpaths.
----
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -277,6 +277,44 @@ AC_SUBST(VMX_CFLAGS)
-
- AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
-
-+dnl Check for ARM
-+
-+have_armv6_simd=no
-+AC_MSG_CHECKING(whether to use ARM assembler)
-+xserver_save_CFLAGS=$CFLAGS
-+CFLAGS="$CFLAGS $ARM_CFLAGS"
-+AC_COMPILE_IFELSE([
-+int main () {
-+ asm("uqadd8 r1, r1, r2");
-+ return 0;
-+}], have_armv6_simd=yes)
-+CFLAGS=$xserver_save_CFLAGS
-+
-+AC_ARG_ENABLE(arm,
-+ [AC_HELP_STRING([--disable-arm],
-+ [disable ARM fast paths])],
-+ [enable_arm=$enableval], [enable_arm=auto])
-+
-+if test $enable_arm = no ; then
-+ have_armv6_simd=disabled
-+fi
-+
-+if test $have_armv6_simd = yes ; then
-+ AC_DEFINE(USE_ARM, 1, [use ARM compiler intrinsics])
-+else
-+ ARM_CFLAGS=
-+fi
-+
-+AC_MSG_RESULT($have_armv6_simd)
-+if test $enable_arm = yes && test $have_armv6_simd = no ; then
-+ AC_MSG_ERROR([ARM intrinsics not detected])
-+fi
-+
-+AC_SUBST(ARM_CFLAGS)
-+
-+AM_CONDITIONAL(USE_ARM, test $have_armv6_simd = yes)
-+
-+
- AC_ARG_ENABLE(gtk,
- [AC_HELP_STRING([--enable-gtk],
- [enable tests using GTK+ [default=auto]])],
---- a/pixman/Makefile.am
-+++ b/pixman/Makefile.am
-@@ -79,3 +79,15 @@ libpixman_sse2_la_LIBADD = $(DEP_LIBS)
- libpixman_1_la_LIBADD += libpixman-sse2.la
- endif
-
-+# arm code
-+if USE_ARM
-+noinst_LTLIBRARIES += libpixman-arm.la
-+libpixman_arm_la_SOURCES = \
-+ pixman-arm.c \
-+ pixman-arm.h
-+libpixman_arm_la_CFLAGS = $(DEP_CFLAGS) $(ARM_CFLAGS)
-+libpixman_arm_la_LIBADD = $(DEP_LIBS)
-+libpixman_1_la_LIBADD += libpixman-arm.la
-+endif
-+
-+
---- /dev/null
-+++ b/pixman/pixman-arm.c
-@@ -0,0 +1,409 @@
-+/*
-+ * Copyright © 2008 Mozilla Corporation
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Mozilla Corporation not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Mozilla Corporation makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ *
-+ * Author: Jeff Muizelaar (jeff@infidigm.net)
-+ *
-+ */
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include "pixman-arm.h"
-+
-+void
-+fbCompositeSrcAdd_8000x8000arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint8_t *dstLine, *dst;
-+ uint8_t *srcLine, *src;
-+ int dstStride, srcStride;
-+ uint16_t w;
-+ uint8_t s, d;
-+
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1);
-+ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
-+
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ while (w && (unsigned long)dst & 3)
-+ {
-+ s = *src;
-+ d = *dst;
-+ asm("uqadd8 %0, %1, %2" : "+r"(d) : "r"(s));
-+ *dst = d;
-+
-+ dst++;
-+ src++;
-+ w--;
-+ }
-+
-+ while (w >= 4)
-+ {
-+ asm("uqadd8 %0, %1, %2" : "=r"(*(uint32_t*)dst) : "r"(*(uint32_t*)src), "r"(*(uint32_t*)dst));
-+ dst += 4;
-+ src += 4;
-+ w -= 4;
-+ }
-+
-+ while (w)
-+ {
-+ s = *src;
-+ d = *dst;
-+ asm("uqadd8 %0, %1, %2" : "+r"(d) : "r"(s));
-+ *dst = d;
-+
-+ dst++;
-+ src++;
-+ w--;
-+ }
-+ }
-+
-+}
-+
-+void
-+fbCompositeSrc_8888x8888arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t *dstLine, *dst;
-+ uint32_t *srcLine, *src;
-+ int dstStride, srcStride;
-+ uint16_t w;
-+ uint32_t component_half = 0x800080;
-+ uint32_t upper_component_mask = 0xff00ff00;
-+ uint32_t alpha_mask = 0xff;
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
-+
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+//#define inner_branch
-+ asm volatile (
-+ "cmp %[w], #0\n\t"
-+ "beq 2f\n\t"
-+ "1:\n\t"
-+ /* load dest */
-+ "ldr r5, [%[src]], #4\n\t"
-+#ifdef inner_branch
-+ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
-+ * The 0x0 case also allows us to avoid doing an unecessary data
-+ * write which is more valuable so we only check for that */
-+ "cmp r5, #0x1000000\n\t"
-+ "blt 3f\n\t"
-+
-+ /* = 255 - alpha */
-+ "sub r8, %[alpha_mask], r5, lsr #24\n\t"
-+
-+ "ldr r4, [%[dest]] \n\t"
-+
-+#else
-+ "ldr r4, [%[dest]] \n\t"
-+
-+ /* = 255 - alpha */
-+ "sub r8, %[alpha_mask], r5, lsr #24\n\t"
-+#endif
-+ "uxtb16 r6, r4\n\t"
-+ "uxtb16 r7, r4, ror #8\n\t"
-+
-+ /* multiply by 257 and divide by 65536 */
-+ "mla r6, r6, r8, %[component_half]\n\t"
-+ "mla r7, r7, r8, %[component_half]\n\t"
-+
-+ "uxtab16 r6, r6, r6, ror #8\n\t"
-+ "uxtab16 r7, r7, r7, ror #8\n\t"
-+
-+ /* recombine the 0xff00ff00 bytes of r6 and r7 */
-+ "and r7, %[upper_component_mask]\n\t"
-+ "uxtab16 r6, r7, r6, ror #8\n\t"
-+
-+ "uqadd8 r5, r6, r5\n\t"
-+
-+#ifdef inner_branch
-+ "3:\n\t"
-+
-+#endif
-+ "str r5, [%[dest]], #4\n\t"
-+ /* increment counter and jmp to top */
-+ "subs %[w], %[w], #1\n\t"
-+ "bne 1b\n\t"
-+ "2:\n\t"
-+ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src)
-+ : [component_half] "r" (component_half), [upper_component_mask] "r" (upper_component_mask),
-+ [alpha_mask] "r" (alpha_mask)
-+ : "r4", "r5", "r6", "r7", "r8", "cc", "memory"
-+ );
-+ }
-+}
-+
-+void
-+fbCompositeSrc_8888x8x8888arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t *dstLine, *dst;
-+ uint32_t *srcLine, *src;
-+ uint32_t mask;
-+ int dstStride, srcStride;
-+ uint16_t w;
-+ uint32_t component_half = 0x800080;
-+ uint32_t alpha_mask = 0xff;
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
-+
-+ fbComposeGetSolid (pMask, mask, pDst->bits.format);
-+ mask = (mask) >> 24;
-+
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+//#define inner_branch
-+ asm volatile (
-+ "cmp %[w], #0\n\t"
-+ "beq 2f\n\t"
-+ "1:\n\t"
-+ /* load dest */
-+ "ldr r5, [%[src]], #4\n\t"
-+#ifdef inner_branch
-+ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
-+ * The 0x0 case also allows us to avoid doing an unecessary data
-+ * write which is more valuable so we only check for that */
-+ "cmp r5, #0x1000000\n\t"
-+ "blt 3f\n\t"
-+
-+#endif
-+ "ldr r4, [%[dest]] \n\t"
-+
-+ "uxtb16 r6, r5\n\t"
-+ "uxtb16 r7, r5, ror #8\n\t"
-+
-+ /* multiply by alpha (r8) then by 257 and divide by 65536 */
-+ "mla r6, r6, %[mask_alpha], %[component_half]\n\t"
-+ "mla r7, r7, %[mask_alpha], %[component_half]\n\t"
-+
-+ "uxtab16 r6, r6, r6, ror #8\n\t"
-+ "uxtab16 r7, r7, r7, ror #8\n\t"
-+
-+ "uxtb16 r6, r6, ror #8\n\t"
-+ "uxtb16 r7, r7, ror #8\n\t"
-+
-+ /* recombine */
-+ "orr r5, r6, r7, lsl #8\n\t"
-+
-+ "uxtb16 r6, r4\n\t"
-+ "uxtb16 r7, r4, ror #8\n\t"
-+
-+ /* 255 - alpha */
-+ "sub r8, %[alpha_mask], r5, lsr #24\n\t"
-+
-+ /* multiply by alpha (r8) then by 257 and divide by 65536 */
-+ "mla r6, r6, r8, %[component_half]\n\t"
-+ "mla r7, r7, r8, %[component_half]\n\t"
-+
-+ "uxtab16 r6, r6, r6, ror #8\n\t"
-+ "uxtab16 r7, r7, r7, ror #8\n\t"
-+
-+ "uxtb16 r6, r6, ror #8\n\t"
-+ "uxtb16 r7, r7, ror #8\n\t"
-+
-+ /* recombine */
-+ "orr r6, r6, r7, lsl #8\n\t"
-+
-+ "uqadd8 r5, r6, r5\n\t"
-+
-+#ifdef inner_branch
-+ "3:\n\t"
-+
-+#endif
-+ "str r5, [%[dest]], #4\n\t"
-+ /* increment counter and jmp to top */
-+ "subs %[w], %[w], #1\n\t"
-+ "bne 1b\n\t"
-+ "2:\n\t"
-+ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src)
-+ : [component_half] "r" (component_half), [mask_alpha] "r" (mask),
-+ [alpha_mask] "r" (alpha_mask)
-+ : "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory"
-+ );
-+ }
-+}
-+
-+void
-+fbCompositeSolidMask_nx8x8888arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint32_t src, srca;
-+ uint32_t *dstLine, *dst;
-+ uint8_t *maskLine, *mask;
-+ int dstStride, maskStride;
-+ uint16_t w;
-+
-+ fbComposeGetSolid(pSrc, src, pDst->bits.format);
-+
-+ srca = src >> 24;
-+ if (src == 0)
-+ return;
-+
-+ uint32_t component_mask = 0xff00ff;
-+ uint32_t component_half = 0x800080;
-+
-+ uint32_t src_hi = (src >> 8) & component_mask;
-+ uint32_t src_lo = src & component_mask;
-+
-+ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
-+ fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
-+
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ mask = maskLine;
-+ maskLine += maskStride;
-+ w = width;
-+
-+//#define inner_branch
-+ asm volatile (
-+ "cmp %[w], #0\n\t"
-+ "beq 2f\n\t"
-+ "1:\n\t"
-+ /* load mask */
-+ "ldrb r5, [%[mask]], #1\n\t"
-+#ifdef inner_branch
-+ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
-+ * The 0x0 case also allows us to avoid doing an unecessary data
-+ * write which is more valuable so we only check for that */
-+ /* 0x1000000 is the least value that contains alpha all values
-+ * less than it have a 0 alpha value */
-+ "cmp r5, #0x0\n\t"
-+ "beq 3f\n\t"
-+
-+#endif
-+ "ldr r4, [%[dest]] \n\t"
-+
-+ /* multiply by alpha (r8) then by 257 and divide by 65536 */
-+ "mla r6, %[src_lo], r5, %[component_half]\n\t"
-+ "mla r7, %[src_hi], r5, %[component_half]\n\t"
-+
-+ "uxtab16 r6, r6, r6, ror #8\n\t"
-+ "uxtab16 r7, r7, r7, ror #8\n\t"
-+
-+ "uxtb16 r6, r6, ror #8\n\t"
-+ "uxtb16 r7, r7, ror #8\n\t"
-+
-+ /* recombine */
-+ "orr r5, r6, r7, lsl #8\n\t"
-+
-+ "uxtb16 r6, r4\n\t"
-+ "uxtb16 r7, r4, ror #8\n\t"
-+
-+ /* we could simplify this to use 'sub' if we were
-+ * willing to give up a register for alpha_mask */
-+ "mvn r8, r5\n\t"
-+ "mov r8, r8, lsr #24\n\t"
-+
-+ /* multiply by alpha (r8) then by 257 and divide by 65536 */
-+ "mla r6, r6, r8, %[component_half]\n\t"
-+ "mla r7, r7, r8, %[component_half]\n\t"
-+
-+ "uxtab16 r6, r6, r6, ror #8\n\t"
-+ "uxtab16 r7, r7, r7, ror #8\n\t"
-+
-+ "uxtb16 r6, r6, ror #8\n\t"
-+ "uxtb16 r7, r7, ror #8\n\t"
-+
-+ /* recombine */
-+ "orr r6, r6, r7, lsl #8\n\t"
-+
-+ "uqadd8 r5, r6, r5\n\t"
-+
-+#ifdef inner_branch
-+ "3:\n\t"
-+
-+#endif
-+ "str r5, [%[dest]], #4\n\t"
-+ /* increment counter and jmp to top */
-+ "subs %[w], %[w], #1\n\t"
-+ "bne 1b\n\t"
-+ "2:\n\t"
-+ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src), [mask] "+r" (mask)
-+ : [component_half] "r" (component_half),
-+ [src_hi] "r" (src_hi), [src_lo] "r" (src_lo)
-+ : "r4", "r5", "r6", "r7", "r8", "cc", "memory"
-+ );
-+ }
-+}
---- /dev/null
-+++ b/pixman/pixman-arm.h
-@@ -0,0 +1,94 @@
-+/*
-+ * Copyright © 2008 Mozilla Corporation
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Mozilla Corporation not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Mozilla Corporation makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ *
-+ * Author: Jeff Muizelaar (jeff@infidigm.net)
-+ *
-+ */
-+
-+#include "pixman-private.h"
-+
-+#ifdef USE_ARM
-+
-+static inline pixman_bool_t pixman_have_arm(void) { return TRUE; }
-+
-+#else
-+#define pixman_have_arm() FALSE
-+#endif
-+
-+#ifdef USE_ARM
-+
-+void
-+fbCompositeSrcAdd_8000x8000arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+void
-+fbCompositeSrc_8888x8888arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+void
-+fbCompositeSrc_8888x8x8888arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+void
-+fbCompositeSolidMask_nx8x8888arm (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height);
-+
-+
-+#endif /* USE_ARM */
---- a/pixman/pixman-pict.c
-+++ b/pixman/pixman-pict.c
-@@ -34,6 +34,7 @@
- #include "pixman-mmx.h"
- #include "pixman-vmx.h"
- #include "pixman-sse2.h"
-+#include "pixman-arm.h"
- #include "pixman-combine32.h"
-
- #ifdef __GNUC__
-@@ -1479,6 +1480,26 @@ static const FastPathInfo vmx_fast_paths
- };
- #endif
-
-+#ifdef USE_ARM
-+static const FastPathInfo arm_fast_paths[] =
-+{
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_a8b8g8r8, fbCompositeSrc_8888x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fbCompositeSrc_8888x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8x8888arm, NEED_SOLID_MASK },
-+ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8x8888arm, NEED_SOLID_MASK },
-+
-+ { PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcAdd_8000x8000arm, 0 },
-+
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSolidMask_nx8x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSolidMask_nx8x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8b8g8r8, fbCompositeSolidMask_nx8x8888arm, 0 },
-+ { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_a8, PIXMAN_x8b8g8r8, fbCompositeSolidMask_nx8x8888arm, 0 },
-+
-+ { PIXMAN_OP_NONE },
-+};
-+#endif
-
- static const FastPathInfo c_fast_paths[] =
- {
-@@ -1829,6 +1850,12 @@ pixman_image_composite (pixman_op_t
- if (!info && pixman_have_vmx())
- info = get_fast_path (vmx_fast_paths, op, pSrc, pMask, pDst, pixbuf);
- #endif
-+
-+#ifdef USE_ARM
-+ if (!info && pixman_have_arm())
-+ info = get_fast_path (arm_fast_paths, op, pSrc, pMask, pDst, pixbuf);
-+#endif
-+
- if (!info)
- info = get_fast_path (c_fast_paths, op, pSrc, pMask, pDst, pixbuf);
-
diff --git a/recipes/xorg-lib/pixman/pixman-x888-565.patch b/recipes/xorg-lib/pixman/pixman-x888-565.patch
deleted file mode 100644
index a3fa331..0000000
--- a/recipes/xorg-lib/pixman/pixman-x888-565.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Vladimir Vukicevic <vladimir@slide.(none)>
-Date: Wed, 17 Sep 2008 20:01:31 +0000 (-0400)
-Subject: Add SRC x888x0565 C fast path
-X-Git-Url: http://gitweb.freedesktop.org/?p=pixman.git;a=commitdiff;h=7180230d4d87c55dfef1e17a0cc3b125d45aa3a0
-
-Add SRC x888x0565 C fast path
----
-
---- a/pixman/pixman-pict.c
-+++ b/pixman/pixman-pict.c
-@@ -759,6 +759,46 @@ fbCompositeSrc_8888x0565 (pixman_op_t op
- }
- }
-
-+
-+void
-+fbCompositeSrc_x888x0565 (pixman_op_t op,
-+ pixman_image_t * pSrc,
-+ pixman_image_t * pMask,
-+ pixman_image_t * pDst,
-+ int16_t xSrc,
-+ int16_t ySrc,
-+ int16_t xMask,
-+ int16_t yMask,
-+ int16_t xDst,
-+ int16_t yDst,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ uint16_t *dstLine, *dst;
-+ uint32_t *srcLine, *src, s;
-+ int dstStride, srcStride;
-+ uint16_t w;
-+
-+ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
-+ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
-+
-+ while (height--)
-+ {
-+ dst = dstLine;
-+ dstLine += dstStride;
-+ src = srcLine;
-+ srcLine += srcStride;
-+ w = width;
-+
-+ while (w--)
-+ {
-+ s = READ(pSrc, src++);
-+ WRITE(pDst, dst, cvt8888to0565(s));
-+ dst++;
-+ }
-+ }
-+}
-+
- void
- fbCompositeSrcAdd_8000x8000 (pixman_op_t op,
- pixman_image_t * pSrc,
-@@ -1568,6 +1608,10 @@ static const FastPathInfo c_fast_paths[]
- { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrcSrc_nxn, 0 },
- { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrcSrc_nxn, 0 },
- #endif
-+ { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 },
-+ { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 },
- { PIXMAN_OP_IN, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcIn_8x8, 0 },
- { PIXMAN_OP_IN, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fbCompositeSolidMaskIn_nx8x8, 0 },
- { PIXMAN_OP_NONE },
diff --git a/recipes/xorg-lib/pixman/prefetch.patch b/recipes/xorg-lib/pixman/prefetch.patch
deleted file mode 100644
index c2e856e..0000000
--- a/recipes/xorg-lib/pixman/prefetch.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-From d0044bfbd596f22ed1560579ea6537b39f3dc1af Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Thu, 29 Oct 2009 19:06:42 +0000
-Subject: ARM: Don't emit prefetch code if prefetch distance is set to 0
-
-Also it is now possible to disable prefetch globally with
-a configuration macro
----
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index bca499a..35e6a7e 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -219,33 +219,33 @@
- vshrn.u16 d7, q2, #3
- vsli.u16 q2, q2, #5
- vshll.u8 q14, d16, #8
-- add PF_X, PF_X, #8
-+ PF add PF_X, PF_X, #8
- vshll.u8 q8, d19, #8
-- tst PF_CTL, #0xF
-+ PF tst PF_CTL, #0xF
- vsri.u8 d6, d6, #5
-- addne PF_X, PF_X, #8
-+ PF addne PF_X, PF_X, #8
- vmvn.8 d3, d3
-- subne PF_CTL, PF_CTL, #1
-+ PF subne PF_CTL, PF_CTL, #1
- vsri.u8 d7, d7, #6
- vshrn.u16 d30, q2, #2
- vmull.u8 q10, d3, d6
-- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
-+ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
- vmull.u8 q11, d3, d7
- vmull.u8 q12, d3, d30
-- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
-+ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
- vsri.u16 q14, q8, #5
-- cmp PF_X, ORIG_W
-+ PF cmp PF_X, ORIG_W
- vshll.u8 q9, d18, #8
- vrshr.u16 q13, q10, #8
-- subge PF_X, PF_X, ORIG_W
-+ PF subge PF_X, PF_X, ORIG_W
- vrshr.u16 q3, q11, #8
- vrshr.u16 q15, q12, #8
-- subges PF_CTL, PF_CTL, #0x10
-+ PF subges PF_CTL, PF_CTL, #0x10
- vsri.u16 q14, q9, #11
-- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
- vraddhn.u16 d20, q10, q13
- vraddhn.u16 d23, q11, q3
-- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
- vraddhn.u16 d22, q12, q15
- vst1.16 {d28, d29}, [DST_W, :128]!
- .endm
-@@ -323,20 +323,20 @@ generate_composite_function \
-
- .macro pixman_composite_src_8888_0565_process_pixblock_tail_head
- vsri.u16 q14, q8, #5
-- add PF_X, PF_X, #8
-- tst PF_CTL, #0xF
-+ PF add PF_X, PF_X, #8
-+ PF tst PF_CTL, #0xF
- vld4.8 {d0, d1, d2, d3}, [SRC]!
-- addne PF_X, PF_X, #8
-- subne PF_CTL, PF_CTL, #1
-+ PF addne PF_X, PF_X, #8
-+ PF subne PF_CTL, PF_CTL, #1
- vsri.u16 q14, q9, #11
-- cmp PF_X, ORIG_W
-- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
-+ PF cmp PF_X, ORIG_W
-+ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
- vshll.u8 q8, d1, #8
- vst1.16 {d28, d29}, [DST_W, :128]!
-- subge PF_X, PF_X, ORIG_W
-- subges PF_CTL, PF_CTL, #0x10
-+ PF subge PF_X, PF_X, ORIG_W
-+ PF subges PF_CTL, PF_CTL, #0x10
- vshll.u8 q14, d2, #8
-- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
- vshll.u8 q9, d0, #8
- .endm
-
-@@ -363,20 +363,20 @@ generate_composite_function \
-
- .macro pixman_composite_add_8000_8000_process_pixblock_tail_head
- vld1.8 {d0, d1, d2, d3}, [SRC]!
-- add PF_X, PF_X, #32
-- tst PF_CTL, #0xF
-+ PF add PF_X, PF_X, #32
-+ PF tst PF_CTL, #0xF
- vld1.8 {d4, d5, d6, d7}, [DST_R, :128]!
-- addne PF_X, PF_X, #32
-- subne PF_CTL, PF_CTL, #1
-+ PF addne PF_X, PF_X, #32
-+ PF subne PF_CTL, PF_CTL, #1
- vst1.8 {d28, d29, d30, d31}, [DST_W, :128]!
-- cmp PF_X, ORIG_W
-- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
-- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
-- subge PF_X, PF_X, ORIG_W
-- subges PF_CTL, PF_CTL, #0x10
-+ PF cmp PF_X, ORIG_W
-+ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
-+ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
-+ PF subge PF_X, PF_X, ORIG_W
-+ PF subges PF_CTL, PF_CTL, #0x10
- vqadd.u8 q14, q0, q2
-- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
-- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
- vqadd.u8 q15, q1, q3
- .endm
-
-@@ -418,32 +418,32 @@ generate_composite_function \
- .macro pixman_composite_over_8888_8888_process_pixblock_tail_head
- vld4.8 {d4, d5, d6, d7}, [DST_R, :128]!
- vrshr.u16 q14, q8, #8
-- add PF_X, PF_X, #8
-- tst PF_CTL, #0xF
-+ PF add PF_X, PF_X, #8
-+ PF tst PF_CTL, #0xF
- vrshr.u16 q15, q9, #8
- vrshr.u16 q12, q10, #8
- vrshr.u16 q13, q11, #8
-- addne PF_X, PF_X, #8
-- subne PF_CTL, PF_CTL, #1
-+ PF addne PF_X, PF_X, #8
-+ PF subne PF_CTL, PF_CTL, #1
- vraddhn.u16 d28, q14, q8
- vraddhn.u16 d29, q15, q9
-- cmp PF_X, ORIG_W
-+ PF cmp PF_X, ORIG_W
- vraddhn.u16 d30, q12, q10
- vraddhn.u16 d31, q13, q11
- vqadd.u8 q14, q0, q14
- vqadd.u8 q15, q1, q15
- vld4.8 {d0, d1, d2, d3}, [SRC]!
-- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
-+ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
- vmvn.8 d22, d3
-- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
-+ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
- vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!
-- subge PF_X, PF_X, ORIG_W
-+ PF subge PF_X, PF_X, ORIG_W
- vmull.u8 q8, d22, d4
-- subges PF_CTL, PF_CTL, #0x10
-+ PF subges PF_CTL, PF_CTL, #0x10
- vmull.u8 q9, d22, d5
-- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
- vmull.u8 q10, d22, d6
-- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
- vmull.u8 q11, d22, d7
- .endm
-
-diff --git a/pixman/pixman-arm-neon-asm.h b/pixman/pixman-arm-neon-asm.h
-index d276ab9..a2941ae 100644
---- a/pixman/pixman-arm-neon-asm.h
-+++ b/pixman/pixman-arm-neon-asm.h
-@@ -58,6 +58,11 @@
- #define RESPECT_STRICT_ALIGNMENT 1
-
- /*
-+ * If set to nonzero value, prefetch is globally disabled
-+ */
-+#define PREFETCH_GLOBALLY_DISABLED 0
-+
-+/*
- * Definitions of supplementary pixld/pixst macros (for partial load/store of
- * pixel data)
- */
-@@ -218,37 +223,43 @@
- * pixels processing like simple copy. Anyway, having prefetch is a must
- * when working with graphics data.
- */
-+.macro PF a, x:vararg
-+.if (ADVANCED_PREFETCH_ENABLED != 0) && (PREFETCH_GLOBALLY_DISABLED == 0)
-+ a x
-+.endif
-+.endm
-+
- .macro cache_preload std_increment, boost_increment
- .if (src_bpp_shift >= 0) || (dst_r_bpp != 0) || (mask_bpp_shift >= 0)
- .if regs_shortage
-- ldr ORIG_W, [sp] /* If we are short on regs, ORIG_W is kept on stack */
-+ PF ldr ORIG_W, [sp] /* If we are short on regs, ORIG_W is kept on stack */
- .endif
- .if std_increment != 0
-- add PF_X, PF_X, #std_increment
-+ PF add PF_X, PF_X, #std_increment
- .endif
-- tst PF_CTL, #0xF
-- addne PF_X, PF_X, #boost_increment
-- subne PF_CTL, PF_CTL, #1
-- cmp PF_X, ORIG_W
-+ PF tst PF_CTL, #0xF
-+ PF addne PF_X, PF_X, #boost_increment
-+ PF subne PF_CTL, PF_CTL, #1
-+ PF cmp PF_X, ORIG_W
- .if src_bpp_shift >= 0
-- pld [PF_SRC, PF_X, lsl #src_bpp_shift]
-+ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]
- .endif
- .if dst_r_bpp != 0
-- pld [PF_DST, PF_X, lsl #dst_bpp_shift]
-+ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift]
- .endif
- .if mask_bpp_shift >= 0
-- pld [PF_MASK, PF_X, lsl #mask_bpp_shift]
-+ PF pld, [PF_MASK, PF_X, lsl #mask_bpp_shift]
- .endif
-- subge PF_X, PF_X, ORIG_W
-- subges PF_CTL, PF_CTL, #0x10
-+ PF subge PF_X, PF_X, ORIG_W
-+ PF subges PF_CTL, PF_CTL, #0x10
- .if src_bpp_shift >= 0
-- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!
- .endif
- .if dst_r_bpp != 0
-- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]!
- .endif
- .if mask_bpp_shift >= 0
-- ldrgeb DUMMY, [PF_MASK, MASK_STRIDE, lsl #mask_bpp_shift]!
-+ PF ldrgeb DUMMY, [PF_MASK, MASK_STRIDE, lsl #mask_bpp_shift]!
- .endif
- .endif
- .endm
-@@ -297,6 +308,12 @@ fname:
- PF_DST .req r12
- PF_MASK .req r14
-
-+.if prefetch_distance == 0
-+ .set ADVANCED_PREFETCH_ENABLED, 0
-+.else
-+ .set ADVANCED_PREFETCH_ENABLED, 1
-+.endif
-+
- .if mask_bpp == 0
- ORIG_W .req r7 /* saved original width */
- DUMMY .req r8 /* temporary register */
-@@ -374,12 +391,12 @@ fname:
- ldr MASK_STRIDE, [sp, #52]
- .endif
- mov DST_R, DST_W
-- mov PF_SRC, SRC
-- mov PF_DST, DST_R
-- mov PF_MASK, MASK
-- mov PF_CTL, H, lsl #4
-- /* pf_ctl = 10 | ((h - 1) << 4) */
-- add PF_CTL, #(prefetch_distance - 0x10)
-+ PF mov PF_SRC, SRC
-+ PF mov PF_DST, DST_R
-+ PF mov PF_MASK, MASK
-+ /* PF_CTL = prefetch_distance | ((h - 1) << 4) */
-+ PF mov PF_CTL, H, lsl #4
-+ PF add PF_CTL, #(prefetch_distance - 0x10)
-
- init
- .if regs_shortage
-@@ -412,7 +429,7 @@ fname:
- .else
- add DST_R, DST_R, #lowbit
- .endif
-- add PF_X, PF_X, #(lowbit * 8 / dst_w_bpp)
-+ PF add PF_X, PF_X, #(lowbit * 8 / dst_w_bpp)
- sub W, W, #(lowbit * 8 / dst_w_bpp)
- 1:
- .endif
-@@ -444,7 +461,7 @@ fname:
- (src_basereg - pixblock_size * src_bpp / 64), SRC
- pixld pixblock_size, mask_bpp, \
- (mask_basereg - pixblock_size * mask_bpp / 64), MASK
-- add PF_X, PF_X, #pixblock_size
-+ PF add PF_X, PF_X, #pixblock_size
- process_pixblock_head
- cache_preload 0, pixblock_size
- subs W, W, #(pixblock_size * 2)
-@@ -468,7 +485,7 @@ fname:
- pixld chunk_size, src_bpp, src_basereg, SRC
- pixld chunk_size, mask_bpp, mask_basereg, MASK
- pixld_a chunk_size, dst_r_bpp, dst_r_basereg, DST_R
-- add PF_X, PF_X, #chunk_size
-+ PF add PF_X, PF_X, #chunk_size
- 1:
- .endif
- .endr
---
-cgit v0.8.2
diff --git a/recipes/xorg-lib/pixman/remove-broken.patch b/recipes/xorg-lib/pixman/remove-broken.patch
deleted file mode 100644
index fd025b4..0000000
--- a/recipes/xorg-lib/pixman/remove-broken.patch
+++ /dev/null
@@ -1,826 +0,0 @@
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Sun, 26 Jul 2009 22:21:26 +0000 (+0300)
-Subject: ARM: Removal of unused/broken NEON code
-X-Git-Url: http://siarhei.siamashka.name/gitweb/?p=pixman.git;a=commitdiff_plain;h=7ef2322eefcccc28a2d45c0da22c0fee88b8f464
-
-ARM: Removal of unused/broken NEON code
----
-
-diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
-index 4125d1b..9404c70 100644
---- a/pixman/pixman-arm-neon.c
-+++ b/pixman/pixman-arm-neon.c
-@@ -1895,710 +1895,6 @@ pixman_fill_neon (uint32_t *bits,
- #endif
- }
-
--/* TODO: is there a more generic way of doing this being introduced? */
--#define NEON_SCANLINE_BUFFER_PIXELS (1024)
--
--static inline void
--neon_quadword_copy (void * dst,
-- void * src,
-- uint32_t count, /* of quadwords */
-- uint32_t trailer_count /* of bytes */)
--{
-- uint8_t *t_dst = dst, *t_src = src;
--
-- /* Uses aligned multi-register loads to maximise read bandwidth
-- * on uncached memory such as framebuffers
-- * The accesses do not have the aligned qualifiers, so that the copy
-- * may convert between aligned-uncached and unaligned-cached memory.
-- * It is assumed that the CPU can infer alignedness from the address.
-- */
--
--#ifdef USE_GCC_INLINE_ASM
--
-- asm volatile (
-- " cmp %[count], #8 \n"
-- " blt 1f @ skip oversized fragments \n"
-- "0: @ start with eight quadwords at a time \n"
-- " sub %[count], %[count], #8 \n"
-- " vld1.8 {d16, d17, d18, d19}, [%[src]]! \n"
-- " vld1.8 {d20, d21, d22, d23}, [%[src]]! \n"
-- " vld1.8 {d24, d25, d26, d27}, [%[src]]! \n"
-- " vld1.8 {d28, d29, d30, d31}, [%[src]]! \n"
-- " cmp %[count], #8 \n"
-- " vst1.8 {d16, d17, d18, d19}, [%[dst]]! \n"
-- " vst1.8 {d20, d21, d22, d23}, [%[dst]]! \n"
-- " vst1.8 {d24, d25, d26, d27}, [%[dst]]! \n"
-- " vst1.8 {d28, d29, d30, d31}, [%[dst]]! \n"
-- " bge 0b \n"
-- "1: @ four quadwords \n"
-- " tst %[count], #4 \n"
-- " beq 2f @ skip oversized fragment \n"
-- " vld1.8 {d16, d17, d18, d19}, [%[src]]! \n"
-- " vld1.8 {d20, d21, d22, d23}, [%[src]]! \n"
-- " vst1.8 {d16, d17, d18, d19}, [%[dst]]! \n"
-- " vst1.8 {d20, d21, d22, d23}, [%[dst]]! \n"
-- "2: @ two quadwords \n"
-- " tst %[count], #2 \n"
-- " beq 3f @ skip oversized fragment \n"
-- " vld1.8 {d16, d17, d18, d19}, [%[src]]! \n"
-- " vst1.8 {d16, d17, d18, d19}, [%[dst]]! \n"
-- "3: @ one quadword \n"
-- " tst %[count], #1 \n"
-- " beq 4f @ skip oversized fragment \n"
-- " vld1.8 {d16, d17}, [%[src]]! \n"
-- " vst1.8 {d16, d17}, [%[dst]]! \n"
-- "4: @ end \n"
--
-- /* Clobbered input registers marked as input/outputs */
-- : [dst] "+r" (t_dst), [src] "+r" (t_src), [count] "+r" (count)
--
-- /* No unclobbered inputs */
-- :
--
-- /* Clobbered vector registers */
-- : "d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23", "d24", "d25",
-- "d26", "d27", "d28", "d29", "d30", "d31", "cc", "memory");
--
--#else
--
-- while (count >= 8)
-- {
-- uint8x16x4_t t1 = vld4q_u8 (t_src);
-- uint8x16x4_t t2 = vld4q_u8 (t_src + sizeof(uint8x16x4_t));
--
-- t_src += sizeof(uint8x16x4_t) * 2;
-- vst4q_u8 (t_dst, t1);
-- vst4q_u8 (t_dst + sizeof(uint8x16x4_t), t2);
-- t_dst += sizeof(uint8x16x4_t) * 2;
-- count -= 8;
-- }
--
-- if (count & 4)
-- {
-- uint8x16x4_t t1 = vld4q_u8 (t_src);
--
-- t_src += sizeof(uint8x16x4_t);
-- vst4q_u8 (t_dst, t1);
-- t_dst += sizeof(uint8x16x4_t);
-- }
--
-- if (count & 2)
-- {
-- uint8x8x4_t t1 = vld4_u8 (t_src);
--
-- t_src += sizeof(uint8x8x4_t);
-- vst4_u8 (t_dst, t1);
-- t_dst += sizeof(uint8x8x4_t);
-- }
--
-- if (count & 1)
-- {
-- uint8x16_t t1 = vld1q_u8 (t_src);
--
-- t_src += sizeof(uint8x16_t);
-- vst1q_u8 (t_dst, t1);
-- t_dst += sizeof(uint8x16_t);
-- }
--
--#endif /* !USE_GCC_INLINE_ASM */
--
-- if (trailer_count)
-- {
-- if (trailer_count & 8)
-- {
-- uint8x8_t t1 = vld1_u8 (t_src);
--
-- t_src += sizeof(uint8x8_t);
-- vst1_u8 (t_dst, t1);
-- t_dst += sizeof(uint8x8_t);
-- }
--
-- if (trailer_count & 4)
-- {
-- *((uint32_t*) t_dst) = *((uint32_t*) t_src);
--
-- t_dst += 4;
-- t_src += 4;
-- }
--
-- if (trailer_count & 2)
-- {
-- *((uint16_t*) t_dst) = *((uint16_t*) t_src);
--
-- t_dst += 2;
-- t_src += 2;
-- }
--
-- if (trailer_count & 1)
-- {
-- *t_dst++ = *t_src++;
-- }
-- }
--}
--
--static inline void
--solid_over_565_8_pix_neon (uint32_t glyph_colour,
-- uint16_t *dest,
-- uint8_t * in_mask,
-- uint32_t dest_stride, /* bytes, not elements */
-- uint32_t mask_stride,
-- uint32_t count /* 8-pixel groups */)
--{
-- /* Inner loop of glyph blitter (solid colour, alpha mask) */
--
--#ifdef USE_GCC_INLINE_ASM
--
-- asm volatile (
-- " vld4.8 {d20[], d21[], d22[], d23[]}, [%[glyph_colour]] @ splat solid colour components \n"
-- "0: @ loop \n"
-- " vld1.16 {d0, d1}, [%[dest]] @ load first pixels from framebuffer \n"
-- " vld1.8 {d17}, [%[in_mask]] @ load alpha mask of glyph \n"
-- " vmull.u8 q9, d17, d23 @ apply glyph colour alpha to mask \n"
-- " vshrn.u16 d17, q9, #8 @ reformat it to match original mask \n"
-- " vmvn d18, d17 @ we need the inverse mask for the background \n"
-- " vsli.u16 q3, q0, #5 @ duplicate framebuffer blue bits \n"
-- " vshrn.u16 d2, q0, #8 @ unpack red from framebuffer pixels \n"
-- " vshrn.u16 d4, q0, #3 @ unpack green \n"
-- " vsri.u8 d2, d2, #5 @ duplicate red bits (extend 5 to 8) \n"
-- " vshrn.u16 d6, q3, #2 @ unpack extended blue (truncate 10 to 8) \n"
-- " vsri.u8 d4, d4, #6 @ duplicate green bits (extend 6 to 8) \n"
-- " vmull.u8 q1, d2, d18 @ apply inverse mask to background red... \n"
-- " vmull.u8 q2, d4, d18 @ ...green... \n"
-- " vmull.u8 q3, d6, d18 @ ...blue \n"
-- " subs %[count], %[count], #1 @ decrement/test loop counter \n"
-- " vmlal.u8 q1, d17, d22 @ add masked foreground red... \n"
-- " vmlal.u8 q2, d17, d21 @ ...green... \n"
-- " vmlal.u8 q3, d17, d20 @ ...blue \n"
-- " add %[in_mask], %[in_mask], %[mask_stride] @ advance mask pointer, while we wait \n"
-- " vsri.16 q1, q2, #5 @ pack green behind red \n"
-- " vsri.16 q1, q3, #11 @ pack blue into pixels \n"
-- " vst1.16 {d2, d3}, [%[dest]] @ store composited pixels \n"
-- " add %[dest], %[dest], %[dest_stride] @ advance framebuffer pointer \n"
-- " bne 0b @ next please \n"
--
-- /* Clobbered registers marked as input/outputs */
-- : [dest] "+r" (dest), [in_mask] "+r" (in_mask), [count] "+r" (count)
--
-- /* Inputs */
-- : [dest_stride] "r" (dest_stride), [mask_stride] "r" (mask_stride), [glyph_colour] "r" (&glyph_colour)
--
-- /* Clobbers, including the inputs we modify, and potentially lots of memory */
-- : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d17", "d18", "d19",
-- "d20", "d21", "d22", "d23", "d24", "d25", "cc", "memory"
-- );
--
--#else
--
-- uint8x8x4_t solid_colour = vld4_dup_u8 ((uint8_t*) &glyph_colour);
--
-- while (count--)
-- {
-- uint16x8_t pixels = vld1q_u16 (dest);
-- uint8x8_t mask = vshrn_n_u16 (vmull_u8 (solid_colour.val[3], vld1_u8 (in_mask)), 8);
-- uint8x8_t mask_image = vmvn_u8 (mask);
--
-- uint8x8_t t_red = vshrn_n_u16 (pixels, 8);
-- uint8x8_t t_green = vshrn_n_u16 (pixels, 3);
-- uint8x8_t t_blue = vshrn_n_u16 (vsli_n_u8 (pixels, pixels, 5), 2);
--
-- uint16x8_t s_red = vmull_u8 (vsri_n_u8 (t_red, t_red, 5), mask_image);
-- uint16x8_t s_green = vmull_u8 (vsri_n_u8 (t_green, t_green, 6), mask_image);
-- uint16x8_t s_blue = vmull_u8 (t_blue, mask_image);
--
-- s_red = vmlal (s_red, mask, solid_colour.val[2]);
-- s_green = vmlal (s_green, mask, solid_colour.val[1]);
-- s_blue = vmlal (s_blue, mask, solid_colour.val[0]);
--
-- pixels = vsri_n_u16 (s_red, s_green, 5);
-- pixels = vsri_n_u16 (pixels, s_blue, 11);
-- vst1q_u16 (dest, pixels);
--
-- dest += dest_stride;
-- mask += mask_stride;
-- }
--
--#endif
--}
--
--#if 0 /* this is broken currently */
--static void
--neon_composite_over_n_8_0565 (pixman_implementation_t * impl,
-- pixman_op_t op,
-- pixman_image_t * src_image,
-- pixman_image_t * mask_image,
-- pixman_image_t * dst_image,
-- int32_t src_x,
-- int32_t src_y,
-- int32_t mask_x,
-- int32_t mask_y,
-- int32_t dest_x,
-- int32_t dest_y,
-- int32_t width,
-- int32_t height)
--{
-- uint32_t src, srca;
-- uint16_t *dst_line, *aligned_line;
-- uint8_t *mask_line;
-- uint32_t dst_stride, mask_stride;
-- uint32_t kernel_count, copy_count, copy_tail;
-- uint8_t kernel_offset, copy_offset;
--
-- src = _pixman_image_get_solid (src_image, dst_image->bits.format);
--
-- /* bail out if fully transparent or degenerate */
-- srca = src >> 24;
-- if (src == 0)
-- return;
--
-- if (width == 0 || height == 0)
-- return;
--
-- if (width > NEON_SCANLINE_BUFFER_PIXELS)
-- {
-- /* split the blit, so we can use a fixed-size scanline buffer
-- * TODO: there must be a more elegant way of doing this.
-- */
-- int x;
-- for (x = 0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS)
-- {
-- neon_composite_over_n_8_0565 (
-- impl, op,
-- src_image, mask_image, dst_image,
-- src_x + x, src_y, mask_x + x, mask_y, dest_x + x, dest_y,
-- (x + NEON_SCANLINE_BUFFER_PIXELS > width) ? width - x : NEON_SCANLINE_BUFFER_PIXELS, height);
-- }
--
-- return;
-- }
--
-- PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
-- PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
--
-- /* keep within minimum number of aligned quadwords on width
-- * while also keeping the minimum number of columns to process
-- */
-- {
-- unsigned long aligned_left = (unsigned long)(dst_line) & ~0xF;
-- unsigned long aligned_right = (((unsigned long)(dst_line + width)) + 0xF) & ~0xF;
-- unsigned long ceiling_length = (((unsigned long) width) * sizeof(*dst_line) + 0xF) & ~0xF;
--
-- /* the fast copy should be quadword aligned */
-- copy_offset = dst_line - ((uint16_t*) aligned_left);
-- aligned_line = dst_line - copy_offset;
-- copy_count = (uint32_t) ((aligned_right - aligned_left) >> 4);
-- copy_tail = 0;
--
-- if (aligned_right - aligned_left > ceiling_length)
-- {
-- /* unaligned routine is tightest */
-- kernel_count = (uint32_t) (ceiling_length >> 4);
-- kernel_offset = copy_offset;
-- }
-- else
-- {
-- /* aligned routine is equally tight, so it is safer to align */
-- kernel_count = copy_count;
-- kernel_offset = 0;
-- }
--
-- /* We should avoid reading beyond scanline ends for safety */
-- if (aligned_line < (dst_line - dest_x) ||
-- (aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
-- {
-- /* switch to precise read */
-- copy_offset = kernel_offset = 0;
-- aligned_line = dst_line;
-- kernel_count = (uint32_t) (ceiling_length >> 4);
-- copy_count = (width * sizeof(*dst_line)) >> 4;
-- copy_tail = (width * sizeof(*dst_line)) & 0xF;
-- }
-- }
--
-- {
-- uint16_t scan_line[NEON_SCANLINE_BUFFER_PIXELS + 8]; /* deliberately not initialised */
-- uint8_t glyph_line[NEON_SCANLINE_BUFFER_PIXELS + 8];
-- int y = height;
--
-- /* row-major order */
-- /* left edge, middle block, right edge */
-- for ( ; y--; mask_line += mask_stride, aligned_line += dst_stride, dst_line += dst_stride)
-- {
-- /* We don't want to overrun the edges of the glyph,
-- * so realign the edge data into known buffers
-- */
-- neon_quadword_copy (glyph_line + copy_offset, mask_line, width >> 4, width & 0xF);
--
-- /* Uncached framebuffer access is really, really slow
-- * if we do it piecemeal. It should be much faster if we
-- * grab it all at once. One scanline should easily fit in
-- * L1 cache, so this should not waste RAM bandwidth.
-- */
-- neon_quadword_copy (scan_line, aligned_line, copy_count, copy_tail);
--
-- /* Apply the actual filter */
-- solid_over_565_8_pix_neon (
-- src, scan_line + kernel_offset,
-- glyph_line + kernel_offset, 8 * sizeof(*dst_line),
-- 8, kernel_count);
--
-- /* Copy the modified scanline back */
-- neon_quadword_copy (dst_line, scan_line + copy_offset,
-- width >> 3, (width & 7) * 2);
-- }
-- }
--}
--#endif
--
--#ifdef USE_GCC_INLINE_ASM
--
--static inline void
--plain_over_565_8_pix_neon (uint32_t colour,
-- uint16_t *dest,
-- uint32_t dest_stride, /* bytes, not elements */
-- uint32_t count /* 8-pixel groups */)
--{
-- /* Inner loop for plain translucent rects
-- * (solid colour without alpha mask)
-- */
-- asm volatile (
-- " vld4.8 {d20[], d21[], d22[], d23[]}, [%[colour]] @ solid colour load/splat \n"
-- " vmull.u8 q12, d23, d22 @ premultiply alpha red \n"
-- " vmull.u8 q13, d23, d21 @ premultiply alpha green \n"
-- " vmull.u8 q14, d23, d20 @ premultiply alpha blue \n"
-- " vmvn d18, d23 @ inverse alpha for background \n"
-- "0: @ loop\n"
-- " vld1.16 {d0, d1}, [%[dest]] @ load first pixels from framebuffer \n"
-- " vshrn.u16 d2, q0, #8 @ unpack red from framebuffer pixels \n"
-- " vshrn.u16 d4, q0, #3 @ unpack green \n"
-- " vsli.u16 q3, q0, #5 @ duplicate framebuffer blue bits \n"
-- " vsri.u8 d2, d2, #5 @ duplicate red bits (extend 5 to 8) \n"
-- " vsri.u8 d4, d4, #6 @ duplicate green bits (extend 6 to 8) \n"
-- " vshrn.u16 d6, q3, #2 @ unpack extended blue (truncate 10 to 8) \n"
-- " vmov q0, q12 @ retrieve foreground red \n"
-- " vmlal.u8 q0, d2, d18 @ blend red - my kingdom for a four-operand MLA \n"
-- " vmov q1, q13 @ retrieve foreground green \n"
-- " vmlal.u8 q1, d4, d18 @ blend green \n"
-- " vmov q2, q14 @ retrieve foreground blue \n"
-- " vmlal.u8 q2, d6, d18 @ blend blue \n"
-- " subs %[count], %[count], #1 @ decrement/test loop counter \n"
-- " vsri.16 q0, q1, #5 @ pack green behind red \n"
-- " vsri.16 q0, q2, #11 @ pack blue into pixels \n"
-- " vst1.16 {d0, d1}, [%[dest]] @ store composited pixels \n"
-- " add %[dest], %[dest], %[dest_stride] @ advance framebuffer pointer \n"
-- " bne 0b @ next please \n"
--
-- /* Clobbered registers marked as input/outputs */
-- : [dest] "+r" (dest), [count] "+r" (count)
--
-- /* Inputs */
-- : [dest_stride] "r" (dest_stride), [colour] "r" (&colour)
--
-- /* Clobbers, including the inputs we modify, and
-- * potentially lots of memory
-- */
-- : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d18", "d19",
-- "d20", "d21", "d22", "d23", "d24", "d25", "d26", "d27", "d28", "d29",
-- "cc", "memory"
-- );
--}
--
--static void
--neon_composite_over_n_0565 (pixman_implementation_t * impl,
-- pixman_op_t op,
-- pixman_image_t * src_image,
-- pixman_image_t * mask_image,
-- pixman_image_t * dst_image,
-- int32_t src_x,
-- int32_t src_y,
-- int32_t mask_x,
-- int32_t mask_y,
-- int32_t dest_x,
-- int32_t dest_y,
-- int32_t width,
-- int32_t height)
--{
-- uint32_t src, srca;
-- uint16_t *dst_line, *aligned_line;
-- uint32_t dst_stride;
-- uint32_t kernel_count, copy_count, copy_tail;
-- uint8_t kernel_offset, copy_offset;
--
-- src = _pixman_image_get_solid (src_image, dst_image->bits.format);
--
-- /* bail out if fully transparent */
-- srca = src >> 24;
-- if (src == 0)
-- return;
--
-- if (width == 0 || height == 0)
-- return;
--
-- if (width > NEON_SCANLINE_BUFFER_PIXELS)
-- {
-- /* split the blit, so we can use a fixed-size scanline buffer *
-- * TODO: there must be a more elegant way of doing this.
-- */
-- int x;
--
-- for (x = 0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS)
-- {
-- neon_composite_over_n_0565 (
-- impl, op,
-- src_image, mask_image, dst_image,
-- src_x + x, src_y, mask_x + x, mask_y, dest_x + x, dest_y,
-- (x + NEON_SCANLINE_BUFFER_PIXELS > width) ? width - x : NEON_SCANLINE_BUFFER_PIXELS, height);
-- }
-- return;
-- }
--
-- PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
--
-- /* keep within minimum number of aligned quadwords on width
-- * while also keeping the minimum number of columns to process
-- */
-- {
-- unsigned long aligned_left = (unsigned long)(dst_line) & ~0xF;
-- unsigned long aligned_right = (((unsigned long)(dst_line + width)) + 0xF) & ~0xF;
-- unsigned long ceiling_length = (((unsigned long) width) * sizeof(*dst_line) + 0xF) & ~0xF;
--
-- /* the fast copy should be quadword aligned */
-- copy_offset = dst_line - ((uint16_t*) aligned_left);
-- aligned_line = dst_line - copy_offset;
-- copy_count = (uint32_t) ((aligned_right - aligned_left) >> 4);
-- copy_tail = 0;
--
-- if (aligned_right - aligned_left > ceiling_length)
-- {
-- /* unaligned routine is tightest */
-- kernel_count = (uint32_t) (ceiling_length >> 4);
-- kernel_offset = copy_offset;
-- }
-- else
-- {
-- /* aligned routine is equally tight, so it is safer to align */
-- kernel_count = copy_count;
-- kernel_offset = 0;
-- }
--
-- /* We should avoid reading beyond scanline ends for safety */
-- if (aligned_line < (dst_line - dest_x) ||
-- (aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
-- {
-- /* switch to precise read */
-- copy_offset = kernel_offset = 0;
-- aligned_line = dst_line;
-- kernel_count = (uint32_t) (ceiling_length >> 4);
-- copy_count = (width * sizeof(*dst_line)) >> 4;
-- copy_tail = (width * sizeof(*dst_line)) & 0xF;
-- }
-- }
--
-- {
-- uint16_t scan_line[NEON_SCANLINE_BUFFER_PIXELS + 8]; /* deliberately not initialised */
--
-- /* row-major order */
-- /* left edge, middle block, right edge */
-- for ( ; height--; aligned_line += dst_stride, dst_line += dst_stride)
-- {
-- /* Uncached framebuffer access is really, really slow if we do it piecemeal.
-- * It should be much faster if we grab it all at once.
-- * One scanline should easily fit in L1 cache, so this should
-- * not waste RAM bandwidth.
-- */
-- neon_quadword_copy (scan_line, aligned_line, copy_count, copy_tail);
--
-- /* Apply the actual filter */
-- plain_over_565_8_pix_neon (
-- src, scan_line + kernel_offset, 8 * sizeof(*dst_line), kernel_count);
--
-- /* Copy the modified scanline back */
-- neon_quadword_copy (
-- dst_line, scan_line + copy_offset, width >> 3, (width & 7) * 2);
-- }
-- }
--}
--
--static inline void
--ARGB8_over_565_8_pix_neon (uint32_t *src,
-- uint16_t *dest,
-- uint32_t src_stride, /* bytes, not elements */
-- uint32_t count /* 8-pixel groups */)
--{
-- asm volatile (
-- "0: @ loop\n"
-- " pld [%[src], %[src_stride]] @ preload from next scanline \n"
-- " vld1.16 {d0, d1}, [%[dest]] @ load pixels from framebuffer \n"
-- " vld4.8 {d20, d21, d22, d23},[%[src]]! @ load source image pixels \n"
-- " vsli.u16 q3, q0, #5 @ duplicate framebuffer blue bits \n"
-- " vshrn.u16 d2, q0, #8 @ unpack red from framebuffer pixels \n"
-- " vshrn.u16 d4, q0, #3 @ unpack green \n"
-- " vmvn d18, d23 @ we need the inverse alpha for the background \n"
-- " vsri.u8 d2, d2, #5 @ duplicate red bits (extend 5 to 8) \n"
-- " vshrn.u16 d6, q3, #2 @ unpack extended blue (truncate 10 to 8) \n"
-- " vsri.u8 d4, d4, #6 @ duplicate green bits (extend 6 to 8) \n"
-- " vmull.u8 q1, d2, d18 @ apply inverse alpha to background red... \n"
-- " vmull.u8 q2, d4, d18 @ ...green... \n"
-- " vmull.u8 q3, d6, d18 @ ...blue \n"
-- " subs %[count], %[count], #1 @ decrement/test loop counter \n"
-- " vmlal.u8 q1, d23, d22 @ add blended foreground red... \n"
-- " vmlal.u8 q2, d23, d21 @ ...green... \n"
-- " vmlal.u8 q3, d23, d20 @ ...blue \n"
-- " vsri.16 q1, q2, #5 @ pack green behind red \n"
-- " vsri.16 q1, q3, #11 @ pack blue into pixels \n"
-- " vst1.16 {d2, d3}, [%[dest]]! @ store composited pixels \n"
-- " bne 0b @ next please \n"
--
-- /* Clobbered registers marked as input/outputs */
-- : [dest] "+r" (dest), [src] "+r" (src), [count] "+r" (count)
--
-- /* Inputs */
-- : [src_stride] "r" (src_stride)
--
-- /* Clobbers, including the inputs we modify, and potentially lots of memory */
-- : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d17", "d18", "d20",
-- "d21", "d22", "d23", "cc", "memory"
-- );
--}
--
--static void
--neon_composite_over_8888_0565 (pixman_implementation_t * impl,
-- pixman_op_t op,
-- pixman_image_t * src_image,
-- pixman_image_t * mask_image,
-- pixman_image_t * dst_image,
-- int32_t src_x,
-- int32_t src_y,
-- int32_t mask_x,
-- int32_t mask_y,
-- int32_t dest_x,
-- int32_t dest_y,
-- int32_t width,
-- int32_t height)
--{
-- uint32_t *src_line;
-- uint16_t *dst_line, *aligned_line;
-- uint32_t dst_stride, src_stride;
-- uint32_t kernel_count, copy_count, copy_tail;
-- uint8_t kernel_offset, copy_offset;
--
-- /* we assume mask is opaque
-- * so the only alpha to deal with is embedded in src
-- */
-- if (width > NEON_SCANLINE_BUFFER_PIXELS)
-- {
-- /* split the blit, so we can use a fixed-size scanline buffer */
-- int x;
-- for (x = 0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS)
-- {
-- neon_composite_over_8888_0565 (
-- impl, op,
-- src_image, mask_image, dst_image,
-- src_x + x, src_y, mask_x + x, mask_y, dest_x + x, dest_y,
-- (x + NEON_SCANLINE_BUFFER_PIXELS > width) ? width - x : NEON_SCANLINE_BUFFER_PIXELS, height);
-- }
-- return;
-- }
--
-- PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
-- PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
--
-- /* keep within minimum number of aligned quadwords on width
-- * while also keeping the minimum number of columns to process
-- */
-- {
-- unsigned long aligned_left = (unsigned long)(dst_line) & ~0xF;
-- unsigned long aligned_right = (((unsigned long)(dst_line + width)) + 0xF) & ~0xF;
-- unsigned long ceiling_length = (((unsigned long) width) * sizeof(*dst_line) + 0xF) & ~0xF;
--
-- /* the fast copy should be quadword aligned */
-- copy_offset = dst_line - ((uint16_t*) aligned_left);
-- aligned_line = dst_line - copy_offset;
-- copy_count = (uint32_t) ((aligned_right - aligned_left) >> 4);
-- copy_tail = 0;
--
-- if (aligned_right - aligned_left > ceiling_length)
-- {
-- /* unaligned routine is tightest */
-- kernel_count = (uint32_t) (ceiling_length >> 4);
-- kernel_offset = copy_offset;
-- }
-- else
-- {
-- /* aligned routine is equally tight, so it is safer to align */
-- kernel_count = copy_count;
-- kernel_offset = 0;
-- }
--
-- /* We should avoid reading beyond scanline ends for safety */
-- if (aligned_line < (dst_line - dest_x) ||
-- (aligned_line + (copy_count * 16 / sizeof(*dst_line))) > ((dst_line - dest_x) + dst_image->bits.width))
-- {
-- /* switch to precise read */
-- copy_offset = kernel_offset = 0;
-- aligned_line = dst_line;
-- kernel_count = (uint32_t) (ceiling_length >> 4);
-- copy_count = (width * sizeof(*dst_line)) >> 4;
-- copy_tail = (width * sizeof(*dst_line)) & 0xF;
-- }
-- }
--
-- /* Preload the first input scanline */
-- {
-- uint8_t *src_ptr = (uint8_t*) src_line;
-- uint32_t count = (width + 15) / 16;
--
--#ifdef USE_GCC_INLINE_ASM
-- asm volatile (
-- "0: @ loop \n"
-- " subs %[count], %[count], #1 \n"
-- " pld [%[src]] \n"
-- " add %[src], %[src], #64 \n"
-- " bgt 0b \n"
--
-- /* Clobbered input registers marked as input/outputs */
-- : [src] "+r" (src_ptr), [count] "+r" (count)
-- : /* no unclobbered inputs */
-- : "cc"
-- );
--#else
-- do
-- {
-- __pld (src_ptr);
-- src_ptr += 64;
-- }
-- while (--count);
--#endif
-- }
--
-- {
-- uint16_t scan_line[NEON_SCANLINE_BUFFER_PIXELS + 8]; /* deliberately not initialised */
--
-- /* row-major order */
-- /* left edge, middle block, right edge */
-- for ( ; height--; src_line += src_stride, aligned_line += dst_stride)
-- {
-- /* Uncached framebuffer access is really, really slow if we do
-- * it piecemeal. It should be much faster if we grab it all at
-- * once. One scanline should easily fit in L1 cache, so this
-- * should not waste RAM bandwidth.
-- */
-- neon_quadword_copy (scan_line, aligned_line, copy_count, copy_tail);
--
-- /* Apply the actual filter */
-- ARGB8_over_565_8_pix_neon (
-- src_line, scan_line + kernel_offset,
-- src_stride * sizeof(*src_line), kernel_count);
--
-- /* Copy the modified scanline back */
-- neon_quadword_copy (dst_line,
-- scan_line + copy_offset,
-- width >> 3, (width & 7) * 2);
-- }
-- }
--}
--
--#endif /* USE_GCC_INLINE_ASM */
--
- static const pixman_fast_path_t arm_neon_fast_path_array[] =
- {
- { PIXMAN_OP_ADD, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, neon_composite_add_8888_8_8, 0 },
-@@ -2612,12 +1908,6 @@ static const pixman_fast_path_t arm_neon_fast_path_array[] =
- #ifdef USE_GCC_INLINE_ASM
- { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_src_16_16, 0 },
- { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_src_16_16, 0 },
--#if 0 /* this code has some bugs */
-- { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_over_n_0565, 0 },
-- { PIXMAN_OP_OVER, PIXMAN_solid, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_over_n_0565, 0 },
-- { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_over_8888_0565, 0 },
-- { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_over_8888_0565, 0 },
--#endif
- #endif
- { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, neon_composite_over_8888_8888, 0 },
- { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, neon_composite_over_8888_8888, 0 },
-@@ -2668,79 +1958,6 @@ arm_neon_composite (pixman_implementation_t *imp,
- }
-
- static pixman_bool_t
--pixman_blt_neon (void *src_bits,
-- void *dst_bits,
-- int src_stride,
-- int dst_stride,
-- int src_bpp,
-- int dst_bpp,
-- int src_x,
-- int src_y,
-- int dst_x,
-- int dst_y,
-- int width,
-- int height)
--{
-- if (!width || !height)
-- return TRUE;
--
-- /* accelerate only straight copies involving complete bytes */
-- if (src_bpp != dst_bpp || (src_bpp & 7))
-- return FALSE;
--
-- {
-- uint32_t bytes_per_pixel = src_bpp >> 3;
-- uint32_t byte_width = width * bytes_per_pixel;
-- /* parameter is in words for some reason */
-- int32_t src_stride_bytes = src_stride * 4;
-- int32_t dst_stride_bytes = dst_stride * 4;
-- uint8_t *src_bytes = ((uint8_t*) src_bits) +
-- src_y * src_stride_bytes + src_x * bytes_per_pixel;
-- uint8_t *dst_bytes = ((uint8_t*) dst_bits) +
-- dst_y * dst_stride_bytes + dst_x * bytes_per_pixel;
-- uint32_t quadword_count = byte_width / 16;
-- uint32_t offset = byte_width % 16;
--
-- while (height--)
-- {
-- neon_quadword_copy (dst_bytes, src_bytes, quadword_count, offset);
-- src_bytes += src_stride_bytes;
-- dst_bytes += dst_stride_bytes;
-- }
-- }
--
-- return TRUE;
--}
--
--static pixman_bool_t
--arm_neon_blt (pixman_implementation_t *imp,
-- uint32_t * src_bits,
-- uint32_t * dst_bits,
-- int src_stride,
-- int dst_stride,
-- int src_bpp,
-- int dst_bpp,
-- int src_x,
-- int src_y,
-- int dst_x,
-- int dst_y,
-- int width,
-- int height)
--{
-- if (pixman_blt_neon (
-- src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
-- src_x, src_y, dst_x, dst_y, width, height))
-- {
-- return TRUE;
-- }
--
-- return _pixman_implementation_blt (
-- imp->delegate,
-- src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
-- src_x, src_y, dst_x, dst_y, width, height);
--}
--
--static pixman_bool_t
- arm_neon_fill (pixman_implementation_t *imp,
- uint32_t * bits,
- int stride,
-@@ -2765,9 +1982,6 @@ _pixman_implementation_create_arm_neon (void)
- pixman_implementation_t *imp = _pixman_implementation_create (simd);
-
- imp->composite = arm_neon_composite;
--#if 0 /* this code has some bugs */
-- imp->blt = arm_neon_blt;
--#endif
- imp->fill = arm_neon_fill;
-
- return imp;
diff --git a/recipes/xorg-lib/pixman/src-8888-0565.patch b/recipes/xorg-lib/pixman/src-8888-0565.patch
deleted file mode 100644
index c544225..0000000
--- a/recipes/xorg-lib/pixman/src-8888-0565.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-From 6494f9ae8820078d0e6109bf8f294156f7a5da4c Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Fri, 05 Mar 2010 00:40:34 +0000
-Subject: ARM: added 'armv6_composite_src_8888_0565' fast path
-
-Provides ~3x performance improvement when working with
-data in L1 cache, and ~80% performace improvement when working
-with memory. This fast path is important for 32bpp -> 16bpp
-color format conversion and is commonly used with 16bpp desktop.
-
-Microbenchmark from N800 (ARM11 @ 400MHz), measured in MPix/s:
-
-before:
-
- src_8888_0565 = L1: 21.54 M: 15.62
-
-after (armv4):
-
- src_8888_0565 = L1: 45.26 M: 23.29
-
-after (armv6):
-
- src_8888_0565 = L1: 60.62 M: 28.37
----
-diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
-index c375c01..69243c1 100644
---- a/pixman/pixman-arm-simd.c
-+++ b/pixman/pixman-arm-simd.c
-@@ -604,6 +604,282 @@ armv6_composite_over_n_8_0565 (pixman_implementation_t * impl,
- dst_stride - width, mask_stride - width, height);
- }
-
-+static inline void
-+armv4_composite_src_8888_0565_asm (
-+ uint16_t *dst, uint32_t *src, int w, int dst_stride,
-+ int src_stride, int h)
-+{
-+ uint32_t a, x, y, c1F001F = 0x1F001F, cFFFF = 0xFFFF;
-+ int backup_w = w;
-+ while (h--)
-+ {
-+ w = backup_w;
-+ if (w > 0 && (uintptr_t)dst & 2)
-+ {
-+ x = *src++;
-+
-+ a = (x >> 3) & c1F001F;
-+ x &= 0xFC00;
-+ a |= a >> 5;
-+ a |= x >> 5;
-+
-+ *dst++ = a;
-+ w--;
-+ }
-+
-+ asm volatile(
-+ "subs %[w], %[w], #2\n"
-+ "blt 2f\n"
-+ "1:\n"
-+ "ldr %[x], [%[src]], #4\n"
-+ "ldr %[y], [%[src]], #4\n"
-+ "subs %[w], %[w], #2\n"
-+
-+ "and %[a], %[c1F001F], %[x], lsr #3\n"
-+ "and %[x], %[x], #0xFC00\n\n"
-+ "orr %[a], %[a], %[a], lsr #5\n"
-+ "orr %[x], %[a], %[x], lsr #5\n"
-+
-+ "and %[a], %[c1F001F], %[y], lsr #3\n"
-+ "and %[y], %[y], #0xFC00\n\n"
-+ "orr %[a], %[a], %[a], lsr #5\n"
-+ "orr %[y], %[a], %[y], lsr #5\n"
-+ /*
-+ * Writing single 32-bit value is much faster than two
-+ * separate 16-bit values for older CPUs without (efficient)
-+ * write combining, even though it costs an extra instruction.
-+ */
-+ "and %[x], %[x], %[cFFFF]\n"
-+ "orr %[x], %[x], %[y], lsl #16\n"
-+ "str %[x], [%[dst]], #4\n"
-+ "bge 1b\n"
-+ "2:\n"
-+ : [c1F001F] "+&r" (c1F001F), [cFFFF] "+&r" (cFFFF),
-+ [src] "+&r" (src), [dst] "+&r" (dst), [a] "=&r" (a),
-+ [x] "=&r" (x), [y] "=&r" (y), [w] "+&r" (w)
-+ );
-+
-+ if (w & 1)
-+ {
-+ x = *src++;
-+
-+ a = (x >> 3) & c1F001F;
-+ x = x & 0xFC00;
-+ a |= a >> 5;
-+ a |= x >> 5;
-+
-+ *dst++ = a;
-+ }
-+
-+ src += src_stride - backup_w;
-+ dst += dst_stride - backup_w;
-+ }
-+}
-+
-+/*
-+ * Conversion x8r8g8b8 -> r5g6b5
-+ *
-+ * Note: 'w' must be >= 7 here
-+ */
-+static void __attribute__((naked))
-+armv6_composite_src_8888_0565_asm (
-+ uint16_t *dst, uint32_t *src, int w, int dst_stride,
-+ int src_stride, int h)
-+{
-+ asm volatile(
-+ /* define supplementary macros */
-+ ".macro cvt8888to565 PIX\n"
-+ "and A, C1F001F, \\PIX, lsr #3\n"
-+ "and \\PIX, \\PIX, #0xFC00\n\n"
-+ "orr A, A, A, lsr #5\n"
-+ "orr \\PIX, A, \\PIX, lsr #5\n"
-+ ".endm\n"
-+
-+ ".macro combine_pixels_pair PIX1, PIX2\n"
-+ /* Note: assume little endian byte order */
-+ "pkhbt \\PIX1, \\PIX1, \\PIX2, lsl #16\n"
-+ ".endm\n"
-+
-+ /* function entry, save all registers (10 words) to stack */
-+ "stmdb sp!, {r4-r11, ip, lr}\n"
-+
-+ /* define some aliases */
-+ "DST .req r0\n"
-+ "SRC .req r1\n"
-+ "W .req r2\n"
-+ "H .req r3\n"
-+
-+ "TMP1 .req r4\n"
-+ "TMP2 .req r5\n"
-+ "TMP3 .req r6\n"
-+ "TMP4 .req r7\n"
-+ "TMP5 .req r8\n"
-+ "TMP6 .req r9\n"
-+ "TMP7 .req r10\n"
-+ "TMP8 .req r11\n"
-+
-+ "C1F001F .req ip\n"
-+ "A .req lr\n"
-+
-+ "ldr TMP1, [sp, #(10*4+0)]\n" /* load src_stride */
-+ "ldr C1F001F, =0x1F001F\n"
-+ "sub r3, r3, W\n"
-+ "str r3, [sp, #(10*4+0)]\n" /* store (dst_stride-w) */
-+ "ldr r3, [sp, #(10*4+4)]\n" /* load h */
-+ "sub TMP1, TMP1, W\n"
-+ "str TMP1, [sp, #(10*4+4)]\n" /* store (src_stride-w) */
-+
-+ "str W, [sp, #(8*4)]\n" /* saved ip = W */
-+
-+ "0:\n"
-+ "subs H, H, #1\n"
-+ "blt 6f\n"
-+ "1:\n"
-+ /* align DST at 4 byte boundary */
-+ "tst DST, #2\n"
-+ "beq 2f\n"
-+ "ldr TMP1, [SRC], #4\n"
-+ "sub W, W, #1\n"
-+ "cvt8888to565 TMP1\n"
-+ "strh TMP1, [DST], #2\n"
-+ "2:"
-+ /* align DST at 8 byte boundary */
-+ "tst DST, #4\n"
-+ "beq 2f\n"
-+ "ldmia SRC!, {TMP1, TMP2}\n"
-+ "sub W, W, #2\n"
-+ "cvt8888to565 TMP1\n"
-+ "cvt8888to565 TMP2\n"
-+ "combine_pixels_pair TMP1, TMP2\n"
-+ "str TMP1, [DST], #4\n"
-+ "2:"
-+ /* align DST at 16 byte boundary */
-+ "tst DST, #8\n"
-+ "beq 2f\n"
-+ "ldmia SRC!, {TMP1, TMP2, TMP3, TMP4}\n"
-+ "sub W, W, #4\n"
-+ "cvt8888to565 TMP1\n"
-+ "cvt8888to565 TMP2\n"
-+ "cvt8888to565 TMP3\n"
-+ "cvt8888to565 TMP4\n"
-+ "combine_pixels_pair TMP1, TMP2\n"
-+ "combine_pixels_pair TMP3, TMP4\n"
-+ "stmia DST!, {TMP1, TMP3}\n"
-+ "2:"
-+ /* inner loop, process 8 pixels per iteration */
-+ "subs W, W, #8\n"
-+ "blt 4f\n"
-+ "3:\n"
-+ "ldmia SRC!, {TMP1, TMP2, TMP3, TMP4, TMP5, TMP6, TMP7, TMP8}\n"
-+ "subs W, W, #8\n"
-+ "cvt8888to565 TMP1\n"
-+ "cvt8888to565 TMP2\n"
-+ "cvt8888to565 TMP3\n"
-+ "cvt8888to565 TMP4\n"
-+ "cvt8888to565 TMP5\n"
-+ "cvt8888to565 TMP6\n"
-+ "cvt8888to565 TMP7\n"
-+ "cvt8888to565 TMP8\n"
-+ "combine_pixels_pair TMP1, TMP2\n"
-+ "combine_pixels_pair TMP3, TMP4\n"
-+ "combine_pixels_pair TMP5, TMP6\n"
-+ "combine_pixels_pair TMP7, TMP8\n"
-+ "stmia DST!, {TMP1, TMP3, TMP5, TMP7}\n"
-+ "bge 3b\n"
-+ "4:\n"
-+
-+ /* process the remaining pixels */
-+ "tst W, #4\n"
-+ "beq 4f\n"
-+ "ldmia SRC!, {TMP1, TMP2, TMP3, TMP4}\n"
-+ "cvt8888to565 TMP1\n"
-+ "cvt8888to565 TMP2\n"
-+ "cvt8888to565 TMP3\n"
-+ "cvt8888to565 TMP4\n"
-+ "combine_pixels_pair TMP1, TMP2\n"
-+ "combine_pixels_pair TMP3, TMP4\n"
-+ "stmia DST!, {TMP1, TMP3}\n"
-+ "4:\n"
-+ "tst W, #2\n"
-+ "beq 4f\n"
-+ "ldmia SRC!, {TMP1, TMP2}\n"
-+ "cvt8888to565 TMP1\n"
-+ "cvt8888to565 TMP2\n"
-+ "combine_pixels_pair TMP1, TMP2\n"
-+ "str TMP1, [DST], #4\n"
-+ "4:\n"
-+ "tst W, #1\n"
-+ "beq 4f\n"
-+ "ldr TMP1, [SRC], #4\n"
-+ "cvt8888to565 TMP1\n"
-+ "strh TMP1, [DST], #2\n"
-+ "4:\n"
-+ "ldr TMP1, [sp, #(10*4+0)]\n" /* (dst_stride-w) */
-+ "ldr TMP2, [sp, #(10*4+4)]\n" /* (src_stride-w) */
-+ "ldr W, [sp, #(8*4)]\n"
-+ "subs H, H, #1\n"
-+ "add DST, DST, TMP1, lsl #1\n"
-+ "add SRC, SRC, TMP2, lsl #2\n"
-+ "bge 1b\n"
-+ "6:\n"
-+ /* restore all registers and return */
-+ "ldmia sp!, {r4-r11, ip, pc}\n"
-+ ".ltorg\n"
-+
-+ ".unreq DST\n"
-+ ".unreq SRC\n"
-+ ".unreq W\n"
-+ ".unreq H\n"
-+
-+ ".unreq TMP1\n"
-+ ".unreq TMP2\n"
-+ ".unreq TMP3\n"
-+ ".unreq TMP4\n"
-+ ".unreq TMP5\n"
-+ ".unreq TMP6\n"
-+ ".unreq TMP7\n"
-+ ".unreq TMP8\n"
-+
-+ ".unreq C1F001F\n"
-+ ".unreq A\n"
-+
-+ ".purgem cvt8888to565\n"
-+ ".purgem combine_pixels_pair\n"
-+ );
-+}
-+
-+static void
-+armv6_composite_src_8888_0565 (pixman_implementation_t * impl,
-+ pixman_op_t op,
-+ pixman_image_t * src_image,
-+ pixman_image_t * mask_image,
-+ pixman_image_t * dst_image,
-+ int32_t src_x,
-+ int32_t src_y,
-+ int32_t mask_x,
-+ int32_t mask_y,
-+ int32_t dest_x,
-+ int32_t dest_y,
-+ int32_t width,
-+ int32_t height)
-+{
-+ uint32_t *src;
-+ uint16_t *dst;
-+ int src_stride, dst_stride;
-+
-+ PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t,
-+ dst_stride, dst, 1);
-+ PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t,
-+ src_stride, src, 1);
-+
-+ if (width < 7)
-+ armv4_composite_src_8888_0565_asm (dst, src, width,
-+ dst_stride, src_stride, height);
-+ else
-+ armv6_composite_src_8888_0565_asm (dst, src, width,
-+ dst_stride, src_stride, height);
-+}
-+
- #endif
-
- static const pixman_fast_path_t arm_simd_fast_paths[] =
-@@ -624,6 +900,10 @@ static const pixman_fast_path_t arm_simd_fast_paths[] =
- #if defined(__ARM_EABI__) && defined(__linux__)
- PIXMAN_STD_FAST_PATH (OVER, solid, a8, r5g6b5, armv6_composite_over_n_8_0565),
- PIXMAN_STD_FAST_PATH (OVER, solid, a8, b5g6r5, armv6_composite_over_n_8_0565),
-+ PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, r5g6b5, armv6_composite_src_8888_0565),
-+ PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, r5g6b5, armv6_composite_src_8888_0565),
-+ PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, b5g6r5, armv6_composite_src_8888_0565),
-+ PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, b5g6r5, armv6_composite_src_8888_0565),
- #endif
- { PIXMAN_OP_NONE },
- };
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman/tls.patch b/recipes/xorg-lib/pixman/tls.patch
deleted file mode 100644
index 316caed..0000000
--- a/recipes/xorg-lib/pixman/tls.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 714559dccda3165a72f0a9935c1edc3aef535f30 Mon Sep 17 00:00:00 2001
-From: Søren Sandmann Pedersen <ssp@redhat.com>
-Date: Wed, 07 Apr 2010 05:44:12 +0000
-Subject: Fixes for pthread thread local storage.
-
-The tls_name_key variable is passed to tls_name_get(), and the first
-time this happens it isn't initialized. tls_name_get() then passes it
-on to tls_name_alloc() which passes it on to pthread_setspecific()
-leading to undefined behavior.
-
-None of this is actually necessary at all because there is only one
-such variable per thread local variable, so it doesn't need to passed
-as a parameter at all.
-
-All of this was pointed out by Tor Lillqvist on the cairo mailing
-list.
----
-diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
-index cdac0d8..531c8c9 100644
---- a/pixman/pixman-compiler.h
-+++ b/pixman/pixman-compiler.h
-@@ -99,16 +99,16 @@
- } \
- \
- static type * \
-- tls_ ## name ## _alloc (key) \
-+ tls_ ## name ## _alloc (void) \
- { \
- type *value = calloc (1, sizeof (type)); \
- if (value) \
-- pthread_setspecific (key, value); \
-+ pthread_setspecific (tls_ ## name ## _key, value); \
- return value; \
- } \
- \
- static force_inline type * \
-- tls_ ## name ## _get (key) \
-+ tls_ ## name ## _get (void) \
- { \
- type *value = NULL; \
- if (pthread_once (&tls_ ## name ## _once_control, \
-@@ -116,13 +116,13 @@
- { \
- value = pthread_getspecific (tls_ ## name ## _key); \
- if (!value) \
-- value = tls_ ## name ## _alloc (key); \
-+ value = tls_ ## name ## _alloc (); \
- } \
- return value; \
- }
-
- # define PIXMAN_GET_THREAD_LOCAL(name) \
-- tls_ ## name ## _get (tls_ ## name ## _key)
-+ tls_ ## name ## _get ()
-
- #else
-
---
-cgit v0.8.3-6-g21f6
diff --git a/recipes/xorg-lib/pixman_0.10.0.bb b/recipes/xorg-lib/pixman_0.10.0.bb
deleted file mode 100644
index 8690818..0000000
--- a/recipes/xorg-lib/pixman_0.10.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "41804ac38025102dcc9891dfd4a3d105"
-SRC_URI[archive.sha256sum] = "48625f6b5ce130672942503c683d306d957ee40f59f8e59be6ca30a245ad47d0"
diff --git a/recipes/xorg-lib/pixman_0.11.4.bb b/recipes/xorg-lib/pixman_0.11.4.bb
deleted file mode 100644
index b058104..0000000
--- a/recipes/xorg-lib/pixman_0.11.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "8c8afc259af61d42aa9b3d8ec5a9a03b"
-SRC_URI[archive.sha256sum] = "d034f4afb4329c38e8789a5a7a384194c7402094b4c2b7600d2d86d8589e8571"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/xorg-lib/pixman_0.11.8.bb b/recipes/xorg-lib/pixman_0.11.8.bb
deleted file mode 100644
index d7c6717..0000000
--- a/recipes/xorg-lib/pixman_0.11.8.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI += " \
- file://pixman-arm.patch \
- file://pixman-x888-565.patch \
- "
-SRC_URI[archive.md5sum] = "7b5db768c51337b5e5e954fc9c961cd3"
-SRC_URI[archive.sha256sum] = "720db5ef6ed0e744b9bac5360ade9a7c024f9fb3fab05c83a90ee28b08e66e01"
diff --git a/recipes/xorg-lib/pixman_0.15.18.bb b/recipes/xorg-lib/pixman_0.15.18.bb
deleted file mode 100644
index 4811a01..0000000
--- a/recipes/xorg-lib/pixman_0.15.18.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "9b60fe7623621b546b76777b8b7d2490"
-SRC_URI[archive.sha256sum] = "3a5003cf6c7d5b03ed5977c108ee11410cfd7849eea370eb4feae98f2822c795"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/xorg-lib/pixman_0.15.6.bb b/recipes/xorg-lib/pixman_0.15.6.bb
deleted file mode 100644
index a09de4e..0000000
--- a/recipes/xorg-lib/pixman_0.15.6.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "fe922698df46b21d7e19f28ded4ca100"
-SRC_URI[archive.sha256sum] = "3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/xorg-lib/pixman_0.17.12.bb b/recipes/xorg-lib/pixman_0.17.12.bb
deleted file mode 100644
index b476aaa..0000000
--- a/recipes/xorg-lib/pixman_0.17.12.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI += "\
- file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
- file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
- file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
- file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
- file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
- file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch \
- file://over-n-8-0565.patch \
- file://src-8888-0565.patch \
-"
-SRC_URI[archive.md5sum] = "331415d7a110145cf27aa00e11d0a683"
-SRC_URI[archive.sha256sum] = "8cce103af1b4200a13bedca5b763f74c9bc99a55985ab44ca92ba532dac6b57f"
-
-NEON = " --disable-arm-neon "
-NEON_armv7a = " "
-
-EXTRA_OECONF = "${NEON} --disable-gtk"
-
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_angstrom = "2"
-DEFAULT_PREFERENCE_shr = "2"
diff --git a/recipes/xorg-lib/pixman_0.17.8.bb b/recipes/xorg-lib/pixman_0.17.8.bb
deleted file mode 100644
index 55c70c8..0000000
--- a/recipes/xorg-lib/pixman_0.17.8.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.0"
-
-SRC_URI += " \
- file://0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
- file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
- file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
- file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
- file://1-composite.patch \
- file://2-composite.patch \
- file://3-composite.patch \
- "
-SRC_URI[archive.md5sum] = "a7deb2ff6b286b676d67aa6ae91317ae"
-SRC_URI[archive.sha256sum] = "ea24e9003455a0881bd43bf7e4169f2b34c90c8521405103e3490553876a81b4"
-
-NEON = " --disable-arm-neon "
-NEON_armv7a = " "
-
-EXTRA_OECONF = "${NEON} --disable-gtk"
-
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_angstrom = "2"
-DEFAULT_PREFERENCE_shr = "2"
diff --git a/recipes/xorg-lib/pixman_0.18.0.bb b/recipes/xorg-lib/pixman_0.18.0.bb
deleted file mode 100644
index c099b77..0000000
--- a/recipes/xorg-lib/pixman_0.18.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require pixman.inc
-PR = "${INC_PR}.3"
-
-SRC_URI += "\
- file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
- file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
- file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
- file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
- file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
- file://calloc.patch \
- file://tls.patch \
- file://565-scanline.patch \
- file://missing-cache-preload.diff \
-"
-SRC_URI[archive.md5sum] = "a4fb870fc325be258089f1683642e976"
-SRC_URI[archive.sha256sum] = "b305291bba3d9271a4481e5eedf901025ac8ba4ec8f7b76ccafc5094610cd4ff"
-
-NEON = " --disable-arm-neon "
-NEON_armv7a = " "
-
-EXTRA_OECONF = "${NEON} --disable-gtk"
-
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_shr = "2"
diff --git a/recipes/xorg-lib/pixman_0.9.4.bb b/recipes/xorg-lib/pixman_0.9.4.bb
deleted file mode 100644
index 254bf61..0000000
--- a/recipes/xorg-lib/pixman_0.9.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "Library for lowlevel pixel operations"
-DEPENDS = "virtual/libx11"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "c354ab5b0da10227226d3ef604254875"
-SRC_URI[archive.sha256sum] = "261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa"
diff --git a/recipes/xorg-lib/pixman_0.9.5.bb b/recipes/xorg-lib/pixman_0.9.5.bb
deleted file mode 100644
index 6259dea..0000000
--- a/recipes/xorg-lib/pixman_0.9.5.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "Library for lowlevel pixel operations"
-DEPENDS = "virtual/libx11"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://dont-copy-unused-bits-to-alpha-channel.patch"
-SRC_URI[archive.md5sum] = "f9fea77e46ec7a3a16e925e137f146e7"
-SRC_URI[archive.sha256sum] = "a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8"
diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb
deleted file mode 100644
index 12140c1..0000000
--- a/recipes/xorg-lib/pixman_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require pixman.inc
-PV = "0.17.13"
-PR = "${INC_PR}.2"
-PR_append = "+gitr${SRCPV}"
-
-SRC_URI = "git://anongit.freedesktop.org/pixman;protocol=git;branch=master \
- file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
- file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \
- file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \
- file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \
- file://0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch \
- file://0006-Revert-ARM-SIMD-Try-without-any-CFLAGS-before-forcin.patch \
- file://over-n-8-0565.patch \
- file://src-8888-0565.patch \
- file://calloc.patch \
- file://tls.patch \
-"
-
-SRCREV = "69f1ec9a7827aeb522fcae99846237ef0f896e7b"
-S = "${WORKDIR}/git"
-
-NEON = " --disable-arm-neon "
-NEON_armv7a = " "
-
-EXTRA_OECONF = "${NEON} --disable-gtk"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/xorg-lib/xtrans/fix-missing-includepath.patch b/recipes/xorg-lib/xtrans/fix-missing-includepath.patch
deleted file mode 100644
index 043d14f..0000000
--- a/recipes/xorg-lib/xtrans/fix-missing-includepath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- xtrans-X11R7.0-1.0.0/xtrans.pc.in~fix-missing-includepath 2005-07-02 20:00:50.000000000 +0200
-+++ xtrans-X11R7.0-1.0.0/xtrans.pc.in 2006-08-11 19:27:58.000000000 +0200
-@@ -6,4 +6,4 @@
- Name: XTrans
- Description: Abstract network code for X
- Version: @PACKAGE_VERSION@
--Cflags: -I${includedir} -D_BSD_SOURCE @fchown_define@ @sticky_bit_define@
-+Cflags: -I${includedir} -I${includedir}/X11/Xtrans -D_BSD_SOURCE @fchown_define@ @sticky_bit_define@
diff --git a/recipes/xorg-lib/xtrans_1.0.3.bb b/recipes/xorg-lib/xtrans_1.0.3.bb
deleted file mode 100644
index 19a56fa..0000000
--- a/recipes/xorg-lib/xtrans_1.0.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-missing-includepath.patch"
-SRC_URI[archive.md5sum] = "bb196907ea1e182dcb396eb22f7d2c1a"
-SRC_URI[archive.sha256sum] = "e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085"
-
-FILESPATHPKG .= ":xtrans-${PV}:xtrans"
-
-ALLOW_EMPTY = "1"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/xorg-lib/xtrans_1.0.4.bb b/recipes/xorg-lib/xtrans_1.0.4.bb
deleted file mode 100644
index d19a6c0..0000000
--- a/recipes/xorg-lib/xtrans_1.0.4.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-missing-includepath.patch"
-SRC_URI[archive.md5sum] = "8b36cdf08df12be96615e3d550236626"
-SRC_URI[archive.sha256sum] = "765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c"
-
-FILESPATHPKG .= ":xtrans-${PV}:xtrans"
-
-ALLOW_EMPTY = "1"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/xorg-lib/xtrans_1.1.bb b/recipes/xorg-lib/xtrans_1.1.bb
deleted file mode 100644
index 1f3fcb4..0000000
--- a/recipes/xorg-lib/xtrans_1.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-missing-includepath.patch"
-SRC_URI[archive.md5sum] = "8546e3a060aefb42c889eaa4b5db33af"
-SRC_URI[archive.sha256sum] = "16bc4646f105efd3d0dd105899ac19035d67acf50950ca8c70cf68772508272d"
-
-FILESPATHPKG .= ":xtrans-${PV}:xtrans"
-
-ALLOW_EMPTY = "1"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/xorg-lib/xtrans_1.2.1.bb b/recipes/xorg-lib/xtrans_1.2.1.bb
deleted file mode 100644
index e695e35..0000000
--- a/recipes/xorg-lib/xtrans_1.2.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-RDEPENDS_${PN}-dev = ""
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "96e142331edd498a9364887b2548f1bb"
-SRC_URI[archive.sha256sum] = "9ff21a8d9ea524ca9b7cb6d6b4d522b4cb20b1c35edeb8995a9e9265a0df64bd"
-
-FILESPATHPKG .= ":xtrans-${PV}:xtrans"
-
-ALLOW_EMPTY = "1"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/xorg-lib/xtrans_1.2.3.bb b/recipes/xorg-lib/xtrans_1.2.3.bb
deleted file mode 100644
index 1f0ec39..0000000
--- a/recipes/xorg-lib/xtrans_1.2.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-RDEPENDS_${PN}-dev = ""
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "f9cf791dfad59cf044e276aab3a71e1d"
-SRC_URI[archive.sha256sum] = "a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0"
-
-FILESPATHPKG .= ":xtrans-${PV}:xtrans"
-
-ALLOW_EMPTY = "1"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/xorg-lib/xtrans_1.2.bb b/recipes/xorg-lib/xtrans_1.2.bb
deleted file mode 100644
index 8a4ddca..0000000
--- a/recipes/xorg-lib/xtrans_1.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-lib-common.inc
-DESCRIPTION = "network API translation layer to insulate X applications and \
-libraries from OS network vageries."
-PE = "1"
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://fix-missing-includepath.patch"
-SRC_URI[archive.md5sum] = "a91fef8b932b21992af7dfff7b2643f3"
-SRC_URI[archive.sha256sum] = "d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4"
-
-FILESPATHPKG .= ":xtrans-${PV}:xtrans"
-
-ALLOW_EMPTY = "1"
-
-BBCLASSEXTEND = "native nativesdk"
--
1.7.2
^ permalink raw reply related [flat|nested] 16+ messages in thread