summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/kernel-arch.bbclass1
-rw-r--r--classes/package.bbclass26
-rw-r--r--classes/rootfs_ipk.bbclass2
-rw-r--r--conf/bitbake.conf5
-rw-r--r--conf/distro/angstrom-2006.9.conf6
-rw-r--r--conf/distro/ezx.conf2
-rw-r--r--conf/distro/generic.conf2
-rw-r--r--conf/distro/include/angstrom.inc1
-rw-r--r--conf/distro/include/preferred-opie-versions.inc3
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.0.inc341
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.1.inc185
-rw-r--r--conf/distro/jlime-donkey.conf30
-rw-r--r--conf/distro/openzaurus-unstable.conf1
-rw-r--r--conf/machine/h4000.conf2
-rw-r--r--conf/machine/h5xxx.conf35
-rw-r--r--conf/machine/h6300.conf6
-rw-r--r--conf/machine/htcuniversal.conf2
-rw-r--r--files/device_table-jlime.txt2
-rw-r--r--packages/angstrom/task-angstrom.bb2
-rw-r--r--packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch47
-rw-r--r--packages/anthy/anthy-native_6801.bb3
-rw-r--r--packages/anthy/anthy-native_7811.bb4
-rw-r--r--packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch90
-rw-r--r--packages/anthy/anthy_6801.bb35
-rw-r--r--packages/anthy/anthy_7811.bb46
-rw-r--r--packages/anthy/files/change_anthy_dic_path.patch16
-rw-r--r--packages/anthy/files/not_build_elc.patch18
-rw-r--r--packages/avahi/avahi_0.6.12.bb60
-rw-r--r--packages/base-files/base-files/h5xxx/.mtn2git_empty (renamed from packages/mplayer/mplayer-1.0pre7/.mtn2git_empty)0
-rw-r--r--packages/base-files/base-files/h5xxx/fstab8
-rw-r--r--packages/bluez/bluez-hcidump_1.31.bb13
-rw-r--r--packages/bluez/bluez-libs_3.1.bb22
-rw-r--r--packages/bluez/bluez-utils/.mtn2git_empty (renamed from packages/mplayer/mplayer-1.0pre8/.mtn2git_empty)0
-rw-r--r--packages/bluez/bluez-utils/02dtl1_cs.sh57
-rw-r--r--packages/bluez/bluez-utils/hciattach-ti-bts.patch489
-rw-r--r--packages/bluez/bluez-utils/hcid.conf57
-rw-r--r--packages/bluez/bluez-utils_3.1.bb52
-rw-r--r--packages/cdtool/.mtn2git_empty (renamed from packages/mplayer/mplayer-atty-1.1.5/.mtn2git_empty)0
-rw-r--r--packages/cdtool/cdtool_2.1.8pre4.bb14
-rw-r--r--packages/cdtool/files/.mtn2git_empty (renamed from packages/prelink/prelink-20050901/.mtn2git_empty)0
-rw-r--r--packages/cdtool/files/install-no-owner.patch33
-rw-r--r--packages/dbus/dbus-0.90/.mtn2git_empty (renamed from packages/x11-apps/xauth/.mtn2git_empty)0
-rw-r--r--packages/dbus/dbus-0.90/dbus-1.init86
-rw-r--r--packages/dbus/dbus-glib/.mtn2git_empty (renamed from packages/xdpyinfo/xdpyinfo/.mtn2git_empty)0
-rw-r--r--packages/dbus/dbus-glib/cross.patch15
-rw-r--r--packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch21
-rw-r--r--packages/dbus/dbus-glib/no-examples.patch8
-rw-r--r--packages/dbus/dbus-glib/no-introspect.patch17
-rw-r--r--packages/dbus/dbus-glib_0.70.bb30
-rw-r--r--packages/dbus/dbus-python/.mtn2git_empty (renamed from packages/xev/files/.mtn2git_empty)0
-rw-r--r--packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch18
-rw-r--r--packages/dbus/dbus-python_0.70.bb15
-rw-r--r--packages/dbus/dbus_0.90.bb62
-rw-r--r--packages/distcc/distcc_2.18.3.bb24
-rw-r--r--packages/e2fsprogs/e2fsprogs_1.38.bb2
-rw-r--r--packages/emacs/.mtn2git_empty (renamed from packages/xhost/xhost/.mtn2git_empty)0
-rw-r--r--packages/emacs/emacs_cvs.bb44
-rw-r--r--packages/ethtool/ethtool.inc9
-rw-r--r--packages/ethtool/ethtool_3.bb13
-rw-r--r--packages/ethtool/ethtool_4.bb2
-rw-r--r--packages/fbpanel/fbpanel_4.3.bb12
-rw-r--r--packages/flac/flac-1.1.2/.mtn2git_empty (renamed from packages/xlibs/diet-x11/.mtn2git_empty)0
-rw-r--r--packages/flac/flac-1.1.2/disable-xmms-plugin.patch21
-rw-r--r--packages/flac/flac-1.1.2/xmms.m4148
-rw-r--r--packages/flac/flac_1.1.2.bb82
-rw-r--r--packages/fontconfig/fontconfig_2.3.91.bb8
-rw-r--r--packages/gcc/gcc_4.1.1.bb8
-rw-r--r--packages/genext2fs/files/.mtn2git_empty (renamed from packages/xlibs/files/.mtn2git_empty)0
-rw-r--r--packages/genext2fs/files/volume.patch107
-rw-r--r--packages/genext2fs/genext2fs_1.3+1.4rc1.bb3
-rw-r--r--packages/glib-2.0/files/glib-mkenums-nowarn.patch8
-rw-r--r--packages/glib-2.0/glib-2.0-native_2.6.5.bb2
-rw-r--r--packages/glib-2.0/glib-2.0_2.4.5.bb5
-rw-r--r--packages/glib-2.0/glib-2.0_2.4.6.bb5
-rw-r--r--packages/glib-2.0/glib-2.0_2.6.0.bb5
-rw-r--r--packages/glib-2.0/glib-2.0_2.6.1.bb5
-rw-r--r--packages/glib-2.0/glib-2.0_2.6.2.bb5
-rw-r--r--packages/glib-2.0/glib-2.0_2.6.3.bb5
-rw-r--r--packages/glib-2.0/glib-2.0_2.6.4.bb5
-rw-r--r--packages/glib-2.0/glib-2.0_2.8.1.bb5
-rw-r--r--packages/glib-2.0/glib-2.0_2.8.2.bb5
-rw-r--r--packages/glib-2.0/glib-2.0_2.8.4.bb3
-rw-r--r--packages/gnome/gdm/.mtn2git_empty (renamed from packages/xlibs/libice/.mtn2git_empty)0
-rw-r--r--packages/gnome/gdm/gdm-nodocs.patch12
-rw-r--r--packages/gnome/gdm_2.14.9.bb16
-rw-r--r--packages/gnome/gnome-doc-utils_0.7.1.bb12
-rw-r--r--packages/gpe-gallery/files/makefile-fix.patch11
-rw-r--r--packages/gpe-gallery/files/mcheck.patch24
-rw-r--r--packages/gpe-gallery/gpe-gallery_0.94.bb16
-rw-r--r--packages/gpe-gallery/gpe-gallery_0.95.bb16
-rw-r--r--packages/gpe-gallery/gpe-gallery_0.96.bb15
-rw-r--r--packages/gpe-gallery/gpe-gallery_0.97.bb2
-rw-r--r--packages/gpe-question/files/.mtn2git_empty (renamed from packages/xlibs/liblbxutil/.mtn2git_empty)0
-rw-r--r--packages/gpe-question/files/makefile-fix.patch11
-rw-r--r--packages/gpe-question/gpe-question_0.03.bb7
-rw-r--r--packages/gpe-question/gpe-question_0.04.bb2
-rw-r--r--packages/gpe-soundbite/files/.mtn2git_empty (renamed from packages/xlibs/libsm/.mtn2git_empty)0
-rw-r--r--packages/gpe-soundbite/files/makefile-fix.patch11
-rw-r--r--packages/gpe-soundbite/gpe-soundbite_1.0.5.bb8
-rw-r--r--packages/gpe-soundbite/gpe-soundbite_1.0.6.bb2
-rw-r--r--packages/hdparm/files/.mtn2git_empty (renamed from packages/xlibs/libx11/.mtn2git_empty)0
-rw-r--r--packages/hdparm/files/uclibc.patch (renamed from packages/hdparm/hdparm-6.3/uclibc.patch)0
-rw-r--r--packages/hdparm/hdparm-6.6/.mtn2git_empty (renamed from packages/xlibs/libxau/.mtn2git_empty)0
-rw-r--r--packages/hdparm/hdparm-6.6/bswap.patch37
-rw-r--r--packages/hdparm/hdparm_6.6.bb14
-rw-r--r--packages/icewm/icewm-1.2.20/configure.patch68
-rw-r--r--packages/icewm/icewm-1.2.26/.mtn2git_empty (renamed from packages/xlibs/libxaw/.mtn2git_empty)0
-rw-r--r--packages/icewm/icewm-1.2.26/configure.patch22
-rw-r--r--packages/icewm/icewm-1.2.26/makefile.patch26
-rw-r--r--packages/icewm/icewm_1.2.20.bb11
-rw-r--r--packages/icewm/icewm_1.2.26.bb25
-rw-r--r--packages/images/.mtn2git_empty (renamed from packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty)0
-rw-r--r--packages/images/bootstrap-image.bb (renamed from packages/meta/bootstrap-image.bb)0
-rw-r--r--packages/images/dvb-image.bb (renamed from packages/meta/dvb-image.bb)0
-rw-r--r--packages/images/e-image-core.bb (renamed from packages/meta/e-image-core.bb)0
-rw-r--r--packages/images/e-image.bb (renamed from packages/meta/e-image.bb)0
-rw-r--r--packages/images/essential-image.bb (renamed from packages/meta/essential-image.bb)0
-rw-r--r--packages/images/essential-machine-image.bb (renamed from packages/meta/essential-machine-image.bb)0
-rw-r--r--packages/images/gpe-image-blank-user.bb (renamed from packages/meta/gpe-image-blank-user.bb)0
-rw-r--r--packages/images/gpe-image.bb (renamed from packages/meta/gpe-image.bb)0
-rw-r--r--packages/images/ludeos-image.bb (renamed from packages/meta/ludeos-image.bb)0
-rw-r--r--packages/images/maemo-image.bb (renamed from packages/meta/maemo-image.bb)0
-rw-r--r--packages/images/mythfront-image.bb (renamed from packages/meta/mythfront-image.bb)0
-rw-r--r--packages/images/nslu2-linksys-image.bb (renamed from packages/meta/nslu2-linksys-image.bb)0
-rw-r--r--packages/images/nylon-image-base.bb (renamed from packages/meta/nylon-image-base.bb)0
-rw-r--r--packages/images/nylon-image-extra.bb (renamed from packages/meta/nylon-image-extra.bb)0
-rw-r--r--packages/images/nylon-image-mini.bb (renamed from packages/meta/nylon-image-mini.bb)0
-rw-r--r--packages/images/nylon-image-standard.bb (renamed from packages/meta/nylon-image-standard.bb)0
-rw-r--r--packages/images/opie-image.bb (renamed from packages/meta/opie-image.bb)0
-rw-r--r--packages/images/opie-kdepim-image.bb (renamed from packages/meta/opie-kdepim-image.bb)0
-rw-r--r--packages/images/pivotboot-image.bb (renamed from packages/meta/pivotboot-image.bb)0
-rw-r--r--packages/images/sdl-image.bb (renamed from packages/meta/sdl-image.bb)0
-rw-r--r--packages/images/sectest-gpe-image.bb (renamed from packages/meta/sectest-gpe-image.bb)0
-rw-r--r--packages/images/slugos-image.bb (renamed from packages/meta/slugos-image.bb)0
-rw-r--r--packages/images/slugos-imagename.bb (renamed from packages/meta/slugos-imagename.bb)0
-rw-r--r--packages/images/twin-image.bb (renamed from packages/meta/twin-image.bb)0
-rw-r--r--packages/images/uml-image.bb (renamed from packages/meta/uml-image.bb)0
-rw-r--r--packages/images/unslung-image.bb (renamed from packages/meta/unslung-image.bb)0
-rw-r--r--packages/images/xfce-image.bb (renamed from packages/meta/xfce-image.bb)0
-rw-r--r--packages/images/xterminal-image.bb (renamed from packages/meta/xterminal-image.bb)0
-rw-r--r--packages/intltool/files/.mtn2git_empty (renamed from packages/xlibs/libxcomposite/.mtn2git_empty)0
-rw-r--r--packages/intltool/files/intltool-nowarn.patch40
-rw-r--r--packages/intltool/intltool-native_0.35.0.bb3
-rw-r--r--packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb3
-rw-r--r--packages/ipkg-utils/ipkg-utils/.mtn2git_empty (renamed from packages/xlibs/libxcursor-1.1.2/.mtn2git_empty)0
-rw-r--r--packages/ipkg-utils/ipkg-utils/index_speedup.patch53
-rw-r--r--packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb5
-rw-r--r--packages/ipkg/ipkg-native_0.99.163.bb2
-rw-r--r--packages/keylaunch/files/makefile-fix.patch11
-rw-r--r--packages/keylaunch/keylaunch_2.0.10.bb4
-rw-r--r--packages/keymaps/files/jornada6xx/.mtn2git_empty (renamed from packages/xlibs/libxcursor/.mtn2git_empty)0
-rw-r--r--packages/keymaps/files/jornada6xx/keymap-de.map597
-rw-r--r--packages/keymaps/files/jornada6xx/keymap-sp.map222
-rw-r--r--packages/keymaps/files/jornada6xx/keymap-uk.map278
-rw-r--r--packages/libcdaudio/.mtn2git_empty (renamed from packages/xlibs/libxdamage-1.0.1/.mtn2git_empty)0
-rw-r--r--packages/libcdaudio/libcdaudio_0.99.12p2.bb16
-rw-r--r--packages/libgpewidget/libgpewidget-0.102/cairo.patch39
-rw-r--r--packages/libgpewidget/libgpewidget_0.102.bb20
-rw-r--r--packages/libgpewidget/libgpewidget_0.103.bb18
-rw-r--r--packages/libgpewidget/libgpewidget_0.105.bb17
-rw-r--r--packages/libgpewidget/libgpewidget_0.107.bb19
-rw-r--r--packages/libgpewidget/libgpewidget_0.109.bb26
-rw-r--r--packages/libgpewidget/libgpewidget_0.113.bb23
-rw-r--r--packages/libidl/libidl_0.8.6.bb5
-rw-r--r--packages/libnss-mdns/libnss-mdns_0.8.bb29
-rw-r--r--packages/libsexy/libsexy_0.1.8.bb17
-rw-r--r--packages/libxml/libxml2-native_2.6.10.bb17
-rw-r--r--packages/libxml/libxml2-native_2.6.9.bb17
-rw-r--r--packages/libxsettings-client/libxsettings-client_0.17.bb2
-rw-r--r--packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh40/defconfig-h5xxx1627
-rw-r--r--packages/linux/handhelds-pxa-2.6_cvs.bb2
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb4
-rw-r--r--packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime353
-rw-r--r--packages/linux/linux-openzaurus_2.6.17.bb12
-rw-r--r--packages/lttng/lttng-control_0.12.bb16
-rw-r--r--packages/lttng/lttng-control_0.6.bb16
-rw-r--r--packages/madwifi/files/10-sh4-le-elf-copts.patch12
-rw-r--r--packages/madwifi/madwifi-ng_r1527-20060425.bb3
-rw-r--r--packages/mesa/files/.mtn2git_empty (renamed from packages/xlibs/libxdamage/.mtn2git_empty)0
-rw-r--r--packages/mesa/files/mklib-rpath-link.patch20
-rw-r--r--packages/mesa/mesa_6.0.1.bb1
-rw-r--r--packages/mesa/mesa_6.4.1+cvs20060101.bb22
-rw-r--r--packages/meta/package-index.bb2
-rw-r--r--packages/meta/task-e-x11.bb25
-rw-r--r--packages/mplayer/files/Makefile-codec-cfg.patch11
-rw-r--r--packages/mplayer/files/libfaad-fixed.patch16
-rw-r--r--packages/mplayer/files/libmpcodecs-ogg-include.patch (renamed from packages/mplayer/mplayer-1.0pre8/libmpcodecs-ogg-include.patch)0
-rw-r--r--packages/mplayer/files/libmpdemux-ogg-include-svn.patch11
-rw-r--r--packages/mplayer/files/libmpdemux-ogg-include.patch (renamed from packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch)0
-rw-r--r--packages/mplayer/files/mplayer-1.0_pre7-gcc4.patch187
-rw-r--r--packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch11
-rw-r--r--packages/mplayer/mplayer-1.0pre7/Makefile.patch40
-rw-r--r--packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch11
-rw-r--r--packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch13
-rw-r--r--packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff446
-rw-r--r--packages/mplayer/mplayer-1.0pre7/sdl.patch41
-rw-r--r--packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch17
-rw-r--r--packages/mplayer/mplayer-1.0pre7/zlib.patch17
-rw-r--r--packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch11
-rw-r--r--packages/mplayer/mplayer-atty-1.1.5/Makefile.patch31
-rw-r--r--packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch37
-rw-r--r--packages/mplayer/mplayer-atty-1.1.5/dsputil.patch41
-rw-r--r--packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch11
-rw-r--r--packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch13
-rw-r--r--packages/mplayer/mplayer-atty-1.1.5/sdl.patch41
-rw-r--r--packages/mplayer/mplayer-atty_1.1.5.bb77
-rw-r--r--packages/mplayer/mplayer_1.0pre7.bb96
-rw-r--r--packages/mplayer/mplayer_svn.bb151
-rw-r--r--packages/mtd/mtd-utils-native_0.0.0+cvs20050801.bb (renamed from packages/mtd/mtd-utils-native_20050801.bb)0
-rw-r--r--packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb (renamed from packages/mtd/mtd-utils-native_20060223.bb)0
-rw-r--r--packages/mtd/mtd-utils_0.0.0+cvs20050801.bb37
-rw-r--r--packages/mtd/mtd-utils_0.0.0+cvs20060223.bb36
-rw-r--r--packages/mtd/mtd-utils_1.0.0.bb4
-rw-r--r--packages/mtd/mtd-utils_20050801.bb37
-rw-r--r--packages/mtd/mtd-utils_20060223.bb36
-rw-r--r--packages/mysql/files/my.cnf21
-rw-r--r--packages/mysql/files/mysqld.sh20
-rw-r--r--packages/mysql/mysql_4.1.18.bb36
-rw-r--r--packages/notification-daemon/notification-daemon_0.3.5.bb15
-rw-r--r--packages/p4/.mtn2git_empty (renamed from packages/xlibs/libxdmcp/.mtn2git_empty)0
-rw-r--r--packages/p4/p4.inc81
-rw-r--r--packages/p4/p4_04.2.bb5
-rw-r--r--packages/p4/p4_05.2.bb5
-rw-r--r--packages/pango/pango_1.10.0.bb2
-rw-r--r--packages/pango/pango_1.10.2.bb2
-rw-r--r--packages/pango/pango_1.12.0.bb2
-rw-r--r--packages/pango/pango_1.13.2.bb2
-rw-r--r--packages/pmtools/.mtn2git_empty (renamed from packages/xlibs/libxext/.mtn2git_empty)0
-rw-r--r--packages/pmtools/pmtools_20050926.bb12
-rw-r--r--packages/prelink/prelink-20060712/.mtn2git_empty (renamed from packages/xlibs/libxfixes/.mtn2git_empty)0
-rw-r--r--packages/prelink/prelink-20060712/arm_eabi.patch (renamed from packages/prelink/prelink-20050901/arm_eabi.patch)0
-rw-r--r--packages/prelink/prelink-20060712/prelink.conf (renamed from packages/prelink/prelink-20050901/prelink.conf)0
-rw-r--r--packages/prelink/prelink-20060712/prelink.cron.daily (renamed from packages/prelink/prelink-20050901/prelink.cron.daily)0
-rw-r--r--packages/prelink/prelink-20060712/prelink.default (renamed from packages/prelink/prelink-20050901/prelink.default)0
-rw-r--r--packages/prelink/prelink_20060712.bb (renamed from packages/prelink/prelink_20050901.bb)0
-rw-r--r--packages/python/python-2.4.3-manifest.inc9
-rw-r--r--packages/python/python_2.4.3.bb3
-rw-r--r--packages/qemu/qemu_0.8.1.bb6
-rw-r--r--packages/rhythmbox/rhythmbox/omfmake.patch13
-rw-r--r--packages/rhythmbox/rhythmbox_0.8.5.bb5
-rw-r--r--packages/rpm2cpio/rpm2cpio-native_1.2_2.bb4
-rw-r--r--packages/tango/.mtn2git_empty (renamed from packages/xlibs/libxfont/.mtn2git_empty)0
-rw-r--r--packages/tango/files/.mtn2git_empty (renamed from packages/xlibs/libxft/.mtn2git_empty)0
-rw-r--r--packages/tango/files/no-icon-naming-utils.patch12
-rw-r--r--packages/tango/tango-icon-theme-extras_0.1.0.bb8
-rw-r--r--packages/tango/tango-icon-theme_0.7.2.bb8
-rw-r--r--packages/tasks/.mtn2git_empty (renamed from packages/xlibs/libxi/.mtn2git_empty)0
-rw-r--r--packages/tasks/task-bootstrap-unionroot.bb (renamed from packages/meta/task-bootstrap-unionroot.bb)0
-rw-r--r--packages/tasks/task-bootstrap.bb (renamed from packages/meta/task-bootstrap.bb)0
-rw-r--r--packages/tasks/task-dvb.bb (renamed from packages/meta/task-dvb.bb)0
-rw-r--r--packages/tasks/task-e-x11.bb25
-rw-r--r--packages/tasks/task-essential-parts.bb (renamed from packages/meta/task-essential-parts.bb)0
-rw-r--r--packages/tasks/task-essential-to-boot.bb (renamed from packages/meta/task-essential-to-boot.bb)0
-rw-r--r--packages/tasks/task-gpe.bb (renamed from packages/meta/task-gpe.bb)0
-rw-r--r--packages/tasks/task-mythfront.bb (renamed from packages/meta/task-mythfront.bb)0
-rw-r--r--packages/tasks/task-opie.bb (renamed from packages/meta/task-opie.bb)0
-rw-r--r--packages/tasks/task-pivotboot.bb (renamed from packages/meta/task-pivotboot.bb)0
-rw-r--r--packages/tasks/task-python-everything_20060425.bb (renamed from packages/meta/task-python-everything_20060425.bb)0
-rw-r--r--packages/tasks/task-python-sharprom_20060425.bb (renamed from packages/meta/task-python-sharprom_20060425.bb)0
-rw-r--r--packages/tasks/task-qpe.bb (renamed from packages/meta/task-qpe.bb)0
-rw-r--r--packages/tasks/task-sdk.bb (renamed from packages/meta/task-sdk.bb)0
-rw-r--r--packages/tasks/task-sdl.bb (renamed from packages/meta/task-sdl.bb)0
-rw-r--r--packages/tasks/task-xfce-base.bb (renamed from packages/meta/task-xfce-base.bb)0
-rw-r--r--packages/tasks/task-xterminal.bb (renamed from packages/meta/task-xterminal.bb)0
-rw-r--r--packages/tcltk/tcl/fix-configure.patch35
-rw-r--r--packages/tomoe/.mtn2git_empty (renamed from packages/xlibs/libxpm/.mtn2git_empty)0
-rw-r--r--packages/tomoe/libtomoe-gtk_0.1.0.bb14
-rw-r--r--packages/tomoe/tomoe_0.2.1.bb13
-rw-r--r--packages/tomoe/uim-tomoe-gtk_0.2.0.bb10
-rw-r--r--packages/tsclient/tsclient-0.132/.mtn2git_empty (renamed from packages/xlibs/libxrandr-1.0.2/.mtn2git_empty)0
-rw-r--r--packages/tsclient/tsclient-0.132/fixes.patch332
-rw-r--r--packages/tsclient/tsclient_0.132.bb30
-rw-r--r--packages/tslib/tslib/h5xxx/.mtn2git_empty (renamed from packages/xlibs/libxrandr/.mtn2git_empty)0
-rw-r--r--packages/tslib/tslib/h5xxx/tslib.sh19
-rw-r--r--packages/tslib/tslib/jornada7xx/tslib.sh2
-rw-r--r--packages/tslib/tslib_20060703.bb3
-rwxr-xr-xpackages/udev/files/init8
-rw-r--r--packages/udev/udev-058/init2
-rw-r--r--packages/udev/udev-063/init2
-rw-r--r--packages/udev/udev-065/init2
-rw-r--r--packages/udev/udev-084/init8
-rw-r--r--packages/udev/udev-089/init8
-rw-r--r--packages/usbview/.mtn2git_empty (renamed from packages/xlibs/libxrender/.mtn2git_empty)0
-rw-r--r--packages/usbview/usbview/.mtn2git_empty (renamed from packages/xlibs/libxt/.mtn2git_empty)0
-rw-r--r--packages/usbview/usbview/gtk2.patch21
-rw-r--r--packages/usbview/usbview_1.0.bb16
-rw-r--r--packages/x11-apps/app-common.inc13
-rw-r--r--packages/x11-apps/bdftopcf_1.0.0.bb2
-rw-r--r--packages/x11-apps/iceauth_1.0.1.bb2
-rw-r--r--packages/x11-apps/mkfontdir_1.0.1.bb2
-rw-r--r--packages/x11-apps/mkfontscale_1.0.1.bb2
-rw-r--r--packages/x11-apps/rgb_1.0.0.bb2
-rw-r--r--packages/x11-apps/twm_1.0.1.bb14
-rw-r--r--packages/x11-apps/xauth_1.0.1.bb2
-rw-r--r--packages/x11-apps/xclock_1.0.1.bb2
-rw-r--r--packages/x11-apps/xeyes_1.0.1.bb2
-rw-r--r--packages/x11-apps/xinit_1.0.1.bb2
-rw-r--r--packages/x11-apps/xkbcomp_1.0.1.bb2
-rw-r--r--packages/xdpyinfo/xdpyinfo_1.0.1.bb12
-rw-r--r--packages/xev/xev_1.0.1.bb12
-rw-r--r--packages/xhost/xhost_1.0.0.bb10
-rw-r--r--packages/xlibs/libfontenc_1.0.1.bb11
-rw-r--r--packages/xlibs/libfontenc_1.0.2.bb12
-rw-r--r--packages/xlibs/libice_X11R7.0-1.0.0.bb12
-rw-r--r--packages/xlibs/libice_X11R7.1-1.0.1.bb13
-rw-r--r--packages/xlibs/liblbxutil_1.0.0.bb17
-rw-r--r--packages/xlibs/liblbxutil_1.0.1.bb18
-rw-r--r--packages/xlibs/libsm_X11R7.0-1.0.0.bb12
-rw-r--r--packages/xlibs/libsm_X11R7.1-1.0.1.bb13
-rw-r--r--packages/xlibs/libx11_X11R7.0-1.0.0.bb25
-rw-r--r--packages/xlibs/libx11_X11R7.1-1.0.1.bb26
-rw-r--r--packages/xlibs/libxau_1.0.0.bb13
-rw-r--r--packages/xlibs/libxau_1.0.1.bb14
-rw-r--r--packages/xlibs/libxaw_X11R7.0-1.0.1.bb15
-rw-r--r--packages/xlibs/libxaw_X11R7.1-1.0.2.bb16
-rw-r--r--packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb14
-rw-r--r--packages/xlibs/libxcomposite_X11R7.1-0.3.bb15
-rw-r--r--packages/xlibs/libxcursor_1.1.5.2.bb13
-rw-r--r--packages/xlibs/libxcursor_1.1.6.bb14
-rw-r--r--packages/xlibs/libxdamage_1.0.2.2.bb11
-rw-r--r--packages/xlibs/libxdamage_1.0.3.bb12
-rw-r--r--packages/xlibs/libxdmcp_1.0.0.bb12
-rw-r--r--packages/xlibs/libxdmcp_1.0.1.bb13
-rw-r--r--packages/xlibs/libxext_1.0.0.bb15
-rw-r--r--packages/xlibs/libxext_1.0.1.bb16
-rw-r--r--packages/xlibs/libxfixes_3.0.1.2.bb10
-rw-r--r--packages/xlibs/libxfixes_4.0.1.bb11
-rw-r--r--packages/xlibs/libxfont_X11R7.0-1.0.0.bb12
-rw-r--r--packages/xlibs/libxfont_X11R7.1-1.1.0.bb13
-rw-r--r--packages/xlibs/libxft_2.1.8.2.bb22
-rw-r--r--packages/xlibs/libxi_X11R7.0-1.0.0.bb11
-rw-r--r--packages/xlibs/libxi_X11R7.1-1.0.1.bb12
-rw-r--r--packages/xlibs/libxinerama_X11R7.0-1.0.1.bb14
-rw-r--r--packages/xlibs/libxkbfile_1.0.1.bb11
-rw-r--r--packages/xlibs/libxkbfile_1.0.3.bb12
-rw-r--r--packages/xlibs/libxkbui_1.0.1.bb12
-rw-r--r--packages/xlibs/libxkbui_1.0.2.bb13
-rw-r--r--packages/xlibs/libxmu_1.0.0.bb19
-rw-r--r--packages/xlibs/libxmu_1.0.1.bb20
-rw-r--r--packages/xlibs/libxp_1.0.0.bb13
-rw-r--r--packages/xlibs/libxpm_3.5.4.2.bb21
-rw-r--r--packages/xlibs/libxpm_3.5.5.bb21
-rw-r--r--packages/xlibs/libxrandr_1.1.0.2.bb12
-rw-r--r--packages/xlibs/libxrandr_1.1.1.bb13
-rw-r--r--packages/xlibs/libxrender_0.9.0.2.bb12
-rw-r--r--packages/xlibs/libxrender_0.9.1.bb13
-rw-r--r--packages/xlibs/libxres_X11R7.0-1.0.0.bb13
-rw-r--r--packages/xlibs/libxres_X11R7.1-1.0.1.bb14
-rw-r--r--packages/xlibs/libxss_1.0.1.bb15
-rw-r--r--packages/xlibs/libxt_1.0.0.bb22
-rw-r--r--packages/xlibs/libxt_1.0.2.bb23
-rw-r--r--packages/xlibs/libxtst_1.0.1.bb12
-rw-r--r--packages/xlibs/libxv_X11R7.0-1.0.1.bb12
-rw-r--r--packages/xlibs/libxxf86dga_1.0.0.bb15
-rw-r--r--packages/xlibs/libxxf86dga_1.0.1.bb16
-rw-r--r--packages/xlibs/libxxf86misc_1.0.0.bb11
-rw-r--r--packages/xlibs/libxxf86misc_1.0.1.bb12
-rw-r--r--packages/xlibs/libxxf86vm_1.0.0.bb12
-rw-r--r--packages/xlibs/libxxf86vm_1.0.1.bb13
-rw-r--r--packages/xlibs/util-macros_1.0.1.bb10
-rw-r--r--packages/xlibs/util-macros_1.0.2.bb11
-rw-r--r--packages/xlibs/xorg-xlibs.inc12
-rw-r--r--packages/xlibs/xtrans_1.0.0.bb9
-rw-r--r--packages/xmodmap/xmodmap_1.0.0.bb11
-rw-r--r--packages/xorg-app/.mtn2git_empty (renamed from packages/xlibs/libxvmc/.mtn2git_empty)0
-rw-r--r--packages/xorg-app/appres_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb12
-rw-r--r--packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/beforelight_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/bitmap_X11R7.0-1.0.1.bb5
-rw-r--r--packages/xorg-app/bitmap_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/editres_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/iceauth_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/ico_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/listres_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/luit_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb9
-rw-r--r--packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/oclock_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/rgb_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/rgb_X11R7.1-1.0.1.bb7
-rw-r--r--packages/xorg-app/rstart_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/rstart_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/scripts_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-app/sessreg_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/showfont_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/smproxy_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/smproxy_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/twm_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-app/viewres_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/x11perf_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/x11perf_X11R7.1-1.4.1.bb5
-rw-r--r--packages/xorg-app/xauth/.mtn2git_empty (renamed from packages/xmodmap/xmodmap/.mtn2git_empty)0
-rw-r--r--packages/xorg-app/xauth/autofoo.patch (renamed from packages/x11-apps/xauth/autofoo.patch)0
-rw-r--r--packages/xorg-app/xauth_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xauth_cvs.bb (renamed from packages/x11-apps/xauth_cvs.bb)0
-rw-r--r--packages/xorg-app/xbiff_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xcalc_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xclock_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xclock_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xconsole_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xconsole_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb6
-rw-r--r--packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xditview_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xdm_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/xdm_X11R7.1-1.0.4.bb7
-rw-r--r--packages/xorg-app/xdpyinfo/.mtn2git_empty (renamed from packages/xprop/xprop/.mtn2git_empty)0
-rw-r--r--packages/xorg-app/xdpyinfo/disable-xkb.patch (renamed from packages/xdpyinfo/xdpyinfo/disable-xkb.patch)0
-rw-r--r--packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-app/xdpyinfo_cvs.bb (renamed from packages/xdpyinfo/xdpyinfo_cvs.bb)0
-rw-r--r--packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb6
-rw-r--r--packages/xorg-app/xedit_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xedit_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xev/.mtn2git_empty (renamed from packages/xrdb/xrdb/.mtn2git_empty)0
-rw-r--r--packages/xorg-app/xev/diet-x11.patch (renamed from packages/xev/files/diet-x11.patch)0
-rw-r--r--packages/xorg-app/xev_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/xev_cvs.bb (renamed from packages/xev/xev_cvs.bb)0
-rw-r--r--packages/xorg-app/xeyes_X11R7.0-1.0.1.bb5
-rw-r--r--packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfd_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfs_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfs_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfwp_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xgamma_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xgc_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xhost/.mtn2git_empty (renamed from packages/xserver-common/files/.mtn2git_empty)0
-rw-r--r--packages/xorg-app/xhost/autofoo.patch (renamed from packages/xhost/xhost/autofoo.patch)0
-rw-r--r--packages/xorg-app/xhost_20040413.bb (renamed from packages/xhost/xhost_20040413.bb)0
-rw-r--r--packages/xorg-app/xhost_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-app/xhost_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-app/xinit_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-app/xinit_X11R7.1-1.0.2.bb7
-rw-r--r--packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xkill_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xload_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xlogo_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xmag_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xman_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/xman_X11R7.1-1.0.2.bb8
-rw-r--r--packages/xorg-app/xmessage_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xmh_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xmodmap/.mtn2git_empty (renamed from packages/xserver/.mtn2git_empty)0
-rw-r--r--packages/xorg-app/xmodmap/autofoo.patch (renamed from packages/xmodmap/xmodmap/autofoo.patch)0
-rw-r--r--packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-app/xmodmap_cvs.bb (renamed from packages/xmodmap/xmodmap_cvs.bb)0
-rw-r--r--packages/xorg-app/xmore_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xorg-app-common.inc18
-rw-r--r--packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xpr_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xprop/.mtn2git_empty (renamed from packages/xserver/xserver-kdrive-omap/.mtn2git_empty)0
-rw-r--r--packages/xorg-app/xprop/autofoo.patch (renamed from packages/xprop/xprop/autofoo.patch)0
-rw-r--r--packages/xorg-app/xprop_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xprop_cvs.bb (renamed from packages/xprop/xprop_cvs.bb)0
-rw-r--r--packages/xorg-app/xrandr_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-app/xrandr_X11R7.1-1.0.2.bb7
-rw-r--r--packages/xorg-app/xrandr_cvs.bb (renamed from packages/xrandr/xrandr_cvs.bb)0
-rw-r--r--packages/xorg-app/xrdb/.mtn2git_empty (renamed from packages/xserver/xserver-kdrive/.mtn2git_empty)0
-rw-r--r--packages/xorg-app/xrdb/autofoo.patch (renamed from packages/xrdb/xrdb/autofoo.patch)0
-rw-r--r--packages/xorg-app/xrdb_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/xrdb_X11R7.1-1.0.2.bb7
-rw-r--r--packages/xorg-app/xrdb_cvs.bb (renamed from packages/xrdb/xrdb_cvs.bb)0
-rw-r--r--packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xrx_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xset/.mtn2git_empty (renamed from packages/xserver/xserver-xorg/.mtn2git_empty)0
-rw-r--r--packages/xorg-app/xset/autofoo.patch (renamed from packages/xset/xset/autofoo.patch)0
-rw-r--r--packages/xorg-app/xset/disable-xkb.patch (renamed from packages/xset/xset/disable-xkb.patch)0
-rw-r--r--packages/xorg-app/xset_20040817.bb (renamed from packages/xset/xset_20040817.bb)0
-rw-r--r--packages/xorg-app/xset_X11R7.0-1.0.1.bb13
-rw-r--r--packages/xorg-app/xset_X11R7.1-1.0.2.bb13
-rw-r--r--packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xsm_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xterm_207.bb29
-rw-r--r--packages/xorg-app/xtrap_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xtrap_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xwd_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xwud_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-data/data-common.inc12
-rw-r--r--packages/xorg-data/xbitmaps_1.0.1.bb1
-rw-r--r--packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-data/xkbdata_1.0.1.bb3
-rw-r--r--packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xorg-data/xorg-data-common.inc16
-rw-r--r--packages/xorg-doc/.mtn2git_empty (renamed from packages/xset/xset/.mtn2git_empty)0
-rw-r--r--packages/xorg-doc/xorg-doc-common.inc16
-rw-r--r--packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb9
-rw-r--r--packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb7
-rw-r--r--packages/xorg-driver/.mtn2git_empty0
-rw-r--r--packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb6
-rw-r--r--packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb6
-rw-r--r--packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb6
-rw-r--r--packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb8
-rw-r--r--packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb6
-rw-r--r--packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb6
-rw-r--r--packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb6
-rw-r--r--packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb6
-rw-r--r--packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb6
-rw-r--r--packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb6
-rw-r--r--packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb6
-rw-r--r--packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb5
-rw-r--r--packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb5
-rw-r--r--packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb5
-rw-r--r--packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb5
-rw-r--r--packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb5
-rw-r--r--packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb5
-rw-r--r--packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-driver/xorg-driver-common.inc42
-rw-r--r--packages/xorg-driver/xorg-driver-input.inc4
-rw-r--r--packages/xorg-driver/xorg-driver-video.inc4
-rw-r--r--packages/xorg-font/.mtn2git_empty0
-rw-r--r--packages/xorg-font/encodings_X11R7.0-1.0.0.bb7
-rw-r--r--packages/xorg-font/files/.mtn2git_empty0
-rw-r--r--packages/xorg-font/files/imake-staging.patch (renamed from packages/xfonts/imake-staging.patch)0
-rw-r--r--packages/xorg-font/files/lexer.patch (renamed from packages/xfonts/lexer.patch)0
-rw-r--r--packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb5
-rw-r--r--packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-font/font-alias_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb7
-rw-r--r--packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb7
-rw-r--r--packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb7
-rw-r--r--packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb11
-rw-r--r--packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb11
-rw-r--r--packages/xorg-font/font-util_X11R7.0-1.0.0.bb7
-rw-r--r--packages/xorg-font/font-util_X11R7.1-1.0.1.bb7
-rw-r--r--packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb5
-rw-r--r--packages/xorg-font/xfonts-xorg_6.8.bb (renamed from packages/xfonts/xfonts-xorg_6.8.bb)0
-rw-r--r--packages/xorg-font/xorg-font-common.inc32
-rw-r--r--packages/xorg-fonts/font-alias_1.0.1.bb4
-rw-r--r--packages/xorg-fonts/font-common.inc31
-rw-r--r--packages/xorg-fonts/font-cursor-misc_1.0.0.bb4
-rw-r--r--packages/xorg-fonts/font-misc-misc_1.0.0.bb7
-rw-r--r--packages/xorg-fonts/font-util_1.0.0.bb5
-rw-r--r--packages/xorg-lib/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/diet-x11/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/diet-x11/X18NCMSstubs.diff (renamed from packages/xlibs/diet-x11/X18NCMSstubs.diff)0
-rw-r--r--packages/xorg-lib/diet-x11/fix-disable-xlocale.diff (renamed from packages/xlibs/diet-x11/fix-disable-xlocale.diff)0
-rw-r--r--packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch (renamed from packages/xlibs/diet-x11/fix-utf8-wrong-define.patch)0
-rw-r--r--packages/xorg-lib/diet-x11_20050226.bb (renamed from packages/xlibs/diet-x11_20050226.bb)0
-rw-r--r--packages/xorg-lib/diet-x11_6.2.1.bb (renamed from packages/xlibs/diet-x11_6.2.1.bb)0
-rw-r--r--packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb (renamed from packages/xlibs/diet-x11_X11R7.0-1.0.0.bb)0
-rw-r--r--packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb (renamed from packages/xlibs/diet-x11_X11R7.1-1.0.1.bb)0
-rw-r--r--packages/xorg-lib/diet-x11_cvs.bb (renamed from packages/xlibs/diet-x11_cvs.bb)0
-rw-r--r--packages/xorg-lib/files/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/files/errordb-keysymdb-path-fix.patch (renamed from packages/xlibs/files/errordb-keysymdb-path-fix.patch)0
-rw-r--r--packages/xorg-lib/files/fix-utf8-wrong-define.patch (renamed from packages/xlibs/files/fix-utf8-wrong-define.patch)0
-rw-r--r--packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb5
-rw-r--r--packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb5
-rw-r--r--packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb12
-rw-r--r--packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb12
-rw-r--r--packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb8
-rw-r--r--packages/xorg-lib/libfs_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libice/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libice/autofoo.patch (renamed from packages/xlibs/libice/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libice_6.3.3.bb (renamed from packages/xlibs/libice_6.3.3.bb)0
-rw-r--r--packages/xorg-lib/libice_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/libice_X11R7.1-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libice_cvs.bb (renamed from packages/xlibs/libice_cvs.bb)0
-rw-r--r--packages/xorg-lib/liblbxutil/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/liblbxutil/mkg3states.patch (renamed from packages/xlibs/liblbxutil/mkg3states.patch)0
-rw-r--r--packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb6
-rw-r--r--packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libsm/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libsm/autofoo.patch (renamed from packages/xlibs/libsm/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libsm_6.0.3.bb (renamed from packages/xlibs/libsm_6.0.3.bb)0
-rw-r--r--packages/xorg-lib/libsm_X11R7.0-1.0.0.bb9
-rw-r--r--packages/xorg-lib/libsm_X11R7.1-1.0.1.bb9
-rw-r--r--packages/xorg-lib/libsm_cvs.bb (renamed from packages/xlibs/libsm_cvs.bb)0
-rw-r--r--packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libx11-native_6.2.1.bb (renamed from packages/xlibs/libx11-native_6.2.1.bb)0
-rw-r--r--packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb25
-rw-r--r--packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb25
-rw-r--r--packages/xorg-lib/libx11-native_cvs.bb (renamed from packages/xlibs/libx11-native_cvs.bb)0
-rw-r--r--packages/xorg-lib/libx11/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libx11/autofoo.patch (renamed from packages/xlibs/libx11/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libx11/xim.patch (renamed from packages/xlibs/libx11/xim.patch)0
-rw-r--r--packages/xorg-lib/libx11_20050226.bb (renamed from packages/xlibs/libx11_20050226.bb)0
-rw-r--r--packages/xorg-lib/libx11_6.2.1.bb (renamed from packages/xlibs/libx11_6.2.1.bb)0
-rw-r--r--packages/xorg-lib/libx11_X11R7.0-1.0.0.bb21
-rw-r--r--packages/xorg-lib/libx11_X11R7.1-1.0.1.bb21
-rw-r--r--packages/xorg-lib/libx11_cvs.bb (renamed from packages/xlibs/libx11_cvs.bb)0
-rw-r--r--packages/xorg-lib/libx11_git.bb (renamed from packages/xlibs/libx11_git.bb)0
-rw-r--r--packages/xorg-lib/libxau-native_0.1.1.bb (renamed from packages/xlibs/libxau-native_0.1.1.bb)0
-rw-r--r--packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb11
-rw-r--r--packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb11
-rw-r--r--packages/xorg-lib/libxau-native_cvs.bb (renamed from packages/xlibs/libxau-native_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxau/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxau/autofoo.patch (renamed from packages/xlibs/libxau/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxau_0.1.1.bb (renamed from packages/xlibs/libxau_0.1.1.bb)0
-rw-r--r--packages/xorg-lib/libxau_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/libxau_X11R7.1-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libxau_cvs.bb (renamed from packages/xlibs/libxau_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxaw/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxaw/auxdir.patch (renamed from packages/xlibs/libxaw/auxdir.patch)0
-rw-r--r--packages/xorg-lib/libxaw_7.0.2.bb (renamed from packages/xlibs/libxaw_7.0.2.bb)0
-rw-r--r--packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb15
-rw-r--r--packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb15
-rw-r--r--packages/xorg-lib/libxaw_cvs.bb (renamed from packages/xlibs/libxaw_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch (renamed from packages/xlibs/libxcomposite-1.0.1/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxcomposite/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxcomposite/change-include-order.patch (renamed from packages/xlibs/libxcomposite/change-include-order.patch)0
-rw-r--r--packages/xorg-lib/libxcomposite_1.0.1.bb (renamed from packages/xlibs/libxcomposite_1.0.1.bb)0
-rw-r--r--packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb11
-rw-r--r--packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb11
-rw-r--r--packages/xorg-lib/libxcomposite_cvs.bb (renamed from packages/xlibs/libxcomposite_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxcursor-1.1.2/autofoo.patch (renamed from packages/xlibs/libxcursor-1.1.2/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxcursor/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxcursor/autofoo.patch (renamed from packages/xlibs/libxcursor/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxcursor_1.1.2.bb (renamed from packages/xlibs/libxcursor_1.1.2.bb)0
-rw-r--r--packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb10
-rw-r--r--packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb10
-rw-r--r--packages/xorg-lib/libxcursor_cvs.bb (renamed from packages/xlibs/libxcursor_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxdamage-1.0.1/autofoo.patch (renamed from packages/xlibs/libxdamage-1.0.1/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxdamage/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxdamage/m4.patch (renamed from packages/xlibs/libxdamage/m4.patch)0
-rw-r--r--packages/xorg-lib/libxdamage_1.0.1.bb (renamed from packages/xlibs/libxdamage_1.0.1.bb)0
-rw-r--r--packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb10
-rw-r--r--packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb10
-rw-r--r--packages/xorg-lib/libxdamage_cvs.bb (renamed from packages/xlibs/libxdamage_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxdmcp-native_0.1.1.bb (renamed from packages/xlibs/libxdmcp-native_0.1.1.bb)0
-rw-r--r--packages/xorg-lib/libxdmcp-native_0.1.3.bb (renamed from packages/xlibs/libxdmcp-native_0.1.3.bb)0
-rw-r--r--packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb11
-rw-r--r--packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb11
-rw-r--r--packages/xorg-lib/libxdmcp/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxdmcp/autofoo.patch (renamed from packages/xlibs/libxdmcp/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxdmcp_0.1.1.bb (renamed from packages/xlibs/libxdmcp_0.1.1.bb)0
-rw-r--r--packages/xorg-lib/libxdmcp_0.1.3.bb (renamed from packages/xlibs/libxdmcp_0.1.3.bb)0
-rw-r--r--packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libxdmcp_cvs.bb (renamed from packages/xlibs/libxdmcp_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxext-native_cvs.bb (renamed from packages/xlibs/libxext-native_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxext/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxext/autofoo.patch (renamed from packages/xlibs/libxext/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxext_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/libxext_X11R7.1-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libxext_cvs.bb (renamed from packages/xlibs/libxext_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxfixes/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxfixes/autofoo.patch (renamed from packages/xlibs/libxfixes/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxfixes_2.0.1.bb (renamed from packages/xlibs/libxfixes_2.0.1.bb)0
-rw-r--r--packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb9
-rw-r--r--packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb9
-rw-r--r--packages/xorg-lib/libxfixes_cvs.bb (renamed from packages/xlibs/libxfixes_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb13
-rw-r--r--packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb13
-rw-r--r--packages/xorg-lib/libxfont/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxfont/autofoo.patch (renamed from packages/xlibs/libxfont/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxfont/scalable.patch (renamed from packages/xlibs/libxfont/scalable.patch)0
-rw-r--r--packages/xorg-lib/libxfont_1.4.2.bb (renamed from packages/xlibs/libxfont_1.4.2.bb)0
-rw-r--r--packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb11
-rw-r--r--packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb11
-rw-r--r--packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb11
-rw-r--r--packages/xorg-lib/libxfont_cvs.bb (renamed from packages/xlibs/libxfont_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb8
-rw-r--r--packages/xorg-lib/libxft/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxft/autofoo.patch (renamed from packages/xlibs/libxft/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxft_2.1.6.bb (renamed from packages/xlibs/libxft_2.1.6.bb)0
-rw-r--r--packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb19
-rw-r--r--packages/xorg-lib/libxft_cvs.bb (renamed from packages/xlibs/libxft_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxi/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxi/autofoo.patch (renamed from packages/xlibs/libxi/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxi_6.0.1.bb (renamed from packages/xlibs/libxi_6.0.1.bb)0
-rw-r--r--packages/xorg-lib/libxi_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxi_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxi_cvs.bb (renamed from packages/xlibs/libxi_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb (renamed from packages/xlibs/libxinerama_1.0.2+cvs20050505.bb)0
-rw-r--r--packages/xorg-lib/libxinerama_1.0.2.bb (renamed from packages/xlibs/libxinerama_1.0.2.bb)0
-rw-r--r--packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libxinerama_cvs.bb (renamed from packages/xlibs/libxinerama_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb8
-rw-r--r--packages/xorg-lib/libxkbfile_cvs.bb (renamed from packages/xlibs/libxkbfile_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb8
-rw-r--r--packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb16
-rw-r--r--packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb16
-rw-r--r--packages/xorg-lib/libxmu_cvs.bb (renamed from packages/xlibs/libxmu_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxp_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-lib/libxp_cvs.bb (renamed from packages/xlibs/libxp_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxpm/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxpm/autofoo.patch (renamed from packages/xlibs/libxpm/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxpm_3.5.1.bb (renamed from packages/xlibs/libxpm_3.5.1.bb)0
-rw-r--r--packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb13
-rw-r--r--packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb13
-rw-r--r--packages/xorg-lib/libxpm_cvs.bb (renamed from packages/xlibs/libxpm_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxrandr-1.0.2/autofoo.patch (renamed from packages/xlibs/libxrandr-1.0.2/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxrandr/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxrandr/autofoo.patch (renamed from packages/xlibs/libxrandr/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxrandr_1.0.2.bb (renamed from packages/xlibs/libxrandr_1.0.2.bb)0
-rw-r--r--packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb9
-rw-r--r--packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb9
-rw-r--r--packages/xorg-lib/libxrandr_cvs.bb (renamed from packages/xlibs/libxrandr_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxrender/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxrender/autofoo.patch (renamed from packages/xlibs/libxrender/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxrender_0.8.4.bb (renamed from packages/xlibs/libxrender_0.8.4.bb)0
-rw-r--r--packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb9
-rw-r--r--packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb9
-rw-r--r--packages/xorg-lib/libxrender_cvs.bb (renamed from packages/xlibs/libxrender_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxres_1.0.1.bb (renamed from packages/xlibs/libxres_1.0.1.bb)0
-rw-r--r--packages/xorg-lib/libxres_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxres_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxres_cvs.bb (renamed from packages/xlibs/libxres_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb13
-rw-r--r--packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb13
-rw-r--r--packages/xorg-lib/libxss_cvs.bb (renamed from packages/xlibs/libxss_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxt/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxt/autofoo.patch (renamed from packages/xlibs/libxt/autofoo.patch)0
-rw-r--r--packages/xorg-lib/libxt_0.1.5.bb (renamed from packages/xlibs/libxt_0.1.5.bb)0
-rw-r--r--packages/xorg-lib/libxt_X11R7.0-1.0.0.bb19
-rw-r--r--packages/xorg-lib/libxt_X11R7.1-1.0.2.bb19
-rw-r--r--packages/xorg-lib/libxt_cvs.bb (renamed from packages/xlibs/libxt_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-lib/libxtst_cvs.bb (renamed from packages/xlibs/libxtst_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxv_2.2.2+cvs20040918.bb (renamed from packages/xlibs/libxv_2.2.2+cvs20040918.bb)0
-rw-r--r--packages/xorg-lib/libxv_2.2.2.bb (renamed from packages/xlibs/libxv_2.2.2.bb)0
-rw-r--r--packages/xorg-lib/libxv_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xorg-lib/libxvmc/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxvmc/drm.patch (renamed from packages/xlibs/libxvmc/drm.patch)0
-rw-r--r--packages/xorg-lib/libxvmc/true.patch (renamed from packages/xlibs/libxvmc/true.patch)0
-rw-r--r--packages/xorg-lib/libxvmc/via.patch (renamed from packages/xlibs/libxvmc/via.patch)0
-rw-r--r--packages/xorg-lib/libxvmc_20040919.bb (renamed from packages/xlibs/libxvmc_20040919.bb)0
-rw-r--r--packages/xorg-lib/libxvmc_20041025.bb (renamed from packages/xlibs/libxvmc_20041025.bb)0
-rw-r--r--packages/xorg-lib/libxvmc_20050612.bb (renamed from packages/xlibs/libxvmc_20050612.bb)0
-rw-r--r--packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb8
-rw-r--r--packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxxf86dga_cvs.bb (renamed from packages/xlibs/libxxf86dga_cvs.bb)0
-rw-r--r--packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb9
-rw-r--r--packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb9
-rw-r--r--packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-lib/libxxf86vm_cvs.bb (renamed from packages/xlibs/libxxf86vm_cvs.bb)0
-rw-r--r--packages/xorg-lib/xorg-lib-common.inc17
-rw-r--r--packages/xorg-lib/xtrans-native_0.1.bb (renamed from packages/xlibs/xtrans-native_0.1.bb)0
-rw-r--r--packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb11
-rw-r--r--packages/xorg-lib/xtrans_0.1.bb (renamed from packages/xlibs/xtrans_0.1.bb)0
-rw-r--r--packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-lib/xtrans_cvs.bb (renamed from packages/xlibs/xtrans_cvs.bb)0
-rw-r--r--packages/xorg-proto/.mtn2git_empty0
-rw-r--r--packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb6
-rw-r--r--packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb9
-rw-r--r--packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb6
-rw-r--r--packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb7
-rw-r--r--packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb7
-rw-r--r--packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb7
-rw-r--r--packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb5
-rw-r--r--packages/xorg-proto/evieext_X11R7.0-1.0.2.bb5
-rw-r--r--packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb7
-rw-r--r--packages/xorg-proto/fixesproto_X11R7.1-4.0.bb7
-rw-r--r--packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb9
-rw-r--r--packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb5
-rw-r--r--packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb9
-rw-r--r--packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb5
-rw-r--r--packages/xorg-proto/glproto_X11R7.0-1.4.3.bb5
-rw-r--r--packages/xorg-proto/glproto_X11R7.1-1.4.7.bb5
-rw-r--r--packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb9
-rw-r--r--packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb5
-rw-r--r--packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb9
-rw-r--r--packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb5
-rw-r--r--packages/xorg-proto/printproto_X11R7.0-1.0.3.bb5
-rw-r--r--packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb7
-rw-r--r--packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb7
-rw-r--r--packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb7
-rw-r--r--packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb7
-rw-r--r--packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb5
-rw-r--r--packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb5
-rw-r--r--packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb5
-rw-r--r--packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb5
-rw-r--r--packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb5
-rw-r--r--packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb9
-rw-r--r--packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb5
-rw-r--r--packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb11
-rw-r--r--packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb7
-rw-r--r--packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb9
-rw-r--r--packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb5
-rw-r--r--packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb7
-rw-r--r--packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb5
-rw-r--r--packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb5
-rw-r--r--packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb5
-rw-r--r--packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb7
-rw-r--r--packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb5
-rw-r--r--packages/xorg-proto/xorg-proto-common.inc16
-rw-r--r--packages/xorg-proto/xproto-native_6.6.2.bb (renamed from packages/xproto/xproto-native_6.6.2.bb)0
-rw-r--r--packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb9
-rw-r--r--packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb9
-rw-r--r--packages/xorg-proto/xproto-native_cvs.bb (renamed from packages/xproto/xproto-native_cvs.bb)0
-rw-r--r--packages/xorg-proto/xproto_6.6.2+cvs20050226.bb (renamed from packages/xproto/xproto_6.6.2+cvs20050226.bb)0
-rw-r--r--packages/xorg-proto/xproto_6.6.2.bb (renamed from packages/xproto/xproto_6.6.2.bb)0
-rw-r--r--packages/xorg-proto/xproto_X11R7.0-7.0.4.bb5
-rw-r--r--packages/xorg-proto/xproto_X11R7.1-7.0.5.bb5
-rw-r--r--packages/xorg-proto/xproto_cvs.bb (renamed from packages/xproto/xproto_cvs.bb)0
-rw-r--r--packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb6
-rw-r--r--packages/xorg-util/.mtn2git_empty0
-rw-r--r--packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-util/imake_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-util/imake_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-util/lndir_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb10
-rw-r--r--packages/xorg-util/makedepend_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb10
-rw-r--r--packages/xorg-util/util-macros_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-util/util-macros_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb7
-rw-r--r--packages/xorg-util/xorg-util-common.inc15
-rw-r--r--packages/xorg-xserver/.mtn2git_empty0
-rw-r--r--packages/xorg-xserver/files/.mtn2git_empty0
-rw-r--r--packages/xorg-xserver/files/calibrate_zaurusd.patch (renamed from packages/xserver-common/files/calibrate_zaurusd.patch)0
-rw-r--r--packages/xorg-xserver/files/poodle-xmodmap-2.6.patch (renamed from packages/xserver-common/files/poodle-xmodmap-2.6.patch)0
-rw-r--r--packages/xorg-xserver/files/setDPI.sh (renamed from packages/xserver-common/files/setDPI.sh)0
-rw-r--r--packages/xorg-xserver/xorg-xserver-common.inc43
-rw-r--r--packages/xorg-xserver/xserver-common_1.10.bb (renamed from packages/xserver-common/xserver-common_1.10.bb)0
-rw-r--r--packages/xorg-xserver/xserver-common_1.3.bb (renamed from packages/xserver-common/xserver-common_1.3.bb)0
-rw-r--r--packages/xorg-xserver/xserver-common_1.8.bb (renamed from packages/xserver-common/xserver-common_1.8.bb)0
-rw-r--r--packages/xorg-xserver/xserver-common_1.9.bb (renamed from packages/xserver-common/xserver-common_1.9.bb)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty0
-rw-r--r--packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch (renamed from packages/xserver/xserver-kdrive-omap/configure-tslib.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch (renamed from packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive-omap/kmode.patch (renamed from packages/xserver/xserver-kdrive-omap/kmode.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb (renamed from packages/xserver/xserver-kdrive-omap_6.6.3.bb)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/.mtn2git_empty0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff (renamed from packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/devfs.patch (renamed from packages/xserver/xserver-kdrive/devfs.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/disable-apm.patch (renamed from packages/xserver/xserver-kdrive/disable-apm.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch (renamed from packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch (renamed from packages/xserver/xserver-kdrive/enable-builtin-fonts.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/enable-tslib.patch (renamed from packages/xserver/xserver-kdrive/enable-tslib.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/epson.patch (renamed from packages/xserver/xserver-kdrive/epson.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/faster-rotated.patch (renamed from packages/xserver/xserver-kdrive/faster-rotated.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch (renamed from packages/xserver/xserver-kdrive/fbdev-not-fix.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch (renamed from packages/xserver/xserver-kdrive/kdrive-evdev.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch (renamed from packages/xserver/xserver-kdrive/kdrive-use-evdev.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/kmode.patch (renamed from packages/xserver/xserver-kdrive/kmode.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch (renamed from packages/xserver/xserver-kdrive/no-serial-probing.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/onlyfb.patch (renamed from packages/xserver/xserver-kdrive/onlyfb.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/optional-xkb.patch (renamed from packages/xserver/xserver-kdrive/optional-xkb.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/xcalibrate.patch (renamed from packages/xserver/xserver-kdrive/xcalibrate.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch (renamed from packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive_20050207.bb (renamed from packages/xserver/xserver-kdrive_20050207.bb)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive_20050624.bb (renamed from packages/xserver/xserver-kdrive_20050624.bb)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive_20060312.bb (renamed from packages/xserver/xserver-kdrive_20060312.bb)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb (renamed from packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive_cvs.bb (renamed from packages/xserver/xserver-kdrive_cvs.bb)0
-rw-r--r--packages/xorg-xserver/xserver-kdrive_git.bb (renamed from packages/xserver/xserver-kdrive_git.bb)0
-rw-r--r--packages/xorg-xserver/xserver-xorg/.mtn2git_empty0
-rw-r--r--packages/xorg-xserver/xserver-xorg/dri.patch (renamed from packages/xserver/xserver-xorg/dri.patch)0
-rw-r--r--packages/xorg-xserver/xserver-xorg/drmfix.patch13
-rw-r--r--packages/xorg-xserver/xserver-xorg/fontfile.patch (renamed from packages/xserver/xserver-xorg/fontfile.patch)0
-rw-r--r--packages/xorg-xserver/xserver-xorg/freetype.patch (renamed from packages/xserver/xserver-xorg/freetype.patch)0
-rw-r--r--packages/xorg-xserver/xserver-xorg/imake-installed.patch (renamed from packages/xserver/xserver-xorg/imake-installed.patch)0
-rw-r--r--packages/xorg-xserver/xserver-xorg/imake-staging.patch (renamed from packages/xserver/xserver-xorg/imake-staging.patch)0
-rw-r--r--packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch11
-rw-r--r--packages/xorg-xserver/xserver-xorg/xorg.conf149
-rw-r--r--packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch30
-rw-r--r--packages/xorg-xserver/xserver-xorg_6.8.99.10.bb (renamed from packages/xserver/xserver-xorg_6.8.99.10.bb)0
-rw-r--r--packages/xorg-xserver/xserver-xorg_6.8.99.11.bb (renamed from packages/xserver/xserver-xorg_6.8.99.11.bb)0
-rw-r--r--packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb7
-rw-r--r--packages/xorg-xserver/xserver-xorg_cvs.bb (renamed from packages/xserver/xserver-xorg_cvs.bb)0
-rw-r--r--packages/xproto/applewmproto_1.0.3.bb1
-rw-r--r--packages/xproto/bigreqsproto_1.0.2.bb1
-rw-r--r--packages/xproto/compositeproto_0.2.2.bb3
-rw-r--r--packages/xproto/compositeproto_0.3.1.bb3
-rw-r--r--packages/xproto/damageproto_1.0.3.bb3
-rw-r--r--packages/xproto/dmxproto_2.2.2.bb1
-rw-r--r--packages/xproto/evieext_1.0.2.bb1
-rw-r--r--packages/xproto/fixesproto_3.0.2.bb3
-rw-r--r--packages/xproto/fixesproto_4.0.bb3
-rw-r--r--packages/xproto/fontcacheproto_0.1.2.bb1
-rw-r--r--packages/xproto/fontsproto_2.0.2.bb1
-rw-r--r--packages/xproto/glproto_1.4.3.bb1
-rw-r--r--packages/xproto/glproto_1.4.7.bb2
-rw-r--r--packages/xproto/inputproto_1.3.2.bb1
-rw-r--r--packages/xproto/kbproto_1.0.2.bb1
-rw-r--r--packages/xproto/printproto_1.0.3.bb1
-rw-r--r--packages/xproto/proto-common.inc16
-rw-r--r--packages/xproto/randrproto_1.1.2.bb3
-rw-r--r--packages/xproto/recordproto_1.13.2.bb3
-rw-r--r--packages/xproto/renderproto_0.9.2.bb3
-rw-r--r--packages/xproto/resourceproto_1.0.2.bb3
-rw-r--r--packages/xproto/scrnsaverproto_1.0.2.bb1
-rw-r--r--packages/xproto/scrnsaverproto_1.1.0.bb2
-rw-r--r--packages/xproto/trapproto_3.4.3.bb1
-rw-r--r--packages/xproto/videoproto_2.2.2.bb1
-rw-r--r--packages/xproto/windowswmproto_1.0.3.bb1
-rw-r--r--packages/xproto/xcmiscproto_1.1.2.bb1
-rw-r--r--packages/xproto/xextproto_7.0.2.bb3
-rw-r--r--packages/xproto/xf86bigfontproto_1.1.2.bb1
-rw-r--r--packages/xproto/xf86dgaproto_2.0.2.bb3
-rw-r--r--packages/xproto/xf86driproto_2.0.3.bb1
-rw-r--r--packages/xproto/xf86miscproto_0.9.2.bb1
-rw-r--r--packages/xproto/xf86rushproto_1.1.2.bb1
-rw-r--r--packages/xproto/xf86vidmodeproto_2.2.2.bb3
-rw-r--r--packages/xproto/xineramaproto_1.1.2.bb1
-rw-r--r--packages/xproto/xproto_7.0.4.bb1
-rw-r--r--packages/xproto/xproto_7.0.5.bb2
-rw-r--r--packages/xproto/xproxymanagementprotocol_1.0.2.bb1
-rw-r--r--packages/xrandr/xrandr_1.0.1.bb9
-rw-r--r--packages/xrdb/xrdb_1.0.1.bb11
-rw-r--r--packages/xscreensaver/xscreensaver_4.16.bb3
-rw-r--r--packages/xscreensaver/xscreensaver_4.22.bb3
-rw-r--r--packages/xset/xset_1.0.1.bb17
-rw-r--r--packages/zlib/zlib-1.2.3/libtool_staging.patch28
-rw-r--r--packages/zlib/zlib-native_1.2.3.bb3
-rw-r--r--packages/zlib/zlib_1.2.3.bb9
1111 files changed, 10568 insertions, 3076 deletions
diff --git a/classes/kernel-arch.bbclass b/classes/kernel-arch.bbclass
index 92a6c982fb..b331d25614 100644
--- a/classes/kernel-arch.bbclass
+++ b/classes/kernel-arch.bbclass
@@ -19,6 +19,7 @@ def map_kernel_arch(a, d):
elif re.match('armeb$', a): return 'arm'
elif re.match('powerpc$', a): return 'ppc'
elif re.match('mipsel$', a): return 'mips'
+ elif re.match('sh(3|4)$', a): return 'sh'
elif a in valid_archs: return a
else:
bb.error("cannot map '%s' to a linux kernel architecture" % a)
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 97e091c254..eb3a0349cb 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -177,8 +177,10 @@ runstrip() {
ro=1
chmod +w "$1"
}
+ '${OBJCOPY}' --only-keep-debug "$1" "$1.dbg"
'${STRIP}' "$1"
st=$?
+ '${OBJCOPY}' --add-gnu-debuglink="$1.dbg" "$1"
test -n "$ro" && chmod -w "$1"
if test $st -ne 0
then
@@ -249,6 +251,21 @@ python populate_packages () {
bb.error("%s is listed in PACKAGES mutliple times. Undefined behaviour will result." % pkg)
pkgs += pkg
+ if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1'):
+ stripfunc = ""
+ for root, dirs, files in os.walk(dvar):
+ for f in files:
+ file = os.path.join(root, f)
+ if not os.path.islink(file) and isexec(file):
+ stripfunc += "\trunstrip %s || st=1\n" % (file)
+ if not stripfunc == "":
+ from bb import build
+ localdata = bb.data.createCopy(d)
+ # strip
+ bb.data.setVar('RUNSTRIP', '\tlocal st\n\tst=0\n%s\treturn $st' % stripfunc, localdata)
+ bb.data.setVarFlag('RUNSTRIP', 'func', 1, localdata)
+ bb.build.exec_func('RUNSTRIP', localdata)
+
for pkg in packages.split():
localdata = bb.data.createCopy(d)
root = os.path.join(workdir, "install", pkg)
@@ -273,7 +290,6 @@ python populate_packages () {
bb.mkdirhier(root)
filesvar = bb.data.getVar('FILES', localdata, 1) or ""
files = filesvar.split()
- stripfunc = ""
for file in files:
if os.path.isabs(file):
file = '.' + file
@@ -293,17 +309,9 @@ python populate_packages () {
fpath = os.path.join(root,file)
dpath = os.path.dirname(fpath)
bb.mkdirhier(dpath)
- if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1') and not os.path.islink(file) and isexec(file):
- stripfunc += "\trunstrip %s || st=1\n" % fpath
ret = bb.movefile(file,fpath)
if ret is None or ret == 0:
raise bb.build.FuncFailed("File population failed")
- if not stripfunc == "":
- from bb import build
- # strip
- bb.data.setVar('RUNSTRIP', '\tlocal st\n\tst=0\n%s\treturn $st' % stripfunc, localdata)
- bb.data.setVarFlag('RUNSTRIP', 'func', 1, localdata)
- bb.build.exec_func('RUNSTRIP', localdata)
del localdata
os.chdir(workdir)
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index b2b7479fad..2b92415b58 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -31,8 +31,6 @@ real_do_rootfs () {
mkdir -p ${IMAGE_ROOTFS}/dev
if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
- rm -f ${DEPLOY_DIR_IPK}/Packages
- touch ${DEPLOY_DIR_IPK}/Packages
ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
fi
mkdir -p ${T}
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 7893fd75cf..d446d40b8f 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -102,7 +102,7 @@ PROVIDES = ""
PROVIDES_prepend = "${P} ${PF} ${PN} "
RPROVIDES = ""
-PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
FILES = ""
FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
${sysconfdir} ${sharedstatedir} ${localstatedir} \
@@ -118,6 +118,8 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
/lib/*.a /lib/*.o ${datadir}/aclocal"
FILES_${PN}-locale = "${datadir}/locale"
+FILES_${PN}-dbg = "${bindir}/*.dbg ${sbindir}/*.dbg ${libexecdir}/*.dbg ${libdir}/lib*.so.*.dbg \
+ /bin/*.dbg /sbin/*.dbg /lib/*.so*.dbg ${libdir}/${PN}/*.dbg"
# File manifest
@@ -223,6 +225,7 @@ export AR = "${HOST_PREFIX}ar"
export AS = "${HOST_PREFIX}as"
export RANLIB = "${HOST_PREFIX}ranlib"
export STRIP = "${HOST_PREFIX}strip"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}"
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index f1a2a74523..1d22b97a9a 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -18,7 +18,11 @@ DISTRO_TYPE = "debug"
FEED_URIS += " \
- base##${ANGSTROM_URI}/unstable/feed/base"
+ base##${ANGSTROM_URI}/unstable/feed/base \
+ perl##${ANGSTROM_URI}/unstable/feed/perl \
+ python##${ANGSTROM_URI}/unstable/feed/python \
+ debug##${ANGSTROM_URI}/unstable/feed/debug \
+ ${MACHINE}##${ANGSTROM_URI}/usntable/feed/machine/${MACHINE}"
# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
index 5a24d22a8c..1e156dd363 100644
--- a/conf/distro/ezx.conf
+++ b/conf/distro/ezx.conf
@@ -57,7 +57,7 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
#
# Utilities
#
-BOOTSTRAP_EXTRA_DEPENDS += "ezx-boot-usb-native"
+EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
BOOTSTRAP_EXTRA_RDEPENDS += "ezx-gpiotool strace"
#
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index b95cc42020..fb38785add 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -35,6 +35,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+PREFERRED_PROVIDER_tslib ?= tslib
+
PREFERRED_VERSION_gcc = "3.4.4"
PREFERRED_VERSION_gcc-cross = "3.4.4"
PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 13ac2b16bf..8203c000f7 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -37,7 +37,6 @@ BUILD_OPTIMIZATION = "-Os"
TARGET_FPU_arm = "soft"
#Always ship these packages
-BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version coreutils dropbear sysvinit"
BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit"
#Name the generated images in a sane way
diff --git a/conf/distro/include/preferred-opie-versions.inc b/conf/distro/include/preferred-opie-versions.inc
index 51c9937628..34c1fd498e 100644
--- a/conf/distro/include/preferred-opie-versions.inc
+++ b/conf/distro/include/preferred-opie-versions.inc
@@ -65,6 +65,7 @@ PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-examples = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
@@ -203,4 +204,6 @@ PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
PREFERRED_VERSION_konqueror-embedded = "20060404"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
new file mode 100644
index 0000000000..8c6b122585
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
@@ -0,0 +1,341 @@
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+PREFERRED_PROVIDER_libxext = "libxext"
+PREFERRED_PROVIDER_xext = "libxext"
+PREFERRED_PROVIDER_libxi = "libxi"
+PREFERRED_PROVIDER_libxft = "libxft"
+PREFERRED_PROVIDER_libx11 = "libx11"
+PREFERRED_PROVIDER_libxpm = "libxpm"
+PREFERRED_PROVIDER_xpm = "libxpm"
+PREFERRED_PROVIDER_libxt = "libxt"
+PREFERRED_PROVIDER_libxaw = "libxaw"
+PREFERRED_PROVIDER_libice = "libice"
+PREFERRED_PROVIDER_libxrender = "libxrender"
+PREFERRED_PROVIDER_libxcursor = "libxcursor"
+PREFERRED_PROVIDER_xextensions = "xextensions"
+PREFERRED_PROVIDER_xproto = "xproto"
+PREFERRED_PROVIDER_x11 = "libx11"
+PREFERRED_PROVIDER_libxv = "libxv"
+PREFERRED_PROVIDER_xft = "libxft"
+PREFERRED_PROVIDER_libxrandr = "libxrandr"
+PREFERRED_PROVIDER_libxdamage = "libxdamage"
+PREFERRED_PROVIDER_libxcomposite = "libxcomposite"
+PREFERRED_PROVIDER_libxfixes = "libxfixes"
+PREFERRED_PROVIDER_libxinerama = "libxinerama"
+PREFERRED_PROVIDER_libxxf86vm = "libxxf86vm"
+PREFERRED_PROVIDER_libxmu = "libxmu"
+PREFERRED_PROVIDER_libsm = "libsm"
+PREFERRED_PROVIDER_xrandr = "xrandr"
+PREFERRED_PROVIDER_xserver = "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xorg = "xserver-xorg"
+
+PREFERRED_VERSION_task-xorg = "X11R7.0"
+
+PREFERRED_VERSION_appres = "X11R7.0-1.0.0"
+PREFERRED_VERSION_bdftopcf-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_bdftopcf = "X11R7.0-1.0.0"
+PREFERRED_VERSION_beforelight = "X11R7.0-1.0.1"
+PREFERRED_VERSION_bitmap = "X11R7.0-1.0.1"
+PREFERRED_VERSION_editres = "X11R7.0-1.0.1"
+PREFERRED_VERSION_fonttosfnt = "X11R7.0-1.0.1"
+PREFERRED_VERSION_fslsfonts = "X11R7.0-1.0.1"
+PREFERRED_VERSION_fstobdf = "X11R7.0-1.0.1"
+PREFERRED_VERSION_iceauth = "X11R7.0-1.0.1"
+PREFERRED_VERSION_ico = "X11R7.0-1.0.1"
+PREFERRED_VERSION_lbxproxy = "X11R7.0-1.0.1"
+PREFERRED_VERSION_listres = "X11R7.0-1.0.1"
+PREFERRED_VERSION_luit = "X11R7.0-1.0.1"
+PREFERRED_VERSION_mkcfm = "X11R7.0-1.0.1"
+PREFERRED_VERSION_mkfontdir-native = "X11R7.0-1.0.1"
+PREFERRED_VERSION_mkfontdir = "X11R7.0-1.0.1"
+PREFERRED_VERSION_mkfontscale-native = "X11R7.0-1.0.1"
+PREFERRED_VERSION_mkfontscale = "X11R7.0-1.0.1"
+PREFERRED_VERSION_oclock = "X11R7.0-1.0.1"
+PREFERRED_VERSION_proxymngr = "X11R7.0-1.0.1"
+PREFERRED_VERSION_rgb = "X11R7.0-1.0.0"
+PREFERRED_VERSION_rstart = "X11R7.0-1.0.1"
+PREFERRED_VERSION_scripts = "X11R7.0-1.0.1"
+PREFERRED_VERSION_sessreg = "X11R7.0-1.0.0"
+PREFERRED_VERSION_setxkbmap = "X11R7.0-1.0.1"
+PREFERRED_VERSION_showfont = "X11R7.0-1.0.1"
+PREFERRED_VERSION_smproxy = "X11R7.0-1.0.1"
+PREFERRED_VERSION_twm = "X11R7.0-1.0.1"
+PREFERRED_VERSION_viewres = "X11R7.0-1.0.1"
+PREFERRED_VERSION_x11perf = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xauth = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xbiff = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcalc = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xclipboard = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xclock = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcmsdb = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xconsole = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcursorgen = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xdbedizzy = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xditview = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xdm = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xdpyinfo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xdriinfo = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xedit = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xev = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xeyes = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xf86dga = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfd = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfindproxy = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfontsel = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfs = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfsinfo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfwp = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xgamma = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xgc = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xhost = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xinit = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbcomp = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbevd = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbprint = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbutils = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkill = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xload = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlogo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlsatoms = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlsclients = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlsfonts = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xmag = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xman = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xmessage = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xmh = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xmodmap = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xmore = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xphelloworld = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xplsprinters = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xpr = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xprehashprinterlist = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xprop = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xrandr = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xrdb = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xrefresh = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xrx = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xset = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xsetmode = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xsetpointer = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xsetroot = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xsm = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xstdcmap = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xtrap = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xvidtune = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xvinfo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xwd = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xwininfo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xwud = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xbitmaps = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcursor-themes = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbdata = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xorg-docs = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xorg-sgml-doctools = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xf86-input-acecad = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-aiptek = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-calcomp = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-citron = "X11R7.0-2.1.1.5"
+PREFERRED_VERSION_xf86-input-digitaledge = "X11R7.0-1.0.1.3"
+PREFERRED_VERSION_xf86-input-dmc = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-dynapro = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-elo2300 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-elographics = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-evdev = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-fpit = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-hyperpen = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-jamstudio = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-joystick = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-keyboard = "X11R7.0-1.0.1.3"
+PREFERRED_VERSION_xf86-input-magellan = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-magictouch = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-mouse = "X11R7.0-1.0.3.1"
+PREFERRED_VERSION_xf86-input-mutouch = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-palmax = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-penmount = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-spaceorb = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-summa = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-tek4957 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-ur98 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-void = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-apm = "X11R7.0-1.0.1.5"
+PREFERRED_VERSION_xf86-video-ark = "X11R7.0-0.5.0.5"
+PREFERRED_VERSION_xf86-video-ati = "X11R7.0-6.5.7.3"
+PREFERRED_VERSION_xf86-video-chips = "X11R7.0-1.0.1.3"
+PREFERRED_VERSION_xf86-video-cirrus = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-cyrix = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-dummy = "X11R7.0-0.1.0.5"
+PREFERRED_VERSION_xf86-video-fbdev = "X11R7.0-0.1.0.5"
+PREFERRED_VERSION_xf86-video-glint = "X11R7.0-1.0.1.3"
+PREFERRED_VERSION_xf86-video-i128 = "X11R7.0-1.1.0.5"
+PREFERRED_VERSION_xf86-video-i740 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-i810 = "X11R7.0-1.4.1.3"
+PREFERRED_VERSION_xf86-video-imstt = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-mga = "X11R7.0-1.2.1.3"
+PREFERRED_VERSION_xf86-video-neomagic = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-newport = "X11R7.0-0.1.4.1"
+PREFERRED_VERSION_xf86-video-nsc = "X11R7.0-2.7.6.5"
+PREFERRED_VERSION_xf86-video-nv = "X11R7.0-1.0.1.5"
+PREFERRED_VERSION_xf86-video-rendition = "X11R7.0-4.0.1.3"
+PREFERRED_VERSION_xf86-video-s3 = "X11R7.0-0.3.5.5"
+PREFERRED_VERSION_xf86-video-s3virge = "X11R7.0-1.8.6.5"
+PREFERRED_VERSION_xf86-video-savage = "X11R7.0-2.0.2.3"
+PREFERRED_VERSION_xf86-video-siliconmotion = "X11R7.0-1.3.1.5"
+PREFERRED_VERSION_xf86-video-sis = "X11R7.0-0.8.1.3"
+PREFERRED_VERSION_xf86-video-sisusb = "X11R7.0-0.7.1.3"
+PREFERRED_VERSION_xf86-video-sunbw2 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-suncg14 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-suncg3 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-suncg6 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-sunffb = "X11R7.0-1.0.1.3"
+PREFERRED_VERSION_xf86-video-sunleo = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-suntcx = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-tdfx = "X11R7.0-1.1.1.3"
+PREFERRED_VERSION_xf86-video-tga = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-trident = "X11R7.0-1.0.1.2"
+PREFERRED_VERSION_xf86-video-tseng = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-v4l = "X11R7.0-0.0.1.5"
+PREFERRED_VERSION_xf86-video-vesa = "X11R7.0-1.0.1.3"
+PREFERRED_VERSION_xf86-video-vga = "X11R7.0-4.0.0.5"
+PREFERRED_VERSION_xf86-video-via = "X11R7.0-0.1.33.2"
+PREFERRED_VERSION_xf86-video-vmware = "X11R7.0-10.11.1.3"
+PREFERRED_VERSION_xf86-video-voodoo = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_encodings = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-adobe-100dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-adobe-75dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-adobe-utopia-100dpi = "X11R7.0-1.0.1"
+PREFERRED_VERSION_font-adobe-utopia-75dpi = "X11R7.0-1.0.1"
+PREFERRED_VERSION_font-adobe-utopia-type1 = "X11R7.0-1.0.1"
+PREFERRED_VERSION_font-alias = "X11R7.0-1.0.1"
+PREFERRED_VERSION_font-arabic-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bh-100dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bh-75dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bh-lucidatypewriter-100dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bh-lucidatypewriter-75dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bh-ttf = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bh-type1 = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bitstream-100dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bitstream-75dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bitstream-speedo = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bitstream-type1 = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-cronyx-cyrillic = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-cursor-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-daewoo-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-dec-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-ibm-type1 = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-isas-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-jis-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-micro-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-misc-cyrillic = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-misc-ethiopic = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-misc-meltho = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-misc-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-mutt-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-schumacher-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-screen-cyrillic = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-sony-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-sun-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-util-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-util = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-winitzki-cyrillic = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-xfree86-type1 = "X11R7.0-1.0.0"
+PREFERRED_VERSION_diet-x11 = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libapplewm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libdmx = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libfontenc-native = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libfontenc = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libfs = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libice = "X11R7.0-1.0.0"
+PREFERRED_VERSION_liblbxutil = "X11R7.0-1.0.0"
+PREFERRED_VERSION_liboldx = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libsm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libwindowswm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libx11-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libx11 = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxau-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxau = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxaw = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxcomposite = "X11R7.0-0.2.2.2"
+PREFERRED_VERSION_libxcursor = "X11R7.0-1.1.5.2"
+PREFERRED_VERSION_libxdamage = "X11R7.0-1.0.2.2"
+PREFERRED_VERSION_libxdmcp-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxdmcp = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxevie = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxext = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxfixes = "X11R7.0-3.0.1.2"
+PREFERRED_VERSION_libxfont-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxfont = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxfontcache = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxft = "X11R7.0-2.1.8.2"
+PREFERRED_VERSION_libxi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxinerama = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxkbfile = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxkbui = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxmu = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxp = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxpm = "X11R7.0-3.5.4.2"
+PREFERRED_VERSION_libxprintapputil = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxprintutil = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxrandr = "X11R7.0-1.1.0.2"
+PREFERRED_VERSION_libxrender = "X11R7.0-0.9.0.2"
+PREFERRED_VERSION_libxres = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxscrnsaver = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxt = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxtrap = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxtst = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxv = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxvmc = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxxf86dga = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxxf86misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxxf86vm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xtrans-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xtrans = "X11R7.0-1.0.0"
+PREFERRED_VERSION_applewmproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_bigreqsproto-native = "X11R7.0-1.0.2"
+PREFERRED_VERSION_bigreqsproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_compositeproto = "X11R7.0-0.2.2"
+PREFERRED_VERSION_damageproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_dmxproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_evieext = "X11R7.0-1.0.2"
+PREFERRED_VERSION_fixesproto = "X11R7.0-3.0.2"
+PREFERRED_VERSION_fontcacheproto-native = "X11R7.0-0.1.2"
+PREFERRED_VERSION_fontcacheproto = "X11R7.0-0.1.2"
+PREFERRED_VERSION_fontsproto-native = "X11R7.0-2.0.2"
+PREFERRED_VERSION_fontsproto = "X11R7.0-2.0.2"
+PREFERRED_VERSION_glproto = "X11R7.0-1.4.3"
+PREFERRED_VERSION_inputproto-native = "X11R7.0-1.3.2"
+PREFERRED_VERSION_inputproto = "X11R7.0-1.3.2"
+PREFERRED_VERSION_kbproto-native = "X11R7.0-1.0.2"
+PREFERRED_VERSION_kbproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_printproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_randrproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_recordproto = "X11R7.0-1.13.2"
+PREFERRED_VERSION_renderproto = "X11R7.0-0.9.2"
+PREFERRED_VERSION_resourceproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_scrnsaverproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_trapproto = "X11R7.0-3.4.3"
+PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_xcmiscproto-native = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xcmiscproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xextproto-native = "X11R7.0-7.0.2"
+PREFERRED_VERSION_xextproto = "X11R7.0-7.0.2"
+PREFERRED_VERSION_xf86bigfontproto-native = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86bigfontproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86dgaproto = "X11R7.0-2.0.2"
+PREFERRED_VERSION_xf86driproto = "X11R7.0-2.0.3"
+PREFERRED_VERSION_xf86miscproto = "X11R7.0-0.9.2"
+PREFERRED_VERSION_xf86rushproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86vidmodeproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_xineramaproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xproto-native = "X11R7.0-7.0.4"
+PREFERRED_VERSION_xproto = "X11R7.0-7.0.4"
+PREFERRED_VERSION_xproxymanagementprotocol = "X11R7.0-1.0.2"
+PREFERRED_VERSION_gccmakedep = "X11R7.0-1.0.1"
+PREFERRED_VERSION_imake = "X11R7.0-1.0.1"
+PREFERRED_VERSION_lndir = "X11R7.0-1.0.1"
+PREFERRED_VERSION_makedepend = "X11R7.0-1.0.0"
+PREFERRED_VERSION_util-macros-native = "X11R7.0-1.0.1"
+PREFERRED_VERSION_util-macros = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xorg-cf-files = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xserver-xorg = "X11R7.0-1.0.1"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
new file mode 100644
index 0000000000..4371fae61d
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
@@ -0,0 +1,185 @@
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+PREFERRED_PROVIDER_libxext = "libxext"
+PREFERRED_PROVIDER_xext = "libxext"
+PREFERRED_PROVIDER_libxi = "libxi"
+PREFERRED_PROVIDER_libxft = "libxft"
+PREFERRED_PROVIDER_libx11 = "libx11"
+PREFERRED_PROVIDER_libxpm = "libxpm"
+PREFERRED_PROVIDER_xpm = "libxpm"
+PREFERRED_PROVIDER_libxt = "libxt"
+PREFERRED_PROVIDER_libxaw = "libxaw"
+PREFERRED_PROVIDER_libice = "libice"
+PREFERRED_PROVIDER_libxrender = "libxrender"
+PREFERRED_PROVIDER_libxcursor = "libxcursor"
+PREFERRED_PROVIDER_xextensions = "xextensions"
+PREFERRED_PROVIDER_xproto = "xproto"
+PREFERRED_PROVIDER_x11 = "libx11"
+PREFERRED_PROVIDER_libxv = "libxv"
+PREFERRED_PROVIDER_xft = "libxft"
+PREFERRED_PROVIDER_libxrandr = "libxrandr"
+PREFERRED_PROVIDER_libxdamage = "libxdamage"
+PREFERRED_PROVIDER_libxcomposite = "libxcomposite"
+PREFERRED_PROVIDER_libxfixes = "libxfixes"
+PREFERRED_PROVIDER_libxinerama = "libxinerama"
+PREFERRED_PROVIDER_libxxf86vm = "libxxf86vm"
+PREFERRED_PROVIDER_libxmu = "libxmu"
+PREFERRED_PROVIDER_libsm = "libsm"
+PREFERRED_PROVIDER_xrandr = "xrandr"
+PREFERRED_PROVIDER_xserver = "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xorg = "xserver-xorg"
+
+PREFERRED_VERSION_task-xorg = "X11R7.1"
+
+PREFERRED_VERSION_bitmap = "X11R7.1-1.0.2"
+PREFERRED_VERSION_fstobdf = "X11R7.1-1.0.2"
+PREFERRED_VERSION_mkfontdir-native = "X11R7.1-1.0.2"
+PREFERRED_VERSION_mkfontdir = "X11R7.1-1.0.2"
+PREFERRED_VERSION_rgb = "X11R7.1-1.0.1"
+PREFERRED_VERSION_rstart = "X11R7.1-1.0.2"
+PREFERRED_VERSION_setxkbmap = "X11R7.1-1.0.2"
+PREFERRED_VERSION_smproxy = "X11R7.1-1.0.2"
+PREFERRED_VERSION_x11perf = "X11R7.1-1.4.1"
+PREFERRED_VERSION_xclock = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xconsole = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xcursorgen = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xdm = "X11R7.1-1.0.4"
+PREFERRED_VERSION_xdriinfo = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xedit = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xfs = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xhost = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xinit = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xkbcomp = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xkbevd = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xman = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xrdb = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xrefresh = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xset = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xtrap = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xwininfo = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xorg-docs = "X11R7.1-1.2"
+PREFERRED_VERSION_xorg-sgml-doctools = "X11R7.1-1.1"
+PREFERRED_VERSION_xf86-input-acecad = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-aiptek = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xf86-input-calcomp = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-citron = "X11R7.1-2.2.0"
+PREFERRED_VERSION_xf86-input-digitaledge = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-dmc = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-dynapro = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-elo2300 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-evdev = "X11R7.1-1.1.2"
+PREFERRED_VERSION_xf86-input-fpit = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-hyperpen = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-jamstudio = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-joystick = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-keyboard = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-magellan = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-magictouch = "X11R7.1-1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-mouse = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-mutouch = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-palmax = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-penmount = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-spaceorb = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-summa = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-tek4957 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-ur98 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-vmmouse = "X11R7.1-12.4.0"
+PREFERRED_VERSION_xf86-input-void = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-apm = "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-ark = "X11R7.1-0.6.0"
+PREFERRED_VERSION_xf86-video-ast = "X11R7.1-0.81.0"
+PREFERRED_VERSION_xf86-video-ati = "X11R7.1-6.6.0"
+PREFERRED_VERSION_xf86-video-chips = "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-cirrus = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-cyrix = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-dummy = "X11R7.1-0.2.0"
+PREFERRED_VERSION_xf86-video-fbdev = "X11R7.1-0.3.0"
+PREFERRED_VERSION_xf86-video-glint = "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-i128 = "X11R7.1-1.1.0.5"
+PREFERRED_VERSION_xf86-video-i740 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-i810 = "X11R7.1-1.6.0"
+PREFERRED_VERSION_xf86-video-imstt = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-mga = "X11R7.1-1.4.1"
+PREFERRED_VERSION_xf86-video-neomagic = "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-newport = "X11R7.1-0.2.0"
+PREFERRED_VERSION_xf86-video-nsc = "X11R7.1-2.8.1"
+PREFERRED_VERSION_xf86-video-nv = "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-rendition = "X11R7.1-4.1.0"
+PREFERRED_VERSION_xf86-video-s3 = "X11R7.1-0.4.1"
+PREFERRED_VERSION_xf86-video-s3virge = "X11R7.1-1.9.1"
+PREFERRED_VERSION_xf86-video-savage = "X11R7.1-2.1.1"
+PREFERRED_VERSION_xf86-video-siliconmotion = "X11R7.1-1.4.1"
+PREFERRED_VERSION_xf86-video-sis = "X11R7.1-0.9.1"
+PREFERRED_VERSION_xf86-video-sisusb = "X11R7.1-0.8.1"
+PREFERRED_VERSION_xf86-video-sunbw2 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-suncg14 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-suncg3 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-suncg6 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-sunffb = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-sunleo = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-suntcx = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-tdfx = "X11R7.1-1.2.1"
+PREFERRED_VERSION_xf86-video-tga = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-trident = "X11R7.1-1.2.1"
+PREFERRED_VERSION_xf86-video-tseng = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-v4l = "X11R7.1-0.1.1"
+PREFERRED_VERSION_xf86-video-vesa = "X11R7.1-1.2.0"
+PREFERRED_VERSION_xf86-video-vga = "X11R7.1-4.1.0"
+PREFERRED_VERSION_xf86-video-via = "X11R7.1-0.2.1"
+PREFERRED_VERSION_xf86-video-vmware = "X11R7.1-10.13.0"
+PREFERRED_VERSION_xf86-video-voodoo = "X11R7.1-1.1.0"
+PREFERRED_VERSION_font-util-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_font-util = "X11R7.1-1.0.1"
+PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libdmx = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfontenc-native = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfontenc = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libice = "X11R7.1-1.0.1"
+PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libsm = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxau = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxaw = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxcomposite = "X11R7.1-0.3"
+PREFERRED_VERSION_libxcursor = "X11R7.1-1.1.6"
+PREFERRED_VERSION_libxdamage = "X11R7.1-1.0.3"
+PREFERRED_VERSION_libxdmcp-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxdmcp = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxevie = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxext = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxfixes = "X11R7.1-4.0.1"
+PREFERRED_VERSION_libxfont-native = "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxfont = "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxfontcache = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxi = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxkbfile = "X11R7.1-1.0.3"
+PREFERRED_VERSION_libxkbui = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxmu = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxpm = "X11R7.1-3.5.5"
+PREFERRED_VERSION_libxrandr = "X11R7.1-1.1.1"
+PREFERRED_VERSION_libxrender = "X11R7.1-0.9.1"
+PREFERRED_VERSION_libxres = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxscrnsaver = "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxt = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxvmc = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxxf86dga = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxxf86misc = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxxf86vm = "X11R7.1-1.0.1"
+PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1"
+PREFERRED_VERSION_fixesproto = "X11R7.1-4.0"
+PREFERRED_VERSION_glproto = "X11R7.1-1.4.7"
+PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5"
+PREFERRED_VERSION_xproto = "X11R7.1-7.0.5"
+PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2"
+PREFERRED_VERSION_imake = "X11R7.1-1.0.2"
+PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2"
+PREFERRED_VERSION_util-macros = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xserver-xorg = "X11R7.1-1.1.0"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index b3be297e53..3c2d8e560b 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -11,9 +11,6 @@ export FEED_URLS_jlime = "donkey##http://www.jlime.com/downloads/releases/donkey
# No uniroot
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-# Lets set a few more terminals
-SYSVINIT_ENABLED_GETTYS = "4"
-
#<>
#<> We will set CVS DATE when things are known to work.
#<>
@@ -52,7 +49,7 @@ PREFERRED_VERSION_glibc-initial = "2.3.2"
#<>
PREFERRED_VERSION_glib-2.0-native = "2.6.5"
PREFERRED_VERSION_glib-1.2-native = "1.2.10"
-PREFERRED_VERSION_glib-2.0 = "2.8.4"
+PREFERRED_VERSION_glib-2.0 = "2.10.0"
PREFERRED_VERSION_glib-1.2 = "1.2.10"
#<>
@@ -69,7 +66,8 @@ PREFRRED_VERSION_cairo = "1.0.4"
#<>We want to be able to build this for all jornadas so
#<>to not mess up the folders we need to make them dynamic.
#<>It will use different folders depending on Arch (set in local.conf)
-INHERIT += "package_ipk multimachine"
+SRC_DIST_LOCAL = "copy"
+INHERIT += "package_ipk package_tar multimachine src_distribute_local"
BBINCLUDELOGS = "yes"
IMAGE_FSTYPES = "tar.bz2"
TARGET_OS = "linux"
@@ -77,9 +75,7 @@ TARGET_OS = "linux"
#<>What we want on the bootstrap image (extra)
#<>
#<>
-BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \
- e2tools e2fsprogs kernel-modules spectrum-fw keymaps"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \
+BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools udev \
e2tools e2fsprogs kernel-modules spectrum-fw keymaps"
#<>
@@ -87,10 +83,13 @@ BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-too
#<>
QTE_VERSION = "2.3.10"
PALMTOP_USE_MULTITHREADED_QT = "yes"
-PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt"
-PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
-OPIE_VERSION = "20060709"
-require conf/distro/include/preferred-opie-cvs-versions.inc
+OPIE_VERSION = "1.2.2"
+require conf/distro/include/preferred-opie-versions.inc
+
+#<>
+#<> Lets decide on a GPE versipns
+#<>
+require conf/distro/include/preferred-gpe-versions-2.7.inc
#<>
#<> We want pcmciautils, not pcmcia-cs
@@ -108,3 +107,10 @@ FULL_OPTIMIZATION = "-O1"
#<>
IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}"
+#<>
+#<>
+#<>
+#<> General non-essential programs
+#<>
+#<>
+PREFERRED_VERSION_irssi = "0.8.10" \ No newline at end of file
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 69dc40e730..14372b5b9e 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -32,6 +32,7 @@ SRCDATE ?= "20060701"
ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+PREFERRED_PROVIDER_tslib ?= tslib
KERNEL_CONSOLE = "ttyS0"
#DEBUG_OPTIMIZATION = "-O -g3"
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 8fa440e155..bf653d9e97 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -10,8 +10,6 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
ROOT_FLASH_SIZE = "32"
-BOOTSTRAP_EXTRA_DEPENDS_append = " mtd-utils virtual/kernel udev module-init-tools"
-
BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}"
BOOTSTRAP_EXTRA_RRECOMMENDS = " ${BOOT_MODULES}"
BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils kernel udev module-init-tools"
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf
new file mode 100644
index 0000000000..758793f7a7
--- /dev/null
+++ b/conf/machine/h5xxx.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
+#@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
+
+KERNEL ?= "kernel24"
+#KERNEL ?= "kernel26"
+
+OVERRIDES =. "${KERNEL}:"
+
+TARGET_ARCH = "arm"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
+PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
+EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
+
+ROOT_FLASH_SIZE = "32"
+
+BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}"
+BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"
+BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
+
+H5XXX_MODULES_kernel24 = " g_ether pxa2xx_udc h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mtdchar h5400-audio"
+H5XXX_MODULES_kernel26 = " h5400_lcd g_ether apm h5400_battery pcmcia-core"
+# pxa2xx_udc is built in to the kernel
+
+SERIAL_CONSOLE = "115200 tts/0 vt100"
+
+USE_DEVFS_kernel24 = "1"
+USE_VT = "0"
+
+GUI_MACHINE_CLASS = "smallscreen"
+
+include conf/machine/tune-xscale.conf
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 33855e3a66..42eabeb588 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -28,11 +28,6 @@ module_autoload_snd-omap-alsa-tsc2101 = "snd-omap-alsa-tsc2101"
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
-BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils console-tools module-init-tools"
-BOOTSTRAP_EXTRA_DEPENDS += "apmd alsa-utils"
-BOOTSTRAP_EXTRA_DEPENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
-BOOTSTRAP_EXTRA_DEPENDS += "scap minicom nano gdb strace network-suspend-scripts pciutils usbutils"
-
BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils console-tools module-init-tools"
BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${H6300_MODULES}', d)}"
BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd alsa-utils"
@@ -40,7 +35,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "alsa-utils-aconnect alsa-utils-alsactl alsa-utils-a
BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
BOOTSTRAP_EXTRA_RRECOMMENDS += "scap minicom nano gdb strace network-suspend-scripts pciutils usbutils"
-GPE_EXTRA_DEPENDS += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator gpe-tetris gpe-othello gpe-go gstreamer"
GPE_EXTRA_INSTALL += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator gpe-tetris gpe-othello gpe-go gstreamer"
SERIAL_CONSOLE ?= "115200 ttyS0"
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 0e377a151f..8ce77e7449 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -47,4 +47,4 @@ module_autoload_htcuniversal-acx = "htcuniversal_acx"
#FIXME: this should be controlled by a userspace utility later.
module_autoload_g_ether = "g_ether"
-#GPE_EXTRA_DEPENDS += " gomunicator"
+#GPE_EXTRA_INSTALL += " gomunicator"
diff --git a/files/device_table-jlime.txt b/files/device_table-jlime.txt
index c0a219f006..6c5d53d18e 100644
--- a/files/device_table-jlime.txt
+++ b/files/device_table-jlime.txt
@@ -16,6 +16,8 @@
/dev/mtd c 660 0 6 90 0 0 2 8
/dev/mtdblock b 640 0 0 31 0 0 1 8
/dev/console c 662 0 5 5 1 - -
+/dev/urandom c 644 0 0 1 9 - - -
+/dev/random c 644 0 0 1 8 - - -
/bin/tinylogin f 4755 0 0 - - - -
/bin/mount f 4755 0 0 - - - -
/bin/umount f 4755 0 0 - - - -
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index dc3d71040c..d050add3a5 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -44,7 +44,7 @@ RDEPENDS_angstrom-base-wifi = "\
"
RDEPENDS_angstrom-x11-base-depends := "\
- diet-x11 \
+ libx11 \
virtual/xserver"
RDEPENDS_angstrom-gpe-task-base := "\
diff --git a/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch b/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch
index 209232ed6d..ab7fb42eaa 100644
--- a/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch
+++ b/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch
@@ -1,16 +1,16 @@
---- anthy-6801/mkanthydic/Makefile.am.orig 2005-08-06 12:08:56 +0200
-+++ anthy-6801/mkanthydic/Makefile.am 2005-08-06 12:11:18 +0200
-@@ -15,7 +15,7 @@
- udict dict.args.in
+--- anthy-7811/mkanthydic/Makefile.am~ 2006-05-13 18:28:35.000000000 +0900
++++ anthy-7811/mkanthydic/Makefile.am 2006-06-18 10:56:25.770000000 +0900
+@@ -3,7 +3,7 @@
+ CLEANFILES = anthy.dic
+ INCLUDES = -I$(top_srcdir)/include -DSRCDIR=\"$(srcdir)\"
- # Generate the dictionary
--noinst_PROGRAMS = mkanthydic
-+bin_PROGRAMS = mkanthydic
- mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
- mkanthydic_LDADD = ../src-diclib/libanthydic.la
+-noinst_PROGRAMS = mkfiledic
++bin_PROGRAMS = mkfiledic
+ mkfiledic_SOURCES = mkfiledic.c
+ mkfiledic_LDADD = ../src-diclib/libdiclib.la
---- anthy-6801/depgraph/Makefile.am.orig 2005-08-06 12:08:33 +0200
-+++ anthy-6801/depgraph/Makefile.am 2005-08-06 12:11:28 +0200
+--- anthy-7811/depgraph/Makefile.am~ 2006-06-02 00:20:54.000000000 +0900
++++ anthy-7811/depgraph/Makefile.am 2006-06-18 10:57:19.420000000 +0900
@@ -9,7 +9,7 @@
EXTRA_DIST = indepword.txt $(DEPWORDS)
@@ -18,5 +18,28 @@
-noinst_PROGRAMS = mkdepgraph
+bin_PROGRAMS = mkdepgraph
mkdepgraph_SOURCES = mkdepgraph.c
- mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la
+ mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la
+
+--- anthy-7811/mkworddic/Makefile.am~ 2006-05-13 18:29:07.000000000 +0900
++++ anthy-7811/mkworddic/Makefile.am 2006-06-18 11:21:56.300000000 +0900
+@@ -16,7 +16,8 @@
+ udict dict.args.in
+
+ # Generate the dictionary
+-noinst_PROGRAMS = mkworddic
++#noinst_PROGRAMS = mkworddic
++bin_PROGRAMS = mkworddic
+ mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
+ mkworddic_LDADD = ../src-worddic/libanthydic.la
+
+--- anthy-7811/mkmatrix/Makefile.am~ 2006-06-18 11:29:52.110000000 +0900
++++ anthy-7811/mkmatrix/Makefile.am 2006-06-18 11:32:30.630000000 +0900
+@@ -1,6 +1,7 @@
+ EXTRA_DIST = dep.sorted
+-noinst_PROGRAMS = mkmatrix
++#noinst_PROGRAMS = mkmatrix
++bin_PROGRAMS = mkmatrix
+ INCLUDES = -I$(top_srcdir)/include
+ mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm
+ mkmatrix_SOURCES = mkmatrix.c
diff --git a/packages/anthy/anthy-native_6801.bb b/packages/anthy/anthy-native_6801.bb
deleted file mode 100644
index dbcf851024..0000000000
--- a/packages/anthy/anthy-native_6801.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require anthy_${PV}.bb
-DEPENDS =""
-inherit native
diff --git a/packages/anthy/anthy-native_7811.bb b/packages/anthy/anthy-native_7811.bb
new file mode 100644
index 0000000000..138abe87c8
--- /dev/null
+++ b/packages/anthy/anthy-native_7811.bb
@@ -0,0 +1,4 @@
+require anthy_${PV}.bb
+PACKAGES = ""
+DEPENDS = ""
+inherit native
diff --git a/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch b/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch
index e5cecbf570..86e6513d13 100644
--- a/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch
+++ b/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch
@@ -1,40 +1,84 @@
---- anthy-6801/mkanthydic/Makefile.am.orig 2005-08-06 12:14:58 +0200
-+++ anthy-6801/mkanthydic/Makefile.am 2005-08-06 12:15:13 +0200
-@@ -15,12 +15,12 @@
- udict dict.args.in
+--- anthy-7811/mkanthydic/Makefile.am~ 2006-05-13 18:28:35.000000000 +0900
++++ anthy-7811/mkanthydic/Makefile.am 2006-06-18 11:07:19.080000000 +0900
+@@ -3,12 +3,12 @@
+ CLEANFILES = anthy.dic
+ INCLUDES = -I$(top_srcdir)/include -DSRCDIR=\"$(srcdir)\"
- # Generate the dictionary
--noinst_PROGRAMS = mkanthydic
--mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
--mkanthydic_LDADD = ../src-diclib/libanthydic.la
-+#noinst_PROGRAMS = mkanthydic
-+#mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
-+#mkanthydic_LDADD = ../src-diclib/libanthydic.la
+-noinst_PROGRAMS = mkfiledic
+-mkfiledic_SOURCES = mkfiledic.c
+-mkfiledic_LDADD = ../src-diclib/libdiclib.la
++#noinst_PROGRAMS = mkfiledic
++#mkfiledic_SOURCES = mkfiledic.c
++#mkfiledic_LDADD = ../src-diclib/libdiclib.la
--anthy.dic : mkanthydic
-- ./mkanthydic -f ./dict.args
-+anthy.dic :
-+ mkanthydic -f ./dict.args
+-anthy.dic : mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep
+- ./mkfiledic
++anthy.dic : ../mkworddic/anthy.wdic ../depgraph/anthy.dep
++ mkfiledic
- # To install
---- anthy-6801/depgraph/Makefile.am.orig 2005-08-06 12:14:03 +0200
-+++ anthy-6801/depgraph/Makefile.am 2005-08-06 12:15:43 +0200
-@@ -9,12 +9,12 @@
+ # To install
+
+--- anthy-7811/depgraph/Makefile.am~ 2006-06-02 00:20:54.000000000 +0900
++++ anthy-7811/depgraph/Makefile.am 2006-06-18 11:08:13.350000000 +0900
+@@ -9,11 +9,11 @@
EXTRA_DIST = indepword.txt $(DEPWORDS)
# Generate the dictionary
-noinst_PROGRAMS = mkdepgraph
-mkdepgraph_SOURCES = mkdepgraph.c
--mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la
+-mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la
+#noinst_PROGRAMS = mkdepgraph
+#mkdepgraph_SOURCES = mkdepgraph.c
-+#mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la
++#mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la
-anthy.dep : mkdepgraph
- ./mkdepgraph
-+anthy.dep :
++anthy.dep :
+ mkdepgraph
+ noinst_DATA = anthy.dep
+
+--- anthy-7811/mkworddic/Makefile.am~ 2006-05-13 18:29:07.000000000 +0900
++++ anthy-7811/mkworddic/Makefile.am 2006-06-18 11:18:35.810000000 +0900
+@@ -16,14 +16,14 @@
+ udict dict.args.in
+
+ # Generate the dictionary
+-noinst_PROGRAMS = mkworddic
+-mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
+-mkworddic_LDADD = ../src-worddic/libanthydic.la
++#noinst_PROGRAMS = mkworddic
++#mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
++#mkworddic_LDADD = ../src-worddic/libanthydic.la
+
+ noinst_DATA = anthy.wdic
+
+-anthy.wdic : mkworddic
+- ./mkworddic -f ./dict.args
++anthy.wdic :
++ mkworddic -f ./dict.args
+
+
# To install
- pkgdata_DATA = anthy.dep
+--- anthy-7811/mkmatrix/Makefile.am~ 2006-06-02 00:19:41.000000000 +0900
++++ anthy-7811/mkmatrix/Makefile.am 2006-06-18 11:31:37.250000000 +0900
+@@ -1,12 +1,12 @@
+ EXTRA_DIST = dep.sorted
+
+-noinst_PROGRAMS = mkmatrix
+-INCLUDES = -I$(top_srcdir)/include
+-mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm
+-mkmatrix_SOURCES = mkmatrix.c
++#noinst_PROGRAMS = mkmatrix
++#INCLUDES = -I$(top_srcdir)/include
++#mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm
++#mkmatrix_SOURCES = mkmatrix.c
+
+ noinst_DATA = matrix
+ CLEANFILES = matrix
+
+-matrix : mkmatrix $(top_srcdir)/mkmatrix/dep.sorted
+- ./mkmatrix $(top_srcdir)/mkmatrix/dep.sorted -o matrix
++matrix : $(top_srcdir)/mkmatrix/dep.sorted
++ mkmatrix $(top_srcdir)/mkmatrix/dep.sorted -o matrix
diff --git a/packages/anthy/anthy_6801.bb b/packages/anthy/anthy_6801.bb
deleted file mode 100644
index c277639430..0000000000
--- a/packages/anthy/anthy_6801.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "A Japanese input method"
-AUTHOR = "Anthy Developers <anthy-dev@lists.sourceforge.jp>"
-HOMEPAGE = "http://anthy.sourceforge.jp"
-LICENSE = "GPL"
-DEPENDS = "anthy-native"
-SECTION = "libs/inputmethod"
-PR = "r0"
-
-SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/15893/anthy-6801.tar.gz \
- file://not_build_elc.patch;patch=1 \
- file://2ch_t.patch;patch=1 \
- file://change_anthy_dic_path.patch;patch=1 \
- file://native-mkanthydic-mkdepgraph.patch;patch=1"
-S = "${WORKDIR}/anthy-${PV}"
-
-inherit autotools pkgconfig
-
-PACKAGES = "${PN} libanthy0 libanthy-dev"
-
-DESCRIPTION_anthy = "A Japanese input method (backend, dictionary and utility)"
-DESCRIPTION_libanthy0 = "Anthy runtime library"
-DESCRIPTION_libanthy-dev = "Anthy static library, headers and documets for developers"
-
-# gettext
-
-LEAD_SONAME = "libanthy.so.0"
-RDEPENDS_anthy = "libanthy0"
-
-FILES_libanthy0 = "${libdir}/libanthy.so.* \
- ${libdir}/libanthydic.so.* \
- ${libdir}/libanthyinput.so.*"
-FILES_libanthy-dev = "${libdir}/libanthy* \
- ${includedir}/anthy \
- ${libdir}/pkgconfig/anthy.pc"
-FILES_${PN} = "${bindir}/* ${datadir}/* ${sysconfdir}/*"
diff --git a/packages/anthy/anthy_7811.bb b/packages/anthy/anthy_7811.bb
new file mode 100644
index 0000000000..a6c8eff200
--- /dev/null
+++ b/packages/anthy/anthy_7811.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "A Japanese input method"
+AUTHOR = "Anthy Developers <anthy-dev@lists.sourceforge.jp>"
+HOMEPAGE = "http://anthy.sourceforge.jp"
+LICENSE = "GPL"
+DEPENDS = "anthy-native"
+SECTION = "libs/inputmethod"
+PR = "r0"
+
+SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz \
+ file://not_build_elc.patch;patch=1 \
+ file://2ch_t.patch;patch=1 \
+ file://change_anthy_dic_path.patch;patch=1 \
+ file://native-mkanthydic-mkdepgraph.patch;patch=1"
+
+S = "${WORKDIR}/anthy-${PV}"
+
+inherit autotools pkgconfig
+
+PACKAGES = "${PN} ${PN}-el libanthy0 libanthy-dev"
+
+DESCRIPTION_anthy = "A Japanese input method (backend, dictionary and utility)"
+DESCRIPTION_libanthy0 = "Anthy runtime library"
+DESCRIPTION_libanthy-dev = "Anthy static library, headers and documets for developers"
+
+# gettext
+
+LEAD_SONAME = "libanthy.so.0"
+RDEPENDS_anthy = "libanthy0"
+
+FILES_libanthy0 = "${libdir}/libanthy.so.* \
+ ${libdir}/libanthydic.so.* \
+ ${libdir}/libanthyinput.so.*"
+FILES_libanthy-dev = "${libdir}/libanthy*.la \
+ ${libdir}/libanthy*.a \
+ ${libdir}/libanthy*.so \
+ ${includedir}/anthy \
+ ${libdir}/pkgconfig/anthy.pc"
+FILES_${PN}-el = "${datadir}/emacs/*"
+FILES_${PN} = "${datadir}/* \
+ ${bindir}/* \
+ ${sysconfdir}/anthy-conf"
+
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/anthy/files/change_anthy_dic_path.patch b/packages/anthy/files/change_anthy_dic_path.patch
index 7d6356bc38..1ea80a6390 100644
--- a/packages/anthy/files/change_anthy_dic_path.patch
+++ b/packages/anthy/files/change_anthy_dic_path.patch
@@ -1,11 +1,13 @@
-diff -urNad anthy/anthy-conf.in /tmp/dpep.kiMfmZ/anthy/anthy-conf.in
---- anthy/anthy-conf.in 2004-05-02 20:31:25.000000000 +0900
-+++ /tmp/dpep.kiMfmZ/anthy/anthy-conf.in 2004-10-24 08:40:37.000000000 +0900
-@@ -1,6 +1,6 @@
+--- anthy-7811/anthy-conf.in~ 2006-05-13 18:27:50.000000000 +0900
++++ anthy-7811/anthy-conf.in 2006-06-18 19:23:59.890000000 +0900
+@@ -1,7 +1,7 @@
# not /usr but should be ${prefix}/share.
- ANTHYDIR @prefix@/share/anthy/
+-ANTHYDIR @prefix@/share/anthy/
-DIC_FILE @prefix@/share/anthy/anthy.dic
-+DIC_FILE /var/lib/anthy/anthy.dic
++ANTHYDIR /usr/share/anthy/
++DIC_FILE /usr/share/anthy/anthy.dic
INDEPWORD indepword.txt
DEPWORD master.depword
- #ZIPDICT_EUC /var/lib/canna/dic/canna/zipcode.ctd
+-ZIPDICT_EUC @prefix@/share/anthy/zipcode.t
++ZIPDICT_EUC /usr/share/anthy/zipcode.t
+ WORDS_FILE /usr/share/dict/words
diff --git a/packages/anthy/files/not_build_elc.patch b/packages/anthy/files/not_build_elc.patch
index 56368027e7..d3f269c46a 100644
--- a/packages/anthy/files/not_build_elc.patch
+++ b/packages/anthy/files/not_build_elc.patch
@@ -1,13 +1,13 @@
-diff -urNad /home/omote/debian/debian-official/japanese/anthy/anthy-4k/anthy-4809/src-util/Makefile.am anthy-4809/src-util/Makefile.am
---- /home/omote/debian/debian-official/japanese/anthy/anthy-4k/anthy-4809/src-util/Makefile.am 2003-11-24 20:59:35.000000000 +0900
-+++ anthy-4809/src-util/Makefile.am 2003-12-11 19:22:56.000000000 +0900
-@@ -5,7 +5,8 @@
- ELISP_FILES = anthy.el anthy-isearch.el anthy-dic.el anthy-conf.el leim-list.el
+diff -Naur anthy-7811/src-util.orig/Makefile.am anthy-7811/src-util/Makefile.am
+--- anthy-7811/src-util.orig/Makefile.am 2006-06-18 10:47:55.790000000 +0900
++++ anthy-7811/src-util/Makefile.am 2006-06-18 10:48:23.860000000 +0900
+@@ -6,7 +6,8 @@
+ anthy-isearch.el anthy-azik.el anthy-kyuri.el
EXTRA_DIST = $(ELISP_FILES) typetab dic-tool-usage.txt rcsize.rb
- bin_PROGRAMS = anthy-dic-tool anthy-agent
--ELCFILES = anthy.elc anthy-dic.elc
-+#ELCFILES = anthy.elc anthy-dic.elc
-+ELCFILES =
+ bin_PROGRAMS = anthy-dic-tool anthy-agent anthy-morphological-analyzer
+-ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc
++#ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc
++ELCFILES =
if ELISP
lisp_LISP = $(ELISP_FILES)
endif
diff --git a/packages/avahi/avahi_0.6.12.bb b/packages/avahi/avahi_0.6.12.bb
new file mode 100644
index 0000000000..2072c1f6bf
--- /dev/null
+++ b/packages/avahi/avahi_0.6.12.bb
@@ -0,0 +1,60 @@
+DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
+SECTION = "network"
+PRIORITY = "optional"
+AUTHOR = "Lennart Poettering <lennart@poettering.net>"
+HOMEPAGE = "http://avahi.org"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+LICENSE= "GPL"
+PR = "r1"
+
+DEPENDS = "expat libdaemon dbus"
+RRECOMMENDS = "libnss-mdns"
+
+SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
+
+PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
+
+FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
+FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
+FILES_avahi-daemon = "${sbindir}/avahi-daemon \
+ ${sysconfdir}/avahi/avahi-daemon.conf \
+ ${sysconfdir}/avahi/hosts \
+ ${sysconfdir}/avahi/services \
+ ${sysconfdir}/dbus-1 \
+ ${sysconfdir}/init.d/avahi-daemon \
+ ${datadir}/avahi/introspection/*.introspect \
+ ${datadir}/avahi/avahi-service.dtd \
+ ${datadir}/avahi/service-types"
+FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
+FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
+ ${sysconfdir}/avahi/avahi-dnsconfd.action \
+ ${sysconfdir}/init.d/avahi-dnsconfd"
+FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
+FILES_avahi-utils = "${bindir}/avahi-*"
+
+CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
+
+EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
+inherit autotools pkgconfig update-rc.d
+
+
+do_stage() {
+ autotools_stage_all
+}
+
+INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
+INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
+INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
+INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
+INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
+
+pkg_postinst_avahi-daemon () {
+ grep avahi /etc/group || addgroup avahi
+ grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
+ /etc/init.d/dbus-1 force-reload
+}
+
+pkg_postrm_avahi-daemon () {
+ deluser avahi || true
+ delgroup avahi || true
+}
diff --git a/packages/mplayer/mplayer-1.0pre7/.mtn2git_empty b/packages/base-files/base-files/h5xxx/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/mplayer/mplayer-1.0pre7/.mtn2git_empty
+++ b/packages/base-files/base-files/h5xxx/.mtn2git_empty
diff --git a/packages/base-files/base-files/h5xxx/fstab b/packages/base-files/base-files/h5xxx/fstab
new file mode 100644
index 0000000000..b44d7eacee
--- /dev/null
+++ b/packages/base-files/base-files/h5xxx/fstab
@@ -0,0 +1,8 @@
+/dev/mtdblock/1 / jffs2 defaults 1 1
+#breaks h51xx
+/dev/mtdblock/2 /home jffs2 defaults 1 1
+proc /proc proc defaults 0 0
+/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0
+/dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /media/ram tmpfs defaults 0 0
diff --git a/packages/bluez/bluez-hcidump_1.31.bb b/packages/bluez/bluez-hcidump_1.31.bb
new file mode 100644
index 0000000000..877c8db33c
--- /dev/null
+++ b/packages/bluez/bluez-hcidump_1.31.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
+S = "${WORKDIR}/bluez-hcidump-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
diff --git a/packages/bluez/bluez-libs_3.1.bb b/packages/bluez/bluez-libs_3.1.bb
new file mode 100644
index 0000000000..d740bd80a9
--- /dev/null
+++ b/packages/bluez/bluez-libs_3.1.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Libaries."
+SECTION = "libs"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.bluez.org"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
+
+do_stage() {
+ oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
+
+ install -d ${STAGING_INCDIR}/bluetooth/
+ for f in ${HEADERS}
+ do
+ install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
+ done
+}
diff --git a/packages/mplayer/mplayer-1.0pre8/.mtn2git_empty b/packages/bluez/bluez-utils/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/mplayer/mplayer-1.0pre8/.mtn2git_empty
+++ b/packages/bluez/bluez-utils/.mtn2git_empty
diff --git a/packages/bluez/bluez-utils/02dtl1_cs.sh b/packages/bluez/bluez-utils/02dtl1_cs.sh
new file mode 100644
index 0000000000..fd81508010
--- /dev/null
+++ b/packages/bluez/bluez-utils/02dtl1_cs.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+case "$1" in
+ suspend)
+ if [ "`/bin/hciconfig`" != "" ]; then
+ #If hciconfig outputs anything then there's probably a Bluetooth
+ # CF card in the slot so shut it down.
+ hcitool dc `hcitool con | grep ACL | sed 's/^.*\([0-9A-F]\{2\}\(:[0-9A-F]\{2\}\)\{5\}\).*$/\1/'`
+ hciconfig hci0 down
+ killall hciattach > /dev/null 2>&1
+ fi
+ ;;
+
+ resume)
+ #check for kernel version
+ if [ "`uname -r | grep 2.4.`" != "" ]; then
+ k="o"
+ elif [ "`uname -r | grep 2.6.`" != "" ]; then
+ k="ko"
+ else
+ exit 0
+ fi
+
+ if test -e /sbin/cardctl; then
+ CARDCTL=/sbin/cardctl
+ elif test -e /sbin/pccardctl; then
+ CARDCTL=/sbin/pccardctl
+ else
+ exit 0
+ fi
+
+ if [ "`lsmod | grep hci_uart`" != "" ]; then
+ #If the hci_usb module is still loaded then there's a serial based
+ # Bluetooth CF card in the slot, which only needs a resume to get it going
+ # again.
+ rfcomm bind all
+ $CARDCTL resume
+ hciconfig hci0 up
+ else
+ # only works for nokia dtl1 cards
+ for f in /lib/modules/`uname -r`/kernel/drivers/bluetooth/dtl1_cs.$k
+ do
+ #Enumerate all the self-contained Bluetooth CF card drivers
+ f=`echo $f | sed 's/\.'$k'$//'`
+ f=`basename $f`
+ if [ "`lsmod | grep $f`" != "" ]; then
+ #If one of these drivers is still loaded, then there is probably
+ #a non-serial based Bluetooth CF card in the slot that needs
+ #ejecting and reinserting to get it going again
+ rfcomm bind all
+ $CARDCTL eject
+ $CARDCTL insert
+ hciconfig hci0 up
+ fi
+ done
+ fi
+esac
diff --git a/packages/bluez/bluez-utils/hciattach-ti-bts.patch b/packages/bluez/bluez-utils/hciattach-ti-bts.patch
new file mode 100644
index 0000000000..217c32619d
--- /dev/null
+++ b/packages/bluez/bluez-utils/hciattach-ti-bts.patch
@@ -0,0 +1,489 @@
+--- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200
++++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200
+@@ -58,6 +58,8 @@
+ #define HCI_UART_3WIRE 2
+ #define HCI_UART_H4DS 3
+
++#include "ti_bts.h"
++
+ struct uart_t {
+ char *type;
+ int m_id;
+@@ -67,6 +69,7 @@
+ int speed;
+ int flags;
+ int (*init) (int fd, struct uart_t *u, struct termios *ti);
++ char *bts; /* bluetooth script */
+ };
+
+ #define FLOW_CTL 0x0001
+@@ -256,6 +259,114 @@
+ return 0;
+ }
+
++static int brf6150(int fd, struct uart_t *u, struct termios *ti)
++{
++ bts_t *bfp;
++ int i;
++ unsigned long vers;
++ unsigned char actionbuf[256];
++ unsigned char resp[128]; /* Response */
++ unsigned long count;
++ unsigned short atype;
++
++ if (u->bts == NULL) /* no script, ignore */
++ return 0;
++
++ bfp = bts_load_script( u->bts, &vers );
++ if (bfp == NULL)
++ return -1;
++
++ fprintf( stderr, "Loading BTS script version %lu\n", vers );
++
++ while ((count = bts_next_action( bfp, actionbuf,
++ sizeof actionbuf - 1, &atype )) != 0) {
++ if (atype == ACTION_REMARKS) {
++ if (actionbuf[0] != 0)
++ fprintf( stderr, "%s\n", actionbuf );
++ }
++ else if (atype == ACTION_SEND_COMMAND) {
++#if 0
++ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype );
++ for (i=0; i<count; i++) {
++ fprintf( stderr, "0x%02x ", actionbuf[i] );
++ }
++ fprintf( stderr, "\n" );
++#endif
++ int n;
++ n = write(fd, actionbuf, count);
++ if (n < 0 || n < count) {
++ perror("Failed to write TI action command");
++ return -1;
++ }
++ }
++ else if (atype == ACTION_WAIT_EVENT) {
++ action_wait_t *wait = (action_wait_t *)actionbuf;
++#if 0
++ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size );
++ for (i=0; i<wait->size; i++) {
++ fprintf( stderr, "0x%02x ", wait->data[i] );
++ }
++ fprintf( stderr, "\n" );
++#endif
++ usleep(wait->msec); /* seems they give usec, not msec */
++ /* Read reply. */
++ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) {
++ perror("Failed to read TI command response");
++ return -1;
++ }
++ if (count < wait->size) {
++ fprintf( stderr, "TI command response is short.");
++ }
++ for (i=0; i<wait->size; i++) {
++ if (i == 3) continue; /* ignore */
++ if (resp[i] != wait->data[i]) {
++ fprintf( stderr, "TI command response does not match expected result.\n" );
++ }
++ }
++ }
++ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) {
++ action_serial_t *sercmd = (action_serial_t *)actionbuf;
++
++ /* Set actual baudrate */
++ fprintf( stderr,
++ "BTS changing baud rate to %u, flow control to %u\n",
++ sercmd->baud, sercmd->flow_control );
++
++ tcflush(fd, TCIOFLUSH);
++
++ if (sercmd->flow_control)
++ ti->c_cflag |= CRTSCTS;
++ else
++ ti->c_cflag &= ~CRTSCTS;
++ if (tcsetattr(fd, TCSANOW, ti) < 0) {
++ perror("Can't set port settings");
++ return -1;
++ }
++
++ u->speed = sercmd->baud;
++
++ tcflush(fd, TCIOFLUSH);
++ if (set_speed(fd, ti, sercmd->baud) < 0) {
++ perror("Can't set baud rate");
++ return -1;
++ }
++ }
++ else if (atype == ACTION_DELAY) {
++ action_delay_t *delay = (action_delay_t *)actionbuf;
++ usleep(delay->msec); /* seems they give usec, not msec */
++ }
++ else {
++ fprintf( stderr, "BTS action type = %d: ", (int)atype );
++ for (i=0; i<count; i++) {
++ fprintf( stderr, "0x%02x ", actionbuf[i] );
++ }
++ fprintf( stderr, "\n" );
++ }
++ }
++ bts_unload_script( bfp );
++ return 0;
++}
++
+ static int texas(int fd, struct uart_t *u, struct termios *ti)
+ {
+ struct timespec tm = {0, 50000};
+@@ -296,15 +407,26 @@
+ } while (resp[4] != cmd[1] && resp[5] != cmd[2]);
+
+ /* Verify manufacturer */
+- if ((resp[11] & 0xFF) != 0x0d)
++ if (resp[11] != 0x0d)
+ fprintf(stderr,"WARNING : module's manufacturer is not Texas Instrument\n");
+
+ /* Print LMP version */
+- fprintf(stderr, "Texas module LMP version : 0x%02x\n", resp[10] & 0xFF);
++ fprintf(stderr, "TI module LMP version : 0x%02x\n", resp[10]);
+
+ /* Print LMP subversion */
+- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
++ fprintf(stderr, "TI module LMP sub-version : 0x%02x%02x\n", resp[14], resp[13]);
++ if ((resp[14] >> 2) == 3) {
++ int err;
++ nanosleep(&tm, NULL);
+
++ /* BRF6150 */
++ if ((err=brf6150( fd, u, ti )) != 0) {
++ fprintf( stderr, "TI script failed (err=%d)\n",
++ err );
++ return -1;
++ }
++ }
++
+ nanosleep(&tm, NULL);
+ return 0;
+ }
+@@ -1103,7 +1225,7 @@
+ {
+ printf("hciattach - HCI UART driver initialization utility\n");
+ printf("Usage:\n");
+- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow]\n");
++ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow]\n");
+ printf("\thciattach -l\n");
+ }
+
+@@ -1118,11 +1240,12 @@
+ struct sigaction sa;
+ struct pollfd p;
+ char dev[PATH_MAX];
++ char *bts = NULL;
+
+ detach = 1;
+ printpid = 0;
+
+- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) {
++ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) {
+ switch(opt) {
+ case 'b':
+ send_break = 1;
+@@ -1144,6 +1267,10 @@
+ init_speed = atoi(optarg);
+ break;
+
++ case 'S':
++ bts = optarg;
++ break;
++
+ case 'l':
+ for (i = 0; uart[i].type; i++) {
+ printf("%-10s0x%04x,0x%04x\n", uart[i].type,
+@@ -1215,6 +1342,8 @@
+ if (init_speed)
+ u->init_speed = init_speed;
+
++ u->bts = bts;
++
+ memset(&sa, 0, sizeof(sa));
+ sa.sa_flags = SA_NOCLDSTOP;
+ sa.sa_handler = sig_alarm;
+--- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200
++++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200
+@@ -37,7 +37,7 @@
+
+ noinst_PROGRAMS = hcisecfilter ppporc
+
+-hciattach_SOURCES = hciattach.c hciattach_st.c
++hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c
+
+ hciconfig_SOURCES = hciconfig.c csr.h csr.c
+ hciconfig_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
+--- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200
++++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200
+@@ -0,0 +1,116 @@
++/*
++ * Copyright (c) 2005 Texas Instruments, Inc.
++ * Ported by SDG Systems, LLC
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation;
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
++ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
++ * CLAIM, OR 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.
++ *
++ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
++ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
++ * SOFTWARE IS DISCLAIMED.
++ *
++ */
++
++#ifndef BT_SCRIPT_H
++#define BT_SCRIPT_H
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*
++ * Define the interface of Bluetooth Script
++ */
++
++typedef void bts_t;
++
++
++#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */
++#define ACTION_WAIT_EVENT 2 /* Wait for data */
++#define ACTION_SERIAL_PORT_PARAMETERS 3
++#define ACTION_DELAY 4
++#define ACTION_RUN_SCRIPT 5
++#define ACTION_REMARKS 6
++
++/*
++ * Structure for ACTION_SEND_COMMAND
++ */
++typedef struct tagCActionCommand
++{
++ unsigned char data[1]; /* Data to send */
++} action_command_t;
++
++/*
++ * Structure for ACTION_WAIT_EVENT
++ */
++typedef struct tagCActionWaitEvent
++{
++ unsigned long msec; /* in milliseconds */
++ unsigned long size;
++ unsigned char data[1]; /* Data to wait for */
++} action_wait_t;
++
++
++/*
++ * Structure for ACTION_SERIAL_PORT_PARAMETERS
++ */
++typedef struct tagCActionSerialPortParameters
++{
++ unsigned long baud;
++ unsigned long flow_control;
++} action_serial_t;
++
++/* Flow Control Type */
++#define FCT_NONE 0
++#define FCT_HARDWARE 1
++
++#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */
++
++
++/*
++ * Structure for ACTION_DELAY
++ */
++typedef struct tagCActionDelay
++{
++ unsigned long msec; /* in milliseconds */
++} action_delay_t;
++
++/*
++ * Structure for ACTION_RUN_SCRIPT
++ */
++typedef struct tagCActionRunScript
++{
++ char filename[1];
++} action_run_t;
++
++/*
++ * Structure for ACTION_REMARKS
++ */
++typedef struct tagCActionRemarks
++{
++ char m_szRemarks[1];
++} action_remarks_t;
++
++
++const char *cis_create_filename(const unsigned char* cmdparms);
++bts_t * bts_load_script(const char* fname, unsigned long* version);
++unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
++ unsigned long nMaxSize, unsigned short* ptype);
++void bts_unload_script(bts_t* bts_fp);
++
++#ifdef __cplusplus
++};
++#endif
++
++#endif /* BT_SCRIPT_H */
++
+--- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200
++++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200
+@@ -0,0 +1,149 @@
++/*
++ * Copyright (c) 2005 Texas Instruments, Inc.
++ * Ported by SDG Systems, LLC
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation;
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
++ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
++ * CLAIM, OR 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.
++ *
++ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
++ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
++ * SOFTWARE IS DISCLAIMED.
++ *
++ */
++
++
++#include <stdio.h>
++#include <stdlib.h>
++#include "ti_bts.h"
++
++#ifndef MAKEWORD
++#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8))
++#endif
++
++#define TI_MANUFACTURER_ID 13
++
++/*
++ * Common Init Script specific
++ */
++const char *
++cis_create_filename(const unsigned char* cmdparms)
++{
++ static char bts_file[50];
++
++ /* Check for TI's id */
++ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]);
++
++ if (TI_MANUFACTURER_ID == manfid) {
++ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]);
++
++ unsigned short chip = (version & 0x7C00) >> 10;
++ unsigned short min_ver = (version & 0x007F);
++ unsigned short maj_ver = (version & 0x0380) >> 7;
++
++ if (0 != (version & 0x8000)) {
++ maj_ver |= 0x0008;
++ }
++
++ sprintf( bts_file, "TIInit_%d.%d.%d.bts",
++ (int)chip, (int)maj_ver, (int)min_ver);
++
++ return &bts_file[0];
++ }
++ return NULL;
++}
++
++typedef struct tagCHeader
++{
++ unsigned long magic;
++ unsigned long version;
++ unsigned char future[24];
++} cheader_t;
++
++
++/* The value 0x42535442 stands for (in ASCII) BTSB */
++/* which is Bluetooth Script Binary */
++#define FILE_HEADER_MAGIC 0x42535442
++
++
++bts_t *
++bts_load_script(const char* fname, unsigned long* version)
++{
++ bts_t* bts = NULL;
++ FILE* fp = fopen(fname, "rb");
++
++ if (NULL != fp) {
++ /* Read header */
++ cheader_t header;
++
++ /* Read header */
++ if (1 == fread(&header, sizeof(header), 1, fp)) {
++ /* Check magic number for correctness */
++ if (header.magic == FILE_HEADER_MAGIC) {
++ /* If user wants the version number */
++ if (NULL != version) {
++ *version = header.version;
++ }
++ bts = (bts_t*)fp;
++ }
++ }
++ /* If failed reading the file, close it */
++ if (NULL == bts) {
++ fclose(fp);
++ }
++ }
++ return bts;
++}
++
++unsigned long
++bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
++ unsigned long nMaxSize, unsigned short* ptype)
++{
++ unsigned long bytes = 0;
++ FILE* fp = (FILE*)bts_fp;
++ unsigned char action_hdr[4];
++
++ if (bts_fp == NULL)
++ return 0;
++
++ /* Each Action has the following: */
++ /* UINT16 type of this action */
++ /* UINT16 size of rest */
++ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */
++
++ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) {
++ unsigned short type = *(unsigned short*)&action_hdr[0];
++ unsigned short size = *(unsigned short*)&action_hdr[2];
++
++ if (size <= nMaxSize) {
++ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp);
++
++ if (nread == size) {
++ *ptype = type;
++ bytes = (unsigned long)size;
++ }
++ }
++ }
++
++ return bytes;
++}
++
++void
++bts_unload_script(bts_t* bts_fp)
++{
++ FILE* fp = (FILE*)bts_fp;
++
++ if (NULL != fp) {
++ fclose(fp);
++ }
++}
++
diff --git a/packages/bluez/bluez-utils/hcid.conf b/packages/bluez/bluez-utils/hcid.conf
new file mode 100644
index 0000000000..bb935aa23d
--- /dev/null
+++ b/packages/bluez/bluez-utils/hcid.conf
@@ -0,0 +1,57 @@
+#
+# HCI daemon configuration file.
+#
+
+# HCId options
+options {
+ # Automatically initialize new devices
+ autoinit yes;
+
+ # Security Manager mode
+ # none - Security manager disabled
+ # auto - Use local PIN for incoming connections
+ # user - Always ask user for a PIN
+ #
+ security auto;
+
+ # Pairing mode
+ # none - Pairing disabled
+ # multi - Allow pairing with already paired devices
+ # once - Pair once and deny successive attempts
+ pairing multi;
+
+ # Default PIN code for incoming connections
+ passkey "BlueZ";
+}
+
+# Default settings for HCI devices
+device {
+ # Local device name
+ # %d - device id
+ # %h - host name
+ name "BlueZ (%d)";
+
+ # Local device class
+ class 0x120112;
+
+ # Default packet type
+ #pkt_type DH1,DM1,HV1;
+
+ # Inquiry and Page scan
+ iscan enable; pscan enable;
+
+ # Default link mode
+ # none - no specific policy
+ # accept - always accept incoming connections
+ # master - become master on incoming connections,
+ # deny role switch on outgoing connections
+ lm accept;
+
+ # Default link policy
+ # none - no specific policy
+ # rswitch - allow role switch
+ # hold - allow hold mode
+ # sniff - allow sniff mode
+ # park - allow park mode
+ lp rswitch,hold,sniff,park;
+}
diff --git a/packages/bluez/bluez-utils_3.1.bb b/packages/bluez/bluez-utils_3.1.bb
new file mode 100644
index 0000000000..46565b8c1b
--- /dev/null
+++ b/packages/bluez/bluez-utils_3.1.bb
@@ -0,0 +1,52 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs-${PV} dbus"
+RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
+RREPLACES = "bluez-utils-dbus"
+RCONFLICTS = "bluez-utils-dbus bluez-utils-nodbus"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+ file://hcid.conf \
+ file://02dtl1_cs.sh \
+ file://hciattach-ti-bts.patch;patch=1"
+
+# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
+# Let's default to that instead of 'any' until further notice...
+SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
+
+S = "${WORKDIR}/bluez-utils-${PV}"
+
+EXTRA_OECONF = "--enable-initscripts --enable-bcm203x"
+# --enable-obex enable OBEX support
+# --enable-alsa enable ALSA support
+# --enable-cups install CUPS backend support
+# --enable-bccmd install BCCMD interface utility
+# --enable-avctrl install Audio/Video control utility
+# --enable-hid2hci install HID mode switching utility
+# --enable-dfutool install DFU firmware upgrade utility
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults 23 19"
+
+do_install_append() {
+ install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/
+ mv ${D}${sbindir}/* ${D}${base_sbindir}/
+ mv ${D}${bindir}/* ${D}${base_bindir}/
+ rmdir ${D}${bindir} ${D}${sbindir}
+ chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
+ install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
+ install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
+}
+
+CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
+ ${sysconfdir}/default/bluetooth"
+
+PACKAGES =+ "${PN}-ciptool"
+FILES_${PN}-ciptool = "/bin/ciptool"
+RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool"
+RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus"
diff --git a/packages/mplayer/mplayer-atty-1.1.5/.mtn2git_empty b/packages/cdtool/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/mplayer/mplayer-atty-1.1.5/.mtn2git_empty
+++ b/packages/cdtool/.mtn2git_empty
diff --git a/packages/cdtool/cdtool_2.1.8pre4.bb b/packages/cdtool/cdtool_2.1.8pre4.bb
new file mode 100644
index 0000000000..8f2b425f49
--- /dev/null
+++ b/packages/cdtool/cdtool_2.1.8pre4.bb
@@ -0,0 +1,14 @@
+# cdtool .bb build file
+# Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see /COPYING)
+
+HOMEPAGE="http://hinterhof.net/cdtool/"
+DESCRIPTION="cdtool is a free software package to control the audio functions \
+of an attached CDROM drive from the command line in a quick and scriptable way."
+MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
+LICENSE = "GPL"
+
+SRC_URI="http://hinterhof.net/${PN}/dist/${PN}-${PV}.tar.gz \
+ file://install-no-owner.patch;patch=1"
+
+inherit autotools
diff --git a/packages/prelink/prelink-20050901/.mtn2git_empty b/packages/cdtool/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/prelink/prelink-20050901/.mtn2git_empty
+++ b/packages/cdtool/files/.mtn2git_empty
diff --git a/packages/cdtool/files/install-no-owner.patch b/packages/cdtool/files/install-no-owner.patch
new file mode 100644
index 0000000000..9519767350
--- /dev/null
+++ b/packages/cdtool/files/install-no-owner.patch
@@ -0,0 +1,33 @@
+--- cdtool-2.1.8pre4/Makefile.in.orig 2006-06-05 20:38:28.567261984 -0600
++++ cdtool-2.1.8pre4/Makefile.in 2006-06-05 20:38:46.218578576 -0600
+@@ -44,13 +44,13 @@
+ install: install-files install-links
+ install-files:
+ mkdir -p $(DESTDIR)$(bindir)
+- $(INSTALL) cdctrl $(DESTDIR)$(bindir) -o root
+- $(INSTALL) cdloop $(DESTDIR)$(bindir) -o root
+- $(INSTALL) cdadd $(DESTDIR)$(bindir) -o root
+- $(INSTALL) cdown $(DESTDIR)$(bindir) -o root
+- $(INSTALL) cdtool2cddb $(DESTDIR)$(bindir) -o root
++ $(INSTALL) cdctrl $(DESTDIR)$(bindir)
++ $(INSTALL) cdloop $(DESTDIR)$(bindir)
++ $(INSTALL) cdadd $(DESTDIR)$(bindir)
++ $(INSTALL) cdown $(DESTDIR)$(bindir)
++ $(INSTALL) cdtool2cddb $(DESTDIR)$(bindir)
+
+- mkdir -p $(DESTDIR)$(mandir)/man1
++ $(INSTALL) -d $(DESTDIR)$(mandir)/man1
+ $(INSTALL) cdctrl.1 $(DESTDIR)$(mandir)/man1
+ $(INSTALL) cdloop.1 $(DESTDIR)$(mandir)/man1
+ $(INSTALL) cdadd.1 $(DESTDIR)$(mandir)/man1
+@@ -58,8 +58,8 @@
+ $(INSTALL) cdtool.1 $(DESTDIR)$(mandir)/man1
+ $(INSTALL) cdtool2cddb.1 $(DESTDIR)$(mandir)/man1
+
+- mkdir -p $(DESTDIR)$(libdir)/cdtool
+- $(INSTALL) cdtool $(DESTDIR)$(libdir)/cdtool -o root
++ $(INSTALL) -d $(DESTDIR)$(libdir)/cdtool
++ $(INSTALL) cdtool $(DESTDIR)$(libdir)/cdtool
+
+ LINKTARGET = ../lib/cdtool/cdtool
+ LINKS = cdplay cdpause cdstop cdclose cdeject cdir cdinfo cdreset \
diff --git a/packages/x11-apps/xauth/.mtn2git_empty b/packages/dbus/dbus-0.90/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/x11-apps/xauth/.mtn2git_empty
+++ b/packages/dbus/dbus-0.90/.mtn2git_empty
diff --git a/packages/dbus/dbus-0.90/dbus-1.init b/packages/dbus/dbus-0.90/dbus-1.init
new file mode 100644
index 0000000000..60440b7223
--- /dev/null
+++ b/packages/dbus/dbus-0.90/dbus-1.init
@@ -0,0 +1,86 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters@debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus-1
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus-1 ]; then
+ . /etc/default/dbus-1
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+ if [ ! -d $PIDDIR ]; then
+ mkdir -p $PIDDIR
+ chown $DAEMONUSER $PIDDIR
+ chgrp $DAEMONUSER $PIDDIR
+ fi
+ if [ -e $PIDFILE ]; then
+ PIDDIR=/proc/$(cat $PIDFILE)
+ if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+ echo "$DESC already started; not starting."
+ else
+ echo "Removing stale PID file $PIDFILE."
+ rm -f $PIDFILE
+ fi
+ fi
+ echo -n "Starting $DESC: "
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+ echo "$NAME."
+ if [ -d $EVENTDIR ]; then
+ run-parts --arg=start $EVENTDIR
+ fi
+}
+
+shut_it_down()
+{
+ if [ -d $EVENTDIR ]; then
+ run-parts --reverse --arg=stop $EVENTDIR
+ fi
+ echo -n "Stopping $DESC: "
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER
+ # We no longer include these arguments so that start-stop-daemon
+ # can do its job even given that we may have been upgraded.
+ # We rely on the pidfile being sanely managed
+ # --exec $DAEMON -- --system $PARAMS
+ echo "$NAME."
+ rm -f $PIDFILE
+}
+
+case "$1" in
+ start)
+ start_it_up
+ ;;
+ stop)
+ shut_it_down
+ ;;
+ restart|force-reload)
+ shut_it_down
+ sleep 1
+ start_it_up
+ ;;
+ *)
+ echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/packages/xdpyinfo/xdpyinfo/.mtn2git_empty b/packages/dbus/dbus-glib/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xdpyinfo/xdpyinfo/.mtn2git_empty
+++ b/packages/dbus/dbus-glib/.mtn2git_empty
diff --git a/packages/dbus/dbus-glib/cross.patch b/packages/dbus/dbus-glib/cross.patch
new file mode 100644
index 0000000000..6d1d9d8e7e
--- /dev/null
+++ b/packages/dbus/dbus-glib/cross.patch
@@ -0,0 +1,15 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- dbus-0.20/configure.in~cross
++++ dbus-0.20/configure.in
+@@ -466,6 +466,7 @@
+ exit (0);
+ ]])],
+ [have_abstract_sockets=yes],
++ [have_abstract_sockets=no],
+ [have_abstract_sockets=no])
+ AC_LANG_POP(C)
+ AC_MSG_RESULT($have_abstract_sockets)
diff --git a/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch b/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch
new file mode 100644
index 0000000000..68edc54038
--- /dev/null
+++ b/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch
@@ -0,0 +1,21 @@
+--- dbus-glib-0.70/dbus/Makefile.am.fix_includes 2006-07-17 13:00:39.000000000 -0400
++++ dbus-glib-0.70/dbus/Makefile.am 2006-07-17 20:09:00.000000000 -0400
+@@ -38,13 +38,13 @@
+ dbus-gvalue.c \
+ dbus-gvalue.h \
+ dbus-gthread.c \
+- dbus-glib.h \
+- dbus-glib-lowlevel.h \
+- dbus-glib-error-enum.h \
+ $(DBUS_GLIB_INTERNALS)
+
+ libdbus_glib_HEADERS = \
+- dbus-gtype-specialized.h
++ dbus-gtype-specialized.h \
++ dbus-glib.h \
++ dbus-glib-lowlevel.h \
++ dbus-glib-error-enum.h
+
+ libdbus_glibdir = $(includedir)/dbus-1.0/dbus
+
+
diff --git a/packages/dbus/dbus-glib/no-examples.patch b/packages/dbus/dbus-glib/no-examples.patch
new file mode 100644
index 0000000000..483153db74
--- /dev/null
+++ b/packages/dbus/dbus-glib/no-examples.patch
@@ -0,0 +1,8 @@
+--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200
++++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = . examples
++SUBDIRS = .
+
+ INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
+
diff --git a/packages/dbus/dbus-glib/no-introspect.patch b/packages/dbus/dbus-glib/no-introspect.patch
new file mode 100644
index 0000000000..7057a63020
--- /dev/null
+++ b/packages/dbus/dbus-glib/no-introspect.patch
@@ -0,0 +1,17 @@
+--- dbus-glib-0.70/tools/Makefile.am.orig 2006-07-23 15:53:06.000000000 +0200
++++ dbus-glib-0.70/tools/Makefile.am 2006-07-23 15:53:53.000000000 +0200
+@@ -3,14 +3,8 @@
+ nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
+ libdbus_glibdir = $(includedir)/dbus-1.0/dbus
+
+-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
+- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml
+-
+ BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
+
+-dbus-bus-introspect.xml:
+- DBUS_TOP_BUILDDIR=$(top_builddir) dbus-send --system --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
+-
+ EXTRA_DIST = run-with-tmp-session-bus.sh
+
+ CLEANFILES = \
diff --git a/packages/dbus/dbus-glib_0.70.bb b/packages/dbus/dbus-glib_0.70.bb
new file mode 100644
index 0000000000..304e7aca48
--- /dev/null
+++ b/packages/dbus/dbus-glib_0.70.bb
@@ -0,0 +1,30 @@
+SECTION = "base"
+PR = "r0"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native"
+
+SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \
+ file://cross.patch;patch=1 \
+ file://dbus-glib-0.70-fix-includes.patch;patch=1 \
+ file://no-examples.patch;patch=1 \
+ file://no-introspect.patch;patch=1"
+
+inherit autotools pkgconfig gettext
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
+
+do_configure_prepend() {
+ install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/
+ install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/
+}
+
+do_stage () {
+ oe_libinstall -so -C dbus libdbus-glib-1 ${STAGING_LIBDIR}
+
+ autotools_stage_includes
+}
+
+FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
diff --git a/packages/xev/files/.mtn2git_empty b/packages/dbus/dbus-python/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xev/files/.mtn2git_empty
+++ b/packages/dbus/dbus-python/.mtn2git_empty
diff --git a/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch b/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch
new file mode 100644
index 0000000000..17b78d938a
--- /dev/null
+++ b/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch
@@ -0,0 +1,18 @@
+--- dbus-python-0.70/setup.py.fix-binary-modules-dir 2006-07-17 20:30:07.000000000 -0400
++++ dbus-python-0.70/setup.py 2006-07-17 20:30:22.000000000 -0400
+@@ -92,12 +92,12 @@
+ "dbus/_util",
+ ],
+ ext_modules=[
+- Extension("dbus_bindings", ["dbus/dbus_bindings.pyx"],
++ Extension("dbus/dbus_bindings", ["dbus/dbus_bindings.pyx"],
+ include_dirs=dbus_includes,
+ libraries=["dbus-1"],
+
+ ),
+- Extension("dbus_glib_bindings", ["dbus/dbus_glib_bindings.pyx"],
++ Extension("dbus/dbus_glib_bindings", ["dbus/dbus_glib_bindings.pyx"],
+ include_dirs=dbus_glib_includes,
+ libraries=["dbus-glib-1", "dbus-1", "glib-2.0"],
+ define_macros=[
+
diff --git a/packages/dbus/dbus-python_0.70.bb b/packages/dbus/dbus-python_0.70.bb
new file mode 100644
index 0000000000..7bfbc931ed
--- /dev/null
+++ b/packages/dbus/dbus-python_0.70.bb
@@ -0,0 +1,15 @@
+DEFAULT_PREFERENCE="-1"
+
+SECTION = "devel/python"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another - python bindings"
+LICENSE = "GPL"
+PR = "r0"
+DEPENDS = "python-native"
+
+SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-python-${PV}.tar.gz \
+ file://cross.patch;patch=1 \
+ file://dbus-python-0.70-fix-binary-modules-dir.patch;patch=1"
+
+inherit distutils
diff --git a/packages/dbus/dbus_0.90.bb b/packages/dbus/dbus_0.90.bb
new file mode 100644
index 0000000000..e48b09e4ff
--- /dev/null
+++ b/packages/dbus/dbus_0.90.bb
@@ -0,0 +1,62 @@
+DEFAULT_PREFERENCE="-1"
+
+SECTION = "base"
+PR = "r0"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0 virtual/libintl"
+
+SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+ file://cross.patch;patch=1 \
+ file://tmpdir.patch;patch=1 \
+ file://dbus-1.init"
+
+inherit autotools pkgconfig update-rc.d gettext
+
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "defaults"
+
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+
+FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
+
+pkg_postinst_dbus() {
+#!/bin/sh
+
+# can't do adduser stuff offline
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+MESSAGEUSER=messagebus
+MESSAGEHOME=/var/run/dbus
+
+mkdir -p $MESSAGEHOME || true
+chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+}
+
+EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \
+ --disable-checks --disable-xml-docs --disable-doxygen-docs \
+ --with-xml=expat --without-x"
+
+do_stage () {
+ oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+
+ autotools_stage_includes
+
+ mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+ install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}
+
+do_install_append () {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+}
+
+python populate_packages_prepend () {
+ if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+ bb.data.setVar('PKG_dbus', 'dbus-1', d)
+}
diff --git a/packages/distcc/distcc_2.18.3.bb b/packages/distcc/distcc_2.18.3.bb
new file mode 100644
index 0000000000..124f87fc7f
--- /dev/null
+++ b/packages/distcc/distcc_2.18.3.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "distcc is a parallel build system that distributes \
+compilation of C/C++/ObjC code across machines on a network."
+SECTION = "devel"
+LICENSE = "GPLv2"
+
+DEPENDS = "avahi gtk+"
+RRECOMMENDS = "avahi-daemon"
+
+SRC_URI = "http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2 \
+ http://0pointer.de/public/distcc-avahi.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --with-gtk "
+
+PACKAGES += "distcc-distmon-gnome"
+
+FILES_${PN} = " ${bindir}/distcc \
+ ${bindir}/distccd \
+ ${bindir}/distccmon-text"
+FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \
+ ${datadir}/distcc"
+
+
diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index c27cf4c3fa..ec28bff31a 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -8,6 +8,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
file://no-hardlinks.patch;patch=1"
S = "${WORKDIR}/e2fsprogs-${PV}"
+PARALLEL_MAKE = ""
+
inherit autotools
EXTRA_OECONF = "--enable-dynamic-e2fsck --sbindir=${base_sbindir}"
diff --git a/packages/xhost/xhost/.mtn2git_empty b/packages/emacs/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xhost/xhost/.mtn2git_empty
+++ b/packages/emacs/.mtn2git_empty
diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb
new file mode 100644
index 0000000000..cba1372926
--- /dev/null
+++ b/packages/emacs/emacs_cvs.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "Emacs"
+HOMEPAGE = "http://www.gnu.org/software/emacs/"
+LICENSE = "GPLv2"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+SECTION = "editor"
+# full X (non-diet) is needed for X support
+DEPENDS = "libx11"
+# and it needs to run some generated binaries..
+DEPENDS += "qemu-native"
+PR = "r1"
+
+SRC_URI = "cvs://anoncvs:anonymous@cvs.savannah.gnu.org/sources/emacs;module=emacs"
+# http://fabrice.bellard.free.fr/qemu/qemu-gnemul-0.5.3.tar.gz"
+S = "${WORKDIR}/emacs"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-x"
+
+#QEMU = "/usr/bin/qemu-arm -L ${WORKDIR}/usr/local/gnemul/qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}"
+QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}"
+
+LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib"
+
+do_compile_prepend() {
+ sed -i 's:/usr/lib:${STAGING_LIBDIR}:g' ${S}/src/s/gnu-linux.h
+
+ find "${S}" -name Makefile | xargs sed -i 's:^RUN_TEMACS = ./temacs$:RUN_TEMACS = ${QEMU} ./temacs:'
+ find "${S}" -name Makefile | xargs sed -i 's:EMACS=../src/bootstrap-emacs:EMACS="${QEMU} ../src/bootstrap-emacs":'
+
+ # src-lib/Makefile
+ find "${S}" -name Makefile | xargs sed -i 's:./test-distrib :${QEMU} ./test-distrib :'
+
+ # src/Makefile
+ find "${S}" -name Makefile | xargs sed -i 's:./prefix-args :${QEMU} ./prefix-args :'
+ find "${S}" -name Makefile | xargs sed -i 's:$''{libsrc}make-docfile :${QEMU} $''{libsrc}make-docfile :'
+
+ # leim/Makefile
+ find "${S}" -name Makefile | xargs sed -i 's:BUILD-EMACS = :BUILT-EMACS = ${QEMU} :'
+
+ find "${S}" -name Makefile | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:g'
+ cd ${S}
+ make bootstrap
+}
diff --git a/packages/ethtool/ethtool.inc b/packages/ethtool/ethtool.inc
new file mode 100644
index 0000000000..323ae9a029
--- /dev/null
+++ b/packages/ethtool/ethtool.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "A small utility for examining and tuning the settings \
+of your ethernet-based network interfaces."
+HOMEPAGE = "http://sourceforge.net/projects/gkernel/"
+SECTION = "console/network"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/ethtool-${PV}.tar.gz"
+
+inherit autotools
diff --git a/packages/ethtool/ethtool_3.bb b/packages/ethtool/ethtool_3.bb
index e1b0aaf092..a330cf0cce 100644
--- a/packages/ethtool/ethtool_3.bb
+++ b/packages/ethtool/ethtool_3.bb
@@ -1,11 +1,2 @@
-SECTION = "console/network"
-
-DESCRIPTION = "ethtool is a Linux net driver diagnostic \
-and tuning tool for the Linux 2.4.x (or later) series \
-of kernels."
-LICENSE = "GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/ethtool-${PV}.tar.gz"
-S = "${WORKDIR}/ethtool-${PV}"
-
-inherit autotools
+include ethtool.inc
+PR="r1"
diff --git a/packages/ethtool/ethtool_4.bb b/packages/ethtool/ethtool_4.bb
new file mode 100644
index 0000000000..7f4ddffdc2
--- /dev/null
+++ b/packages/ethtool/ethtool_4.bb
@@ -0,0 +1,2 @@
+include ethtool.inc
+PR="r0"
diff --git a/packages/fbpanel/fbpanel_4.3.bb b/packages/fbpanel/fbpanel_4.3.bb
index 3313e61629..3b959078ba 100644
--- a/packages/fbpanel/fbpanel_4.3.bb
+++ b/packages/fbpanel/fbpanel_4.3.bb
@@ -7,23 +7,25 @@ MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
SRC_URI = "${SOURCEFORGE_MIRROR}/fbpanel/fbpanel-${PV}.tgz \
file://makefile.common.patch;patch=1 "
-PR = "r0"
+PR = "r1"
+
+LDFLAGS += "-Wl,--export-dynamic"
do_configure () {
./configure --prefix=/usr --cpu=on
}
do_compile () {
- oe_runmake CHATTY=1 STATIC_PLUGINS=1
+ oe_runmake CHATTY=1
}
do_install () {
install -d ${D}${bindir}
install -m 0755 fbpanel ${D}${bindir}
install -d ${D}${datadir}/fbpanel/
- #install -d ${D}${datadir}/fbpanel/plugins
- #install -m 644 plugins/*.so ${D}${datadir}/fbpanel/plugins
- #install -m 644 systray/tray.so ${D}${datadir}/fbpanel/plugins
+ install -d ${D}${datadir}/fbpanel/plugins
+ install -m 644 plugins/*.so ${D}${datadir}/fbpanel/plugins
+ install -m 644 systray/tray.so ${D}${datadir}/fbpanel/plugins
install -m 644 config/default ${D}${datadir}/fbpanel/default
install -d ${D}${datadir}/fbpanel/images
install -m 644 config/images/* ${D}${datadir}/fbpanel/images
diff --git a/packages/xlibs/diet-x11/.mtn2git_empty b/packages/flac/flac-1.1.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/diet-x11/.mtn2git_empty
+++ b/packages/flac/flac-1.1.2/.mtn2git_empty
diff --git a/packages/flac/flac-1.1.2/disable-xmms-plugin.patch b/packages/flac/flac-1.1.2/disable-xmms-plugin.patch
new file mode 100644
index 0000000000..e42fcbd84d
--- /dev/null
+++ b/packages/flac/flac-1.1.2/disable-xmms-plugin.patch
@@ -0,0 +1,21 @@
+--- flac-1.1.0/src/Makefile.am.orig 2004-12-25 01:11:45.000000000 +0100
++++ flac-1.1.0/src/Makefile.am 2004-12-25 01:12:10.000000000 +0100
+@@ -15,10 +15,6 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+-if FLaC__HAS_XMMS
+-XMMS_DIRS = plugin_xmms
+-endif
+-
+ if FLaC__HAS_OGG
+ OGGFLAC_DIRS = libOggFLAC libOggFLAC++
+ OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++
+@@ -33,7 +29,6 @@
+ metaflac \
+ monkeys_audio_utilities \
+ plugin_common \
+- $(XMMS_DIRS) \
+ plugin_winamp2 \
+ plugin_winamp3 \
+ test_grabbag \
diff --git a/packages/flac/flac-1.1.2/xmms.m4 b/packages/flac/flac-1.1.2/xmms.m4
new file mode 100644
index 0000000000..6d1489bf19
--- /dev/null
+++ b/packages/flac/flac-1.1.2/xmms.m4
@@ -0,0 +1,148 @@
+# CFLAGS and library paths for XMMS
+# written 15 December 1999 by Ben Gertzfield <che@debian.org>
+
+dnl Usage:
+dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl
+dnl Example:
+dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***]))
+dnl
+dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR,
+dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR,
+dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR,
+dnl and XMMS_VERSION for your plugin pleasure.
+dnl
+
+dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]])
+AC_DEFUN(XMMS_TEST_VERSION, [
+
+# Determine which version number is greater. Prints 2 to stdout if
+# the second number is greater, 1 if the first number is greater,
+# 0 if the numbers are equal.
+
+# Written 15 December 1999 by Ben Gertzfield <che@debian.org>
+# Revised 15 December 1999 by Jim Monty <monty@primenet.com>
+
+ AC_PROG_AWK
+ xmms_got_version=[` $AWK ' \
+BEGIN { \
+ print vercmp(ARGV[1], ARGV[2]); \
+} \
+ \
+function vercmp(ver1, ver2, ver1arr, ver2arr, \
+ ver1len, ver2len, \
+ ver1int, ver2int, len, i, p) { \
+ \
+ ver1len = split(ver1, ver1arr, /\./); \
+ ver2len = split(ver2, ver2arr, /\./); \
+ \
+ len = ver1len > ver2len ? ver1len : ver2len; \
+ \
+ for (i = 1; i <= len; i++) { \
+ p = 1000 ^ (len - i); \
+ ver1int += ver1arr[i] * p; \
+ ver2int += ver2arr[i] * p; \
+ } \
+ \
+ if (ver1int < ver2int) \
+ return 2; \
+ else if (ver1int > ver2int) \
+ return 1; \
+ else \
+ return 0; \
+}' $1 $2`]
+
+ if test $xmms_got_version -eq 2; then # failure
+ ifelse([$4], , :, $4)
+ else # success!
+ ifelse([$3], , :, $3)
+ fi
+])
+
+AC_DEFUN(AM_PATH_XMMS,
+[
+AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)],
+ xmms_config_prefix="$withval", xmms_config_prefix="")
+AC_ARG_WITH(xmms-exec-prefix,[ --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)],
+ xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="")
+
+if test x$xmms_config_exec_prefix != x; then
+ xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix"
+ if test x${XMMS_CONFIG+set} != xset; then
+ XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config
+ fi
+fi
+
+if test x$xmms_config_prefix != x; then
+ xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix"
+ if test x${XMMS_CONFIG+set} != xset; then
+ XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config
+ fi
+fi
+
+AC_PATH_PROG(XMMS_CONFIG, xmms-config, no)
+min_xmms_version=ifelse([$1], ,0.9.5.1, $1)
+
+if test "$XMMS_CONFIG" = "no"; then
+ no_xmms=yes
+else
+ XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags`
+ XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs`
+ XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version`
+ XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir`
+ XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir`
+ XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \
+ --visualization-plugin-dir`
+ XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir`
+ XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir`
+ XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir`
+ XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir`
+
+ XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version)
+fi
+
+AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version)
+
+if test "x$no_xmms" = x; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+else
+ AC_MSG_RESULT(no)
+
+ if test "$XMMS_CONFIG" = "no" ; then
+ echo "*** The xmms-config script installed by XMMS could not be found."
+ echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in"
+ echo "*** your path, or set the XMMS_CONFIG environment variable to the"
+ echo "*** full path to xmms-config."
+ else
+ if test "$no_xmms" = "version"; then
+ echo "*** An old version of XMMS, $XMMS_VERSION, was found."
+ echo "*** You need a version of XMMS newer than $min_xmms_version."
+ echo "*** The latest version of XMMS is always available from"
+ echo "*** http://www.xmms.org/"
+ echo "***"
+
+ echo "*** If you have already installed a sufficiently new version, this error"
+ echo "*** probably means that the wrong copy of the xmms-config shell script is"
+ echo "*** being found. The easiest way to fix this is to remove the old version"
+ echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the"
+ echo "*** correct copy of xmms-config. (In this case, you will have to"
+ echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf"
+ echo "*** so that the correct libraries are found at run-time)"
+ fi
+ fi
+ XMMS_CFLAGS=""
+ XMMS_LIBS=""
+ ifelse([$3], , :, [$3])
+fi
+AC_SUBST(XMMS_CFLAGS)
+AC_SUBST(XMMS_LIBS)
+AC_SUBST(XMMS_VERSION)
+AC_SUBST(XMMS_DATA_DIR)
+AC_SUBST(XMMS_PLUGIN_DIR)
+AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR)
+AC_SUBST(XMMS_INPUT_PLUGIN_DIR)
+AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR)
+AC_SUBST(XMMS_GENERAL_PLUGIN_DIR)
+AC_SUBST(XMMS_EFFECT_PLUGIN_DIR)
+])
diff --git a/packages/flac/flac_1.1.2.bb b/packages/flac/flac_1.1.2.bb
new file mode 100644
index 0000000000..ec9d1b7197
--- /dev/null
+++ b/packages/flac/flac_1.1.2.bb
@@ -0,0 +1,82 @@
+DESCRIPTION = "FLAC is a Free Lossless Audio Codec."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+LICENSE = "BSD GPL"
+SECTION = "libs"
+DEPENDS = "libogg"
+PR = "r4"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
+ file://disable-xmms-plugin.patch;patch=1 \
+ file://xmms.m4"
+
+S = "${WORKDIR}/flac-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
+ --with-ogg-libraries=${STAGING_LIBDIR} \
+ --with-ogg-includes=${STAGING_INCDIR} \
+ --without-xmms-prefix \
+ --without-xmms-exec-prefix \
+ --without-libiconv-prefix \
+ --without-id3lib"
+
+PACKAGES += "libflac libflac++ liboggflac liboggflac++"
+FILES_${PN} = "${bindir}"
+FILES_libflac = "${libdir}/libFLAC.so.*"
+FILES_libflac++ = "${libdir}/libFLAC++.so.*"
+FILES_liboggflac = "${libdir}/libOggFLAC.so.*"
+FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*"
+
+do_configure () {
+ install -d ${S}/m4
+ install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/
+ autotools_do_configure
+}
+
+do_stage () {
+ install -d ${STAGING_DATADIR}/aclocal
+
+ oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/
+ install -d ${STAGING_INCDIR}/OggFLAC
+ install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h
+
+ install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h
+ install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h
+ install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h
+ install -m 0644 ${S}/src/libOggFLAC/libOggFLAC.m4 ${STAGING_DATADIR}/aclocal/
+
+ oe_libinstall -a -so -C src/libFLAC libFLAC ${STAGING_LIBDIR}/
+ install -d ${STAGING_INCDIR}/FLAC
+ install -m 0644 ${S}/include/FLAC/export.h ${STAGING_INCDIR}/FLAC/export.h
+ install -m 0644 ${S}/include/FLAC/metadata.h ${STAGING_INCDIR}/FLAC/metadata.h
+ install -m 0644 ${S}/include/FLAC/all.h ${STAGING_INCDIR}/FLAC/all.h
+ install -m 0644 ${S}/include/FLAC/format.h ${STAGING_INCDIR}/FLAC/format.h
+ install -m 0644 ${S}/include/FLAC/stream_encoder.h ${STAGING_INCDIR}/FLAC/stream_encoder.h
+ install -m 0644 ${S}/include/FLAC/stream_decoder.h ${STAGING_INCDIR}/FLAC/stream_decoder.h
+ install -m 0644 ${S}/include/FLAC/ordinals.h ${STAGING_INCDIR}/FLAC/ordinals.h
+ install -m 0644 ${S}/include/FLAC/seekable_stream_encoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_encoder.h
+ install -m 0644 ${S}/include/FLAC/file_encoder.h ${STAGING_INCDIR}/FLAC/file_encoder.h
+ install -m 0644 ${S}/include/FLAC/seekable_stream_decoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_decoder.h
+ install -m 0644 ${S}/include/FLAC/file_decoder.h ${STAGING_INCDIR}/FLAC/file_decoder.h
+ install -m 0644 ${S}/include/FLAC/assert.h ${STAGING_INCDIR}/FLAC/assert.h
+ install -m 0644 ${S}/include/FLAC/callback.h ${STAGING_INCDIR}/FLAC/callback.h
+ install -m 0644 ${S}/src/libFLAC/libFLAC.m4 ${STAGING_DATADIR}/aclocal/
+
+ oe_libinstall -a -so -C src/libFLAC++ libFLAC++ ${STAGING_LIBDIR}/
+ install -d ${STAGING_INCDIR}/FLAC++
+ install -m 0644 ${S}/include/FLAC++/export.h ${STAGING_INCDIR}/FLAC++/export.h
+ install -m 0644 ${S}/include/FLAC++/metadata.h ${STAGING_INCDIR}/FLAC++/metadata.h
+ install -m 0644 ${S}/include/FLAC++/all.h ${STAGING_INCDIR}/FLAC++/all.h
+ install -m 0644 ${S}/include/FLAC++/encoder.h ${STAGING_INCDIR}/FLAC++/encoder.h
+ install -m 0644 ${S}/include/FLAC++/decoder.h ${STAGING_INCDIR}/FLAC++/decoder.h
+ install -m 0644 ${S}/src/libFLAC++/libFLAC++.m4 ${STAGING_DATADIR}/aclocal/
+
+ oe_libinstall -a -so -C src/libOggFLAC++ libOggFLAC++ ${STAGING_LIBDIR}/
+ install -d ${STAGING_INCDIR}/OggFLAC++
+ install -m 0644 ${S}/include/OggFLAC++/export.h ${STAGING_INCDIR}/OggFLAC++/export.h
+ install -m 0644 ${S}/include/OggFLAC++/all.h ${STAGING_INCDIR}/OggFLAC++/all.h
+ install -m 0644 ${S}/include/OggFLAC++/encoder.h ${STAGING_INCDIR}/OggFLAC++/encoder.h
+ install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h
+ install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/fontconfig/fontconfig_2.3.91.bb b/packages/fontconfig/fontconfig_2.3.91.bb
index e45d1339fe..d12d57a3ff 100644
--- a/packages/fontconfig/fontconfig_2.3.91.bb
+++ b/packages/fontconfig/fontconfig_2.3.91.bb
@@ -5,9 +5,10 @@ DEPENDS = "expat freetype freetype-native zlib fontconfig-native"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://fc-glyphname.patch;patch=1 \
- file://fc-lang.patch;patch=1"
+ file://fc-lang.patch;patch=1 \
+ file://local.conf"
-PR = "r0"
+PR = "r1"
PACKAGES =+ "fontconfig-utils "
FILES_fontconfig-utils = "${bindir}/*"
@@ -47,5 +48,8 @@ do_stage () {
do_install () {
autotools_do_install
+
+ install -d ${D}/etc/fonts/
+ install -m 0644 ${WORKDIR}/local.conf ${D}/etc/fonts/
}
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index e29f5e5b31..35124823a0 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -30,15 +30,15 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
#Set the fortran bits
-FORTRAN = "" # "f95"
-HAS_GFORTRAN ?= "no"
+FORTRAN = ""
+HAS_GFORTRAN = "no"
HAS_G2C = "no"
#Set the java bits
-JAVA_arm = "" # ",java"
+JAVA_arm = ""
include gcc3-build.inc
-EXTRA_OECONF += "--disable-libssp"
+EXTRA_OECONF += " --disable-libssp "
diff --git a/packages/xlibs/files/.mtn2git_empty b/packages/genext2fs/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/files/.mtn2git_empty
+++ b/packages/genext2fs/files/.mtn2git_empty
diff --git a/packages/genext2fs/files/volume.patch b/packages/genext2fs/files/volume.patch
new file mode 100644
index 0000000000..32ef8dc52b
--- /dev/null
+++ b/packages/genext2fs/files/volume.patch
@@ -0,0 +1,107 @@
+Index: genext2fs-1.4rc1/genext2fs.c
+===================================================================
+--- genext2fs-1.4rc1.orig/genext2fs.c
++++ genext2fs-1.4rc1/genext2fs.c
+@@ -409,7 +409,9 @@ swab32(uint32 val)
+ typedef struct
+ {
+ superblock_decl
+- uint32 s_reserved[235]; // Reserved
++ uint32 s_reserved1[9];
++ char s_volume[16];
++ uint32 s_reserved2[222]; // Reserved
+ } superblock;
+
+ typedef struct
+@@ -1122,7 +1124,7 @@ extend_blk(filesystem *fs, uint32 nod, b
+ while(create)
+ {
+ int i, copyb = 0;
+- if(!(fs->sb.s_reserved[200] & OP_HOLES))
++ if(!(fs->sb.s_reserved2[187] & OP_HOLES))
+ copyb = 1;
+ else
+ for(i = 0; i < BLOCKSIZE / 4; i++)
+@@ -1784,7 +1786,8 @@ swap_badfs(filesystem *fs)
+
+ // initialize an empty filesystem
+ static filesystem *
+-init_fs(int nbblocks, int nbinodes, int nbresrvd, int holes, uint32 fs_timestamp)
++init_fs(int nbblocks, int nbinodes, int nbresrvd, int holes,
++ uint32 fs_timestamp, char *volumeid)
+ {
+ int i;
+ filesystem *fs;
+@@ -1847,6 +1850,9 @@ init_fs(int nbblocks, int nbinodes, int
+ fs->sb.s_magic = EXT2_MAGIC_NUMBER;
+ fs->sb.s_lastcheck = fs_timestamp;
+
++ if (volumeid != NULL)
++ strncpy(fs->sb.s_volume, volumeid, sizeof(fs->sb.s_volume));
++
+ // set up groupdescriptors
+ for(i = 0,bbmpos=2+gd,ibmpos=3+gd,itblpos =4+gd;
+ i<nbgroups;
+@@ -1945,7 +1951,7 @@ init_fs(int nbblocks, int nbinodes, int
+
+ // options for me
+ if(holes)
+- fs->sb.s_reserved[200] |= OP_HOLES;
++ fs->sb.s_reserved2[187] |= OP_HOLES;
+
+ return fs;
+ }
+@@ -2276,7 +2282,7 @@ static void
+ dump_fs(filesystem *fs, FILE * fh, int swapit)
+ {
+ int nbblocks = fs->sb.s_blocks_count;
+- fs->sb.s_reserved[200] = 0;
++ fs->sb.s_reserved2[187] = 0;
+ if(swapit)
+ swap_goodfs(fs);
+ if(fwrite(fs, BLOCKSIZE, nbblocks, fh) < nbblocks)
+@@ -2341,6 +2347,7 @@ main(int argc, char **argv)
+ uint16 endian = 1;
+ int bigendian = !*(char*)&endian;
+ filesystem *fs;
++ char *volumeid = NULL;
+ int i;
+ int c;
+ struct stats stats;
+@@ -2359,6 +2366,7 @@ main(int argc, char **argv)
+ { "size-in-blocks", required_argument, NULL, 'b' },
+ { "bytes-per-inode", required_argument, NULL, 'i' },
+ { "number-of-inodes", required_argument, NULL, 'I' },
++ { "volume-id", required_argument, NULL, 'L' },
+ { "reserved-blocks", required_argument, NULL, 'r' },
+ { "block-map", required_argument, NULL, 'g' },
+ { "fill-value", required_argument, NULL, 'e' },
+@@ -2372,7 +2380,7 @@ main(int argc, char **argv)
+ { 0, 0, 0, 0}
+ } ;
+
+- while((c = getopt_long(argc, argv, "x:d:D:b:I:i:r:g:e:zfqUPhv", longopts, NULL)) != EOF) {
++ while((c = getopt_long(argc, argv, "x:d:D:b:I:i:L:r:g:e:zfqUPhv", longopts, NULL)) != EOF) {
+ switch(c)
+ {
+ case 'x':
+@@ -2391,6 +2399,9 @@ main(int argc, char **argv)
+ case 'I':
+ nbinodes = SI_atof(optarg);
+ break;
++ case 'L':
++ volumeid = optarg;
++ break;
+ case 'r':
+ nbresrvd = SI_atof(optarg);
+ break;
+@@ -2517,7 +2528,8 @@ main(int argc, char **argv)
+ nbresrvd = nbblocks * RESERVED_BLOCKS;
+ if(fs_timestamp == -1)
+ fs_timestamp = time(NULL);
+- fs = init_fs(nbblocks, nbinodes, nbresrvd, holes, fs_timestamp);
++ fs = init_fs(nbblocks, nbinodes, nbresrvd, holes,
++ fs_timestamp, volumeid);
+ }
+ for(i = 0; i < didx; i++)
+ {
diff --git a/packages/genext2fs/genext2fs_1.3+1.4rc1.bb b/packages/genext2fs/genext2fs_1.3+1.4rc1.bb
index 5bcb608ce1..a7f14d7da0 100644
--- a/packages/genext2fs/genext2fs_1.3+1.4rc1.bb
+++ b/packages/genext2fs/genext2fs_1.3+1.4rc1.bb
@@ -2,7 +2,8 @@ include genext2fs.inc
TRIMMEDV = "${@bb.data.getVar('PV', d, 1).split('+')[1]}"
FILESPATH = "${FILE_DIRNAME}/genext2fs-${PV}:${FILE_DIRNAME}/genext2fs:${FILE_DIRNAME}/files"
-SRC_URI = "${SOURCEFORGE_MIRROR}/genext2fs/genext2fs-${TRIMMEDV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/genext2fs/genext2fs-${TRIMMEDV}.tar.gz \
+ file://volume.patch;patch=1"
S = "${WORKDIR}/genext2fs-${TRIMMEDV}"
DEFAULT_PREFERENCE = "1"
diff --git a/packages/glib-2.0/files/glib-mkenums-nowarn.patch b/packages/glib-2.0/files/glib-mkenums-nowarn.patch
new file mode 100644
index 0000000000..1ab6e379c2
--- /dev/null
+++ b/packages/glib-2.0/files/glib-mkenums-nowarn.patch
@@ -0,0 +1,8 @@
+--- glib-2.6.5/gobject/glib-mkenums.in.orig 2006-06-15 21:28:23.436946024 -0600
++++ glib-2.6.5/gobject/glib-mkenums.in 2006-06-15 21:28:35.417124760 -0600
+@@ -1,4 +1,4 @@
+-#!@PERL_PATH@ -w
++#!@PERL_PATH@
+
+ # glib-mkenums.pl
+ # Information about the current enumeration
diff --git a/packages/glib-2.0/glib-2.0-native_2.6.5.bb b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
index e0cfb8b6fb..7a4d385fe9 100644
--- a/packages/glib-2.0/glib-2.0-native_2.6.5.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
@@ -10,10 +10,12 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>"
DEPENDS = "gtk-doc-native"
PR = "r4"
+export PERL_PATH="/usr/bin/env perl"
EXTRA_OECONF = "--disable-debug"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
file://glib-gettextize-dir.patch;patch=1 \
+ file://glib-mkenums-nowarn.patch;patch=1 \
file://glibconfig-sysdefs.h \
file://configure-libtool.patch;patch=1"
diff --git a/packages/glib-2.0/glib-2.0_2.4.5.bb b/packages/glib-2.0/glib-2.0_2.4.5.bb
index 32d25876c9..bb4127f84d 100644
--- a/packages/glib-2.0/glib-2.0_2.4.5.bb
+++ b/packages/glib-2.0/glib-2.0_2.4.5.bb
@@ -14,6 +14,11 @@ PACKAGES =+ "glib-2.0-utils "
LEAD_SONAME = "libglib-2.0.*"
FILES_glib-2.0-utils = "${bindir}/*"
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+ ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
EXTRA_OECONF = "--disable-debug"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
diff --git a/packages/glib-2.0/glib-2.0_2.4.6.bb b/packages/glib-2.0/glib-2.0_2.4.6.bb
index e250d34c9c..e3722a8e96 100644
--- a/packages/glib-2.0/glib-2.0_2.4.6.bb
+++ b/packages/glib-2.0/glib-2.0_2.4.6.bb
@@ -15,6 +15,11 @@ PR = "r4"
LEAD_SONAME = "libglib-2.0.*"
FILES_glib-2.0-utils = "${bindir}/*"
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+ ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
EXTRA_OECONF = "--disable-debug"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
diff --git a/packages/glib-2.0/glib-2.0_2.6.0.bb b/packages/glib-2.0/glib-2.0_2.6.0.bb
index 227bc8a3fc..212afa7e01 100644
--- a/packages/glib-2.0/glib-2.0_2.6.0.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.0.bb
@@ -15,6 +15,11 @@ PR = "r1"
LEAD_SONAME = "libglib-2.0.*"
FILES_glib-2.0-utils = "${bindir}/*"
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+ ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
EXTRA_OECONF = "--disable-debug"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
diff --git a/packages/glib-2.0/glib-2.0_2.6.1.bb b/packages/glib-2.0/glib-2.0_2.6.1.bb
index 61e9abae0e..64047a865f 100644
--- a/packages/glib-2.0/glib-2.0_2.6.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.1.bb
@@ -15,6 +15,11 @@ PR = "r1"
LEAD_SONAME = "libglib-2.0.*"
FILES_glib-2.0-utils = "${bindir}/*"
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+ ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
EXTRA_OECONF = "--disable-debug"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
diff --git a/packages/glib-2.0/glib-2.0_2.6.2.bb b/packages/glib-2.0/glib-2.0_2.6.2.bb
index 61e9abae0e..64047a865f 100644
--- a/packages/glib-2.0/glib-2.0_2.6.2.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.2.bb
@@ -15,6 +15,11 @@ PR = "r1"
LEAD_SONAME = "libglib-2.0.*"
FILES_glib-2.0-utils = "${bindir}/*"
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+ ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
EXTRA_OECONF = "--disable-debug"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
diff --git a/packages/glib-2.0/glib-2.0_2.6.3.bb b/packages/glib-2.0/glib-2.0_2.6.3.bb
index 61e9abae0e..64047a865f 100644
--- a/packages/glib-2.0/glib-2.0_2.6.3.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.3.bb
@@ -15,6 +15,11 @@ PR = "r1"
LEAD_SONAME = "libglib-2.0.*"
FILES_glib-2.0-utils = "${bindir}/*"
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+ ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
EXTRA_OECONF = "--disable-debug"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
diff --git a/packages/glib-2.0/glib-2.0_2.6.4.bb b/packages/glib-2.0/glib-2.0_2.6.4.bb
index 61e9abae0e..64047a865f 100644
--- a/packages/glib-2.0/glib-2.0_2.6.4.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.4.bb
@@ -15,6 +15,11 @@ PR = "r1"
LEAD_SONAME = "libglib-2.0.*"
FILES_glib-2.0-utils = "${bindir}/*"
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+ ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
EXTRA_OECONF = "--disable-debug"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
diff --git a/packages/glib-2.0/glib-2.0_2.8.1.bb b/packages/glib-2.0/glib-2.0_2.8.1.bb
index f501487fb9..b3891f108b 100644
--- a/packages/glib-2.0/glib-2.0_2.8.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.1.bb
@@ -15,6 +15,11 @@ PR = "r1"
LEAD_SONAME = "libglib-2.0.*"
FILES_glib-2.0-utils = "${bindir}/*"
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+ ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
EXTRA_OECONF = "--disable-debug"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \
diff --git a/packages/glib-2.0/glib-2.0_2.8.2.bb b/packages/glib-2.0/glib-2.0_2.8.2.bb
index 1c06176e01..22849917d6 100644
--- a/packages/glib-2.0/glib-2.0_2.8.2.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.2.bb
@@ -15,6 +15,11 @@ PR = "r3"
LEAD_SONAME = "libglib-2.0.*"
FILES_glib-2.0-utils = "${bindir}/*"
+# Add some files to glib-2.0 dev that normally don't get pulled in
+
+FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \
+ ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
+
EXTRA_OECONF = "--disable-debug"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \
diff --git a/packages/glib-2.0/glib-2.0_2.8.4.bb b/packages/glib-2.0/glib-2.0_2.8.4.bb
index fc22bb866e..778e3118d1 100644
--- a/packages/glib-2.0/glib-2.0_2.8.4.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.4.bb
@@ -13,7 +13,8 @@ PR = "r2"
LEAD_SONAME = "libglib-2.0.*"
FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/glib-2.0/include ${datadir}/glib-2.0/gettext"
+FILES_${PN}-dev += "${libdir}/glib-2.0/include ${datadir}/glib-2.0/gettext \
+ ${libdir}/glib-2.0/include/glibconfig.h"
FILES_glib-2.0-utils = "${bindir}/*"
EXTRA_OECONF = "--disable-debug"
diff --git a/packages/xlibs/libice/.mtn2git_empty b/packages/gnome/gdm/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libice/.mtn2git_empty
+++ b/packages/gnome/gdm/.mtn2git_empty
diff --git a/packages/gnome/gdm/gdm-nodocs.patch b/packages/gnome/gdm/gdm-nodocs.patch
new file mode 100644
index 0000000000..395fa627eb
--- /dev/null
+++ b/packages/gnome/gdm/gdm-nodocs.patch
@@ -0,0 +1,12 @@
+--- /tmp/Makefile.am 2006-07-26 11:37:52.000000000 +0200
++++ gdm-2.14.9/Makefile.am 2006-07-26 11:38:01.734411000 +0200
+@@ -5,8 +5,7 @@
+ vicious-extensions \
+ daemon \
+ gui \
+- utils \
+- docs
++ utils
+
+ # add these when help gets added back
+ # docs omf-install
diff --git a/packages/gnome/gdm_2.14.9.bb b/packages/gnome/gdm_2.14.9.bb
new file mode 100644
index 0000000000..76a6a1028d
--- /dev/null
+++ b/packages/gnome/gdm_2.14.9.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Graphical login manager"
+LICENSE = "GPL"
+
+DEPENDS = "gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl"
+
+inherit gnome
+
+SRC_URI += "file://gdm-nodocs.patch;patch=1"
+
+FILES_${PN} += "${datadir}/icon* \
+ ${datadir}/xsession*"
+
+
+
+
+
diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb
new file mode 100644
index 0000000000..66d34f09be
--- /dev/null
+++ b/packages/gnome/gnome-doc-utils_0.7.1.bb
@@ -0,0 +1,12 @@
+LICENSE = "GPL/LGPL"
+DEPENDS = "libxml2 libxslt"
+
+inherit gnome
+
+FILES_${PN} += "${datadir}/xml*"
+
+do_stage() {
+ autotools_stage_all
+ }
+
+
diff --git a/packages/gpe-gallery/files/makefile-fix.patch b/packages/gpe-gallery/files/makefile-fix.patch
new file mode 100644
index 0000000000..ae4583573e
--- /dev/null
+++ b/packages/gpe-gallery/files/makefile-fix.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile 2006-07-26 11:02:47.000000000 +0200
++++ gpe-gallery-0.97/Makefile 2006-07-26 11:05:07.584411000 +0200
+@@ -28,7 +28,7 @@
+ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
+
+ install-program: all
+- install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
++ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
+ install -D -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png
+ install -D -m 644 $(PACKAGE).applications $(DESTDIR)/$(PREFIX)/share/application-registry/$(PACKAGE).applications
+ mkdir -p $(DESTDIR)$(PREFIX)/share/applications
diff --git a/packages/gpe-gallery/files/mcheck.patch b/packages/gpe-gallery/files/mcheck.patch
deleted file mode 100644
index a2f2376eba..0000000000
--- a/packages/gpe-gallery/files/mcheck.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: gpe-gallery-0.95/main.c
-===================================================================
---- gpe-gallery-0.95.orig/main.c 2004-09-07 09:01:39.000000000 -0500
-+++ gpe-gallery-0.95/main.c 2004-11-18 15:55:18.856050416 -0600
-@@ -19,7 +19,9 @@
- #include <fcntl.h>
- #include <math.h>
- #include <time.h>
-+#ifdef USE_MCHECK
- #include <mcheck.h>
-+#endif
-
- #include <gtk/gtk.h>
- #include <gdk/gdk.h>
-@@ -1115,7 +1117,9 @@
- GdkBitmap *bmap;
- struct stat arg_stat;
-
-+#ifdef USE_MCHECK
- mtrace ();
-+#endif
-
- if (gpe_application_init (&argc, &argv) == FALSE)
- exit (1);
diff --git a/packages/gpe-gallery/gpe-gallery_0.94.bb b/packages/gpe-gallery/gpe-gallery_0.94.bb
deleted file mode 100644
index 4409171f48..0000000000
--- a/packages/gpe-gallery/gpe-gallery_0.94.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-PR = "r1"
-
-inherit gpe
-
-SRC_URI += "file://mcheck.patch;patch=1"
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-FILES_${PN} += "${datadir}/gpe/pixmaps"
-FILES_${PN} += "${datadir}/application-registry"
-
-DESCRIPTION = "GPE image viewer application"
-export CVSBUILD = "no"
-
diff --git a/packages/gpe-gallery/gpe-gallery_0.95.bb b/packages/gpe-gallery/gpe-gallery_0.95.bb
deleted file mode 100644
index 4409171f48..0000000000
--- a/packages/gpe-gallery/gpe-gallery_0.95.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-PR = "r1"
-
-inherit gpe
-
-SRC_URI += "file://mcheck.patch;patch=1"
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-FILES_${PN} += "${datadir}/gpe/pixmaps"
-FILES_${PN} += "${datadir}/application-registry"
-
-DESCRIPTION = "GPE image viewer application"
-export CVSBUILD = "no"
-
diff --git a/packages/gpe-gallery/gpe-gallery_0.96.bb b/packages/gpe-gallery/gpe-gallery_0.96.bb
deleted file mode 100644
index 4a6a18a430..0000000000
--- a/packages/gpe-gallery/gpe-gallery_0.96.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "GPL"
-PR = "r0"
-
-inherit gpe
-
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-FILES_${PN} += "${datadir}/gpe/pixmaps"
-FILES_${PN} += "${datadir}/application-registry"
-
-DESCRIPTION = "GPE image viewer application"
-export CVSBUILD = "no"
-
diff --git a/packages/gpe-gallery/gpe-gallery_0.97.bb b/packages/gpe-gallery/gpe-gallery_0.97.bb
index 4a6a18a430..0f6e747b8a 100644
--- a/packages/gpe-gallery/gpe-gallery_0.97.bb
+++ b/packages/gpe-gallery/gpe-gallery_0.97.bb
@@ -3,6 +3,8 @@ PR = "r0"
inherit gpe
+SRC_URI += "file://makefile-fix.patch;patch=1"
+
DEPENDS = "libgpewidget"
SECTION = "gpe"
MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
diff --git a/packages/xlibs/liblbxutil/.mtn2git_empty b/packages/gpe-question/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/liblbxutil/.mtn2git_empty
+++ b/packages/gpe-question/files/.mtn2git_empty
diff --git a/packages/gpe-question/files/makefile-fix.patch b/packages/gpe-question/files/makefile-fix.patch
new file mode 100644
index 0000000000..a8d1eadee2
--- /dev/null
+++ b/packages/gpe-question/files/makefile-fix.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile 2006-07-26 11:14:27.000000000 +0200
++++ gpe-question-0.04/Makefile 2006-07-26 11:14:41.284411000 +0200
+@@ -21,7 +21,7 @@
+ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
+
+ install-program: all
+- install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
++ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
+
+ clean:
+ rm -f $(PACKAGE).o $(PACKAGE) $(DEPS)
diff --git a/packages/gpe-question/gpe-question_0.03.bb b/packages/gpe-question/gpe-question_0.03.bb
deleted file mode 100644
index b94505a300..0000000000
--- a/packages/gpe-question/gpe-question_0.03.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DEPENDS = "libgpewidget"
-RDEPENDS = "gpe-icons"
-SECTION = "gpe"
-DESCRIPTION = "GPE interface for asking questions from shell scripts"
diff --git a/packages/gpe-question/gpe-question_0.04.bb b/packages/gpe-question/gpe-question_0.04.bb
index b94505a300..d2cad00803 100644
--- a/packages/gpe-question/gpe-question_0.04.bb
+++ b/packages/gpe-question/gpe-question_0.04.bb
@@ -1,6 +1,8 @@
LICENSE = "GPL"
inherit gpe
+SRC_URI += "file://makefile-fix.patch;patch=1"
+
DEPENDS = "libgpewidget"
RDEPENDS = "gpe-icons"
SECTION = "gpe"
diff --git a/packages/xlibs/libsm/.mtn2git_empty b/packages/gpe-soundbite/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libsm/.mtn2git_empty
+++ b/packages/gpe-soundbite/files/.mtn2git_empty
diff --git a/packages/gpe-soundbite/files/makefile-fix.patch b/packages/gpe-soundbite/files/makefile-fix.patch
new file mode 100644
index 0000000000..c2f14d17d7
--- /dev/null
+++ b/packages/gpe-soundbite/files/makefile-fix.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile 2006-07-26 10:51:15.000000000 +0200
++++ gpe-soundbite-1.0.6/Makefile 2006-07-26 10:52:02.924411000 +0200
+@@ -38,7 +38,7 @@
+ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
+
+ install-program: all $(PACKAGE)-play.desktop $(PACKAGE)-record.desktop
+- install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
++ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
+ install -D $(PACKAGE)-play $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)-play
+ install -D $(PACKAGE)-record $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)-record
+ mkdir -p $(DESTDIR)$(PREFIX)/share/applications
diff --git a/packages/gpe-soundbite/gpe-soundbite_1.0.5.bb b/packages/gpe-soundbite/gpe-soundbite_1.0.5.bb
deleted file mode 100644
index 186769676b..0000000000
--- a/packages/gpe-soundbite/gpe-soundbite_1.0.5.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-LICENSE = "GPL"
-inherit gpe pkgconfig
-
-DESCRIPTION = "GPE audio Recorder"
-DEPENDS = "gtk+ libgpewidget libglade libgsm gpe-soundserver"
-SECTION = "gpe"
-PRIORITY = "optional"
-LDFLAGS_append = "-Wl,--export-dynamic"
diff --git a/packages/gpe-soundbite/gpe-soundbite_1.0.6.bb b/packages/gpe-soundbite/gpe-soundbite_1.0.6.bb
index 186769676b..90a8a823a5 100644
--- a/packages/gpe-soundbite/gpe-soundbite_1.0.6.bb
+++ b/packages/gpe-soundbite/gpe-soundbite_1.0.6.bb
@@ -1,6 +1,8 @@
LICENSE = "GPL"
inherit gpe pkgconfig
+SRC_URI += "file://makefile-fix.patch;patch=1"
+
DESCRIPTION = "GPE audio Recorder"
DEPENDS = "gtk+ libgpewidget libglade libgsm gpe-soundserver"
SECTION = "gpe"
diff --git a/packages/xlibs/libx11/.mtn2git_empty b/packages/hdparm/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libx11/.mtn2git_empty
+++ b/packages/hdparm/files/.mtn2git_empty
diff --git a/packages/hdparm/hdparm-6.3/uclibc.patch b/packages/hdparm/files/uclibc.patch
index 495d7491bb..495d7491bb 100644
--- a/packages/hdparm/hdparm-6.3/uclibc.patch
+++ b/packages/hdparm/files/uclibc.patch
diff --git a/packages/xlibs/libxau/.mtn2git_empty b/packages/hdparm/hdparm-6.6/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxau/.mtn2git_empty
+++ b/packages/hdparm/hdparm-6.6/.mtn2git_empty
diff --git a/packages/hdparm/hdparm-6.6/bswap.patch b/packages/hdparm/hdparm-6.6/bswap.patch
new file mode 100644
index 0000000000..6b0506ceb5
--- /dev/null
+++ b/packages/hdparm/hdparm-6.6/bswap.patch
@@ -0,0 +1,37 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- hdparm-5.8/hdparm.c~bswap
++++ hdparm-5.8/hdparm.c
+@@ -20,8 +20,9 @@
+ #include <linux/types.h>
+ #include <linux/hdreg.h>
+ #include <linux/major.h>
+-#include <asm/byteorder.h>
+-//#include <endian.h>
++#include <byteswap.h>
++
++#define le16_to_cpus(x) bswap_16(htons(x))
+
+ #include "hdparm.h"
+
+@@ -1160,7 +1162,7 @@
+ }
+ } else {
+ for(i = 0; i < 0x100; ++i) {
+- __le16_to_cpus(&id[i]);
++ le16_to_cpus(&id[i]);
+ }
+ identify((void *)id, NULL);
+ }
+@@ -1380,7 +1382,7 @@
+ }
+ for (i = 0; count >= 4; ++i) {
+ sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]);
+- __le16_to_cpus((__u16 *)(&sbuf[i]));
++ le16_to_cpus((__u16 *)(&sbuf[i]));
+ b += 5;
+ count -= 5;
+ }
diff --git a/packages/hdparm/hdparm_6.6.bb b/packages/hdparm/hdparm_6.6.bb
new file mode 100644
index 0000000000..94d1e6e9bf
--- /dev/null
+++ b/packages/hdparm/hdparm_6.6.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "hdparm is a Linux shell utility for viewing \
+and manipulating various IDE drive and driver parameters."
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "BSD"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz \
+ file://bswap.patch;patch=1 \
+ file://uclibc.patch;patch=1"
+
+do_install () {
+ install -d ${D}/${sbindir} ${D}/${mandir}/man8
+ oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/packages/icewm/icewm-1.2.20/configure.patch b/packages/icewm/icewm-1.2.20/configure.patch
new file mode 100644
index 0000000000..d6071bf260
--- /dev/null
+++ b/packages/icewm/icewm-1.2.20/configure.patch
@@ -0,0 +1,68 @@
+--- icewm-1.2.20/configure.in.orig 2006-06-17 18:03:43.000000000 -0600
++++ icewm-1.2.20/configure.in 2006-06-17 18:03:45.000000000 -0600
+@@ -426,32 +426,43 @@
+ AC_MSG_ERROR("xfreetype or core fonts must be enabled")
+ fi
+ if test "$enable_xfreetype" != "no" -o "$enable_xfreetype" = "implied"; then
+- AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}})
+- if test "${XFT_CONFIG}" != ""; then
+- XFT_CFLAGS=`${XFT_CONFIG} --cflags`
+- XFT_LIBS=`${XFT_CONFIG} --libs`
+- AC_DEFINE(CONFIG_XFREETYPE, 2, [Define to enable XFreeType support.])
+- CORE_CFLAGS="${CORE_CFLAGS} $XFT_CFLAGS"
+- CORE_LIBS="${CORE_LIBS} $XFT_LIBS"
+- features="${features} xfreetype"
+- else
+- AC_CHECK_HEADERS(X11/Xft/Xft.h,
+- [ AC_CHECK_LIB(Xft, XftDrawCreate,
+- [ AC_DEFINE(CONFIG_XFREETYPE, 1, [Define to enable XFreeType support.])
+- CORE_LIBS="${CORE_LIBS} -lXft"
+- enable_corefonts=yes
+- features="${features} xfreetype" ],
+- [ if test "$enable_xfreetype" != "implied"; then
+- AC_MSG_ERROR([Xft support has been requested but libraries were not found.
++ AC_PATH_PROG(PKG_CONFIG, pkg-config)
++
++ if test "${PKG_CONFIG}" != ""; then
++ XFT_CFLAGS=`${PKG_CONFIG} xft --cflags`
++ XFT_LIBS=`${PKG_CONFIG} xft --libs`
++ AC_DEFINE(CONFIG_XFREETYPE, 2, [Define to enable XFreeType support.])
++ CORE_CFLAGS="${CORE_CFLAGS} $XFT_CFLAGS"
++ CORE_LIBS="${CORE_LIBS} $XFT_LIBS"
++ features="${features} xfreetype"
++ else
++ AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}})
++ if test "${XFT_CONFIG}" != ""; then
++ XFT_CFLAGS=`${XFT_CONFIG} --cflags`
++ XFT_LIBS=`${XFT_CONFIG} --libs`
++ AC_DEFINE(CONFIG_XFREETYPE, 2, [Define to enable XFreeType support.])
++ CORE_CFLAGS="${CORE_CFLAGS} $XFT_CFLAGS"
++ CORE_LIBS="${CORE_LIBS} $XFT_LIBS"
++ features="${features} xfreetype"
++ else
++ AC_CHECK_HEADERS(X11/Xft/Xft.h,
++ [ AC_CHECK_LIB(Xft, XftDrawCreate,
++ [ AC_DEFINE(CONFIG_XFREETYPE, 1, [Define to enable XFreeType support.])
++ CORE_LIBS="${CORE_LIBS} -lXft"
++ enable_corefonts=yes
++ features="${features} xfreetype" ],
++ [ if test "$enable_xfreetype" != "implied"; then
++ AC_MSG_ERROR([Xft support has been requested but libraries were not found.
+ *** Configure your X server to support XFreeType.
+ *** Information about how to do this can be found in RELNOTES for XFree86.])
+- fi ])],
+- [ if test "$enable_xfreetype" != "implied"; then
+- AC_MSG_ERROR([Xft support has been requested but headers were not found.
++ fi ])],
++ [ if test "$enable_xfreetype" != "implied"; then
++ AC_MSG_ERROR([Xft support has been requested but headers were not found.
+ *** Configure your X server to support XFreeType.
+ *** Information about how to do this can be found in RELNOTES for XFree86.])
+- fi ])
+- fi
++ fi ])
++ fi
++ fi
+ fi
+
+ if test "$enable_corefonts" = "yes"; then
diff --git a/packages/xlibs/libxaw/.mtn2git_empty b/packages/icewm/icewm-1.2.26/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxaw/.mtn2git_empty
+++ b/packages/icewm/icewm-1.2.26/.mtn2git_empty
diff --git a/packages/icewm/icewm-1.2.26/configure.patch b/packages/icewm/icewm-1.2.26/configure.patch
new file mode 100644
index 0000000000..ade427d5e0
--- /dev/null
+++ b/packages/icewm/icewm-1.2.26/configure.patch
@@ -0,0 +1,22 @@
+--- icewm-1.2.26/configure.in.orig 2006-07-18 15:16:37.024817360 -0600
++++ icewm-1.2.26/configure.in 2006-07-18 15:17:32.889324664 -0600
+@@ -426,14 +426,11 @@
+ AC_MSG_ERROR("xfreetype or core fonts must be enabled")
+ fi
+ if test "$enable_xfreetype" != "no" -o "$enable_xfreetype" = "implied"; then
+- AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}})
+- if test "${XFT_CONFIG}" == ""; then
+- AC_PATH_PROG(PKG_CONFIG, pkg-config)
+- if test "${PKG_CONFIG}" != ""; then
+- ${PKG_CONFIG} xft 2>/dev/null
+- if test $? -eq 0 ; then
+- XFT_CONFIG='pkg-config xft'
+- fi
++ AC_PATH_PROG(PKG_CONFIG, pkg-config)
++ if test "${PKG_CONFIG}" != ""; then
++ ${PKG_CONFIG} xft 2>/dev/null
++ if test $? -eq 0 ; then
++ XFT_CONFIG='pkg-config xft'
+ fi
+ fi
+ if test "${XFT_CONFIG}" != ""; then
diff --git a/packages/icewm/icewm-1.2.26/makefile.patch b/packages/icewm/icewm-1.2.26/makefile.patch
new file mode 100644
index 0000000000..9473c9b2a9
--- /dev/null
+++ b/packages/icewm/icewm-1.2.26/makefile.patch
@@ -0,0 +1,26 @@
+--- ./src/Makefile.in 2005-02-01 21:56:08.000000000 +0100
++++ ./src/Makefile.in 2005-02-01 21:55:12.000000000 +0100
+@@ -206,10 +206,21 @@
+ %.o: %.cc
+ @echo " CXX " $@
+ @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
+-
+-genpref $(BINARIES):
++
++HOSTCXX=g++
++HOSTLD=g++
++
++genpref.o: genpref.cc
++ @echo " HOSTCXX " $@
++ @$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $<
++
++$(BINARIES):
+ @echo " LD " $@
+ @$(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
++
++genpref:
++ @echo " HOSTLD " $@
++ @$(HOSTLD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
+
+ ################################################################################
+
diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb
index ff6434279b..dfe87335b3 100644
--- a/packages/icewm/icewm_1.2.20.bb
+++ b/packages/icewm/icewm_1.2.20.bb
@@ -1,17 +1,20 @@
SECTION = "x11/wm"
DESCRIPTION = "IceWM Window Manager"
LICENSE = "GPL"
-DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft"
+DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
- file://makefile.patch;patch=1"
+ file://makefile.patch;patch=1 \
+ file://configure.patch;patch=1"
S = "${WORKDIR}/icewm-${PV}"
inherit autotools pkgconfig
-EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus"
+EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus \
+ --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} \
+ --with-mkfontdir=${STAGING_DIR}/${BUILD_SYS}/bin/mkfontdir"
pkg_postinst() {
update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/icewm-session 10
@@ -19,4 +22,4 @@ update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bi
pkg_postrm() {
update-alternatives --remove x-window-manager /usr/bin/icewm-session
-} \ No newline at end of file
+}
diff --git a/packages/icewm/icewm_1.2.26.bb b/packages/icewm/icewm_1.2.26.bb
new file mode 100644
index 0000000000..7c1e2a2bf7
--- /dev/null
+++ b/packages/icewm/icewm_1.2.26.bb
@@ -0,0 +1,25 @@
+SECTION = "x11/wm"
+DESCRIPTION = "IceWM Window Manager"
+LICENSE = "GPL"
+DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
+ file://makefile.patch;patch=1 \
+ file://configure.patch;patch=1"
+
+S = "${WORKDIR}/icewm-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus \
+ --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} \
+ --with-mkfontdir=${STAGING_DIR}/${BUILD_SYS}/bin/mkfontdir"
+
+pkg_postinst() {
+update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/icewm-session 10
+}
+
+pkg_postrm() {
+update-alternatives --remove x-window-manager /usr/bin/icewm-session
+}
diff --git a/packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty b/packages/images/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty
+++ b/packages/images/.mtn2git_empty
diff --git a/packages/meta/bootstrap-image.bb b/packages/images/bootstrap-image.bb
index 1791dd8f56..1791dd8f56 100644
--- a/packages/meta/bootstrap-image.bb
+++ b/packages/images/bootstrap-image.bb
diff --git a/packages/meta/dvb-image.bb b/packages/images/dvb-image.bb
index fa964b4490..fa964b4490 100644
--- a/packages/meta/dvb-image.bb
+++ b/packages/images/dvb-image.bb
diff --git a/packages/meta/e-image-core.bb b/packages/images/e-image-core.bb
index 9a1ed51a1a..9a1ed51a1a 100644
--- a/packages/meta/e-image-core.bb
+++ b/packages/images/e-image-core.bb
diff --git a/packages/meta/e-image.bb b/packages/images/e-image.bb
index 99f3858f66..99f3858f66 100644
--- a/packages/meta/e-image.bb
+++ b/packages/images/e-image.bb
diff --git a/packages/meta/essential-image.bb b/packages/images/essential-image.bb
index 53510ddc09..53510ddc09 100644
--- a/packages/meta/essential-image.bb
+++ b/packages/images/essential-image.bb
diff --git a/packages/meta/essential-machine-image.bb b/packages/images/essential-machine-image.bb
index c3c7b33b92..c3c7b33b92 100644
--- a/packages/meta/essential-machine-image.bb
+++ b/packages/images/essential-machine-image.bb
diff --git a/packages/meta/gpe-image-blank-user.bb b/packages/images/gpe-image-blank-user.bb
index c8e24ae035..c8e24ae035 100644
--- a/packages/meta/gpe-image-blank-user.bb
+++ b/packages/images/gpe-image-blank-user.bb
diff --git a/packages/meta/gpe-image.bb b/packages/images/gpe-image.bb
index 92bed0dd5c..92bed0dd5c 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/images/gpe-image.bb
diff --git a/packages/meta/ludeos-image.bb b/packages/images/ludeos-image.bb
index 669ff49634..669ff49634 100644
--- a/packages/meta/ludeos-image.bb
+++ b/packages/images/ludeos-image.bb
diff --git a/packages/meta/maemo-image.bb b/packages/images/maemo-image.bb
index 2adc88b958..2adc88b958 100644
--- a/packages/meta/maemo-image.bb
+++ b/packages/images/maemo-image.bb
diff --git a/packages/meta/mythfront-image.bb b/packages/images/mythfront-image.bb
index 7836258940..7836258940 100644
--- a/packages/meta/mythfront-image.bb
+++ b/packages/images/mythfront-image.bb
diff --git a/packages/meta/nslu2-linksys-image.bb b/packages/images/nslu2-linksys-image.bb
index d1bdbe64b9..d1bdbe64b9 100644
--- a/packages/meta/nslu2-linksys-image.bb
+++ b/packages/images/nslu2-linksys-image.bb
diff --git a/packages/meta/nylon-image-base.bb b/packages/images/nylon-image-base.bb
index a4f6d17dd8..a4f6d17dd8 100644
--- a/packages/meta/nylon-image-base.bb
+++ b/packages/images/nylon-image-base.bb
diff --git a/packages/meta/nylon-image-extra.bb b/packages/images/nylon-image-extra.bb
index be20ddde78..be20ddde78 100644
--- a/packages/meta/nylon-image-extra.bb
+++ b/packages/images/nylon-image-extra.bb
diff --git a/packages/meta/nylon-image-mini.bb b/packages/images/nylon-image-mini.bb
index e3ac80720d..e3ac80720d 100644
--- a/packages/meta/nylon-image-mini.bb
+++ b/packages/images/nylon-image-mini.bb
diff --git a/packages/meta/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb
index 8d10e9a30f..8d10e9a30f 100644
--- a/packages/meta/nylon-image-standard.bb
+++ b/packages/images/nylon-image-standard.bb
diff --git a/packages/meta/opie-image.bb b/packages/images/opie-image.bb
index c786f67e0b..c786f67e0b 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/images/opie-image.bb
diff --git a/packages/meta/opie-kdepim-image.bb b/packages/images/opie-kdepim-image.bb
index 113608736a..113608736a 100644
--- a/packages/meta/opie-kdepim-image.bb
+++ b/packages/images/opie-kdepim-image.bb
diff --git a/packages/meta/pivotboot-image.bb b/packages/images/pivotboot-image.bb
index 50634e0353..50634e0353 100644
--- a/packages/meta/pivotboot-image.bb
+++ b/packages/images/pivotboot-image.bb
diff --git a/packages/meta/sdl-image.bb b/packages/images/sdl-image.bb
index 0f3254b56e..0f3254b56e 100644
--- a/packages/meta/sdl-image.bb
+++ b/packages/images/sdl-image.bb
diff --git a/packages/meta/sectest-gpe-image.bb b/packages/images/sectest-gpe-image.bb
index be7f28fb91..be7f28fb91 100644
--- a/packages/meta/sectest-gpe-image.bb
+++ b/packages/images/sectest-gpe-image.bb
diff --git a/packages/meta/slugos-image.bb b/packages/images/slugos-image.bb
index 428a48bc28..428a48bc28 100644
--- a/packages/meta/slugos-image.bb
+++ b/packages/images/slugos-image.bb
diff --git a/packages/meta/slugos-imagename.bb b/packages/images/slugos-imagename.bb
index 2637524407..2637524407 100644
--- a/packages/meta/slugos-imagename.bb
+++ b/packages/images/slugos-imagename.bb
diff --git a/packages/meta/twin-image.bb b/packages/images/twin-image.bb
index 7015f7020c..7015f7020c 100644
--- a/packages/meta/twin-image.bb
+++ b/packages/images/twin-image.bb
diff --git a/packages/meta/uml-image.bb b/packages/images/uml-image.bb
index 6ebbf04537..6ebbf04537 100644
--- a/packages/meta/uml-image.bb
+++ b/packages/images/uml-image.bb
diff --git a/packages/meta/unslung-image.bb b/packages/images/unslung-image.bb
index e57960ecdb..e57960ecdb 100644
--- a/packages/meta/unslung-image.bb
+++ b/packages/images/unslung-image.bb
diff --git a/packages/meta/xfce-image.bb b/packages/images/xfce-image.bb
index 5605a6b2ee..5605a6b2ee 100644
--- a/packages/meta/xfce-image.bb
+++ b/packages/images/xfce-image.bb
diff --git a/packages/meta/xterminal-image.bb b/packages/images/xterminal-image.bb
index 2b98ec98fc..2b98ec98fc 100644
--- a/packages/meta/xterminal-image.bb
+++ b/packages/images/xterminal-image.bb
diff --git a/packages/xlibs/libxcomposite/.mtn2git_empty b/packages/intltool/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxcomposite/.mtn2git_empty
+++ b/packages/intltool/files/.mtn2git_empty
diff --git a/packages/intltool/files/intltool-nowarn.patch b/packages/intltool/files/intltool-nowarn.patch
new file mode 100644
index 0000000000..546db5f119
--- /dev/null
+++ b/packages/intltool/files/intltool-nowarn.patch
@@ -0,0 +1,40 @@
+--- intltool-0.35.0/intltool-extract.in.in.orig 2006-06-16 15:49:14.000000000 -0600
++++ intltool-0.35.0/intltool-extract.in.in 2006-06-16 15:49:18.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!@INTLTOOL_PERL@ -w
++#!@INTLTOOL_PERL@
+ # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
+ #
+--- intltool-0.35.0/intltool-merge.in.in.orig 2006-06-16 15:49:18.000000000 -0600
++++ intltool-0.35.0/intltool-merge.in.in 2006-06-16 15:49:23.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!@INTLTOOL_PERL@ -w
++#!@INTLTOOL_PERL@
+ # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
+ #
+--- intltool-0.35.0/intltool-prepare.in.orig 2006-06-16 15:49:23.000000000 -0600
++++ intltool-0.35.0/intltool-prepare.in 2006-06-16 15:49:26.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!@INTLTOOL_PERL@ -w
++#!@INTLTOOL_PERL@
+ # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
+ # Intltool .desktop, .directory Prepare Tool
+--- intltool-0.35.0/intltool-unicodify.in.orig 2006-06-16 15:49:26.000000000 -0600
++++ intltool-0.35.0/intltool-unicodify.in 2006-06-16 15:49:30.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!@INTLTOOL_PERL@ -w
++#!@INTLTOOL_PERL@
+
+ #
+ # The i18n Unicode Encoding Utility
+--- intltool-0.35.0/intltool-update.in.in.orig 2006-06-16 15:49:30.000000000 -0600
++++ intltool-0.35.0/intltool-update.in.in 2006-06-16 15:49:35.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!@INTLTOOL_PERL@ -w
++#!@INTLTOOL_PERL@
+ # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
+ #
diff --git a/packages/intltool/intltool-native_0.35.0.bb b/packages/intltool/intltool-native_0.35.0.bb
index f200d26dd1..18177ffe28 100644
--- a/packages/intltool/intltool-native_0.35.0.bb
+++ b/packages/intltool/intltool-native_0.35.0.bb
@@ -2,3 +2,6 @@ SECTION = "devel"
include intltool_${PV}.bb
inherit native
DEPENDS = "libxml-parser-perl-native"
+
+export PERL="/usr/bin/env perl"
+SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index ab8f4d63e0..bfb91f2f56 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -2,12 +2,13 @@ include ipkg-utils_${PV}.bb
SRC_URI += "file://ipkg-utils-fix.patch;patch=1"
RDEPENDS = ""
-PR = "r7"
+PR = "r8"
inherit native
# Avoid circular dependencies from package_ipk.bbclass
PACKAGES = ""
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-utils"
do_stage() {
for i in ${INSTALL}; do
diff --git a/packages/xlibs/libxcursor-1.1.2/.mtn2git_empty b/packages/ipkg-utils/ipkg-utils/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxcursor-1.1.2/.mtn2git_empty
+++ b/packages/ipkg-utils/ipkg-utils/.mtn2git_empty
diff --git a/packages/ipkg-utils/ipkg-utils/index_speedup.patch b/packages/ipkg-utils/ipkg-utils/index_speedup.patch
new file mode 100644
index 0000000000..bef28a9df1
--- /dev/null
+++ b/packages/ipkg-utils/ipkg-utils/index_speedup.patch
@@ -0,0 +1,53 @@
+Index: ipkg-utils/ipkg-make-index
+===================================================================
+--- ipkg-utils.orig/ipkg-make-index 2005-03-20 18:10:54.000000000 +0000
++++ ipkg-utils/ipkg-make-index 2006-07-24 09:18:16.000000000 +0100
+@@ -37,6 +37,21 @@
+ if os.path.exists(pkg_dir + "/" + filename + ".asc"):
+ os.rename(pkg_dir + "/" + filename + ".asc", locale_dir + "/" + filename + ".asc")
+
++def md5sum(file):
++ import md5
++ sum = md5.new()
++ f = open(file, "r")
++ while 1:
++ data = f.read(1024)
++ if not data: break
++ sum.update(data)
++ f.close()
++ if sys.version[:1] > '2':
++ # when using Python 2.0 or newer
++ return sum.hexdigest()
++ else:
++ return string.join(map((lambda x:"%02x" % ord(x)),sum.digest()),'')
++
+ old_filename = None
+ packages_filename = None
+ filelist_filename = "Packages.filelist"
+@@ -87,7 +102,7 @@
+ files.sort()
+ for filename in files:
+ basename = os.path.basename(filename)
+- if old_pkg_hash.has_key(basename):
++ if old_pkg_hash.has_key(basename) and old_pkg_hash[basename].md5 == md5sum(filename) and old_pkg_hash[basename].size == os.stat(filename)[6]:
+ if (verbose):
+ sys.stderr.write("Found %s in Packages\n" % (filename,))
+ pkg = old_pkg_hash[basename]
+Index: ipkg-utils/ipkg.py
+===================================================================
+--- ipkg-utils.orig/ipkg.py 2005-01-20 23:09:10.000000000 +0000
++++ ipkg-utils/ipkg.py 2006-07-24 09:16:44.000000000 +0100
+@@ -210,8 +210,13 @@
+ value = value + '\n' + line
+ if name == 'size':
+ self.size = int(value)
++ elif name == 'md5sum':
++ self.md5 = value
+ elif self.__dict__.has_key(name):
+ self.__dict__[name] = value
++ else:
++ print "Lost field %s, %s" % (name,value)
++
+ if line[0] == '\n':
+ return # consumes one blank line at end of package descriptoin
+ else:
diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index 12ed042f15..48c7445828 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,9 +5,10 @@ LICENSE = "GPL"
CONFLICTS = "ipkg-link"
RDEPENDS = "python"
SRCDATE = "20050404"
-PR = "r11"
+PR = "r12"
-SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils"
+SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
+ file://index_speedup.patch;patch=1"
S = "${WORKDIR}/ipkg-utils"
diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb
index a7d68d5350..6f6a1ea4fd 100644
--- a/packages/ipkg/ipkg-native_0.99.163.bb
+++ b/packages/ipkg/ipkg-native_0.99.163.bb
@@ -5,5 +5,5 @@ include ipkg-native.inc
inherit autotools pkgconfig native
-SRC_URI = "http://ftp.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz"
+SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz"
diff --git a/packages/keylaunch/files/makefile-fix.patch b/packages/keylaunch/files/makefile-fix.patch
new file mode 100644
index 0000000000..30275001df
--- /dev/null
+++ b/packages/keylaunch/files/makefile-fix.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile 2006-07-26 09:31:43.000000000 +0200
++++ keylaunch-2.0.10/Makefile 2006-07-26 09:32:23.464411000 +0200
+@@ -31,7 +31,7 @@
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
+
+ install-program: all
+- install -sD $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
++ install -s -D $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
+ install -D -m 644 $(PROG)rc $(DESTDIR)/etc/$(PROG)rc
+ install -d $(DESTDIR)/etc/X11/Xsession.d
+ install 90$(PROG) $(DESTDIR)/etc/X11/Xsession.d/90$(PROG)
diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb
index 990de0cba7..e5f0b35b22 100644
--- a/packages/keylaunch/keylaunch_2.0.10.bb
+++ b/packages/keylaunch/keylaunch_2.0.10.bb
@@ -1,7 +1,6 @@
inherit gpe
DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch"
-DEPENDS_append_openzaurus = " display-brightness"
RDEPENDS_append_openzaurus = " display-brightness"
SECTION = "gpe"
@@ -13,9 +12,10 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\
program is already running, keylaunch can bring its window to the front\
rather than just running another copy."
PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r6"
+PR = "r7"
SRC_URI += " file://keylaunchrc"
+SRC_URI += " file://makefile-fix.patch;patch=1"
do_install_prepend () {
install ${WORKDIR}/keylaunchrc ${S}/keylaunchrc
diff --git a/packages/xlibs/libxcursor/.mtn2git_empty b/packages/keymaps/files/jornada6xx/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxcursor/.mtn2git_empty
+++ b/packages/keymaps/files/jornada6xx/.mtn2git_empty
diff --git a/packages/keymaps/files/jornada6xx/keymap-de.map b/packages/keymaps/files/jornada6xx/keymap-de.map
new file mode 100644
index 0000000000..98083d2e58
--- /dev/null
+++ b/packages/keymaps/files/jornada6xx/keymap-de.map
@@ -0,0 +1,597 @@
+keymaps 0-6,8-10,12
+keycode 1 = Escape Escape
+keycode 2 = one exclam bar
+keycode 3 = two quotedbl twosuperior
+keycode 4 = three section threesuperior
+ control keycode 4 = Escape
+ alt keycode 4 = Meta_three
+ control alt keycode 4 = Meta_Escape
+keycode 5 = four dollar
+ alt keycode 5 = Meta_four
+ shift alt keycode 5 = Meta_dollar
+keycode 6 = five percent
+ alt keycode 6 = Meta_five
+ shift alt keycode 6 = Meta_percent
+keycode 7 = six ampersand
+ control keycode 7 = Control_asciicircum
+ alt keycode 7 = Meta_six
+ shift alt keycode 7 = Meta_ampersand
+keycode 8 = seven slash braceleft
+ alt keycode 8 = Meta_seven
+ shift alt keycode 8 = Meta_slash
+ altgr alt keycode 8 = Meta_braceleft
+keycode 9 = eight parenleft bracketleft
+ alt keycode 9 = Meta_eight
+ shift alt keycode 9 = Meta_parenleft
+ altgr alt keycode 9 = Meta_bracketleft
+keycode 10 = nine parenright bracketright
+ altgr control keycode 10 = Control_bracketright
+ alt keycode 10 = Meta_nine
+ shift alt keycode 10 = Meta_parenright
+ altgr alt keycode 10 = Meta_bracketright
+keycode 11 = zero equal braceright
+ alt keycode 11 = Meta_zero
+ shift alt keycode 11 = Meta_equal
+ altgr alt keycode 11 = Meta_braceright
+keycode 12 = ssharp question backslash
+ altgr control keycode 12 = Control_backslash
+ shift alt keycode 12 = Meta_question
+ altgr alt keycode 12 = Meta_backslash
+keycode 13 = apostrophe grave
+ alt keycode 13 = 0x08b4
+ shift alt keycode 13 = Meta_grave
+keycode 14 = Delete Delete
+ alt keycode 14 = Meta_Delete
+ shift alt keycode 14 = Meta_Delete
+keycode 15 = Tab Meta_Tab
+ alt keycode 15 = Meta_Tab
+keycode 16 = +q +Q at
+ control keycode 16 = Control_q
+ shift control keycode 16 = Control_q
+ altgr control keycode 16 = nul
+ alt keycode 16 = Meta_q
+ shift alt keycode 16 = Meta_Q
+ altgr alt keycode 16 = Meta_at
+ control alt keycode 16 = Meta_Control_q
+keycode 17 = +w
+ shift keycode 17 = +W
+ shift altgr keycode 17 = VoidSymbol
+ control keycode 17 = Control_w
+ shift control keycode 17 = Control_w
+ altgr control keycode 17 = Control_w
+ alt keycode 17 = Meta_w
+ shift alt keycode 17 = Meta_W
+ altgr alt keycode 17 = Meta_w
+ control alt keycode 17 = Meta_Control_w
+keycode 18 = +e +E currency
+ control keycode 18 = Control_e
+ shift control keycode 18 = Control_e
+ altgr control keycode 18 = Control_e
+ alt keycode 18 = Meta_e
+ shift alt keycode 18 = Meta_E
+ altgr alt keycode 18 = Meta_e
+ control alt keycode 18 = Meta_Control_e
+keycode 19 = +r
+ shift keycode 19 = +R
+ shift altgr keycode 19 = VoidSymbol
+ control keycode 19 = Control_r
+ shift control keycode 19 = Control_r
+ altgr control keycode 19 = Control_r
+ alt keycode 19 = Meta_r
+ shift alt keycode 19 = Meta_R
+ altgr alt keycode 19 = Meta_r
+ control alt keycode 19 = Meta_Control_r
+keycode 20 = +t
+ shift keycode 20 = +T
+ shift altgr keycode 20 = VoidSymbol
+ control keycode 20 = Control_t
+ shift control keycode 20 = Control_t
+ altgr control keycode 20 = Control_t
+ alt keycode 20 = Meta_t
+ shift alt keycode 20 = Meta_T
+ altgr alt keycode 20 = Meta_t
+ control alt keycode 20 = Meta_Control_t
+keycode 21 = +z
+ shift keycode 21 = +Z
+ shift altgr keycode 21 = VoidSymbol
+ control keycode 21 = Control_z
+ shift control keycode 21 = Control_z
+ altgr control keycode 21 = Control_z
+ alt keycode 21 = Meta_z
+ shift alt keycode 21 = Meta_Z
+ altgr alt keycode 21 = Meta_z
+ control alt keycode 21 = Meta_Control_z
+keycode 22 = +u
+ shift keycode 22 = +U
+ shift altgr keycode 22 = VoidSymbol
+ control keycode 22 = Control_u
+ shift control keycode 22 = Control_u
+ altgr control keycode 22 = Control_u
+ alt keycode 22 = Meta_u
+ shift alt keycode 22 = Meta_U
+ altgr alt keycode 22 = Meta_u
+ control alt keycode 22 = Meta_Control_u
+keycode 23 = +i
+ shift keycode 23 = +I
+ shift altgr keycode 23 = VoidSymbol
+ control keycode 23 = Tab
+ shift control keycode 23 = Tab
+ altgr control keycode 23 = Tab
+ alt keycode 23 = Meta_i
+ shift alt keycode 23 = Meta_I
+ altgr alt keycode 23 = Meta_i
+ control alt keycode 23 = Meta_Tab
+keycode 24 = +o
+ shift keycode 24 = +O
+ shift altgr keycode 24 = VoidSymbol
+ control keycode 24 = Control_o
+ shift control keycode 24 = Control_o
+ altgr control keycode 24 = Control_o
+ alt keycode 24 = Meta_o
+ shift alt keycode 24 = Meta_O
+ altgr alt keycode 24 = Meta_o
+ control alt keycode 24 = Meta_Control_o
+keycode 25 = +p
+ shift keycode 25 = +P
+ shift altgr keycode 25 = VoidSymbol
+ control keycode 25 = Control_p
+ shift control keycode 25 = Control_p
+ altgr control keycode 25 = Control_p
+ alt keycode 25 = Meta_p
+ shift alt keycode 25 = Meta_P
+ altgr alt keycode 25 = Meta_p
+ control alt keycode 25 = Meta_Control_p
+keycode 26 = +udiaeresis +Udiaeresis
+keycode 27 = plus asterisk asciitilde
+ alt keycode 27 = Meta_plus
+ shift alt keycode 27 = Meta_asterisk
+keycode 28 = Return
+ shift altgr keycode 28 = VoidSymbol
+ alt keycode 28 = Meta_Control_m
+keycode 29 = Control
+ shift keycode 29 = Compose
+ shift altgr keycode 29 = VoidSymbol
+keycode 30 = +a
+ shift keycode 30 = +A
+ shift altgr keycode 30 = VoidSymbol
+ control keycode 30 = Control_a
+ shift control keycode 30 = Control_a
+ altgr control keycode 30 = Control_a
+ alt keycode 30 = Meta_a
+ shift alt keycode 30 = Meta_A
+ altgr alt keycode 30 = Meta_a
+ control alt keycode 30 = Meta_Control_a
+keycode 31 = +s
+ shift keycode 31 = +S
+ shift altgr keycode 31 = VoidSymbol
+ control keycode 31 = Control_s
+ shift control keycode 31 = Control_s
+ altgr control keycode 31 = Control_s
+ alt keycode 31 = Meta_s
+ shift alt keycode 31 = Meta_S
+ altgr alt keycode 31 = Meta_s
+ control alt keycode 31 = Meta_Control_s
+keycode 32 = +d
+ shift keycode 32 = +D
+ shift altgr keycode 32 = VoidSymbol
+ control keycode 32 = Control_d
+ shift control keycode 32 = Control_d
+ altgr control keycode 32 = Control_d
+ alt keycode 32 = Meta_d
+ shift alt keycode 32 = Meta_D
+ altgr alt keycode 32 = Meta_d
+ control alt keycode 32 = Meta_Control_d
+keycode 33 = +f
+ shift keycode 33 = +F
+ shift altgr keycode 33 = VoidSymbol
+ control keycode 33 = Control_f
+ shift control keycode 33 = Control_f
+ altgr control keycode 33 = Control_f
+ alt keycode 33 = Meta_f
+ shift alt keycode 33 = Meta_F
+ altgr alt keycode 33 = Meta_f
+ control alt keycode 33 = Meta_Control_f
+keycode 34 = +g
+ shift keycode 34 = +G
+ shift altgr keycode 34 = VoidSymbol
+ control keycode 34 = Control_g
+ shift control keycode 34 = Control_g
+ altgr control keycode 34 = Control_g
+ alt keycode 34 = Meta_g
+ shift alt keycode 34 = Meta_G
+ altgr alt keycode 34 = Meta_g
+ control alt keycode 34 = Meta_Control_g
+keycode 35 = +h
+ shift keycode 35 = +H
+ shift altgr keycode 35 = VoidSymbol
+ control keycode 35 = BackSpace
+ shift control keycode 35 = BackSpace
+ altgr control keycode 35 = BackSpace
+ alt keycode 35 = Meta_h
+ shift alt keycode 35 = Meta_H
+ altgr alt keycode 35 = Meta_h
+ control alt keycode 35 = Meta_BackSpace
+keycode 36 = +j
+ shift keycode 36 = +J
+ shift altgr keycode 36 = VoidSymbol
+ control keycode 36 = Linefeed
+ shift control keycode 36 = Linefeed
+ altgr control keycode 36 = Linefeed
+ alt keycode 36 = Meta_j
+ shift alt keycode 36 = Meta_J
+ altgr alt keycode 36 = Meta_j
+ control alt keycode 36 = Meta_Linefeed
+keycode 37 = +k
+ shift keycode 37 = +K
+ shift altgr keycode 37 = VoidSymbol
+ control keycode 37 = Control_k
+ shift control keycode 37 = Control_k
+ altgr control keycode 37 = Control_k
+ alt keycode 37 = Meta_k
+ shift alt keycode 37 = Meta_K
+ altgr alt keycode 37 = Meta_k
+ control alt keycode 37 = Meta_Control_k
+keycode 38 = +l
+ shift keycode 38 = +L
+ shift altgr keycode 38 = VoidSymbol
+ control keycode 38 = Control_l
+ shift control keycode 38 = Control_l
+ altgr control keycode 38 = Control_l
+ alt keycode 38 = Meta_l
+ shift alt keycode 38 = Meta_L
+ altgr alt keycode 38 = Meta_l
+ control alt keycode 38 = Meta_Control_l
+keycode 39 = +odiaeresis +Odiaeresis
+keycode 40 = +adiaeresis +Adiaeresis
+keycode 41 = F11 F23
+ control keycode 41 = Control_asciicircum
+ control alt keycode 41 = Meta_Control_asciicircum
+keycode 42 = Shift Shift Caps_Lock
+ shift altgr keycode 42 = VoidSymbol
+ control keycode 42 = Compose
+keycode 43 = numbersign apostrophe
+ alt keycode 43 = Meta_numbersign
+ shift alt keycode 43 = Meta_apostrophe
+keycode 44 = +y +Y less
+ shift altgr keycode 44 = VoidSymbol
+ control keycode 44 = Control_y
+ shift control keycode 44 = Control_y
+ altgr control keycode 44 = Control_y
+ alt keycode 44 = Meta_y
+ shift alt keycode 44 = Meta_Y
+ altgr alt keycode 44 = Meta_y
+ control alt keycode 44 = Meta_Control_y
+keycode 45 = +x +X greater
+ shift altgr keycode 45 = VoidSymbol
+ control keycode 45 = Control_x
+ shift control keycode 45 = Control_x
+ altgr control keycode 45 = Control_x
+ alt keycode 45 = Meta_x
+ shift alt keycode 45 = Meta_X
+ altgr alt keycode 45 = Meta_x
+ control alt keycode 45 = Meta_Control_x
+keycode 46 = +c +C cent
+ control keycode 46 = Control_c
+ shift control keycode 46 = Control_c
+ altgr control keycode 46 = Control_c
+ alt keycode 46 = Meta_c
+ shift alt keycode 46 = Meta_C
+ altgr alt keycode 46 = Meta_c
+ control alt keycode 46 = Meta_Control_c
+keycode 47 = +v
+ shift keycode 47 = +V
+ shift altgr keycode 47 = VoidSymbol
+ control keycode 47 = Control_v
+ shift control keycode 47 = Control_v
+ altgr control keycode 47 = Control_v
+ alt keycode 47 = Meta_v
+ shift alt keycode 47 = Meta_V
+ altgr alt keycode 47 = Meta_v
+ control alt keycode 47 = Meta_Control_v
+keycode 48 = +b
+ shift keycode 48 = +B
+ shift altgr keycode 48 = VoidSymbol
+ control keycode 48 = Control_b
+ shift control keycode 48 = Control_b
+ altgr control keycode 48 = Control_b
+ alt keycode 48 = Meta_b
+ shift alt keycode 48 = Meta_B
+ altgr alt keycode 48 = Meta_b
+ control alt keycode 48 = Meta_Control_b
+keycode 49 = +n
+ shift keycode 49 = +N
+ shift altgr keycode 49 = VoidSymbol
+ control keycode 49 = Control_n
+ shift control keycode 49 = Control_n
+ altgr control keycode 49 = Control_n
+ alt keycode 49 = Meta_n
+ shift alt keycode 49 = Meta_N
+ altgr alt keycode 49 = Meta_n
+ control alt keycode 49 = Meta_Control_n
+keycode 50 = +m +M mu
+ control keycode 50 = Control_m
+ shift control keycode 50 = Control_m
+ altgr control keycode 50 = Control_m
+ alt keycode 50 = Meta_m
+ shift alt keycode 50 = Meta_M
+ altgr alt keycode 50 = Meta_m
+ control alt keycode 50 = Meta_Control_m
+keycode 51 = comma semicolon
+ alt keycode 51 = Meta_comma
+ shift alt keycode 51 = Meta_semicolon
+keycode 52 = period colon
+ alt keycode 52 = Meta_period
+ shift alt keycode 52 = Meta_colon
+keycode 53 = minus underscore Meta_minus
+ shift control keycode 53 = Control_underscore
+ alt keycode 53 = Meta_minus
+ shift alt keycode 53 = Meta_underscore
+keycode 54 = Shift
+ shift altgr keycode 54 = VoidSymbol
+ control keycode 54 = Compose
+keycode 56 = Alt
+ shift altgr keycode 56 = VoidSymbol
+keycode 57 = space space Meta_space
+ control keycode 57 = nul
+ alt keycode 57 = Meta_space
+ shift alt keycode 57 = Meta_space
+ control alt keycode 57 = Meta_nul
+keycode 58 = F9
+ shift altgr keycode 58 = VoidSymbol
+keycode 59 = F1 F13 Console_13
+ control keycode 59 = F25
+ alt keycode 59 = Console_1
+ control alt keycode 59 = Console_1
+keycode 60 = F2 F14 Console_14
+ control keycode 60 = F26
+ alt keycode 60 = Console_2
+ control alt keycode 60 = Console_2
+keycode 61 = F3 F15 Console_15
+ control keycode 61 = F27
+ alt keycode 61 = Console_3
+ control alt keycode 61 = Console_3
+keycode 62 = F4 F16 Console_16
+ control keycode 62 = F28
+ alt keycode 62 = Console_4
+ control alt keycode 62 = Console_4
+keycode 63 = F5 F17 Console_17
+ control keycode 63 = F29
+ alt keycode 63 = Console_5
+ control alt keycode 63 = Console_5
+keycode 64 = F6 F18 Console_18
+ control keycode 64 = F30
+ alt keycode 64 = Console_6
+ control alt keycode 64 = Console_6
+keycode 65 = F7 F19 Console_19
+ control keycode 65 = F31
+ alt keycode 65 = Console_7
+ control alt keycode 65 = Console_7
+keycode 66 = F8 F20 Console_20
+ control keycode 66 = F32
+ alt keycode 66 = Console_8
+ control alt keycode 66 = Console_8
+keycode 72 = Up
+ alt keycode 72 = Prior
+ shift alt keycode 72 = Scroll_Backward
+keycode 75 = KP_4
+ altgr keycode 75 = Hex_4
+ shift altgr keycode 75 = VoidSymbol
+ alt keycode 75 = Find
+keycode 77 = KP_6
+ altgr keycode 77 = Hex_6
+ shift altgr keycode 77 = VoidSymbol
+ alt keycode 77 = Select
+keycode 80 = KP_2
+ altgr keycode 80 = Hex_2
+ shift altgr keycode 80 = VoidSymbol
+ alt keycode 80 = Next
+keycode 83 = Remove
+ alt keycode 83 = Insert
+ shift altgr keycode 83 = VoidSymbol
+ altgr control keycode 83 = Boot
+ control alt keycode 83 = Boot
+keycode 91 = Insert
+keycode 112 = F10 F22
+ shift altgr keycode 112 = VoidSymbol
+ altgr control keycode 112 = VoidSymbol
+ shift alt keycode 112 = VoidSymbol
+ altgr alt keycode 112 = VoidSymbol
+keycode 115 = AltGr
+ shift altgr keycode 115 = VoidSymbol
+ altgr control keycode 115 = VoidSymbol
+ shift alt keycode 115 = VoidSymbol
+ altgr alt keycode 115 = VoidSymbol
+keycode 123 = asciicircum degree
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string Macro = "\033[M"
+string Pause = "\033[P"
+compose '`' 'A' to 'À'
+compose '`' 'a' to 'à'
+compose '\'' 'A' to 'Á'
+compose '\'' 'a' to 'á'
+compose '^' 'A' to 'Â'
+compose '^' 'a' to 'â'
+compose '~' 'A' to 'Ã'
+compose '~' 'a' to 'ã'
+compose '"' 'A' to 'Ä'
+compose '"' 'a' to 'ä'
+compose '-' 'a' to 'ª'
+compose '-' 'A' to 'ª'
+compose 'O' 'A' to 'Å'
+compose 'o' 'a' to 'å'
+compose '0' 'A' to 'Å'
+compose '0' 'a' to 'å'
+compose 'A' 'A' to 'Å'
+compose 'a' 'a' to 'å'
+compose '°' 'A' to 'Å'
+compose '°' 'a' to 'å'
+compose 'A' 'E' to 'Æ'
+compose 'a' 'e' to 'æ'
+compose ',' 'C' to 'Ç'
+compose ',' 'c' to 'ç'
+compose '^' 'C' to 'Ç'
+compose '^' 'c' to 'ç'
+compose '`' 'E' to 'È'
+compose '`' 'e' to 'è'
+compose '\'' 'E' to 'É'
+compose '\'' 'e' to 'é'
+compose '^' 'E' to 'Ê'
+compose '^' 'e' to 'ê'
+compose '"' 'E' to 'Ë'
+compose '"' 'e' to 'ë'
+compose '`' 'I' to 'Ì'
+compose '`' 'i' to 'ì'
+compose '\'' 'I' to 'Í'
+compose '\'' 'i' to 'í'
+compose '^' 'I' to 'Î'
+compose '^' 'i' to 'î'
+compose '"' 'I' to 'Ï'
+compose '"' 'i' to 'ï'
+compose '-' 'D' to 'Ð'
+compose '-' 'd' to 'ð'
+compose '^' 'D' to 'Ð'
+compose '^' 'd' to 'ð'
+compose '~' 'N' to 'Ñ'
+compose '~' 'n' to 'ñ'
+compose '^' 'N' to 'Ñ'
+compose '^' 'n' to 'ñ'
+compose '`' 'O' to 'Ò'
+compose '`' 'o' to 'ò'
+compose '\'' 'O' to 'Ó'
+compose '\'' 'o' to 'ó'
+compose '^' 'O' to 'Ô'
+compose '^' 'o' to 'ô'
+compose '~' 'O' to 'Õ'
+compose '~' 'o' to 'õ'
+compose '"' 'O' to 'Ö'
+compose '"' 'o' to 'ö'
+compose '/' 'O' to 'Ø'
+compose '/' 'o' to 'ø'
+compose '-' 'o' to 'º'
+compose '-' 'O' to 'º'
+compose '`' 'U' to 'Ù'
+compose '`' 'u' to 'ù'
+compose '\'' 'U' to 'Ú'
+compose '\'' 'u' to 'ú'
+compose '^' 'U' to 'Û'
+compose '^' 'u' to 'û'
+compose '"' 'U' to 'Ü'
+compose '"' 'u' to 'ü'
+compose '\'' 'Y' to 'Ý'
+compose '\'' 'y' to 'ý'
+compose 'T' 'H' to 'Þ'
+compose 't' 'h' to 'þ'
+compose 's' 's' to 'ß'
+compose '"' 'y' to 'ÿ'
+compose 's' 'z' to 'ß'
+compose 'n' 'n' to 'ñ'
+compose 'n' 'h' to 'ñ'
+compose 'N' 'Y' to 'Ñ'
+compose 'N' 'N' to 'Ñ'
+compose 'N' 'H' to 'Ñ'
+compose 'N' 'y' to 'Ñ'
+compose 'N' 'n' to 'Ñ'
+compose 'N' 'h' to 'Ñ'
+compose '-' 'L' to '£'
+compose '<' '<' to '«'
+compose '>' '>' to '»'
+compose '?' '?' to '¿'
+compose '^' '?' to '¿'
+compose '!' '!' to '¡'
+compose '^' '!' to '¡'
+compose '^' '1' to '¹'
+compose '^' '2' to '²'
+compose '^' '3' to '³'
+compose '+' '-' to '±'
+compose 'c' '=' to '¢'
+compose 'c' '/' to '¢'
+compose '/' 'c' to '¢'
+compose '-' 'c' to '¢'
+compose '-' 'C' to '¢'
+compose '|' 'c' to '¢'
+compose '|' 'C' to '¢'
+compose 'L' '=' to '£'
+compose '-' 'L' to '£'
+compose '-' 'l' to '£'
+compose '^' '*' to '×'
+compose '^' 'x' to '×'
+compose 'x' 'x' to '×'
+compose '^' '.' to '·'
+compose '.' '.' to '·'
+compose '^' '/' to '÷'
+compose '^' ':' to '÷'
+compose '-' ':' to '÷'
+compose ':' '-' to '÷'
+compose 'Y' '=' to '¥'
+compose '=' 'Y' to '¥'
+compose '-' 'Y' to '¥'
+compose '-' 'l' to '¥'
+compose '(' 'c' to '©'
+compose '"' 'c' to '©'
+compose 'O' 'C' to '©'
+compose '(' 'C' to '©'
+compose 'C' ')' to '©'
+compose '-' 'a' to 'ª'
+compose '-' 'A' to 'ª'
+compose '-' 'o' to 'º'
+compose '-' 'O' to 'º'
+compose '(' 'r' to '®'
+compose '"' 'r' to '®'
+compose 'O' 'R' to '®'
+compose '(' 'R' to '®'
+compose 'R' ')' to '®'
+compose 'm' 'u' to 'µ'
+compose 'P' 'P' to '¶'
+compose '1' '4' to '¼'
+compose '1' '2' to '½'
+compose '3' '4' to '¾'
+compose 'e' '=' to '¤'
+compose '-' 'e' to '¤'
+compose '-' 'E' to '¤'
+compose '=' 'E' to '¤'
+compose 'v' 'S' to '¦'
+compose '^' 'S' to '¦'
+compose 'v' 's' to '¨'
+compose '^' 's' to '¨'
+compose 'v' 'Z' to '´'
+compose '^' 'Z' to '´'
+compose 'v' 'z' to '¸'
+compose '^' 'z' to '¸'
+compose 'O' 'E' to '¼'
+compose 'O' 'e' to '¼'
+compose 'o' 'e' to '½'
+compose '"' 'Y' to '¾'
+compose 'i' 'j' to 'ÿ'
+compose 'I' 'J' to '¾'
+compose '|' 's' to '$'
+compose '|' 'S' to '$'
+compose 'S' 'S' to '§'
+compose '=' 'C' to '¤'
+compose 'C' '=' to '¤'
+compose 'o' 'x' to '¤'
+compose 'x' 'o' to '¤'
diff --git a/packages/keymaps/files/jornada6xx/keymap-sp.map b/packages/keymaps/files/jornada6xx/keymap-sp.map
new file mode 100644
index 0000000000..ba05387743
--- /dev/null
+++ b/packages/keymaps/files/jornada6xx/keymap-sp.map
@@ -0,0 +1,222 @@
+# <ES.Keymap> for JLime
+#
+# By Pau Rodriguez-Estivill
+# <20060708>
+
+strings as usual
+
+keycode 1 = Escape
+keycode 2 = one
+ shift keycode 2 = exclam
+ AltGr keycode 2 = 0246
+keycode 3 = two
+ Shift keycode 3 = quotedbl
+ AltGr keycode 3 = 0247
+keycode 4 = three
+ shift keycode 4 = numbersign
+keycode 5 = four
+ shift keycode 5 = dollar
+ AltGr keycode 5 = asciitilde
+keycode 6 = five
+ shift keycode 6 = percent
+keycode 7 = six
+ shift keycode 7 = ampersand
+keycode 8 = seven
+ shift keycode 8 = slash
+keycode 9 = eight
+ shift keycode 9 = parenleft
+keycode 10 = nine
+ shift keycode 10 = parenright
+keycode 11 = zero
+ shift keycode 11 = equal
+keycode 12 = apostrophe
+ shift keycode 12 = question
+ AltGr keycode 12 = backslash
+keycode 13 = 0250
+ shift keycode 13 = 0255
+keycode 14 = Delete
+keycode 15 = Tab
+keycode 16 = +q +Q
+ AltGr keycode 16 = at
+keycode 17 = +w
+ shift keycode 17 = +W
+keycode 18 = +e +E
+ AltGr keycode 18 = currency
+keycode 19 = +r
+ shift keycode 19 = +R
+keycode 20 = +t
+ shift keycode 20 = +T
+keycode 21 = +y
+ shift keycode 21 = +Y
+keycode 22 = +u
+ shift keycode 22 = +U
+keycode 23 = +i
+ shift keycode 23 = +I
+keycode 24 = +o
+ shift keycode 24 = +O
+keycode 25 = +p
+ shift keycode 25 = +P
+keycode 26 = dead_acute
+ shift keycode 26 = dead_diaeresis
+keycode 27 = plus asterisk asciitilde
+keycode 28 = Return
+keycode 29 = Control
+ AltGr keycode 29 = Num_Lock
+keycode 30 = +a
+ shift keycode 30 = +A
+keycode 31 = +s
+ shift keycode 31 = +S
+keycode 32 = +d
+ shift keycode 32 = +D
+keycode 33 = +f
+ shift keycode 33 = +F
+keycode 34 = +g
+ shift keycode 34 = +G
+keycode 35 = +h
+ shift keycode 35 = +H
+keycode 36 = +j
+ shift keycode 36 = +J
+keycode 37 = +k
+ shift keycode 37 = +K
+keycode 38 = +l
+ shift keycode 38 = +L
+keycode 39 = +0244
+ shift keycode 39 = +0245
+keycode 40 = braceleft
+ shift keycode 40 = bracketleft
+ AltGr keycode 40 = dead_circumflex
+keycode 41 = F11
+ alt keycode 41 = Console_11
+ shift keycode 41 = F12
+ shift alt keycode 41 = Console_12
+keycode 42 = Shift
+ AltGr keycode 42 = Caps_Lock
+keycode 43 = braceright
+ shift keycode 43 = bracketright
+ AltGr keycode 43 = dead_grave
+keycode 44 = +z +Z
+ AltGr keycode 44 = less
+keycode 45 = +x +X
+ AltGr keycode 45 = greater
+keycode 46 = +c +C
+ AltGr keycode 46 = 0247
+ shift AltGr keycode 46 = 0246
+keycode 47 = +v
+ shift keycode 47 = +V
+keycode 48 = +b
+ shift keycode 48 = +B
+keycode 49 = +n
+ shift keycode 49 = +N
+keycode 50 = +m +M mu
+keycode 51 = comma
+ shift keycode 51 = semicolon
+keycode 52 = period
+ shift keycode 52 = colon
+keycode 53 = minus underscore Meta_minus
+keycode 54 = Shift
+keycode 56 = Alt
+keycode 57 = space space Meta_space
+keycode 58 = F9
+ alt keycode 58 = Console_9
+keycode 59 = F1
+keycode 60 = F2
+keycode 61 = F3
+ alt keycode 61 = Console_3
+keycode 62 = F4
+ alt keycode 62 = Console_4
+keycode 63 = F5
+ alt keycode 63 = Console_5
+keycode 64 = F6
+ alt keycode 64 = Console_6
+keycode 65 = F7
+ alt keycode 65 = Console_7
+keycode 66 = F8
+ alt keycode 66 = Console_8
+keycode 72 = Up
+ alt keycode 72 = PageUp
+ shift alt keycode 72 = Scroll_Backward
+keycode 75 = Left
+ alt keycode 75 = Home
+keycode 77 = Right
+ alt keycode 77 = End
+keycode 80 = Down
+ alt keycode 80 = PageDown
+ shift alt keycode 80 = Scroll_Forward
+keycode 83 = Remove
+ alt keycode 83 = Insert
+keycode 91 = Insert
+keycode 112 = F10
+ alt keycode 112 = Console_10
+keycode 115 = AltGr
+keycode 123 = bar
+ shift keycode 123 = 0372
+ AltGr keycode 123 = +0252
+! compose for cp 850
+compose '`' 'A' to '·'
+compose '`' 'a' to '…'
+compose '\'' 'A' to 'µ'
+compose '\'' 'a' to ' '
+compose '^' 'A' to '¶'
+compose '^' 'a' to 'ƒ'
+compose '~' 'A' to 'Ç'
+compose '~' 'a' to 'Æ'
+compose '"' 'A' to 'Ž'
+compose '"' 'a' to '„'
+compose 'O' 'A' to ''
+compose 'o' 'a' to '†'
+compose '0' 'A' to ''
+compose '0' 'a' to '†'
+compose 'A' 'A' to ''
+compose 'a' 'a' to '†'
+compose 'A' 'E' to '’'
+compose 'a' 'e' to '‘'
+compose ',' 'C' to '€'
+compose ',' 'c' to '‡'
+compose '`' 'E' to 'Ô'
+compose '`' 'e' to 'Š'
+compose '\'' 'E' to ''
+compose '\'' 'e' to '‚'
+compose '^' 'E' to 'Ò'
+compose '^' 'e' to 'ˆ'
+compose '"' 'E' to 'Ó'
+compose '"' 'e' to '‰'
+compose '`' 'I' to 'Þ'
+compose '`' 'i' to ''
+compose '\'' 'I' to 'Ö'
+compose '\'' 'i' to '¡'
+compose '^' 'I' to '×'
+compose '^' 'i' to 'Œ'
+compose '"' 'I' to 'Ø'
+compose '"' 'i' to '‹'
+compose '-' 'D' to 'Ñ'
+compose '-' 'd' to 'Ð'
+compose '~' 'N' to '¥'
+compose '~' 'n' to '¤'
+compose '`' 'O' to 'ã'
+compose '`' 'o' to '•'
+compose '\'' 'O' to 'à'
+compose '\'' 'o' to '¢'
+compose '^' 'O' to 'â'
+compose '^' 'o' to '“'
+compose '~' 'O' to 'å'
+compose '~' 'o' to 'ä'
+compose '"' 'O' to '™'
+compose '"' 'o' to '”'
+compose '/' 'O' to ''
+compose '/' 'o' to '›'
+compose '`' 'U' to 'ë'
+compose '`' 'u' to '—'
+compose '\'' 'U' to 'é'
+compose '\'' 'u' to '£'
+compose '^' 'U' to 'ê'
+compose '^' 'u' to '–'
+compose '"' 'U' to 'š'
+compose '"' 'u' to ''
+compose '\'' 'Y' to 'í'
+compose '\'' 'y' to 'ì'
+compose 'T' 'H' to 'è'
+compose 't' 'h' to 'ç'
+compose 's' 's' to 'á'
+compose '"' 'y' to '˜'
+compose 's' 'z' to 'á'
+compose 'i' 'j' to '˜'
diff --git a/packages/keymaps/files/jornada6xx/keymap-uk.map b/packages/keymaps/files/jornada6xx/keymap-uk.map
new file mode 100644
index 0000000000..4f511c8847
--- /dev/null
+++ b/packages/keymaps/files/jornada6xx/keymap-uk.map
@@ -0,0 +1,278 @@
+# English keymap for Jornada 6xx devices.
+#
+# Created by Tibor Zenis ( zenis <at> fmph.uniba.sk )
+# (Lightly) Modified by Alex Palestras ( B_Linuz <at> yahoo.com )
+# plain, shift, altgr, ctrl, shift + ctrl, alt, ctrl + alt
+
+keymaps 0-2,4-5,8,12
+keycode 1 = Escape Escape
+ alt keycode 1 = Meta_Escape
+keycode 2 = one exclam asciitilde
+ alt keycode 2 = Meta_one
+keycode 3 = two at grave
+ alt keycode 3 = Meta_two
+keycode 4 = three numbersign
+ alt keycode 4 = Meta_three
+ altgr keycode 4 = pound
+keycode 5 = four dollar
+ control keycode 5 = Control_backslash
+ alt keycode 5 = Meta_four
+ altgr keycode 5 = currency
+keycode 6 = five percent
+ control keycode 6 = Control_bracketright
+ alt keycode 6 = Meta_five
+keycode 7 = six asciicircum
+ control keycode 7 = Control_asciicircum
+ alt keycode 7 = Meta_six
+keycode 8 = seven ampersand braceleft
+ control keycode 8 = Control_underscore
+ alt keycode 8 = KP_7
+keycode 9 = eight asterisk bracketleft
+ control keycode 9 = Delete
+ alt keycode 9 = KP_8
+keycode 10 = nine parenleft bracketright
+ alt keycode 10 = KP_9
+keycode 11 = zero parenright braceright
+ alt keycode 11 = KP_Divide
+keycode 12 = minus underscore backslash
+ control keycode 11 = Control_underscore
+ shift control keycode 11 = Control_underscore
+ alt keycode 11 = Meta_minus
+keycode 13 = equal plus
+ alt keycode 13 = Meta_equal
+keycode 14 = Delete Delete
+ control keycode 14 = BackSpace
+ alt keycode 14 = Meta_Delete
+keycode 15 = Tab Tab
+ alt keycode 15 = Meta_Tab
+keycode 16 = q
+keycode 17 = w
+keycode 18 = e
+ Shift keycode 18 = E
+keycode 19 = r
+keycode 20 = t
+keycode 21 = y
+ alt keycode 21 = KP_4
+keycode 22 = u
+ alt keycode 22 = KP_5
+keycode 23 = i
+ alt keycode 23 = KP_6
+keycode 24 = o
+ alt keycode 24 = KP_Multiply
+keycode 25 = p
+ AltGr keycode 25 = braceleft
+keycode 26 = backslash bar
+ AltGr keycode 26 = braceright
+keycode 28 = Return
+ alt keycode 28 = Meta_Control_m
+keycode 29 = Control
+ altgr keycode 29 = Num_Lock
+keycode 30 = a
+keycode 31 = s
+keycode 32 = d
+keycode 33 = f
+keycode 34 = g
+keycode 35 = h
+ alt keycode 35 = KP_1
+keycode 36 = j
+ alt keycode 36 = KP_2
+keycode 37 = k
+ alt keycode 37 = KP_3
+keycode 38 = l
+ alt keycode 38 = KP_Subtract
+keycode 39 = semicolon colon bracketleft
+ alt keycode 39 = Meta_semicolon
+keycode 40 = apostrophe quotedbl bracketright
+ control keycode 40 = Control_g
+ alt keycode 40 = Meta_apostrophe
+keycode 41 = F11
+ shift keycode 41 = F21
+ altgr keycode 41 = Console_23
+ alt keycode 41 = Console_11
+ control alt keycode 41 = Console_11
+keycode 42 = Shift
+ altgr keycode 42 = Caps_Lock
+keycode 44 = z
+keycode 45 = x
+keycode 46 = c
+keycode 47 = v
+keycode 48 = b
+keycode 49 = n
+ alt keycode 49 = KP_0
+keycode 50 = m
+ alt keycode 50 = KP_Comma
+keycode 51 = comma less
+ alt keycode 51 = KP_Period
+keycode 52 = period greater
+ control keycode 52 = Compose
+ alt keycode 52 = KP_Add
+keycode 54 = Shift
+keycode 56 = Alt
+keycode 57 = space space
+ alt keycode 57 = Meta_space
+keycode 58 = F9
+ shift keycode 58 = F19
+ altgr keycode 58 = Console_21
+ alt keycode 58 = Console_9
+ control alt keycode 58 = Console_9
+keycode 59 = F1
+ altgr keycode 59 = Console_13
+ alt keycode 59 = Console_1
+ control alt keycode 59 = Console_1
+keycode 60 = F2
+ shift keycode 60 = F12
+ altgr keycode 60 = Console_14
+ alt keycode 60 = Console_2
+ control alt keycode 60 = Console_2
+keycode 61 = F3
+ shift keycode 61 = F13
+ altgr keycode 61 = Console_15
+ alt keycode 61 = Console_3
+ control alt keycode 61 = Console_3
+keycode 62 = F4
+ shift keycode 62 = F14
+ altgr keycode 62 = Console_16
+ alt keycode 62 = Console_4
+ control alt keycode 62 = Console_4
+keycode 63 = F5
+ shift keycode 63 = F15
+ altgr keycode 63 = Console_17
+ alt keycode 63 = Console_5
+ control alt keycode 63 = Console_5
+keycode 64 = F6
+ shift keycode 64 = F16
+ altgr keycode 64 = Console_18
+ alt keycode 64 = Console_6
+ control alt keycode 64 = Console_6
+keycode 65 = F7
+ shift keycode 65 = F17
+ altgr keycode 65 = Console_19
+ alt keycode 65 = Console_7
+ control alt keycode 65 = Console_7
+keycode 66 = F8
+ shift keycode 66 = F18
+ altgr keycode 66 = Console_20
+ alt keycode 66 = Console_8
+ control alt keycode 66 = Console_8
+keycode 72 = Up
+ shift keycode 72 = Scroll_Backward
+ altgr keycode 72 = Scroll_Backward
+ alt keycode 72 = Prior
+keycode 75 = Left
+ altgr keycode 75 = Decr_Console
+ alt keycode 75 = Find
+keycode 77 = Right
+ altgr keycode 77 = Incr_Console
+ alt keycode 77 = Select
+keycode 80 = Down
+ shift keycode 80 = Scroll_Forward
+ altgr keycode 80 = Scroll_Forward
+ alt keycode 80 = Next
+keycode 83 = Remove Remove Meta_Delete
+ alt keycode 83 = Meta_Delete
+keycode 112 = F10
+ shift keycode 112 = F20
+ altgr keycode 112 = Console_22
+ alt keycode 112 = Console_10
+ control alt keycode 112 = Console_10
+keycode 115 = slash question
+ control keycode 115 = Delete
+ alt keycode 115 = Meta_slash
+keycode 123 = AltGr
+keycode 219 = Insert
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string Macro = "\033[M"
+string Pause = "\033[P"
+compose '`' 'A' to 'À'
+compose '`' 'a' to 'à'
+compose '\'' 'A' to 'Á'
+compose '\'' 'a' to 'á'
+compose '^' 'A' to 'Â'
+compose '^' 'a' to 'â'
+compose '~' 'A' to 'Ã'
+compose '~' 'a' to 'ã'
+compose '"' 'A' to 'Ä'
+compose '"' 'a' to 'ä'
+compose 'O' 'A' to 'Å'
+compose 'o' 'a' to 'å'
+compose '0' 'A' to 'Å'
+compose '0' 'a' to 'å'
+compose 'A' 'A' to 'Å'
+compose 'a' 'a' to 'å'
+compose 'A' 'E' to 'Æ'
+compose 'a' 'e' to 'æ'
+compose ',' 'C' to 'Ç'
+compose ',' 'c' to 'ç'
+compose '`' 'E' to 'È'
+compose '`' 'e' to 'è'
+compose '\'' 'E' to 'É'
+compose '\'' 'e' to 'é'
+compose '^' 'E' to 'Ê'
+compose '^' 'e' to 'ê'
+compose '"' 'E' to 'Ë'
+compose '"' 'e' to 'ë'
+compose '`' 'I' to 'Ì'
+compose '`' 'i' to 'ì'
+compose '\'' 'I' to 'Í'
+compose '\'' 'i' to 'í'
+compose '^' 'I' to 'Î'
+compose '^' 'i' to 'î'
+compose '"' 'I' to 'Ï'
+compose '"' 'i' to 'ï'
+compose '-' 'D' to 'Ð'
+compose '-' 'd' to 'ð'
+compose '~' 'N' to 'Ñ'
+compose '~' 'n' to 'ñ'
+compose '`' 'O' to 'Ò'
+compose '`' 'o' to 'ò'
+compose '\'' 'O' to 'Ó'
+compose '\'' 'o' to 'ó'
+compose '^' 'O' to 'Ô'
+compose '^' 'o' to 'ô'
+compose '~' 'O' to 'Õ'
+compose '~' 'o' to 'õ'
+compose '"' 'O' to 'Ö'
+compose '"' 'o' to 'ö'
+compose '/' 'O' to 'Ø'
+compose '/' 'o' to 'ø'
+compose '`' 'U' to 'Ù'
+compose '`' 'u' to 'ù'
+compose '\'' 'U' to 'Ú'
+compose '\'' 'u' to 'ú'
+compose '^' 'U' to 'Û'
+compose '^' 'u' to 'û'
+compose '"' 'U' to 'Ü'
+compose '"' 'u' to 'ü'
+compose '\'' 'Y' to 'Ý'
+compose '\'' 'y' to 'ý'
+compose 'T' 'H' to 'Þ'
+compose 't' 'h' to 'þ'
+compose 's' 's' to 'ß'
+compose '"' 'y' to 'ÿ'
+compose 's' 'z' to 'ß'
+compose 'i' 'j' to 'ÿ'
diff --git a/packages/xlibs/libxdamage-1.0.1/.mtn2git_empty b/packages/libcdaudio/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxdamage-1.0.1/.mtn2git_empty
+++ b/packages/libcdaudio/.mtn2git_empty
diff --git a/packages/libcdaudio/libcdaudio_0.99.12p2.bb b/packages/libcdaudio/libcdaudio_0.99.12p2.bb
new file mode 100644
index 0000000000..3e15ee8dcc
--- /dev/null
+++ b/packages/libcdaudio/libcdaudio_0.99.12p2.bb
@@ -0,0 +1,16 @@
+# libcdaudio .bb build file
+# Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see /COPYING)
+
+HOMEPAGE = "http://libcdaudio.sourceforge.net/"
+DESCRIPTION = "Portable library for controlling audio CDs"
+MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/libgpewidget/libgpewidget-0.102/cairo.patch b/packages/libgpewidget/libgpewidget-0.102/cairo.patch
deleted file mode 100644
index 64b0dd3a3f..0000000000
--- a/packages/libgpewidget/libgpewidget-0.102/cairo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- /tmp/gpeclockface.c 2005-08-07 22:30:20.000000000 +0200
-+++ libgpewidget-0.102/gpeclockface.c 2005-08-08 10:10:09.180756032 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2003 Philip Blundell <philb@gnu.org>
-+ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
-@@ -11,6 +11,7 @@
-
- #include <sys/types.h>
- #include <stdio.h>
-+#include <string.h>
- #include <stdlib.h>
- #include <math.h>
- #include <string.h>
-@@ -267,7 +268,7 @@
- 0,
- 2 * M_PI);
- cairo_fill (clock->cr);
-- cairo_set_rgb_color (clock->cr, 0, 0, 0);
-+ cairo_set_source_rgba (clock->cr, 0, 0, 0, 1.0);
- cairo_arc (clock->cr,
- clock->x_offset + clock->radius,
- clock->y_offset + clock->radius,
-@@ -493,11 +494,10 @@
- gcm = gdk_drawable_get_colormap (widget->window);
-
- #ifdef HAVE_CAIRO
-- clock->cr = cairo_create ();
- clock->surface = cairo_xlib_surface_create (dpy, GDK_WINDOW_XWINDOW (clock->backing_pixmap),
- gdk_x11_visual_get_xvisual (gv), 0,
- gdk_x11_colormap_get_xcolormap (gcm));
-- cairo_set_target_surface (clock->cr, clock->surface);
-+ clock->cr = cairo_create (clock->surface);
- #else
- clock->backing_poly_gc = gdk_gc_new (clock->backing_pixmap);
- #endif
diff --git a/packages/libgpewidget/libgpewidget_0.102.bb b/packages/libgpewidget/libgpewidget_0.102.bb
deleted file mode 100644
index 58e8c71c18..0000000000
--- a/packages/libgpewidget/libgpewidget_0.102.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "LGPL"
-PR = "r3"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender gtk-doc"
-
-GPE_TARBALL_SUFFIX = "bz2"
-inherit gpe pkgconfig autotools
-
-SRC_URI += "file://cairo.patch;patch=1;pnum=1"
-
-EXTRA_OECONF = "--enable-cairo"
-
-do_stage () {
- oe_libinstall -C .libs -so libgpewidget ${STAGING_LIBDIR}
- autotools_stage_includes
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.103.bb b/packages/libgpewidget/libgpewidget_0.103.bb
deleted file mode 100644
index b174398670..0000000000
--- a/packages/libgpewidget/libgpewidget_0.103.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-LICENSE = "LGPL"
-PR = "r3"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender gtk-doc"
-
-GPE_TARBALL_SUFFIX = "bz2"
-inherit gpe pkgconfig autotools
-
-EXTRA_OECONF = "--enable-cairo"
-
-do_stage () {
- oe_libinstall -C .libs -so libgpewidget ${STAGING_LIBDIR}
- autotools_stage_includes
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.105.bb b/packages/libgpewidget/libgpewidget_0.105.bb
deleted file mode 100644
index 884c55c9d3..0000000000
--- a/packages/libgpewidget/libgpewidget_0.105.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender gtk-doc"
-PR = "r1"
-
-GPE_TARBALL_SUFFIX = "bz2"
-inherit gpe pkgconfig autotools
-
-EXTRA_OECONF = "--enable-cairo"
-
-do_stage () {
- autotools_stage_all
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.107.bb b/packages/libgpewidget/libgpewidget_0.107.bb
deleted file mode 100644
index 6ebab6db35..0000000000
--- a/packages/libgpewidget/libgpewidget_0.107.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS = "gtk+ cairo libxrender gtk-doc"
-PR = "r1"
-
-GPE_TARBALL_SUFFIX = "bz2"
-inherit gpe pkgconfig autotools
-
-PACKAGES =+ "libgpewidget-bin"
-FILES_libgpewidget-bin = "${bindir}"
-
-EXTRA_OECONF = "--enable-cairo"
-
-do_stage () {
- autotools_stage_all
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.109.bb b/packages/libgpewidget/libgpewidget_0.109.bb
deleted file mode 100644
index f1078860d7..0000000000
--- a/packages/libgpewidget/libgpewidget_0.109.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-DEPENDS = "gtk+ cairo libxrender gtk-doc"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-PR = "r2"
-
-GPE_TARBALL_SUFFIX = "bz2"
-inherit gpe pkgconfig autotools
-
-SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
-
-PACKAGES =+ "libgpewidget-bin"
-FILES_libgpewidget-bin = "${bindir}"
-
-EXTRA_OECONF = "--enable-cairo"
-
-PARALLEL_MAKE = ""
-
-LDFLAGS += " -L${STAGING_LIBDIR}"
-
-do_stage () {
- autotools_stage_all
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.113.bb b/packages/libgpewidget/libgpewidget_0.113.bb
new file mode 100644
index 0000000000..21ab29bff6
--- /dev/null
+++ b/packages/libgpewidget/libgpewidget_0.113.bb
@@ -0,0 +1,23 @@
+LICENSE = "LGPL"
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "gtk+ cairo libxrender gtk-doc"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+PR = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe pkgconfig autotools
+
+SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
+
+PACKAGES =+ "libgpewidget-bin"
+FILES_libgpewidget-bin = "${bindir}"
+
+EXTRA_OECONF = "--enable-cairo"
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb
index bded954bb3..16e95ac3d6 100644
--- a/packages/libidl/libidl_0.8.6.bb
+++ b/packages/libidl/libidl_0.8.6.bb
@@ -14,9 +14,8 @@ inherit autotools pkgconfig
do_stage() {
autotools_stage_all
-
- cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig
- cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
+
+ cat ${S}/libIDL-config-2 | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
}
FILES_${PN} = "${libdir}/*.so.*"
diff --git a/packages/libnss-mdns/libnss-mdns_0.8.bb b/packages/libnss-mdns/libnss-mdns_0.8.bb
new file mode 100644
index 0000000000..997daf43b0
--- /dev/null
+++ b/packages/libnss-mdns/libnss-mdns_0.8.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "NSS module for Multicast DNS name resolution"
+HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/"
+LICENSE = "GPL"
+SECTION = "libs"
+PRIORITY = "optional"
+
+RRECOMMENDS_${PN} = "avahi-daemon zeroconf"
+PR = "r0"
+
+EXTRA_OECONF = "--libdir=/lib"
+S = "${WORKDIR}/nss-mdns-${PV}"
+
+SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz"
+
+inherit autotools
+
+pkg_postinst () {
+ cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && {
+ cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)dns/\1mdns4_minimal [NOTFOUND=return] dns mdns4/' > /tmp/nsswitch.conf
+ mv /tmp/nsswitch.conf /etc/nsswitch.conf
+ }
+}
+
+pkg_prerm () {
+ cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && {
+ cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)mdns4_minimal [NOTFOUND=return] dns mdns4/\1dns/' > /tmp/nsswitch.conf
+ mv /tmp/nsswitch.conf /etc/nsswitch.conf
+ }
+}
diff --git a/packages/libsexy/libsexy_0.1.8.bb b/packages/libsexy/libsexy_0.1.8.bb
new file mode 100644
index 0000000000..4e55160042
--- /dev/null
+++ b/packages/libsexy/libsexy_0.1.8.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
+HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
+AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
+MAINTAINER = "Koen Kooi <koen@handhelds.org>""
+PR = "r0"
+
+DEPENDS = "gtk+ enchant libxml2"
+
+SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+autotools_stage_all
+}
+
+
diff --git a/packages/libxml/libxml2-native_2.6.10.bb b/packages/libxml/libxml2-native_2.6.10.bb
new file mode 100644
index 0000000000..1a387c4d81
--- /dev/null
+++ b/packages/libxml/libxml2-native_2.6.10.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "GNOME XML library"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+
+SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
+S = "${WORKDIR}/libxml2-${PV}"
+
+inherit autotools native pkgconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n"
+
+headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h"
+
+do_stage () {
+ oe_runmake install
+}
diff --git a/packages/libxml/libxml2-native_2.6.9.bb b/packages/libxml/libxml2-native_2.6.9.bb
new file mode 100644
index 0000000000..1a387c4d81
--- /dev/null
+++ b/packages/libxml/libxml2-native_2.6.9.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "GNOME XML library"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+
+SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
+S = "${WORKDIR}/libxml2-${PV}"
+
+inherit autotools native pkgconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n"
+
+headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h"
+
+do_stage () {
+ oe_runmake install
+}
diff --git a/packages/libxsettings-client/libxsettings-client_0.17.bb b/packages/libxsettings-client/libxsettings-client_0.17.bb
index 6b8c75c717..ed1503d5d2 100644
--- a/packages/libxsettings-client/libxsettings-client_0.17.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.17.bb
@@ -1,7 +1,7 @@
SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
-DEPENDS = "libxsettings libx11 libxt"
+DEPENDS = "libxsettings libx11 libxt gtk-doc"
# libxt is required to stop configure breaking builds by
# including system paths to find it if it isn't present.
MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh40/defconfig-h5xxx b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh40/defconfig-h5xxx
new file mode 100644
index 0000000000..4d012c89e0
--- /dev/null
+++ b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh40/defconfig-h5xxx
@@ -0,0 +1,1627 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_ARM=y
+# CONFIG_EISA is not set
+# CONFIG_SBUS is not set
+# CONFIG_MCA is not set
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_GENERIC_BUST_SPINLOCK is not set
+# CONFIG_GENERIC_ISA_DMA is not set
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+# CONFIG_OBSOLETE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_ANAKIN is not set
+# CONFIG_ARCH_ARCA5K is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+CONFIG_ARCH_PXA=y
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_CAMELOT is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_OMAHA is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_MX1ADS is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_RISCSTATION is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_AT91RM9200DK is not set
+# CONFIG_MINIMAL_OOPS is not set
+
+#
+# Linux As Bootldr support
+#
+# CONFIG_LAB is not set
+# CONFIG_BIG_KERNEL is not set
+# CONFIG_USE_DATE_CODE is not set
+
+#
+# Archimedes/A5000 Implementations
+#
+
+#
+# Archimedes/A5000 Implementations (select only ONE)
+#
+# CONFIG_ARCH_ARC is not set
+# CONFIG_ARCH_A5K is not set
+
+#
+# Footbridge Implementations
+#
+# CONFIG_ARCH_CATS is not set
+# CONFIG_ARCH_PERSONAL_SERVER is not set
+# CONFIG_ARCH_EBSA285_ADDIN is not set
+# CONFIG_ARCH_EBSA285_HOST is not set
+# CONFIG_ARCH_NETWINDER is not set
+
+#
+# SA11x0 Implementations
+#
+# CONFIG_SA1100_ACCELENT is not set
+# CONFIG_SA1100_ASSABET is not set
+# CONFIG_ASSABET_NEPONSET is not set
+# CONFIG_SA1100_ADSBITSY is not set
+# CONFIG_SA1100_BRUTUS is not set
+# CONFIG_SA1100_CEP is not set
+# CONFIG_SA1100_CERF is not set
+# CONFIG_SA1100_H3100 is not set
+# CONFIG_SA1100_H3600 is not set
+# CONFIG_SA1100_H3800 is not set
+# CONFIG_SA1100_CONSUS is not set
+# CONFIG_SA1100_EXTENEX1 is not set
+# CONFIG_SA1100_FLEXANET is not set
+# CONFIG_SA1100_FREEBIRD is not set
+# CONFIG_SA1100_FRODO is not set
+# CONFIG_SA1100_GRAPHICSCLIENT is not set
+# CONFIG_SA1100_GRAPHICSMASTER is not set
+# CONFIG_SA1100_HACKKIT is not set
+# CONFIG_SA1100_BADGE4 is not set
+# CONFIG_SA1100_JORNADA720 is not set
+# CONFIG_SA1100_JORNADA56X is not set
+# CONFIG_SA1100_HUW_WEBPANEL is not set
+# CONFIG_SA1100_ITSY is not set
+# CONFIG_SA1100_LART is not set
+# CONFIG_SA1100_NANOENGINE is not set
+# CONFIG_SA1100_OMNIMETER is not set
+# CONFIG_SA1100_PANGOLIN is not set
+# CONFIG_SA1100_PLEB is not set
+# CONFIG_SA1100_PT_SYSTEM3 is not set
+# CONFIG_SA1100_SHANNON is not set
+# CONFIG_SA1100_SHERMAN is not set
+# CONFIG_SA1100_SIMPAD is not set
+# CONFIG_SA1100_SIMPUTER is not set
+# CONFIG_SA1100_PFS168 is not set
+# CONFIG_SA1100_VICTOR is not set
+# CONFIG_SA1100_XP860 is not set
+# CONFIG_SA1100_YOPY is not set
+# CONFIG_SA1100_USB is not set
+# CONFIG_SA1100_USB_NETLINK is not set
+# CONFIG_SA1100_USB_CHAR is not set
+# CONFIG_REGISTERS is not set
+
+#
+# Intel PXA250/210 Implementations
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_ARCH_PXA_CERF is not set
+CONFIG_ARCH_H3900=y
+CONFIG_ARCH_H1900=y
+CONFIG_ARCH_H5400=y
+# CONFIG_ARCH_H2200 is not set
+CONFIG_ARCH_AXIM=y
+CONFIG_PXA_USB=m
+CONFIG_PXA_USB_NETLINK=m
+CONFIG_PXA_USB_CHAR=m
+
+#
+# CLPS711X/EP721X Implementations
+#
+# CONFIG_ARCH_AUTCPU12 is not set
+# CONFIG_ARCH_CDB89712 is not set
+# CONFIG_ARCH_CLEP7312 is not set
+# CONFIG_ARCH_EDB7211 is not set
+# CONFIG_ARCH_P720T is not set
+# CONFIG_ARCH_FORTUNET is not set
+# CONFIG_ARCH_EP7211 is not set
+# CONFIG_ARCH_EP7212 is not set
+# CONFIG_ARCH_ACORN is not set
+# CONFIG_FOOTBRIDGE is not set
+# CONFIG_FOOTBRIDGE_HOST is not set
+# CONFIG_FOOTBRIDGE_ADDIN is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+# CONFIG_CPU_26 is not set
+# CONFIG_CPU_ARM610 is not set
+# CONFIG_CPU_ARM710 is not set
+# CONFIG_CPU_ARM720T is not set
+# CONFIG_CPU_ARM920T is not set
+# CONFIG_CPU_ARM922T is not set
+# CONFIG_PLD is not set
+# CONFIG_CPU_ARM926T is not set
+# CONFIG_CPU_ARM1020 is not set
+# CONFIG_CPU_ARM1026 is not set
+# CONFIG_CPU_SA110 is not set
+# CONFIG_CPU_SA1100 is not set
+CONFIG_CPU_32v5=y
+CONFIG_CPU_XSCALE=y
+CONFIG_XSCALE_PXA250=y
+# CONFIG_XSCALE_80200_OLD is not set
+# CONFIG_CPU_32v3 is not set
+# CONFIG_CPU_32v4 is not set
+# CONFIG_SA1100_IPAQ is not set
+CONFIG_PXA_IPAQ=y
+CONFIG_IPAQ_HANDHELD=y
+
+#
+# Compaq iPAQ Handheld
+#
+CONFIG_IPAQ_HAL=m
+# CONFIG_H3600_MICRO is not set
+CONFIG_IPAQ_HAS_ROSELLA=y
+CONFIG_IPAQ_HAS_ASIC3=y
+CONFIG_H3600_ASIC=m
+CONFIG_H3900_ASIC_DEBUG=m
+CONFIG_H5400_ASIC=m
+CONFIG_H1900_ASIC=m
+CONFIG_H1900_TS=m
+CONFIG_H3600_HARDWARE=y
+CONFIG_IPAQ_SLEEVE=m
+CONFIG_SLEEVE_DEBUG=y
+CONFIG_SLEEVE_DEBUG_VERBOSE=0
+# CONFIG_SLEEVE_IRQ_DEMUX is not set
+
+#
+# Dell Axim X5
+#
+CONFIG_AXIM_HAL=m
+
+#
+# Processor Features
+#
+# CONFIG_DISCONTIGMEM is not set
+
+#
+# General setup
+#
+# CONFIG_PCI is not set
+# CONFIG_ISA is not set
+# CONFIG_ISA_DMA is not set
+# CONFIG_ZBOOT_ROM is not set
+CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZBOOT_ROM_BSS=0
+CONFIG_CPU_FREQ=y
+CONFIG_HOTPLUG=y
+
+#
+# PCMCIA/CardBus support
+#
+CONFIG_PCMCIA=m
+# CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
+# CONFIG_TCIC is not set
+# CONFIG_PCMCIA_CLPS6700 is not set
+# CONFIG_PCMCIA_SA1100 is not set
+CONFIG_PCMCIA_PXA=m
+# CONFIG_MERCURY_BACKPAQ is not set
+
+#
+# MMC/SD Card support
+#
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SAMSUNG_ASIC=m
+# CONFIG_MMC_S3C2410 is not set
+CONFIG_MMC_H5400=m
+CONFIG_MMC_ASIC3=m
+CONFIG_NET=y
+CONFIG_SYSVIPC=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_XIP_KERNEL is not set
+
+#
+# At least one math emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_FASTFPE is not set
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_PM=y
+CONFIG_APM=m
+# CONFIG_HWTIMER is not set
+# CONFIG_ARTHUR is not set
+CONFIG_CMDLINE="keepinitrd"
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+# CONFIG_PARPORT_SERIAL is not set
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_ARC is not set
+# CONFIG_PARPORT_IDP is not set
+# CONFIG_PARPORT_AMIGA is not set
+# CONFIG_PARPORT_MFC3 is not set
+# CONFIG_PARPORT_ATARI is not set
+# CONFIG_PARPORT_GSC is not set
+# CONFIG_PARPORT_SUNBPP is not set
+# CONFIG_PARPORT_OTHER is not set
+# CONFIG_PARPORT_1284 is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+CONFIG_MTD_DEBUG=y
+CONFIG_MTD_DEBUG_VERBOSE=1
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+# CONFIG_MTD_AMDSTD is not set
+# CONFIG_MTD_SHARP is not set
+# CONFIG_MTD_JEDEC is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_IPAQ=y
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_CDB89712 is not set
+# CONFIG_MTD_SA1100 is not set
+# CONFIG_MTD_DC21285 is not set
+# CONFIG_MTD_IQ80310 is not set
+# CONFIG_MTD_LUBBOCK is not set
+# CONFIG_MTD_IXP425 is not set
+# CONFIG_MTD_EPXA10DB is not set
+# CONFIG_MTD_FORTUNET is not set
+# CONFIG_MTD_AUTCPU12 is not set
+# CONFIG_MTD_EDB7312 is not set
+# CONFIG_MTD_H720X is not set
+# CONFIG_MTD_IMPA7 is not set
+# CONFIG_MTD_CEIVA is not set
+# CONFIG_MTD_NOR_TOTO is not set
+# CONFIG_MTD_PCI is not set
+# CONFIG_MTD_PCMCIA is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+CONFIG_MTD_BLKMTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_DOCPROBE is not set
+# CONFIG_MTD_DOCECC is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_SPIA is not set
+# CONFIG_MTD_NAND_TOTO is not set
+# CONFIG_MTD_NAND_AUTCPU12 is not set
+# CONFIG_MTD_NAND_EDB7312 is not set
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+
+#
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_CISS_SCSI_TAPE is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_NVRD=m
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+# CONFIG_BLK_DEV_MD is not set
+# CONFIG_MD_LINEAR is not set
+# CONFIG_MD_RAID0 is not set
+# CONFIG_MD_RAID1 is not set
+# CONFIG_MD_RAID5 is not set
+# CONFIG_MD_MULTIPATH is not set
+CONFIG_BLK_DEV_LVM=m
+CONFIG_BLK_DEV_DM=m
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+# CONFIG_NETLINK_DEV is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_FILTER=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_INET_ECN is not set
+# CONFIG_SYN_COOKIES is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+CONFIG_IP_NF_FTP=m
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_TFTP is not set
+CONFIG_IP_NF_IRC=m
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_MAC=m
+# CONFIG_IP_NF_MATCH_PKTTYPE is not set
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+# CONFIG_IP_NF_MATCH_RECENT is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_DSCP is not set
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+# CONFIG_IP_NF_MATCH_HELPER is not set
+CONFIG_IP_NF_MATCH_STATE=m
+# CONFIG_IP_NF_MATCH_CONNTRACK is not set
+# CONFIG_IP_NF_MATCH_UNCLEAN is not set
+# CONFIG_IP_NF_MATCH_OWNER is not set
+CONFIG_IP_NF_FILTER=m
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_MIRROR is not set
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+# CONFIG_IP_NF_NAT_LOCAL is not set
+# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_DSCP is not set
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+# CONFIG_IP_NF_ARPTABLES is not set
+CONFIG_IP_NF_COMPAT_IPCHAINS=m
+CONFIG_IP_NF_NAT_NEEDED=y
+# CONFIG_IP_NF_COMPAT_IPFWADM is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MOBILITY=m
+CONFIG_IPV6_MOBILITY_MN=m
+# CONFIG_IPV6_MOBILITY_HA is not set
+CONFIG_IPV6_MOBILITY_DEBUG=y
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_LIMIT=m
+CONFIG_IP6_NF_MATCH_MAC=m
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+CONFIG_IP6_NF_MATCH_MULTIPORT=m
+# CONFIG_IP6_NF_MATCH_OWNER is not set
+CONFIG_IP6_NF_MATCH_MARK=m
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_MATCH_AHESP is not set
+# CONFIG_IP6_NF_MATCH_LENGTH is not set
+# CONFIG_IP6_NF_MATCH_EUI64 is not set
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_TARGET_MARK=m
+# CONFIG_KHTTPD is not set
+# CONFIG_ATM is not set
+# CONFIG_VLAN_8021Q is not set
+
+#
+#
+#
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+
+#
+# Appletalk devices
+#
+# CONFIG_DEV_APPLETALK is not set
+# CONFIG_DECNET is not set
+CONFIG_BRIDGE=m
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_LLC is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+CONFIG_IPSEC=m
+
+#
+# IPSec options (FreeS/WAN)
+#
+CONFIG_KLIPS_AUTH_HMAC_MD5=y
+CONFIG_KLIPS_AUTH_HMAC_SHA1=y
+CONFIG_KLIPS_ENC_3DES=y
+
+#
+# ESP always enabled with tunnel mode
+#
+CONFIG_KLIPS_IPCOMP=y
+CONFIG_KLIPS_DEBUG=y
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+# CONFIG_ETHERTAP is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_MYRI_SBUS is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+# CONFIG_PPPOE is not set
+# CONFIG_SLIP is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+# CONFIG_STRIP is not set
+# CONFIG_WAVELAN is not set
+# CONFIG_ARLAN is not set
+# CONFIG_AIRONET4500 is not set
+# CONFIG_AIRONET4500_NONCS is not set
+# CONFIG_AIRONET4500_PROC is not set
+# CONFIG_HERMES is not set
+# CONFIG_SPECTRUM24T is not set
+
+#
+# Wireless Pcmcia cards support
+#
+# CONFIG_PCMCIA_HERMES is not set
+CONFIG_AIRO_CS=m
+# CONFIG_WVLAN_CS is not set
+# CONFIG_MWVLAN_CS is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_HOSTAP_CS is not set
+CONFIG_NET_WIRELESS=y
+# CONFIG_ATMELWLAN is not set
+# CONFIG_ATMELWLAN_USB_503A_RFMD is not set
+# CONFIG_ATMELWLAN_PCMCIA_502A is not set
+# CONFIG_ATMELWLAN_PCMCIA_3COM is not set
+# CONFIG_ATMELWLAN_PCMCIA_502AD is not set
+# CONFIG_ATMELWLAN_PCMCIA_502AE is not set
+# CONFIG_ATMELWLAN_PCMCIA_504 is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+# CONFIG_NET_FC is not set
+# CONFIG_RCPCI is not set
+# CONFIG_SHAPER is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+
+#
+# PCMCIA network device support
+#
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+# CONFIG_ARCNET_COM20020_CS is not set
+# CONFIG_PCMCIA_IBMTR is not set
+CONFIG_NET_PCMCIA_RADIO=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_NETWAVE=m
+CONFIG_PCMCIA_WAVELAN=m
+# CONFIG_AIRONET4500_CS is not set
+
+#
+# Amateur Radio support
+#
+# CONFIG_HAMRADIO is not set
+
+#
+# IrDA (infrared) support
+#
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+CONFIG_IRDA_DEBUG=y
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+CONFIG_IRPORT_SIR=m
+
+#
+# Dongle support
+#
+# CONFIG_DONGLE is not set
+
+#
+# FIR device drivers
+#
+# CONFIG_USB_IRDA is not set
+# CONFIG_NSC_FIR is not set
+# CONFIG_WINBOND_FIR is not set
+# CONFIG_TOSHIBA_FIR is not set
+# CONFIG_SMC_IRCC_FIR is not set
+# CONFIG_ALI_FIR is not set
+# CONFIG_VLSI_FIR is not set
+CONFIG_PXA_FIR=m
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=m
+
+#
+# IDE, ATA and ATAPI Block devices
+#
+CONFIG_BLK_DEV_IDE=m
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_HD_IDE is not set
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_IDEDISK=m
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_IDEDISK_STROKE is not set
+# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set
+# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set
+# CONFIG_BLK_DEV_IDEDISK_IBM is not set
+# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set
+# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set
+# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set
+# CONFIG_BLK_DEV_IDEDISK_WD is not set
+# CONFIG_BLK_DEV_COMMERIAL is not set
+# CONFIG_BLK_DEV_TIVO is not set
+CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECD=m
+CONFIG_BLK_DEV_IDETAPE=m
+CONFIG_BLK_DEV_IDEFLOPPY=m
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+# CONFIG_BLK_DEV_ISAPNP is not set
+# CONFIG_IDE_CHIPSETS is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_DMA_NONPCI is not set
+# CONFIG_BLK_DEV_IDE_MODES is not set
+# CONFIG_BLK_DEV_ATARAID is not set
+# CONFIG_BLK_DEV_ATARAID_PDC is not set
+# CONFIG_BLK_DEV_ATARAID_HPT is not set
+
+#
+# SCSI support
+#
+CONFIG_SCSI=m
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_SD_EXTRA_DEVS=40
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_SR_EXTRA_DEVS=2
+CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_DEBUG_QUEUES is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AHA1740 is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_AM53C974 is not set
+# CONFIG_SCSI_MEGARAID is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_DMA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_NCR53C7xx is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PCI2000 is not set
+# CONFIG_SCSI_PCI2220I is not set
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_SIM710 is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# PCMCIA SCSI adapter support
+#
+CONFIG_SCSI_PCMCIA=y
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_I2O_BLOCK is not set
+# CONFIG_I2O_LAN is not set
+# CONFIG_I2O_SCSI is not set
+# CONFIG_I2O_PROC is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input core support
+#
+CONFIG_INPUT=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_UINPUT=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_SERIAL_CONSOLE=y
+CONFIG_SERIAL_EXTENDED=y
+# CONFIG_SERIAL_MANY_PORTS is not set
+# CONFIG_SERIAL_SHARE_IRQ is not set
+# CONFIG_SERIAL_DETECT_IRQ is not set
+# CONFIG_SERIAL_MULTIPORT is not set
+# CONFIG_HUB6 is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_ANAKIN is not set
+# CONFIG_SERIAL_ANAKIN_CONSOLE is not set
+# CONFIG_SERIAL_S3C2410 is not set
+# CONFIG_SERIAL_S3C2410_CONSOLE is not set
+# CONFIG_SERIAL_AMBA is not set
+# CONFIG_SERIAL_AMBA_CONSOLE is not set
+# CONFIG_SERIAL_CLPS711X is not set
+# CONFIG_SERIAL_CLPS711X_CONSOLE is not set
+# CONFIG_SERIAL_21285 is not set
+# CONFIG_SERIAL_21285_OLD is not set
+# CONFIG_SERIAL_21285_CONSOLE is not set
+# CONFIG_SERIAL_UART00 is not set
+# CONFIG_SERIAL_UART00_CONSOLE is not set
+# CONFIG_SERIAL_SA1100 is not set
+# CONFIG_SERIAL_SA1100_CONSOLE is not set
+# CONFIG_SERIAL_SIR_PXA is not set
+# CONFIG_SERIAL_8250 is not set
+# CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+# CONFIG_SERIAL_8250_SHARE_IRQ is not set
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+# CONFIG_SERIAL_8250_MULTIPORT is not set
+# CONFIG_SERIAL_8250_HUB6 is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=32
+# CONFIG_PRINTER is not set
+# CONFIG_PPDEV is not set
+CONFIG_NEWTONKBD=m
+# CONFIG_SA1100_PROFILER is not set
+
+#
+# Compaq iPAQ H3600 support
+#
+CONFIG_TOUCHSCREEN_H3600=m
+# CONFIG_H3600_BACKPAQ_FPGA is not set
+# CONFIG_H3600_BACKPAQ_ACCEL is not set
+# CONFIG_H3600_BACKPAQ_GASGAUGE is not set
+# CONFIG_H3600_BACKPAQ_SRAM is not set
+# CONFIG_H3600_BACKPAQ_AUDIO is not set
+# CONFIG_H3600_STOWAWAY is not set
+# CONFIG_H3800_MICROKBD is not set
+# CONFIG_SA1100_LIRC is not set
+CONFIG_H5400_BUZZER=m
+CONFIG_H5400_FSI=m
+
+#
+# I2C support
+#
+CONFIG_I2C=m
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+CONFIG_I2C_PXA_ALGO=m
+CONFIG_I2C_PXA_ADAP=m
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_PROC=m
+# CONFIG_I2C_DS1307 is not set
+
+#
+# L3 serial bus support
+#
+# CONFIG_L3 is not set
+# CONFIG_L3_ALGOBIT is not set
+# CONFIG_L3_BIT_SA1100_GPIO is not set
+
+#
+# Other L3 adapters
+#
+# CONFIG_L3_S3C2410 is not set
+# CONFIG_L3_SA1111 is not set
+# CONFIG_L3_BACKPAQ is not set
+# CONFIG_BIT_SA1100_GPIO is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+
+#
+# Mice
+#
+# CONFIG_BUSMOUSE is not set
+CONFIG_MOUSE=m
+# CONFIG_PSMOUSE is not set
+# CONFIG_82C710_MOUSE is not set
+# CONFIG_PC110_PAD is not set
+# CONFIG_MK712_MOUSE is not set
+
+#
+# Joysticks
+#
+# CONFIG_INPUT_GAMEPORT is not set
+# CONFIG_INPUT_NS558 is not set
+# CONFIG_INPUT_LIGHTNING is not set
+# CONFIG_INPUT_PCIGAME is not set
+# CONFIG_INPUT_CS461X is not set
+# CONFIG_INPUT_EMU10K1 is not set
+CONFIG_INPUT_SERIO=m
+CONFIG_INPUT_SERPORT=m
+
+#
+# Joysticks
+#
+# CONFIG_INPUT_ANALOG is not set
+# CONFIG_INPUT_A3D is not set
+# CONFIG_INPUT_ADI is not set
+# CONFIG_INPUT_COBRA is not set
+# CONFIG_INPUT_GF2K is not set
+# CONFIG_INPUT_GRIP is not set
+# CONFIG_INPUT_INTERACT is not set
+# CONFIG_INPUT_TMDC is not set
+# CONFIG_INPUT_SIDEWINDER is not set
+# CONFIG_INPUT_IFORCE_USB is not set
+# CONFIG_INPUT_IFORCE_232 is not set
+# CONFIG_INPUT_WARRIOR is not set
+# CONFIG_INPUT_MAGELLAN is not set
+# CONFIG_INPUT_SPACEORB is not set
+# CONFIG_INPUT_SPACEBALL is not set
+# CONFIG_INPUT_STINGER is not set
+# CONFIG_INPUT_DB9 is not set
+# CONFIG_INPUT_GAMECON is not set
+# CONFIG_INPUT_TURBOGRAFX is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_SC520_WDT is not set
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_21285_WATCHDOG is not set
+# CONFIG_977_WATCHDOG is not set
+# CONFIG_SA1100_WATCHDOG is not set
+CONFIG_PXA_WATCHDOG=m
+# CONFIG_OMAHA_WATCHDOG is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_I810_TCO is not set
+# CONFIG_MIXCOMWD is not set
+# CONFIG_60XX_WDT is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_WDT is not set
+# CONFIG_WDTPCI is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_NVRAM is not set
+# CONFIG_RTC is not set
+CONFIG_PXA_RTC=m
+CONFIG_PXA_RTC_HACK=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+
+#
+# PCMCIA character devices
+#
+CONFIG_PCMCIA_SERIAL_CS=m
+CONFIG_PCMCIA_MOBILISCAN_CS=m
+# CONFIG_AXIM_TS is not set
+CONFIG_AXIM_KEY=m
+# CONFIG_AXIM_KEY_FIX is not set
+
+#
+# Multimedia devices
+#
+CONFIG_MEDIA=m
+CONFIG_VIDEO_DEV=m
+CONFIG_V4L2_DEV=m
+
+#
+# Video For Linux
+#
+CONFIG_VIDEO_PROC_FS=y
+# CONFIG_I2C_PARPORT is not set
+
+#
+# Video Adapters
+#
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_BWQCAM is not set
+# CONFIG_VIDEO_CQCAM is not set
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_USB=m
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_TUNER_3036 is not set
+# CONFIG_VIDEO_STRADIS is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_ZORAN_BUZ is not set
+# CONFIG_VIDEO_ZORAN_DC10 is not set
+# CONFIG_VIDEO_ZORAN_LML33 is not set
+# CONFIG_VIDEO_ZR36120 is not set
+# CONFIG_VIDEO_MEYE is not set
+# CONFIG_VIDEO_CYBERPRO is not set
+# CONFIG_VIDEO_H3600_BACKPAQ is not set
+# CONFIG_VIDEO_HAWKEYE is not set
+
+#
+# Video for Linux 2 (V4L2)
+#
+CONFIG_VIDEO_WINNOV_CS=m
+
+#
+# Radio Adapters
+#
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
+# CONFIG_RADIO_MIROPCM20 is not set
+# CONFIG_RADIO_MIROPCM20_RDS is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+
+#
+# File systems
+#
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADFS_FS_RW is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_BFS_FS is not set
+CONFIG_EXT3_FS=m
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_UMSDOS_FS=m
+CONFIG_VFAT_FS=m
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_LZO is not set
+# CONFIG_JFFS2_LZARI is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_PROC=y
+CONFIG_CRAMFS=y
+CONFIG_TMPFS=y
+CONFIG_RAMFS=y
+CONFIG_ISO9660_FS=m
+# CONFIG_JOLIET is not set
+# CONFIG_ZISOFS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+# CONFIG_HPFS_FS is not set
+CONFIG_PROC_FS=y
+CONFIG_DEVFS_FS=y
+CONFIG_DEVFS_MOUNT=y
+# CONFIG_DEVFS_DEBUG is not set
+# CONFIG_DRIVERFS_FS is not set
+CONFIG_DEVPTS_FS=y
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX4FS_RW is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_EXT2_FS=m
+# CONFIG_SYSV_FS is not set
+# CONFIG_UDF_FS is not set
+# CONFIG_UDF_RW is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_UFS_FS_WRITE is not set
+
+#
+# Network File Systems
+#
+# CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_ROOT_NFS is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+CONFIG_SUNRPC=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+# CONFIG_NCPFS_NFS_NS is not set
+# CONFIG_NCPFS_OS2_NS is not set
+# CONFIG_NCPFS_SMALLDOS is not set
+# CONFIG_NCPFS_NLS is not set
+# CONFIG_NCPFS_EXTRAS is not set
+# CONFIG_ZISOFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_SMB_NLS=y
+CONFIG_NLS=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+
+#
+# Console drivers
+#
+CONFIG_PC_KEYMAP=y
+# CONFIG_VGA_CONSOLE is not set
+
+#
+# Frame-buffer support
+#
+CONFIG_FB=y
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FB_ACORN is not set
+# CONFIG_FB_ANAKIN is not set
+# CONFIG_FB_CLPS711X is not set
+# CONFIG_FB_S3C2410 is not set
+# CONFIG_FB_SA1100 is not set
+# CONFIG_FB_EPSON1356 is not set
+# CONFIG_FB_MQ200 is not set
+CONFIG_FB_PXA=y
+# CONFIG_FB_PXA_8BPP is not set
+CONFIG_FB_PXA_16BPP=y
+CONFIG_FB_MQ1100=y
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FBCON_ADVANCED=y
+# CONFIG_FBCON_MFB is not set
+# CONFIG_FBCON_CFB2 is not set
+# CONFIG_FBCON_CFB4 is not set
+# CONFIG_FBCON_CFB8 is not set
+CONFIG_FBCON_CFB16=y
+# CONFIG_FBCON_CFB24 is not set
+# CONFIG_FBCON_CFB32 is not set
+# CONFIG_FBCON_AFB is not set
+# CONFIG_FBCON_ILBM is not set
+# CONFIG_FBCON_IPLAN2P2 is not set
+# CONFIG_FBCON_IPLAN2P4 is not set
+# CONFIG_FBCON_IPLAN2P8 is not set
+# CONFIG_FBCON_MAC is not set
+# CONFIG_FBCON_VGA_PLANES is not set
+# CONFIG_FBCON_VGA is not set
+# CONFIG_FBCON_HGA is not set
+# CONFIG_FBCON_NO_LOGO is not set
+# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
+CONFIG_FBCON_FONTS=y
+CONFIG_FONT_8x8=y
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+# CONFIG_SOUND_BT878 is not set
+# CONFIG_SOUND_CMPCI is not set
+# CONFIG_SOUND_EMU10K1 is not set
+# CONFIG_MIDI_EMU10K1 is not set
+# CONFIG_SOUND_FUSION is not set
+# CONFIG_SOUND_CS4281 is not set
+# CONFIG_SOUND_ES1370 is not set
+# CONFIG_SOUND_ES1371 is not set
+# CONFIG_SOUND_ESSSOLO1 is not set
+# CONFIG_SOUND_MAESTRO is not set
+# CONFIG_SOUND_MAESTRO3 is not set
+# CONFIG_SOUND_ICH is not set
+# CONFIG_SOUND_RME96XX is not set
+# CONFIG_SOUND_SONICVIBES is not set
+# CONFIG_SOUND_TRIDENT is not set
+# CONFIG_SOUND_MSNDCLAS is not set
+# CONFIG_SOUND_MSNDPIN is not set
+# CONFIG_SOUND_VIA82CXXX is not set
+# CONFIG_MIDI_VIA82CXXX is not set
+CONFIG_SOUND_H3900_UDA1380=m
+CONFIG_SOUND_H5400=m
+CONFIG_SOUND_OSS=m
+# CONFIG_SOUND_TRACEINIT is not set
+# CONFIG_SOUND_DMAP is not set
+# CONFIG_SOUND_AD1816 is not set
+# CONFIG_SOUND_SGALAXY is not set
+# CONFIG_SOUND_ADLIB is not set
+# CONFIG_SOUND_ACI_MIXER is not set
+# CONFIG_SOUND_CS4232 is not set
+# CONFIG_SOUND_SSCAPE is not set
+# CONFIG_SOUND_GUS is not set
+# CONFIG_SOUND_VMIDI is not set
+# CONFIG_SOUND_TRIX is not set
+# CONFIG_SOUND_MSS is not set
+# CONFIG_SOUND_MPU401 is not set
+# CONFIG_SOUND_NM256 is not set
+# CONFIG_SOUND_MAD16 is not set
+# CONFIG_SOUND_PAS is not set
+# CONFIG_PAS_JOYSTICK is not set
+# CONFIG_SOUND_PSS is not set
+# CONFIG_SOUND_SB is not set
+# CONFIG_SOUND_AWE32_SYNTH is not set
+# CONFIG_SOUND_WAVEFRONT is not set
+# CONFIG_SOUND_MAUI is not set
+# CONFIG_SOUND_YM3812 is not set
+# CONFIG_SOUND_OPL3SA1 is not set
+# CONFIG_SOUND_OPL3SA2 is not set
+# CONFIG_SOUND_YMFPCI is not set
+# CONFIG_SOUND_YMFPCI_LEGACY is not set
+# CONFIG_SOUND_UART6850 is not set
+# CONFIG_SOUND_AEDSP16 is not set
+# CONFIG_SOUND_VIDC is not set
+# CONFIG_SOUND_WAVEARTIST is not set
+CONFIG_SOUND_PXA_AC97=m
+# CONFIG_SOUND_TVMIXER is not set
+
+#
+# Multimedia Capabilities Port drivers
+#
+# CONFIG_MCP is not set
+# CONFIG_MCP_SA1100 is not set
+# CONFIG_MCP_UCB1200 is not set
+# CONFIG_MCP_UCB1200_AUDIO is not set
+# CONFIG_MCP_UCB1200_TS is not set
+# CONFIG_MCP_UCB1400_TS is not set
+
+#
+# Console Switches
+#
+# CONFIG_SWITCHES is not set
+
+#
+# USB support
+#
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_LONG_TIMEOUT is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_UHCI is not set
+# CONFIG_USB_UHCI_ALT is not set
+CONFIG_USB_OHCI=m
+# CONFIG_USB_OHCI_SA1111 is not set
+CONFIG_USB_OHCI_H5400=m
+CONFIG_USB_SL811HS=m
+CONFIG_USB_SL811HS_CS=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_AUDIO=m
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_BLUETOOTH is not set
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_ACM is not set
+CONFIG_USB_PRINTER=m
+
+#
+# USB Human Interface Devices (HID)
+#
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT=y
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_WACOM is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_DC2XX is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_SCANNER is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_QC is not set
+CONFIG_USB_SE401=m
+CONFIG_USB_STV680=m
+CONFIG_USB_VICAM=m
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_DABUSB is not set
+
+#
+# USB Network adaptors
+#
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_CATC is not set
+CONFIG_USB_CDCETHER=m
+# CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=m
+# CONFIG_USB_SERIAL_GENERIC is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+CONFIG_USB_SERIAL_IPAQ=m
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_BRLVGER is not set
+
+#
+# Support for USB gadgets
+#
+CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET_PXA2XX=y
+# CONFIG_USB_GADGET_N9604 is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_SUPERH is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_CONTROLLER is not set
+CONFIG_USB_PXA2XX=m
+CONFIG_USB_GADGET_CONTROLLER=m
+# CONFIG_USB_GADGET_DUALSPEED is not set
+
+#
+# USB Gadget Drivers
+#
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
+
+#
+# Linux As Bootldr Modules
+#
+# CONFIG_BIG_KERNEL is not set
+# CONFIG_USE_DATE_CODE is not set
+# CONFIG_YMODEM is not set
+# CONFIG_LAB_DUMMY is not set
+# CONFIG_LAB_CRC is not set
+# CONFIG_LAB_YMODEM is not set
+# CONFIG_LAB_MTD is not set
+# CONFIG_LAB_COPY is not set
+# CONFIG_LAB_COPY_YMODEM is not set
+# CONFIG_LAB_COPY_FLASH is not set
+# CONFIG_LAB_COPY_FS is not set
+# CONFIG_LAB_COPY_WRAPPER is not set
+
+#
+# Bluetooth support
+#
+CONFIG_BLUEZ=m
+CONFIG_BLUEZ_L2CAP=m
+CONFIG_BLUEZ_SCO=m
+CONFIG_BLUEZ_RFCOMM=m
+CONFIG_BLUEZ_RFCOMM_TTY=y
+CONFIG_BLUEZ_BNEP=m
+CONFIG_BLUEZ_BNEP_MC_FILTER=y
+CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+CONFIG_BLUEZ_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BLUEZ_HCIUSB=m
+# CONFIG_BLUEZ_HCIUSB_SCO is not set
+CONFIG_BLUEZ_HCIUART=m
+CONFIG_BLUEZ_HCIUART_H4=y
+CONFIG_BLUEZ_HCIUART_BCSP=y
+# CONFIG_BLUEZ_HCIUART_BCSP_TXCRC is not set
+# CONFIG_BLUEZ_HCIBFUSB is not set
+CONFIG_BLUEZ_HCIDTL1=m
+CONFIG_BLUEZ_HCIBT3C=m
+CONFIG_BLUEZ_HCIBLUECARD=m
+CONFIG_BLUEZ_HCIBTUART=m
+# CONFIG_BLUEZ_HCIVHCI is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_FRAME_POINTER is not set
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_NO_PGT_CACHE is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_WAITQ is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_ERRORS=y
+# CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_DC21285_PORT is not set
+# CONFIG_DEBUG_CLPS711X_UART2 is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC32 is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+# CONFIG_REED_SOLOMON is not set
+CONFIG_FW_LOADER=m
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index ef42191005..7fcfc93943 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -59,5 +59,5 @@ do_deploy() {
do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
+addtask deploy before do_package after do_compile
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
index 32068528aa..d3733b3e70 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
@@ -3,12 +3,10 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
LICENSE = "GPL"
PR = "r0"
-DEFAULT_PREFERENCE="-1"
-
KERNEL_CCSUFFIX = "-3.3.4"
COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
+COMPATIBLE_MACHINE = '(h3900|h5xxx)'
SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
file://defconfig-${PACKAGE_ARCH} \
diff --git a/packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime b/packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime
index 38fce226a1..434c5401c7 100644
--- a/packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime
+++ b/packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.17
-# Thu Jul 13 18:12:14 2006
+# Sat Jul 22 17:21:24 2006
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -22,20 +22,20 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
# General setup
#
CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
# CONFIG_POSIX_MQUEUE is not set
CONFIG_BSD_PROCESS_ACCT=y
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_SYSCTL=y
+# CONFIG_SYSCTL is not set
# CONFIG_AUDIT is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
-CONFIG_RELAY=y
+# CONFIG_RELAY is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_UID16=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -65,20 +65,20 @@ CONFIG_KMOD=y
#
# Block layer
#
-CONFIG_BLK_DEV_IO_TRACE=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_IOSCHED="cfq"
#
# System Type
@@ -126,7 +126,7 @@ CONFIG_SA1100_JORNADA720=y
# CONFIG_SA1100_PLEB is not set
# CONFIG_SA1100_SHANNON is not set
# CONFIG_SA1100_SIMPAD is not set
-CONFIG_SA1100_SSP=y
+# CONFIG_SA1100_SSP is not set
#
# Processor Type
@@ -154,17 +154,17 @@ CONFIG_ISA=y
# PCCARD (PCMCIA/CardBus) support
#
CONFIG_PCCARD=y
-# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA_DEBUG=y
CONFIG_PCMCIA=y
CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
+# CONFIG_PCMCIA_IOCTL is not set
#
# PC-card bridges
#
# CONFIG_I82365 is not set
# CONFIG_TCIC is not set
-CONFIG_PCMCIA_SA1100=y
+# CONFIG_PCMCIA_SA1100 is not set
CONFIG_PCMCIA_SA1111=y
#
@@ -191,8 +191,8 @@ CONFIG_ALIGNMENT_TRAP=y
#
# Boot options
#
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE=""
# CONFIG_XIP_KERNEL is not set
@@ -224,9 +224,9 @@ CONFIG_BINFMT_ELF=y
# Power management options
#
CONFIG_PM=y
-CONFIG_PM_LEGACY=y
+# CONFIG_PM_LEGACY is not set
# CONFIG_PM_DEBUG is not set
-CONFIG_APM=y
+CONFIG_APM=m
#
# Networking
@@ -236,36 +236,25 @@ CONFIG_NET=y
#
# Networking options
#
-CONFIG_NETDEBUG=y
-CONFIG_PACKET=y
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=m
# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-CONFIG_NET_KEY=y
+CONFIG_UNIX=m
+# CONFIG_NET_KEY is not set
CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_MULTIPLE_TABLES is not set
-# CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
+# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-CONFIG_INET_XFRM_TUNNEL=y
-CONFIG_INET_TUNNEL=y
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
# CONFIG_TCP_CONG_ADVANCED is not set
@@ -312,74 +301,13 @@ CONFIG_TCP_CONG_BIC=y
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-# CONFIG_IRNET is not set
-# CONFIG_IRCOMM is not set
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-# CONFIG_IRDA_CACHE_LAST_LSAP is not set
-# CONFIG_IRDA_FAST_RR is not set
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-# CONFIG_IRTTY_SIR is not set
-
-#
-# Dongle support
-#
-
-#
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-# CONFIG_SA1100_FIR is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIUART=m
-# CONFIG_BT_HCIUART_H4 is not set
-# CONFIG_BT_HCIUART_BCSP is not set
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_IEEE80211=y
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_IEEE80211=m
# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=y
-CONFIG_IEEE80211_CRYPT_CCMP=y
-CONFIG_IEEE80211_CRYPT_TKIP=y
+CONFIG_IEEE80211_CRYPT_WEP=m
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
# CONFIG_IEEE80211_SOFTMAC is not set
CONFIG_WIRELESS_EXT=y
@@ -391,7 +319,7 @@ CONFIG_WIRELESS_EXT=y
# Generic Driver Options
#
CONFIG_STANDALONE=y
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
#
@@ -418,8 +346,8 @@ CONFIG_FW_LOADER=y
# Block devices
#
# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_INITRD is not set
@@ -436,7 +364,7 @@ CONFIG_BLK_DEV_IDE=y
# Please see Documentation/ide.txt for help/info on IDE drives
#
# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDEDISK is not set
+CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
CONFIG_BLK_DEV_IDECS=y
# CONFIG_BLK_DEV_IDECD is not set
@@ -447,7 +375,7 @@ CONFIG_BLK_DEV_IDECS=y
#
# IDE chipset support/bugfixes
#
-# CONFIG_IDE_GENERIC is not set
+CONFIG_IDE_GENERIC=y
# CONFIG_IDE_ARM is not set
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_BLK_DEV_IDEDMA is not set
@@ -482,10 +410,10 @@ CONFIG_BLK_DEV_IDECS=y
# Network device support
#
CONFIG_NETDEVICES=y
-CONFIG_DUMMY=y
+# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
#
# ARCnet devices
@@ -559,7 +487,7 @@ CONFIG_PCMCIA_HERMES=m
CONFIG_PCMCIA_SPECTRUM=m
CONFIG_AIRO_CS=m
CONFIG_PCMCIA_ATMEL=m
-# CONFIG_PCMCIA_WL3501 is not set
+CONFIG_PCMCIA_WL3501=m
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
@@ -587,10 +515,10 @@ CONFIG_PPP=m
# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPP_FILTER is not set
CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
+# CONFIG_PPP_SYNC_TTY is not set
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
-# CONFIG_PPP_MPPE is not set
+CONFIG_PPP_MPPE=m
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
# CONFIG_SHAPER is not set
@@ -612,14 +540,14 @@ CONFIG_INPUT=y
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
# CONFIG_INPUT_JOYDEV is not set
CONFIG_INPUT_TSDEV=y
CONFIG_INPUT_TSDEV_SCREEN_X=640
CONFIG_INPUT_TSDEV_SCREEN_Y=240
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
#
@@ -645,10 +573,7 @@ CONFIG_TOUCHSCREEN_JORNADA720=y
#
# Hardware I/O ports
#
-CONFIG_SERIO=y
-# CONFIG_SERIO_SERPORT is not set
-CONFIG_SERIO_SA1111=y
-# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO is not set
# CONFIG_GAMEPORT is not set
#
@@ -662,15 +587,22 @@ CONFIG_HW_CONSOLE=y
#
# Serial drivers
#
-# CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
#
# Non-8250 serial port support
#
-# CONFIG_SERIAL_SA1100 is not set
+CONFIG_SERIAL_SA1100=y
+CONFIG_SERIAL_SA1100_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=16
+CONFIG_LEGACY_PTY_COUNT=8
#
# IPMI
@@ -722,10 +654,8 @@ CONFIG_LEGACY_PTY_COUNT=16
#
# Hardware Monitoring support
#
-CONFIG_HWMON=y
+# CONFIG_HWMON is not set
# CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
#
# Misc devices
@@ -734,9 +664,7 @@ CONFIG_HWMON=y
#
# Multimedia Capabilities Port drivers
#
-CONFIG_MCP=y
-CONFIG_MCP_SA11X0=y
-# CONFIG_MCP_UCB1200 is not set
+# CONFIG_MCP_SA11X0 is not set
#
# LED devices
@@ -770,10 +698,10 @@ CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_MACMODES is not set
-CONFIG_FB_FIRMWARE_EDID=y
+# CONFIG_FB_FIRMWARE_EDID is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_SA1100=y
+# CONFIG_FB_SA1100 is not set
CONFIG_FB_EPSON1356=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set
@@ -786,9 +714,17 @@ CONFIG_FB_EPSON1356=y
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
#
# Logo configuration
@@ -803,7 +739,46 @@ CONFIG_LCD_DEVICE=y
#
# Sound
#
-# CONFIG_SOUND is not set
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+CONFIG_SND_SA11XX_UDA1341=m
+
+#
+# PCMCIA devices
+#
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_PDAUDIOCF is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
#
# USB support
@@ -888,8 +863,8 @@ CONFIG_DNOTIFY=y
CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_FAT_DEFAULT_CODEPAGE=852
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-2"
# CONFIG_NTFS_FS is not set
#
@@ -912,7 +887,7 @@ CONFIG_RAMFS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
+CONFIG_CRAMFS=y
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
@@ -923,21 +898,27 @@ CONFIG_RAMFS=y
# Network File Systems
#
CONFIG_NFS_FS=m
-# CONFIG_NFS_V3 is not set
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
CONFIG_NFSD=m
-# CONFIG_NFSD_V3 is not set
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_CIFS is not set
+# CONFIG_SMB_FS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
@@ -953,12 +934,12 @@ CONFIG_MSDOS_PARTITION=y
# Native Language Support
#
CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_DEFAULT="iso8859-2"
CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_CODEPAGE_737=m
CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=y
CONFIG_NLS_CODEPAGE_855=m
CONFIG_NLS_CODEPAGE_857=m
CONFIG_NLS_CODEPAGE_860=m
@@ -966,7 +947,7 @@ CONFIG_NLS_CODEPAGE_861=m
CONFIG_NLS_CODEPAGE_862=m
CONFIG_NLS_CODEPAGE_863=m
CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=y
+CONFIG_NLS_CODEPAGE_865=m
CONFIG_NLS_CODEPAGE_866=m
CONFIG_NLS_CODEPAGE_869=m
CONFIG_NLS_CODEPAGE_936=m
@@ -975,13 +956,13 @@ CONFIG_NLS_CODEPAGE_932=m
CONFIG_NLS_CODEPAGE_949=m
CONFIG_NLS_CODEPAGE_874=m
CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_CODEPAGE_1251=y
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
CONFIG_NLS_ASCII=m
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_2=y
-CONFIG_NLS_ISO8859_3=y
-CONFIG_NLS_ISO8859_4=y
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
CONFIG_NLS_ISO8859_5=m
CONFIG_NLS_ISO8859_6=m
CONFIG_NLS_ISO8859_7=m
@@ -991,7 +972,7 @@ CONFIG_NLS_ISO8859_14=m
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
+CONFIG_NLS_UTF8=y
#
# Profiling support
@@ -1006,7 +987,7 @@ CONFIG_NLS_UTF8=m
# CONFIG_DEBUG_KERNEL is not set
CONFIG_LOG_BUF_SHIFT=14
CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_FS=y
+# CONFIG_DEBUG_FS is not set
CONFIG_FRAME_POINTER=y
# CONFIG_UNWIND_INFO is not set
# CONFIG_DEBUG_USER is not set
@@ -1021,29 +1002,29 @@ CONFIG_FRAME_POINTER=y
# Cryptographic options
#
CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+CONFIG_CRYPTO_SHA1=m
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
# CONFIG_CRYPTO_TEST is not set
#
@@ -1053,9 +1034,9 @@ CONFIG_CRYPTO_CRC32C=m
#
# Library routines
#
-CONFIG_CRC_CCITT=y
-CONFIG_CRC16=y
+CONFIG_CRC_CCITT=m
+# CONFIG_CRC16 is not set
CONFIG_CRC32=y
-CONFIG_LIBCRC32C=y
+# CONFIG_LIBCRC32C is not set
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZLIB_DEFLATE=m
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index d883a86a1a..88d33b352f 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r9"
+PR = "r11"
DEFAULT_PREFERENCE = "-1"
@@ -29,14 +29,14 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=merged \
file://00-hostap.patch;patch=1;status=merged \
file://10-pcnet.patch;patch=1;status=merged \
- ${RPSRC}/asoc-v0.11pre2-oz.patch;patch=1 \
- ${RPSRC}/asoc_updates-r1.patch;patch=1 \
- ${RPSRC}/hx2750_base-r25.patch;patch=1 \
+ ${RPSRC}/asoc-v0.11pre5-oz.patch;patch=1 \
+ ${RPSRC}/asoc_fixes2-r0.patch;patch=1 \
+ ${RPSRC}/hx2750_base-r26.patch;patch=1 \
${RPSRC}/hx2750_bl-r7.patch;patch=1 \
${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
${RPSRC}/pxa_keys-r5.patch;patch=1 \
${RPSRC}/tsc2101-r12.patch;patch=1 \
- ${RPSRC}/hx2750_test1-r3.patch;patch=1 \
+ ${RPSRC}/hx2750_test1-r4.patch;patch=1 \
${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
${RPSRC}/input_power-r5.patch;patch=1 \
${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
@@ -48,7 +48,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \
${RPSRC}/poodle_pm-r1.patch;patch=1 \
${RPSRC}/pxafb_changeres-r0.patch;patch=1 \
- ${RPSRC}/poodle_audio-r0.patch;patch=1 \
+ ${RPSRC}/poodle_audio-r1.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
file://hrw-pcmcia-ids-r3.patch;patch=1 \
${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
diff --git a/packages/lttng/lttng-control_0.12.bb b/packages/lttng/lttng-control_0.12.bb
new file mode 100644
index 0000000000..1596995fb0
--- /dev/null
+++ b/packages/lttng/lttng-control_0.12.bb
@@ -0,0 +1,16 @@
+SECTION = "devel"
+DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
+extract program execution details from the Linux operating system and \
+interpret them."
+LICENSE = "GPL"
+MAINTAINER = "Richard Purdie <richard@openedhand.com>"
+
+SRC_URI = "http://ltt.polymtl.ca/lttng/ltt-control-${PV}-21062006.tar.gz"
+
+S = "${WORKDIR}/ltt-control-${PV}-21062006"
+
+inherit autotools
+
+export KERNELDIR="${STAGING_KERNEL_DIR}"
+
+FILES_${PN} += "${datadir}/ltt-control/facilities/*" \ No newline at end of file
diff --git a/packages/lttng/lttng-control_0.6.bb b/packages/lttng/lttng-control_0.6.bb
deleted file mode 100644
index b18f507e9d..0000000000
--- a/packages/lttng/lttng-control_0.6.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SECTION = "devel"
-DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
-extract program execution details from the Linux operating system and \
-interpret them."
-LICENSE = "GPL"
-MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>"
-
-SRC_URI = "http://ltt.polymtl.ca/lttng/ltt-control-${PV}-28042006.tar.gz"
-
-S = "${WORKDIR}/ltt-control-${PV}-28042006"
-
-inherit autotools
-
-export KERNELDIR="${STAGING_KERNEL_DIR}"
-
-FILES_${PN} += "${datadir}/ltt-control/facilities/*" \ No newline at end of file
diff --git a/packages/madwifi/files/10-sh4-le-elf-copts.patch b/packages/madwifi/files/10-sh4-le-elf-copts.patch
new file mode 100644
index 0000000000..f6a9e0020b
--- /dev/null
+++ b/packages/madwifi/files/10-sh4-le-elf-copts.patch
@@ -0,0 +1,12 @@
+The -mno-implicit-fp is for gcc 4.x while for gcc 3.x we need -m4-nofpu.
+Since kernels built with gcc 4.x don't work on sh4 anwyay we patch this
+unconditionally for building with gcc 3.x
+
+--- madwifi-ng-r1527-20060425/hal/public/sh4-le-elf.inc~ 2006-07-25 13:41:29.000000000 +1000
++++ madwifi-ng-r1527-20060425/hal/public/sh4-le-elf.inc 2006-07-25 13:41:29.000000000 +1000
+@@ -59,4 +59,4 @@
+
+ LDOPTS= -EL
+ COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
+-COPTS+= -ml -m4 -mno-implicit-fp
++COPTS+= -ml -m4 -m4-nofpu
diff --git a/packages/madwifi/madwifi-ng_r1527-20060425.bb b/packages/madwifi/madwifi-ng_r1527-20060425.bb
index aa03b048a2..488d9aefa4 100644
--- a/packages/madwifi/madwifi-ng_r1527-20060425.bb
+++ b/packages/madwifi/madwifi-ng_r1527-20060425.bb
@@ -9,7 +9,8 @@ PR="r0"
SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \
file://10-xscale-be-elf-copts.patch;patch=1 \
- file://10-xscale-le-elf-copts.patch;patch=1"
+ file://10-xscale-le-elf-copts.patch;patch=1 \
+ file://10-sh4-le-elf-copts.patch;patch=1"
S = "${WORKDIR}/${PN}-${PV}"
diff --git a/packages/xlibs/libxdamage/.mtn2git_empty b/packages/mesa/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxdamage/.mtn2git_empty
+++ b/packages/mesa/files/.mtn2git_empty
diff --git a/packages/mesa/files/mklib-rpath-link.patch b/packages/mesa/files/mklib-rpath-link.patch
new file mode 100644
index 0000000000..07361f531a
--- /dev/null
+++ b/packages/mesa/files/mklib-rpath-link.patch
@@ -0,0 +1,20 @@
+--- Mesa/bin/mklib.orig 2006-06-04 20:56:22.000000000 -0600
++++ Mesa/bin/mklib 2006-06-04 20:57:04.000000000 -0600
+@@ -98,6 +98,9 @@
+ -L*)
+ DEPS="$DEPS $1"
+ ;;
++ -Wl*)
++ DEPS="$DEPS $1"
++ ;;
+ '-cplusplus')
+ CPLUSPLUS=1
+ ;;
+--- Mesa/configs/default.orig 2006-06-04 21:01:47.000000000 -0600
++++ Mesa/configs/default 2006-06-04 21:01:16.000000000 -0600
+@@ -71,4 +71,4 @@
+ GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
+ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
+ GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
+-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
++APP_LIB_DEPS = -L$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/packages/mesa/mesa_6.0.1.bb b/packages/mesa/mesa_6.0.1.bb
index 7c2e7ca627..be63a32190 100644
--- a/packages/mesa/mesa_6.0.1.bb
+++ b/packages/mesa/mesa_6.0.1.bb
@@ -6,6 +6,7 @@ S = "${WORKDIR}/Mesa-${PV}"
LICENSE = "LGPL"
# gcc-3.4 blows up in gtktext with -frename-registers on arm-linux
CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}"
+DEPENDS = "makedepend-native"
do_compile() {
oe_runmake linux CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}"
diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb
index 788b8d3cef..164f62648f 100644
--- a/packages/mesa/mesa_6.4.1+cvs20060101.bb
+++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb
@@ -3,19 +3,33 @@ SECTION = "unknown"
SRCDATE = "20060101"
PV = "6.4.1+cvs${SRCDATE}"
-SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE}"
+SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE} \
+ file://mklib-rpath-link.patch;patch=1"
S = "${WORKDIR}/Mesa"
LICENSE = "LGPL"
-RDEPENDS = "expat libx11 libxext libxxf86vm libxi libxmu libice"
-DEPENDS = "xf86vidmodeproto glproto"
+RDEPENDS = "expat"
+DEPENDS = "makedepend-native xf86vidmodeproto glproto libx11 libxext libxxf86vm libxi libxmu libice"
# gcc-3.4 blows up in gtktext with -frename-registers on arm-linux
CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}"
+do_configure() {
+ cd configs
+
+ ln -sf linux current
+ sed -e "s%CC *= *.*%CC = ${CC}%" -i current
+ sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current
+ sed -e "s%LD *= *.*%LD = ${LD}%" -i current
+ sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current
+ sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current
+ sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current
+ echo "SRC_DIRS = mesa glu glut/glx" >> current
+}
+
do_compile() {
- oe_runmake linux CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}"
+ oe_runmake default
}
do_install() {
diff --git a/packages/meta/package-index.bb b/packages/meta/package-index.bb
index f230af0e27..0f8c450e37 100644
--- a/packages/meta/package-index.bb
+++ b/packages/meta/package-index.bb
@@ -27,8 +27,6 @@ do_build[nostamp] = 1
do_build[dirs] = "${DEPLOY_DIR_IPK}"
do_build() {
set -ex
- rm -f Packages
- touch Packages
ipkg-make-index -r Packages -p Packages -l Packages.filelist -m .
set +ex
}
diff --git a/packages/meta/task-e-x11.bb b/packages/meta/task-e-x11.bb
deleted file mode 100644
index 0f0f7b4a43..0000000000
--- a/packages/meta/task-e-x11.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Tasks for Enlightenment/X11"
-PACKAGES = "task-e-x11-core task-e-x11"
-PROVIDES = "task-e-x11-core task-e-x11"
-PR = "r9"
-
-PREFERRED_PROVIDER_virtual/imlib2 = "imlib-x11"
-
-ALLOW_EMPTY = 1
-
-#
-# X
-#
-RDEPENDS_task-e-x11-core = "rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
- ttf-bitstream-vera chkhinge gpe-bootsplash-theme-e"
-
-#
-# E-core
-#
-RDEPENDS_task-e-x11-core += "entrance e-wm"
-
-
-RDEPENDS_task-e-x11 = "task-e-x11-core"
-# entice eclair examine evidence e-modules e-utils elitaire"
-DEPENDS_task-e-x11 = "task-e-x11-core"
-# entice eclair examine evidence e-modules e-utils elitaire"
diff --git a/packages/mplayer/files/Makefile-codec-cfg.patch b/packages/mplayer/files/Makefile-codec-cfg.patch
new file mode 100644
index 0000000000..8eec79f291
--- /dev/null
+++ b/packages/mplayer/files/Makefile-codec-cfg.patch
@@ -0,0 +1,11 @@
+--- trunk/Makefile.orig 2006-07-24 09:55:12.000000000 +0100
++++ trunk/Makefile 2006-07-24 09:56:18.000000000 +0100
+@@ -410,7 +410,7 @@
+ endif
+
+ codec-cfg: codec-cfg.c codec-cfg.h help_mp.h
+- $(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@
++ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -DCODECS2HTML codec-cfg.c -o $@
+
+ codecs.conf.h: codec-cfg etc/codecs.conf
+ ./codec-cfg ./etc/codecs.conf > $@
diff --git a/packages/mplayer/files/libfaad-fixed.patch b/packages/mplayer/files/libfaad-fixed.patch
deleted file mode 100644
index 2b85179038..0000000000
--- a/packages/mplayer/files/libfaad-fixed.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- mplayer-1.1.5/libfaad2/Makefile.orig 2006-05-12 14:45:49.000000000 +0100
-+++ mplayer-1.1.5/libfaad2/Makefile 2006-05-12 14:46:36.000000000 +0100
-@@ -6,11 +6,11 @@
- SRCS = bits.c cfft.c common.c decoder.c drc.c error.c filtbank.c hcr.c huffman.c ic_predict.c is.c lt_predict.c mdct.c mp4.c ms.c output.c pns.c ps_dec.c ps_syntax.c pulse.c rvlc.c sbr_dct.c sbr_dec.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c specrec.c ssr.c ssr_fb.c ssr_ipqf.c syntax.c tns.c
- OBJS = $(SRCS:.c=.o)
-
--CFLAGS = -I. $(OPTFLAGS)
-+#CFLAGS = -I. $(OPTFLAGS)
-
- # Uncomment this to use the FIXED_POINT implementation of FAAD2.
- # This should improve performance, especially for SBR files.
--#CFLAGS = -I. $(OPTFLAGS) -DFIXED_POINT
-+CFLAGS = -I. $(OPTFLAGS) -DFIXED_POINT
-
- .SUFFIXES: .c .o
-
diff --git a/packages/mplayer/mplayer-1.0pre8/libmpcodecs-ogg-include.patch b/packages/mplayer/files/libmpcodecs-ogg-include.patch
index 619c4b0cd2..619c4b0cd2 100644
--- a/packages/mplayer/mplayer-1.0pre8/libmpcodecs-ogg-include.patch
+++ b/packages/mplayer/files/libmpcodecs-ogg-include.patch
diff --git a/packages/mplayer/files/libmpdemux-ogg-include-svn.patch b/packages/mplayer/files/libmpdemux-ogg-include-svn.patch
new file mode 100644
index 0000000000..52b7029bc5
--- /dev/null
+++ b/packages/mplayer/files/libmpdemux-ogg-include-svn.patch
@@ -0,0 +1,11 @@
+--- trunk/libmpdemux/Makefile.orig 2006-07-24 10:11:06.000000000 +0100
++++ trunk/libmpdemux/Makefile 2006-07-24 10:12:02.000000000 +0100
+@@ -208,7 +208,7 @@
+ OBJS = $(SRCS:.c=.o)
+ OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
+ INCLUDE = -I.. -I../loader $(LIBAV_INC)
+-CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
++CFLAGS = $(INCLUDE) $(OPTFLAGS) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
+ CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
+ CPLUSPLUS = $(CC)
+
diff --git a/packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch b/packages/mplayer/files/libmpdemux-ogg-include.patch
index 541f4a03ee..541f4a03ee 100644
--- a/packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch
+++ b/packages/mplayer/files/libmpdemux-ogg-include.patch
diff --git a/packages/mplayer/files/mplayer-1.0_pre7-gcc4.patch b/packages/mplayer/files/mplayer-1.0_pre7-gcc4.patch
deleted file mode 100644
index d5a7a30505..0000000000
--- a/packages/mplayer/files/mplayer-1.0_pre7-gcc4.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -bBur MPlayer-20050413-orig/configure MPlayer-20050413/configure
---- MPlayer-20050413-orig/configure 2005-04-06 14:57:08.000000000 +0300
-+++ MPlayer-20050413/configure 2005-04-14 16:20:41.000000000 +0300
-@@ -604,7 +604,7 @@
- cc_version="v. ?.??, bad"
- cc_verc_fail=yes
- ;;
-- 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9])
-+ 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|4.*)
- _cc_major=`echo $cc_version | cut -d '.' -f 1`
- _cc_minor=`echo $cc_version | cut -d '.' -f 2`
- _cc_mini=`echo $cc_version | cut -d '.' -f 3`
-diff -bBur MPlayer-20050413-orig/liba52/imdct.c MPlayer-20050413/liba52/imdct.c
---- MPlayer-20050413-orig/liba52/imdct.c 2005-03-23 01:27:18.000000000 +0200
-+++ MPlayer-20050413/liba52/imdct.c 2005-04-14 16:48:54.000000000 +0300
-@@ -937,7 +937,8 @@
- /* 4-7. iterations */
- for (m=3; m < 7; m++) {
- two_m = (1 << m);
-- two_m_plus_one = two_m<<1;
-+ int two_m_plus_four=two_m<<4;
-+ complex_t* buf_plus_128=buf+128;
- asm volatile(
- "movl %0, %%esi \n\t"
- ".balign 16 \n\t"
-@@ -963,7 +964,7 @@
- "addl %2, %%esi \n\t"
- "cmpl %1, %%esi \n\t"
- " jb 1b \n\t"
-- :: "g" (buf), "m" (buf+128), "m" (two_m_plus_one<<3), "r" (two_m<<3),
-+ :: "g" (buf), "m" (buf_plus_128), "m" (two_m_plus_four), "r" (two_m<<3),
- "r" (sseW[m])
- : "%esi", "%edi", "%edx"
- );
-diff -bBur MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c
---- MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c 2005-02-27 10:56:26.000000000 +0200
-+++ MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c 2005-04-14 16:35:07.000000000 +0300
-@@ -2648,6 +2648,8 @@
- static always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int stride, PPContext *c){
- int64_t dc_mask, eq_mask;
- int64_t sums[10*8*2];
-+ int64_t dc_and_eq_mask;
-+
- src+= step*3; // src points to begin of the 8x8 Block
- //START_TIMER
- asm volatile(
-@@ -2754,8 +2756,9 @@
- : "r" (src), "r" ((long)step), "m" (c->pQPb), "m"(c->ppMode.flatnessThreshold)
- : "%"REG_a
- );
-+ dc_and_eq_mask=dc_mask & eq_mask;
-
-- if(dc_mask & eq_mask){
-+ if(dc_and_eq_mask){
- long offset= -8*step;
- int64_t *temp_sums= sums;
-
-@@ -2930,7 +2933,7 @@
- " js 1b \n\t"
-
- : "+r"(offset), "+r"(temp_sums)
-- : "r" ((long)step), "r"(src - offset), "m"(dc_mask & eq_mask)
-+ : "r" ((long)step), "r"(src - offset), "m"(dc_and_eq_mask)
- );
- }else
- src+= step; // src points to begin of the 8x8 Block
-diff -bBur MPlayer-20050413-orig/libmpdemux/frequencies.h MPlayer-20050413/libmpdemux/frequencies.h
---- MPlayer-20050413-orig/libmpdemux/frequencies.h 2001-11-17 00:06:48.000000000 +0200
-+++ MPlayer-20050413/libmpdemux/frequencies.h 2005-04-14 16:36:51.000000000 +0300
-@@ -104,7 +104,7 @@
- /* --------------------------------------------------------------------- */
-
- extern struct CHANLISTS chanlists[];
--extern struct STRTAB chanlist_names[];
-+/* extern struct STRTAB chanlist_names[]; */
-
- extern int chantab;
- extern struct CHANLIST *chanlist;
-diff -bBur MPlayer-20050413-orig/mmx.h MPlayer-20050413/mmx.h
---- MPlayer-20050413-orig/mmx.h 2001-10-28 13:47:21.000000000 +0200
-+++ MPlayer-20050413/mmx.h 2005-04-14 16:22:54.000000000 +0300
-@@ -353,11 +353,11 @@
- #define mmx_m2r(op, mem, reg) \
- __asm__ __volatile__ (#op " %0, %%" #reg \
- : /* nothing */ \
-- : "X" (mem))
-+ : "m" (mem))
-
- #define mmx_r2m(op, reg, mem) \
- __asm__ __volatile__ (#op " %%" #reg ", %0" \
-- : "=X" (mem) \
-+ : "=m" (mem) \
- : /* nothing */ )
-
- #define mmx_r2r(op, regs, regd) \
-@@ -367,8 +367,8 @@
- __asm__ __volatile__ ("movq %0, %%mm0\n\t" \
- #op " %1, %%mm0\n\t" \
- "movq %%mm0, %0" \
-- : "=X" (memd) \
-- : "X" (mems))
-+ : "=m" (memd) \
-+ : "m" (mems))
-
- #endif
-
-diff -bBur MPlayer-20050413-orig/postproc/swscale_template.c MPlayer-20050413/postproc/swscale_template.c
---- MPlayer-20050413-orig/postproc/swscale_template.c 2005-02-17 01:47:00.000000000 +0200
-+++ MPlayer-20050413/postproc/swscale_template.c 2005-04-14 16:46:12.000000000 +0300
-@@ -2136,6 +2136,7 @@
- else
- {
- long counter= -2*dstW;
-+ uint8_t* ptr=src+filterSize;
- // filter-= counter*filterSize/2;
- filterPos-= counter/2;
- dst-= counter/2;
-@@ -2177,7 +2178,7 @@
- " jnc 1b \n\t"
-
- : "+r" (counter), "+r" (filter)
-- : "m" (filterPos), "m" (dst), "m"(src+filterSize),
-+ : "m" (filterPos), "m" (dst), "m"(ptr),
- "m" (src), "r" ((long)filterSize*2)
- : "%"REG_b, "%"REG_a, "%"REG_c
- );
-@@ -2320,6 +2321,8 @@
- {
- #endif
- //NO MMX just normal asm ...
-+ int xInc_hi=xInc>>16;
-+ int xInc_lo=xInc&0xffff;
- asm volatile(
- "xor %%"REG_a", %%"REG_a" \n\t" // i
- "xor %%"REG_b", %%"REG_b" \n\t" // xx
-@@ -2356,7 +2359,7 @@
- " jb 1b \n\t"
-
-
-- :: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc>>16), "m" (xInc&0xFFFF)
-+ :: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc_hi), "m" (xInc_lo)
- : "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"
- );
- #ifdef HAVE_MMX2
-@@ -2515,6 +2518,8 @@
- else
- {
- #endif
-+ int xInc_hi=xInc>>16;
-+ int xInc_lo=xInc&0xffff;
- asm volatile(
- "xor %%"REG_a", %%"REG_a" \n\t" // i
- "xor %%"REG_b", %%"REG_b" \n\t" // xx
-@@ -2548,7 +2553,7 @@
- "cmp %2, %%"REG_a" \n\t"
- " jb 1b \n\t"
-
-- :: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc>>16)), "m" ((xInc&0xFFFF)),
-+ :: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc_hi)), "m" ((xInc_lo)),
- "r" (src2)
- : "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"
- );
-
---- MPlayer-1.0pre7/libvo/aclib_template.c 2005-04-25 08:26:11.000000000 +0000
-+++ MPlayer-1.0pre7.az/libvo/aclib_template.c 2005-04-25 08:26:17.000000000 +0000
-@@ -249,8 +249,8 @@
- MOVNTQ" %%mm6, 48(%1)\n"
- MOVNTQ" %%mm7, 56(%1)\n"
- :: "r" (from), "r" (to) : "memory");
-- ((const unsigned char *)from)+=64;
-- ((unsigned char *)to)+=64;
-+ from=((const unsigned char *)from)+64;
-+ to=((unsigned char *)to)+64;
- }
-
- // printf(" %d %d\n", (int)from&1023, (int)to&1023);
-@@ -338,8 +338,8 @@
- MOVNTQ" %%mm6, 48(%1)\n"
- MOVNTQ" %%mm7, 56(%1)\n"
- :: "r" (from), "r" (to) : "memory");
-- ((const unsigned char *)from)+=64;
-- ((unsigned char *)to)+=64;
-+ from=((const unsigned char *)from)+64;
-+ to=((unsigned char *)to)+64;
- }
-
- #endif /* Have SSE */
diff --git a/packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch b/packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch
deleted file mode 100644
index 9c84bdd05c..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./vidix/drivers/Makefile 2004-09-24 19:05:49.000000000 +0930
-+++ ./vidix/drivers/Makefile~mplayer-w100_1.0pre3.1.modified.diff 2003-10-23 02:15:33.000000000 +0930
-@@ -151,7 +138,7 @@
-
- install:
- mkdir -p $(LIBDIR)/mplayer/vidix
-- -install -m 755 -s -p *.so $(LIBDIR)/mplayer/vidix
-+ -install -m 755 -p *.so $(LIBDIR)/mplayer/vidix
- uninstall:
- rm -f $(LIBDIR)/mplayer/vidix/*.so
- rmdir -p --ignore-fail-on-non-empty $(LIBDIR)/mplayer/vidix
diff --git a/packages/mplayer/mplayer-1.0pre7/Makefile.patch b/packages/mplayer/mplayer-1.0pre7/Makefile.patch
deleted file mode 100644
index 07d8cd1cea..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/Makefile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- MPlayer-1.0pre7/Makefile.orig 2005-04-18 09:01:02.021562376 +0100
-+++ MPlayer-1.0pre7/Makefile 2005-04-18 09:11:13.018676696 +0100
-@@ -8,11 +8,6 @@
-
- PRG_CFG = codec-cfg
-
--# Do not strip the binaries at installation
--ifeq ($(STRIPBINARIES),yes)
--INSTALLSTRIP = -s
--endif
--
- # These subdirectories require installation due to binaries within them.
- ifeq ($(VIDIX),yes)
- SUBDIRS += libdha vidix
-@@ -244,7 +239,7 @@
- ifeq ($(TARGET_WIN32),yes)
- windres -o osdep/mplayer-rc.o osdep/mplayer.rc
- endif
-- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
-+ $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) -ljpeg -lpng $(LDFLAGS)
-
- mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
- winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
-@@ -277,7 +272,7 @@
- $(MENCODER_DEP): version.h help_mp.h
-
- $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
-- $(HOST_CC) $(HOST_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
-+ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
-
- install: $(ALL_PRG)
- ifeq ($(VIDIX),yes)
-@@ -365,7 +360,6 @@
- @for a in $(PARTS); do $(MAKE) -C $$a distclean; done
-
- strip:
-- strip -s $(ALL_PRG)
-
- dep: depend
-
diff --git a/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch
deleted file mode 100644
index 9ca1266c4b..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- MPlayer-1.0pre7/libmpcodecs/Makefile.orig 2005-04-19 12:09:24.313075760 +0100
-+++ MPlayer-1.0pre7/libmpcodecs/Makefile 2005-04-19 12:09:55.204379568 +0100
-@@ -50,7 +50,7 @@
- SRCS2=$(ENCODER_SRCS)
- OBJS2=$(SRCS2:.c=.o)
-
--CFLAGS = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
-+CFLAGS = -I.. $(OPTFLAGS) -I. -Inative -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
-
- .SUFFIXES: .c .o
-
diff --git a/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch
deleted file mode 100644
index 059a397926..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- MPlayer-1.0pre7/libmpdemux/Makefile.orig 2005-04-19 12:03:18.032758832 +0100
-+++ MPlayer-1.0pre7/libmpdemux/Makefile 2005-04-19 12:04:01.934084816 +0100
-@@ -36,8 +36,8 @@
-
- OBJS = $(SRCS:.c=.o)
- OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
--INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
--CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
-+INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
-+CFLAGS = -I.. $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
- CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE)
- CPLUSPLUS = $(CC)
-
diff --git a/packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff b/packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff
deleted file mode 100644
index cabfcf8c41..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff
+++ /dev/null
@@ -1,446 +0,0 @@
-diff -ruN MPlayer-1.0pre3/Makefile MPlayer-1.0pre3.custom/Makefile
---- MPlayer-1.0pre3.orig/Makefile Tue Dec 9 06:33:31 2003
-+++ MPlayer-1.0pre3/Makefile Thu Dec 11 16:18:27 2003
-@@ -17,7 +17,7 @@
-
- # These subdirectories require installation due to binaries within them.
- ifeq ($(VIDIX),yes)
--SUBDIRS += libdha vidix
-+SUBDIRS += vidix
- DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
- endif
-
-@@ -45,7 +45,7 @@
- PARTS += libfaad2
- endif
- ifeq ($(VIDIX),yes)
--PARTS += libdha vidix
-+PARTS += vidix
- endif
- ifeq ($(FAME),yes)
- PARTS += libfame
-@@ -81,7 +81,7 @@
- COMMON_DEPS += libfaad2/libfaad2.a
- endif
- ifeq ($(VIDIX),yes)
--COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
-+COMMON_DEPS += vidix/libvidix.a
- endif
- ifeq ($(FAME),yes)
- COMMON_DEPS += libfame/libfame.a
-diff -ruN MPlayer-1.0pre3.orig/configure MPlayer-1.0pre3/configure
---- MPlayer-1.0pre3.orig/configure Tue Dec 9 06:33:31 2003
-+++ MPlayer-1.0pre3/configure Thu Dec 11 17:29:38 2003
-@@ -2151,7 +2151,7 @@
- #include <sys/types.h>
- int main(void) { printf("%d\n", sizeof(size_t)*8); return 0; }
- EOF
--cc_check && _wordsize=`$TMPO` && _mp_wordsize="#define MP_WORDSIZE $_wordsize"
-+cc_check && _wordsize="32" && _mp_wordsize="#define MP_WORDSIZE $_wordsize"
- echores "$_wordsize"
-
-
-@@ -2289,6 +2289,8 @@
- EOF
- if mingw32 ; then
- _ld_pthread=''
-+elif true ; then
-+ _ld_pthread='-lpthread'
- elif ( cc_check && $TMPO ) ; then # QNX
- _ld_pthread=''
- elif ( cc_check -lpthread && $TMPO ) ; then
-diff -ruN MPlayer-1.0pre3.orig/vidix/drivers/Makefile MPlayer-1.0pre3/vidix/drivers/Makefile
---- MPlayer-1.0pre3.orig/vidix/drivers/Makefile Thu Oct 23 01:45:33 2003
-+++ MPlayer-1.0pre3/vidix/drivers/Makefile Thu Dec 11 17:13:01 2003
-@@ -124,6 +131,12 @@
-
- $(SIS_VID): $(SIS_OBJS)
- $(CC) -shared $(SIS_OBJS) $(SIS_LIBS) -Wl,-soname,$(SIS_VID) -o $(SIS_VID)
-+
-+$(W100_OBJS): $(W100_SRCS)
-+ $(CC) -c $(W100_CFLAGS) -o $@ $<
-+
-+$(W100_VID): $(W100_OBJS)
-+ $(CC) -shared $(W100_OBJS) $(W100_LIBS) -Wl,-soname,$(W100_VID) -o $(W100_VID)
-
- clean:
- rm -f *.o *.so *~
-diff -ruN MPlayer-1.0pre3.orig/vidix/drivers/w100_vid.c MPlayer-1.0pre3/vidix/drivers/w100_vid.c
---- MPlayer-1.0pre3.orig/vidix/drivers/w100_vid.c Thu Jan 1 09:00:00 1970
-+++ MPlayer-1.0pre3/vidix/drivers/w100_vid.c Thu Dec 11 16:24:01 2003
-@@ -0,0 +1,375 @@
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <inttypes.h>
-+#include <unistd.h>
-+
-+#include "../vidix.h"
-+#include "../fourcc.h"
-+#include "../../config.h"
-+#include "aticore.h"
-+
-+#define UNUSED(v) ((void)(v))
-+
-+static uint16_t st_overlayHandle;
-+
-+static vidix_capability_t w100_cap =
-+{
-+ "ATI W100 driver",
-+ "AGAWA Koji <kaoru-K@self-core.org>",
-+ TYPE_OUTPUT,
-+ { 0, 0, 0, 0 }, /* reserved */
-+ 480, /* max width */
-+ 640, /* max height */
-+ 4, /* min width */
-+ 4, /* min height */
-+ -1, /* max framerate */
-+ FLAG_EQUALIZER, /* flags */
-+ 0x1002, /* VENDOR_ATI(libdha/pci_vendors.h) */
-+ -1, /* device id */
-+ { 0, 0, 0, 0 } /* reserved */
-+};
-+
-+unsigned int vixGetVersion(void)
-+{
-+ return VIDIX_VERSION;
-+}
-+
-+int vixProbe(int verbose, int force)
-+{
-+ UNUSED(verbose);
-+ UNUSED(force);
-+ return 0;
-+}
-+
-+int vixInit(void)
-+{
-+ if (AtiCore_ProcessAttach()) {
-+ if (AtiCore_AllocOverlay(&st_overlayHandle))
-+ return 0;
-+ }
-+
-+ return ENOSYS;
-+}
-+
-+void vixDestroy(void)
-+{
-+ AtiCore_SetOverlayOnOff(st_overlayHandle, 0);
-+ AtiCore_ReleaseOverlay(st_overlayHandle);
-+ AtiCore_ProcessDetach();
-+}
-+
-+int vixGetCapability(vidix_capability_t *to)
-+{
-+ memcpy(to, &w100_cap, sizeof(vidix_capability_t));
-+ return 0;
-+}
-+
-+static int is_supported_fourcc(uint32_t fourcc)
-+{
-+ switch(fourcc) {
-+ case IMGFMT_YV12:
-+ return 1;
-+ default:
-+ return 0;
-+ }
-+}
-+
-+int vixQueryFourcc(vidix_fourcc_t *to)
-+{
-+ if (is_supported_fourcc(to->fourcc)) {
-+ to->depth = VID_DEPTH_1BPP | VID_DEPTH_2BPP |
-+ VID_DEPTH_4BPP | VID_DEPTH_8BPP |
-+ VID_DEPTH_12BPP| VID_DEPTH_15BPP|
-+ VID_DEPTH_16BPP| VID_DEPTH_24BPP|
-+ VID_DEPTH_32BPP;
-+ to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK;
-+/* to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY; */
-+ return 0;
-+ } else
-+ to->depth = to->flags = 0;
-+
-+ return ENOSYS;
-+}
-+
-+int vixGetGrKeys(vidix_grkey_t *grkey)
-+{
-+ UNUSED(grkey);
-+ return 0;
-+}
-+
-+int vixSetGrKeys(const vidix_grkey_t *grkey)
-+{
-+ UNUSED(grkey);
-+ return 0;
-+}
-+
-+static vidix_video_eq_t st_equal =
-+{
-+ VEQ_CAP_BRIGHTNESS,
-+ 0, 0, 0, 0, 0, 0, 0, 0
-+};
-+
-+int vixPlaybackGetEq(vidix_video_eq_t * eq)
-+{
-+ memcpy(eq, &st_equal, sizeof(st_equal));
-+ return 0;
-+}
-+
-+int vixPlaybackSetEq(const vidix_video_eq_t * eq)
-+{
-+ int br;
-+
-+ if (eq->cap & VEQ_CAP_BRIGHTNESS)
-+ st_equal.brightness = eq->brightness;
-+ if (eq->cap & VEQ_CAP_CONTRAST)
-+ st_equal.contrast = eq->contrast;
-+ if (eq->cap & VEQ_CAP_SATURATION)
-+ st_equal.saturation = eq->saturation;
-+ if (eq->cap & VEQ_CAP_HUE)
-+ st_equal.hue = eq->hue;
-+ if (eq->cap & VEQ_CAP_RGB_INTENSITY) {
-+ st_equal.red_intensity = eq->red_intensity;
-+ st_equal.green_intensity = eq->green_intensity;
-+ st_equal.blue_intensity = eq->blue_intensity;
-+ }
-+ st_equal.flags = eq->flags;
-+
-+ br = (st_equal.brightness + 1000) * 127 / 2000;
-+ if (br < 0)
-+ br = 0;
-+ if (br > 127)
-+ br = 127;
-+ if (br > 64)
-+ br -= 64;
-+ else
-+ br += 64;
-+
-+ AtiCore_SetDisplayBrightness(br);
-+
-+ return 0;
-+}
-+
-+static uint32_t st_frameOffsets[VID_PLAY_MAXFRAMES];
-+static vidix_playback_t st_playbackInfo;
-+static ATI_OVERLAYPROP st_overlayProp;
-+
-+int vixConfigPlayback(vidix_playback_t *info)
-+{
-+ int src_w, src_h;
-+ int drw_w, drw_h;
-+ int y_pitch, uv_pitch;
-+ int i, ret, newNumFrames;
-+ ATI_CLIPRECT clipRect;
-+ uint32_t base;
-+ uint32_t internalVramSize, internalVramAddr;
-+ uint32_t externalVramSize, externalVramAddr;
-+ int useExternalVram = 0;
-+
-+ if (!is_supported_fourcc(info->fourcc))
-+ return -1;
-+
-+ src_w = info->src.w;
-+ src_h = info->src.h;
-+ drw_w = info->dest.w;
-+ drw_h = info->dest.h;
-+
-+ switch (info->fourcc) {
-+ case IMGFMT_YV12:
-+ y_pitch = (src_w + 15) & ~15;
-+ uv_pitch = ((src_w / 2) + 7) & ~7;
-+ info->offset.y = 0;
-+ info->offset.v = y_pitch * src_h;
-+ info->offset.u = info->offset.v + uv_pitch * (src_h / 2);
-+ info->frame_size = y_pitch * src_h + 2 * uv_pitch * (src_h / 2);
-+ break;
-+ default:
-+ return -1;
-+ }
-+/* fprintf(stderr, "w100_vid: num_frames:%d\n", info->num_frames); */
-+/* fprintf(stderr, "w100_vid: y_pitch:%d\n", y_pitch); */
-+
-+/* fprintf(stderr, "w100_vid: struct info {\n"); */
-+/* fprintf(stderr, "w100_vid: src.x:%d. src.y:%d. src.w:%d, src.h:%d,\n", */
-+/* info->src.x, info->src.y, info->src.w, info->src.h); */
-+/* fprintf(stderr, "w100_vid: dest.x:%d. dest.y:%d. dest.w:%d, dest.h:%d,\n", */
-+/* info->dest.x, info->dest.y, info->dest.w, info->dest.h); */
-+/* fprintf(stderr, "w100_vid: offset.y:%d, offset.v:%d offset.y:%d\n", */
-+/* info->offset.y, info->offset.v, info->offset.u); */
-+/* fprintf(stderr, "w100_vid: frame_size:%d,\n", info->frame_size); */
-+
-+ GetAvailableVideoMem(&internalVramSize, &externalVramSize);
-+ AtiCore_SetupMemoryTransfer(0, &internalVramAddr);
-+ AtiCore_TerminateMemoryTransfer();
-+ AtiCore_SetupMemoryTransfer(0xF000000, &externalVramAddr);
-+ AtiCore_TerminateMemoryTransfer();
-+
-+/* info->num_frames = 1; */
-+ useExternalVram = (getenv("MPLAYER_W100_USEEXTVRAM") ? 1 : 0);
-+
-+ if (useExternalVram) {
-+ /* $B%U%l!<%`%P%C%U%!$H$7$FMxMQ$5$l$F$$$kItJ,$O;H$o$J$$(B */
-+ base = 640 * 480 * 2;
-+ newNumFrames = (externalVramSize - (640 * 480 * 2))
-+ / info->frame_size;
-+
-+ /* FIXME: $B30It(B VRAM $B$K%*!<%P%l%$$r3NJ]$9$k$H!"(BVGA/QVGA $BLd$o$:(B
-+ $BI=<($,GH>u$KMp$l$k!#(B @SL-C700/C750 */
-+ } else {
-+ /* $B%U%l!<%`%P%C%U%!It$b;H$o$J$$$H!"(BVRAM $BMFNL$,B-$j$J$$(B */
-+/* base = 320 * 240 * 2; */
-+ base = 320 * 4 * 2;
-+ memset((void *)internalVramAddr, 0x00, 320 * 4 * 2);
-+ newNumFrames = internalVramSize / info->frame_size;
-+ }
-+
-+ if (newNumFrames > info->num_frames)
-+ newNumFrames = info->num_frames;
-+ if (newNumFrames > VID_PLAY_MAXFRAMES)
-+ newNumFrames = VID_PLAY_MAXFRAMES;
-+ info->num_frames = newNumFrames;
-+
-+ info->dga_addr =
-+ (void *)(useExternalVram ? externalVramAddr : internalVramAddr);
-+/* fprintf(stderr, "w100_vid: num_frames:%d,\n", info->num_frames); */
-+
-+ info->dest.pitch.y = 16;
-+ info->dest.pitch.u = 16;
-+ info->dest.pitch.v = 16;
-+
-+/* fprintf(stderr, "w100_vid: }\n"); */
-+/* fprintf(stderr, "w100_vid: base:%d\n", base); */
-+
-+ for (i = 0; i < info->num_frames; ++i) {
-+ info->offsets[i] = base + info->frame_size * i;
-+ st_frameOffsets[i] = info->offsets[i]
-+ + (useExternalVram ? 0xF000000 : 0);
-+ }
-+
-+ st_overlayProp.lpSrcBitmap = (void *)st_frameOffsets[0];
-+ st_overlayProp.XCoord = 0;
-+ st_overlayProp.YCoord = 0;
-+ st_overlayProp.SrcPitch = y_pitch;
-+ st_overlayProp.SrcHeight = src_h;
-+ st_overlayProp.OverlayWidth = y_pitch;
-+ st_overlayProp.OverlayHeight = src_h;
-+ st_overlayProp.lpOverlayKey = 0;
-+ st_overlayProp.OverlayFormat = OVLTYPE_YUV420;
-+
-+ ret = AtiCore_SetupOverlay(st_overlayHandle, &st_overlayProp);
-+/* printf("w100_vid: AtiCore_SetupOverlay: ret=%d\n", ret); */
-+
-+ clipRect.X_Top_Left = 0;
-+ clipRect.Y_Top_Left = 0;
-+ clipRect.X_Bottom_Right = st_overlayProp.SrcPitch;
-+ clipRect.Y_Bottom_Right = st_overlayProp.SrcHeight;
-+ AtiCore_SetDstClippingRect(&clipRect);
-+ clipRect.X_Bottom_Right = info->src.w;
-+ clipRect.Y_Bottom_Right = info->src.h;
-+ AtiCore_SetSrcClippingRect(&clipRect);
-+
-+/* AtiCore_SetOverlayPos(st_overlayHandle, info->dest.x, info->dest.y); */
-+ AtiCore_SetOverlayPos(st_overlayHandle, 4, 0);
-+
-+ AtiCore_SetRopOperation(ROP3_SRCCOPY);
-+ AtiCore_SetDstType(DSTTYPE_8BPP);
-+ AtiCore_SetSrcType(SRCTYPE_EQU_DST);
-+
-+ vixPlaybackSetEq(&st_equal);
-+
-+ memcpy(&st_playbackInfo, info, sizeof(*info));
-+
-+/* fprintf(stderr, "w100_vid: ---- vixConfigPlayback complete.\n"); */
-+
-+ return 0;
-+}
-+
-+int vixPlaybackOn(void)
-+{
-+ AtiCore_SetOverlayOnOff(st_overlayHandle, 1);
-+
-+ return 0;
-+}
-+
-+int vixPlaybackOff(void)
-+{
-+ AtiCore_SetOverlayOnOff(st_overlayHandle, 0);
-+
-+ return 0;
-+}
-+
-+int vixPlaybackFrameSelect(unsigned int frame)
-+{
-+ st_overlayProp.lpSrcBitmap = (void *)st_frameOffsets[frame];
-+ AtiCore_SetupOverlay(st_overlayHandle, &st_overlayProp);
-+
-+#if 0
-+ ATI_STRETCH stretchOptions;
-+ ATI_POINT dpPoint;
-+ ATI_RECT srcRect, dstRect;
-+ int ret;
-+
-+/* fprintf(stderr, "w100_vid: vixPlaybackFrameSelect(frame=%d)\n", frame); */
-+/* fprintf(stderr, "w100_vid: dga_addr:0x%08x, offset:%d,\n", */
-+/* st_playbackInfo.dga_addr, st_frameOffsets[frame]); */
-+
-+ stretchOptions.Count = 1;
-+ stretchOptions.ScaleXFactor = 4;
-+ stretchOptions.ScaleYFactor = 4;
-+ stretchOptions.BlendOn = 0;
-+ stretchOptions.dummy1 = 0;
-+
-+ dpPoint.XCoord = 0;
-+ dpPoint.YCoord = 0;
-+
-+ srcRect.XCoord = st_playbackInfo.src.x;
-+ srcRect.YCoord = st_playbackInfo.src.y;
-+ srcRect.Width = st_playbackInfo.src.w;
-+ srcRect.Height = st_playbackInfo.src.h;
-+ fprintf(stderr, "%d, %d, %d, %d\n", srcRect.XCoord, srcRect.YCoord,
-+ srcRect.Width, srcRect.Height);
-+
-+ dstRect.XCoord = 0;
-+ dstRect.YCoord = 0;
-+ dstRect.Width = 432;//st_playbackInfo.src.w;
-+ dstRect.Height = 592;//st_playbackInfo.src.h;
-+
-+#if 1
-+ while (AtiCore_WaitComplete(100) != 1)
-+ ;
-+
-+ AtiCore_SetRopOperation( ROP3_SRCCOPY );
-+ AtiCore_SetDstType( DSTTYPE_8BPP );
-+ AtiCore_SetSrcType( SRCTYPE_EQU_DST );
-+
-+ ret = AtiCore_SetSrcPitchOffset(st_playbackInfo.src.w,
-+ st_frameOffsets[frame]);
-+ fprintf(stderr, "AtiCore_SetSrcPitchOffset(%d, %x) %d\n",
-+ st_playbackInfo.src.w, st_frameOffsets[frame], ret);
-+ ret = AtiCore_SetDstPitchOffset(432, 0);
-+/* printf("AtiCore_SetDstPitchOffset: ret=%d\n", ret); */
-+
-+/* ret = AtiCore_BitBltFilpRotate(0, &srcRect, &dstRect); */
-+ ret = AtiCore_StretchBlt(&stretchOptions, &dpPoint, &srcRect);
-+ fprintf(stderr, "AtiCore_StretchBlt: ret=%d\n", ret);
-+
-+#else
-+ {
-+ int y, srcOffset = 0, dstOffset = 0;
-+ fprintf(stderr, "%d %d %d\n", st_playbackInfo.src.h,
-+ st_playbackInfo.src.w, 0);
-+ for (y = 0; y < st_playbackInfo.src.h; ++y) {
-+ memcpy(
-+ 0xF1100000 + dstOffset,
-+ st_playbackInfo.dga_addr + st_playbackInfo.offsets[frame] + srcOffset,
-+ st_playbackInfo.src.w);
-+ srcOffset += st_playbackInfo.src.w;
-+ dstOffset += 432;
-+ }
-+ }
-+#endif
-+#endif
-+
-+ return 0;
-+}
diff --git a/packages/mplayer/mplayer-1.0pre7/sdl.patch b/packages/mplayer/mplayer-1.0pre7/sdl.patch
deleted file mode 100644
index d74c8397b9..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/sdl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- ./configure.orig 2004-09-24 19:09:56.000000000 +0930
-+++ ./configure 2004-09-24 19:22:21.000000000 +0930
-@@ -3554,38 +3554,6 @@
- #################
-
-
--echocheck "SDL"
--if test -z "$_sdlconfig" ; then
-- if ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then
-- _sdlconfig="sdl-config"
-- elif ( sdl11-config --version ) >>"$TMPLOG" 2>&1 ; then
-- _sdlconfig="sdl11-config"
-- else
-- _sdlconfig=false
-- fi
--fi
--if test "$_sdl" = auto || test "$_sdl" = yes ; then
-- cat > $TMPC << EOF
--#include <SDL.h>
--int main(int argc, char *argv[]) { return 0; }
--EOF
-- _sdl=no
-- if "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then
-- if cc_check `$_sdlconfig --cflags` `$_sdlconfig --libs` >>"$TMPLOG" 2>&1 ; then
-- _sdlversion=`$_sdlconfig --version | sed 's/[^0-9]//g'`
-- if test "$_sdlversion" -gt 116 ; then
-- if test "$_sdlversion" -lt 121 ; then
-- _def_sdlbuggy='#define BUGGY_SDL'
-- else
-- _def_sdlbuggy='#undef BUGGY_SDL'
-- fi
-- _sdl=yes
-- else
-- _sdl=outdated
-- fi
-- fi
-- fi
--fi
- if test "$_sdl" = yes ; then
- _def_sdl='#define HAVE_SDL 1'
- if cygwin ; then
diff --git a/packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch b/packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch
deleted file mode 100644
index 2c8df9aa3b..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- MPlayer-1.0pre6a/vidix/drivers/Makefile.orig 2005-04-05 14:17:28.130812264 +0000
-+++ MPlayer-1.0pre6a/vidix/drivers/Makefile 2005-04-05 14:18:09.294554424 +0000
-@@ -70,7 +70,13 @@
- SAVAGE_LIBS=-L../../libdha -ldha -lm
- SAVAGE_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-
--all: $(CYBERBLADE_VID) $(RADEON_VID) $(RAGE128_VID) $(MACH64_VID) $(NVIDIA_VID) $(GENFB_VID) $(MGA_VID) $(MGA_CRTC2_VID) $(PM3_VID) $(SIS_VID) $(UNICHROME_VID) $(SAVAGE_VID)
-+W100_VID=w100_vid.so
-+W100_SRCS=w100_vid.c
-+W100_OBJS=w100_vid.o
-+W100_LIBS=-L$(QPEDIR)/lib -laticore
-+W100_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-+
-+all: $(W100_VID)
-
-
- .SUFFIXES: .c .o
diff --git a/packages/mplayer/mplayer-1.0pre7/zlib.patch b/packages/mplayer/mplayer-1.0pre7/zlib.patch
deleted file mode 100644
index 6e0918d8ed..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/zlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./configure.old 2004-09-24 01:03:55.000000000 +0930
-+++ ./configure 2004-09-24 01:04:18.000000000 +0930
-@@ -4313,13 +4313,7 @@
- echores "$_fribidi"
-
-
--echocheck "zlib"
--cat > $TMPC << EOF
--#include <zlib.h>
--int main(void) { (void) inflate(0, Z_NO_FLUSH); return 0; }
--EOF
--_zlib=no
--cc_check -lz && _zlib=yes
-+_zlib=yes
- if test "$_zlib" = yes ; then
- _def_zlib='#define HAVE_ZLIB 1'
- _ld_zlib='-lz'
diff --git a/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch b/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch
deleted file mode 100644
index 03456aca4a..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mplayer-1.1.4/Makefile.orig 2005-06-24 15:36:12.974059040 +0000
-+++ mplayer-1.1.4/Makefile 2005-06-24 15:36:31.628223176 +0000
-@@ -245,7 +245,7 @@
- ifeq ($(TARGET_WIN32),yes)
- windres -o osdep/mplayer-rc.o osdep/mplayer.rc
- endif
-- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
-+ $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) $(LDFLAGS)
- cp $(PRG) $(PRG).debug
- $(STRIP) $(PRG)
-
diff --git a/packages/mplayer/mplayer-atty-1.1.5/Makefile.patch b/packages/mplayer/mplayer-atty-1.1.5/Makefile.patch
deleted file mode 100644
index 78161e79ee..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/Makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig 2005-04-07 10:19:08.392784784 +0100
-+++ Makefile 2005-04-07 10:21:26.262825352 +0100
-@@ -8,11 +8,6 @@
-
- PRG_CFG = codec-cfg
-
--# Do not strip the binaries at installation
--ifeq ($(STRIPBINARIES),yes)
--INSTALLSTRIP = -s
--endif
--
- # These subdirectories require installation due to binaries within them.
- ifeq ($(VIDIX),yes)
- SUBDIRS += libdha vidix
-@@ -283,7 +278,7 @@
- $(MENCODER_DEP): version.h help_mp.h
-
- $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
-- $(HOST_CC) $(HOST_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
-+ $(BUILD_CC) $(BUILD_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
-
- install: $(ALL_PRG)
- ifeq ($(VIDIX),yes)
-@@ -368,7 +363,6 @@
- @for a in $(PARTS); do $(MAKE) -C $$a distclean; done
-
- strip:
-- strip -s $(ALL_PRG)
-
- dep: depend
-
diff --git a/packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch b/packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch
deleted file mode 100644
index ad6d4504e1..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- mplayer-1.1.5/configure.orig 2005-11-08 15:07:52.000000000 +0000
-+++ mplayer-1.1.5/configure 2005-11-08 15:08:40.000000000 +0000
-@@ -4627,33 +4627,7 @@
- echocheck "ALSA audio"
- if test "$_alsa" != no ; then
- _alsa=no
-- cat > $TMPC << EOF
--#include <sys/asoundlib.h>
--int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)); }
--EOF
-- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.5.x'
--
-- cat > $TMPC << EOF
--#include <sys/asoundlib.h>
--int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); }
--EOF
-- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x-sys'
-- cat > $TMPC << EOF
--#include <alsa/asoundlib.h>
--int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); }
--EOF
-- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x-alsa'
--
-- cat > $TMPC << EOF
--#include <sys/asoundlib.h>
--int main(void) { return (!(SND_LIB_MAJOR==1 && SND_LIB_MINOR==0)); }
--EOF
-- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='1.0.x-sys'
-- cat > $TMPC << EOF
--#include <alsa/asoundlib.h>
--int main(void) { return (!(SND_LIB_MAJOR==1 && SND_LIB_MINOR==0)); }
--EOF
-- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='1.0.x-alsa'
-+ _alsaver='1.0.x-alsa'
- fi
- _def_alsa5='#undef HAVE_ALSA5'
- _def_alsa9='#undef HAVE_ALSA9'
diff --git a/packages/mplayer/mplayer-atty-1.1.5/dsputil.patch b/packages/mplayer/mplayer-atty-1.1.5/dsputil.patch
deleted file mode 100644
index 962f1bc1e3..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/dsputil.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- mplayer-1.0.1/libavcodec/armv4l/dsputil_arm.c.orig 2005-04-08 09:16:18.310720680 +0000
-+++ mplayer-1.0.1/libavcodec/armv4l/dsputil_arm.c 2005-04-08 09:18:11.679486008 +0000
-@@ -248,22 +248,22 @@
- c->idct_permutation_type= FF_NO_IDCT_PERM;
- }
-
-- c->put_pixels_tab[0][0] = put_pixels16_arm;
-- c->put_pixels_tab[0][1] = put_pixels16_x2_arm;
-- c->put_pixels_tab[0][2] = put_pixels16_y2_arm;
-- c->put_pixels_tab[0][3] = put_pixels16_xy2_arm;
-- c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm;
-- c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm;
-- c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm;
-- c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm;
-- c->put_pixels_tab[1][0] = put_pixels8_arm;
-- c->put_pixels_tab[1][1] = put_pixels8_x2_arm;
-- c->put_pixels_tab[1][2] = put_pixels8_y2_arm;
-- c->put_pixels_tab[1][3] = put_pixels8_xy2_arm;
-- c->put_no_rnd_pixels_tab[1][0] = put_pixels8_arm;
-- c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_arm;
-- c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm;
-- c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm;
-+ /* c->put_pixels_tab[0][0] = put_pixels16_arm; */ // NG!
-+ c->put_pixels_tab[0][1] = put_pixels16_x2_arm; //OK!
-+ c->put_pixels_tab[0][2] = put_pixels16_y2_arm; //OK!
-+ /* c->put_pixels_tab[0][3] = put_pixels16_xy2_arm; /\* NG *\/ */
-+ /* c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm; // ?(.....) */
-+ c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm; // OK
-+ c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm; //OK
-+ /* c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm; //NG */
-+ c->put_pixels_tab[1][0] = put_pixels8_arm; //OK
-+ c->put_pixels_tab[1][1] = put_pixels8_x2_arm; //OK
-+ /* c->put_pixels_tab[1][2] = put_pixels8_y2_arm; //NG */
-+ /* c->put_pixels_tab[1][3] = put_pixels8_xy2_arm; //NG */
-+ c->put_no_rnd_pixels_tab[1][0] = put_pixels8_arm;//OK
-+ c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_arm; //OK
-+ c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm; //OK
-+ /* c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm;//NG */
-
- #ifdef HAVE_IWMMXT
- dsputil_init_iwmmxt(c, avctx);
diff --git a/packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch
deleted file mode 100644
index 9ca1266c4b..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- MPlayer-1.0pre7/libmpcodecs/Makefile.orig 2005-04-19 12:09:24.313075760 +0100
-+++ MPlayer-1.0pre7/libmpcodecs/Makefile 2005-04-19 12:09:55.204379568 +0100
-@@ -50,7 +50,7 @@
- SRCS2=$(ENCODER_SRCS)
- OBJS2=$(SRCS2:.c=.o)
-
--CFLAGS = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
-+CFLAGS = -I.. $(OPTFLAGS) -I. -Inative -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
-
- .SUFFIXES: .c .o
-
diff --git a/packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch
deleted file mode 100644
index 059a397926..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- MPlayer-1.0pre7/libmpdemux/Makefile.orig 2005-04-19 12:03:18.032758832 +0100
-+++ MPlayer-1.0pre7/libmpdemux/Makefile 2005-04-19 12:04:01.934084816 +0100
-@@ -36,8 +36,8 @@
-
- OBJS = $(SRCS:.c=.o)
- OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
--INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
--CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
-+INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
-+CFLAGS = -I.. $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
- CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE)
- CPLUSPLUS = $(CC)
-
diff --git a/packages/mplayer/mplayer-atty-1.1.5/sdl.patch b/packages/mplayer/mplayer-atty-1.1.5/sdl.patch
deleted file mode 100644
index d74c8397b9..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/sdl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- ./configure.orig 2004-09-24 19:09:56.000000000 +0930
-+++ ./configure 2004-09-24 19:22:21.000000000 +0930
-@@ -3554,38 +3554,6 @@
- #################
-
-
--echocheck "SDL"
--if test -z "$_sdlconfig" ; then
-- if ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then
-- _sdlconfig="sdl-config"
-- elif ( sdl11-config --version ) >>"$TMPLOG" 2>&1 ; then
-- _sdlconfig="sdl11-config"
-- else
-- _sdlconfig=false
-- fi
--fi
--if test "$_sdl" = auto || test "$_sdl" = yes ; then
-- cat > $TMPC << EOF
--#include <SDL.h>
--int main(int argc, char *argv[]) { return 0; }
--EOF
-- _sdl=no
-- if "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then
-- if cc_check `$_sdlconfig --cflags` `$_sdlconfig --libs` >>"$TMPLOG" 2>&1 ; then
-- _sdlversion=`$_sdlconfig --version | sed 's/[^0-9]//g'`
-- if test "$_sdlversion" -gt 116 ; then
-- if test "$_sdlversion" -lt 121 ; then
-- _def_sdlbuggy='#define BUGGY_SDL'
-- else
-- _def_sdlbuggy='#undef BUGGY_SDL'
-- fi
-- _sdl=yes
-- else
-- _sdl=outdated
-- fi
-- fi
-- fi
--fi
- if test "$_sdl" = yes ; then
- _def_sdl='#define HAVE_SDL 1'
- if cygwin ; then
diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb
deleted file mode 100644
index cfc8c7a40a..0000000000
--- a/packages/mplayer/mplayer-atty_1.1.5.bb
+++ /dev/null
@@ -1,77 +0,0 @@
-DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-HOMEPAGE = "http://atty.skr.jp/?Zaurus%2Fmplayer"
-DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib mplayer-common"
-RDEPENDS = "mplayer-common"
-LICENSE = "GPL"
-RCONFLICTS = "mplayer"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
-PR = "r5"
-
-SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \
- file://Makefile.patch;patch=1;pnum=0 \
- file://sdl.patch;patch=1 \
- file://Makefile-libs.patch;patch=1 \
- file://libmpdemux-ogg-include.patch;patch=1 \
- file://libmpcodecs-ogg-include.patch;patch=1 \
- file://alsa-configure.patch;patch=1 \
- file://mplayer-1.0_pre7-gcc4.patch;patch=1 "
-
-PARALLEL_MAKE = ""
-
-DEPENDS_append_c7x0 = " sharp-aticore-oss"
-PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_akita = "${MACHINE_ARCH}"
-PACKAGE_ARCH_spitz = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/mplayer-${PV}"
-
-FILES_${PN} = "${bindir}/mplayer"
-
-inherit autotools
-
-EXTRA_OECONF = " \
- --prefix=/usr \
- --mandir=${mandir} \
- --target=${TARGET_SYS} \
- --disable-shared-pp \
- \
- --disable-win32 \
- --disable-macosx \
- --disable-dvdread \
- --disable-mpdvdkit \
- --disable-tv \
- --disable-tv-v4l \
- --disable-tv-v4l2 \
- --disable-tv-bsdbt848 \
- --disable-mencoder \
- --disable-live \
- --disable-smb \
- \
- --enable-dynamic-plugins \
- --enable-fbdev \
- --enable-sdl \
- --enable-alsa \
- --with-sdl-config=${STAGING_BINDIR}/sdl-config \
- \
- --enable-mad \
- --enable-vorbis \
- \
- --enable-ossaudio \
- \
- --enable-rtc \
- --disable-ipp \
- --disable-iwmmxt \
- \
- --enable-freetype \
- --with-extralibdir=${STAGING_LIBDIR} "
-
-EXTRA_OECONF_append_c7x0 = " --enable-w100"
-EXTRA_OECONF_append_akita = " --enable-bvdd"
-EXTRA_OECONF_append_spitz = " --enable-bvdd"
-
-do_configure() {
- ./configure ${EXTRA_OECONF}
-}
-
diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb
deleted file mode 100644
index 25194beec9..0000000000
--- a/packages/mplayer/mplayer_1.0pre7.bb
+++ /dev/null
@@ -1,96 +0,0 @@
-DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg mplayer-common"
-RDEPENDS = "mplayer-common"
-LICENSE = "GPL"
-SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
- file://Makefile.patch;patch=1 \
- file://sdl.patch;patch=0 \
- file://zlib.patch;patch=0 \
- file://libmpdemux-ogg-include.patch;patch=1 \
- file://libmpcodecs-ogg-include.patch;patch=1 \
- file://mplayer-1.0_pre7-gcc4.patch;patch=1 "
-
-MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
-RCONFLICTS_${PN} = "mplayer-atty"
-PR = "r3"
-
-PARALLEL_MAKE = ""
-
-DEPENDS_append_c7x0 = " sharp-aticore-oss"
-PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"
-SRC_URI_append_c7x0 = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
- file://Makefile-vidix.patch;patch=0 \
- file://vidix-drivers-w100.patch;patch=1 "
-
-S = "${WORKDIR}/MPlayer-${PV}"
-
-PACKAGES =+ "postproc postproc-dev"
-
-FILES_${PN} = "${bindir}/mplayer ${libdir}/mplayer/vidix/w100_vid.so"
-
-FILES_postproc = " ${libdir}/libpostproc.so.0.0.0 ${libdir}/libpostproc.so.0"
-FILES_postproc-dev = " ${includedir}/postproc/postprocess.h ${libdir}/libpostproc.so ${libdir}/libpostproc.a"
-
-inherit autotools
-
-EXTRA_OECONF = " \
- --prefix=/usr \
- --mandir=${mandir} \
- --target=${TARGET_SYS} \
- --enable-shared-pp \
- \
- --disable-win32 \
- --disable-macosx \
- --disable-dvdread \
- --disable-mpdvdkit \
- --disable-tv \
- --disable-tv-v4l \
- --disable-tv-v4l2 \
- --disable-tv-bsdbt848 \
- --disable-mencoder \
- --disable-live \
- --disable-smb \
- \
- --enable-dynamic-plugins \
- --enable-fbdev \
- --enable-sdl \
- --with-sdl-config=${STAGING_BINDIR}/sdl-config \
- \
- --enable-mad \
- --enable-tremor-low \
- \
- --enable-ossaudio \
- \
- --enable-rtc \
- \
- --with-extralibdir=${STAGING_LIBDIR} "
-
-EXTRA_OECONF_append_c7x0 = " --enable-vidix "
-
-do_configure() {
- ./configure ${EXTRA_OECONF}
-}
-
-do_install_append () {
- install -d ${D}${libdir} ${D}${includedir} ${D}${includedir}/postproc
- install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/
- oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}${libdir}
- cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0
- cd ${D}${libdir}
- ln -sf libpostproc.so.0.0.0 libpostproc.so.0
- ln -sf libpostproc.so.0 libpostproc.so
-}
-
-do_stage () {
- oe_libinstall -a -so -C libavcodec/libpostproc libpostproc ${STAGING_LIBDIR}
- cd ${STAGING_LIBDIR}
- ln -sf libpostproc.so libpostproc.so.0.0.0
- ln -sf libpostproc.so libpostproc.so.0
-
- install -d ${STAGING_INCDIR}/postproc
- install -m 0644 ${S}/libavcodec/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h
-}
-
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index 7af431430b..2a37efe3c6 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -2,18 +2,21 @@ DESCRIPTION = "Open Source multimedia player."
SECTION = "opie/multimedia"
PRIORITY = "optional"
HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common"
+DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame"
RDEPENDS = "mplayer-common"
LICENSE = "GPL"
SRC_URI = "svn://svn.mplayerhq.hu/;module=mplayer \
file://vo_w100.c \
file://vo_w100_api.h \
file://vo_w100_fb.h \
- file://Makefile.patch;patch=1 \
+ file://Makefile-codec-cfg.patch;patch=1 \
file://w100-configure.patch;patch=1 \
file://w100-Makefile.patch;patch=1 \
file://w100-video_out.patch;patch=1 \
- file://w100-mplayer.patch;patch=1"
+ file://w100-mplayer.patch;patch= \
+ file://libmpdemux-ogg-include-svn.patch;patch=1 \
+ file://libmpcodecs-ogg-include.patch;patch=1 \
+ file://pld-onlyarm5.patch;patch=1"
MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
RCONFLICTS_${PN} = "mplayer-atty"
@@ -34,30 +37,132 @@ PACKAGES =+ "mencoder"
FILES_${PN} = "${bindir}/mplayer"
FILES_mencoder = "${bindir}/mencoder"
-inherit autotools
+inherit autotools pkgconfig
EXTRA_OECONF = " \
--prefix=/usr \
- --mandir=${mandir} \
+ --mandir=${mandir} \
--target=${TARGET_SYS} \
- \
- --enable-mencoder \
- --disable-gui \
- --enable-largefiles \
- --disable-linux-devfs \
- --disable-lirc \
- --disable-lircc \
- --disable-tv \
- --enable-rtc \
- --disable-smb \
- --disable-win32 \
- \
- --enable-tremor-low \
- --disable-mp3lib \
- \
- --disable-x11 \
- --enable-sdl \
- --enable-fbdev "
+ \
+ --enable-mencoder \
+ --disable-gui \
+ --enable-largefiles \
+ --disable-linux-devfs \
+ --disable-lirc \
+ --disable-lircc \
+ --disable-joystick \
+ --disable-vm \
+ --disable-xf86keysym \
+ --disable-tv \
+ --disable-tv-v4l \
+ --disable-tv-v4l2 \
+ --disable-tv-bsdbt848 \
+ --enable-rtc \
+ --enable-network \
+ --disable-winsock2 \
+ --disable-smb \
+ --disable-live \
+ --disable-dvdread \
+ --disable-mpdvdkit \
+ --disable-cdparanoia \
+ --enable-freetype \
+ --disable-unrarlib \
+ --disable-menu \
+ --enable-sortsub \
+ --disable-fribidi \
+ --disable-enca \
+ --disable-macosx \
+ --disable-macosx-finder-support \
+ --disable-macosx-bundle \
+ --disable-ftp \
+ --disable-vstream \
+ \
+ --disable-gif \
+ --enable-png \
+ --enable-jpeg \
+ --disable-libcdio \
+ --enable-liblzo \
+ --disable-win32 \
+ --disable-qtx \
+ --disable-xanim \
+ --disable-real \
+ --disable-xvid \
+ --disable-x264 \
+ \
+ --disable-libavutil_so \
+ --disable-libavcodec_so \
+ --disable-libavformat_so \
+ --disable-libpostproc_so \
+ --disable-libfame \
+ \
+ --enable-tremor-low \
+ \
+ --disable-speex \
+ --disable-theora \
+ --disable-faac \
+ --disable-ladspa \
+ --disable-libdv \
+ --enable-mad \
+ --disable-toolame \
+ --disable-twolame \
+ --disable-xmms \
+ --disable-mp3lib \
+ --disable-libdts \
+ --enable-libmpeg2 \
+ --disable-musepack \
+ --disable-amr_nb \
+ --disable-amr_nb-fixed \
+ --disable-amr_wb \
+ \
+ --disable-gl \
+ --disable-dga \
+ --disable-vesa \
+ --disable-svga \
+ --enable-sdl \
+ --disable-aa \
+ --disable-caca \
+ --disable-ggi \
+ --disable-ggiwmh \
+ --disable-directx \
+ --disable-dxr2 \
+ --disable-dxr3 \
+ --disable-dvb \
+ --disable-dvbhead \
+ --disable-mga \
+ --disable-xmga \
+ --disable-xv \
+ --disable-xvmc \
+ --disable-vm \
+ --disable-xinerama \
+ --disable-x11 \
+ --enable-fbdev \
+ --disable-mlib \
+ --disable-3dfx \
+ --disable-tdfxfb \
+ --disable-s3fb \
+ --disable-directfb \
+ --disable-zr \
+ --disable-bl \
+ --disable-tdfxvid \
+ --disable-tga \
+ --disable-pnm \
+ --disable-md5sum \
+ \
+ --enable-alsa \
+ --enable-ossaudio \
+ --disable-arts \
+ --disable-esd \
+ --disable-polyp \
+ --disable-jack \
+ --disable-openal \
+ --disable-nas \
+ --disable-sgiaudio \
+ --disable-sunaudio \
+ --disable-win32waveout \
+ --enable-select \
+ \
+ --disable-runtime-cpudetection \
+ "
EXTRA_OECONF_append_c7x0 = " --enable-w100 "
diff --git a/packages/mtd/mtd-utils-native_20050801.bb b/packages/mtd/mtd-utils-native_0.0.0+cvs20050801.bb
index cd1fb7d11b..cd1fb7d11b 100644
--- a/packages/mtd/mtd-utils-native_20050801.bb
+++ b/packages/mtd/mtd-utils-native_0.0.0+cvs20050801.bb
diff --git a/packages/mtd/mtd-utils-native_20060223.bb b/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb
index cd1fb7d11b..cd1fb7d11b 100644
--- a/packages/mtd/mtd-utils-native_20060223.bb
+++ b/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb
diff --git a/packages/mtd/mtd-utils_0.0.0+cvs20050801.bb b/packages/mtd/mtd-utils_0.0.0+cvs20050801.bb
new file mode 100644
index 0000000000..fee110a754
--- /dev/null
+++ b/packages/mtd/mtd-utils_0.0.0+cvs20050801.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Tools for managing memory technology devices."
+SECTION = "base"
+DEPENDS = "zlib"
+HOMEPAGE = "http://www.linux-mtd.infradead.org/"
+LICENSE = "GPLv2"
+PR = "r0"
+SRCDATE = "20050801"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \
+ file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \
+ file://more-verbosity.patch;patch=1 \
+ file://fix-ignoreerrors.patch;patch=1"
+S = "${WORKDIR}/mtd/"
+
+CFLAGS_prepend = "-I${S}/include "
+
+do_compile () {
+ oe_runmake -C util ${mtd_utils}
+}
+
+do_stage () {
+ install -d ${STAGING_INCDIR}/mtd
+ for f in ${S}/include/mtd/*.h; do
+ install -m 0644 $f ${STAGING_INCDIR}/mtd/
+ done
+}
+
+mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
+ mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
+ flashcp nandwrite jffs2dump"
+
+do_install () {
+ install -d ${D}${bindir}
+ for binary in ${mtd_utils}; do
+ install -m 0755 util/$binary ${D}${bindir}
+ done
+}
diff --git a/packages/mtd/mtd-utils_0.0.0+cvs20060223.bb b/packages/mtd/mtd-utils_0.0.0+cvs20060223.bb
new file mode 100644
index 0000000000..50e4dc184f
--- /dev/null
+++ b/packages/mtd/mtd-utils_0.0.0+cvs20060223.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Tools for managing memory technology devices."
+SECTION = "base"
+DEPENDS = "zlib"
+HOMEPAGE = "http://www.linux-mtd.infradead.org/"
+LICENSE = "GPLv2"
+PR = "r0"
+SRCDATE = "20060223"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \
+ file://add-exclusion-to-mkfs-jffs2-20060131.patch;patch=1 \
+ file://fix-ignoreerrors-20060131.patch;patch=1"
+S = "${WORKDIR}/mtd/"
+
+CFLAGS_prepend = "-I${S}/include "
+
+do_compile () {
+ oe_runmake -C util ${mtd_utils}
+}
+
+do_stage () {
+ install -d ${STAGING_INCDIR}/mtd
+ for f in ${S}/include/mtd/*.h; do
+ install -m 0644 $f ${STAGING_INCDIR}/mtd/
+ done
+}
+
+mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
+ mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
+ flashcp nandwrite jffs2dump sumtool"
+
+do_install () {
+ install -d ${D}${bindir}
+ for binary in ${mtd_utils}; do
+ install -m 0755 util/$binary ${D}${bindir}
+ done
+}
diff --git a/packages/mtd/mtd-utils_1.0.0.bb b/packages/mtd/mtd-utils_1.0.0.bb
index 06347339a1..aae722b987 100644
--- a/packages/mtd/mtd-utils_1.0.0.bb
+++ b/packages/mtd/mtd-utils_1.0.0.bb
@@ -5,6 +5,10 @@ HOMEPAGE = "http://www.linux-mtd.infradead.org/"
LICENSE = "GPLv2"
PR = "r0"
+# RP/kergoth: Builds seem to break with recent mtd-utils
+# Can't pin down the exact problems
+DEFAULT_PREFERENCE = "-1"
+
SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.0.0.tar.gz"
CFLAGS_prepend = "-I${WORKDIR}/mtd-utils-${PV}/include "
diff --git a/packages/mtd/mtd-utils_20050801.bb b/packages/mtd/mtd-utils_20050801.bb
deleted file mode 100644
index eb25309b36..0000000000
--- a/packages/mtd/mtd-utils_20050801.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "Tools for managing memory technology devices."
-SECTION = "base"
-DEPENDS = "zlib"
-HOMEPAGE = "http://www.linux-mtd.infradead.org/"
-LICENSE = "GPLv2"
-PR = "r0"
-SRCDATE = "${PV}"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \
- file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \
- file://more-verbosity.patch;patch=1 \
- file://fix-ignoreerrors.patch;patch=1"
-S = "${WORKDIR}/mtd/"
-
-CFLAGS_prepend = "-I${S}/include "
-
-do_compile () {
- oe_runmake -C util ${mtd_utils}
-}
-
-do_stage () {
- install -d ${STAGING_INCDIR}/mtd
- for f in ${S}/include/mtd/*.h; do
- install -m 0644 $f ${STAGING_INCDIR}/mtd/
- done
-}
-
-mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
- mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
- flashcp nandwrite jffs2dump"
-
-do_install () {
- install -d ${D}${bindir}
- for binary in ${mtd_utils}; do
- install -m 0755 util/$binary ${D}${bindir}
- done
-}
diff --git a/packages/mtd/mtd-utils_20060223.bb b/packages/mtd/mtd-utils_20060223.bb
deleted file mode 100644
index 21d0f21fcd..0000000000
--- a/packages/mtd/mtd-utils_20060223.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Tools for managing memory technology devices."
-SECTION = "base"
-DEPENDS = "zlib"
-HOMEPAGE = "http://www.linux-mtd.infradead.org/"
-LICENSE = "GPLv2"
-PR = "r0"
-SRCDATE = "${PV}"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \
- file://add-exclusion-to-mkfs-jffs2-20060131.patch;patch=1 \
- file://fix-ignoreerrors-20060131.patch;patch=1"
-S = "${WORKDIR}/mtd/"
-
-CFLAGS_prepend = "-I${S}/include "
-
-do_compile () {
- oe_runmake -C util ${mtd_utils}
-}
-
-do_stage () {
- install -d ${STAGING_INCDIR}/mtd
- for f in ${S}/include/mtd/*.h; do
- install -m 0644 $f ${STAGING_INCDIR}/mtd/
- done
-}
-
-mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
- mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
- flashcp nandwrite jffs2dump sumtool"
-
-do_install () {
- install -d ${D}${bindir}
- for binary in ${mtd_utils}; do
- install -m 0755 util/$binary ${D}${bindir}
- done
-}
diff --git a/packages/mysql/files/my.cnf b/packages/mysql/files/my.cnf
new file mode 100644
index 0000000000..15a8b1b4ab
--- /dev/null
+++ b/packages/mysql/files/my.cnf
@@ -0,0 +1,21 @@
+[client]
+#password = password
+port = 3306
+socket = /tmp/mysql.sock
+
+[mysqld_safe]
+err-log = /var/log/mysql.err
+
+[mysqld]
+user = mysql
+port = 3306
+socket = /tmp/mysql.sock
+pid-file = /var/run/mysqld.pid
+log-error = /var/log/mysqld.err
+basedir = /usr
+datadir = /var/mysql
+skip-locking
+skip-innodb
+skip-networking
+bind-address = localhost
+
diff --git a/packages/mysql/files/mysqld.sh b/packages/mysql/files/mysqld.sh
new file mode 100644
index 0000000000..c94772e202
--- /dev/null
+++ b/packages/mysql/files/mysqld.sh
@@ -0,0 +1,20 @@
+# MySQL init script
+
+. /etc/default/rcS
+
+case "$1" in
+ start)
+ /usr/bin/mysqld_safe &
+ ;;
+ stop)
+ if test -f /var/run/mysqld.pid ; then
+ PID=`cat /var/run/mysqld.pid`
+ kill $PID
+ fi
+ ;;
+ *)
+ echo "Usage: /etc/init.d/mysqld {start|stop}"
+ ;;
+esac
+
+exit 0
diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb
index d35442b50a..53165ac8d4 100644
--- a/packages/mysql/mysql_4.1.18.bb
+++ b/packages/mysql/mysql_4.1.18.bb
@@ -3,19 +3,25 @@ SECTION = "libs"
HOMEPAGE = "http://www.mysql.com/"
DEPENDS += "ncurses mysql-native"
LICENSE = "GPL"
-PR = "r1"
+PR="r2"
SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \
file://autofoo.patch;patch=1 \
- file://gen_lex_hash.patch;patch=1"
+ file://gen_lex_hash.patch;patch=1 \
+ file://my.cnf \
+ file://mysqld.sh"
S = "${WORKDIR}/mysql-${PV}"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
BINCONFIG_GLOB = "mysql_config"
-inherit autotools binconfig
+inherit autotools binconfig update-rc.d
+
+INITSCRIPT_PACKAGES = "mysql-server"
+INITSCRIPT_NAME = "mysqld"
+INITSCRIPT_PARAMS = "start 45 S . stop 45 0 6 1 ."
EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'"
EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb "
@@ -30,13 +36,29 @@ do_install() {
oe_runmake 'DESTDIR=${D}' install
mv -f ${D}${libdir}/mysql/* ${D}${libdir}
rmdir ${D}${libdir}/mysql
+
+ install -d ${D}/etc/init.d
+ install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/
+ install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld
}
-pkg_postinst () {
+pkg_postinst_mysql-server () {
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+
grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql
+
+ #Install the database
+ test -d /usr/bin || mkdir -p /usr/bin
+ test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname
+ chmod go+rw /var/run
+
+ mysql_install_db
+
}
-pkg_postrm () {
+pkg_postrm_mysql-server () {
grep mysql /etc/passwd && deluser mysql
}
@@ -112,4 +134,6 @@ ${sbindir}/ndb_cpcd \
${sbindir}/ndbd \
${sbindir}/ndb_mgmd \
${datadir}/mysql/ \
-${localstatedir}/mysql/"
+${localstatedir}/mysql/ \
+${sysconfdir}/init.d \
+${sysconfdir}/my.cnf"
diff --git a/packages/notification-daemon/notification-daemon_0.3.5.bb b/packages/notification-daemon/notification-daemon_0.3.5.bb
new file mode 100644
index 0000000000..8acabfae73
--- /dev/null
+++ b/packages/notification-daemon/notification-daemon_0.3.5.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "a dbus service that listens to desktop notification requests and displays them"
+HOMEPAGE = "http://www.galago-project.org/"
+LICENSE = "GPL"
+DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${libexecdir}/notification-daemon \
+ ${datadir}/dbus-1/services/notification-daemon.service \
+ ${libdir}/notification-daemon-1.0/engines/libstandard.so \
+ ${sysconfdir}/gconf/schemas/notification-daemon.schemas"
+
+SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz"
+EXTRA_OECONF = "--disable-binreloc"
+
+inherit autotools pkgconfig
diff --git a/packages/xlibs/libxdmcp/.mtn2git_empty b/packages/p4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxdmcp/.mtn2git_empty
+++ b/packages/p4/.mtn2git_empty
diff --git a/packages/p4/p4.inc b/packages/p4/p4.inc
new file mode 100644
index 0000000000..a473cfeea1
--- /dev/null
+++ b/packages/p4/p4.inc
@@ -0,0 +1,81 @@
+# p4 .bb build file
+# Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see /COPYING)
+
+HOMEPAGE = "http://www.perforce.com"
+DESCRIPTION = "Perforce client and server binaries"
+MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
+LICENSE = "Perforce"
+
+def get_kernelmajorversion(p):
+ import re
+ r = re.compile("([0-9]+\.[0-9]+).*")
+ m = r.match(p);
+ if m:
+ return m.group(1)
+ return None
+
+def p4_arch(d):
+ import bb, re
+ arch = bb.data.getVar('TARGET_ARCH', d, 1)
+ os = bb.data.getVar('TARGET_OS', d, 1)
+
+ if re.match("^linux.*$", os):
+ r = re.compile("([0-9]+\.[0-9]+).*")
+ m = r.match(base_read_file(bb.data.expand('${STAGING_KERNEL_DIR}/kernel-abiversion', d)));
+ os = "linux"
+ if m and re.match("^.*86.*$", arch):
+ os = "linux%s" % m.group(1).replace('.','')
+
+ if re.match("^i.86$", arch):
+ arch = "x86"
+ elif arch == "x86_64":
+ arch = "amd64"
+ elif re.match("^mips.*$", arch):
+ arch = "mips"
+
+ return "%s%s" % (os, arch)
+
+P4ARCH="${@p4_arch(d)}"
+P4BASEURL="http://filehost.perforce.com/perforce/r${PV}/bin.${P4ARCH}"
+S="${WORKDIR}"
+
+#Because these files are all named the same thing, regardless of version or arch
+PREMIRRORS=""
+DL_DIR="${WORKDIR}/${P4ARCH}"
+
+SRC_URI="\
+ ${P4BASEURL}/p4 \
+ ${P4BASEURL}/p4api.tar \
+ ${P4BASEURL}/p4d \
+ ${P4BASEURL}/p4ftpd \
+ ${P4BASEURL}/p4p \
+ ${P4BASEURL}/p4web"
+
+PACKAGES += " ${PN}-server"
+FILES_${PN} = " ${bindir}/p4"
+FILES_${PN}-server = " ${bindir}/p4d ${bindir}/p4ftpd ${bindir}/p4p ${bindir}/p4web"
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/p4api
+ install -m 0644 *.h ${STAGING_INCDIR}/p4api/
+
+ oe_libinstall -a libclient ${STAGING_LIBDIR}
+ oe_libinstall -a librpc ${STAGING_LIBDIR}
+ oe_libinstall -a libsupp ${STAGING_LIBDIR}
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${includedir}/p4api
+ install -d ${D}${libdir}
+
+ install -m 0644 *.h ${D}${includedir}/p4api/
+ for p4bin in p4 p4d p4ftpd p4p p4web ; do
+ install -m 0755 $p4bin ${D}${bindir}/
+ done
+
+ oe_libinstall -a libclient ${D}${libdir}/
+ oe_libinstall -a librpc ${D}${libdir}/
+ oe_libinstall -a libsupp ${D}${libdir}/
+}
diff --git a/packages/p4/p4_04.2.bb b/packages/p4/p4_04.2.bb
new file mode 100644
index 0000000000..7e1ac53785
--- /dev/null
+++ b/packages/p4/p4_04.2.bb
@@ -0,0 +1,5 @@
+# p4 .bb build file
+# Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see /COPYING)
+
+include p4.inc
diff --git a/packages/p4/p4_05.2.bb b/packages/p4/p4_05.2.bb
new file mode 100644
index 0000000000..7e1ac53785
--- /dev/null
+++ b/packages/p4/p4_05.2.bb
@@ -0,0 +1,5 @@
+# p4 .bb build file
+# Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see /COPYING)
+
+include p4.inc
diff --git a/packages/pango/pango_1.10.0.bb b/packages/pango/pango_1.10.0.bb
index 869b146d56..5898eae40e 100644
--- a/packages/pango/pango_1.10.0.bb
+++ b/packages/pango/pango_1.10.0.bb
@@ -7,6 +7,8 @@ Open Source framework for the layout and rendering of \
internationalized text."
PR = "r0"
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
+
# seems to go wrong with default cflags
FULL_OPTIMIZATION_arm = "-O2"
diff --git a/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb
index 068eeafddf..e9da77c13a 100644
--- a/packages/pango/pango_1.10.2.bb
+++ b/packages/pango/pango_1.10.2.bb
@@ -7,6 +7,8 @@ Open Source framework for the layout and rendering of \
internationalized text."
PR = "r0"
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
+
# seems to go wrong with default cflags
FULL_OPTIMIZATION_arm = "-O2"
diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb
index 08aa64b6a2..704bf4ffc5 100644
--- a/packages/pango/pango_1.12.0.bb
+++ b/packages/pango/pango_1.12.0.bb
@@ -7,6 +7,8 @@ Open Source framework for the layout and rendering of \
internationalized text."
PR = "r0"
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
+
# seems to go wrong with default cflags
FULL_OPTIMIZATION_arm = "-O2"
diff --git a/packages/pango/pango_1.13.2.bb b/packages/pango/pango_1.13.2.bb
index 113f604340..ae3cd003d9 100644
--- a/packages/pango/pango_1.13.2.bb
+++ b/packages/pango/pango_1.13.2.bb
@@ -7,6 +7,8 @@ Open Source framework for the layout and rendering of \
internationalized text."
PR = "r0"
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
+
# seems to go wrong with default cflags
FULL_OPTIMIZATION_arm = "-O2"
diff --git a/packages/xlibs/libxext/.mtn2git_empty b/packages/pmtools/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxext/.mtn2git_empty
+++ b/packages/pmtools/.mtn2git_empty
diff --git a/packages/pmtools/pmtools_20050926.bb b/packages/pmtools/pmtools_20050926.bb
new file mode 100644
index 0000000000..6e6e0f02e7
--- /dev/null
+++ b/packages/pmtools/pmtools_20050926.bb
@@ -0,0 +1,12 @@
+SRC_URI="http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils/pmtools-${PV}.tar.bz2"
+
+S="${WORKDIR}/pmtools"
+
+do_compile() {
+ oe_runmake
+}
+
+do_install() {
+ install -d ${D}/usr/bin
+ install ${S}/acpidump/acpidump ${D}/usr/bin
+}
diff --git a/packages/xlibs/libxfixes/.mtn2git_empty b/packages/prelink/prelink-20060712/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxfixes/.mtn2git_empty
+++ b/packages/prelink/prelink-20060712/.mtn2git_empty
diff --git a/packages/prelink/prelink-20050901/arm_eabi.patch b/packages/prelink/prelink-20060712/arm_eabi.patch
index b234af9b3f..b234af9b3f 100644
--- a/packages/prelink/prelink-20050901/arm_eabi.patch
+++ b/packages/prelink/prelink-20060712/arm_eabi.patch
diff --git a/packages/prelink/prelink-20050901/prelink.conf b/packages/prelink/prelink-20060712/prelink.conf
index c5a4f4adc3..c5a4f4adc3 100644
--- a/packages/prelink/prelink-20050901/prelink.conf
+++ b/packages/prelink/prelink-20060712/prelink.conf
diff --git a/packages/prelink/prelink-20050901/prelink.cron.daily b/packages/prelink/prelink-20060712/prelink.cron.daily
index 0b3c07322c..0b3c07322c 100644
--- a/packages/prelink/prelink-20050901/prelink.cron.daily
+++ b/packages/prelink/prelink-20060712/prelink.cron.daily
diff --git a/packages/prelink/prelink-20050901/prelink.default b/packages/prelink/prelink-20060712/prelink.default
index 901258ed2a..901258ed2a 100644
--- a/packages/prelink/prelink-20050901/prelink.default
+++ b/packages/prelink/prelink-20060712/prelink.default
diff --git a/packages/prelink/prelink_20050901.bb b/packages/prelink/prelink_20060712.bb
index a83ff1b61f..a83ff1b61f 100644
--- a/packages/prelink/prelink_20050901.bb
+++ b/packages/prelink/prelink_20060712.bb
diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc
index 52e0b5d082..92db34115b 100644
--- a/packages/python/python-2.4.3-manifest.inc
+++ b/packages/python/python-2.4.3-manifest.inc
@@ -8,9 +8,9 @@
########################################################################################################################
-PROVIDES+="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PROVIDES+="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-profile "
-PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-profile "
DESCRIPTION_python-threading="Python Threading & Synchronization Support"
PR_python-threading="ml0"
@@ -258,4 +258,9 @@ RDEPENDS_python-audio="python-core"
FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so "
+DESCRIPTION_python-profile="Python Profiler Support"
+PR_python-profile="ml0"
+RDEPENDS_python-profile="python-core"
+FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* "
+
diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb
index dafae9a3a8..4fe3ebd402 100644
--- a/packages/python/python_2.4.3.bb
+++ b/packages/python/python_2.4.3.bb
@@ -44,7 +44,8 @@ do_compile() {
HOSTPYTHON=${STAGING_BINDIR}/python \
STAGING_LIBDIR=${STAGING_LIBDIR} \
STAGING_INCDIR=${STAGING_INCDIR} \
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS}
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ OPT="${CFLAGS}"
}
do_stage() {
diff --git a/packages/qemu/qemu_0.8.1.bb b/packages/qemu/qemu_0.8.1.bb
new file mode 100644
index 0000000000..fd7a892347
--- /dev/null
+++ b/packages/qemu/qemu_0.8.1.bb
@@ -0,0 +1,6 @@
+LICENSE = "GPL"
+
+SRC_URI = "http://fabrice.bellard.free.fr/qemu/qemu-${PV}.tar.gz"
+
+inherit autotools
+
diff --git a/packages/rhythmbox/rhythmbox/omfmake.patch b/packages/rhythmbox/rhythmbox/omfmake.patch
new file mode 100644
index 0000000000..8950a7b66f
--- /dev/null
+++ b/packages/rhythmbox/rhythmbox/omfmake.patch
@@ -0,0 +1,13 @@
+--- rhythmbox-0.8.4/omf.make 2004-04-15 12:30:20.000000000 -0700
++++ rhythmbox-0.8.4.new/omf.make 2004-06-08 16:11:06.130981816 -0700
+@@ -41,7 +41,9 @@
+ install-data-hook-omf:
+ $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ for file in $(omffile); do \
+- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++ if [ -f $$file.out ]; then \
++ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++ fi; \
+ done
+ -scrollkeeper-update -o $(DESTDIR)$(omf_dest_dir)
+
diff --git a/packages/rhythmbox/rhythmbox_0.8.5.bb b/packages/rhythmbox/rhythmbox_0.8.5.bb
index b35914cccc..8a6f3a8905 100644
--- a/packages/rhythmbox/rhythmbox_0.8.5.bb
+++ b/packages/rhythmbox/rhythmbox_0.8.5.bb
@@ -1,8 +1,9 @@
LICENSE = "GPL"
SECTION = "unknown"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-${PV}.tar.gz \
- file://ogg.m4 file://vorbis.m4"
+ file://ogg.m4 file://vorbis.m4 \
+ file://omfmake.patch;patch=1"
DEPENDS = "gstreamer gst-plugins libgnomeui"
diff --git a/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb b/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb
index 4d3392c128..23d6fead53 100644
--- a/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb
+++ b/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb
@@ -17,5 +17,9 @@ do_stage() {
install -d ${STAGING_BINDIR}
sed -e '1,1s|${bindir}/|${bindir}/env |' bin/rpm2cpio.pl \
> ${STAGING_BINDIR}/rpm2cpio.pl
+
+ my_PERL="/usr/bin/env perl"
+ sed -e "s%/[a-zA-Z0-9/]*/bin/perl%$my_PERL%g" -i ${STAGING_BINDIR}/rpm2cpio.pl
+
chmod 0755 ${STAGING_BINDIR}/rpm2cpio.pl
}
diff --git a/packages/xlibs/libxfont/.mtn2git_empty b/packages/tango/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxfont/.mtn2git_empty
+++ b/packages/tango/.mtn2git_empty
diff --git a/packages/xlibs/libxft/.mtn2git_empty b/packages/tango/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxft/.mtn2git_empty
+++ b/packages/tango/files/.mtn2git_empty
diff --git a/packages/tango/files/no-icon-naming-utils.patch b/packages/tango/files/no-icon-naming-utils.patch
new file mode 100644
index 0000000000..690a06f431
--- /dev/null
+++ b/packages/tango/files/no-icon-naming-utils.patch
@@ -0,0 +1,12 @@
+--- tango-icon-theme-0.6.1/configure.ac.orig 2005-12-10 20:48:31 +0100
++++ tango-icon-theme-0.6.1/configure.ac 2005-12-10 20:49:18 +0100
+@@ -38,8 +38,7 @@
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
++ ICONMAP="true"
+- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
+- and install tango-icon-theme])
+ fi
+
+ # Check for convert from ImageMagick to add the 1x1 frame to 22x22 icons
diff --git a/packages/tango/tango-icon-theme-extras_0.1.0.bb b/packages/tango/tango-icon-theme-extras_0.1.0.bb
new file mode 100644
index 0000000000..d9158234e9
--- /dev/null
+++ b/packages/tango/tango-icon-theme-extras_0.1.0.bb
@@ -0,0 +1,8 @@
+SECTION = "unknown"
+LICENSE = "http://creativecommons.org/licenses/by-sa/2.5/"
+inherit autotools pkgconfig
+
+SRC_URI = "http://tango-project.org/releases/${PN}-${PV}.tar.gz \
+ file://no-icon-naming-utils.patch;patch=1"
+EXTRA_OECONF = "--disable-icon-framing"
+FILES_${PN} += "${datadir}/icons"
diff --git a/packages/tango/tango-icon-theme_0.7.2.bb b/packages/tango/tango-icon-theme_0.7.2.bb
new file mode 100644
index 0000000000..d9158234e9
--- /dev/null
+++ b/packages/tango/tango-icon-theme_0.7.2.bb
@@ -0,0 +1,8 @@
+SECTION = "unknown"
+LICENSE = "http://creativecommons.org/licenses/by-sa/2.5/"
+inherit autotools pkgconfig
+
+SRC_URI = "http://tango-project.org/releases/${PN}-${PV}.tar.gz \
+ file://no-icon-naming-utils.patch;patch=1"
+EXTRA_OECONF = "--disable-icon-framing"
+FILES_${PN} += "${datadir}/icons"
diff --git a/packages/xlibs/libxi/.mtn2git_empty b/packages/tasks/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxi/.mtn2git_empty
+++ b/packages/tasks/.mtn2git_empty
diff --git a/packages/meta/task-bootstrap-unionroot.bb b/packages/tasks/task-bootstrap-unionroot.bb
index 5db841903d..5db841903d 100644
--- a/packages/meta/task-bootstrap-unionroot.bb
+++ b/packages/tasks/task-bootstrap-unionroot.bb
diff --git a/packages/meta/task-bootstrap.bb b/packages/tasks/task-bootstrap.bb
index ef76ec4345..ef76ec4345 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/tasks/task-bootstrap.bb
diff --git a/packages/meta/task-dvb.bb b/packages/tasks/task-dvb.bb
index 5a5c37a565..5a5c37a565 100644
--- a/packages/meta/task-dvb.bb
+++ b/packages/tasks/task-dvb.bb
diff --git a/packages/tasks/task-e-x11.bb b/packages/tasks/task-e-x11.bb
new file mode 100644
index 0000000000..899ed38a94
--- /dev/null
+++ b/packages/tasks/task-e-x11.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Tasks for Enlightenment/X11"
+PACKAGES = "task-e-x11-core task-e-x11"
+PROVIDES = "task-e-x11-core task-e-x11"
+PR = "r9"
+
+PREFERRED_PROVIDER_virtual/imlib2 = "imlib-x11"
+
+ALLOW_EMPTY = 1
+
+#
+# X
+#
+RDEPENDS_task-e-x11-core = "rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
+ ttf-bitstream-vera gpe-bootsplash-theme-e"
+
+#
+# E-core
+#
+RDEPENDS_task-e-x11-core += "entrance e-wm"
+
+
+RDEPENDS_task-e-x11 = "task-e-x11-core"
+# entice eclair examine evidence e-modules e-utils elitaire"
+DEPENDS_task-e-x11 = "task-e-x11-core"
+# entice eclair examine evidence e-modules e-utils elitaire"
diff --git a/packages/meta/task-essential-parts.bb b/packages/tasks/task-essential-parts.bb
index 49183170c4..49183170c4 100644
--- a/packages/meta/task-essential-parts.bb
+++ b/packages/tasks/task-essential-parts.bb
diff --git a/packages/meta/task-essential-to-boot.bb b/packages/tasks/task-essential-to-boot.bb
index 8bcd182b58..8bcd182b58 100644
--- a/packages/meta/task-essential-to-boot.bb
+++ b/packages/tasks/task-essential-to-boot.bb
diff --git a/packages/meta/task-gpe.bb b/packages/tasks/task-gpe.bb
index 80f85238d1..80f85238d1 100644
--- a/packages/meta/task-gpe.bb
+++ b/packages/tasks/task-gpe.bb
diff --git a/packages/meta/task-mythfront.bb b/packages/tasks/task-mythfront.bb
index a1532c1739..a1532c1739 100644
--- a/packages/meta/task-mythfront.bb
+++ b/packages/tasks/task-mythfront.bb
diff --git a/packages/meta/task-opie.bb b/packages/tasks/task-opie.bb
index a9405522a1..a9405522a1 100644
--- a/packages/meta/task-opie.bb
+++ b/packages/tasks/task-opie.bb
diff --git a/packages/meta/task-pivotboot.bb b/packages/tasks/task-pivotboot.bb
index 091f70f459..091f70f459 100644
--- a/packages/meta/task-pivotboot.bb
+++ b/packages/tasks/task-pivotboot.bb
diff --git a/packages/meta/task-python-everything_20060425.bb b/packages/tasks/task-python-everything_20060425.bb
index 7fd4c8f286..7fd4c8f286 100644
--- a/packages/meta/task-python-everything_20060425.bb
+++ b/packages/tasks/task-python-everything_20060425.bb
diff --git a/packages/meta/task-python-sharprom_20060425.bb b/packages/tasks/task-python-sharprom_20060425.bb
index bb62a15472..bb62a15472 100644
--- a/packages/meta/task-python-sharprom_20060425.bb
+++ b/packages/tasks/task-python-sharprom_20060425.bb
diff --git a/packages/meta/task-qpe.bb b/packages/tasks/task-qpe.bb
index 50f42d84fa..50f42d84fa 100644
--- a/packages/meta/task-qpe.bb
+++ b/packages/tasks/task-qpe.bb
diff --git a/packages/meta/task-sdk.bb b/packages/tasks/task-sdk.bb
index c39ffd59f8..c39ffd59f8 100644
--- a/packages/meta/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
diff --git a/packages/meta/task-sdl.bb b/packages/tasks/task-sdl.bb
index 046283f28f..046283f28f 100644
--- a/packages/meta/task-sdl.bb
+++ b/packages/tasks/task-sdl.bb
diff --git a/packages/meta/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb
index 4c508ec7c5..4c508ec7c5 100644
--- a/packages/meta/task-xfce-base.bb
+++ b/packages/tasks/task-xfce-base.bb
diff --git a/packages/meta/task-xterminal.bb b/packages/tasks/task-xterminal.bb
index 77eb094caa..77eb094caa 100644
--- a/packages/meta/task-xterminal.bb
+++ b/packages/tasks/task-xterminal.bb
diff --git a/packages/tcltk/tcl/fix-configure.patch b/packages/tcltk/tcl/fix-configure.patch
index e37780352d..8b2654bae0 100644
--- a/packages/tcltk/tcl/fix-configure.patch
+++ b/packages/tcltk/tcl/fix-configure.patch
@@ -1,11 +1,30 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- tcl8.4.11/unix/configure~fix-configure
+Index: unix/tcl.m4
+===================================================================
+--- tcl8.4.11/unix.orig/tcl.m4
++++ tcl8.4.11/unix/tcl.m4
+@@ -845,7 +845,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+ # results, and the version is kept in special file).
+
+ if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++ system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ fi
+ if test "`uname -s`" = "AIX" ; then
+ system=AIX-`uname -v`.`uname -r`
+@@ -2250,7 +2250,7 @@ AC_DEFUN(SC_BLOCKING_STYLE, [
+ # results, and the version is kept in special file).
+
+ if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++ system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ fi
+ if test "`uname -s`" = "AIX" ; then
+ system=AIX-`uname -v`.`uname -r`
+Index: unix/configure
+===================================================================
+--- tcl8.4.11/unix.orig/configure
+++ tcl8.4.11/unix/configure
-@@ -2130,7 +2130,7 @@
+@@ -2130,7 +2130,7 @@ echo "configure:2121: checking system ve
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
@@ -14,7 +33,7 @@
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
-@@ -7608,7 +7608,7 @@
+@@ -7608,7 +7608,7 @@ echo "configure:7600: checking FIONBIO v
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
diff --git a/packages/xlibs/libxpm/.mtn2git_empty b/packages/tomoe/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxpm/.mtn2git_empty
+++ b/packages/tomoe/.mtn2git_empty
diff --git a/packages/tomoe/libtomoe-gtk_0.1.0.bb b/packages/tomoe/libtomoe-gtk_0.1.0.bb
new file mode 100644
index 0000000000..a4dbff2085
--- /dev/null
+++ b/packages/tomoe/libtomoe-gtk_0.1.0.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "A handwriting recognition engine"
+HOMEPAGE = "http://tomoe.sourceforge.net"
+SECTION = "libs"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+DEPENDS = "gtk+ tomoe"
+LICENSE = "LGPL"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://prdownloads.sourceforge.jp/tomoe/17171/libtomoe-gtk-0.1.0.tar.gz"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/tomoe/tomoe_0.2.1.bb b/packages/tomoe/tomoe_0.2.1.bb
new file mode 100644
index 0000000000..f321142dd1
--- /dev/null
+++ b/packages/tomoe/tomoe_0.2.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "A handwriting recognition engine"
+HOMEPAGE = "http://tomoe.sourceforge.net"
+SECTION = "libs"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+LICENSE = "LGPL"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
+
+SRC_URI = "http://prdownloads.sourceforge.jp/tomoe/16048/tomoe-0.2.1.tar.gz"
diff --git a/packages/tomoe/uim-tomoe-gtk_0.2.0.bb b/packages/tomoe/uim-tomoe-gtk_0.2.0.bb
new file mode 100644
index 0000000000..d0b1c5a385
--- /dev/null
+++ b/packages/tomoe/uim-tomoe-gtk_0.2.0.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "A handwriting recognition engine"
+HOMEPAGE = "http://tomoe.sourceforge.net"
+SECTION = "libs"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+DEPENDS = "gtk+ uim tomoe"
+LICENSE = "LGPL"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://prdownloads.sourceforge.jp/tomoe/17172/uim-tomoe-gtk-0.2.0.tar.gz"
diff --git a/packages/xlibs/libxrandr-1.0.2/.mtn2git_empty b/packages/tsclient/tsclient-0.132/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxrandr-1.0.2/.mtn2git_empty
+++ b/packages/tsclient/tsclient-0.132/.mtn2git_empty
diff --git a/packages/tsclient/tsclient-0.132/fixes.patch b/packages/tsclient/tsclient-0.132/fixes.patch
new file mode 100644
index 0000000000..c0634c2167
--- /dev/null
+++ b/packages/tsclient/tsclient-0.132/fixes.patch
@@ -0,0 +1,332 @@
+# tsclient patch
+# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the GPL license
+
+diff -urN tsclient-0.132/Makefile.am tsclient-0.132.diff/Makefile.am
+--- tsclient-0.132/Makefile.am 2003-11-08 16:21:32.000000000 -0700
++++ tsclient-0.132.diff/Makefile.am 2004-08-24 16:53:40.000000000 -0600
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-SUBDIRS = src applet po
++SUBDIRS = @SDIRS@
+
+ appicondir = $(datadir)/pixmaps
+ appicon_DATA = tsclient.png
+diff -urN tsclient-0.132/configure.in tsclient-0.132.diff/configure.in
+--- tsclient-0.132/configure.in 2003-11-09 00:09:31.000000000 -0700
++++ tsclient-0.132.diff/configure.in 2004-08-24 16:57:35.000000000 -0600
+@@ -12,8 +12,30 @@
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+
+-pkg_modules="libgnomeui-2.0"
+-pkg_modules="libpanelapplet-2.0"
++SDIRS="src"
++
++dnl Once libgnomeui disappears, this is all we need
++pkg_modules="gtk+-2.0 gdk-pixbuf-2.0"
++
++AC_ARG_WITH(applet, [ --without-applet Don't build the panel applet ],
++withapplet=no, withapplet=yes)
++
++echo "With applet: $withapplet"
++
++if test "$withapplet" != "no"; then
++ pkg_modules="$pkg_modules libpanelapplet-2.0"
++ SDIRS="$SDIRS applet"
++fi
++
++AC_ARG_WITH(ica, [ --without-ica Don't build in support for the ICA client ],
++withica=no, withica=yes)
++
++if test "$withica" != "no"; then
++ CFLAGS="$CFLAGS -DENABLE_ICA"
++fi
++
++SDIRS="$SDIRS po"
++
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+@@ -41,6 +63,8 @@
+ AC_MSG_RESULT(no)
+ fi
+
++AC_SUBST(SDIRS)
++
+ dnl ==========================================================================
+
+ AC_OUTPUT([
+diff -urN tsclient-0.132/src/connect.c tsclient-0.132.diff/src/connect.c
+--- tsclient-0.132/src/connect.c 2003-11-08 19:45:43.000000000 -0700
++++ tsclient-0.132.diff/src/connect.c 2004-08-24 16:57:53.000000000 -0600
+@@ -460,6 +460,7 @@
+ gtk_widget_ref (miProtocol);
+ if (!g_find_program_in_path ("Xnest")) { gtk_widget_set_sensitive (miProtocol, FALSE); }
+
++#ifdef ENABLE_ICA
+ miProtocol = gtk_menu_item_new_with_mnemonic ("ICA");
+ gtk_container_add (GTK_CONTAINER (mnuProtocol), miProtocol);
+ gtk_tooltips_set_tip (tooltips, miProtocol, _("ICA protocol is used to connect to Citrix servers."), NULL);
+@@ -468,6 +469,7 @@
+ if (!g_find_program_in_path ("wfica") &&
+ !g_file_test ("/usr/lib/ICAClient/wfica", G_FILE_TEST_EXISTS) )
+ { gtk_widget_set_sensitive (miProtocol, FALSE); }
++#endif
+
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optProtocol), mnuProtocol);
+
+diff -urN tsclient-0.132/src/rdpfile.c tsclient-0.132.diff/src/rdpfile.c
+--- tsclient-0.132/src/rdpfile.c 2003-11-08 19:41:58.000000000 -0700
++++ tsclient-0.132.diff/src/rdpfile.c 2004-08-24 16:53:40.000000000 -0600
+@@ -585,7 +585,7 @@
+ widget = lookup_widget (main_window, "optSize2");
+ if (gtk_toggle_button_get_active ((GtkToggleButton *) widget)) {
+ widget = lookup_widget (main_window, "optSize");
+- if ((int) gtk_option_menu_get_history (GTK_OPTION_MENU (widget)) > 0) {
++ if ((int) gtk_option_menu_get_history (GTK_OPTION_MENU (widget)) >= 0) {
+ switch ((int) gtk_option_menu_get_history (GTK_OPTION_MENU (widget))) {
+ case 0:
+ rdp->desktopwidth = 640;
+diff -urN tsclient-0.132/src/support.c tsclient-0.132.diff/src/support.c
+--- tsclient-0.132/src/support.c 2003-11-09 00:12:17.000000000 -0700
++++ tsclient-0.132.diff/src/support.c 2004-08-24 16:57:46.000000000 -0600
+@@ -13,7 +13,7 @@
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+ #include <glib.h>
+-#include <libgnomeui/gnome-about.h>
++#include <gtk/gtkdialog.h>
+
+ #include <libintl.h>
+ #define _(x) gettext(x)
+@@ -528,7 +528,9 @@
+ //buffer[strlen(buffer)-2] = '\0';
+ c_argv[c_argc++] = strdup(buffer);
+
+- } else if (rdp->protocol == 3) {
++ }
++#ifdef ENABLE_ICA
++ else if (rdp->protocol == 3) {
+ // ICA/Citrix Connection
+ if (g_find_program_in_path ("wfica")) {
+ cmd = "wfica";
+@@ -542,21 +544,25 @@
+ c_argv[c_argc++] = g_strdup (buffer);
+
+ if ( rdp->username && strlen (rdp->username) ) {
+- sprintf(buffer, "-username %s", (char*)g_strescape(rdp->username, NULL));
+- c_argv[c_argc++] = g_strdup (buffer);
++ sprintf(buffer, "-username");
++ c_argv[c_argc++] = g_strdup (buffer);
++ c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->username, NULL));
+ }
+ if ( rdp->password && strlen (rdp->password) ) {
+- sprintf(buffer, "-password %s", (char*)g_strescape(rdp->password, NULL));
+- c_argv[c_argc++] = g_strdup (buffer);
++ sprintf(buffer, "-password");
++ c_argv[c_argc++] = g_strdup (buffer);
++ c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->password, NULL));
+ }
+ if ( rdp->domain && strlen (rdp->domain) ) {
+- sprintf(buffer, "-domain %s", (char*)g_strescape(rdp->domain, NULL));
+- c_argv[c_argc++] = g_strdup (buffer);
++ sprintf(buffer, "-domain");
++ c_argv[c_argc++] = g_strdup (buffer);
++ c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->domain, NULL));
+ }
+
+ if ( rdp->client_hostname && strlen (rdp->client_hostname) ) {
+- sprintf(buffer, "-clientname %s", (char*)g_strescape(rdp->client_hostname, NULL));
+- c_argv[c_argc++] = g_strdup (buffer);
++ sprintf(buffer, "-clientname");
++ c_argv[c_argc++] = g_strdup (buffer);
++ c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->client_hostname, NULL));
+ }
+
+ switch (rdp->desktopwidth) {
+@@ -624,30 +630,24 @@
+ }
+
+ if (rdp->enable_alternate_shell == 1) {
+- if ( rdp->alternate_shell && strlen (rdp->alternate_shell) ) {
+- sprintf(buffer, "-program %s", (char*)g_strescape(rdp->alternate_shell, NULL));
+- c_argv[c_argc++] = g_strdup (buffer);
+- }
+-
+- if ( rdp->shell_working_directory && strlen (rdp->shell_working_directory) ) {
+- sprintf(buffer, "-directory %s", (char*)g_strescape(rdp->shell_working_directory, NULL));
+- c_argv[c_argc++] = g_strdup (buffer);
+- }
++ sprintf(buffer, "-program");
++ c_argv[c_argc++] = g_strdup (buffer);
++ c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->alternate_shell, NULL));
+ }
+-
+- if (strlen(rdp->proto_file) && g_file_test (rdp->proto_file, G_FILE_TEST_EXISTS)) {
+- sprintf(buffer, "-passwd");
+- c_argv[c_argc++] = g_strdup (buffer);
+- sprintf(buffer, "%s", (char*)g_strescape(rdp->proto_file, NULL));
+- c_argv[c_argc++] = g_strdup (buffer);
++
++ if ( rdp->shell_working_directory && strlen (rdp->shell_working_directory) ) {
++ sprintf(buffer, "-directory");
++ c_argv[c_argc++] = g_strdup (buffer);
++ c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->shell_working_directory, NULL));
+ }
+
+ if ( rdp->full_address && strlen (rdp->full_address) ) {
+- sprintf(buffer, "-description %s", (char*)g_strescape(rdp->full_address, NULL));
+- c_argv[c_argc++] = g_strdup (buffer);
++ sprintf(buffer, "-desc");
++ c_argv[c_argc++] = g_strdup (buffer);
++ c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->full_address, NULL));
+ }
+-
+- }
++ }
++#endif
+
+ c_argv[c_argc++] = NULL;
+
+@@ -663,7 +663,10 @@
+ }
+ if (std_err && strlen(std_err)) {
+ g_warning ("\n%s\n", std_err);
+- tsc_error_message ((gchar*)std_err);
++ /* Note - this is a stupid and irresponsible thing to do -
++ Really, this needs to be handled more intellegently
++ */
++ /* tsc_error_message ((gchar*)std_err); */
+ }
+ } else {
+ if (!g_spawn_async (NULL, (gchar**)c_argv, NULL, G_SPAWN_SEARCH_PATH,
+@@ -733,47 +736,82 @@
+ gtk_widget_show_all (dialog);
+ }
+
++static void
++update_label(GtkWidget *label, const gchar *str) {
++ GString *string;
++
++ gchar *tmp = g_markup_escape_text (str, -1);
++
++ string = g_string_new (NULL);
++ g_string_append(string, tmp);
++ gtk_label_set_markup (GTK_LABEL (label), string->str);
++ g_string_free (string, TRUE);
++}
++
++void tsc_about_dialog() {
++ GtkWidget *about = NULL;
++ GtkWidget *name_label, *comments_label, *copyright_label;
++ GtkWidget *logo_image;
++ GtkWidget *vbox;
+
+-void tsc_about_dialog ()
+-{
+- static GtkWidget *about = NULL;
+- const gchar *name = _("Terminal Server Client");
+- const gchar *version = VERSION;
+- const gchar *copyright = "(C) 2003 Erick Woods\n<http://www.gnomepro.com/tsclient/>";
+- const gchar *authors[] = { "Erick Woods <erick@gnomepro.com>", NULL };
+- const gchar *documenters[] = { NULL };
+- const gchar *translator_credits = NULL;
+ GdkPixbuf *pixbuf = create_pixbuf ("tsclient.png");
+
+- const gchar *comments = \
+- "Terminal Server Client is a frontend for \nrdesktop <http://www.rdesktop.org/> \nand vncviewer.\n" \
+- "\n" \
+- "Terminal Server Client is licensed under the \n" \
+- "GNU General Public License (GPL)\n<http://www.gnu.org/licenses/gpl.html>\n" \
+- "\n" \
+- "Images by: Jakub \"jimmac\" Steiner and others.";
++ about = gtk_dialog_new_with_buttons (_("About"),
++ NULL,
++ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
++ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
++ NULL);
+
+- if (about) {
+- gtk_window_present (GTK_WINDOW (about));
+- return;
+- }
++ vbox = gtk_vbox_new (FALSE, 8);
++ gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+
+- about = gnome_about_new (
+- name,
+- version,
+- copyright,
+- comments,
+- authors,
+- documenters,
+- translator_credits,
+- pixbuf);
++ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (about)->vbox), vbox, TRUE, TRUE, 0);
+
+- //gtk_window_set_wmclass (GTK_WINDOW (about), "terminal server client", "Terminal Server Client");
+- g_signal_connect (G_OBJECT (about), "destroy", G_CALLBACK (gtk_widget_destroyed), &about);
+- gtk_widget_show_all (about);
+- return;
+-}
++ logo_image = gtk_image_new ();
++ gtk_box_pack_start (GTK_BOX (vbox), logo_image, FALSE, FALSE, 0);
+
++ if (pixbuf)
++ gtk_image_set_from_pixbuf (GTK_IMAGE (logo_image), pixbuf);
++
++ name_label = gtk_label_new (NULL);
++ gtk_label_set_selectable (GTK_LABEL (name_label), TRUE);
++ gtk_label_set_justify (GTK_LABEL (name_label), GTK_JUSTIFY_CENTER);
++ gtk_box_pack_start (GTK_BOX (vbox), name_label, FALSE, FALSE, 0);
++
++ gtk_label_set_markup (GTK_LABEL (name_label), _("Terminal Server Client"));
++
++ comments_label = gtk_label_new (NULL);
++ gtk_label_set_selectable (GTK_LABEL (comments_label), TRUE);
++ gtk_label_set_justify (GTK_LABEL (comments_label), GTK_JUSTIFY_CENTER);
++ gtk_label_set_line_wrap (GTK_LABEL (comments_label), TRUE);
++ gtk_box_pack_start (GTK_BOX (vbox), comments_label, FALSE, FALSE, 0);
++
++ update_label(comments_label, "Terminal Server Client is a frontend for \nrdesktop " \
++ "<http://www.rdesktop.org/> \nand vncviewer.\n" \
++ "\n" \
++ "Terminal Server Client is licensed under the \n" \
++ "GNU General Public License (GPL)\n<http://www.gnu.org/licenses/gpl.html>\n" \
++ "\n" \
++ "Images by: Jakub \"jimmac\" Steiner and others.");
++
++ copyright_label = gtk_label_new (NULL);
++ gtk_label_set_selectable (GTK_LABEL (copyright_label), TRUE);
++ gtk_label_set_justify (GTK_LABEL (copyright_label), GTK_JUSTIFY_CENTER);
++ gtk_box_pack_start (GTK_BOX (vbox), copyright_label, FALSE, FALSE, 0);
++
++ update_label(copyright_label, "(C) 2003 Erick Woods\n<http://www.gnomepro.com/tsclient/>");
++
++ gtk_widget_show_all (vbox);
++
++ gtk_window_set_resizable (GTK_WINDOW (about), FALSE);
++
++ g_signal_connect_swapped (GTK_OBJECT (about),
++ "response",
++ G_CALLBACK (gtk_widget_destroy),
++ GTK_OBJECT (about));
++
++ gtk_widget_show_all (about);
++}
+
+ void tsc_quick_pick_activate (GtkMenuItem *menuitem, gpointer user_data)
+ {
+@@ -847,8 +885,10 @@
+ gtk_widget_set_sensitive ((GtkWidget*) g_object_get_data (G_OBJECT (main_win), "txtProgramPath"), FALSE);
+ gtk_widget_set_sensitive ((GtkWidget*) g_object_get_data (G_OBJECT (main_win), "txtStartFolder"), FALSE);
+ break;
++#ifdef ENABLE_ICA
+ case 3: // ica
+ break;
++#endif
+ default:
+ break;
+ }
diff --git a/packages/tsclient/tsclient_0.132.bb b/packages/tsclient/tsclient_0.132.bb
new file mode 100644
index 0000000000..8a80855219
--- /dev/null
+++ b/packages/tsclient/tsclient_0.132.bb
@@ -0,0 +1,30 @@
+# tsclient OE build file
+# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR="r1"
+
+DESCRIPTION="Terminal Server Client (tsclient) is a frontend for rdesktop and other remote desktop tools"
+HOMEPAGE="http://www.gnomepro.com/tsclient/"
+MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
+LICENSE="GPL"
+
+SRC_URI="http://www.gnomepro.com/tsclient/tsclient-${PV}.tar.gz \
+ file://fixes.patch;patch=1"
+
+DEPENDS="gtk+ intltool-native"
+
+inherit autotools
+
+EXTRA_OECONF=" --without-applet --without-ica"
+
+FILES_${PN}="${bindir} \
+ ${datadir}/pixmaps/tsclient/banner-en.png \
+ ${datadir}/pixmaps/tsclient/computer.png \
+ ${datadir}/pixmaps/tsclient/perform.png \
+ ${datadir}/pixmaps/tsclient/size.png \
+ ${datadir}/pixmaps/tsclient/tsclient.png \
+ ${datadir}/pixmaps/tsclient/colors.png \
+ ${datadir}/pixmaps/tsclient/keyboard.png \
+ ${datadir}/pixmaps/tsclient/program.png \
+ ${datadir}/pixmaps/tsclient/sound.png"
diff --git a/packages/xlibs/libxrandr/.mtn2git_empty b/packages/tslib/tslib/h5xxx/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxrandr/.mtn2git_empty
+++ b/packages/tslib/tslib/h5xxx/.mtn2git_empty
diff --git a/packages/tslib/tslib/h5xxx/tslib.sh b/packages/tslib/tslib/h5xxx/tslib.sh
new file mode 100644
index 0000000000..0de3534a51
--- /dev/null
+++ b/packages/tslib/tslib/h5xxx/tslib.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+module_id() {
+ awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+case `uname -r` in
+2.4*)
+ TSLIB_TSDEVICE=/dev/touchscreen/0raw
+ TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
+ ;;
+*)
+ TSLIB_TSDEVICE=`detect-stylus --device`
+ TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
+ ;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
+
diff --git a/packages/tslib/tslib/jornada7xx/tslib.sh b/packages/tslib/tslib/jornada7xx/tslib.sh
index a93d2d3ef0..e64f644b74 100644
--- a/packages/tslib/tslib/jornada7xx/tslib.sh
+++ b/packages/tslib/tslib/jornada7xx/tslib.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-TSLIB_TSDEVICE=/dev/input/tsraw0
+TSLIB_TSDEVICE=/dev/input/ts0
TSLIB_TSEVENTTYPE=H3600
export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE
diff --git a/packages/tslib/tslib_20060703.bb b/packages/tslib/tslib_20060703.bb
index d756a5c576..55884a8b49 100644
--- a/packages/tslib/tslib_20060703.bb
+++ b/packages/tslib/tslib_20060703.bb
@@ -38,7 +38,7 @@ do_install_append() {
install -d ${D}${sysconfdir}/profile.d/
install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
case ${MACHINE} in
- a780 | e680 | h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel | h4000)
+ a780 | e680 | h3600 | h3900 | h5xxx | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel | h4000)
install -d ${D}${datadir}/tslib
for f in ts-2.6.conf ts.conf-h3600-2.4; do
install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
@@ -79,6 +79,7 @@ RDEPENDS_tslib-conf_h1940 = "detect-stylus"
RDEPENDS_tslib-conf_h2200 = "detect-stylus"
RDEPENDS_tslib-conf_h3600 = "detect-stylus"
RDEPENDS_tslib-conf_h3900 = "detect-stylus"
+RDEPENDS_tslib-conf_h5xxx = "detect-stylus"
RDEPENDS_tslib-conf_h6300 = "detect-stylus"
RDEPENDS_tslib-conf_blueangel = "detect-stylus"
RDEPENDS_tslib-conf_htcuniversal = "detect-stylus"
diff --git a/packages/udev/files/init b/packages/udev/files/init
index 1022b40c89..8cbab188f0 100755
--- a/packages/udev/files/init
+++ b/packages/udev/files/init
@@ -138,7 +138,7 @@ if [ ! -d /sys/class/ ]; then
exit 1
fi
-if [ ! -e /proc/sys/kernel/hotplug ]; then
+if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ]; then
echo "udev requires hotplug support, not started."
exit 1
fi
@@ -161,7 +161,11 @@ case "$1" in
warn_if_interactive
#echo /sbin/udevsend > /proc/sys/kernel/hotplug
- echo "" > /proc/sys/kernel/hotplug
+ if [ -e /sys/kernel/uevent_helper ] ; then
+ echo "" > /sys/kernel/uevent_helper
+ else
+ echo "" > /proc/sys/kernel/hotplug
+ fi
udevsend
if [ "$UDEV_DISABLED" = "yes" ]; then
echo "udev disabled on the kernel command line, not started."
diff --git a/packages/udev/udev-058/init b/packages/udev/udev-058/init
index 16efb31542..a213463ad2 100644
--- a/packages/udev/udev-058/init
+++ b/packages/udev/udev-058/init
@@ -23,7 +23,7 @@ if ! grep -q '[[:space:]]ramfs$' /proc/filesystems; then
exit 0
fi
-if [ ! -e /proc/sys/kernel/hotplug ]; then
+if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ] ; then
echo "udev requires hotplug support, not started."
exit 0
fi
diff --git a/packages/udev/udev-063/init b/packages/udev/udev-063/init
index 16efb31542..67886c9e54 100644
--- a/packages/udev/udev-063/init
+++ b/packages/udev/udev-063/init
@@ -23,7 +23,7 @@ if ! grep -q '[[:space:]]ramfs$' /proc/filesystems; then
exit 0
fi
-if [ ! -e /proc/sys/kernel/hotplug ]; then
+if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ]; then
echo "udev requires hotplug support, not started."
exit 0
fi
diff --git a/packages/udev/udev-065/init b/packages/udev/udev-065/init
index 16efb31542..67886c9e54 100644
--- a/packages/udev/udev-065/init
+++ b/packages/udev/udev-065/init
@@ -23,7 +23,7 @@ if ! grep -q '[[:space:]]ramfs$' /proc/filesystems; then
exit 0
fi
-if [ ! -e /proc/sys/kernel/hotplug ]; then
+if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ]; then
echo "udev requires hotplug support, not started."
exit 0
fi
diff --git a/packages/udev/udev-084/init b/packages/udev/udev-084/init
index 5a60d52a9a..e20e881e2a 100644
--- a/packages/udev/udev-084/init
+++ b/packages/udev/udev-084/init
@@ -84,7 +84,11 @@ set_hotplug_handler() {
case "$(uname -r)" in
2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;;
esac
- echo $HANDLER > /proc/sys/kernel/hotplug
+ if [ -e /sys/kernel/uevent_helper ] ; then
+ echo $HANDLER > /sys/kernel/uevent_helper
+ else
+ echo $HANDLER > /proc/sys/kernel/hotplug
+ fi
}
# shell version of /usr/bin/tty
@@ -145,7 +149,7 @@ if [ ! -d /sys/class/ ]; then
exit 1
fi
-if [ ! -e /proc/sys/kernel/hotplug ]; then
+if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ]; then
echo "udev requires hotplug support, not started."
exit 1
fi
diff --git a/packages/udev/udev-089/init b/packages/udev/udev-089/init
index 5a60d52a9a..e20e881e2a 100644
--- a/packages/udev/udev-089/init
+++ b/packages/udev/udev-089/init
@@ -84,7 +84,11 @@ set_hotplug_handler() {
case "$(uname -r)" in
2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;;
esac
- echo $HANDLER > /proc/sys/kernel/hotplug
+ if [ -e /sys/kernel/uevent_helper ] ; then
+ echo $HANDLER > /sys/kernel/uevent_helper
+ else
+ echo $HANDLER > /proc/sys/kernel/hotplug
+ fi
}
# shell version of /usr/bin/tty
@@ -145,7 +149,7 @@ if [ ! -d /sys/class/ ]; then
exit 1
fi
-if [ ! -e /proc/sys/kernel/hotplug ]; then
+if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ]; then
echo "udev requires hotplug support, not started."
exit 1
fi
diff --git a/packages/xlibs/libxrender/.mtn2git_empty b/packages/usbview/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxrender/.mtn2git_empty
+++ b/packages/usbview/.mtn2git_empty
diff --git a/packages/xlibs/libxt/.mtn2git_empty b/packages/usbview/usbview/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxt/.mtn2git_empty
+++ b/packages/usbview/usbview/.mtn2git_empty
diff --git a/packages/usbview/usbview/gtk2.patch b/packages/usbview/usbview/gtk2.patch
new file mode 100644
index 0000000000..e0ec4e9940
--- /dev/null
+++ b/packages/usbview/usbview/gtk2.patch
@@ -0,0 +1,21 @@
+--- usbview-1.0/configure.in.orig 2006-07-18 14:31:32.000000000 -0600
++++ usbview-1.0/configure.in 2006-07-18 14:31:58.000000000 -0600
+@@ -9,7 +9,7 @@
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+
+-AM_PATH_GTK(1.2.0, ,
++AM_PATH_GTK_2_0(1.2.0, ,
+ AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
+
+
+--- usbview-1.0/usbtree.c.orig 2006-07-18 14:36:39.996545080 -0600
++++ usbview-1.0/usbtree.c 2006-07-18 14:36:54.531335456 -0600
+@@ -31,6 +31,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <errno.h>
++#define GTK_ENABLE_BROKEN
+ #include <gtk/gtk.h>
+
+ #include "usbtree.h"
diff --git a/packages/usbview/usbview_1.0.bb b/packages/usbview/usbview_1.0.bb
new file mode 100644
index 0000000000..5e719e8e65
--- /dev/null
+++ b/packages/usbview/usbview_1.0.bb
@@ -0,0 +1,16 @@
+# usbview .bb build file
+# Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see /COPYING)
+
+DESCRIPTION="USBView is a GTK program that displays the topography of the \
+ devices that are plugged into the USB bus on a Linux machine."
+HOMEPAGE="http://www.kroah.com/linux-usb/"
+MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
+LICENSE="GPL"
+
+SRC_URI="http://www.kroah.com/linux-usb/${PN}-${PV}.tar.gz \
+ file://gtk2.patch;patch=1"
+
+DEPENDS="gtk+ pango glib-2.0 cairo atk"
+
+inherit autotools
diff --git a/packages/x11-apps/app-common.inc b/packages/x11-apps/app-common.inc
deleted file mode 100644
index 9d668cd9b2..0000000000
--- a/packages/x11-apps/app-common.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "X application"
-SECTION = "x11/apps"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2"
-
-S = ${WORKDIR}/${PN}-X11R7.0-${PV}
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
diff --git a/packages/x11-apps/bdftopcf_1.0.0.bb b/packages/x11-apps/bdftopcf_1.0.0.bb
deleted file mode 100644
index 96492be848..0000000000
--- a/packages/x11-apps/bdftopcf_1.0.0.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include app-common.inc
-DEPENDS = "libxfont"
diff --git a/packages/x11-apps/iceauth_1.0.1.bb b/packages/x11-apps/iceauth_1.0.1.bb
deleted file mode 100644
index 19b59b8381..0000000000
--- a/packages/x11-apps/iceauth_1.0.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include app-common.inc
-DEPENDS = "libx11 libice"
diff --git a/packages/x11-apps/mkfontdir_1.0.1.bb b/packages/x11-apps/mkfontdir_1.0.1.bb
deleted file mode 100644
index eff2e125e7..0000000000
--- a/packages/x11-apps/mkfontdir_1.0.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include app-common.inc
-DEPENDS = "mkfontscale"
diff --git a/packages/x11-apps/mkfontscale_1.0.1.bb b/packages/x11-apps/mkfontscale_1.0.1.bb
deleted file mode 100644
index ead4663781..0000000000
--- a/packages/x11-apps/mkfontscale_1.0.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include app-common.inc
-DEPENDS = "libfontenc freetype"
diff --git a/packages/x11-apps/rgb_1.0.0.bb b/packages/x11-apps/rgb_1.0.0.bb
deleted file mode 100644
index 714ab3f83f..0000000000
--- a/packages/x11-apps/rgb_1.0.0.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include app-common.inc
-DEPENDS = "libx11 libxt"
diff --git a/packages/x11-apps/twm_1.0.1.bb b/packages/x11-apps/twm_1.0.1.bb
deleted file mode 100644
index e02bc4cf7b..0000000000
--- a/packages/x11-apps/twm_1.0.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-PR = "r1"
-
-include app-common.inc
-DEPENDS = "libx11 libxt libxmu"
-
-inherit update-alternatives
-
-ALTERNATIVE_PATH = "${bindir}/twm"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "1"
-
-
-
diff --git a/packages/x11-apps/xauth_1.0.1.bb b/packages/x11-apps/xauth_1.0.1.bb
deleted file mode 100644
index c9d1a12ba2..0000000000
--- a/packages/x11-apps/xauth_1.0.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include app-common.inc
-DEPENDS = "libx11 libxau libxext libxmu"
diff --git a/packages/x11-apps/xclock_1.0.1.bb b/packages/x11-apps/xclock_1.0.1.bb
deleted file mode 100644
index 8a4b59d811..0000000000
--- a/packages/x11-apps/xclock_1.0.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include app-common.inc
-DEPENDS = "libx11 libxrender libxft libxkbfile libxaw"
diff --git a/packages/x11-apps/xeyes_1.0.1.bb b/packages/x11-apps/xeyes_1.0.1.bb
deleted file mode 100644
index c9d1a12ba2..0000000000
--- a/packages/x11-apps/xeyes_1.0.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include app-common.inc
-DEPENDS = "libx11 libxau libxext libxmu"
diff --git a/packages/x11-apps/xinit_1.0.1.bb b/packages/x11-apps/xinit_1.0.1.bb
deleted file mode 100644
index 2e65b76202..0000000000
--- a/packages/x11-apps/xinit_1.0.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include app-common.inc
-DEPENDS = "libx11 twm xclock xeyes xrdb"
diff --git a/packages/x11-apps/xkbcomp_1.0.1.bb b/packages/x11-apps/xkbcomp_1.0.1.bb
deleted file mode 100644
index 808f5d0a6d..0000000000
--- a/packages/x11-apps/xkbcomp_1.0.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include app-common.inc
-DEPENDS = "libx11 libxkbfile"
diff --git a/packages/xdpyinfo/xdpyinfo_1.0.1.bb b/packages/xdpyinfo/xdpyinfo_1.0.1.bb
deleted file mode 100644
index a8972e18ab..0000000000
--- a/packages/xdpyinfo/xdpyinfo_1.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-LICENSE = "MIT"
-DEPENDS = "libx11 libxext libxtst"
-DESCRIPTION = "X display information utility"
-SECTION = "x11/base"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2 \
- file://disable-xkb.patch;patch=1"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-EXTRA_OECONF = "--disable-xkb"
-
-inherit autotools pkgconfig
diff --git a/packages/xev/xev_1.0.1.bb b/packages/xev/xev_1.0.1.bb
deleted file mode 100644
index 2d0f79b046..0000000000
--- a/packages/xev/xev_1.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X Event Viewer"
-HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps"
-LICENSE = "MIT"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-SECTION = "x11/base"
-DEPENDS = "libx11 libxau"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2 \
- file://diet-x11.patch;patch=1"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-inherit autotools
diff --git a/packages/xhost/xhost_1.0.0.bb b/packages/xhost/xhost_1.0.0.bb
deleted file mode 100644
index 220de1b535..0000000000
--- a/packages/xhost/xhost_1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "MIT"
-DEPENDS = "libx11 libxext libxmu"
-DESCRIPTION = "server access control program for X"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
-SECTION = "x11/base"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-inherit autotools pkgconfig
diff --git a/packages/xlibs/libfontenc_1.0.1.bb b/packages/xlibs/libfontenc_1.0.1.bb
deleted file mode 100644
index 02883c4d26..0000000000
--- a/packages/xlibs/libfontenc_1.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "X fontenc library (used by libxfont)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "BSD-X"
-
-DEPENDS = "zlib xproto"
-
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libfontenc_1.0.2.bb b/packages/xlibs/libfontenc_1.0.2.bb
deleted file mode 100644
index b67c4a0e38..0000000000
--- a/packages/xlibs/libfontenc_1.0.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X fontenc library (used by libxfont)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "BSD-X"
-
-DEPENDS = "zlib xproto"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libice_X11R7.0-1.0.0.bb b/packages/xlibs/libice_X11R7.0-1.0.0.bb
deleted file mode 100644
index cd5c2d372f..0000000000
--- a/packages/xlibs/libice_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X11 ICE library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "libx11 util-macros"
-PROVIDES = "ice"
-
-XORG_PN = "libICE"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libice_X11R7.1-1.0.1.bb b/packages/xlibs/libice_X11R7.1-1.0.1.bb
deleted file mode 100644
index a1e92b66fa..0000000000
--- a/packages/xlibs/libice_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "X11 ICE library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "libx11 util-macros"
-PROVIDES = "ice"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libICE"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/liblbxutil_1.0.0.bb b/packages/xlibs/liblbxutil_1.0.0.bb
deleted file mode 100644
index 36837c23e4..0000000000
--- a/packages/xlibs/liblbxutil_1.0.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "X11 keyboard library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "xextproto"
-
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-X11R7.0-${PV}.tar.bz2 \
- file://mkg3states.patch;patch=1"
-
-export CC_FOR_BUILD = "${BUILD_CC}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
diff --git a/packages/xlibs/liblbxutil_1.0.1.bb b/packages/xlibs/liblbxutil_1.0.1.bb
deleted file mode 100644
index 795cd4555d..0000000000
--- a/packages/xlibs/liblbxutil_1.0.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "X11 keyboard library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "xproto"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/${PN}-X11R7.1-${PV}.tar.bz2 \
- file://mkg3states.patch;patch=1"
-
-export CC_FOR_BUILD = "${BUILD_CC}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
diff --git a/packages/xlibs/libsm_X11R7.0-1.0.0.bb b/packages/xlibs/libsm_X11R7.0-1.0.0.bb
deleted file mode 100644
index bf96271ba6..0000000000
--- a/packages/xlibs/libsm_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Session management library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT-X"
-#PV="1:1.0.0"
-
-DEPENDS = "libx11 libice util-macros"
-
-XORG_PN = "libSM"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libsm_X11R7.1-1.0.1.bb b/packages/xlibs/libsm_X11R7.1-1.0.1.bb
deleted file mode 100644
index 468b014165..0000000000
--- a/packages/xlibs/libsm_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Session management library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT-X"
-#PV="1:1.0.1"
-
-DEPENDS = "libx11 libice util-macros"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libSM"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libx11_X11R7.0-1.0.0.bb b/packages/xlibs/libx11_X11R7.0-1.0.0.bb
deleted file mode 100644
index ac9d87292a..0000000000
--- a/packages/xlibs/libx11_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Base X libs."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "XFree86"
-
-DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
-PROVIDES = "x11"
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
-FILES_${PN}-locale += "${datadir}/X11/locale"
-
-XORG_PN = "libX11"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C src/util '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}' makekeys
- )
- rm -f ${STAGING_INCDIR}/X11/Xlib.h
- oe_runmake
-}
diff --git a/packages/xlibs/libx11_X11R7.1-1.0.1.bb b/packages/xlibs/libx11_X11R7.1-1.0.1.bb
deleted file mode 100644
index 6836c872bd..0000000000
--- a/packages/xlibs/libx11_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Base X libs."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "XFree86"
-
-DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
-PROVIDES = "x11"
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
-FILES_${PN}-locale += "${datadir}/X11/locale"
-
-XORG_PN = "libX11"
-XORG_RELEASE = "X11R7.1"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C src/util '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}' makekeys
- )
- rm -f ${STAGING_INCDIR}/X11/Xlib.h
- oe_runmake
-}
diff --git a/packages/xlibs/libxau_1.0.0.bb b/packages/xlibs/libxau_1.0.0.bb
deleted file mode 100644
index f64be68583..0000000000
--- a/packages/xlibs/libxau_1.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Authorization Protocol for X."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "xproto util-macros"
-PROVIDES = "xau"
-
-XORG_PN = "libXau"
-
-include xorg-xlibs.inc
-
diff --git a/packages/xlibs/libxau_1.0.1.bb b/packages/xlibs/libxau_1.0.1.bb
deleted file mode 100644
index 39e2f88b95..0000000000
--- a/packages/xlibs/libxau_1.0.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Authorization Protocol for X."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "xproto util-macros"
-PROVIDES = "xau"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXau"
-
-include xorg-xlibs.inc
-
diff --git a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb b/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
deleted file mode 100644
index 03ac373f77..0000000000
--- a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "X Athena Widgets library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT"
-
-DEPENDS = "xproto libx11 libxt libxmu libxpm"
-PROVIDES = "xaw"
-
-XORG_PN = "libXaw"
-
-include xorg-xlibs.inc
-
-# FIXME: libXaw needs a full x11, not diet
-BROKEN = "1"
diff --git a/packages/xlibs/libxaw_X11R7.1-1.0.2.bb b/packages/xlibs/libxaw_X11R7.1-1.0.2.bb
deleted file mode 100644
index 7fb68385a1..0000000000
--- a/packages/xlibs/libxaw_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "X Athena Widgets library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT"
-
-DEPENDS = "xproto libx11 libxt libxmu libxpm"
-PROVIDES = "xaw"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXaw"
-
-include xorg-xlibs.inc
-
-# FIXME: libXaw needs a full x11, not diet
-BROKEN = "1"
diff --git a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
deleted file mode 100644
index d3166a99f4..0000000000
--- a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "X Composite extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libx11 compositeproto xextproto libxfixes"
-PROVIDES = "xcomposite"
-
-XORG_PN = "libXcomposite"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \
- file://change-include-order.patch;patch=1"
diff --git a/packages/xlibs/libxcomposite_X11R7.1-0.3.bb b/packages/xlibs/libxcomposite_X11R7.1-0.3.bb
deleted file mode 100644
index 2847ada716..0000000000
--- a/packages/xlibs/libxcomposite_X11R7.1-0.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "X Composite extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libx11 compositeproto libxfixes"
-PROVIDES = "xcomposite"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXcomposite"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/libXcomposite-${PV}.tar.bz2 \
- file://change-include-order.patch;patch=1"
diff --git a/packages/xlibs/libxcursor_1.1.5.2.bb b/packages/xlibs/libxcursor_1.1.5.2.bb
deleted file mode 100644
index 9aed134fbb..0000000000
--- a/packages/xlibs/libxcursor_1.1.5.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "X Cursor library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libxfixes"
-
-XORG_PN = "libXcursor"
-
-include xorg-xlibs.inc
-
-FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/packages/xlibs/libxcursor_1.1.6.bb b/packages/xlibs/libxcursor_1.1.6.bb
deleted file mode 100644
index 20f44bfb41..0000000000
--- a/packages/xlibs/libxcursor_1.1.6.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "X Cursor library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libxfixes"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXcursor"
-
-include xorg-xlibs.inc
-
-FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/packages/xlibs/libxdamage_1.0.2.2.bb b/packages/xlibs/libxdamage_1.0.2.2.bb
deleted file mode 100644
index acea09c7bd..0000000000
--- a/packages/xlibs/libxdamage_1.0.2.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "X Damage extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libx11 damageproto libxfixes xproto"
-PROVIDES = "xdamage"
-
-XORG_PN = "libXdamage"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libxdamage_1.0.3.bb b/packages/xlibs/libxdamage_1.0.3.bb
deleted file mode 100644
index b97e01cfb0..0000000000
--- a/packages/xlibs/libxdamage_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X Damage extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libx11 damageproto libxfixes xproto"
-PROVIDES = "xdamage"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXdamage"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libxdmcp_1.0.0.bb b/packages/xlibs/libxdmcp_1.0.0.bb
deleted file mode 100644
index 5ea8cdd513..0000000000
--- a/packages/xlibs/libxdmcp_1.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X Display Manager Control Protocol library."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "xproto util-macros"
-PROVIDES = "xdmcp"
-
-XORG_PN = "libXdmcp"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libxdmcp_1.0.1.bb b/packages/xlibs/libxdmcp_1.0.1.bb
deleted file mode 100644
index d9cfadbf7b..0000000000
--- a/packages/xlibs/libxdmcp_1.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "X Display Manager Control Protocol library."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "xproto util-macros"
-PROVIDES = "xdmcp"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXdmcp"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libxext_1.0.0.bb b/packages/xlibs/libxext_1.0.0.bb
deleted file mode 100644
index 1c4a21280e..0000000000
--- a/packages/xlibs/libxext_1.0.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "X Server Extension library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "xproto libx11 xextproto util-macros"
-PROVIDES = "xext"
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-XORG_PN = "libXext"
-
-include xorg-xlibs.inc
-
diff --git a/packages/xlibs/libxext_1.0.1.bb b/packages/xlibs/libxext_1.0.1.bb
deleted file mode 100644
index 5ee1d82990..0000000000
--- a/packages/xlibs/libxext_1.0.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "X Server Extension library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "xproto libx11 util-macros"
-PROVIDES = "xext"
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXext"
-
-include xorg-xlibs.inc
-
diff --git a/packages/xlibs/libxfixes_3.0.1.2.bb b/packages/xlibs/libxfixes_3.0.1.2.bb
deleted file mode 100644
index b22da223f5..0000000000
--- a/packages/xlibs/libxfixes_3.0.1.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "X Fixes extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libx11 fixesproto"
-
-XORG_PN = "libXfixes"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libxfixes_4.0.1.bb b/packages/xlibs/libxfixes_4.0.1.bb
deleted file mode 100644
index 5b8881e0b8..0000000000
--- a/packages/xlibs/libxfixes_4.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "X Fixes extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libx11 fixesproto"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXfixes"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
deleted file mode 100644
index aff0e55e21..0000000000
--- a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X font library (used by the X server)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "BSD-X"
-
-DEPENDS = "xproto xtrans zlib fontcacheproto fontsproto libfontenc freetype"
-PROVIDES = "xfont"
-
-XORG_PN = "libXfont"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libxfont_X11R7.1-1.1.0.bb b/packages/xlibs/libxfont_X11R7.1-1.1.0.bb
deleted file mode 100644
index d17359dc29..0000000000
--- a/packages/xlibs/libxfont_X11R7.1-1.1.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "X font library (used by the X server)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "BSD-X"
-
-DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype"
-PROVIDES = "xfont"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXfont"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libxft_2.1.8.2.bb b/packages/xlibs/libxft_2.1.8.2.bb
deleted file mode 100644
index f1b6456740..0000000000
--- a/packages/xlibs/libxft_2.1.8.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
-LICENSE = "MIT-X"
-SECTION = "x11/libs"
-
-DEPENDS = "libx11 xproto libxrender freetype fontconfig"
-PROVIDES = "xft"
-
-
-XORG_PN = "libXft"
-
-include xorg-xlibs.inc
-
-FILES_${PN} = ${libdir}/lib*.so.*
-FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${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)
-}
diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
deleted file mode 100644
index 4e357cde7c..0000000000
--- a/packages/xlibs/libxi_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "X Input extension library."
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-
-DEPENDS = "xproto libx11 libxext"
-
-XORG_PN = "libXi"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxi_X11R7.1-1.0.1.bb b/packages/xlibs/libxi_X11R7.1-1.0.1.bb
deleted file mode 100644
index d698f04ee1..0000000000
--- a/packages/xlibs/libxi_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X Input extension library."
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-
-DEPENDS = "xproto libx11 libxext"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXi"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb b/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
deleted file mode 100644
index 09a4f564f5..0000000000
--- a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Xinerama library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT"
-
-DEPENDS = "xineramaproto xproto libx11 libxext"
-PROVIDES = "xinerama"
-
-XORG_PN = "libXinerama"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxkbfile_1.0.1.bb b/packages/xlibs/libxkbfile_1.0.1.bb
deleted file mode 100644
index 5cbc9a1150..0000000000
--- a/packages/xlibs/libxkbfile_1.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "X11 keyboard library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11"
-
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libxkbfile_1.0.3.bb b/packages/xlibs/libxkbfile_1.0.3.bb
deleted file mode 100644
index 36e3e5f600..0000000000
--- a/packages/xlibs/libxkbfile_1.0.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X11 keyboard library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libxkbui_1.0.1.bb b/packages/xlibs/libxkbui_1.0.1.bb
deleted file mode 100644
index ded3da66f3..0000000000
--- a/packages/xlibs/libxkbui_1.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X11 keyboard library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11 libxt libxkbfile kbproto"
-
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
-
diff --git a/packages/xlibs/libxkbui_1.0.2.bb b/packages/xlibs/libxkbui_1.0.2.bb
deleted file mode 100644
index a914f1e0ef..0000000000
--- a/packages/xlibs/libxkbui_1.0.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "X11 keyboard library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11 libxt libxkbfile"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
-
diff --git a/packages/xlibs/libxmu_1.0.0.bb b/packages/xlibs/libxmu_1.0.0.bb
deleted file mode 100644
index 1693e5d0d5..0000000000
--- a/packages/xlibs/libxmu_1.0.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "X Window System miscellaneous utility library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT"
-
-DEPENDS = "libxt libxext util-macros"
-PROVIDES = "xmu"
-
-XORG_PN = "libXmu"
-
-include xorg-xlibs.inc
-
-PACKAGES =+ "libxmuu libxmuu-dev"
-
-FILES_libxmuu = "${libdir}/libXmuu.so.*"
-FILES_libxmuu-dev = "${libdir}/libXmuu.so"
-
-LEAD_SONAME = "libXmu"
diff --git a/packages/xlibs/libxmu_1.0.1.bb b/packages/xlibs/libxmu_1.0.1.bb
deleted file mode 100644
index cc06d2a671..0000000000
--- a/packages/xlibs/libxmu_1.0.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "X Window System miscellaneous utility library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT"
-
-DEPENDS = "libxt libxext util-macros"
-PROVIDES = "xmu"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXmu"
-
-include xorg-xlibs.inc
-
-PACKAGES =+ "libxmuu libxmuu-dev"
-
-FILES_libxmuu = "${libdir}/libXmuu.so.*"
-FILES_libxmuu-dev = "${libdir}/libXmuu.so"
-
-LEAD_SONAME = "libXmu"
diff --git a/packages/xlibs/libxp_1.0.0.bb b/packages/xlibs/libxp_1.0.0.bb
deleted file mode 100644
index 15653f1390..0000000000
--- a/packages/xlibs/libxp_1.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "X print extension library."
-SECTION = "libs"
-#MAINTAINER = ""
-LICENSE = "MIT"
-
-DEPENDS = "libx11 libxext xextproto libxau printproto"
-
-XORG_PN = "libXp"
-
-include xorg-xlibs.inc
-
-CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
-EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxpm_3.5.4.2.bb b/packages/xlibs/libxpm_3.5.4.2.bb
deleted file mode 100644
index c88bd3f6bc..0000000000
--- a/packages/xlibs/libxpm_3.5.4.2.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "X Pixmap library."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "X-BSD"
-PR = "r1"
-
-DEPENDS = "xproto libx11 util-macros"
-
-XORG_PN = "libXpm"
-
-include xorg-xlibs.inc
-
-do_stage () {
- install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
- oe_libinstall -a -so libXpm ${STAGING_LIBDIR}
-}
-
-PACKAGES =+ "sxpm cxpm"
-FILES_cxpm = "${bindir}/cxpm"
-FILES_sxpm = "${bindir}/sxpm"
diff --git a/packages/xlibs/libxpm_3.5.5.bb b/packages/xlibs/libxpm_3.5.5.bb
deleted file mode 100644
index 397be2faf4..0000000000
--- a/packages/xlibs/libxpm_3.5.5.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "X Pixmap library."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "X-BSD"
-
-DEPENDS = "xproto libx11 util-macros"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXpm"
-
-include xorg-xlibs.inc
-
-do_stage () {
- install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
- oe_libinstall -a -so libXpm ${STAGING_LIBDIR}
-}
-
-PACKAGES =+ "sxpm cxpm"
-FILES_cxpm = "${bindir}/cxpm"
-FILES_sxpm = "${bindir}/sxpm"
diff --git a/packages/xlibs/libxrandr_1.1.0.2.bb b/packages/xlibs/libxrandr_1.1.0.2.bb
deleted file mode 100644
index 3081f4ab86..0000000000
--- a/packages/xlibs/libxrandr_1.1.0.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X Resize and Rotate extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE = "BSD-X"
-
-DEPENDS = "randrproto libx11 libxrender libxext"
-
-XORG_PN = "libXrandr"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxrandr_1.1.1.bb b/packages/xlibs/libxrandr_1.1.1.bb
deleted file mode 100644
index 0c7978945a..0000000000
--- a/packages/xlibs/libxrandr_1.1.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "X Resize and Rotate extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE = "BSD-X"
-
-DEPENDS = "randrproto libx11 libxrender libxext"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXrandr"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxrender_0.9.0.2.bb b/packages/xlibs/libxrender_0.9.0.2.bb
deleted file mode 100644
index 1cff60983a..0000000000
--- a/packages/xlibs/libxrender_0.9.0.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X Render extension library."
-SECTION = "libs"
-#MAINTAINER = ""
-LICENSE = "BSD"
-
-DEPENDS = "renderproto libx11"
-
-XORG_PN = "libXrender"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxrender_0.9.1.bb b/packages/xlibs/libxrender_0.9.1.bb
deleted file mode 100644
index 1ee518645b..0000000000
--- a/packages/xlibs/libxrender_0.9.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "X Render extension library."
-SECTION = "libs"
-#MAINTAINER = ""
-LICENSE = "BSD"
-
-DEPENDS = "renderproto libx11"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXrender"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxres_X11R7.0-1.0.0.bb b/packages/xlibs/libxres_X11R7.0-1.0.0.bb
deleted file mode 100644
index a9806f57b1..0000000000
--- a/packages/xlibs/libxres_X11R7.0-1.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "X Resource usage library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE = "X-MIT"
-
-DEPENDS = "libx11 xextproto libxext resourceproto"
-PROVIDES = "xres"
-
-XORG_PN = "libXres"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxres_X11R7.1-1.0.1.bb b/packages/xlibs/libxres_X11R7.1-1.0.1.bb
deleted file mode 100644
index e2ac5aee7b..0000000000
--- a/packages/xlibs/libxres_X11R7.1-1.0.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "X Resource usage library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE = "X-MIT"
-
-DEPENDS = "libx11 libxext"
-PROVIDES = "xres"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXres"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxss_1.0.1.bb b/packages/xlibs/libxss_1.0.1.bb
deleted file mode 100644
index 92dd4c82c4..0000000000
--- a/packages/xlibs/libxss_1.0.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "X screen saver extension library."
-SECTION = "libs"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11 libxext xextproto scrnsaverproto"
-PROVIDES = "libxss"
-RREPLACES = "libxss"
-
-XORG_PN = "libXScrnSaver"
-
-include xorg-xlibs.inc
-
-#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
-EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxt_1.0.0.bb b/packages/xlibs/libxt_1.0.0.bb
deleted file mode 100644
index 606de5f31c..0000000000
--- a/packages/xlibs/libxt_1.0.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "X Toolkit Intrinsics"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "X-MIT"
-
-DEPENDS = "libx11 libsm util-macros kbproto"
-PROVIDES = "xt"
-
-XORG_PN = "libXt"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C util '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
- )
- oe_runmake
-}
diff --git a/packages/xlibs/libxt_1.0.2.bb b/packages/xlibs/libxt_1.0.2.bb
deleted file mode 100644
index 69c74343a4..0000000000
--- a/packages/xlibs/libxt_1.0.2.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "X Toolkit Intrinsics"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "X-MIT"
-
-DEPENDS = "libx11 libsm util-macros"
-PROVIDES = "xt"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXt"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C util '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
- )
- oe_runmake
-}
diff --git a/packages/xlibs/libxtst_1.0.1.bb b/packages/xlibs/libxtst_1.0.1.bb
deleted file mode 100644
index 1355142ffd..0000000000
--- a/packages/xlibs/libxtst_1.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X Test Extension: client side library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11 libxext recordproto xextproto inputproto"
-PROVIDES = "xtst"
-
-XORG_PN = "libXtst"
-
-include xorg-xlibs.inc
diff --git a/packages/xlibs/libxv_X11R7.0-1.0.1.bb b/packages/xlibs/libxv_X11R7.0-1.0.1.bb
deleted file mode 100644
index 2d5c6aeb17..0000000000
--- a/packages/xlibs/libxv_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X Video extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11 libxext xextproto videoproto"
-
-XORG_PN = "libXv"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxxf86dga_1.0.0.bb b/packages/xlibs/libxxf86dga_1.0.0.bb
deleted file mode 100644
index 82e784789f..0000000000
--- a/packages/xlibs/libxxf86dga_1.0.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Xxf86dga extension library."
-SECTION = "x11/libs"
-LICENSE = "XFree86"
-
-DEPENDS = "libx11 libxext xf86dgaproto"
-
-XORG_PN = "libXxf86dga"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
- oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
-}
diff --git a/packages/xlibs/libxxf86dga_1.0.1.bb b/packages/xlibs/libxxf86dga_1.0.1.bb
deleted file mode 100644
index 2842c2c458..0000000000
--- a/packages/xlibs/libxxf86dga_1.0.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Xxf86dga extension library."
-SECTION = "x11/libs"
-LICENSE = "XFree86"
-
-DEPENDS = "libx11 libxext"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXxf86dga"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
- oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
-}
diff --git a/packages/xlibs/libxxf86misc_1.0.0.bb b/packages/xlibs/libxxf86misc_1.0.0.bb
deleted file mode 100644
index 5d5badb7a1..0000000000
--- a/packages/xlibs/libxxf86misc_1.0.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Xxf86vm extension library."
-SECTION = "x11/libs"
-LICENSE = "MIT"
-DEPENDS = "libx11 libxext xf86miscproto"
-
-XORG_PN = "libXxf86misc"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
diff --git a/packages/xlibs/libxxf86misc_1.0.1.bb b/packages/xlibs/libxxf86misc_1.0.1.bb
deleted file mode 100644
index 2544f91ab1..0000000000
--- a/packages/xlibs/libxxf86misc_1.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Xxf86vm extension library."
-SECTION = "x11/libs"
-LICENSE = "MIT"
-DEPENDS = "libx11 libxext"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXxf86misc"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
diff --git a/packages/xlibs/libxxf86vm_1.0.0.bb b/packages/xlibs/libxxf86vm_1.0.0.bb
deleted file mode 100644
index 47a319c28e..0000000000
--- a/packages/xlibs/libxxf86vm_1.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Xxf86vm extension library."
-SECTION = "x11/libs"
-LICENSE = "MIT"
-
-DEPENDS = "libx11 libxext xf86vidmodeproto"
-
-XORG_PN = "libXxf86vm"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
diff --git a/packages/xlibs/libxxf86vm_1.0.1.bb b/packages/xlibs/libxxf86vm_1.0.1.bb
deleted file mode 100644
index 0ab206a0df..0000000000
--- a/packages/xlibs/libxxf86vm_1.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Xxf86vm extension library."
-SECTION = "x11/libs"
-LICENSE = "MIT"
-
-DEPENDS = "libx11 libxext"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXxf86vm"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
diff --git a/packages/xlibs/util-macros_1.0.1.bb b/packages/xlibs/util-macros_1.0.1.bb
deleted file mode 100644
index 6b009a7ea7..0000000000
--- a/packages/xlibs/util-macros_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "X autotools macros"
-SECTION = "x11/libs"
-LICENSE= "Xorg"
-#MAINTAINER = ""
-
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2"
diff --git a/packages/xlibs/util-macros_1.0.2.bb b/packages/xlibs/util-macros_1.0.2.bb
deleted file mode 100644
index 76101b0345..0000000000
--- a/packages/xlibs/util-macros_1.0.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "X autotools macros"
-SECTION = "x11/libs"
-LICENSE= "Xorg"
-#MAINTAINER = ""
-
-XORG_PN = "${PN}"
-XORG_RELEASE = "X11R7.1"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/${PN}-X11R7.1-${PV}.tar.bz2"
diff --git a/packages/xlibs/xorg-xlibs.inc b/packages/xlibs/xorg-xlibs.inc
deleted file mode 100644
index 8fb46777b0..0000000000
--- a/packages/xlibs/xorg-xlibs.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-XORG_PV = "${@['${XORG_RELEASE}-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:4]=='X11R']}"
-XORG_RELEASE ?= "X11R7.0"
-
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-${XORG_PV}"
-
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
diff --git a/packages/xlibs/xtrans_1.0.0.bb b/packages/xlibs/xtrans_1.0.0.bb
deleted file mode 100644
index b6933bf615..0000000000
--- a/packages/xlibs/xtrans_1.0.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "MIT"
-SECTION = "x11/libs"
-DESCRIPTION = "network API translation layer to \
-insulate X applications and libraries from OS \
-network vageries."
-
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
diff --git a/packages/xmodmap/xmodmap_1.0.0.bb b/packages/xmodmap/xmodmap_1.0.0.bb
deleted file mode 100644
index d65c84bb71..0000000000
--- a/packages/xmodmap/xmodmap_1.0.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-LICENSE = "MIT"
-DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
-SECTION = "x11/base"
-
-DEPENDS = "libx11"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.0.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-inherit autotools pkgconfig
diff --git a/packages/xlibs/libxvmc/.mtn2git_empty b/packages/xorg-app/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxvmc/.mtn2git_empty
+++ b/packages/xorg-app/.mtn2git_empty
diff --git a/packages/xorg-app/appres_X11R7.0-1.0.0.bb b/packages/xorg-app/appres_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..e6780a89f2
--- /dev/null
+++ b/packages/xorg-app/appres_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "The appres program prints the resources seen by an application."
+
+DEPENDS += " libx11 libxt"
+
diff --git a/packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb b/packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..7b6aa37311
--- /dev/null
+++ b/packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Native bdftopdf utility"
+SECTION = "x11/fonts"
+LICENSE = "MIT-X"
+
+S="${WORKDIR}/bdftopcf-${PV}"
+
+DEPENDS = "libxfont-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/bdftopcf-X11R7.0-1.0.0.tar.gz"
+
+inherit native autotools pkgconfig
+
diff --git a/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..4eefa72194
--- /dev/null
+++ b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "bdftopcf is a font compiler for the X server and font server."
+
+DEPENDS += " libxfont"
+
diff --git a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..e8083fde2a
--- /dev/null
+++ b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxscrnsaver libxt libxaw libxt"
+
diff --git a/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb b/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a738705e7e
--- /dev/null
+++ b/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb
@@ -0,0 +1,5 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxmu xbitmaps libxt"
diff --git a/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb b/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..1f4c3ea1b1
--- /dev/null
+++ b/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxmu xbitmaps libxt"
+
diff --git a/packages/xorg-app/editres_X11R7.0-1.0.1.bb b/packages/xorg-app/editres_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..aeb981cd43
--- /dev/null
+++ b/packages/xorg-app/editres_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxt libxmu libxaw"
+
diff --git a/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb b/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..5d268a7f76
--- /dev/null
+++ b/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto freetype libfontenc"
+
diff --git a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b86b4ba4d8
--- /dev/null
+++ b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libfs"
+
diff --git a/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb b/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b86b4ba4d8
--- /dev/null
+++ b/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libfs"
+
diff --git a/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb b/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..b86b4ba4d8
--- /dev/null
+++ b/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libfs"
+
diff --git a/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..2093e75f68
--- /dev/null
+++ b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto libice"
+
diff --git a/packages/xorg-app/ico_X11R7.0-1.0.1.bb b/packages/xorg-app/ico_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/ico_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+
diff --git a/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..ce1485e63b
--- /dev/null
+++ b/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include 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 libx11 libice xproxymngproto bigreqsproto zlib"
diff --git a/packages/xorg-app/listres_X11R7.0-1.0.1.bb b/packages/xorg-app/listres_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..cb0808ad2b
--- /dev/null
+++ b/packages/xorg-app/listres_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libx11 libxt libxmu"
+
diff --git a/packages/xorg-app/luit_X11R7.0-1.0.1.bb b/packages/xorg-app/luit_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..de995f785b
--- /dev/null
+++ b/packages/xorg-app/luit_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " zlib zlib libx11 libfontenc"
+
diff --git a/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb b/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a84aa3db3b
--- /dev/null
+++ b/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxfont libfs libfontenc"
+
diff --git a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b322350e03
--- /dev/null
+++ b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X mkfontdir app"
+SECTION = "x11/apps"
+LICENSE = "MIT-X"
+
+S="${WORKDIR}/mkfontdir-${PV}"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontdir-${PV}.tar.bz2"
+
+DEPENDS = "util-macros-native"
+inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..3ec30fde48
--- /dev/null
+++ b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X mkfontdir app"
+SECTION = "x11/apps"
+LICENSE = "MIT-X"
+
+S="${WORKDIR}/mkfontdir-${PV}"
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/app/mkfontdir-${PV}.tar.bz2"
+
+DEPENDS = "util-macros-native"
+inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..62c088314f
--- /dev/null
+++ b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..62c088314f
--- /dev/null
+++ b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..98b49f99ac
--- /dev/null
+++ b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "X mkfontscale app"
+SECTION = "x11/apps"
+LICENSE = "MIT-X"
+S="${WORKDIR}/mkfontscale-${PV}"
+
+DEPENDS = "libx11-native libfontenc-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontscale-${PV}.tar.bz2"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..0d90a387e2
--- /dev/null
+++ b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " zlib libfontenc freetype libx11"
+
diff --git a/packages/xorg-app/oclock_X11R7.0-1.0.1.bb b/packages/xorg-app/oclock_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..c73ea3426b
--- /dev/null
+++ b/packages/xorg-app/oclock_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxmu libxext libxt"
+
diff --git a/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb b/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..dc1e5ccbcf
--- /dev/null
+++ b/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libice libxt libx11 xproxymngproto"
+
diff --git a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..a6eb7ea7d4
--- /dev/null
+++ b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxt"
+
diff --git a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..4077c44cfb
--- /dev/null
+++ b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto util-macros"
+
+
diff --git a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+
diff --git a/packages/xorg-app/rstart_X11R7.1-1.0.2.bb b/packages/xorg-app/rstart_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/rstart_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+
diff --git a/packages/xorg-app/scripts_X11R7.0-1.0.1.bb b/packages/xorg-app/scripts_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..3e99a06516
--- /dev/null
+++ b/packages/xorg-app/scripts_X11R7.0-1.0.1.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+
+
diff --git a/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb b/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+
diff --git a/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb b/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..962cdf481c
--- /dev/null
+++ b/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile libx11"
+
diff --git a/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb b/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..962cdf481c
--- /dev/null
+++ b/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile libx11"
+
diff --git a/packages/xorg-app/showfont_X11R7.0-1.0.1.bb b/packages/xorg-app/showfont_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..46efe223ef
--- /dev/null
+++ b/packages/xorg-app/showfont_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libfs"
+
diff --git a/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a8533a377a
--- /dev/null
+++ b/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxt libxmu"
+
diff --git a/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb b/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..a8533a377a
--- /dev/null
+++ b/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxt libxmu"
+
diff --git a/packages/xorg-app/twm_X11R7.0-1.0.1.bb b/packages/xorg-app/twm_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..ab47831d31
--- /dev/null
+++ b/packages/xorg-app/twm_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "tiny window manager"
+
+DEPENDS += " libx11 libxext libxt libxmu"
+
+ALTERNATIVE_PATH = "${bindir}/twm"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "1"
diff --git a/packages/xorg-app/viewres_X11R7.0-1.0.1.bb b/packages/xorg-app/viewres_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..2a03dcb18c
--- /dev/null
+++ b/packages/xorg-app/viewres_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxt"
+
diff --git a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..52746c9316
--- /dev/null
+++ b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxmu"
+
diff --git a/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb b/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
new file mode 100644
index 0000000000..83b1830524
--- /dev/null
+++ b/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
@@ -0,0 +1,5 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxmu libxrender libxft libxext"
diff --git a/packages/xmodmap/xmodmap/.mtn2git_empty b/packages/xorg-app/xauth/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xmodmap/xmodmap/.mtn2git_empty
+++ b/packages/xorg-app/xauth/.mtn2git_empty
diff --git a/packages/x11-apps/xauth/autofoo.patch b/packages/xorg-app/xauth/autofoo.patch
index d279a6f4fc..d279a6f4fc 100644
--- a/packages/x11-apps/xauth/autofoo.patch
+++ b/packages/xorg-app/xauth/autofoo.patch
diff --git a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..1608c22e0e
--- /dev/null
+++ b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxau libxext libxmu"
+
diff --git a/packages/x11-apps/xauth_cvs.bb b/packages/xorg-app/xauth_cvs.bb
index 54700574b7..54700574b7 100644
--- a/packages/x11-apps/xauth_cvs.bb
+++ b/packages/xorg-app/xauth_cvs.bb
diff --git a/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb b/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..0c5c6ed540
--- /dev/null
+++ b/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw xbitmaps libxext"
+
diff --git a/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb b/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb b/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..aa68cc73e0
--- /dev/null
+++ b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxaw libxrender libxft libxkbfile libxt"
+
diff --git a/packages/xorg-app/xclock_X11R7.1-1.0.2.bb b/packages/xorg-app/xclock_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..aa68cc73e0
--- /dev/null
+++ b/packages/xorg-app/xclock_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxaw libxrender libxft libxkbfile libxt"
+
diff --git a/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+
diff --git a/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb b/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb b/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..2a03dcb18c
--- /dev/null
+++ b/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxt"
+
diff --git a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..2f5c449b0b
--- /dev/null
+++ b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxcursor libpng"
+
diff --git a/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb b/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..2f5c449b0b
--- /dev/null
+++ b/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxcursor libpng"
+
diff --git a/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb b/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..7bf0a43a95
--- /dev/null
+++ b/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxp libxprintutil libxp libxau libxext"
+
diff --git a/packages/xorg-app/xditview_X11R7.0-1.0.1.bb b/packages/xorg-app/xditview_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xditview_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..0ccc5710a9
--- /dev/null
+++ b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X display manager"
+
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libx11 libxext libxdmcp libxt"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
+
diff --git a/packages/xorg-app/xdm_X11R7.1-1.0.4.bb b/packages/xorg-app/xdm_X11R7.1-1.0.4.bb
new file mode 100644
index 0000000000..0450f2f8f3
--- /dev/null
+++ b/packages/xorg-app/xdm_X11R7.1-1.0.4.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X display manager"
+
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau libx11 libxext libxdmcp libxt"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/packages/xprop/xprop/.mtn2git_empty b/packages/xorg-app/xdpyinfo/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xprop/xprop/.mtn2git_empty
+++ b/packages/xorg-app/xdpyinfo/.mtn2git_empty
diff --git a/packages/xdpyinfo/xdpyinfo/disable-xkb.patch b/packages/xorg-app/xdpyinfo/disable-xkb.patch
index 24af21f4fc..24af21f4fc 100644
--- a/packages/xdpyinfo/xdpyinfo/disable-xkb.patch
+++ b/packages/xorg-app/xdpyinfo/disable-xkb.patch
diff --git a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a8f4c66934
--- /dev/null
+++ b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X display information utility"
+LICENSE = "MIT"
+
+DEPENDS += " libxtst libxext libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
+
+SRC_URI += "file://disable-xkb.patch;patch=1"
+
+EXTRA_OECONF = "--disable-xkb"
diff --git a/packages/xdpyinfo/xdpyinfo_cvs.bb b/packages/xorg-app/xdpyinfo_cvs.bb
index eb63ae7f4d..eb63ae7f4d 100644
--- a/packages/xdpyinfo/xdpyinfo_cvs.bb
+++ b/packages/xorg-app/xdpyinfo_cvs.bb
diff --git a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..ced75ddf5a
--- /dev/null
+++ b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 glproto mesa"
+
diff --git a/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb b/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..ced75ddf5a
--- /dev/null
+++ b/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 glproto mesa"
+
diff --git a/packages/xorg-app/xedit_X11R7.0-1.0.1.bb b/packages/xorg-app/xedit_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..ae2da418b0
--- /dev/null
+++ b/packages/xorg-app/xedit_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxprintutil libxp libxt"
+
diff --git a/packages/xorg-app/xedit_X11R7.1-1.0.2.bb b/packages/xorg-app/xedit_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..ae2da418b0
--- /dev/null
+++ b/packages/xorg-app/xedit_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxprintutil libxp libxt"
+
diff --git a/packages/xrdb/xrdb/.mtn2git_empty b/packages/xorg-app/xev/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xrdb/xrdb/.mtn2git_empty
+++ b/packages/xorg-app/xev/.mtn2git_empty
diff --git a/packages/xev/files/diet-x11.patch b/packages/xorg-app/xev/diet-x11.patch
index 7e93f160a5..7e93f160a5 100644
--- a/packages/xev/files/diet-x11.patch
+++ b/packages/xorg-app/xev/diet-x11.patch
diff --git a/packages/xorg-app/xev_X11R7.0-1.0.1.bb b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..3158de66a5
--- /dev/null
+++ b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X Event Viewer"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+LICENSE = "MIT"
+
+DEPENDS += " libx11"
+
diff --git a/packages/xev/xev_cvs.bb b/packages/xorg-app/xev_cvs.bb
index 3ea9d05c63..3ea9d05c63 100644
--- a/packages/xev/xev_cvs.bb
+++ b/packages/xorg-app/xev_cvs.bb
diff --git a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..bc0b9fb114
--- /dev/null
+++ b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
@@ -0,0 +1,5 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxau libxt libxext libxmu"
diff --git a/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb b/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..ef6de0aaaa
--- /dev/null
+++ b/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxxf86dga libxt libxaw libxmu"
+
diff --git a/packages/xorg-app/xfd_X11R7.0-1.0.1.bb b/packages/xorg-app/xfd_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..4487df1c6e
--- /dev/null
+++ b/packages/xorg-app/xfd_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw freetype fontconfig libxft libxt"
+
diff --git a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..02f8bf36b8
--- /dev/null
+++ b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libice libxt xproxymngproto"
+
diff --git a/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb b/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xfs_X11R7.0-1.0.1.bb b/packages/xorg-app/xfs_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..bb5dbb18e3
--- /dev/null
+++ b/packages/xorg-app/xfs_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X fontserver"
+
+DEPENDS += " libfs libxfont xtrans"
+
diff --git a/packages/xorg-app/xfs_X11R7.1-1.0.2.bb b/packages/xorg-app/xfs_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..bb5dbb18e3
--- /dev/null
+++ b/packages/xorg-app/xfs_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X fontserver"
+
+DEPENDS += " libfs libxfont xtrans"
+
diff --git a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b86b4ba4d8
--- /dev/null
+++ b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libfs"
+
diff --git a/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb b/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..5300f85f86
--- /dev/null
+++ b/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libice xproxymngproto"
+
diff --git a/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb b/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..d8ff2d20a5
--- /dev/null
+++ b/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxxf86vm"
+
diff --git a/packages/xorg-app/xgc_X11R7.0-1.0.1.bb b/packages/xorg-app/xgc_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xgc_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/xorg-app/xhost/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xserver-common/files/.mtn2git_empty
+++ b/packages/xorg-app/xhost/.mtn2git_empty
diff --git a/packages/xhost/xhost/autofoo.patch b/packages/xorg-app/xhost/autofoo.patch
index b29f017abc..b29f017abc 100644
--- a/packages/xhost/xhost/autofoo.patch
+++ b/packages/xorg-app/xhost/autofoo.patch
diff --git a/packages/xhost/xhost_20040413.bb b/packages/xorg-app/xhost_20040413.bb
index 4d36e62bee..4d36e62bee 100644
--- a/packages/xhost/xhost_20040413.bb
+++ b/packages/xorg-app/xhost_20040413.bb
diff --git a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..a53f8defed
--- /dev/null
+++ b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "Server access control program for X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "MIT"
+
+DEPENDS += " libx11 libxmu libxau"
+
diff --git a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..a53f8defed
--- /dev/null
+++ b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "Server access control program for X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "MIT"
+
+DEPENDS += " libx11 libxmu libxau"
+
diff --git a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..3e99a06516
--- /dev/null
+++ b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+
+
diff --git a/packages/xorg-app/xinit_X11R7.1-1.0.2.bb b/packages/xorg-app/xinit_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..f3259146f5
--- /dev/null
+++ b/packages/xorg-app/xinit_X11R7.1-1.0.2.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+FILES_${PN} += " /usr/lib/X11/xinit"
+
diff --git a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..debcdb4481
--- /dev/null
+++ b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+
+DEPENDS += " libx11 libxkbfile"
+
diff --git a/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb b/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..debcdb4481
--- /dev/null
+++ b/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+
+DEPENDS += " libx11 libxkbfile"
+
diff --git a/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..962cdf481c
--- /dev/null
+++ b/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile libx11"
+
diff --git a/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb b/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..962cdf481c
--- /dev/null
+++ b/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile libx11"
+
diff --git a/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..962cdf481c
--- /dev/null
+++ b/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile libx11"
+
diff --git a/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..125af907fc
--- /dev/null
+++ b/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxkbfile libx11"
+
diff --git a/packages/xorg-app/xkill_X11R7.0-1.0.1.bb b/packages/xorg-app/xkill_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..52746c9316
--- /dev/null
+++ b/packages/xorg-app/xkill_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxmu"
+
diff --git a/packages/xorg-app/xload_X11R7.0-1.0.1.bb b/packages/xorg-app/xload_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xload_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb b/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..1c68e539a6
--- /dev/null
+++ b/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxprintutil libxp libxrender libxft libxext libxt"
+
diff --git a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..52746c9316
--- /dev/null
+++ b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxmu"
+
diff --git a/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..52746c9316
--- /dev/null
+++ b/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxmu"
+
diff --git a/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+
diff --git a/packages/xorg-app/xmag_X11R7.0-1.0.1.bb b/packages/xorg-app/xmag_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xmag_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xman_X11R7.0-1.0.1.bb b/packages/xorg-app/xman_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..16364e3ddc
--- /dev/null
+++ b/packages/xorg-app/xman_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxprintutil libxp libxt"
+RDEPENDS = " man"
+
+FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/packages/xorg-app/xman_X11R7.1-1.0.2.bb b/packages/xorg-app/xman_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..16364e3ddc
--- /dev/null
+++ b/packages/xorg-app/xman_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxprintutil libxp libxt"
+RDEPENDS = " man"
+
+FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb b/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..457946bcf3
--- /dev/null
+++ b/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "xmessage displays a message or query in a window."
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xmh_X11R7.0-1.0.1.bb b/packages/xorg-app/xmh_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xmh_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xserver/.mtn2git_empty b/packages/xorg-app/xmodmap/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xserver/.mtn2git_empty
+++ b/packages/xorg-app/xmodmap/.mtn2git_empty
diff --git a/packages/xmodmap/xmodmap/autofoo.patch b/packages/xorg-app/xmodmap/autofoo.patch
index f309add086..f309add086 100644
--- a/packages/xmodmap/xmodmap/autofoo.patch
+++ b/packages/xorg-app/xmodmap/autofoo.patch
diff --git a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..3f1300b670
--- /dev/null
+++ b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "Utility for modifying keymaps and pointer button mappings in X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "MIT"
+
+DEPENDS += " libx11"
+
diff --git a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..b3e13bea6a
--- /dev/null
+++ b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "MIT"
+
+DEPENDS += " libx11"
+
diff --git a/packages/xmodmap/xmodmap_cvs.bb b/packages/xorg-app/xmodmap_cvs.bb
index 773466e6bb..773466e6bb 100644
--- a/packages/xmodmap/xmodmap_cvs.bb
+++ b/packages/xorg-app/xmodmap_cvs.bb
diff --git a/packages/xorg-app/xmore_X11R7.0-1.0.1.bb b/packages/xorg-app/xmore_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..3d53264fba
--- /dev/null
+++ b/packages/xorg-app/xmore_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxprintutil libxp libxt"
+
diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc
new file mode 100644
index 0000000000..78146b1e78
--- /dev/null
+++ b/packages/xorg-app/xorg-app-common.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "X application"
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/apps"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+#DEPENDS = ""
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+FILES_${PN} += " /usr/lib/X11/${XORG_PN}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..50558f2b05
--- /dev/null
+++ b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxprintapputil libxaw libxprintutil libxt libxp"
+
diff --git a/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb b/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..edde5ae353
--- /dev/null
+++ b/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxp libxprintutil libx11"
+
diff --git a/packages/xorg-app/xpr_X11R7.0-1.0.1.bb b/packages/xorg-app/xpr_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..14c99d3343
--- /dev/null
+++ b/packages/xorg-app/xpr_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu libx11"
+
diff --git a/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb b/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..97426ec2c7
--- /dev/null
+++ b/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxp libx11"
+
diff --git a/packages/xserver/xserver-kdrive-omap/.mtn2git_empty b/packages/xorg-app/xprop/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xserver/xserver-kdrive-omap/.mtn2git_empty
+++ b/packages/xorg-app/xprop/.mtn2git_empty
diff --git a/packages/xprop/xprop/autofoo.patch b/packages/xorg-app/xprop/autofoo.patch
index 2526d95087..2526d95087 100644
--- a/packages/xprop/xprop/autofoo.patch
+++ b/packages/xorg-app/xprop/autofoo.patch
diff --git a/packages/xorg-app/xprop_X11R7.0-1.0.1.bb b/packages/xorg-app/xprop_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..14c99d3343
--- /dev/null
+++ b/packages/xorg-app/xprop_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu libx11"
+
diff --git a/packages/xprop/xprop_cvs.bb b/packages/xorg-app/xprop_cvs.bb
index f6dd54b7cd..f6dd54b7cd 100644
--- a/packages/xprop/xprop_cvs.bb
+++ b/packages/xorg-app/xprop_cvs.bb
diff --git a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..ac20c5f4cb
--- /dev/null
+++ b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE= "BSD-X"
+
+DEPENDS += " libxrandr libxrender libx11"
+
diff --git a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..ac20c5f4cb
--- /dev/null
+++ b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE= "BSD-X"
+
+DEPENDS += " libxrandr libxrender libx11"
+
diff --git a/packages/xrandr/xrandr_cvs.bb b/packages/xorg-app/xrandr_cvs.bb
index 0ab7c745f4..0ab7c745f4 100644
--- a/packages/xrandr/xrandr_cvs.bb
+++ b/packages/xorg-app/xrandr_cvs.bb
diff --git a/packages/xserver/xserver-kdrive/.mtn2git_empty b/packages/xorg-app/xrdb/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xserver/xserver-kdrive/.mtn2git_empty
+++ b/packages/xorg-app/xrdb/.mtn2git_empty
diff --git a/packages/xrdb/xrdb/autofoo.patch b/packages/xorg-app/xrdb/autofoo.patch
index b30a46bc36..b30a46bc36 100644
--- a/packages/xrdb/xrdb/autofoo.patch
+++ b/packages/xorg-app/xrdb/autofoo.patch
diff --git a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..39d6bce25f
--- /dev/null
+++ b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X server resource database utility"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "xrdb"
+
+DEPENDS += " libxmu libx11 libxext"
+
diff --git a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..903474e054
--- /dev/null
+++ b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X server resource database utility"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "xrdb"
+
+DEPENDS += " libxmu libx11 libxext"
diff --git a/packages/xrdb/xrdb_cvs.bb b/packages/xorg-app/xrdb_cvs.bb
index cbf2caac70..cbf2caac70 100644
--- a/packages/xrdb/xrdb_cvs.bb
+++ b/packages/xorg-app/xrdb_cvs.bb
diff --git a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+
diff --git a/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb b/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+
diff --git a/packages/xorg-app/xrx_X11R7.0-1.0.1.bb b/packages/xorg-app/xrx_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..058badcd6a
--- /dev/null
+++ b/packages/xorg-app/xrx_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libx11 libxt libxext xtrans xproxymngproto libxau"
+
diff --git a/packages/xserver/xserver-xorg/.mtn2git_empty b/packages/xorg-app/xset/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xserver/xserver-xorg/.mtn2git_empty
+++ b/packages/xorg-app/xset/.mtn2git_empty
diff --git a/packages/xset/xset/autofoo.patch b/packages/xorg-app/xset/autofoo.patch
index 039d1319e3..039d1319e3 100644
--- a/packages/xset/xset/autofoo.patch
+++ b/packages/xorg-app/xset/autofoo.patch
diff --git a/packages/xset/xset/disable-xkb.patch b/packages/xorg-app/xset/disable-xkb.patch
index 6060fbb995..6060fbb995 100644
--- a/packages/xset/xset/disable-xkb.patch
+++ b/packages/xorg-app/xset/disable-xkb.patch
diff --git a/packages/xset/xset_20040817.bb b/packages/xorg-app/xset_20040817.bb
index daf57d15c8..daf57d15c8 100644
--- a/packages/xset/xset_20040817.bb
+++ b/packages/xorg-app/xset_20040817.bb
diff --git a/packages/xorg-app/xset_X11R7.0-1.0.1.bb b/packages/xorg-app/xset_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..c8424cb12d
--- /dev/null
+++ b/packages/xorg-app/xset_X11R7.0-1.0.1.bb
@@ -0,0 +1,13 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "user preference utility for X"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+LICENSE = "MIT"
+
+DEPENDS += " libxmu libxext libx11 libxxf86misc libxfontcache libxp"
+
+SRC_URI += "file://disable-xkb.patch;patch=1"
+
+CFLAGS += "-D_GNU_SOURCE"
+EXTRA_OECONF = "--disable-xkb"
+
diff --git a/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/packages/xorg-app/xset_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..c8424cb12d
--- /dev/null
+++ b/packages/xorg-app/xset_X11R7.1-1.0.2.bb
@@ -0,0 +1,13 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "user preference utility for X"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+LICENSE = "MIT"
+
+DEPENDS += " libxmu libxext libx11 libxxf86misc libxfontcache libxp"
+
+SRC_URI += "file://disable-xkb.patch;patch=1"
+
+CFLAGS += "-D_GNU_SOURCE"
+EXTRA_OECONF = "--disable-xkb"
+
diff --git a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..ca8816065c
--- /dev/null
+++ b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxi libx11"
+
diff --git a/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..ca8816065c
--- /dev/null
+++ b/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxi libx11"
+
diff --git a/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb b/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..8cf815f2f6
--- /dev/null
+++ b/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu libx11 xbitmaps"
+
diff --git a/packages/xorg-app/xsm_X11R7.0-1.0.1.bb b/packages/xorg-app/xsm_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..57d80cc75c
--- /dev/null
+++ b/packages/xorg-app/xsm_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = "X Session Manager"
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..14c99d3343
--- /dev/null
+++ b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu libx11"
+
diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb
new file mode 100644
index 0000000000..0738ffab02
--- /dev/null
+++ b/packages/xorg-app/xterm_207.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "xterm app"
+SECTION = "x11/apps"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+DEPENDS = "xproto libx11 xextproto xext xau xpm ncurses"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/extras/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += " /usr/lib/X11"
+
+#EXTRA_OERECONF = " -I${S}/xterm.m4"
+EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} FREETYPE_CONFIG=${STAGING_DIR}/${BUILD_SYS}/bin/freetype-config"
+
+#do_configure_prepend () {
+# mv ${S}/aclocal.m4 ${S}/xterm.m4
+#}
+do_configure() {
+
+ sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure
+
+ oe_runconf
+}
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..76c1a1e3d4
--- /dev/null
+++ b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxtrap"
+
diff --git a/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb b/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..76c1a1e3d4
--- /dev/null
+++ b/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxtrap"
+
diff --git a/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb b/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..06f2b5115f
--- /dev/null
+++ b/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxxf86vm libxt"
+
diff --git a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b5caa9a7a1
--- /dev/null
+++ b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxv libx11"
+
diff --git a/packages/xorg-app/xwd_X11R7.0-1.0.1.bb b/packages/xorg-app/xwd_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..14c99d3343
--- /dev/null
+++ b/packages/xorg-app/xwd_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu libx11"
+
diff --git a/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..6662f1d710
--- /dev/null
+++ b/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu libxext libx11"
+
diff --git a/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb b/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..6662f1d710
--- /dev/null
+++ b/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu libxext libx11"
+
diff --git a/packages/xorg-app/xwud_X11R7.0-1.0.1.bb b/packages/xorg-app/xwud_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/xwud_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+
diff --git a/packages/xorg-data/data-common.inc b/packages/xorg-data/data-common.inc
deleted file mode 100644
index 47dc922500..0000000000
--- a/packages/xorg-data/data-common.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "X data files"
-SECTION = "x11/data"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/data/${PN}-X11R7.0-${PV}.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
diff --git a/packages/xorg-data/xbitmaps_1.0.1.bb b/packages/xorg-data/xbitmaps_1.0.1.bb
deleted file mode 100644
index aa6c16c802..0000000000
--- a/packages/xorg-data/xbitmaps_1.0.1.bb
+++ /dev/null
@@ -1 +0,0 @@
-include data-common.inc
diff --git a/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..3071a71a5b
--- /dev/null
+++ b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-data-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb b/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..bc09132a05
--- /dev/null
+++ b/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-data-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxcursor"
+
diff --git a/packages/xorg-data/xkbdata_1.0.1.bb b/packages/xorg-data/xkbdata_1.0.1.bb
deleted file mode 100644
index 9b34b04ad2..0000000000
--- a/packages/xorg-data/xkbdata_1.0.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include data-common.inc
-FILES_${PN} = "/usr/share/X11/*"
-RDEPENDS = "xkbcomp"
diff --git a/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b3e3a92ac6
--- /dev/null
+++ b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb
@@ -0,0 +1,9 @@
+include xorg-data-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+RDEPENDS = "xkbcomp"
+
+FILES_${PN} += " /usr/share/X11/xkb"
+
diff --git a/packages/xorg-data/xorg-data-common.inc b/packages/xorg-data/xorg-data-common.inc
new file mode 100644
index 0000000000..ade9fdec58
--- /dev/null
+++ b/packages/xorg-data/xorg-data-common.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "X data files"
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/datas"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+#DEPENDS = ""
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xset/xset/.mtn2git_empty b/packages/xorg-doc/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xset/xset/.mtn2git_empty
+++ b/packages/xorg-doc/.mtn2git_empty
diff --git a/packages/xorg-doc/xorg-doc-common.inc b/packages/xorg-doc/xorg-doc-common.inc
new file mode 100644
index 0000000000..91a297265b
--- /dev/null
+++ b/packages/xorg-doc/xorg-doc-common.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "X documentation"
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/docs"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+#DEPENDS = ""
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/doc/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb b/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..44bd16051a
--- /dev/null
+++ b/packages/xorg-doc/xorg-docs_X11R7.0-1.0.1.bb
@@ -0,0 +1,9 @@
+include xorg-doc-common.inc
+
+DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
+source tree."
+
+DEPENDS += " intltool"
+
+FILES_${PN} += " /usr/share/X11/doc"
+
diff --git a/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb b/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb
new file mode 100644
index 0000000000..44bd16051a
--- /dev/null
+++ b/packages/xorg-doc/xorg-docs_X11R7.1-1.2.bb
@@ -0,0 +1,9 @@
+include xorg-doc-common.inc
+
+DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
+source tree."
+
+DEPENDS += " intltool"
+
+FILES_${PN} += " /usr/share/X11/doc"
+
diff --git a/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb b/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..75163dba22
--- /dev/null
+++ b/packages/xorg-doc/xorg-sgml-doctools_X11R7.0-1.0.1.bb
@@ -0,0 +1,7 @@
+include xorg-doc-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+FILES_${PN} += " /usr/share/X11/sgml"
diff --git a/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb b/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb
new file mode 100644
index 0000000000..75163dba22
--- /dev/null
+++ b/packages/xorg-doc/xorg-sgml-doctools_X11R7.1-1.1.bb
@@ -0,0 +1,7 @@
+include xorg-doc-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+FILES_${PN} += " /usr/share/X11/sgml"
diff --git a/packages/xorg-driver/.mtn2git_empty b/packages/xorg-driver/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-driver/.mtn2git_empty
diff --git a/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-acecad_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-acecad_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-aiptek_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb b/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-aiptek_X11R7.1-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-calcomp_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-calcomp_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb b/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-citron_X11R7.0-2.1.1.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb b/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-citron_X11R7.1-2.2.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-digitaledge_X11R7.0-1.0.1.3.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-digitaledge_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-dmc_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-dmc_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-dynapro_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-dynapro_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-elo2300_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-elo2300_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-evdev_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb b/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb
new file mode 100644
index 0000000000..0e81a3f8d2
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-evdev_X11R7.1-1.1.2.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " kbproto"
+
diff --git a/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-fpit_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-fpit_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-hyperpen_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-hyperpen_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-jamstudio_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-jamstudio_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-joystick_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-joystick_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb
new file mode 100644
index 0000000000..0e81a3f8d2
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-keyboard_X11R7.0-1.0.1.3.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " kbproto"
+
diff --git a/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..0e81a3f8d2
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-keyboard_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " kbproto"
+
diff --git a/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-magellan_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-magellan_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-magictouch_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb b/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-magictouch_X11R7.1-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-microtouch_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-microtouch_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb b/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb
new file mode 100644
index 0000000000..9c46cfa21e
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-mouse_X11R7.0-1.0.3.1.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+DESCRIPTION = "Mouse Support in X11"
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..f13e8eadc1
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-mouse_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+DESCRIPTION = "Mouse Support in X11
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-mutouch_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-mutouch_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-palmax_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-palmax_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-penmount_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-penmount_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-spaceorb_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-spaceorb_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-summa_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-summa_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-tek4957_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-tek4957_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-ur98_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-ur98_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb b/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb
new file mode 100644
index 0000000000..f5b0021a24
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-vmmouse_X11R7.1-12.4.0.bb
@@ -0,0 +1,8 @@
+include 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. "
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-void_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7b542e2342
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-void_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-input.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb b/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb
new file mode 100644
index 0000000000..40cec21467
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-apm_X11R7.0-1.0.1.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+"
+
+DEPENDS += " xf86rushproto"
+
diff --git a/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb
new file mode 100644
index 0000000000..40cec21467
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-apm_X11R7.1-1.1.1.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+"
+
+DEPENDS += " xf86rushproto"
+
diff --git a/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb b/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-ark_X11R7.0-0.5.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb b/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-ark_X11R7.1-0.6.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb b/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-ast_X11R7.1-0.81.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb b/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb
new file mode 100644
index 0000000000..9cd4f894ff
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-ati_X11R7.0-6.5.7.3.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb b/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb
new file mode 100644
index 0000000000..9cd4f894ff
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-ati_X11R7.1-6.6.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-chips_X11R7.0-1.0.1.3.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-chips_X11R7.1-1.1.1.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-cirrus_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-cirrus_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..2bdc1e2e3a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-cyrix_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..2bdc1e2e3a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-cyrix_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb b/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb
new file mode 100644
index 0000000000..2bdc1e2e3a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-dummy_X11R7.0-0.1.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb b/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb
new file mode 100644
index 0000000000..2bdc1e2e3a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-dummy_X11R7.1-0.2.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb b/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-fbdev_X11R7.0-0.1.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb b/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-fbdev_X11R7.1-0.3.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb
new file mode 100644
index 0000000000..dec2e1fa70
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-glint_X11R7.0-1.0.1.3.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xf86dgaproto drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb
new file mode 100644
index 0000000000..dec2e1fa70
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-glint_X11R7.1-1.1.1.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xf86dgaproto drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb b/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb
new file mode 100644
index 0000000000..1b7a1e077a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-i128_X11R7.0-1.1.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "Number Nine I128 for X11"
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb b/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb
new file mode 100644
index 0000000000..1b7a1e077a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-i128_X11R7.1-1.1.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "Number Nine I128 for X11"
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..0782229fc7
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-i740_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "I740 for X11"
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..0782229fc7
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-i740_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "I740 for X11"
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb b/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb
new file mode 100644
index 0000000000..0e39496e3a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-i810_X11R7.0-1.4.1.3.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "I810 for X11"
+
+DEPENDS += " libx11 libxvmc drm xf86driproto"
+
diff --git a/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb b/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb
new file mode 100644
index 0000000000..0e39496e3a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-i810_X11R7.1-1.6.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "I810 for X11"
+
+DEPENDS += " libx11 libxvmc drm xf86driproto"
+
diff --git a/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-imstt_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-imstt_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb b/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb
new file mode 100644
index 0000000000..3d1d2c12f6
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-mga_X11R7.0-1.2.1.3.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " drm xf86driproto"
+
diff --git a/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb b/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb
new file mode 100644
index 0000000000..3d1d2c12f6
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-mga_X11R7.1-1.4.1.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " drm xf86driproto"
+
diff --git a/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..3aebbad1d9
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-neomagic_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070"
+
+DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb
new file mode 100644
index 0000000000..41df689fd7
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-neomagic_X11R7.1-1.1.1.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070"
+
+DEPENDS += " xf86dgaproto"
+
diff --git a/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb b/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb
new file mode 100644
index 0000000000..0751631ce7
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-newport_X11R7.0-0.1.4.1.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards."
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb b/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb
new file mode 100644
index 0000000000..0751631ce7
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-newport_X11R7.1-0.2.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards."
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb b/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb
new file mode 100644
index 0000000000..dd8b202256
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-nsc_X11R7.0-2.7.6.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xf86dgaproto"
+
diff --git a/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb b/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb
new file mode 100644
index 0000000000..dd8b202256
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-nsc_X11R7.1-2.8.1.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xf86dgaproto"
+
diff --git a/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb b/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-nv_X11R7.0-1.0.1.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb b/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-nv_X11R7.1-1.1.1.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb b/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb
new file mode 100644
index 0000000000..30f11e4a0f
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-rendition_X11R7.0-4.0.1.3.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00."
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb b/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb
new file mode 100644
index 0000000000..30f11e4a0f
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-rendition_X11R7.1-4.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00."
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb b/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-s3_X11R7.0-0.3.5.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb b/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-s3_X11R7.1-0.4.1.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb b/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-s3virge_X11R7.0-1.8.6.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb b/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-s3virge_X11R7.1-1.9.1.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb b/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb
new file mode 100644
index 0000000000..ce50ce0e1e
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-savage_X11R7.0-2.0.2.3.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto"
+
diff --git a/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb b/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb
new file mode 100644
index 0000000000..7e2c424649
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-savage_X11R7.1-2.1.1.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb b/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-siliconmotion_X11R7.0-1.3.1.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb b/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-siliconmotion_X11R7.1-1.4.1.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb b/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb
new file mode 100644
index 0000000000..ec4ba0e0b4
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sis_X11R7.0-0.8.1.3.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
+
diff --git a/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb b/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb
new file mode 100644
index 0000000000..ec4ba0e0b4
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sis_X11R7.1-0.9.1.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
+
diff --git a/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb b/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb
new file mode 100644
index 0000000000..204a22a1e8
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sisusb_X11R7.0-0.7.1.3.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto"
+
diff --git a/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb b/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb
new file mode 100644
index 0000000000..204a22a1e8
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sisusb_X11R7.1-0.8.1.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto"
+
diff --git a/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..2a74356190
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sunbw2_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sunbw2_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-suncg14_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-suncg14_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-suncg3_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-suncg3_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-suncg6_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-suncg6_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb
new file mode 100644
index 0000000000..ce50ce0e1e
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sunffb_X11R7.0-1.0.1.3.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto"
+
diff --git a/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..7e2c424649
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sunffb_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sunleo_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sunleo_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-suntcx_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-suntcx_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb b/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb
new file mode 100644
index 0000000000..7e2c424649
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-tdfx_X11R7.0-1.1.1.3.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb b/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb
new file mode 100644
index 0000000000..7e2c424649
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-tdfx_X11R7.1-1.2.1.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..aae1ba8c83
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-tga_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "DEC 21030 X11 driver"
+
+DEPENDS += " xf86dgaproto"
+
diff --git a/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..aae1ba8c83
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-tga_X11R7.1-1.1.0.bb
@@ -0,0 +1,6 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "DEC 21030 X11 driver"
+
+DEPENDS += " xf86dgaproto"
+
diff --git a/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb b/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb
new file mode 100644
index 0000000000..2bdc1e2e3a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-trident_X11R7.0-1.0.1.2.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb b/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb
new file mode 100644
index 0000000000..2bdc1e2e3a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-trident_X11R7.1-1.2.1.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-tseng_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-tseng_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb b/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb
new file mode 100644
index 0000000000..40f713f729
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-v4l_X11R7.0-0.0.1.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "Video 4 Linux adaptor driver for X11"
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb b/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb
new file mode 100644
index 0000000000..40f713f729
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-v4l_X11R7.1-0.1.1.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "Video 4 Linux adaptor driver for X11"
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb b/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vesa_X11R7.0-1.0.1.3.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb b/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vesa_X11R7.1-1.2.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb b/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vga_X11R7.0-4.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb b/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb
new file mode 100644
index 0000000000..5575f1866d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vga_X11R7.1-4.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb b/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb
new file mode 100644
index 0000000000..5cec7e3d5f
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-via_X11R7.0-0.1.33.2.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto libxvmc"
diff --git a/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb b/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb
new file mode 100644
index 0000000000..5cec7e3d5f
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-via_X11R7.1-0.2.1.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto libxvmc"
diff --git a/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb b/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb
new file mode 100644
index 0000000000..0c0201ba93
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vmware_X11R7.0-10.11.1.3.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "X11 driver for VMware SVGA Device"
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb b/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb
new file mode 100644
index 0000000000..0c0201ba93
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vmware_X11R7.1-10.13.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "X11 driver for VMware SVGA Device"
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb b/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb
new file mode 100644
index 0000000000..ce469e0bc9
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-voodoo_X11R7.0-1.0.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "X11 driver for Voodoo/Voodoo2"
+
+DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb b/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..ce469e0bc9
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-voodoo_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-driver-video.inc
+
+DESCRIPTION = "X11 driver for Voodoo/Voodoo2"
+
+DEPENDS += " xf86dgaproto"
diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc
new file mode 100644
index 0000000000..361914db24
--- /dev/null
+++ b/packages/xorg-driver/xorg-driver-common.inc
@@ -0,0 +1,42 @@
+DESCRIPTION = "X driver"
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/drivers"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+DEPENDS = "randrproto xorg-server xproto"
+
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/driver/${XORG_PN}-${PV}.tar.gz"
+
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+FILES_${PN} += " ${libdir}/xorg/modules"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
+# Another sucky behavor from Xorg configure scripts.
+# They use AC_CHECK_FILE to check for DRI headers. Yuck!
+# Of course this will blow up when cross compiling.
+
+do_configure_prepend() {
+ incdir=${STAGING_INCDIR}/xorg
+ for f in dri.h sarea.h dristruct.h exa.h; do
+ path="$incdir/$f"
+ if [ -f "$path" ]; then
+ p=`echo "$path" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'`
+ eval "export ac_cv_file_$p=yes"
+ fi
+ done
+}
+
+# FIXME: We don't want to include the libtool archives (*.la) from modules
+# directory, as they serve no useful purpose. Upstream should fix Makefile.am
+do_install_append() {
+ find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
+}
+
diff --git a/packages/xorg-driver/xorg-driver-input.inc b/packages/xorg-driver/xorg-driver-input.inc
new file mode 100644
index 0000000000..e44dbd58fe
--- /dev/null
+++ b/packages/xorg-driver/xorg-driver-input.inc
@@ -0,0 +1,4 @@
+include xorg-driver-common.inc
+
+DEPENDS = "randrproto inputproto xserver-xorg xproto"
+
diff --git a/packages/xorg-driver/xorg-driver-video.inc b/packages/xorg-driver/xorg-driver-video.inc
new file mode 100644
index 0000000000..36b5b75951
--- /dev/null
+++ b/packages/xorg-driver/xorg-driver-video.inc
@@ -0,0 +1,4 @@
+include xorg-driver-common.inc
+
+DEPENDS = "randrproto renderproto videoproto xextproto fontsproto xserver-xorg xproto"
+
diff --git a/packages/xorg-font/.mtn2git_empty b/packages/xorg-font/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-font/.mtn2git_empty
diff --git a/packages/xorg-font/encodings_X11R7.0-1.0.0.bb b/packages/xorg-font/encodings_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..00aafda3bf
--- /dev/null
+++ b/packages/xorg-font/encodings_X11R7.0-1.0.0.bb
@@ -0,0 +1,7 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS = "mkfontscale-native"
+RDEPENDS = ""
+
diff --git a/packages/xorg-font/files/.mtn2git_empty b/packages/xorg-font/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-font/files/.mtn2git_empty
diff --git a/packages/xfonts/imake-staging.patch b/packages/xorg-font/files/imake-staging.patch
index bf2e350830..bf2e350830 100644
--- a/packages/xfonts/imake-staging.patch
+++ b/packages/xorg-font/files/imake-staging.patch
diff --git a/packages/xfonts/lexer.patch b/packages/xorg-font/files/lexer.patch
index c3caf57174..c3caf57174 100644
--- a/packages/xfonts/lexer.patch
+++ b/packages/xorg-font/files/lexer.patch
diff --git a/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..5ad12ba000
--- /dev/null
+++ b/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..7020e75d8c
--- /dev/null
+++ b/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "Adobe typeface software"
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..1a385e386e
--- /dev/null
+++ b/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "Adobe typeface software"
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..1a385e386e
--- /dev/null
+++ b/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "Adobe typeface software"
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..02db64181a
--- /dev/null
+++ b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb
@@ -0,0 +1,7 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "X font aliases."
+
+DEPENDS = "xserver-xorg font-util"
+RDEPENDS = "encodings font-util"
+
diff --git a/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8fcecc96be
--- /dev/null
+++ b/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,7 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "100dpi, 24 point (approximately) font to minimally support (almost) all \
+of the Arabic characters available in Unicode."
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..9b876fb953
--- /dev/null
+++ b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,7 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+-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"
diff --git a/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..f932b30872
--- /dev/null
+++ b/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "These fonts are designed for the display of Syriac text."
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..c2812649ff
--- /dev/null
+++ b/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,7 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "Provides a 12pt, 100dpi proportional font with many of \
+the glyphs needed for Unicode text."
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb b/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..07a5659300
--- /dev/null
+++ b/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X font utils."
+SECTION = "x11/fonts"
+LICENSE = "MIT-X"
+
+S="${WORKDIR}/font-util-${PV}"
+
+DEPENDS = "bdftopcf-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/font-util-${PV}.tar.gz"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..07a5659300
--- /dev/null
+++ b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X font utils."
+SECTION = "x11/fonts"
+LICENSE = "MIT-X"
+
+S="${WORKDIR}/font-util-${PV}"
+
+DEPENDS = "bdftopcf-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/font-util-${PV}.tar.gz"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-font/font-util_X11R7.0-1.0.0.bb b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..17986ecffe
--- /dev/null
+++ b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb
@@ -0,0 +1,7 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "X font utils."
+
+DEPENDS = "encodings"
+RDEPENDS = "encodings"
+
diff --git a/packages/xorg-font/font-util_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..17986ecffe
--- /dev/null
+++ b/packages/xorg-font/font-util_X11R7.1-1.0.1.bb
@@ -0,0 +1,7 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "X font utils."
+
+DEPENDS = "encodings"
+RDEPENDS = "encodings"
+
diff --git a/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xfonts/xfonts-xorg_6.8.bb b/packages/xorg-font/xfonts-xorg_6.8.bb
index f6710dcd5b..f6710dcd5b 100644
--- a/packages/xfonts/xfonts-xorg_6.8.bb
+++ b/packages/xorg-font/xfonts-xorg_6.8.bb
diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc
new file mode 100644
index 0000000000..38fd1af5a5
--- /dev/null
+++ b/packages/xorg-font/xorg-font-common.inc
@@ -0,0 +1,32 @@
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/fonts"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native"
+RDEPENDS = "encodings font-util font-alias"
+
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += " ${libdir}/X11/fonts"
+
+do_install_append() {
+ find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f
+ find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+pkg_postinst_${PN} () {
+ set -x
+ for fontdir in `find $D/usr/lib/X11/fonts -type d`; do
+ mkfontdir $fontdir
+ mkfontscale $fontdir
+ done
+}
diff --git a/packages/xorg-fonts/font-alias_1.0.1.bb b/packages/xorg-fonts/font-alias_1.0.1.bb
deleted file mode 100644
index f757dd39bf..0000000000
--- a/packages/xorg-fonts/font-alias_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include font-common.inc
-
-DEPENDS = "mkfontscale"
-FILES_${PN} = "${libdir}/X11/fonts/*"
diff --git a/packages/xorg-fonts/font-common.inc b/packages/xorg-fonts/font-common.inc
deleted file mode 100644
index 37d478bdc6..0000000000
--- a/packages/xorg-fonts/font-common.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "X font files"
-SECTION = "x11/fonts"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/${PN}-X11R7.0-${PV}.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-FONT_DIR = "${datadir}/share/fonts"
-DEPENDS = "encodings mkfontscale mkfontdir"
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
-
-
-FILES_${PN} += " ${libdir}/X11/fonts/*.gz ${libdir}/X11/fonts/*/*.gz"
-
-pkg_postinst_${PN} () {
-
- if [ "x$D" != "x" ]; then
- exit 1
- fi
-
- for fontdir in /usr/lib/X11/fonts/* /usr/lib/X11/fonts/*/* ; do
- if test -d $fontdir ; then
- mkfontdir $fontdir
- mkfontscale $fontdir
- fi
- done
-}
diff --git a/packages/xorg-fonts/font-cursor-misc_1.0.0.bb b/packages/xorg-fonts/font-cursor-misc_1.0.0.bb
deleted file mode 100644
index a7b1ceaf0d..0000000000
--- a/packages/xorg-fonts/font-cursor-misc_1.0.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include font-common.inc
-
-DEPENDS = "bdftopcf font-util"
-FILES_${PN} = "${libdir}/X11/fonts/*"
diff --git a/packages/xorg-fonts/font-misc-misc_1.0.0.bb b/packages/xorg-fonts/font-misc-misc_1.0.0.bb
deleted file mode 100644
index 14022adaf9..0000000000
--- a/packages/xorg-fonts/font-misc-misc_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-include font-common.inc
-
-DEPENDS = "bdftopcf font-util"
-
-FILES_${PN} = "${libdir}/X11/fonts/misc/*"
-
-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"
diff --git a/packages/xorg-fonts/font-util_1.0.0.bb b/packages/xorg-fonts/font-util_1.0.0.bb
deleted file mode 100644
index 5bbf7e0809..0000000000
--- a/packages/xorg-fonts/font-util_1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-include font-common.inc
-
-DEPENDS = "bdftopcf"
-
-FILES_${PN} = "${bindir}/* ${libdir}/X11/fonts/util/*"
diff --git a/packages/xorg-lib/.mtn2git_empty b/packages/xorg-lib/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/.mtn2git_empty
diff --git a/packages/xorg-lib/diet-x11/.mtn2git_empty b/packages/xorg-lib/diet-x11/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/diet-x11/.mtn2git_empty
diff --git a/packages/xlibs/diet-x11/X18NCMSstubs.diff b/packages/xorg-lib/diet-x11/X18NCMSstubs.diff
index 54b1727a95..54b1727a95 100644
--- a/packages/xlibs/diet-x11/X18NCMSstubs.diff
+++ b/packages/xorg-lib/diet-x11/X18NCMSstubs.diff
diff --git a/packages/xlibs/diet-x11/fix-disable-xlocale.diff b/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff
index 9dbf6dac68..9dbf6dac68 100644
--- a/packages/xlibs/diet-x11/fix-disable-xlocale.diff
+++ b/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff
diff --git a/packages/xlibs/diet-x11/fix-utf8-wrong-define.patch b/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch
index a098db1941..a098db1941 100644
--- a/packages/xlibs/diet-x11/fix-utf8-wrong-define.patch
+++ b/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch
diff --git a/packages/xlibs/diet-x11_20050226.bb b/packages/xorg-lib/diet-x11_20050226.bb
index cab8c5d570..cab8c5d570 100644
--- a/packages/xlibs/diet-x11_20050226.bb
+++ b/packages/xorg-lib/diet-x11_20050226.bb
diff --git a/packages/xlibs/diet-x11_6.2.1.bb b/packages/xorg-lib/diet-x11_6.2.1.bb
index 643e658412..643e658412 100644
--- a/packages/xlibs/diet-x11_6.2.1.bb
+++ b/packages/xorg-lib/diet-x11_6.2.1.bb
diff --git a/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
index 3e09f9a4b8..3e09f9a4b8 100644
--- a/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
index 747c525535..747c525535 100644
--- a/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/diet-x11_cvs.bb b/packages/xorg-lib/diet-x11_cvs.bb
index eea73f0964..eea73f0964 100644
--- a/packages/xlibs/diet-x11_cvs.bb
+++ b/packages/xorg-lib/diet-x11_cvs.bb
diff --git a/packages/xorg-lib/files/.mtn2git_empty b/packages/xorg-lib/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/files/.mtn2git_empty
diff --git a/packages/xlibs/files/errordb-keysymdb-path-fix.patch b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
index f43d38065e..f43d38065e 100644
--- a/packages/xlibs/files/errordb-keysymdb-path-fix.patch
+++ b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
diff --git a/packages/xlibs/files/fix-utf8-wrong-define.patch b/packages/xorg-lib/files/fix-utf8-wrong-define.patch
index dca88fba92..dca88fba92 100644
--- a/packages/xlibs/files/fix-utf8-wrong-define.patch
+++ b/packages/xorg-lib/files/fix-utf8-wrong-define.patch
diff --git a/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..481ce7d2cd
--- /dev/null
+++ b/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxext xextproto applewmproto"
+
+XORG_PN = "libAppleWM"
+
diff --git a/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb b/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..8f0ed5f8ae
--- /dev/null
+++ b/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb
@@ -0,0 +1,5 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxext xextproto dmxproto"
diff --git a/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb b/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..8f0ed5f8ae
--- /dev/null
+++ b/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb
@@ -0,0 +1,5 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxext xextproto dmxproto"
diff --git a/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb b/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..cecd14f57f
--- /dev/null
+++ b/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X fontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "zlib-native xproto-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libfontenc-${PV}.tar.bz2"
+S = "${WORKDIR}/libfontenc-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb b/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..0ccc8dd3d3
--- /dev/null
+++ b/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X libfontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "zlib-native xproto-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libfontenc-${PV}.tar.bz2"
+S = "${WORKDIR}/libfontenc-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..72164c0415
--- /dev/null
+++ b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X fontenc library (used by libxfont)."
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+
+DEPENDS += " zlib xproto"
+
diff --git a/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..72164c0415
--- /dev/null
+++ b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X fontenc library (used by libxfont)."
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+
+DEPENDS += " zlib xproto"
+
diff --git a/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb b/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..9156ab01cb
--- /dev/null
+++ b/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = " "
+
+DEPENDS += " xproto fontsproto xtrans"
+
+XORG_PN = "libFS"
+
diff --git a/packages/xorg-lib/libice/.mtn2git_empty b/packages/xorg-lib/libice/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libice/.mtn2git_empty
diff --git a/packages/xlibs/libice/autofoo.patch b/packages/xorg-lib/libice/autofoo.patch
index 8ab0585fb8..8ab0585fb8 100644
--- a/packages/xlibs/libice/autofoo.patch
+++ b/packages/xorg-lib/libice/autofoo.patch
diff --git a/packages/xlibs/libice_6.3.3.bb b/packages/xorg-lib/libice_6.3.3.bb
index 1311145334..1311145334 100644
--- a/packages/xlibs/libice_6.3.3.bb
+++ b/packages/xorg-lib/libice_6.3.3.bb
diff --git a/packages/xorg-lib/libice_X11R7.0-1.0.0.bb b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..2d16be34b8
--- /dev/null
+++ b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X11 ICE library"
+PRIORITY = "optional"
+
+DEPENDS += " xproto xtrans"
+PROVIDES = "ice"
+
+XORG_PN = "libICE"
+
diff --git a/packages/xorg-lib/libice_X11R7.1-1.0.1.bb b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..2d16be34b8
--- /dev/null
+++ b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X11 ICE library"
+PRIORITY = "optional"
+
+DEPENDS += " xproto xtrans"
+PROVIDES = "ice"
+
+XORG_PN = "libICE"
+
diff --git a/packages/xlibs/libice_cvs.bb b/packages/xorg-lib/libice_cvs.bb
index 90c98d594a..90c98d594a 100644
--- a/packages/xlibs/libice_cvs.bb
+++ b/packages/xorg-lib/libice_cvs.bb
diff --git a/packages/xorg-lib/liblbxutil/.mtn2git_empty b/packages/xorg-lib/liblbxutil/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/liblbxutil/.mtn2git_empty
diff --git a/packages/xlibs/liblbxutil/mkg3states.patch b/packages/xorg-lib/liblbxutil/mkg3states.patch
index 58463db46b..58463db46b 100644
--- a/packages/xlibs/liblbxutil/mkg3states.patch
+++ b/packages/xorg-lib/liblbxutil/mkg3states.patch
diff --git a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..7ce88dfe74
--- /dev/null
+++ b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "XFIXES Extension"
+
+DEPENDS += " xextproto xproto zlib"
+PROVIDES = "lbxutil"
diff --git a/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..7ce88dfe74
--- /dev/null
+++ b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "XFIXES Extension"
+
+DEPENDS += " xextproto xproto zlib"
+PROVIDES = "lbxutil"
diff --git a/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb b/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..1dbf2fe068
--- /dev/null
+++ b/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+
+XORG_PN = "liboldX"
+
diff --git a/packages/xorg-lib/libsm/.mtn2git_empty b/packages/xorg-lib/libsm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libsm/.mtn2git_empty
diff --git a/packages/xlibs/libsm/autofoo.patch b/packages/xorg-lib/libsm/autofoo.patch
index 8cb204a66e..8cb204a66e 100644
--- a/packages/xlibs/libsm/autofoo.patch
+++ b/packages/xorg-lib/libsm/autofoo.patch
diff --git a/packages/xlibs/libsm_6.0.3.bb b/packages/xorg-lib/libsm_6.0.3.bb
index 08f9597045..08f9597045 100644
--- a/packages/xlibs/libsm_6.0.3.bb
+++ b/packages/xorg-lib/libsm_6.0.3.bb
diff --git a/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..2683d0042b
--- /dev/null
+++ b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb
@@ -0,0 +1,9 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "Session management library"
+PRIORITY = "optional"
+
+DEPENDS += " libice xproto xtrans"
+
+XORG_PN = "libSM"
+
diff --git a/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..2683d0042b
--- /dev/null
+++ b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb
@@ -0,0 +1,9 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "Session management library"
+PRIORITY = "optional"
+
+DEPENDS += " libice xproto xtrans"
+
+XORG_PN = "libSM"
+
diff --git a/packages/xlibs/libsm_cvs.bb b/packages/xorg-lib/libsm_cvs.bb
index 22b316cf57..22b316cf57 100644
--- a/packages/xlibs/libsm_cvs.bb
+++ b/packages/xorg-lib/libsm_cvs.bb
diff --git a/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..1848a14fd2
--- /dev/null
+++ b/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxext xextproto windowswmproto"
+
+XORG_PN = "libWindowsWM"
+
diff --git a/packages/xlibs/libx11-native_6.2.1.bb b/packages/xorg-lib/libx11-native_6.2.1.bb
index 9513c4237e..9513c4237e 100644
--- a/packages/xlibs/libx11-native_6.2.1.bb
+++ b/packages/xorg-lib/libx11-native_6.2.1.bb
diff --git a/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..2023b5741d
--- /dev/null
+++ b/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = "x11-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libX11-${PV}.tar.bz2"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit native autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C src/util '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}' makekeys
+ )
+ rm -f ${STAGING_INCDIR}/X11/Xlib.h
+ oe_runmake
+}
diff --git a/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..2b84b2c53c
--- /dev/null
+++ b/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = "x11-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libX11-${PV}.tar.bz2"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit native autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C src/util '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}' makekeys
+ )
+ rm -f ${STAGING_INCDIR}/X11/Xlib.h
+ oe_runmake
+}
diff --git a/packages/xlibs/libx11-native_cvs.bb b/packages/xorg-lib/libx11-native_cvs.bb
index 5b221122d3..5b221122d3 100644
--- a/packages/xlibs/libx11-native_cvs.bb
+++ b/packages/xorg-lib/libx11-native_cvs.bb
diff --git a/packages/xorg-lib/libx11/.mtn2git_empty b/packages/xorg-lib/libx11/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libx11/.mtn2git_empty
diff --git a/packages/xlibs/libx11/autofoo.patch b/packages/xorg-lib/libx11/autofoo.patch
index 8bdba09768..8bdba09768 100644
--- a/packages/xlibs/libx11/autofoo.patch
+++ b/packages/xorg-lib/libx11/autofoo.patch
diff --git a/packages/xlibs/libx11/xim.patch b/packages/xorg-lib/libx11/xim.patch
index 0eab197a80..0eab197a80 100644
--- a/packages/xlibs/libx11/xim.patch
+++ b/packages/xorg-lib/libx11/xim.patch
diff --git a/packages/xlibs/libx11_20050226.bb b/packages/xorg-lib/libx11_20050226.bb
index 0bc30a42cc..0bc30a42cc 100644
--- a/packages/xlibs/libx11_20050226.bb
+++ b/packages/xorg-lib/libx11_20050226.bb
diff --git a/packages/xlibs/libx11_6.2.1.bb b/packages/xorg-lib/libx11_6.2.1.bb
index 901746bafa..901746bafa 100644
--- a/packages/xlibs/libx11_6.2.1.bb
+++ b/packages/xorg-lib/libx11_6.2.1.bb
diff --git a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..de33be0bf8
--- /dev/null
+++ b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
@@ -0,0 +1,21 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+
+DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+ libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "x11"
+
+XORG_PN = "libX11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C src/util '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}' makekeys
+ )
+ rm -f ${STAGING_INCDIR}/X11/Xlib.h
+ oe_runmake
+}
diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..de33be0bf8
--- /dev/null
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -0,0 +1,21 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+
+DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+ libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "x11"
+
+XORG_PN = "libX11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C src/util '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}' makekeys
+ )
+ rm -f ${STAGING_INCDIR}/X11/Xlib.h
+ oe_runmake
+}
diff --git a/packages/xlibs/libx11_cvs.bb b/packages/xorg-lib/libx11_cvs.bb
index d44dd76aac..d44dd76aac 100644
--- a/packages/xlibs/libx11_cvs.bb
+++ b/packages/xorg-lib/libx11_cvs.bb
diff --git a/packages/xlibs/libx11_git.bb b/packages/xorg-lib/libx11_git.bb
index ed6623f03a..ed6623f03a 100644
--- a/packages/xlibs/libx11_git.bb
+++ b/packages/xorg-lib/libx11_git.bb
diff --git a/packages/xlibs/libxau-native_0.1.1.bb b/packages/xorg-lib/libxau-native_0.1.1.bb
index ecb71ce3d6..ecb71ce3d6 100644
--- a/packages/xlibs/libxau-native_0.1.1.bb
+++ b/packages/xorg-lib/libxau-native_0.1.1.bb
diff --git a/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..553c3aeacf
--- /dev/null
+++ b/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto-native util-macros-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXau-${PV}.tar.bz2"
+S = "${WORKDIR}/libXau-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..c0a3ea802f
--- /dev/null
+++ b/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto-native util-macros-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXau-${PV}.tar.bz2"
+S = "${WORKDIR}/libXau-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xlibs/libxau-native_cvs.bb b/packages/xorg-lib/libxau-native_cvs.bb
index cd070033ce..cd070033ce 100644
--- a/packages/xlibs/libxau-native_cvs.bb
+++ b/packages/xorg-lib/libxau-native_cvs.bb
diff --git a/packages/xorg-lib/libxau/.mtn2git_empty b/packages/xorg-lib/libxau/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxau/.mtn2git_empty
diff --git a/packages/xlibs/libxau/autofoo.patch b/packages/xorg-lib/libxau/autofoo.patch
index 1e42eb974d..1e42eb974d 100644
--- a/packages/xlibs/libxau/autofoo.patch
+++ b/packages/xorg-lib/libxau/autofoo.patch
diff --git a/packages/xlibs/libxau_0.1.1.bb b/packages/xorg-lib/libxau_0.1.1.bb
index dc1a28171b..dc1a28171b 100644
--- a/packages/xlibs/libxau_0.1.1.bb
+++ b/packages/xorg-lib/libxau_0.1.1.bb
diff --git a/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..1767424320
--- /dev/null
+++ b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "A Sample Authorization Protocol for X"
+PRIORITY = "optional"
+
+DEPENDS += " xproto"
+PROVIDES = "xau"
+
+XORG_PN = "libXau"
+
diff --git a/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..1767424320
--- /dev/null
+++ b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "A Sample Authorization Protocol for X"
+PRIORITY = "optional"
+
+DEPENDS += " xproto"
+PROVIDES = "xau"
+
+XORG_PN = "libXau"
+
diff --git a/packages/xlibs/libxau_cvs.bb b/packages/xorg-lib/libxau_cvs.bb
index 518744816d..518744816d 100644
--- a/packages/xlibs/libxau_cvs.bb
+++ b/packages/xorg-lib/libxau_cvs.bb
diff --git a/packages/xorg-lib/libxaw/.mtn2git_empty b/packages/xorg-lib/libxaw/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxaw/.mtn2git_empty
diff --git a/packages/xlibs/libxaw/auxdir.patch b/packages/xorg-lib/libxaw/auxdir.patch
index 4226ab6a4d..4226ab6a4d 100644
--- a/packages/xlibs/libxaw/auxdir.patch
+++ b/packages/xorg-lib/libxaw/auxdir.patch
diff --git a/packages/xlibs/libxaw_7.0.2.bb b/packages/xorg-lib/libxaw_7.0.2.bb
index 929b54a127..929b54a127 100644
--- a/packages/xlibs/libxaw_7.0.2.bb
+++ b/packages/xorg-lib/libxaw_7.0.2.bb
diff --git a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b1b1ad48be
--- /dev/null
+++ b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
@@ -0,0 +1,15 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "Xaw is the X Athena Widget Set."
+
+DEPENDS += " xproto libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PROVIDES = "xaw"
+
+XORG_PN = "libXaw"
+
+do_stage () {
+ autotools_stage_all
+ ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
+ ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
+ ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
+}
diff --git a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..b1b1ad48be
--- /dev/null
+++ b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
@@ -0,0 +1,15 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "Xaw is the X Athena Widget Set."
+
+DEPENDS += " xproto libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PROVIDES = "xaw"
+
+XORG_PN = "libXaw"
+
+do_stage () {
+ autotools_stage_all
+ ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
+ ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
+ ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
+}
diff --git a/packages/xlibs/libxaw_cvs.bb b/packages/xorg-lib/libxaw_cvs.bb
index 7860f6e6b1..7860f6e6b1 100644
--- a/packages/xlibs/libxaw_cvs.bb
+++ b/packages/xorg-lib/libxaw_cvs.bb
diff --git a/packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty b/packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty
diff --git a/packages/xlibs/libxcomposite-1.0.1/autofoo.patch b/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch
index 072cf25214..072cf25214 100644
--- a/packages/xlibs/libxcomposite-1.0.1/autofoo.patch
+++ b/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch
diff --git a/packages/xorg-lib/libxcomposite/.mtn2git_empty b/packages/xorg-lib/libxcomposite/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxcomposite/.mtn2git_empty
diff --git a/packages/xlibs/libxcomposite/change-include-order.patch b/packages/xorg-lib/libxcomposite/change-include-order.patch
index 630b8818fc..630b8818fc 100644
--- a/packages/xlibs/libxcomposite/change-include-order.patch
+++ b/packages/xorg-lib/libxcomposite/change-include-order.patch
diff --git a/packages/xlibs/libxcomposite_1.0.1.bb b/packages/xorg-lib/libxcomposite_1.0.1.bb
index e2ca3bbc7b..e2ca3bbc7b 100644
--- a/packages/xlibs/libxcomposite_1.0.1.bb
+++ b/packages/xorg-lib/libxcomposite_1.0.1.bb
diff --git a/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
new file mode 100644
index 0000000000..806cc69082
--- /dev/null
+++ b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
@@ -0,0 +1,11 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Composite extension library."
+LICENSE= "BSD-X"
+
+DEPENDS += " compositeproto libx11 libxfixes"
+PROVIDES = "xcomposite"
+
+XORG_PN = "libXcomposite"
+
+SRC_URI += " file://change-include-order.patch;patch=1"
diff --git a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
new file mode 100644
index 0000000000..806cc69082
--- /dev/null
+++ b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
@@ -0,0 +1,11 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Composite extension library."
+LICENSE= "BSD-X"
+
+DEPENDS += " compositeproto libx11 libxfixes"
+PROVIDES = "xcomposite"
+
+XORG_PN = "libXcomposite"
+
+SRC_URI += " file://change-include-order.patch;patch=1"
diff --git a/packages/xlibs/libxcomposite_cvs.bb b/packages/xorg-lib/libxcomposite_cvs.bb
index 1d8b69c8c6..1d8b69c8c6 100644
--- a/packages/xlibs/libxcomposite_cvs.bb
+++ b/packages/xorg-lib/libxcomposite_cvs.bb
diff --git a/packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty b/packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty
diff --git a/packages/xlibs/libxcursor-1.1.2/autofoo.patch b/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch
index 99cd45a7ea..99cd45a7ea 100644
--- a/packages/xlibs/libxcursor-1.1.2/autofoo.patch
+++ b/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch
diff --git a/packages/xorg-lib/libxcursor/.mtn2git_empty b/packages/xorg-lib/libxcursor/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxcursor/.mtn2git_empty
diff --git a/packages/xlibs/libxcursor/autofoo.patch b/packages/xorg-lib/libxcursor/autofoo.patch
index 7aa573ce13..7aa573ce13 100644
--- a/packages/xlibs/libxcursor/autofoo.patch
+++ b/packages/xorg-lib/libxcursor/autofoo.patch
diff --git a/packages/xlibs/libxcursor_1.1.2.bb b/packages/xorg-lib/libxcursor_1.1.2.bb
index 25744c7dca..25744c7dca 100644
--- a/packages/xlibs/libxcursor_1.1.2.bb
+++ b/packages/xorg-lib/libxcursor_1.1.2.bb
diff --git a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
new file mode 100644
index 0000000000..7b9aa035c6
--- /dev/null
+++ b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Cursor library"
+LICENSE= "BSD-X"
+
+DEPENDS += " libxrender libxfixes libx11 fixesproto"
+
+XORG_PN = "libXcursor"
+
+FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
new file mode 100644
index 0000000000..7b9aa035c6
--- /dev/null
+++ b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Cursor library"
+LICENSE= "BSD-X"
+
+DEPENDS += " libxrender libxfixes libx11 fixesproto"
+
+XORG_PN = "libXcursor"
+
+FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/packages/xlibs/libxcursor_cvs.bb b/packages/xorg-lib/libxcursor_cvs.bb
index 5fe2334b85..5fe2334b85 100644
--- a/packages/xlibs/libxcursor_cvs.bb
+++ b/packages/xorg-lib/libxcursor_cvs.bb
diff --git a/packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty b/packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty
diff --git a/packages/xlibs/libxdamage-1.0.1/autofoo.patch b/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
index 1e3ec45d4a..1e3ec45d4a 100644
--- a/packages/xlibs/libxdamage-1.0.1/autofoo.patch
+++ b/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
diff --git a/packages/xorg-lib/libxdamage/.mtn2git_empty b/packages/xorg-lib/libxdamage/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxdamage/.mtn2git_empty
diff --git a/packages/xlibs/libxdamage/m4.patch b/packages/xorg-lib/libxdamage/m4.patch
index 393f3d13d2..393f3d13d2 100644
--- a/packages/xlibs/libxdamage/m4.patch
+++ b/packages/xorg-lib/libxdamage/m4.patch
diff --git a/packages/xlibs/libxdamage_1.0.1.bb b/packages/xorg-lib/libxdamage_1.0.1.bb
index 040e863447..040e863447 100644
--- a/packages/xlibs/libxdamage_1.0.1.bb
+++ b/packages/xorg-lib/libxdamage_1.0.1.bb
diff --git a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
new file mode 100644
index 0000000000..190a01e2f6
--- /dev/null
+++ b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Damage extension library."
+LICENSE= "BSD-X"
+
+DEPENDS += " libx11 damageproto libxfixes fixesproto xextproto"
+PROVIDES = "xdamage"
+
+XORG_PN = "libXdamage"
+
diff --git a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
new file mode 100644
index 0000000000..190a01e2f6
--- /dev/null
+++ b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Damage extension library."
+LICENSE= "BSD-X"
+
+DEPENDS += " libx11 damageproto libxfixes fixesproto xextproto"
+PROVIDES = "xdamage"
+
+XORG_PN = "libXdamage"
+
diff --git a/packages/xlibs/libxdamage_cvs.bb b/packages/xorg-lib/libxdamage_cvs.bb
index ba8a68033a..ba8a68033a 100644
--- a/packages/xlibs/libxdamage_cvs.bb
+++ b/packages/xorg-lib/libxdamage_cvs.bb
diff --git a/packages/xlibs/libxdmcp-native_0.1.1.bb b/packages/xorg-lib/libxdmcp-native_0.1.1.bb
index bd6d990f53..bd6d990f53 100644
--- a/packages/xlibs/libxdmcp-native_0.1.1.bb
+++ b/packages/xorg-lib/libxdmcp-native_0.1.1.bb
diff --git a/packages/xlibs/libxdmcp-native_0.1.3.bb b/packages/xorg-lib/libxdmcp-native_0.1.3.bb
index 8d7162b351..8d7162b351 100644
--- a/packages/xlibs/libxdmcp-native_0.1.3.bb
+++ b/packages/xorg-lib/libxdmcp-native_0.1.3.bb
diff --git a/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..fbbf8e9117
--- /dev/null
+++ b/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto-native util-macros-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdmcp-${PV}.tar.bz2"
+S = "${WORKDIR}/libXdmcp-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..8ab69a1d41
--- /dev/null
+++ b/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto-native util-macros-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXdmcp-${PV}.tar.bz2"
+S = "${WORKDIR}/libXdmcp-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libxdmcp/.mtn2git_empty b/packages/xorg-lib/libxdmcp/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxdmcp/.mtn2git_empty
diff --git a/packages/xlibs/libxdmcp/autofoo.patch b/packages/xorg-lib/libxdmcp/autofoo.patch
index ff1a76ad04..ff1a76ad04 100644
--- a/packages/xlibs/libxdmcp/autofoo.patch
+++ b/packages/xorg-lib/libxdmcp/autofoo.patch
diff --git a/packages/xlibs/libxdmcp_0.1.1.bb b/packages/xorg-lib/libxdmcp_0.1.1.bb
index 19fba1529e..19fba1529e 100644
--- a/packages/xlibs/libxdmcp_0.1.1.bb
+++ b/packages/xorg-lib/libxdmcp_0.1.1.bb
diff --git a/packages/xlibs/libxdmcp_0.1.3.bb b/packages/xorg-lib/libxdmcp_0.1.3.bb
index aa2736cdb2..aa2736cdb2 100644
--- a/packages/xlibs/libxdmcp_0.1.3.bb
+++ b/packages/xorg-lib/libxdmcp_0.1.3.bb
diff --git a/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..74c4b6e35d
--- /dev/null
+++ b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Display Manager Control Protocol library."
+PRIORITY = "optional"
+
+DEPENDS += " xproto"
+PROVIDES = "xdmcp"
+
+XORG_PN = "libXdmcp"
+
diff --git a/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..74c4b6e35d
--- /dev/null
+++ b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Display Manager Control Protocol library."
+PRIORITY = "optional"
+
+DEPENDS += " xproto"
+PROVIDES = "xdmcp"
+
+XORG_PN = "libXdmcp"
+
diff --git a/packages/xlibs/libxdmcp_cvs.bb b/packages/xorg-lib/libxdmcp_cvs.bb
index 20b957b522..20b957b522 100644
--- a/packages/xlibs/libxdmcp_cvs.bb
+++ b/packages/xorg-lib/libxdmcp_cvs.bb
diff --git a/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..da09dc69c0
--- /dev/null
+++ b/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto libx11 xextproto libxext evieext"
+
+XORG_PN = "libXevie"
+
diff --git a/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..da09dc69c0
--- /dev/null
+++ b/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto libx11 xextproto libxext evieext"
+
+XORG_PN = "libXevie"
+
diff --git a/packages/xlibs/libxext-native_cvs.bb b/packages/xorg-lib/libxext-native_cvs.bb
index 9294b080b7..9294b080b7 100644
--- a/packages/xlibs/libxext-native_cvs.bb
+++ b/packages/xorg-lib/libxext-native_cvs.bb
diff --git a/packages/xorg-lib/libxext/.mtn2git_empty b/packages/xorg-lib/libxext/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxext/.mtn2git_empty
diff --git a/packages/xlibs/libxext/autofoo.patch b/packages/xorg-lib/libxext/autofoo.patch
index c006884526..c006884526 100644
--- a/packages/xlibs/libxext/autofoo.patch
+++ b/packages/xorg-lib/libxext/autofoo.patch
diff --git a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..ca32e52d31
--- /dev/null
+++ b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Server Extension library"
+PRIORITY = "optional"
+
+DEPENDS += " xproto libx11 xextproto libxau"
+PROVIDES = "xext"
+
+XORG_PN = "libXext"
+
diff --git a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..ca32e52d31
--- /dev/null
+++ b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Server Extension library"
+PRIORITY = "optional"
+
+DEPENDS += " xproto libx11 xextproto libxau"
+PROVIDES = "xext"
+
+XORG_PN = "libXext"
+
diff --git a/packages/xlibs/libxext_cvs.bb b/packages/xorg-lib/libxext_cvs.bb
index 0ef675ca70..0ef675ca70 100644
--- a/packages/xlibs/libxext_cvs.bb
+++ b/packages/xorg-lib/libxext_cvs.bb
diff --git a/packages/xorg-lib/libxfixes/.mtn2git_empty b/packages/xorg-lib/libxfixes/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxfixes/.mtn2git_empty
diff --git a/packages/xlibs/libxfixes/autofoo.patch b/packages/xorg-lib/libxfixes/autofoo.patch
index 26803cf7f3..26803cf7f3 100644
--- a/packages/xlibs/libxfixes/autofoo.patch
+++ b/packages/xorg-lib/libxfixes/autofoo.patch
diff --git a/packages/xlibs/libxfixes_2.0.1.bb b/packages/xorg-lib/libxfixes_2.0.1.bb
index 710fa17454..710fa17454 100644
--- a/packages/xlibs/libxfixes_2.0.1.bb
+++ b/packages/xorg-lib/libxfixes_2.0.1.bb
diff --git a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
new file mode 100644
index 0000000000..04b2e48006
--- /dev/null
+++ b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
@@ -0,0 +1,9 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Fixes extension library."
+LICENSE= "BSD-X"
+
+DEPENDS += " libx11 xproto fixesproto xextproto"
+
+XORG_PN = "libXfixes"
+
diff --git a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
new file mode 100644
index 0000000000..04b2e48006
--- /dev/null
+++ b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
@@ -0,0 +1,9 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Fixes extension library."
+LICENSE= "BSD-X"
+
+DEPENDS += " libx11 xproto fixesproto xextproto"
+
+XORG_PN = "libXfixes"
+
diff --git a/packages/xlibs/libxfixes_cvs.bb b/packages/xorg-lib/libxfixes_cvs.bb
index 4494dc9326..4494dc9326 100644
--- a/packages/xlibs/libxfixes_cvs.bb
+++ b/packages/xorg-lib/libxfixes_cvs.bb
diff --git a/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..93aac77f7b
--- /dev/null
+++ b/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X font library (used by the X server)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfont-${PV}.tar.bz2"
+S = "${WORKDIR}/libXfont-${PV}"
+
+inherit native autotools pkgconfig
+
diff --git a/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..664f9440a4
--- /dev/null
+++ b/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X font library (used by the X server)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXfont-${PV}.tar.bz2"
+S = "${WORKDIR}/libXfont-${PV}"
+
+inherit native autotools pkgconfig
+
diff --git a/packages/xorg-lib/libxfont/.mtn2git_empty b/packages/xorg-lib/libxfont/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxfont/.mtn2git_empty
diff --git a/packages/xlibs/libxfont/autofoo.patch b/packages/xorg-lib/libxfont/autofoo.patch
index 4998625c24..4998625c24 100644
--- a/packages/xlibs/libxfont/autofoo.patch
+++ b/packages/xorg-lib/libxfont/autofoo.patch
diff --git a/packages/xlibs/libxfont/scalable.patch b/packages/xorg-lib/libxfont/scalable.patch
index 7f97b9a8f6..7f97b9a8f6 100644
--- a/packages/xlibs/libxfont/scalable.patch
+++ b/packages/xorg-lib/libxfont/scalable.patch
diff --git a/packages/xlibs/libxfont_1.4.2.bb b/packages/xorg-lib/libxfont_1.4.2.bb
index 0cc45397fe..0cc45397fe 100644
--- a/packages/xlibs/libxfont_1.4.2.bb
+++ b/packages/xorg-lib/libxfont_1.4.2.bb
diff --git a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..07fbf5f9a6
--- /dev/null
+++ b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
@@ -0,0 +1,11 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X font library (used by the X server)."
+LICENSE= "BSD-X"
+PRIORITY = "optional"
+
+DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
+PROVIDES = "xfont"
+
+XORG_PN = "libXfont"
+
diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..07fbf5f9a6
--- /dev/null
+++ b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb
@@ -0,0 +1,11 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X font library (used by the X server)."
+LICENSE= "BSD-X"
+PRIORITY = "optional"
+
+DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
+PROVIDES = "xfont"
+
+XORG_PN = "libXfont"
+
diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
new file mode 100644
index 0000000000..07fbf5f9a6
--- /dev/null
+++ b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
@@ -0,0 +1,11 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X font library (used by the X server)."
+LICENSE= "BSD-X"
+PRIORITY = "optional"
+
+DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
+PROVIDES = "xfont"
+
+XORG_PN = "libXfont"
+
diff --git a/packages/xlibs/libxfont_cvs.bb b/packages/xorg-lib/libxfont_cvs.bb
index bd21e0fd12..bd21e0fd12 100644
--- a/packages/xlibs/libxfont_cvs.bb
+++ b/packages/xorg-lib/libxfont_cvs.bb
diff --git a/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..5de5a2a590
--- /dev/null
+++ b/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxext xextproto fontcacheproto"
+
+XORG_PN = "libXfontcache"
+
diff --git a/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..5de5a2a590
--- /dev/null
+++ b/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxext xextproto fontcacheproto"
+
+XORG_PN = "libXfontcache"
+
diff --git a/packages/xorg-lib/libxft/.mtn2git_empty b/packages/xorg-lib/libxft/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxft/.mtn2git_empty
diff --git a/packages/xlibs/libxft/autofoo.patch b/packages/xorg-lib/libxft/autofoo.patch
index 54120aa612..54120aa612 100644
--- a/packages/xlibs/libxft/autofoo.patch
+++ b/packages/xorg-lib/libxft/autofoo.patch
diff --git a/packages/xlibs/libxft_2.1.6.bb b/packages/xorg-lib/libxft_2.1.6.bb
index c3f1f74e40..c3f1f74e40 100644
--- a/packages/xlibs/libxft_2.1.6.bb
+++ b/packages/xorg-lib/libxft_2.1.6.bb
diff --git a/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb
new file mode 100644
index 0000000000..88d850401e
--- /dev/null
+++ b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb
@@ -0,0 +1,19 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+
+DEPENDS += " libxrender freetype fontconfig"
+PROVIDES = "xft"
+
+XORG_PN = "libXft"
+
+FILES_${PN} = ${libdir}/lib*.so.*
+FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${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)
+}
diff --git a/packages/xlibs/libxft_cvs.bb b/packages/xorg-lib/libxft_cvs.bb
index 6c1a5f5c32..6c1a5f5c32 100644
--- a/packages/xlibs/libxft_cvs.bb
+++ b/packages/xorg-lib/libxft_cvs.bb
diff --git a/packages/xorg-lib/libxi/.mtn2git_empty b/packages/xorg-lib/libxi/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxi/.mtn2git_empty
diff --git a/packages/xlibs/libxi/autofoo.patch b/packages/xorg-lib/libxi/autofoo.patch
index f1bce9ed7a..f1bce9ed7a 100644
--- a/packages/xlibs/libxi/autofoo.patch
+++ b/packages/xorg-lib/libxi/autofoo.patch
diff --git a/packages/xlibs/libxi_6.0.1.bb b/packages/xorg-lib/libxi_6.0.1.bb
index 5c44d06df3..5c44d06df3 100644
--- a/packages/xlibs/libxi_6.0.1.bb
+++ b/packages/xorg-lib/libxi_6.0.1.bb
diff --git a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..10ea847e9c
--- /dev/null
+++ b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Input extension library."
+
+DEPENDS += " xproto libx11 xextproto libxext inputproto"
+
+XORG_PN = "libXi"
+
diff --git a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..10ea847e9c
--- /dev/null
+++ b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Input extension library."
+
+DEPENDS += " xproto libx11 xextproto libxext inputproto"
+
+XORG_PN = "libXi"
+
diff --git a/packages/xlibs/libxi_cvs.bb b/packages/xorg-lib/libxi_cvs.bb
index 767c641a95..767c641a95 100644
--- a/packages/xlibs/libxi_cvs.bb
+++ b/packages/xorg-lib/libxi_cvs.bb
diff --git a/packages/xlibs/libxinerama_1.0.2+cvs20050505.bb b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
index dc5d82b9b0..dc5d82b9b0 100644
--- a/packages/xlibs/libxinerama_1.0.2+cvs20050505.bb
+++ b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
diff --git a/packages/xlibs/libxinerama_1.0.2.bb b/packages/xorg-lib/libxinerama_1.0.2.bb
index a267e6c2d9..a267e6c2d9 100644
--- a/packages/xlibs/libxinerama_1.0.2.bb
+++ b/packages/xorg-lib/libxinerama_1.0.2.bb
diff --git a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..88ce13b30e
--- /dev/null
+++ b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "Xinerama library"
+PRIORITY = "optional"
+
+DEPENDS += " libx11 libxext xextproto xineramaproto"
+PROVIDES = "xinerama"
+
+XORG_PN = "libXinerama"
+
diff --git a/packages/xlibs/libxinerama_cvs.bb b/packages/xorg-lib/libxinerama_cvs.bb
index 3e959df19e..3e959df19e 100644
--- a/packages/xlibs/libxinerama_cvs.bb
+++ b/packages/xorg-lib/libxinerama_cvs.bb
diff --git a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..58b085294e
--- /dev/null
+++ b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X11 keyboard library"
+LICENSE= "GPL"
+PRIORITY = "optional"
+
+DEPENDS += " libx11 kbproto"
+
diff --git a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
new file mode 100644
index 0000000000..58b085294e
--- /dev/null
+++ b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X11 keyboard library"
+LICENSE= "GPL"
+PRIORITY = "optional"
+
+DEPENDS += " libx11 kbproto"
+
diff --git a/packages/xlibs/libxkbfile_cvs.bb b/packages/xorg-lib/libxkbfile_cvs.bb
index 1b433ef65f..1b433ef65f 100644
--- a/packages/xlibs/libxkbfile_cvs.bb
+++ b/packages/xorg-lib/libxkbfile_cvs.bb
diff --git a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..3039ff09b4
--- /dev/null
+++ b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X11 lbxkbui library"
+LICENSE= "GPL"
+PRIORITY = "optional"
+
+DEPENDS += " libx11 libxt libxkbfile"
+PROVIDES = "xkbui"
diff --git a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..3039ff09b4
--- /dev/null
+++ b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X11 lbxkbui library"
+LICENSE= "GPL"
+PRIORITY = "optional"
+
+DEPENDS += " libx11 libxt libxkbfile"
+PROVIDES = "xkbui"
diff --git a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..ed2e765084
--- /dev/null
+++ b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
@@ -0,0 +1,16 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Window System miscellaneous utility library"
+PRIORITY = "optional"
+
+DEPENDS += " libxt libxext xextproto libx11"
+PROVIDES = "xmu"
+
+XORG_PN = "libXmu"
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
diff --git a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..ed2e765084
--- /dev/null
+++ b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
@@ -0,0 +1,16 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Window System miscellaneous utility library"
+PRIORITY = "optional"
+
+DEPENDS += " libxt libxext xextproto libx11"
+PROVIDES = "xmu"
+
+XORG_PN = "libXmu"
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
diff --git a/packages/xlibs/libxmu_cvs.bb b/packages/xorg-lib/libxmu_cvs.bb
index 500b373c32..500b373c32 100644
--- a/packages/xlibs/libxmu_cvs.bb
+++ b/packages/xorg-lib/libxmu_cvs.bb
diff --git a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..fc77aa08c8
--- /dev/null
+++ b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X print extension library."
+
+DEPENDS += " libx11 libxext xextproto libxau printproto"
+
+XORG_PN = "libXp"
+
+CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxp_cvs.bb b/packages/xorg-lib/libxp_cvs.bb
index eaf6546d0e..eaf6546d0e 100644
--- a/packages/xlibs/libxp_cvs.bb
+++ b/packages/xorg-lib/libxp_cvs.bb
diff --git a/packages/xorg-lib/libxpm/.mtn2git_empty b/packages/xorg-lib/libxpm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxpm/.mtn2git_empty
diff --git a/packages/xlibs/libxpm/autofoo.patch b/packages/xorg-lib/libxpm/autofoo.patch
index 6b2174bf02..6b2174bf02 100644
--- a/packages/xlibs/libxpm/autofoo.patch
+++ b/packages/xorg-lib/libxpm/autofoo.patch
diff --git a/packages/xlibs/libxpm_3.5.1.bb b/packages/xorg-lib/libxpm_3.5.1.bb
index 513261efd3..513261efd3 100644
--- a/packages/xlibs/libxpm_3.5.1.bb
+++ b/packages/xorg-lib/libxpm_3.5.1.bb
diff --git a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
new file mode 100644
index 0000000000..94e638ce74
--- /dev/null
+++ b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
@@ -0,0 +1,13 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Pixmap library."
+PRIORITY = "optional"
+LICENSE = "X-BSD"
+
+DEPENDS += " xproto libx11 libxt libxext xextproto"
+
+XORG_PN = "libXpm"
+
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
diff --git a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
new file mode 100644
index 0000000000..94e638ce74
--- /dev/null
+++ b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
@@ -0,0 +1,13 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Pixmap library."
+PRIORITY = "optional"
+LICENSE = "X-BSD"
+
+DEPENDS += " xproto libx11 libxt libxext xextproto"
+
+XORG_PN = "libXpm"
+
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
diff --git a/packages/xlibs/libxpm_cvs.bb b/packages/xorg-lib/libxpm_cvs.bb
index 1b46855735..1b46855735 100644
--- a/packages/xlibs/libxpm_cvs.bb
+++ b/packages/xorg-lib/libxpm_cvs.bb
diff --git a/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..d65caf0eae
--- /dev/null
+++ b/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxp libxprintutil printproto libxau"
+
+XORG_PN = "libXprintAppUtil"
+
diff --git a/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..dfb38c6624
--- /dev/null
+++ b/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxp libxt printproto libxau"
+
+XORG_PN = "libXprintUtil"
+
diff --git a/packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty b/packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty
diff --git a/packages/xlibs/libxrandr-1.0.2/autofoo.patch b/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch
index 21f6e7fd78..21f6e7fd78 100644
--- a/packages/xlibs/libxrandr-1.0.2/autofoo.patch
+++ b/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch
diff --git a/packages/xorg-lib/libxrandr/.mtn2git_empty b/packages/xorg-lib/libxrandr/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxrandr/.mtn2git_empty
diff --git a/packages/xlibs/libxrandr/autofoo.patch b/packages/xorg-lib/libxrandr/autofoo.patch
index 7b1db760f2..7b1db760f2 100644
--- a/packages/xlibs/libxrandr/autofoo.patch
+++ b/packages/xorg-lib/libxrandr/autofoo.patch
diff --git a/packages/xlibs/libxrandr_1.0.2.bb b/packages/xorg-lib/libxrandr_1.0.2.bb
index efd0505544..efd0505544 100644
--- a/packages/xlibs/libxrandr_1.0.2.bb
+++ b/packages/xorg-lib/libxrandr_1.0.2.bb
diff --git a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
new file mode 100644
index 0000000000..d14bc4c8bb
--- /dev/null
+++ b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
@@ -0,0 +1,9 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Resize and Rotate extension library."
+LICENSE = "BSD-X"
+
+DEPENDS += " libx11 randrproto libxext xextproto libxrender renderproto"
+
+XORG_PN = "libXrandr"
+
diff --git a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
new file mode 100644
index 0000000000..d14bc4c8bb
--- /dev/null
+++ b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
@@ -0,0 +1,9 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Resize and Rotate extension library."
+LICENSE = "BSD-X"
+
+DEPENDS += " libx11 randrproto libxext xextproto libxrender renderproto"
+
+XORG_PN = "libXrandr"
+
diff --git a/packages/xlibs/libxrandr_cvs.bb b/packages/xorg-lib/libxrandr_cvs.bb
index 3b6fd02de8..3b6fd02de8 100644
--- a/packages/xlibs/libxrandr_cvs.bb
+++ b/packages/xorg-lib/libxrandr_cvs.bb
diff --git a/packages/xorg-lib/libxrender/.mtn2git_empty b/packages/xorg-lib/libxrender/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxrender/.mtn2git_empty
diff --git a/packages/xlibs/libxrender/autofoo.patch b/packages/xorg-lib/libxrender/autofoo.patch
index eb21c766f8..eb21c766f8 100644
--- a/packages/xlibs/libxrender/autofoo.patch
+++ b/packages/xorg-lib/libxrender/autofoo.patch
diff --git a/packages/xlibs/libxrender_0.8.4.bb b/packages/xorg-lib/libxrender_0.8.4.bb
index b36c5701ba..b36c5701ba 100644
--- a/packages/xlibs/libxrender_0.8.4.bb
+++ b/packages/xorg-lib/libxrender_0.8.4.bb
diff --git a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
new file mode 100644
index 0000000000..797780042c
--- /dev/null
+++ b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
@@ -0,0 +1,9 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Render extension library."
+LICENSE = "BSD-X"
+
+DEPENDS += " libx11 renderproto"
+
+XORG_PN = "libXrender"
+
diff --git a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
new file mode 100644
index 0000000000..797780042c
--- /dev/null
+++ b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
@@ -0,0 +1,9 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Render extension library."
+LICENSE = "BSD-X"
+
+DEPENDS += " libx11 renderproto"
+
+XORG_PN = "libXrender"
+
diff --git a/packages/xlibs/libxrender_cvs.bb b/packages/xorg-lib/libxrender_cvs.bb
index ea6b1f4607..ea6b1f4607 100644
--- a/packages/xlibs/libxrender_cvs.bb
+++ b/packages/xorg-lib/libxrender_cvs.bb
diff --git a/packages/xlibs/libxres_1.0.1.bb b/packages/xorg-lib/libxres_1.0.1.bb
index c01731d37a..c01731d37a 100644
--- a/packages/xlibs/libxres_1.0.1.bb
+++ b/packages/xorg-lib/libxres_1.0.1.bb
diff --git a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..4e7b203584
--- /dev/null
+++ b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Resource usage library."
+
+DEPENDS += " libx11 libxext xextproto resourceproto"
+
+XORG_PN = "libXres"
+
diff --git a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..4e7b203584
--- /dev/null
+++ b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Resource usage library."
+
+DEPENDS += " libx11 libxext xextproto resourceproto"
+
+XORG_PN = "libXres"
+
diff --git a/packages/xlibs/libxres_cvs.bb b/packages/xorg-lib/libxres_cvs.bb
index e3e5c6704c..e3e5c6704c 100644
--- a/packages/xlibs/libxres_cvs.bb
+++ b/packages/xorg-lib/libxres_cvs.bb
diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..fc77bdf373
--- /dev/null
+++ b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
@@ -0,0 +1,13 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X screen saver extension library."
+LICENSE = "GPL"
+
+DEPENDS += " libx11 libxext xextproto scrnsaverproto"
+
+XORG_PN = "libXScrnSaver"
+
+PROVIDES = "libxss"
+RREPLACES = "libxss"
+
+#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..fc77bdf373
--- /dev/null
+++ b/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb
@@ -0,0 +1,13 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X screen saver extension library."
+LICENSE = "GPL"
+
+DEPENDS += " libx11 libxext xextproto scrnsaverproto"
+
+XORG_PN = "libXScrnSaver"
+
+PROVIDES = "libxss"
+RREPLACES = "libxss"
+
+#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
diff --git a/packages/xlibs/libxss_cvs.bb b/packages/xorg-lib/libxss_cvs.bb
index af064f5b4d..af064f5b4d 100644
--- a/packages/xlibs/libxss_cvs.bb
+++ b/packages/xorg-lib/libxss_cvs.bb
diff --git a/packages/xorg-lib/libxt/.mtn2git_empty b/packages/xorg-lib/libxt/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxt/.mtn2git_empty
diff --git a/packages/xlibs/libxt/autofoo.patch b/packages/xorg-lib/libxt/autofoo.patch
index ff6dfdbbcc..ff6dfdbbcc 100644
--- a/packages/xlibs/libxt/autofoo.patch
+++ b/packages/xorg-lib/libxt/autofoo.patch
diff --git a/packages/xlibs/libxt_0.1.5.bb b/packages/xorg-lib/libxt_0.1.5.bb
index 00cbe9a3ad..00cbe9a3ad 100644
--- a/packages/xlibs/libxt_0.1.5.bb
+++ b/packages/xorg-lib/libxt_0.1.5.bb
diff --git a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..605827bc25
--- /dev/null
+++ b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
@@ -0,0 +1,19 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Toolkit Intrinsics"
+PRIORITY = "optional"
+
+DEPENDS += " libsm libx11 xproto kbproto"
+PROVIDES = "xt"
+
+XORG_PN = "libXt"
+
+EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C util '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
+ )
+ oe_runmake
+}
diff --git a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..605827bc25
--- /dev/null
+++ b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
@@ -0,0 +1,19 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Toolkit Intrinsics"
+PRIORITY = "optional"
+
+DEPENDS += " libsm libx11 xproto kbproto"
+PROVIDES = "xt"
+
+XORG_PN = "libXt"
+
+EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C util '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
+ )
+ oe_runmake
+}
diff --git a/packages/xlibs/libxt_cvs.bb b/packages/xorg-lib/libxt_cvs.bb
index fdabe1d90f..fdabe1d90f 100644
--- a/packages/xlibs/libxt_cvs.bb
+++ b/packages/xorg-lib/libxt_cvs.bb
diff --git a/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..c8999efd81
--- /dev/null
+++ b/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxt trapproto libxext xextproto"
+
+XORG_PN = "libXTrap"
+
diff --git a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a89203f5df
--- /dev/null
+++ b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Test Extension: client side library"
+PRIORITY = "optional"
+
+DEPENDS += " libx11 libxext recordproto xextproto inputproto"
+PROVIDES = "xtst"
+
+XORG_PN = "libXtst"
+
diff --git a/packages/xlibs/libxtst_cvs.bb b/packages/xorg-lib/libxtst_cvs.bb
index c7c24d5d74..c7c24d5d74 100644
--- a/packages/xlibs/libxtst_cvs.bb
+++ b/packages/xorg-lib/libxtst_cvs.bb
diff --git a/packages/xlibs/libxv_2.2.2+cvs20040918.bb b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
index e70ce9cee9..e70ce9cee9 100644
--- a/packages/xlibs/libxv_2.2.2+cvs20040918.bb
+++ b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
diff --git a/packages/xlibs/libxv_2.2.2.bb b/packages/xorg-lib/libxv_2.2.2.bb
index 49e9670120..49e9670120 100644
--- a/packages/xlibs/libxv_2.2.2.bb
+++ b/packages/xorg-lib/libxv_2.2.2.bb
diff --git a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..0f7d074098
--- /dev/null
+++ b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
@@ -0,0 +1,9 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Video extension library."
+LICENSE = "GPL"
+
+DEPENDS += " libx11 libxext xextproto videoproto"
+
+XORG_PN = "libXv"
+
diff --git a/packages/xorg-lib/libxvmc/.mtn2git_empty b/packages/xorg-lib/libxvmc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/libxvmc/.mtn2git_empty
diff --git a/packages/xlibs/libxvmc/drm.patch b/packages/xorg-lib/libxvmc/drm.patch
index d48cdb3d0b..d48cdb3d0b 100644
--- a/packages/xlibs/libxvmc/drm.patch
+++ b/packages/xorg-lib/libxvmc/drm.patch
diff --git a/packages/xlibs/libxvmc/true.patch b/packages/xorg-lib/libxvmc/true.patch
index 7059295007..7059295007 100644
--- a/packages/xlibs/libxvmc/true.patch
+++ b/packages/xorg-lib/libxvmc/true.patch
diff --git a/packages/xlibs/libxvmc/via.patch b/packages/xorg-lib/libxvmc/via.patch
index 21cdfbdd6b..21cdfbdd6b 100644
--- a/packages/xlibs/libxvmc/via.patch
+++ b/packages/xorg-lib/libxvmc/via.patch
diff --git a/packages/xlibs/libxvmc_20040919.bb b/packages/xorg-lib/libxvmc_20040919.bb
index b70c9f52e4..b70c9f52e4 100644
--- a/packages/xlibs/libxvmc_20040919.bb
+++ b/packages/xorg-lib/libxvmc_20040919.bb
diff --git a/packages/xlibs/libxvmc_20041025.bb b/packages/xorg-lib/libxvmc_20041025.bb
index 829a74d92b..829a74d92b 100644
--- a/packages/xlibs/libxvmc_20041025.bb
+++ b/packages/xorg-lib/libxvmc_20041025.bb
diff --git a/packages/xlibs/libxvmc_20050612.bb b/packages/xorg-lib/libxvmc_20050612.bb
index 18cd369acc..18cd369acc 100644
--- a/packages/xlibs/libxvmc_20050612.bb
+++ b/packages/xorg-lib/libxvmc_20050612.bb
diff --git a/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..3625d38bb8
--- /dev/null
+++ b/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Video Motion Compensation extension library."
+
+DEPENDS += " libx11 libxext libxv xextproto videoproto"
+
+XORG_PN = "libXvMC"
+
diff --git a/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..3625d38bb8
--- /dev/null
+++ b/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "X Video Motion Compensation extension library."
+
+DEPENDS += " libx11 libxext libxv xextproto videoproto"
+
+XORG_PN = "libXvMC"
+
diff --git a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..57b686a8b5
--- /dev/null
+++ b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "Xxf86dga extension library."
+
+DEPENDS += " xproto libx11 xextproto libxext xf86dgaproto"
+
+XORG_PN = "libXxf86dga"
+
diff --git a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..57b686a8b5
--- /dev/null
+++ b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "Xxf86dga extension library."
+
+DEPENDS += " xproto libx11 xextproto libxext xf86dgaproto"
+
+XORG_PN = "libXxf86dga"
+
diff --git a/packages/xlibs/libxxf86dga_cvs.bb b/packages/xorg-lib/libxxf86dga_cvs.bb
index 96acce5d0e..96acce5d0e 100644
--- a/packages/xlibs/libxxf86dga_cvs.bb
+++ b/packages/xorg-lib/libxxf86dga_cvs.bb
diff --git a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..50bddbe2b8
--- /dev/null
+++ b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,9 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto libx11 xextproto libxext xf86miscproto"
+PROVIDES = "xxf86misc"
+
+XORG_PN = "libXxf86misc"
+
diff --git a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..50bddbe2b8
--- /dev/null
+++ b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
@@ -0,0 +1,9 @@
+include xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto libx11 xextproto libxext xf86miscproto"
+PROVIDES = "xxf86misc"
+
+XORG_PN = "libXxf86misc"
+
diff --git a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8dac3c7417
--- /dev/null
+++ b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "Xxf86vm extension library."
+
+DEPENDS += " xproto libx11 xextproto libxext xf86vidmodeproto"
+
+XORG_PN = "libXxf86vm"
+
diff --git a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..8dac3c7417
--- /dev/null
+++ b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "Xxf86vm extension library."
+
+DEPENDS += " xproto libx11 xextproto libxext xf86vidmodeproto"
+
+XORG_PN = "libXxf86vm"
+
diff --git a/packages/xlibs/libxxf86vm_cvs.bb b/packages/xorg-lib/libxxf86vm_cvs.bb
index 5eb48f930d..5eb48f930d 100644
--- a/packages/xlibs/libxxf86vm_cvs.bb
+++ b/packages/xorg-lib/libxxf86vm_cvs.bb
diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc
new file mode 100644
index 0000000000..7a3e0425c7
--- /dev/null
+++ b/packages/xorg-lib/xorg-lib-common.inc
@@ -0,0 +1,17 @@
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+DEPENDS = "util-macros"
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/xtrans-native_0.1.bb b/packages/xorg-lib/xtrans-native_0.1.bb
index 80de95c869..80de95c869 100644
--- a/packages/xlibs/xtrans-native_0.1.bb
+++ b/packages/xorg-lib/xtrans-native_0.1.bb
diff --git a/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..ff63987713
--- /dev/null
+++ b/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "util-macros-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/xtrans-${PV}.tar.bz2"
+S = "${WORKDIR}/xtrans-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xlibs/xtrans_0.1.bb b/packages/xorg-lib/xtrans_0.1.bb
index 8fee0d5089..8fee0d5089 100644
--- a/packages/xlibs/xtrans_0.1.bb
+++ b/packages/xorg-lib/xtrans_0.1.bb
diff --git a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..2fe92245c2
--- /dev/null
+++ b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
+include xorg-lib-common.inc
+
+DESCRIPTION = "network API translation layer to \
+insulate X applications and libraries from OS \
+network vageries."
+
+#DEPENDS += " "
+
diff --git a/packages/xlibs/xtrans_cvs.bb b/packages/xorg-lib/xtrans_cvs.bb
index 9714f4017b..9714f4017b 100644
--- a/packages/xlibs/xtrans_cvs.bb
+++ b/packages/xorg-lib/xtrans_cvs.bb
diff --git a/packages/xorg-proto/.mtn2git_empty b/packages/xorg-proto/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-proto/.mtn2git_empty
diff --git a/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
new file mode 100644
index 0000000000..c03b079d65
--- /dev/null
+++ b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
@@ -0,0 +1,6 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb b/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..9b9cc8e472
--- /dev/null
+++ b/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/bigreqsproto-${PV}.tar.bz2"
+S = "${WORKDIR}/bigreqsproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..c03b079d65
--- /dev/null
+++ b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
new file mode 100644
index 0000000000..9a566e7e7d
--- /dev/null
+++ b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
@@ -0,0 +1,7 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+CONFLICTS = "compositeext"
diff --git a/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
new file mode 100644
index 0000000000..9a566e7e7d
--- /dev/null
+++ b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
@@ -0,0 +1,7 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+CONFLICTS = "compositeext"
diff --git a/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
new file mode 100644
index 0000000000..4104de91df
--- /dev/null
+++ b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
@@ -0,0 +1,7 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+CONFLICTS = "damageext"
diff --git a/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
new file mode 100644
index 0000000000..63361612db
--- /dev/null
+++ b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
@@ -0,0 +1,7 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+CONFLICTS = "fixesext"
diff --git a/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
new file mode 100644
index 0000000000..63361612db
--- /dev/null
+++ b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
@@ -0,0 +1,7 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+CONFLICTS = "fixesext"
diff --git a/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb b/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
new file mode 100644
index 0000000000..062c6ccbb9
--- /dev/null
+++ b/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontcacheproto-${PV}.tar.bz2"
+S = "${WORKDIR}/fontcacheproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb b/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
new file mode 100644
index 0000000000..3c5356f0df
--- /dev/null
+++ b/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontsproto-${PV}.tar.bz2"
+S = "${WORKDIR}/fontsproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb b/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
new file mode 100644
index 0000000000..c89ec23505
--- /dev/null
+++ b/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/inputproto-${PV}.tar.bz2"
+S = "${WORKDIR}/inputproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb b/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..983730ecc0
--- /dev/null
+++ b/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/kbproto-${PV}.tar.bz2"
+S = "${WORKDIR}/kbproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..19287d7a75
--- /dev/null
+++ b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
@@ -0,0 +1,7 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+CONFLICTS = "randrext"
diff --git a/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
new file mode 100644
index 0000000000..262ea04c9b
--- /dev/null
+++ b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
@@ -0,0 +1,7 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+CONFLICTS = "recordext"
diff --git a/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
new file mode 100644
index 0000000000..8dec781fda
--- /dev/null
+++ b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
@@ -0,0 +1,7 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+CONFLICTS = "renderext"
diff --git a/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..414c7e2a2a
--- /dev/null
+++ b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
@@ -0,0 +1,7 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+CONFLICTS = "resourceext"
diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb b/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..af35684479
--- /dev/null
+++ b/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xcmiscproto-${PV}.tar.bz2"
+S = "${WORKDIR}/xcmiscproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb b/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
new file mode 100644
index 0000000000..0c1fda0e16
--- /dev/null
+++ b/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/protto/xextproto-${PV}.tar.bz2"
+S = "${WORKDIR}/xextproto-${PV}"
+
+inherit native autotools pkgconfig
+
+PROVIDES = "xextensions-native"
diff --git a/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
new file mode 100644
index 0000000000..4b73dc7da2
--- /dev/null
+++ b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
@@ -0,0 +1,7 @@
+include xorg-proto-common.inc
+
+PROVIDES = "xextensions"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..3fa9c9522c
--- /dev/null
+++ b/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xf86bigfontproto-${PV}.tar.bz2"
+S = "${WORKDIR}/xf86bigfontproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
new file mode 100644
index 0000000000..08a45da203
--- /dev/null
+++ b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
@@ -0,0 +1,7 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+CONFLICTS = "xxf86dgaext"
diff --git a/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
new file mode 100644
index 0000000000..cfe5bf18a1
--- /dev/null
+++ b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
@@ -0,0 +1,7 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+CONFLICTS = "xxf86vmext"
diff --git a/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc
new file mode 100644
index 0000000000..74e7312a50
--- /dev/null
+++ b/packages/xorg-proto/xorg-proto-common.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "X protocol headers"
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+#DEPENDS = ""
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xproto/xproto-native_6.6.2.bb b/packages/xorg-proto/xproto-native_6.6.2.bb
index 44ccb5f035..44ccb5f035 100644
--- a/packages/xproto/xproto-native_6.6.2.bb
+++ b/packages/xorg-proto/xproto-native_6.6.2.bb
diff --git a/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb b/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb
new file mode 100644
index 0000000000..c197c87298
--- /dev/null
+++ b/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xproto-${PV}.tar.bz2"
+S = "${WORKDIR}/xproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb b/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb
new file mode 100644
index 0000000000..8cec6426fd
--- /dev/null
+++ b/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/proto/xproto-${PV}.tar.bz2"
+S = "${WORKDIR}/xproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xproto/xproto-native_cvs.bb b/packages/xorg-proto/xproto-native_cvs.bb
index 7b768a8079..7b768a8079 100644
--- a/packages/xproto/xproto-native_cvs.bb
+++ b/packages/xorg-proto/xproto-native_cvs.bb
diff --git a/packages/xproto/xproto_6.6.2+cvs20050226.bb b/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
index 594a351155..594a351155 100644
--- a/packages/xproto/xproto_6.6.2+cvs20050226.bb
+++ b/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
diff --git a/packages/xproto/xproto_6.6.2.bb b/packages/xorg-proto/xproto_6.6.2.bb
index b5cf751053..b5cf751053 100644
--- a/packages/xproto/xproto_6.6.2.bb
+++ b/packages/xorg-proto/xproto_6.6.2.bb
diff --git a/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
new file mode 100644
index 0000000000..f9017b560e
--- /dev/null
+++ b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
@@ -0,0 +1,5 @@
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xproto/xproto_cvs.bb b/packages/xorg-proto/xproto_cvs.bb
index 1d9c96c87d..1d9c96c87d 100644
--- a/packages/xproto/xproto_cvs.bb
+++ b/packages/xorg-proto/xproto_cvs.bb
diff --git a/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..836af65108
--- /dev/null
+++ b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-proto-common.inc
+
+PROVIDES="xproxymngproto"
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-util/.mtn2git_empty b/packages/xorg-util/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-util/.mtn2git_empty
diff --git a/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb b/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..de3c2ee99a
--- /dev/null
+++ b/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb b/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..de3c2ee99a
--- /dev/null
+++ b/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-util/imake_X11R7.0-1.0.1.bb b/packages/xorg-util/imake_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..f6f5451846
--- /dev/null
+++ b/packages/xorg-util/imake_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+DESCRIPTION = "imake utility"
+
+DEPENDS += " perl xproto"
+
diff --git a/packages/xorg-util/imake_X11R7.1-1.0.2.bb b/packages/xorg-util/imake_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..f6f5451846
--- /dev/null
+++ b/packages/xorg-util/imake_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+DESCRIPTION = "imake utility"
+
+DEPENDS += " perl xproto"
+
diff --git a/packages/xorg-util/lndir_X11R7.0-1.0.1.bb b/packages/xorg-util/lndir_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..6738184b92
--- /dev/null
+++ b/packages/xorg-util/lndir_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto"
+
diff --git a/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb b/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..b3d52356ce
--- /dev/null
+++ b/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
+include xorg-util-common.inc
+inherit native
+
+#DESCRIPTION = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/makedepend-${PV}.tar.bz2"
+S="${WORKDIR}/makedepend-${PV}"
+
+DEPENDS += " util-macros-native xproto-native"
+
diff --git a/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb b/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..6738184b92
--- /dev/null
+++ b/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto"
+
diff --git a/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb b/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..8696ae62f8
--- /dev/null
+++ b/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "X autotools macros"
+SECTION = "x11/libs"
+LICENSE= "Xorg"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/util-macros-${PV}.tar.bz2"
+S = "${WORKDIR}/util-macros-${PV}"
+
+inherit native autotools pkgconfig
+
diff --git a/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb b/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..1506bd3cb2
--- /dev/null
+++ b/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "X autotools macros"
+SECTION = "x11/libs"
+LICENSE= "Xorg"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/util-macros-${PV}.tar.bz2"
+S = "${WORKDIR}/util-macros-${PV}"
+
+inherit native autotools pkgconfig
+
diff --git a/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..79e5dbaa08
--- /dev/null
+++ b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+DESCRIPTION = "X autotools macros"
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..79e5dbaa08
--- /dev/null
+++ b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-util-common.inc
+
+DESCRIPTION = "X autotools macros"
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb b/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..991fc05326
--- /dev/null
+++ b/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb
@@ -0,0 +1,7 @@
+include xorg-util-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+FILES_${PN} += " /usr/lib/X11/config"
diff --git a/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb b/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..991fc05326
--- /dev/null
+++ b/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb
@@ -0,0 +1,7 @@
+include xorg-util-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+FILES_${PN} += " /usr/lib/X11/config"
diff --git a/packages/xorg-util/xorg-util-common.inc b/packages/xorg-util/xorg-util-common.inc
new file mode 100644
index 0000000000..f00a29a21c
--- /dev/null
+++ b/packages/xorg-util/xorg-util-common.inc
@@ -0,0 +1,15 @@
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/utils"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+#DEPENDS = ""
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/util/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xorg-xserver/.mtn2git_empty b/packages/xorg-xserver/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/.mtn2git_empty
diff --git a/packages/xorg-xserver/files/.mtn2git_empty b/packages/xorg-xserver/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/files/.mtn2git_empty
diff --git a/packages/xserver-common/files/calibrate_zaurusd.patch b/packages/xorg-xserver/files/calibrate_zaurusd.patch
index 6a7e3b02b7..6a7e3b02b7 100644
--- a/packages/xserver-common/files/calibrate_zaurusd.patch
+++ b/packages/xorg-xserver/files/calibrate_zaurusd.patch
diff --git a/packages/xserver-common/files/poodle-xmodmap-2.6.patch b/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch
index 73cf3f6ffb..73cf3f6ffb 100644
--- a/packages/xserver-common/files/poodle-xmodmap-2.6.patch
+++ b/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch
diff --git a/packages/xserver-common/files/setDPI.sh b/packages/xorg-xserver/files/setDPI.sh
index 04a2edd6c6..04a2edd6c6 100644
--- a/packages/xserver-common/files/setDPI.sh
+++ b/packages/xorg-xserver/files/setDPI.sh
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
new file mode 100644
index 0000000000..6c1bbd34a9
--- /dev/null
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -0,0 +1,43 @@
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/base"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+RPROVIDES = "virtual/xserver"
+PROVIDES = "virtual/xserver"
+
+DEPENDS = "fontconfig freetype flex-native lbxutil 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 mesa"
+
+REPENDS="rgb"
+
+XORG_PN = "xorg-server"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.gz \
+ file://xorg.conf"
+
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils"
+
+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}/xserver/SecurityPolicy ${libdir}/modules ${libdir}/xorg/modules /etc/X11 "
+FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
+
+do_stage() {
+ autotools_stage_all
+}
+
+do_install_append () {
+ install -d ${D}/etc/X11
+ install -m0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/
+}
diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xorg-xserver/xserver-common_1.10.bb
index de81537f99..de81537f99 100644
--- a/packages/xserver-common/xserver-common_1.10.bb
+++ b/packages/xorg-xserver/xserver-common_1.10.bb
diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xorg-xserver/xserver-common_1.3.bb
index ea3fab6654..ea3fab6654 100644
--- a/packages/xserver-common/xserver-common_1.3.bb
+++ b/packages/xorg-xserver/xserver-common_1.3.bb
diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xorg-xserver/xserver-common_1.8.bb
index b7b3f554f3..b7b3f554f3 100644
--- a/packages/xserver-common/xserver-common_1.8.bb
+++ b/packages/xorg-xserver/xserver-common_1.8.bb
diff --git a/packages/xserver-common/xserver-common_1.9.bb b/packages/xorg-xserver/xserver-common_1.9.bb
index de81537f99..de81537f99 100644
--- a/packages/xserver-common/xserver-common_1.9.bb
+++ b/packages/xorg-xserver/xserver-common_1.9.bb
diff --git a/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty
diff --git a/packages/xserver/xserver-kdrive-omap/configure-tslib.patch b/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch
index 0c0b64bf14..0c0b64bf14 100644
--- a/packages/xserver/xserver-kdrive-omap/configure-tslib.patch
+++ b/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch
diff --git a/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch b/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch
index f87e7cc2cd..f87e7cc2cd 100644
--- a/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch
+++ b/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch
diff --git a/packages/xserver/xserver-kdrive-omap/kmode.patch b/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch
index 22ad51c5ad..22ad51c5ad 100644
--- a/packages/xserver/xserver-kdrive-omap/kmode.patch
+++ b/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch
diff --git a/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
index 31bcb0c273..31bcb0c273 100644
--- a/packages/xserver/xserver-kdrive-omap_6.6.3.bb
+++ b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
diff --git a/packages/xorg-xserver/xserver-kdrive/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/.mtn2git_empty
diff --git a/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff b/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff
index 596e498b80..596e498b80 100644
--- a/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff
+++ b/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff
diff --git a/packages/xserver/xserver-kdrive/devfs.patch b/packages/xorg-xserver/xserver-kdrive/devfs.patch
index a6238126c0..a6238126c0 100644
--- a/packages/xserver/xserver-kdrive/devfs.patch
+++ b/packages/xorg-xserver/xserver-kdrive/devfs.patch
diff --git a/packages/xserver/xserver-kdrive/disable-apm.patch b/packages/xorg-xserver/xserver-kdrive/disable-apm.patch
index bd8842721b..bd8842721b 100644
--- a/packages/xserver/xserver-kdrive/disable-apm.patch
+++ b/packages/xorg-xserver/xserver-kdrive/disable-apm.patch
diff --git a/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
index 9c43e52ead..9c43e52ead 100644
--- a/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
+++ b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
diff --git a/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch b/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch
index 13a6c2c954..13a6c2c954 100644
--- a/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch
+++ b/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch
diff --git a/packages/xserver/xserver-kdrive/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch
index e488657b74..e488657b74 100644
--- a/packages/xserver/xserver-kdrive/enable-tslib.patch
+++ b/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch
diff --git a/packages/xserver/xserver-kdrive/epson.patch b/packages/xorg-xserver/xserver-kdrive/epson.patch
index 07009bdc40..07009bdc40 100644
--- a/packages/xserver/xserver-kdrive/epson.patch
+++ b/packages/xorg-xserver/xserver-kdrive/epson.patch
diff --git a/packages/xserver/xserver-kdrive/faster-rotated.patch b/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch
index eaf7ddec36..eaf7ddec36 100644
--- a/packages/xserver/xserver-kdrive/faster-rotated.patch
+++ b/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch
diff --git a/packages/xserver/xserver-kdrive/fbdev-not-fix.patch b/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch
index f87e7cc2cd..f87e7cc2cd 100644
--- a/packages/xserver/xserver-kdrive/fbdev-not-fix.patch
+++ b/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch
diff --git a/packages/xserver/xserver-kdrive/kdrive-evdev.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch
index 2dc22bf50e..2dc22bf50e 100644
--- a/packages/xserver/xserver-kdrive/kdrive-evdev.patch
+++ b/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch
diff --git a/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch
index d4f885ee26..d4f885ee26 100644
--- a/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch
+++ b/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch
diff --git a/packages/xserver/xserver-kdrive/kmode.patch b/packages/xorg-xserver/xserver-kdrive/kmode.patch
index 5ad3e4e277..5ad3e4e277 100644
--- a/packages/xserver/xserver-kdrive/kmode.patch
+++ b/packages/xorg-xserver/xserver-kdrive/kmode.patch
diff --git a/packages/xserver/xserver-kdrive/no-serial-probing.patch b/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch
index 35ccadaa8d..35ccadaa8d 100644
--- a/packages/xserver/xserver-kdrive/no-serial-probing.patch
+++ b/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch
diff --git a/packages/xserver/xserver-kdrive/onlyfb.patch b/packages/xorg-xserver/xserver-kdrive/onlyfb.patch
index e773324981..e773324981 100644
--- a/packages/xserver/xserver-kdrive/onlyfb.patch
+++ b/packages/xorg-xserver/xserver-kdrive/onlyfb.patch
diff --git a/packages/xserver/xserver-kdrive/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch
index d9ef51c5ba..d9ef51c5ba 100644
--- a/packages/xserver/xserver-kdrive/optional-xkb.patch
+++ b/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch
diff --git a/packages/xserver/xserver-kdrive/xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch
index 3f8cd4ea5c..3f8cd4ea5c 100644
--- a/packages/xserver/xserver-kdrive/xcalibrate.patch
+++ b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch
diff --git a/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch
index ce80a7e389..ce80a7e389 100644
--- a/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
+++ b/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xorg-xserver/xserver-kdrive_20050207.bb
index 21529a69d9..21529a69d9 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xorg-xserver/xserver-kdrive_20050207.bb
diff --git a/packages/xserver/xserver-kdrive_20050624.bb b/packages/xorg-xserver/xserver-kdrive_20050624.bb
index c2e44f7837..c2e44f7837 100644
--- a/packages/xserver/xserver-kdrive_20050624.bb
+++ b/packages/xorg-xserver/xserver-kdrive_20050624.bb
diff --git a/packages/xserver/xserver-kdrive_20060312.bb b/packages/xorg-xserver/xserver-kdrive_20060312.bb
index e5101a3579..e5101a3579 100644
--- a/packages/xserver/xserver-kdrive_20060312.bb
+++ b/packages/xorg-xserver/xserver-kdrive_20060312.bb
diff --git a/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
index 103185289c..103185289c 100644
--- a/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xorg-xserver/xserver-kdrive_cvs.bb
index 1c841cabf7..1c841cabf7 100644
--- a/packages/xserver/xserver-kdrive_cvs.bb
+++ b/packages/xorg-xserver/xserver-kdrive_cvs.bb
diff --git a/packages/xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index 1f42cc159c..1f42cc159c 100644
--- a/packages/xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
diff --git a/packages/xorg-xserver/xserver-xorg/.mtn2git_empty b/packages/xorg-xserver/xserver-xorg/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg/.mtn2git_empty
diff --git a/packages/xserver/xserver-xorg/dri.patch b/packages/xorg-xserver/xserver-xorg/dri.patch
index 37d0407fe4..37d0407fe4 100644
--- a/packages/xserver/xserver-xorg/dri.patch
+++ b/packages/xorg-xserver/xserver-xorg/dri.patch
diff --git a/packages/xorg-xserver/xserver-xorg/drmfix.patch b/packages/xorg-xserver/xserver-xorg/drmfix.patch
new file mode 100644
index 0000000000..04b0c1ae4f
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg/drmfix.patch
@@ -0,0 +1,13 @@
+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/packages/xserver/xserver-xorg/fontfile.patch b/packages/xorg-xserver/xserver-xorg/fontfile.patch
index ed39bf45d0..ed39bf45d0 100644
--- a/packages/xserver/xserver-xorg/fontfile.patch
+++ b/packages/xorg-xserver/xserver-xorg/fontfile.patch
diff --git a/packages/xserver/xserver-xorg/freetype.patch b/packages/xorg-xserver/xserver-xorg/freetype.patch
index 0ba3dd5627..0ba3dd5627 100644
--- a/packages/xserver/xserver-xorg/freetype.patch
+++ b/packages/xorg-xserver/xserver-xorg/freetype.patch
diff --git a/packages/xserver/xserver-xorg/imake-installed.patch b/packages/xorg-xserver/xserver-xorg/imake-installed.patch
index 57821075ef..57821075ef 100644
--- a/packages/xserver/xserver-xorg/imake-installed.patch
+++ b/packages/xorg-xserver/xserver-xorg/imake-installed.patch
diff --git a/packages/xserver/xserver-xorg/imake-staging.patch b/packages/xorg-xserver/xserver-xorg/imake-staging.patch
index bf2e350830..bf2e350830 100644
--- a/packages/xserver/xserver-xorg/imake-staging.patch
+++ b/packages/xorg-xserver/xserver-xorg/imake-staging.patch
diff --git a/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch b/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch
new file mode 100644
index 0000000000..fbade4319a
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch
@@ -0,0 +1,11 @@
+--- temp/xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2005-12-01 23:02:44.000000000 -0700
++++ xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2006-04-18 23:16:04.315823560 -0600
+@@ -2,7 +2,7 @@
+
+ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+
+-INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
++INCLUDES = -I$(top_srcdir)/miext/shadow -I$(top_srcdir)/hw/xfree86/os-support
+
+ liblayer_la_SOURCES = \
+ layer.h \
diff --git a/packages/xorg-xserver/xserver-xorg/xorg.conf b/packages/xorg-xserver/xserver-xorg/xorg.conf
new file mode 100644
index 0000000000..34f4465764
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg/xorg.conf
@@ -0,0 +1,149 @@
+
+# xorg configuration
+
+Section "ServerLayout"
+ Identifier "Default Layout"
+ Screen 0 "Screen0" 0 0
+ InputDevice "Mouse0" "CorePointer"
+ InputDevice "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "Files"
+
+# RgbPath is the location of the RGB database. Note, this is the name of the
+# file minus the extension (like ".txt" or ".db"). There is normally
+# no need to change the default.
+# Multiple FontPath entries are allowed (they are concatenated together)
+# By default, Red Hat 6.0 and later now use a font server independent of
+# the X server to render fonts.
+# FontPath "unix/:7100"
+ FontPath "/usr/lib/X11/fonts/misc"
+EndSection
+
+Section "Module"
+ Load "dbe"
+ Load "extmod"
+ Load "fbdevhw"
+# Load "glx"
+ Load "record"
+ Load "freetype"
+ Load "type1"
+# to enable Xv, link /dev/videox to video device, eg. ln -s video0 /dev/videox
+# Load "z4l"
+EndSection
+
+Section "InputDevice"
+
+# Specify which keyboard LEDs can be user-controlled (eg, with xset(1))
+# Option "Xleds" "1 2 3"
+# To disable the XKEYBOARD extension, uncomment XkbDisable.
+# Option "XkbDisable"
+# To customise the XKB settings to suit your keyboard, modify the
+# lines below (which are the defaults). For example, for a non-U.S.
+# keyboard, you will probably want to use:
+# Option "XkbModel" "pc102"
+# If you have a US Microsoft Natural keyboard, you can use:
+# Option "XkbModel" "microsoft"
+#
+# Then to change the language, change the Layout setting.
+# For example, a german layout can be obtained with:
+# Option "XkbLayout" "de"
+# or:
+# Option "XkbLayout" "de"
+# Option "XkbVariant" "nodeadkeys"
+#
+# If you'd like to switch the positions of your capslock and
+# control keys, use:
+# Option "XkbOptions" "ctrl:swapcaps"
+# Or if you just want both to be control, use:
+# Option "XkbOptions" "ctrl:nocaps"
+#
+ Identifier "Keyboard0"
+ Driver "keyboard"
+ Option "XkbModel" "pc105"
+ Option "XkbLayout" "us"
+EndSection
+
+Section "InputDevice"
+ Identifier "Mouse0"
+ Driver "mouse"
+ Option "Protocol" "PS/2"
+# Option "Protocol" "IMPS/2"
+ Option "Device" "/dev/psaux"
+# Option "Device" "/dev/input/mice"
+ Option "ZAxisMapping" "4 5"
+ Option "Emulate3Buttons" "yes"
+EndSection
+
+Section "Monitor"
+ Identifier "Monitor0"
+ VendorName "Monitor Vendor"
+ ModelName "NEC FP2141SB"
+# DisplaySize 400 300
+# Note: setting HorizSync/VertRefresh will override DDC probe
+# HorizSync 30.0 - 140.0
+# VertRefresh 25.0 - 160.0
+ Option "dpms"
+EndSection
+
+Section "Monitor"
+ Identifier "Monitor1"
+ VendorName "Generic Vendor"
+ ModelName "Generic Monitor"
+ HorizSync 28-50
+ VertRefresh 43-73
+ Modeline "800x600-60" 40.0000 800 840 976 1056 600 601 605 628
+ Modeline "800x600-72" 50.0000 800 856 976 1040 600 637 643 666
+ Modeline "640x480-60" 25.1749 640 656 744 800 480 490 492 525 -HSync -VSync
+ Modeline "640x480-72" 31.5000 640 664 704 832 480 489 492 520 -HSync -VSync
+ Option "dpms"
+EndSection
+
+
+Section "Device"
+ Identifier "Videocard0"
+ Driver "s3"
+# Driver "nv"
+ VendorName "Videocard vendor"
+ BoardName "S3 driver"
+ #BoardName "NVidia driver"
+EndSection
+
+Section "Device"
+ Identifier "FBDev"
+ Driver "fbdev"
+ #Option "shadowfb" "off"
+ VideoRam 4096
+EndSection
+
+Section "Screen"
+ Identifier "Screen0"
+ Device "Videocard0"
+ Monitor "Monitor0"
+# DefaultDepth 8
+ DefaultDepth 16
+# DefaultDepth 24
+
+ SubSection "Display"
+ Depth 8
+ Modes "1024x768" "800x600" "640x480"
+ EndSubsection
+
+ SubSection "Display"
+ Depth 16
+ Modes "1024x768" "800x600" "640x480"
+ EndSubsection
+
+ SubSection "Display"
+ Depth 24
+ FbBpp 32
+ Modes "1024x768" "800x600" "640x480"
+ EndSubsection
+
+EndSection
+
+Section "DRI"
+ Group 0
+ Mode 0666
+EndSection
+
diff --git a/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch b/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch
new file mode 100644
index 0000000000..17d05d3ff8
--- /dev/null
+++ b/packages/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/packages/xserver/xserver-xorg_6.8.99.10.bb b/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb
index 37546fe1ee..37546fe1ee 100644
--- a/packages/xserver/xserver-xorg_6.8.99.10.bb
+++ b/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb
diff --git a/packages/xserver/xserver-xorg_6.8.99.11.bb b/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb
index e60f62ef57..e60f62ef57 100644
--- a/packages/xserver/xserver-xorg_6.8.99.11.bb
+++ b/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb
diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..bfde2f732e
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
@@ -0,0 +1,9 @@
+include xorg-xserver-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+SRC_URI += " file://miext_layer_shadow_h.patch;patch=1 \
+ file://xpconfig-parentdir.patch;patch=1"
+
diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..674f1e5e64
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
@@ -0,0 +1,7 @@
+include xorg-xserver-common.inc
+
+SRC_URI += "file://drmfix.patch;patch=1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xserver/xserver-xorg_cvs.bb b/packages/xorg-xserver/xserver-xorg_cvs.bb
index e410581e17..e410581e17 100644
--- a/packages/xserver/xserver-xorg_cvs.bb
+++ b/packages/xorg-xserver/xserver-xorg_cvs.bb
diff --git a/packages/xproto/applewmproto_1.0.3.bb b/packages/xproto/applewmproto_1.0.3.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/applewmproto_1.0.3.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/bigreqsproto_1.0.2.bb b/packages/xproto/bigreqsproto_1.0.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/bigreqsproto_1.0.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/compositeproto_0.2.2.bb b/packages/xproto/compositeproto_0.2.2.bb
deleted file mode 100644
index 0989abb63c..0000000000
--- a/packages/xproto/compositeproto_0.2.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include proto-common.inc
-
-CONFLICTS = "compositeext"
diff --git a/packages/xproto/compositeproto_0.3.1.bb b/packages/xproto/compositeproto_0.3.1.bb
deleted file mode 100644
index bb55a2022e..0000000000
--- a/packages/xproto/compositeproto_0.3.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
-CONFLICTS = "compositeext"
diff --git a/packages/xproto/damageproto_1.0.3.bb b/packages/xproto/damageproto_1.0.3.bb
deleted file mode 100644
index cde80f0ffa..0000000000
--- a/packages/xproto/damageproto_1.0.3.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include proto-common.inc
-
-CONFLICTS = "damageext"
diff --git a/packages/xproto/dmxproto_2.2.2.bb b/packages/xproto/dmxproto_2.2.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/dmxproto_2.2.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/evieext_1.0.2.bb b/packages/xproto/evieext_1.0.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/evieext_1.0.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/fixesproto_3.0.2.bb b/packages/xproto/fixesproto_3.0.2.bb
deleted file mode 100644
index 2be69994a8..0000000000
--- a/packages/xproto/fixesproto_3.0.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include proto-common.inc
-
-CONFLICTS = "fixesext"
diff --git a/packages/xproto/fixesproto_4.0.bb b/packages/xproto/fixesproto_4.0.bb
deleted file mode 100644
index 8e552e6bc5..0000000000
--- a/packages/xproto/fixesproto_4.0.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
-CONFLICTS = "fixesext"
diff --git a/packages/xproto/fontcacheproto_0.1.2.bb b/packages/xproto/fontcacheproto_0.1.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/fontcacheproto_0.1.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/fontsproto_2.0.2.bb b/packages/xproto/fontsproto_2.0.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/fontsproto_2.0.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/glproto_1.4.3.bb b/packages/xproto/glproto_1.4.3.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/glproto_1.4.3.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/glproto_1.4.7.bb b/packages/xproto/glproto_1.4.7.bb
deleted file mode 100644
index 67c086e764..0000000000
--- a/packages/xproto/glproto_1.4.7.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
diff --git a/packages/xproto/inputproto_1.3.2.bb b/packages/xproto/inputproto_1.3.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/inputproto_1.3.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/kbproto_1.0.2.bb b/packages/xproto/kbproto_1.0.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/kbproto_1.0.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/printproto_1.0.3.bb b/packages/xproto/printproto_1.0.3.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/printproto_1.0.3.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/proto-common.inc b/packages/xproto/proto-common.inc
deleted file mode 100644
index 65dfd4207a..0000000000
--- a/packages/xproto/proto-common.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-#MAINTAINER = ""
-
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/proto/${PN}-${XORG_RELEASE}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${PN}-${XORG_RELEASE}-${PV}"
-
-XORG_RELEASE ?= "X11R7.0"
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
diff --git a/packages/xproto/randrproto_1.1.2.bb b/packages/xproto/randrproto_1.1.2.bb
deleted file mode 100644
index fafe3d3bef..0000000000
--- a/packages/xproto/randrproto_1.1.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include proto-common.inc
-
-CONFLICTS = "randrext"
diff --git a/packages/xproto/recordproto_1.13.2.bb b/packages/xproto/recordproto_1.13.2.bb
deleted file mode 100644
index 9e2cafceb8..0000000000
--- a/packages/xproto/recordproto_1.13.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include proto-common.inc
-
-CONFLICTS = "recordext"
diff --git a/packages/xproto/renderproto_0.9.2.bb b/packages/xproto/renderproto_0.9.2.bb
deleted file mode 100644
index 7f9febd8fa..0000000000
--- a/packages/xproto/renderproto_0.9.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include proto-common.inc
-
-CONFLICTS = "renderext"
diff --git a/packages/xproto/resourceproto_1.0.2.bb b/packages/xproto/resourceproto_1.0.2.bb
deleted file mode 100644
index e210b894ee..0000000000
--- a/packages/xproto/resourceproto_1.0.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include proto-common.inc
-
-CONFLICTS = "resourceext"
diff --git a/packages/xproto/scrnsaverproto_1.0.2.bb b/packages/xproto/scrnsaverproto_1.0.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/scrnsaverproto_1.0.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/scrnsaverproto_1.1.0.bb b/packages/xproto/scrnsaverproto_1.1.0.bb
deleted file mode 100644
index 67c086e764..0000000000
--- a/packages/xproto/scrnsaverproto_1.1.0.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
diff --git a/packages/xproto/trapproto_3.4.3.bb b/packages/xproto/trapproto_3.4.3.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/trapproto_3.4.3.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/videoproto_2.2.2.bb b/packages/xproto/videoproto_2.2.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/videoproto_2.2.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/windowswmproto_1.0.3.bb b/packages/xproto/windowswmproto_1.0.3.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/windowswmproto_1.0.3.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/xcmiscproto_1.1.2.bb b/packages/xproto/xcmiscproto_1.1.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/xcmiscproto_1.1.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/xextproto_7.0.2.bb b/packages/xproto/xextproto_7.0.2.bb
deleted file mode 100644
index 1ae2522d5f..0000000000
--- a/packages/xproto/xextproto_7.0.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include proto-common.inc
-
-PROVIDES = "xextensions"
diff --git a/packages/xproto/xf86bigfontproto_1.1.2.bb b/packages/xproto/xf86bigfontproto_1.1.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/xf86bigfontproto_1.1.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/xf86dgaproto_2.0.2.bb b/packages/xproto/xf86dgaproto_2.0.2.bb
deleted file mode 100644
index 3d7166c741..0000000000
--- a/packages/xproto/xf86dgaproto_2.0.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include proto-common.inc
-
-CONFLICTS = "xxf86dgaext"
diff --git a/packages/xproto/xf86driproto_2.0.3.bb b/packages/xproto/xf86driproto_2.0.3.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/xf86driproto_2.0.3.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/xf86miscproto_0.9.2.bb b/packages/xproto/xf86miscproto_0.9.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/xf86miscproto_0.9.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/xf86rushproto_1.1.2.bb b/packages/xproto/xf86rushproto_1.1.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/xf86rushproto_1.1.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/xf86vidmodeproto_2.2.2.bb b/packages/xproto/xf86vidmodeproto_2.2.2.bb
deleted file mode 100644
index 9ce9a207b8..0000000000
--- a/packages/xproto/xf86vidmodeproto_2.2.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include proto-common.inc
-
-CONFLICTS = "xxf86vmext"
diff --git a/packages/xproto/xineramaproto_1.1.2.bb b/packages/xproto/xineramaproto_1.1.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/xineramaproto_1.1.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/xproto_7.0.4.bb b/packages/xproto/xproto_7.0.4.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/xproto_7.0.4.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xproto/xproto_7.0.5.bb b/packages/xproto/xproto_7.0.5.bb
deleted file mode 100644
index 67c086e764..0000000000
--- a/packages/xproto/xproto_7.0.5.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
diff --git a/packages/xproto/xproxymanagementprotocol_1.0.2.bb b/packages/xproto/xproxymanagementprotocol_1.0.2.bb
deleted file mode 100644
index 66419fe87f..0000000000
--- a/packages/xproto/xproxymanagementprotocol_1.0.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-include proto-common.inc
diff --git a/packages/xrandr/xrandr_1.0.1.bb b/packages/xrandr/xrandr_1.0.1.bb
deleted file mode 100644
index db750c8b97..0000000000
--- a/packages/xrandr/xrandr_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE= "BSD-X"
-DEPENDS = "libxrandr libx11 libxext"
-DESCRIPTION = "X Resize and Rotate extension command."
-SECTION = "x11/base"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-inherit autotools pkgconfig
diff --git a/packages/xrdb/xrdb_1.0.1.bb b/packages/xrdb/xrdb_1.0.1.bb
deleted file mode 100644
index 5703556a33..0000000000
--- a/packages/xrdb/xrdb_1.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DEPENDS = "libx11 libxmu libxext"
-DESCRIPTION = "X server resource database utility"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
-SECTION = "x11/base"
-LICENSE = "xrdb"
-PR = "r0"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-inherit autotools pkgconfig
diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb
index acf629f558..b2d8653f74 100644
--- a/packages/xscreensaver/xscreensaver_4.16.bb
+++ b/packages/xscreensaver/xscreensaver_4.16.bb
@@ -22,6 +22,9 @@ DEPENDS="intltool libx11 gtk+ libxml2 libglade"
LDFLAGS_append = " -Wl,--export-dynamic"
inherit autotools
+
+export INTLTOOL_PERL="/usr/bin/env perl"
+
EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \
--with-jpeg --with-xpm"
diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb
index ba6bd9c58e..75b6b43ef6 100644
--- a/packages/xscreensaver/xscreensaver_4.22.bb
+++ b/packages/xscreensaver/xscreensaver_4.22.bb
@@ -19,6 +19,9 @@ DEPENDS="intltool libx11 gtk+ libxml2 libglade"
LDFLAGS_append = " -Wl,--export-dynamic"
inherit autotools
+
+export INTLTOOL_PERL="/usr/bin/env perl"
+
EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \
--with-jpeg --with-xpm"
diff --git a/packages/xset/xset_1.0.1.bb b/packages/xset/xset_1.0.1.bb
deleted file mode 100644
index 55f3a0de21..0000000000
--- a/packages/xset/xset_1.0.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-DEPENDS = "libx11 libxext xextproto libxmu"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-SECTION = "x11/base"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2 \
- file://disable-xkb.patch;patch=1"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-EXTRA_OECONF = "--disable-xkb"
-
-inherit autotools pkgconfig
diff --git a/packages/zlib/zlib-1.2.3/libtool_staging.patch b/packages/zlib/zlib-1.2.3/libtool_staging.patch
new file mode 100644
index 0000000000..f52e036108
--- /dev/null
+++ b/packages/zlib/zlib-1.2.3/libtool_staging.patch
@@ -0,0 +1,28 @@
+--- zlib-1.2.3/Makefile.in.sav 2006-06-13 09:09:53.000000000 -0600
++++ zlib-1.2.3/Makefile.in 2006-06-13 09:24:48.861200464 -0600
+@@ -24,11 +24,13 @@
+ #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+ # -Wstrict-prototypes -Wmissing-prototypes
+
++LIBTOOL=libtool
+ LDFLAGS=libz.a
+ LDSHARED=$(CC)
+ CPP=$(CC) -E
+
+ LIBS=libz.a
++LIBTOOLLIB=libz.la
+ SHAREDLIB=libz.so
+ SHAREDLIBV=libz.so.1.2.3
+ SHAREDLIBM=libz.so.1
+@@ -67,7 +69,10 @@
+ echo ' *** zlib test FAILED ***'; \
+ fi
+
+-libz.a: $(OBJS) $(OBJA)
++$(LIBTOOLLIB): $(OBJS) $(OBJA)
++ $(LIBTOOL) --tag='CC' --mode=link $(CC) -o $@ $(OBJS) $(OBJA)
++
++libz.a: $(OBJS) $(OBJA) $(LIBTOOLLIB)
+ $(AR) $@ $(OBJS) $(OBJA)
+ -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
+
diff --git a/packages/zlib/zlib-native_1.2.3.bb b/packages/zlib/zlib-native_1.2.3.bb
index 14e1be63e1..c93f7a329a 100644
--- a/packages/zlib/zlib-native_1.2.3.bb
+++ b/packages/zlib/zlib-native_1.2.3.bb
@@ -1,5 +1,6 @@
SECTION = "libs"
include zlib_${PV}.bb
inherit native
-DEPENDS = ""
+
+DEPENDS = "libtool-native"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/zlib-${PV}', '${FILE_DIRNAME}/zlib', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
diff --git a/packages/zlib/zlib_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb
index 1d342f51d1..c7a72c9107 100644
--- a/packages/zlib/zlib_1.2.3.bb
+++ b/packages/zlib/zlib_1.2.3.bb
@@ -6,15 +6,18 @@ HOMEPAGE = "http://www.gzip.org/zlib/"
LICENSE = "zlib"
SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
- file://visibility.patch;patch=1"
+ file://visibility.patch;patch=1 \
+ file://libtool_staging.patch;patch=1"
S = "${WORKDIR}/zlib-${PV}"
+DEPENDS = "libtool-cross"
+
export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1"
LDFLAGS_append = " -L. -lz"
CFLAGS_prepend = "-fPIC -DZLIB_DLL "
AR_append = " rc"
-EXTRA_OEMAKE = ""
+EXTRA_OEMAKE = " LIBTOOL=${TARGET_SYS}-libtool"
do_compile() {
./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
@@ -24,6 +27,8 @@ do_compile() {
do_stage() {
install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h
install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h
+
+ mv libz.la ${STAGING_LIBDIR}/
oe_libinstall -a -so libz ${STAGING_LIBDIR}
}